diff options
Diffstat (limited to 'po/git.pot')
| -rw-r--r-- | po/git.pot | 3484 |
1 files changed, 2043 insertions, 1441 deletions
diff --git a/po/git.pot b/po/git.pot index e5611581e6..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: 2012-10-16 08:38+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:40 +#: 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:70 +#: advice.c:83 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -52,74 +52,194 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:322 +#: archive.c:323 msgid "fmt" msgstr "" -#: archive.c:322 +#: archive.c:323 msgid "archive format" msgstr "" -#: archive.c:323 builtin/log.c:1079 +#: archive.c:324 builtin/log.c:1126 msgid "prefix" msgstr "" -#: archive.c:324 +#: archive.c:325 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2389 -#: builtin/blame.c:2390 builtin/config.c:56 builtin/fast-export.c:642 -#: builtin/fast-export.c:644 builtin/grep.c:801 builtin/hash-object.c:77 -#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540 -#: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149 +#: 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:326 builtin/archive.c:92 +#: archive.c:327 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" -#: archive.c:328 +#: archive.c:329 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:329 +#: archive.c:330 msgid "report archived files on stderr" msgstr "" -#: archive.c:330 +#: archive.c:331 msgid "store only" msgstr "" -#: archive.c:331 +#: archive.c:332 msgid "compress faster" msgstr "" -#: archive.c:339 +#: archive.c:340 msgid "compress better" msgstr "" -#: archive.c:342 +#: archive.c:343 msgid "list supported archive formats" msgstr "" -#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85 +#: archive.c:345 builtin/archive.c:90 builtin/clone.c:86 msgid "repo" msgstr "" -#: archive.c:345 builtin/archive.c:94 +#: archive.c:346 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:346 builtin/archive.c:95 builtin/notes.c:619 +#: archive.c:347 builtin/archive.c:92 builtin/notes.c:615 msgid "command" msgstr "" -#: archive.c:347 builtin/archive.c:96 +#: archive.c:348 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" +#: attr.c:259 +msgid "" +"Negative patterns are ignored in git attributes\n" +"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" @@ -130,7 +250,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:89 builtin/commit.c:672 +#: bundle.c:89 builtin/commit.c:676 #, c-format msgid "could not open '%s'" msgstr "" @@ -139,27 +259,27 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290 -#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 -#: builtin/shortlog.c:181 +#: 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] "" @@ -167,7 +287,7 @@ msgstr[1] "" msgid "rev-list died" msgstr "" -#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -293,31 +413,41 @@ msgid_plural "%lu years ago" msgstr[0] "" msgstr[1] "" -#: diff.c:105 +#: diff.c:112 #, c-format -msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:110 +#: diff.c:117 #, c-format -msgid " Unknown dirstat parameter '%.*s'\n" +msgid " Unknown dirstat parameter '%s'\n" msgstr "" #: diff.c:210 #, c-format +msgid "Unknown value for 'diff.submodule' config variable: '%s'" +msgstr "" + +#: diff.c:260 +#, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:3458 +#: diff.c:3481 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: gpg-interface.c:59 +#: diff.c:3495 +#, c-format +msgid "Failed to parse --submodule option parameter: '%s'" +msgstr "" + +#: gpg-interface.c:59 gpg-interface.c:131 msgid "could not run gpg." msgstr "" @@ -329,17 +459,27 @@ msgstr "" msgid "gpg failed to sign the data" msgstr "" -#: grep.c:1441 +#: gpg-interface.c:115 +#, c-format +msgid "could not create temporary file '%s': %s" +msgstr "" + +#: gpg-interface.c:118 +#, c-format +msgid "failed writing detached signature to '%s': %s" +msgstr "" + +#: grep.c:1623 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1458 +#: grep.c:1640 #, c-format msgid "'%s': %s" msgstr "" -#: grep.c:1469 +#: grep.c:1651 #, c-format msgid "'%s': short read %s" msgstr "" @@ -353,35 +493,39 @@ msgstr "" msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:275 +#: help.c:235 +msgid "The most commonly used git commands are:" +msgstr "" + +#: help.c:292 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "" -#: help.c:332 +#: help.c:349 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:354 +#: help.c:371 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" "Continuing under the assumption that you meant '%s'" msgstr "" -#: help.c:359 +#: help.c:376 #, c-format msgid "in %0.1f seconds automatically..." msgstr "" -#: help.c:366 +#: help.c:383 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:370 +#: help.c:387 msgid "" "\n" "Did you mean this?" @@ -391,6 +535,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#: merge.c:56 +msgid "failed to read the cache" +msgstr "" + +#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566 +#: builtin/clone.c:645 +msgid "unable to write new index file" +msgstr "" + #: merge-recursive.c:190 #, c-format msgid "(bad commit)\n" @@ -436,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 "" @@ -563,7 +716,7 @@ msgstr "" msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1633 git-submodule.sh:869 +#: merge-recursive.c:1633 git-submodule.sh:1029 msgid "submodule" msgstr "" @@ -633,39 +786,62 @@ msgstr "" msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2009 builtin/merge.c:696 +#: merge-recursive.c:2009 builtin/merge.c:658 msgid "Unable to write index." msgstr "" -#: parse-options.c:494 +#: object.c:195 +#, c-format +msgid "unable to parse object: %s" +msgstr "" + +#: parse-options.c:489 msgid "..." msgstr "" -#: parse-options.c:512 +#: parse-options.c:507 #, c-format msgid "usage: %s" msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:516 +#: parse-options.c:511 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:519 +#: parse-options.c:514 #, c-format msgid " %s" msgstr "" -#: remote.c:1632 +#: parse-options.c:548 +msgid "-NUM" +msgstr "" + +#: pathspec.c:83 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "" + +#: pathspec.c:99 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "" + +#: 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:1638 +#: remote.c:1787 +msgid " (use \"git push\" to publish your local commits)\n" +msgstr "" + +#: remote.c:1790 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -673,7 +849,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1646 +#: remote.c:1798 +msgid " (use \"git pull\" to update your local branch)\n" +msgstr "" + +#: remote.c:1801 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -684,257 +864,267 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: sequencer.c:123 builtin/merge.c:864 builtin/merge.c:977 -#: builtin/merge.c:1087 builtin/merge.c:1097 +#: remote.c:1811 +msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgstr "" + +#: 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:867 -#: builtin/merge.c:1089 builtin/merge.c:1102 +#: 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:770 sequencer.c:853 +#: 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:235 +#: sequencer.c:319 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:266 +#: sequencer.c:350 msgid "Could not resolve HEAD commit\n" msgstr "" -#: sequencer.c:287 +#: sequencer.c:371 msgid "Unable to update cache tree\n" msgstr "" -#: sequencer.c:332 +#: sequencer.c:416 #, c-format msgid "Could not parse commit %s\n" msgstr "" -#: sequencer.c:337 +#: sequencer.c:421 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" -#: sequencer.c:403 +#: sequencer.c:487 msgid "Your index file is unmerged." msgstr "" -#: sequencer.c:406 -msgid "You do not have a valid HEAD" -msgstr "" - -#: sequencer.c:421 +#: sequencer.c:506 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:429 +#: sequencer.c:514 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: sequencer.c:433 +#: 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:444 +#: sequencer.c:531 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:448 +#: sequencer.c:535 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:532 +#: sequencer.c:621 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:533 +#: sequencer.c:622 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:565 +#: sequencer.c:654 msgid "empty commit set passed" msgstr "" -#: sequencer.c:573 +#: sequencer.c:662 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:578 +#: sequencer.c:667 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:636 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "" -#: sequencer.c:658 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "" -#: sequencer.c:663 +#: sequencer.c:752 msgid "No commits parsed." msgstr "" -#: sequencer.c:676 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "" -#: sequencer.c:680 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "" -#: sequencer.c:687 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" -#: sequencer.c:715 +#: sequencer.c:804 #, c-format msgid "Invalid key: %s" msgstr "" -#: sequencer.c:718 +#: sequencer.c:807 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: sequencer.c:730 +#: sequencer.c:819 #, c-format msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:751 +#: sequencer.c:840 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:752 +#: sequencer.c:841 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:756 +#: sequencer.c:845 #, c-format msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:772 sequencer.c:857 +#: sequencer.c:861 sequencer.c:946 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:791 sequencer.c:925 +#: sequencer.c:880 sequencer.c:1014 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:793 +#: sequencer.c:882 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:795 +#: sequencer.c:884 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:817 builtin/apply.c:4005 +#: sequencer.c:906 builtin/apply.c:4060 #, c-format msgid "cannot open %s: %s" msgstr "" -#: sequencer.c:820 +#: sequencer.c:909 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:821 +#: sequencer.c:910 msgid "unexpected end of file" msgstr "" -#: sequencer.c:827 +#: sequencer.c:916 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:850 +#: sequencer.c:939 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:1012 +#: 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:1013 +#: 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 "" @@ -944,12 +1134,17 @@ msgstr "" msgid "unable to access '%s': %s" msgstr "" -#: wrapper.c:426 +#: wrapper.c:423 +#, c-format +msgid "unable to access '%s'" +msgstr "" + +#: wrapper.c:434 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" -#: wrapper.c:427 +#: wrapper.c:435 msgid "no such user" msgstr "" @@ -1052,401 +1247,496 @@ 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:785 +#: wt-status.c:803 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:788 wt-status.c:912 +#: wt-status.c:806 wt-status.c:958 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:791 +#: wt-status.c:809 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:794 +#: wt-status.c:812 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:804 +#: wt-status.c:822 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:807 +#: wt-status.c:825 msgid "The current patch is empty." msgstr "" -#: wt-status.c:811 +#: wt-status.c:829 msgid " (fix conflicts and then run \"git am --resolved\")" msgstr "" -#: wt-status.c:813 +#: wt-status.c:831 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:815 +#: wt-status.c:833 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:873 wt-status.c:883 +#: wt-status.c:893 wt-status.c:910 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "" + +#: wt-status.c:898 wt-status.c:915 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:876 +#: wt-status.c:901 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:878 +#: wt-status.c:903 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:880 +#: wt-status.c:905 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:886 +#: wt-status.c:918 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:888 +#: wt-status.c:922 +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "" + +#: wt-status.c:927 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:891 +#: wt-status.c:930 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:893 +#: wt-status.c:934 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "" + +#: wt-status.c:939 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:896 +#: wt-status.c:942 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:898 +#: wt-status.c:944 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:908 +#: wt-status.c:954 msgid "You are currently cherry-picking." msgstr "" -#: wt-status.c:915 +#: wt-status.c:961 msgid " (all conflicts fixed: run \"git commit\")" msgstr "" -#: wt-status.c:924 +#: 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, started from branch '%s'." +msgstr "" + +#: wt-status.c:995 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:927 +#: wt-status.c:998 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:978 +#: wt-status.c:1173 msgid "On branch " msgstr "" -#: wt-status.c:985 +#: 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:997 +#: wt-status.c:1206 msgid "Initial commit" msgstr "" -#: wt-status.c:1011 +#: wt-status.c:1220 msgid "Untracked files" msgstr "" -#: wt-status.c:1013 +#: wt-status.c:1222 msgid "Ignored files" msgstr "" -#: wt-status.c:1015 +#: 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:1017 +#: wt-status.c:1234 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1023 +#: wt-status.c:1240 msgid "No changes" msgstr "" -#: wt-status.c:1028 +#: 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:1031 +#: wt-status.c:1248 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1034 +#: 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:1037 +#: wt-status.c:1254 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1040 +#: wt-status.c:1257 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1043 wt-status.c:1048 +#: wt-status.c:1260 wt-status.c:1265 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1046 +#: wt-status.c:1263 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1050 +#: wt-status.c:1267 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1158 +#: wt-status.c:1375 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1164 +#: wt-status.c:1381 msgid "Initial commit on " msgstr "" -#: wt-status.c:1179 +#: wt-status.c:1396 msgid "behind " msgstr "" -#: wt-status.c:1182 wt-status.c:1185 +#: wt-status.c:1399 wt-status.c:1402 msgid "ahead " msgstr "" -#: wt-status.c:1187 +#: 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 "" -#: builtin/add.c:19 -msgid "git add [options] [--] <filepattern>..." +#: builtin/add.c:20 +msgid "git add [options] [--] <pathspec>..." msgstr "" -#: builtin/add.c:62 +#. +#. * 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 "unexpected diff status %c" +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:67 builtin/commit.c:230 -msgid "updating files failed" +#: 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:77 +#: builtin/add.c:144 #, c-format -msgid "remove '%s'\n" +msgid "unexpected diff status %c" +msgstr "" + +#: builtin/add.c:149 builtin/commit.c:233 +msgid "updating files failed" msgstr "" -#: builtin/add.c:176 +#: builtin/add.c:163 #, c-format -msgid "Path '%s' is in submodule '%.*s'" +msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:192 +#: builtin/add.c:253 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186 +#: 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:209 -#, c-format -msgid "'%s' is beyond a symbolic link" -msgstr "" - -#: builtin/add.c:276 +#: builtin/add.c:339 msgid "Could not read the index" msgstr "" -#: builtin/add.c:286 +#: builtin/add.c:349 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:290 +#: builtin/add.c:353 msgid "Could not write patch" msgstr "" -#: builtin/add.c:295 +#: builtin/add.c:358 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:297 +#: builtin/add.c:360 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:303 +#: builtin/add.c:366 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:313 +#: builtin/add.c:376 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63 -#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253 -#: builtin/rm.c:133 +#: 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:320 builtin/apply.c:4354 builtin/commit.c:1154 -#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477 -#: 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:322 +#: builtin/add.c:396 msgid "interactive picking" msgstr "" -#: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248 +#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:324 +#: builtin/add.c:398 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:325 +#: builtin/add.c:399 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:326 +#: builtin/add.c:400 msgid "update tracked files" msgstr "" -#: builtin/add.c:327 +#: builtin/add.c:401 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:328 +#: builtin/add.c:402 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:329 +#. 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:330 +#: builtin/add.c:408 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:331 +#: builtin/add.c:409 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:353 +#: builtin/add.c:431 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:354 +#: builtin/add.c:432 msgid "no files added" msgstr "" -#: builtin/add.c:360 +#: builtin/add.c:438 msgid "adding files failed" msgstr "" -#: builtin/add.c:392 +#: builtin/add.c:477 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:394 +#: 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/clean.c:95 builtin/commit.c:290 builtin/mv.c:82 -#: builtin/rm.c:162 +#: 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:4450 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370 msgid "Unable to write new index file" msgstr "" @@ -1499,17 +1789,17 @@ msgstr "" msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1420 +#: builtin/apply.c:1422 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1477 +#: builtin/apply.c:1479 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1494 +#: builtin/apply.c:1496 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1520,400 +1810,396 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1654 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1656 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1682 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1718 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1720 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1723 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1869 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1898 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:1984 +#: builtin/apply.c:1986 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2074 +#: builtin/apply.c:2076 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2078 +#: builtin/apply.c:2080 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2149 -msgid "oops" -msgstr "" - -#: builtin/apply.c:2671 +#: builtin/apply.c:2688 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2789 +#: 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:2801 +#: builtin/apply.c:2818 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2807 +#: builtin/apply.c:2824 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2826 +#: builtin/apply.c:2843 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:2929 +#: builtin/apply.c:2946 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:2935 +#: builtin/apply.c:2952 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:2956 +#: builtin/apply.c:2973 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3078 +#: builtin/apply.c:3095 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176 +#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3156 builtin/apply.c:3378 +#: builtin/apply.c:3173 builtin/apply.c:3395 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3237 builtin/apply.c:3392 +#: builtin/apply.c:3254 builtin/apply.c:3409 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406 +#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3246 builtin/apply.c:3400 +#: builtin/apply.c:3263 builtin/apply.c:3417 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3348 +#: builtin/apply.c:3365 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3417 +#: builtin/apply.c:3434 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3419 +#: builtin/apply.c:3436 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3520 +#: builtin/apply.c:3537 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3523 +#: builtin/apply.c:3540 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3543 +#: builtin/apply.c:3560 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3548 +#: builtin/apply.c:3565 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3556 +#: builtin/apply.c:3573 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3569 +#: builtin/apply.c:3586 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158 +#: 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:3767 +#: builtin/apply.c:3822 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3795 +#: builtin/apply.c:3850 #, c-format msgid "corrupt patch for subproject %s" msgstr "" -#: builtin/apply.c:3799 +#: builtin/apply.c:3854 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3804 +#: builtin/apply.c:3859 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3807 builtin/apply.c:3915 +#: builtin/apply.c:3862 builtin/apply.c:3970 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3840 +#: builtin/apply.c:3895 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:3889 +#: builtin/apply.c:3944 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:3976 +#: builtin/apply.c:4031 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:3984 +#: builtin/apply.c:4039 msgid "internal error" msgstr "" #. Say this even without --verbose -#: builtin/apply.c:3987 +#: 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:3997 +#: builtin/apply.c:4052 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4018 +#: builtin/apply.c:4073 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4021 +#: builtin/apply.c:4076 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4171 +#: builtin/apply.c:4226 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4182 +#: builtin/apply.c:4237 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4301 builtin/apply.c:4304 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:4302 +#: builtin/apply.c:4357 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4305 +#: builtin/apply.c:4360 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4307 +#: builtin/apply.c:4362 msgid "num" msgstr "" -#: builtin/apply.c:4308 +#: builtin/apply.c:4363 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4311 +#: builtin/apply.c:4366 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4313 +#: builtin/apply.c:4368 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4317 +#: builtin/apply.c:4372 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4319 +#: builtin/apply.c:4374 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4321 +#: builtin/apply.c:4376 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4323 +#: builtin/apply.c:4378 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4325 +#: builtin/apply.c:4380 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4327 +#: builtin/apply.c:4382 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4329 +#: builtin/apply.c:4384 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4331 +#: builtin/apply.c:4386 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460 +#: 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:4336 +#: builtin/apply.c:4391 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4337 +#: builtin/apply.c:4392 msgid "action" msgstr "" -#: builtin/apply.c:4338 +#: builtin/apply.c:4393 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4341 builtin/apply.c:4344 +#: builtin/apply.c:4396 builtin/apply.c:4399 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4347 +#: builtin/apply.c:4402 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4349 +#: builtin/apply.c:4404 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4351 +#: builtin/apply.c:4406 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4353 +#: builtin/apply.c:4408 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4356 +#: builtin/apply.c:4411 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4359 +#: builtin/apply.c:4414 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4361 +#: builtin/apply.c:4416 msgid "root" msgstr "" -#: builtin/apply.c:4362 +#: builtin/apply.c:4417 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4384 +#: builtin/apply.c:4439 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4392 +#: builtin/apply.c:4447 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4395 +#: builtin/apply.c:4450 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4411 +#: builtin/apply.c:4466 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4425 +#: builtin/apply.c:4480 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4431 builtin/apply.c:4441 +#: builtin/apply.c:4486 builtin/apply.c:4496 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1937,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 "" @@ -1971,395 +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:2373 +#: builtin/blame.c:2355 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2374 +#: builtin/blame.c:2356 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2375 +#: builtin/blame.c:2357 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2376 +#: builtin/blame.c:2358 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2377 +#: builtin/blame.c:2359 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2378 +#: builtin/blame.c:2360 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2379 +#: builtin/blame.c:2361 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2380 +#: builtin/blame.c:2362 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2381 +#: builtin/blame.c:2363 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2382 +#: builtin/blame.c:2364 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2383 +#: builtin/blame.c:2365 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2384 +#: builtin/blame.c:2366 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2385 +#: builtin/blame.c:2367 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2386 +#: builtin/blame.c:2368 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2387 +#: builtin/blame.c:2369 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2388 +#: builtin/blame.c:2370 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2389 +#: builtin/blame.c:2371 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2390 +#: builtin/blame.c:2372 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2391 builtin/blame.c:2392 +#: builtin/blame.c:2373 builtin/blame.c:2374 msgid "score" msgstr "" -#: builtin/blame.c:2391 +#: builtin/blame.c:2373 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2392 +#: builtin/blame.c:2374 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2393 +#: builtin/blame.c:2375 msgid "n,m" msgstr "" -#: builtin/blame.c:2393 +#: 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:181 +#: builtin/branch.c:168 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "" + +#: 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:185 +msgid "Update of config-file failed" +msgstr "" + +#: builtin/branch.c:213 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:187 +#: builtin/branch.c:219 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:192 +#: builtin/branch.c:227 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "" -#: builtin/branch.c:203 +#: builtin/branch.c:240 #, c-format msgid "remote branch '%s' not found." msgstr "" -#: builtin/branch.c:204 +#: builtin/branch.c:241 #, c-format msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:211 -#, c-format -msgid "Couldn't look up commit object for '%s'" -msgstr "" - -#: builtin/branch.c:217 -#, 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:226 +#: builtin/branch.c:255 #, c-format msgid "Error deleting remote branch '%s'" msgstr "" -#: builtin/branch.c:227 +#: builtin/branch.c:256 #, c-format msgid "Error deleting branch '%s'" msgstr "" -#: builtin/branch.c:234 +#: builtin/branch.c:263 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:235 +#: builtin/branch.c:264 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:240 -msgid "Update of config-file failed" -msgstr "" - -#: builtin/branch.c:338 +#: builtin/branch.c:366 #, c-format msgid "branch '%s' does not point at a commit" msgstr "" -#: builtin/branch.c:410 +#: builtin/branch.c:453 #, c-format msgid "[%s: behind %d]" msgstr "" -#: builtin/branch.c:412 +#: builtin/branch.c:455 #, c-format msgid "[behind %d]" msgstr "" -#: builtin/branch.c:416 +#: builtin/branch.c:459 #, c-format msgid "[%s: ahead %d]" msgstr "" -#: builtin/branch.c:418 +#: builtin/branch.c:461 #, c-format msgid "[ahead %d]" msgstr "" -#: builtin/branch.c:421 +#: builtin/branch.c:464 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:424 +#: builtin/branch.c:467 #, c-format msgid "[ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:537 +#: builtin/branch.c:490 +msgid " **** invalid ref ****" +msgstr "" + +#: 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:602 +#: builtin/branch.c:637 +#, c-format +msgid "object '%s' does not point to a commit" +msgstr "" + +#: builtin/branch.c:669 msgid "some refs could not be read" msgstr "" -#: builtin/branch.c:615 +#: builtin/branch.c:682 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:625 +#: builtin/branch.c:692 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:640 +#: builtin/branch.c:707 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:644 +#: builtin/branch.c:711 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:648 +#: builtin/branch.c:715 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:655 +#: builtin/branch.c:722 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:670 +#: builtin/branch.c:737 #, c-format msgid "malformed object name %s" msgstr "" -#: builtin/branch.c:694 +#: builtin/branch.c:761 #, c-format msgid "could not write branch description template: %s" msgstr "" -#: builtin/branch.c:724 +#: builtin/branch.c:791 msgid "Generic options" msgstr "" -#: builtin/branch.c:726 +#: builtin/branch.c:793 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:727 +#: builtin/branch.c:794 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:728 +#: builtin/branch.c:795 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:730 +#: builtin/branch.c:797 msgid "change upstream info" msgstr "" -#: builtin/branch.c:734 +#: builtin/branch.c:801 msgid "use colored output" msgstr "" -#: builtin/branch.c:735 +#: builtin/branch.c:802 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765 -#: builtin/branch.c:771 builtin/commit.c:1362 builtin/commit.c:1363 -#: builtin/commit.c:1364 builtin/commit.c:1365 builtin/tag.c:470 +#: 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:739 builtin/branch.c:745 +#: builtin/branch.c:806 builtin/branch.c:812 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:751 +#: builtin/branch.c:818 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:752 +#: builtin/branch.c:819 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:754 +#: builtin/branch.c:821 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:755 +#: builtin/branch.c:822 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:756 +#: builtin/branch.c:823 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:757 +#: builtin/branch.c:824 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:758 +#: builtin/branch.c:825 msgid "list branch names" msgstr "" -#: builtin/branch.c:759 +#: builtin/branch.c:826 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:761 +#: builtin/branch.c:828 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:762 +#: builtin/branch.c:829 msgid "force creation (when already exists)" msgstr "" -#: builtin/branch.c:765 +#: builtin/branch.c:832 msgid "print only not merged branches" msgstr "" -#: builtin/branch.c:771 +#: builtin/branch.c:838 msgid "print only merged branches" msgstr "" -#: builtin/branch.c:775 +#: builtin/branch.c:842 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:788 +#: builtin/branch.c:855 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:793 builtin/clone.c:561 +#: builtin/branch.c:860 builtin/clone.c:619 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:813 +#: builtin/branch.c:883 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:864 +#: builtin/branch.c:889 builtin/branch.c:928 +msgid "branch name required" +msgstr "" + +#: builtin/branch.c:904 +msgid "Cannot give description to detached HEAD" +msgstr "" + +#: builtin/branch.c:909 +msgid "cannot edit description of more than one branch" +msgstr "" + +#: builtin/branch.c:916 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "" + +#: builtin/branch.c:919 +#, c-format +msgid "No branch named '%s'." +msgstr "" + +#: builtin/branch.c:934 +msgid "too many branches for a rename operation" +msgstr "" + +#: 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:876 +#: 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:891 +#: 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:894 +#: 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:911 +#: builtin/branch.c:1013 #, c-format msgid "" "\n" @@ -2367,12 +2730,12 @@ msgid "" "\n" msgstr "" -#: builtin/branch.c:912 +#: builtin/branch.c:1014 #, c-format msgid " git branch -d %s\n" msgstr "" -#: builtin/branch.c:913 +#: builtin/branch.c:1015 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr "" @@ -2390,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 "" @@ -2446,14 +2809,38 @@ msgstr "" msgid "use .gitattributes only from the index" msgstr "" -#: builtin/check-attr.c:21 builtin/hash-object.c:75 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 msgid "read file names from stdin" msgstr "" -#: builtin/check-attr.c:23 +#: builtin/check-attr.c:23 builtin/check-ignore.c:24 msgid "input paths are terminated by a null character" msgstr "" +#: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177 +msgid "suppress progress reporting" +msgstr "" + +#: builtin/check-ignore.c:146 +msgid "cannot specify pathnames with --stdin" +msgstr "" + +#: builtin/check-ignore.c:149 +msgid "-z only makes sense with --stdin" +msgstr "" + +#: builtin/check-ignore.c:151 +msgid "no path specified" +msgstr "" + +#: builtin/check-ignore.c:155 +msgid "--quiet is only valid with a single pathname" +msgstr "" + +#: builtin/check-ignore.c:157 +msgid "cannot have both --quiet and --verbose" +msgstr "" + #: builtin/checkout-index.c:126 msgid "git checkout-index [options] [--] [<file>...]" msgstr "" @@ -2506,111 +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:333 builtin/checkout.c:534 builtin/clone.c:586 -#: builtin/merge.c:811 -msgid "unable to write new index file" -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: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" @@ -2625,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" @@ -2635,431 +3017,450 @@ 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:961 +#: builtin/checkout.c:996 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:964 builtin/checkout.c:968 +#: builtin/checkout.c:999 builtin/checkout.c:1003 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980 -#: builtin/checkout.c:983 +#: 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:988 +#: builtin/checkout.c:1023 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1009 builtin/gc.c:177 -msgid "suppress progress reporting" -msgstr "" - -#: builtin/checkout.c:1010 builtin/checkout.c:1012 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:1011 +#: builtin/checkout.c:1046 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1013 +#: builtin/checkout.c:1048 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1014 +#: builtin/checkout.c:1049 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1015 +#: builtin/checkout.c:1050 msgid "detach the HEAD at named commit" msgstr "" -#: builtin/checkout.c:1016 +#: builtin/checkout.c:1051 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1018 +#: builtin/checkout.c:1053 msgid "new branch" msgstr "" -#: builtin/checkout.c:1018 +#: builtin/checkout.c:1053 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1019 +#: builtin/checkout.c:1054 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1021 +#: builtin/checkout.c:1056 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1058 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1024 +#: builtin/checkout.c:1059 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1025 builtin/merge.c:215 +#: builtin/checkout.c:1060 builtin/merge.c:217 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241 +#: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245 msgid "style" msgstr "" -#: builtin/checkout.c:1027 +#: builtin/checkout.c:1062 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1030 +#: 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:1054 +#: builtin/checkout.c:1091 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1071 +#: builtin/checkout.c:1108 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1078 +#: builtin/checkout.c:1115 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1150 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1120 +#: 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:1125 +#: builtin/checkout.c:1162 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1129 +#: builtin/checkout.c:1166 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/clean.c:19 +#: builtin/clean.c:20 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" -#: builtin/clean.c:51 +#: builtin/clean.c:24 +#, c-format +msgid "Removing %s\n" +msgstr "" + +#: builtin/clean.c:25 +#, c-format +msgid "Would remove %s\n" +msgstr "" + +#: builtin/clean.c:26 +#, c-format +msgid "Skipping repository %s\n" +msgstr "" + +#: builtin/clean.c:27 +#, c-format +msgid "Would skip repository %s\n" +msgstr "" + +#: builtin/clean.c:28 +#, c-format +msgid "failed to remove %s" +msgstr "" + +#: builtin/clean.c:160 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:53 +#: builtin/clean.c:162 msgid "force" msgstr "" -#: builtin/clean.c:55 +#: builtin/clean.c:164 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:803 -#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199 +#: 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 "" -#: builtin/clean.c:57 +#: builtin/clean.c:166 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:58 +#: builtin/clean.c:167 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:60 +#: builtin/clean.c:169 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:78 +#: builtin/clean.c:187 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:82 +#: builtin/clean.c:191 msgid "" "clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "" -#: builtin/clean.c:85 +#: builtin/clean.c:194 msgid "" "clean.requireForce defaults to true and neither -n nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:155 builtin/clean.c:176 -#, c-format -msgid "Would remove %s\n" -msgstr "" - -#: builtin/clean.c:159 builtin/clean.c:179 -#, c-format -msgid "Removing %s\n" -msgstr "" - -#: builtin/clean.c:162 builtin/clean.c:182 -#, c-format -msgid "failed to remove %s" -msgstr "" - -#: builtin/clean.c:166 -#, c-format -msgid "Would not remove %s\n" -msgstr "" - -#: builtin/clean.c:168 -#, c-format -msgid "Not removing %s\n" -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/push.c:399 +#: 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:748 +#: 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:719 +#: builtin/clone.c:767 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "" + +#: builtin/clone.c:780 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:724 +#: builtin/clone.c:785 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:734 +#: builtin/clone.c:795 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:744 +#: builtin/clone.c:805 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:757 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:760 +#: builtin/clone.c:821 #, c-format msgid "could not create work tree dir '%s'." msgstr "" -#: builtin/clone.c:779 +#: builtin/clone.c:840 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:781 +#: builtin/clone.c:842 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:823 +#: builtin/clone.c:877 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:872 +#: builtin/clone.c:926 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:879 +#: builtin/clone.c:933 msgid "You appear to have cloned an empty repository." msgstr "" @@ -3096,11 +3497,11 @@ msgid "--command must be the first argument" msgstr "" #: builtin/commit.c:34 -msgid "git commit [options] [--] <filepattern>..." +msgid "git commit [options] [--] <pathspec>..." msgstr "" #: builtin/commit.c:39 -msgid "git status [options] [--] <filepattern>..." +msgid "git status [options] [--] <pathspec>..." msgstr "" #: builtin/commit.c:44 @@ -3134,93 +3535,93 @@ msgid "" "Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:257 +#: builtin/commit.c:260 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:299 +#: builtin/commit.c:302 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:305 +#: builtin/commit.c:308 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:338 builtin/commit.c:359 builtin/commit.c:409 +#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:390 +#: builtin/commit.c:393 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:392 +#: builtin/commit.c:395 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:402 +#: builtin/commit.c:405 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:422 +#: builtin/commit.c:425 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:509 builtin/commit.c:515 +#: builtin/commit.c:513 builtin/commit.c:519 #, c-format msgid "invalid commit: %s" msgstr "" -#: builtin/commit.c:538 +#: builtin/commit.c:542 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:558 +#: builtin/commit.c:562 #, c-format msgid "Malformed ident string: '%s'" msgstr "" -#: builtin/commit.c:596 builtin/commit.c:629 builtin/commit.c:952 +#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:608 builtin/shortlog.c:296 +#: builtin/commit.c:612 builtin/shortlog.c:270 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:610 +#: builtin/commit.c:614 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:614 +#: builtin/commit.c:618 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:620 +#: builtin/commit.c:624 msgid "commit has empty message" msgstr "" -#: builtin/commit.c:636 +#: builtin/commit.c:640 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:640 +#: builtin/commit.c:644 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:644 +#: builtin/commit.c:648 #, c-format msgid "could not read '%s'" msgstr "" -#: builtin/commit.c:705 +#: builtin/commit.c:709 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:716 +#: builtin/commit.c:720 #, c-format msgid "" "\n" @@ -3230,7 +3631,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:721 +#: builtin/commit.c:725 #, c-format msgid "" "\n" @@ -3240,356 +3641,366 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:733 +#: builtin/commit.c:737 +#, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '#' will be ignored, and an empty message aborts the commit.\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:738 +#: builtin/commit.c:742 +#, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '#' will be kept; you may remove them yourself if you want to.\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:751 +#: builtin/commit.c:755 #, c-format msgid "%sAuthor: %s" msgstr "" -#: builtin/commit.c:758 +#: builtin/commit.c:762 #, c-format msgid "%sCommitter: %s" msgstr "" -#: builtin/commit.c:778 +#: builtin/commit.c:782 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:815 +#: builtin/commit.c:819 msgid "Error building trees" msgstr "" -#: builtin/commit.c:830 builtin/tag.c:361 +#: 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:927 +#: builtin/commit.c:931 #, c-format msgid "No existing author found with '%s'" msgstr "" -#: builtin/commit.c:942 builtin/commit.c:1142 +#: builtin/commit.c:946 builtin/commit.c:1140 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:982 +#: builtin/commit.c:976 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:993 +#: builtin/commit.c:987 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:996 +#: builtin/commit.c:990 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:998 +#: builtin/commit.c:992 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1001 +#: builtin/commit.c:995 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1011 +#: builtin/commit.c:1005 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1013 +#: builtin/commit.c:1007 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1021 +#: builtin/commit.c:1015 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1038 +#: builtin/commit.c:1032 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1040 +#: builtin/commit.c:1034 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1042 +#: builtin/commit.c:1036 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1044 +#: builtin/commit.c:1038 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1054 builtin/tag.c:577 +#: builtin/commit.c:1048 builtin/tag.c:575 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1059 +#: builtin/commit.c:1053 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1156 builtin/commit.c:1384 +#: builtin/commit.c:1059 builtin/commit.c:1194 +msgid "--long and -z are incompatible" +msgstr "" + +#: builtin/commit.c:1154 builtin/commit.c:1390 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1158 builtin/commit.c:1386 +#: builtin/commit.c:1156 builtin/commit.c:1392 msgid "show branch information" msgstr "" -#: builtin/commit.c:1160 builtin/commit.c:1388 builtin/push.c:389 +#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1163 builtin/commit.c:1390 +#: builtin/commit.c:1161 builtin/commit.c:1396 +msgid "show status in long format (default)" +msgstr "" + +#: builtin/commit.c:1164 builtin/commit.c:1399 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1165 builtin/commit.c:1393 builtin/fast-export.c:636 -#: builtin/fast-export.c:639 builtin/tag.c:461 +#: 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:1166 builtin/commit.c:1393 +#: builtin/commit.c:1167 builtin/commit.c:1402 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1169 +#: builtin/commit.c:1170 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1170 parse-options.h:151 +#: builtin/commit.c:1171 parse-options.h:151 msgid "when" msgstr "" -#: builtin/commit.c:1171 +#: builtin/commit.c:1172 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1173 +#: builtin/commit.c:1174 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1242 +#: builtin/commit.c:1248 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1244 +#: builtin/commit.c:1250 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1285 +#: builtin/commit.c:1291 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1287 +#: builtin/commit.c:1293 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1354 +#: builtin/commit.c:1360 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1355 +#: builtin/commit.c:1361 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1357 +#: builtin/commit.c:1363 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1358 builtin/tag.c:459 +#: builtin/commit.c:1364 builtin/tag.c:457 msgid "read message from file" msgstr "" -#: builtin/commit.c:1359 +#: builtin/commit.c:1365 msgid "author" msgstr "" -#: builtin/commit.c:1359 +#: builtin/commit.c:1365 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1360 builtin/gc.c:178 +#: builtin/commit.c:1366 builtin/gc.c:178 msgid "date" msgstr "" -#: builtin/commit.c:1360 +#: builtin/commit.c:1366 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1361 builtin/merge.c:206 builtin/notes.c:537 -#: builtin/notes.c:694 builtin/tag.c:457 +#: 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:1361 +#: builtin/commit.c:1367 msgid "commit message" msgstr "" -#: builtin/commit.c:1362 +#: builtin/commit.c:1368 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1363 +#: builtin/commit.c:1369 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1364 +#: builtin/commit.c:1370 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1365 +#: builtin/commit.c:1371 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1366 +#: builtin/commit.c:1372 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1367 builtin/log.c:1068 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:1368 +#: builtin/commit.c:1374 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1369 +#: builtin/commit.c:1375 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1370 +#: builtin/commit.c:1376 msgid "default" msgstr "" -#: builtin/commit.c:1370 builtin/tag.c:462 +#: builtin/commit.c:1376 builtin/tag.c:460 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1371 +#: builtin/commit.c:1377 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1372 builtin/merge.c:213 builtin/tag.c:463 +#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461 msgid "key id" msgstr "" -#: builtin/commit.c:1373 builtin/merge.c:214 +#: builtin/commit.c:1379 builtin/merge.c:216 msgid "GPG sign commit" msgstr "" #. end commit message options -#: builtin/commit.c:1376 +#: builtin/commit.c:1382 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1377 +#: builtin/commit.c:1383 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1378 +#: builtin/commit.c:1384 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1379 +#: builtin/commit.c:1385 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1380 +#: builtin/commit.c:1386 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1381 +#: builtin/commit.c:1387 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1382 +#: builtin/commit.c:1388 msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1383 +#: builtin/commit.c:1389 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1391 +#: builtin/commit.c:1400 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1392 +#: builtin/commit.c:1401 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1397 +#: builtin/commit.c:1406 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1400 +#: builtin/commit.c:1409 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1432 +#: builtin/commit.c:1441 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1470 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:1477 +#: builtin/commit.c:1486 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1484 +#: builtin/commit.c:1493 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1503 +#: builtin/commit.c:1512 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1517 +#: builtin/commit.c:1526 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1522 +#: builtin/commit.c:1531 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1537 builtin/merge.c:935 builtin/merge.c:960 +#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1558 +#: builtin/commit.c:1567 msgid "cannot lock HEAD ref" msgstr "" -#: builtin/commit.c:1562 +#: builtin/commit.c:1571 msgid "cannot update HEAD ref" msgstr "" -#: builtin/commit.c:1573 +#: 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" @@ -3600,120 +4011,124 @@ msgstr "" msgid "git config [options]" msgstr "" -#: builtin/config.c:52 +#: builtin/config.c:51 msgid "Config file location" msgstr "" -#: builtin/config.c:53 +#: builtin/config.c:52 msgid "use global config file" msgstr "" -#: builtin/config.c:54 +#: builtin/config.c:53 msgid "use system config file" msgstr "" -#: builtin/config.c:55 +#: builtin/config.c:54 msgid "use repository config file" msgstr "" -#: builtin/config.c:56 +#: builtin/config.c:55 msgid "use given config file" msgstr "" -#: builtin/config.c:57 +#: builtin/config.c:56 msgid "Action" msgstr "" -#: builtin/config.c:58 +#: builtin/config.c:57 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:59 +#: builtin/config.c:58 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:60 +#: builtin/config.c:59 msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/config.c:61 +#: builtin/config.c:60 msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/config.c:62 +#: builtin/config.c:61 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:63 +#: builtin/config.c:62 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:64 +#: builtin/config.c:63 msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/config.c:65 +#: builtin/config.c:64 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:66 +#: builtin/config.c:65 msgid "remove a section: name" msgstr "" -#: builtin/config.c:67 +#: builtin/config.c:66 msgid "list all" msgstr "" -#: builtin/config.c:68 +#: builtin/config.c:67 msgid "open an editor" msgstr "" -#: builtin/config.c:69 builtin/config.c:70 +#: builtin/config.c:68 builtin/config.c:69 msgid "slot" msgstr "" -#: builtin/config.c:69 +#: builtin/config.c:68 msgid "find the color configured: [default]" msgstr "" -#: builtin/config.c:70 +#: builtin/config.c:69 msgid "find the color setting: [stdout-is-tty]" msgstr "" -#: builtin/config.c:71 +#: builtin/config.c:70 msgid "Type" msgstr "" -#: builtin/config.c:72 +#: builtin/config.c:71 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:73 +#: builtin/config.c:72 msgid "value is decimal number" msgstr "" -#: builtin/config.c:74 +#: builtin/config.c:73 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:75 +#: builtin/config.c:74 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:76 +#: builtin/config.c:75 msgid "Other" msgstr "" -#: builtin/config.c:77 +#: builtin/config.c:76 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:78 +#: builtin/config.c:77 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 @@ -3724,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 "" @@ -3851,31 +4266,31 @@ msgstr "" msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:224 +#: builtin/diff.c:228 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:301 +#: builtin/diff.c:305 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:344 +#: builtin/diff.c:348 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:349 +#: builtin/diff.c:353 #, c-format msgid "more than %d trees given: '%s'" msgstr "" -#: builtin/diff.c:359 +#: builtin/diff.c:363 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:367 +#: builtin/diff.c:371 #, c-format msgid "unhandled object '%s' given." msgstr "" @@ -3884,39 +4299,39 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:635 +#: builtin/fast-export.c:658 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:637 +#: builtin/fast-export.c:660 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:640 +#: builtin/fast-export.c:663 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:643 +#: builtin/fast-export.c:666 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:645 +#: builtin/fast-export.c:668 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:647 +#: builtin/fast-export.c:670 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:649 +#: builtin/fast-export.c:672 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:651 +#: builtin/fast-export.c:674 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:652 +#: builtin/fast-export.c:675 msgid "Skip output of blob data" msgstr "" @@ -3988,166 +4403,178 @@ msgstr "" msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:85 builtin/log.c:1083 +#: builtin/fetch.c:86 +msgid "convert to a complete repository" +msgstr "" + +#: builtin/fetch.c:88 builtin/log.c:1130 msgid "dir" msgstr "" -#: builtin/fetch.c:86 +#: builtin/fetch.c:89 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:89 +#: builtin/fetch.c:92 msgid "default mode for recursion" msgstr "" -#: builtin/fetch.c:201 +#: builtin/fetch.c:204 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:254 +#: builtin/fetch.c:257 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:259 +#: builtin/fetch.c:262 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:273 +#: builtin/fetch.c:276 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:274 builtin/fetch.c:360 +#: builtin/fetch.c:277 builtin/fetch.c:363 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:285 +#: builtin/fetch.c:288 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 msgid " (unable to update local ref)" msgstr "" -#: builtin/fetch.c:305 +#: builtin/fetch.c:308 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:308 +#: builtin/fetch.c:311 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:311 +#: builtin/fetch.c:314 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "forced update" msgstr "" -#: builtin/fetch.c:362 +#: builtin/fetch.c:365 msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:393 builtin/fetch.c:685 +#: builtin/fetch.c:396 builtin/fetch.c:688 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: builtin/fetch.c:402 +#: builtin/fetch.c:405 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:488 +#: builtin/fetch.c:491 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:499 +#: builtin/fetch.c:502 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:549 +#: builtin/fetch.c:552 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:550 +#: builtin/fetch.c:553 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:557 +#: builtin/fetch.c:560 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:558 builtin/remote.c:1055 +#: builtin/fetch.c:561 builtin/remote.c:1055 msgid "(none)" msgstr "" -#: builtin/fetch.c:675 +#: builtin/fetch.c:678 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:709 +#: builtin/fetch.c:712 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:786 +#: builtin/fetch.c:789 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:789 +#: builtin/fetch.c:792 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:891 +#: builtin/fetch.c:894 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:893 builtin/remote.c:100 +#: builtin/fetch.c:896 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:912 +#: builtin/fetch.c:915 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:932 +#: builtin/fetch.c:935 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:984 +#: builtin/fetch.c:981 +msgid "--depth and --unshallow cannot be used together" +msgstr "" + +#: builtin/fetch.c:983 +msgid "--unshallow on a complete repository does not make sense" +msgstr "" + +#: builtin/fetch.c:1002 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:986 +#: builtin/fetch.c:1004 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1015 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1005 +#: builtin/fetch.c:1023 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -4155,29 +4582,29 @@ msgstr "" msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:787 -#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192 -#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235 +#: 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:654 +#: builtin/fmt-merge-msg.c:664 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:657 +#: builtin/fmt-merge-msg.c:667 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:660 +#: builtin/fmt-merge-msg.c:670 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:661 +#: builtin/fmt-merge-msg.c:671 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:662 +#: builtin/fmt-merge-msg.c:672 msgid "file to read from" msgstr "" @@ -4312,225 +4739,220 @@ msgstr "" msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/grep.c:455 +#: builtin/grep.c:365 #, c-format msgid "Failed to chdir: %s" msgstr "" -#: builtin/grep.c:531 builtin/grep.c:565 +#: builtin/grep.c:443 builtin/grep.c:478 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:579 +#: builtin/grep.c:493 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:637 +#: builtin/grep.c:551 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:654 +#: builtin/grep.c:568 #, c-format msgid "cannot open '%s'" msgstr "" -#: builtin/grep.c:729 +#: builtin/grep.c:643 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:731 +#: builtin/grep.c:645 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:733 +#: builtin/grep.c:647 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:735 +#: builtin/grep.c:649 msgid "search also in ignored files" msgstr "" -#: builtin/grep.c:738 +#: builtin/grep.c:652 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:740 +#: builtin/grep.c:654 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:742 +#: builtin/grep.c:656 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:744 +#: builtin/grep.c:658 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:746 +#: builtin/grep.c:660 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:749 +#: builtin/grep.c:663 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:753 +#: builtin/grep.c:667 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:756 +#: builtin/grep.c:670 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:759 +#: builtin/grep.c:673 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:762 +#: builtin/grep.c:676 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:765 +#: builtin/grep.c:679 msgid "show line numbers" msgstr "" -#: builtin/grep.c:766 +#: builtin/grep.c:680 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:767 +#: builtin/grep.c:681 msgid "show filenames" msgstr "" -#: builtin/grep.c:769 +#: builtin/grep.c:683 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:771 +#: builtin/grep.c:685 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:773 +#: builtin/grep.c:687 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:776 +#: builtin/grep.c:690 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:778 +#: builtin/grep.c:692 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:780 +#: builtin/grep.c:694 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:781 +#: builtin/grep.c:695 msgid "highlight matches" msgstr "" -#: builtin/grep.c:783 +#: builtin/grep.c:697 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:785 +#: builtin/grep.c:699 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:788 +#: builtin/grep.c:702 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:791 +#: builtin/grep.c:705 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:793 +#: builtin/grep.c:707 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:794 +#: builtin/grep.c:708 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:797 +#: builtin/grep.c:711 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:799 +#: builtin/grep.c:713 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:802 +#: builtin/grep.c:716 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:804 +#: builtin/grep.c:718 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:806 +#: builtin/grep.c:720 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:818 +#: builtin/grep.c:732 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:820 +#: builtin/grep.c:734 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:822 +#: builtin/grep.c:736 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:826 +#: builtin/grep.c:740 msgid "pager" msgstr "" -#: builtin/grep.c:826 +#: builtin/grep.c:740 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:829 +#: builtin/grep.c:743 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:830 builtin/show-ref.c:201 +#: builtin/grep.c:744 builtin/show-ref.c:184 msgid "show usage" msgstr "" -#: builtin/grep.c:921 +#: builtin/grep.c:811 msgid "no pattern given." msgstr "" -#: builtin/grep.c:935 -#, c-format -msgid "bad object %s" -msgstr "" - -#: builtin/grep.c:976 +#: builtin/grep.c:866 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:999 +#: builtin/grep.c:889 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:1004 +#: builtin/grep.c:894 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:1007 +#: builtin/grep.c:897 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:1015 +#: builtin/grep.c:905 msgid "both --cached and trees are given." msgstr "" @@ -4573,359 +4995,391 @@ msgid "print all available commands" msgstr "" #: builtin/help.c:44 -msgid "show man page" +msgid "print list of useful guides" msgstr "" #: builtin/help.c:45 +msgid "show man page" +msgstr "" + +#: builtin/help.c:46 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "show info page" msgstr "" -#: builtin/help.c:53 -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:65 +#: builtin/help.c:66 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:93 +#: builtin/help.c:94 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:106 +#: builtin/help.c:107 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:114 +#: builtin/help.c:115 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#: 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:217 +#: 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:229 +#: 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:299 -msgid "The most commonly used git commands are:" -msgstr "" - -#: builtin/help.c:367 +#: builtin/help.c:351 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:384 +#: builtin/help.c:368 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:392 +#: builtin/help.c:376 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:447 builtin/help.c:454 +#: 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:470 +#: 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 "" @@ -5047,8 +5501,8 @@ msgstr "" #: builtin/init-db.c:467 msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" -"[=<permissions>]] [directory]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" +"shared[=<permissions>]] [directory]" msgstr "" #: builtin/init-db.c:490 @@ -5089,337 +5543,340 @@ msgstr "" msgid "Cannot access work tree '%s'" msgstr "" -#: builtin/log.c:37 -msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" +#: builtin/log.c:40 +msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" msgstr "" -#: builtin/log.c:38 +#: builtin/log.c:41 msgid " or: git show [options] <object>..." msgstr "" -#: builtin/log.c:100 +#: builtin/log.c:103 msgid "suppress diff output" msgstr "" -#: builtin/log.c:101 +#: builtin/log.c:104 msgid "show source" msgstr "" -#: builtin/log.c:102 +#: builtin/log.c:105 +msgid "Use mail map file" +msgstr "" + +#: builtin/log.c:106 msgid "decorate options" msgstr "" -#: builtin/log.c:189 +#: builtin/log.c:199 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:403 builtin/log.c:494 +#: builtin/log.c:422 builtin/log.c:514 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:518 +#: builtin/log.c:538 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:608 +#: builtin/log.c:638 msgid "format.headers without value" msgstr "" -#: builtin/log.c:682 +#: builtin/log.c:720 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:693 +#: builtin/log.c:736 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:707 +#: builtin/log.c:750 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:715 +#: builtin/log.c:758 msgid "Not a range." msgstr "" -#: builtin/log.c:789 +#: builtin/log.c:860 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:862 +#: builtin/log.c:936 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:890 +#: builtin/log.c:964 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "" -#: builtin/log.c:935 +#: builtin/log.c:1009 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1063 +#: builtin/log.c:1108 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1066 +#: builtin/log.c:1111 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1070 +#: builtin/log.c:1115 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1072 +#: builtin/log.c:1117 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1074 +#: builtin/log.c:1119 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1075 +#: builtin/log.c:1120 msgid "sfx" msgstr "" -#: builtin/log.c:1076 +#: builtin/log.c:1121 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1078 +#: builtin/log.c:1123 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1080 +#: builtin/log.c:1125 +msgid "mark the series as Nth re-roll" +msgstr "" + +#: builtin/log.c:1127 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1083 +#: builtin/log.c:1130 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1086 +#: builtin/log.c:1133 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1089 +#: builtin/log.c:1136 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1091 +#: builtin/log.c:1138 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1093 +#: builtin/log.c:1140 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1095 +#: builtin/log.c:1142 msgid "Messaging" msgstr "" -#: builtin/log.c:1096 +#: builtin/log.c:1143 msgid "header" msgstr "" -#: builtin/log.c:1097 +#: builtin/log.c:1144 msgid "add email header" msgstr "" -#: builtin/log.c:1098 builtin/log.c:1100 +#: builtin/log.c:1145 builtin/log.c:1147 msgid "email" msgstr "" -#: builtin/log.c:1098 +#: builtin/log.c:1145 msgid "add To: header" msgstr "" -#: builtin/log.c:1100 +#: builtin/log.c:1147 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1102 +#: builtin/log.c:1149 msgid "message-id" msgstr "" -#: builtin/log.c:1103 +#: builtin/log.c:1150 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1104 builtin/log.c:1107 +#: builtin/log.c:1151 builtin/log.c:1154 msgid "boundary" msgstr "" -#: builtin/log.c:1105 +#: builtin/log.c:1152 msgid "attach the patch" msgstr "" -#: builtin/log.c:1108 +#: builtin/log.c:1155 msgid "inline the patch" msgstr "" -#: builtin/log.c:1112 +#: builtin/log.c:1159 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1114 +#: builtin/log.c:1161 msgid "signature" msgstr "" -#: builtin/log.c:1115 +#: builtin/log.c:1162 msgid "add a signature" msgstr "" -#: builtin/log.c:1117 +#: builtin/log.c:1164 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1157 -#, c-format -msgid "bogus committer info %s" -msgstr "" - -#: builtin/log.c:1202 +#: builtin/log.c:1248 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1204 +#: builtin/log.c:1250 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1212 +#: builtin/log.c:1258 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1214 +#: builtin/log.c:1260 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1216 +#: builtin/log.c:1262 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1239 +#: builtin/log.c:1285 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1241 +#: builtin/log.c:1287 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1394 +#: builtin/log.c:1435 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1443 +#: builtin/log.c:1484 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1498 +#: builtin/log.c:1539 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 +#: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566 #, c-format msgid "Unknown commit %s" msgstr "" -#: builtin/ls-files.c:408 +#: builtin/ls-files.c:402 msgid "git ls-files [options] [<file>...]" msgstr "" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:459 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:461 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:467 +#: builtin/ls-files.c:463 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:465 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:467 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:469 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:471 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:478 +#: builtin/ls-files.c:474 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:476 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:482 +#: builtin/ls-files.c:478 msgid "show 'other' directories' name only" msgstr "" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:481 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:488 +#: builtin/ls-files.c:484 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:486 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:492 +#: builtin/ls-files.c:488 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:491 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:494 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:500 +#: builtin/ls-files.c:496 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:499 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:506 +#: builtin/ls-files.c:502 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:507 +#: builtin/ls-files.c:503 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:508 +#: builtin/ls-files.c:504 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:510 +#: builtin/ls-files.c:506 msgid "show debugging data" msgstr "" @@ -5526,254 +5983,276 @@ msgstr "" msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:202 builtin/notes.c:870 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:678 -msgid "failed to read the cache" -msgstr "" - -#: builtin/merge.c:709 +#: builtin/merge.c:671 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:723 +#: builtin/merge.c:685 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:737 +#: builtin/merge.c:699 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:876 +#: builtin/merge.c:788 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:885 +#: builtin/merge.c:797 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:891 +#: builtin/merge.c:803 +#, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" -"Lines starting with '#' will be ignored, and an empty message aborts\n" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -#: builtin/merge.c:915 +#: builtin/merge.c:827 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:927 +#: builtin/merge.c:839 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:992 +#: builtin/merge.c:904 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:1008 +#: builtin/merge.c:920 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:1049 +#: builtin/merge.c:961 msgid "No current branch." msgstr "" -#: builtin/merge.c:1051 +#: builtin/merge.c:963 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:1053 +#: builtin/merge.c:965 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:1058 +#: builtin/merge.c:970 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1145 builtin/merge.c:1302 +#: builtin/merge.c:1057 builtin/merge.c:1214 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1213 +#: builtin/merge.c:1125 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1229 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:1232 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:1236 +#: 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:1239 +#: builtin/merge.c:1151 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1248 +#: builtin/merge.c:1160 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1253 +#: builtin/merge.c:1165 msgid "You cannot combine --no-ff with --ff-only." msgstr "" -#: builtin/merge.c:1260 +#: builtin/merge.c:1172 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1292 +#: builtin/merge.c:1204 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1295 +#: builtin/merge.c:1207 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1297 +#: builtin/merge.c:1209 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1412 +#: 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:1450 +#: builtin/merge.c:1397 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1457 +#: builtin/merge.c:1404 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1489 +#: builtin/merge.c:1436 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1512 builtin/merge.c:1591 +#: builtin/merge.c:1459 builtin/merge.c:1538 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1516 +#: builtin/merge.c:1463 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1582 +#: builtin/merge.c:1529 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1584 +#: builtin/merge.c:1531 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1593 +#: builtin/merge.c:1540 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1605 +#: builtin/merge.c:1552 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -6079,233 +6558,228 @@ msgstr "" msgid "git notes get-ref" msgstr "" -#: builtin/notes.c:142 +#: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" -#: builtin/notes.c:148 -msgid "can't fdopen 'show' output fd" -msgstr "" - -#: builtin/notes.c:158 -#, c-format -msgid "failed to close pipe to 'show' for object '%s'" +#: builtin/notes.c:143 +msgid "could not read 'show' output" msgstr "" -#: builtin/notes.c:161 +#: builtin/notes.c:151 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:178 builtin/tag.c:347 +#: builtin/notes.c:169 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" msgstr "" -#: builtin/notes.c:192 +#: builtin/notes.c:188 msgid "Please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:213 builtin/notes.c:976 +#: builtin/notes.c:209 builtin/notes.c:972 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:218 +#: builtin/notes.c:214 msgid "unable to write note object" msgstr "" -#: builtin/notes.c:220 +#: builtin/notes.c:216 #, c-format msgid "The note contents has been left in %s" msgstr "" -#: builtin/notes.c:254 builtin/tag.c:542 +#: builtin/notes.c:250 builtin/tag.c:540 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:256 builtin/tag.c:545 +#: builtin/notes.c:252 builtin/tag.c:543 #, c-format msgid "could not open or read '%s'" msgstr "" -#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450 -#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647 -#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769 -#: builtin/notes.c:971 builtin/reset.c:293 builtin/tag.c:558 +#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 +#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 +#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 +#: builtin/notes.c:967 builtin/tag.c:556 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:278 +#: builtin/notes.c:274 #, c-format msgid "Failed to read object '%s'." msgstr "" -#: builtin/notes.c:302 +#: builtin/notes.c:298 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -#: builtin/notes.c:343 +#: builtin/notes.c:339 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" -#: builtin/notes.c:353 +#: builtin/notes.c:349 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: builtin/notes.c:380 +#: builtin/notes.c:376 #, c-format msgid "Bad %s value: '%s'" msgstr "" -#: builtin/notes.c:444 +#: builtin/notes.c:440 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/notes.c:459 +#: builtin/notes.c:455 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630 -#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762 -#: builtin/notes.c:1036 +#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 +#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 +#: builtin/notes.c:1032 msgid "too many parameters" msgstr "" -#: builtin/notes.c:516 builtin/notes.c:775 +#: builtin/notes.c:512 builtin/notes.c:771 #, c-format msgid "No note found for object %s." msgstr "" -#: builtin/notes.c:538 builtin/notes.c:695 +#: builtin/notes.c:534 builtin/notes.c:691 msgid "note contents as a string" msgstr "" -#: builtin/notes.c:541 builtin/notes.c:698 +#: builtin/notes.c:537 builtin/notes.c:694 msgid "note contents in a file" msgstr "" -#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700 -#: builtin/notes.c:703 builtin/tag.c:476 +#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 +#: builtin/notes.c:699 builtin/tag.c:474 msgid "object" msgstr "" -#: builtin/notes.c:544 builtin/notes.c:701 +#: builtin/notes.c:540 builtin/notes.c:697 msgid "reuse and edit specified note object" msgstr "" -#: builtin/notes.c:547 builtin/notes.c:704 +#: builtin/notes.c:543 builtin/notes.c:700 msgid "reuse specified note object" msgstr "" -#: builtin/notes.c:549 builtin/notes.c:617 +#: builtin/notes.c:545 builtin/notes.c:613 msgid "replace existing notes" msgstr "" -#: builtin/notes.c:583 +#: builtin/notes.c:579 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:588 builtin/notes.c:665 +#: builtin/notes.c:584 builtin/notes.c:661 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:618 +#: builtin/notes.c:614 msgid "read objects from stdin" msgstr "" -#: builtin/notes.c:620 +#: builtin/notes.c:616 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" -#: builtin/notes.c:638 +#: builtin/notes.c:634 msgid "too few parameters" msgstr "" -#: builtin/notes.c:659 +#: builtin/notes.c:655 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:671 +#: builtin/notes.c:667 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:720 +#: builtin/notes.c:716 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" -#: builtin/notes.c:867 +#: builtin/notes.c:863 msgid "General options" msgstr "" -#: builtin/notes.c:869 +#: builtin/notes.c:865 msgid "Merge options" msgstr "" -#: builtin/notes.c:871 +#: builtin/notes.c:867 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -#: builtin/notes.c:873 +#: builtin/notes.c:869 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:875 +#: builtin/notes.c:871 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:877 +#: builtin/notes.c:873 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:879 +#: builtin/notes.c:875 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:974 +#: builtin/notes.c:970 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:986 +#: builtin/notes.c:982 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:989 +#: builtin/notes.c:985 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:1070 +#: builtin/notes.c:1066 msgid "notes_ref" msgstr "" -#: builtin/notes.c:1071 +#: builtin/notes.c:1067 msgid "use notes from <notes_ref>" msgstr "" -#: builtin/notes.c:1106 builtin/remote.c:1598 +#: builtin/notes.c:1102 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "" @@ -6323,143 +6797,143 @@ msgstr "" msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:2398 +#: builtin/pack-objects.c:2397 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2402 +#: builtin/pack-objects.c:2401 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2425 +#: builtin/pack-objects.c:2424 #, c-format msgid "option %s does not accept negative form" msgstr "" -#: builtin/pack-objects.c:2429 +#: builtin/pack-objects.c:2428 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "" -#: builtin/pack-objects.c:2448 +#: builtin/pack-objects.c:2447 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2450 +#: builtin/pack-objects.c:2449 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2452 +#: builtin/pack-objects.c:2451 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2455 +#: builtin/pack-objects.c:2454 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2455 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2457 +#: builtin/pack-objects.c:2456 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2460 +#: builtin/pack-objects.c:2459 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2462 +#: builtin/pack-objects.c:2461 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2464 +#: builtin/pack-objects.c:2463 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2466 +#: builtin/pack-objects.c:2465 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2468 +#: builtin/pack-objects.c:2467 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2470 +#: builtin/pack-objects.c:2469 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2472 +#: builtin/pack-objects.c:2471 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2474 +#: builtin/pack-objects.c:2473 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2476 +#: builtin/pack-objects.c:2475 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2478 +#: builtin/pack-objects.c:2477 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2480 +#: builtin/pack-objects.c:2479 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2482 +#: builtin/pack-objects.c:2481 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2484 +#: builtin/pack-objects.c:2483 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2487 +#: builtin/pack-objects.c:2486 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2490 +#: builtin/pack-objects.c:2489 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2493 +#: builtin/pack-objects.c:2492 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2495 +#: builtin/pack-objects.c:2494 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2497 +#: builtin/pack-objects.c:2496 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2498 parse-options.h:141 +#: builtin/pack-objects.c:2497 parse-options.h:141 msgid "time" msgstr "" -#: builtin/pack-objects.c:2499 +#: builtin/pack-objects.c:2498 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2502 +#: builtin/pack-objects.c:2501 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2504 +#: builtin/pack-objects.c:2503 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2506 +#: builtin/pack-objects.c:2505 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2508 +#: builtin/pack-objects.c:2507 msgid "do not hide commits by grafts" msgstr "" @@ -6607,22 +7081,42 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:258 +#: builtin/push.c:224 +msgid "" +"Updates were rejected because the remote contains work that you do\n" +"not have locally. This is usually caused by another repository pushing\n" +"to the same ref. You may want to first merge the remote changes (e.g.,\n" +"'git pull') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" + +#: builtin/push.c:231 +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "" + +#: builtin/push.c:234 +msgid "" +"You cannot update a remote ref that points at a non-commit object,\n" +"or update a remote ref to make it point at a non-commit object,\n" +"without using the '--force' option.\n" +msgstr "" + +#: builtin/push.c:294 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:262 +#: builtin/push.c:298 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:294 +#: builtin/push.c:331 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:295 +#: builtin/push.c:332 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -6635,79 +7129,87 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:310 +#: builtin/push.c:347 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:311 +#: builtin/push.c:348 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:316 +#: builtin/push.c:353 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:317 +#: builtin/push.c:354 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:322 +#: builtin/push.c:359 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:382 +#: builtin/push.c:419 msgid "repository" msgstr "" -#: builtin/push.c:383 +#: builtin/push.c:420 msgid "push all refs" msgstr "" -#: builtin/push.c:384 +#: builtin/push.c:421 msgid "mirror all refs" msgstr "" -#: builtin/push.c:386 +#: builtin/push.c:423 msgid "delete refs" msgstr "" -#: builtin/push.c:387 +#: builtin/push.c:424 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:390 +#: builtin/push.c:427 msgid "force updates" msgstr "" -#: builtin/push.c:391 +#: builtin/push.c:428 msgid "check" msgstr "" -#: builtin/push.c:392 +#: builtin/push.c:429 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:394 +#: builtin/push.c:431 msgid "use thin pack" msgstr "" -#: builtin/push.c:395 builtin/push.c:396 +#: builtin/push.c:432 builtin/push.c:433 msgid "receive pack program" msgstr "" -#: builtin/push.c:397 +#: builtin/push.c:434 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:400 +#: builtin/push.c:437 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:410 +#: builtin/push.c:439 +msgid "bypass pre-push hook" +msgstr "" + +#: 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:412 +#: builtin/push.c:452 msgid "--delete doesn't make sense without any refs" msgstr "" @@ -6800,7 +7302,7 @@ msgstr "" msgid "git remote remove <name>" msgstr "" -#: builtin/remote.c:15 +#: builtin/remote.c:15 builtin/remote.c:42 msgid "git remote set-head <name> (-a | -d | <branch>)" msgstr "" @@ -6837,10 +7339,6 @@ msgstr "" msgid "git remote add [<options>] <name> <url>" msgstr "" -#: builtin/remote.c:42 -msgid "git remote set-head <name> (-a | -d | <branch>])" -msgstr "" - #: builtin/remote.c:47 msgid "git remote set-branches <name> <branch>..." msgstr "" @@ -7280,15 +7778,15 @@ msgstr "" msgid "git replace -l [<pattern>]" msgstr "" -#: builtin/replace.c:118 +#: builtin/replace.c:121 msgid "list replace refs" msgstr "" -#: builtin/replace.c:119 +#: builtin/replace.c:122 msgid "delete replace refs" msgstr "" -#: builtin/replace.c:120 +#: builtin/replace.c:123 msgid "replace the ref if it exists" msgstr "" @@ -7306,11 +7804,11 @@ msgid "" msgstr "" #: builtin/reset.c:26 -msgid "git reset [-q] <commit> [--] <paths>..." +msgid "git reset [-q] <tree-ish> [--] <paths>..." msgstr "" #: builtin/reset.c:27 -msgid "git reset --patch [<commit>] [--] [<paths>...]" +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "" #: builtin/reset.c:33 @@ -7333,89 +7831,95 @@ msgstr "" msgid "keep" msgstr "" -#: builtin/reset.c:77 +#: builtin/reset.c:73 msgid "You do not have a valid HEAD." msgstr "" -#: builtin/reset.c:79 +#: builtin/reset.c:75 msgid "Failed to find tree of HEAD." msgstr "" -#: builtin/reset.c:85 +#: builtin/reset.c:81 #, c-format msgid "Failed to find tree of %s." msgstr "" -#: builtin/reset.c:96 -msgid "Could not write new index file." -msgstr "" - -#: builtin/reset.c:106 +#: builtin/reset.c:98 #, c-format msgid "HEAD is now at %s" msgstr "" -#: builtin/reset.c:130 -msgid "Could not read index" -msgstr "" - -#: builtin/reset.c:133 -msgid "Unstaged changes after reset:" -msgstr "" - -#: builtin/reset.c:223 +#: builtin/reset.c:169 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:238 +#: builtin/reset.c:248 msgid "be quiet, only report errors" msgstr "" -#: builtin/reset.c:240 +#: builtin/reset.c:250 msgid "reset HEAD and index" msgstr "" -#: builtin/reset.c:241 +#: builtin/reset.c:251 msgid "reset only HEAD" msgstr "" -#: builtin/reset.c:243 builtin/reset.c:245 +#: builtin/reset.c:253 builtin/reset.c:255 msgid "reset HEAD, index and working tree" msgstr "" -#: builtin/reset.c:247 +#: builtin/reset.c:257 msgid "reset HEAD but keep local changes" msgstr "" -#: builtin/reset.c:303 +#: builtin/reset.c:275 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "" + +#: builtin/reset.c:278 builtin/reset.c:286 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/reset.c:308 +#: builtin/reset.c:283 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "" + +#: builtin/reset.c:292 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:317 +#: builtin/reset.c:301 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:319 +#: builtin/reset.c:303 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:331 +#: builtin/reset.c:313 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" -#: builtin/reset.c:347 +#: builtin/reset.c:333 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "" +#: builtin/reset.c:339 +msgid "Unstaged changes after reset:" +msgstr "" + +#: builtin/reset.c:344 +msgid "Could not write new index file." +msgstr "" + #: builtin/rev-parse.c:339 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "" @@ -7438,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 @@ -7446,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 @@ -7526,87 +8030,94 @@ msgstr "" msgid "cherry-pick failed" msgstr "" -#: builtin/rm.c:14 +#: builtin/rm.c:15 msgid "git rm [options] [--] <file>..." msgstr "" -#: builtin/rm.c:109 +#: builtin/rm.c:64 builtin/rm.c:186 +#, c-format +msgid "" +"submodule '%s' (or one of its nested submodules) uses a .git directory\n" +"(use 'rm -rf' if you really want to remove it including all of its history)" +msgstr "" + +#: builtin/rm.c:174 #, c-format msgid "" "'%s' has staged content different from both the file and the HEAD\n" "(use -f to force removal)" msgstr "" -#: builtin/rm.c:115 +#: builtin/rm.c:180 #, c-format msgid "" "'%s' has changes staged in the index\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -#: builtin/rm.c:119 +#: builtin/rm.c:191 #, c-format msgid "" "'%s' has local modifications\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -#: builtin/rm.c:134 +#: builtin/rm.c:207 msgid "do not list removed files" msgstr "" -#: builtin/rm.c:135 +#: builtin/rm.c:208 msgid "only remove from the index" msgstr "" -#: builtin/rm.c:136 +#: builtin/rm.c:209 msgid "override the up-to-date check" msgstr "" -#: builtin/rm.c:137 +#: builtin/rm.c:210 msgid "allow recursive removal" msgstr "" -#: builtin/rm.c:139 +#: builtin/rm.c:212 msgid "exit with a zero status even if nothing matched" msgstr "" -#: builtin/rm.c:194 +#: builtin/rm.c:283 #, c-format msgid "not removing '%s' recursively without -r" msgstr "" -#: builtin/rm.c:230 +#: builtin/rm.c:322 #, c-format 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:157 +#: builtin/shortlog.c:131 #, c-format msgid "Missing author: %s" msgstr "" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:227 msgid "sort output according to the number of commits per author" msgstr "" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:229 msgid "Suppress commit descriptions, only provides commit count" msgstr "" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:231 msgid "Show the email address of each author" msgstr "" -#: builtin/shortlog.c:258 +#: builtin/shortlog.c:232 msgid "w[,i1[,i2]]" msgstr "" -#: builtin/shortlog.c:259 +#: builtin/shortlog.c:233 msgid "Linewrap output" msgstr "" @@ -7622,109 +8133,109 @@ 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 "" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" -"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " msgstr "" #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" msgstr "" -#: builtin/show-ref.c:182 +#: builtin/show-ref.c:165 msgid "only show tags (can be combined with heads)" msgstr "" -#: builtin/show-ref.c:183 +#: builtin/show-ref.c:166 msgid "only show heads (can be combined with tags)" msgstr "" -#: builtin/show-ref.c:184 +#: builtin/show-ref.c:167 msgid "stricter reference checking, requires exact ref path" msgstr "" -#: builtin/show-ref.c:187 builtin/show-ref.c:189 +#: builtin/show-ref.c:170 builtin/show-ref.c:172 msgid "show the HEAD reference" msgstr "" -#: builtin/show-ref.c:191 +#: builtin/show-ref.c:174 msgid "dereference tags into object IDs" msgstr "" -#: builtin/show-ref.c:193 +#: builtin/show-ref.c:176 msgid "only show SHA1 hash using <n> digits" msgstr "" -#: builtin/show-ref.c:197 +#: builtin/show-ref.c:180 msgid "do not print results to stdout (useful with --verify)" msgstr "" -#: builtin/show-ref.c:199 +#: builtin/show-ref.c:182 msgid "show refs from stdin that aren't in local repository" msgstr "" @@ -7732,19 +8243,27 @@ msgstr "" msgid "git symbolic-ref [options] name [ref]" msgstr "" -#: builtin/symbolic-ref.c:38 +#: builtin/symbolic-ref.c:8 +msgid "git symbolic-ref -d [-q] name" +msgstr "" + +#: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" msgstr "" -#: builtin/symbolic-ref.c:39 +#: builtin/symbolic-ref.c:41 +msgid "delete symbolic ref" +msgstr "" + +#: builtin/symbolic-ref.c:42 msgid "shorten ref output" msgstr "" -#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 msgid "reason" msgstr "" -#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 msgid "reason of the update" msgstr "" @@ -7793,159 +8312,157 @@ msgid "could not verify the tag '%s'" msgstr "" #: builtin/tag.c:249 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be ignored.\n" -"#\n" +"Write a tag message\n" +"Lines starting with '%c' will be ignored.\n" msgstr "" -#: builtin/tag.c:256 +#: builtin/tag.c:253 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be kept; you may remove them yourself if you " +"Write a tag message\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you " "want to.\n" -"#\n" msgstr "" -#: builtin/tag.c:298 +#: builtin/tag.c:292 msgid "unable to sign the tag" msgstr "" -#: builtin/tag.c:300 +#: builtin/tag.c:294 msgid "unable to write tag file" msgstr "" -#: builtin/tag.c:325 +#: builtin/tag.c:319 msgid "bad object type." msgstr "" -#: builtin/tag.c:338 +#: builtin/tag.c:332 msgid "tag header too big." msgstr "" -#: builtin/tag.c:370 +#: builtin/tag.c:368 msgid "no tag message?" msgstr "" -#: builtin/tag.c:376 +#: builtin/tag.c:374 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:425 +#: builtin/tag.c:423 msgid "switch 'points-at' requires an object" msgstr "" -#: builtin/tag.c:427 +#: builtin/tag.c:425 #, c-format msgid "malformed object name '%s'" msgstr "" -#: builtin/tag.c:447 +#: builtin/tag.c:445 msgid "list tag names" msgstr "" -#: builtin/tag.c:449 +#: builtin/tag.c:447 msgid "print <n> lines of each tag message" msgstr "" -#: builtin/tag.c:451 +#: builtin/tag.c:449 msgid "delete tags" msgstr "" -#: builtin/tag.c:452 +#: builtin/tag.c:450 msgid "verify tags" msgstr "" -#: builtin/tag.c:454 +#: builtin/tag.c:452 msgid "Tag creation options" msgstr "" -#: builtin/tag.c:456 +#: builtin/tag.c:454 msgid "annotated tag, needs a message" msgstr "" -#: builtin/tag.c:458 +#: builtin/tag.c:456 msgid "tag message" msgstr "" -#: builtin/tag.c:460 +#: builtin/tag.c:458 msgid "annotated and GPG-signed tag" msgstr "" -#: builtin/tag.c:464 +#: builtin/tag.c:462 msgid "use another key to sign the tag" msgstr "" -#: builtin/tag.c:465 +#: builtin/tag.c:463 msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:466 +#: builtin/tag.c:464 msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:468 +#: builtin/tag.c:466 msgid "Tag listing options" msgstr "" -#: builtin/tag.c:471 +#: builtin/tag.c:469 msgid "print only tags that contain the commit" msgstr "" -#: builtin/tag.c:477 +#: builtin/tag.c:475 msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:506 +#: builtin/tag.c:504 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:523 +#: builtin/tag.c:521 msgid "-n option is only allowed with -l." msgstr "" -#: builtin/tag.c:525 +#: builtin/tag.c:523 msgid "--contains option is only allowed with -l." msgstr "" -#: builtin/tag.c:527 +#: builtin/tag.c:525 msgid "--points-at option is only allowed with -l." msgstr "" -#: builtin/tag.c:535 +#: builtin/tag.c:533 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:555 +#: builtin/tag.c:553 msgid "too many params" msgstr "" -#: builtin/tag.c:561 +#: builtin/tag.c:559 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:566 +#: builtin/tag.c:564 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:584 +#: builtin/tag.c:582 #, c-format msgid "%s: cannot lock the ref" msgstr "" -#: builtin/tag.c:586 +#: builtin/tag.c:584 #, c-format msgid "%s: cannot update the ref" msgstr "" -#: builtin/tag.c:588 +#: builtin/tag.c:586 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" @@ -7954,111 +8471,111 @@ msgstr "" msgid "git update-index [options] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:717 +#: builtin/update-index.c:718 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:720 +#: builtin/update-index.c:721 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:723 +#: builtin/update-index.c:724 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:725 +#: builtin/update-index.c:726 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:727 +#: builtin/update-index.c:728 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:729 +#: builtin/update-index.c:730 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:732 +#: builtin/update-index.c:733 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:736 +#: builtin/update-index.c:737 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:740 +#: builtin/update-index.c:741 msgid "<mode> <object> <path>" msgstr "" -#: builtin/update-index.c:741 +#: builtin/update-index.c:742 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:745 +#: builtin/update-index.c:746 msgid "(+/-)x" msgstr "" -#: builtin/update-index.c:746 +#: builtin/update-index.c:747 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/update-index.c:750 +#: builtin/update-index.c:751 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:753 +#: builtin/update-index.c:754 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:756 +#: builtin/update-index.c:757 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:759 +#: builtin/update-index.c:760 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:762 +#: builtin/update-index.c:763 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:764 +#: builtin/update-index.c:765 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:766 +#: builtin/update-index.c:767 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:768 +#: builtin/update-index.c:769 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:772 +#: builtin/update-index.c:773 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:776 +#: builtin/update-index.c:777 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:780 +#: builtin/update-index.c:781 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:787 +#: builtin/update-index.c:788 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:789 +#: builtin/update-index.c:790 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:793 +#: builtin/update-index.c:794 msgid "write index in this format" msgstr "" @@ -8123,22 +8640,25 @@ 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 msgid "no-op (backward compatibility)" msgstr "" -#: parse-options.h:228 +#: parse-options.h:232 msgid "be more verbose" msgstr "" -#: parse-options.h:230 +#: parse-options.h:234 msgid "be more quiet" msgstr "" -#: parse-options.h:236 +#: parse-options.h:240 msgid "use <n> digits to display SHA-1s" msgstr "" @@ -8179,7 +8699,7 @@ msgid "Print lines matching a pattern" msgstr "" #: common-cmds.h:17 -msgid "Create an empty git repository or reinitialize an existing one" +msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" #: common-cmds.h:18 @@ -8460,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 "" @@ -8527,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 "" @@ -8535,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:228 +#: git-pull.sh:235 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -8543,11 +9063,11 @@ msgid "" "Warning: commit $orig_head." msgstr "" -#: git-pull.sh:253 +#: git-pull.sh:260 msgid "Cannot merge multiple branches into empty head" msgstr "" -#: git-pull.sh:257 +#: git-pull.sh:264 msgid "Cannot rebase onto multiple branches" msgstr "" @@ -8788,37 +9308,37 @@ msgstr "" msgid "(To restore them type \"git stash apply\")" msgstr "" -#: git-submodule.sh:88 +#: git-submodule.sh:91 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "" -#: git-submodule.sh:167 +#: git-submodule.sh:196 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "" -#: git-submodule.sh:211 +#: git-submodule.sh:239 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "" -#: git-submodule.sh:223 +#: git-submodule.sh:251 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "" -#: git-submodule.sh:312 +#: git-submodule.sh:349 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:329 +#: git-submodule.sh:366 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:333 +#: git-submodule.sh:370 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -8826,151 +9346,233 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:344 +#: git-submodule.sh:388 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:346 +#: git-submodule.sh:390 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:360 +#: git-submodule.sh:398 +#, sh-format +msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgstr "" + +#: 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:402 +#, sh-format +msgid "" +"use the '--force' option. If the local git directory is not the correct repo" +msgstr "" + +#: 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:405 +#, sh-format +msgid "Reactivating local git directory for submodule '$sm_name'." +msgstr "" + +#: git-submodule.sh:417 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:365 +#: git-submodule.sh:422 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:370 +#: git-submodule.sh:431 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:413 +#: git-submodule.sh:474 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:427 +#: git-submodule.sh:488 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "" -#: git-submodule.sh:471 +#: git-submodule.sh:532 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "" -#: git-submodule.sh:480 +#: git-submodule.sh:541 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:482 +#: git-submodule.sh:543 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "" -#: git-submodule.sh:490 +#: git-submodule.sh:551 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:590 +#: 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:603 +#: 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:622 +#: git-submodule.sh:753 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:636 +#: 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:637 +#: 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:642 +#: 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:643 +#: 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:648 +#: 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:649 +#: 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:671 git-submodule.sh:995 +#: 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:779 +#: git-submodule.sh:939 msgid "The --cached option cannot be used with the --files option" msgstr "" #. unexpected type -#: git-submodule.sh:819 +#: git-submodule.sh:979 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:837 +#: git-submodule.sh:997 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:840 +#: git-submodule.sh:1000 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:843 +#: git-submodule.sh:1003 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:868 +#: git-submodule.sh:1028 msgid "blob" msgstr "" -#: git-submodule.sh:906 -msgid "# Submodules changed but not updated:" +#: git-submodule.sh:1066 +msgid "Submodules changed but not updated:" +msgstr "" + +#: git-submodule.sh:1068 +msgid "Submodule changes to be committed:" msgstr "" -#: git-submodule.sh:908 -msgid "# Submodule changes to be committed:" +#: git-submodule.sh:1153 +#, sh-format +msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:1054 +#: git-submodule.sh:1216 #, sh-format -msgid "Synchronizing submodule url for '$name'" +msgid "Synchronizing submodule url for '$prefix$sm_path'" msgstr "" |