diff options
Diffstat (limited to 'po/git.pot')
| -rw-r--r-- | po/git.pot | 4430 |
1 files changed, 2672 insertions, 1758 deletions
diff --git a/po/git.pot b/po/git.pot index a826dcbf9f..58af01a219 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2013-03-05 12:36+0800\n" +"POT-Creation-Date: 2013-11-02 08:06+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: advice.c:49 +#: advice.c:57 #, c-format msgid "hint: %.*s\n" msgstr "" @@ -27,7 +27,7 @@ msgstr "" #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. -#: advice.c:79 +#: advice.c:87 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -52,71 +52,76 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:323 +#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "" + +#: archive.c:327 msgid "fmt" msgstr "" -#: archive.c:323 +#: archive.c:327 msgid "archive format" msgstr "" -#: archive.c:324 builtin/log.c:1115 +#: archive.c:328 builtin/log.c:1193 msgid "prefix" msgstr "" -#: archive.c:325 +#: archive.c:329 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366 -#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653 -#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77 -#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536 -#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 +#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264 +#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680 +#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77 +#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408 +#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154 msgid "file" msgstr "" -#: archive.c:327 builtin/archive.c:92 +#: archive.c:331 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" -#: archive.c:329 +#: archive.c:333 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:330 +#: archive.c:334 msgid "report archived files on stderr" msgstr "" -#: archive.c:331 +#: archive.c:335 msgid "store only" msgstr "" -#: archive.c:332 +#: archive.c:336 msgid "compress faster" msgstr "" -#: archive.c:340 +#: archive.c:344 msgid "compress better" msgstr "" -#: archive.c:343 +#: archive.c:347 msgid "list supported archive formats" msgstr "" -#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85 +#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84 msgid "repo" msgstr "" -#: archive.c:346 builtin/archive.c:94 +#: archive.c:350 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615 +#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487 msgid "command" msgstr "" -#: archive.c:348 builtin/archive.c:96 +#: archive.c:352 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" @@ -126,6 +131,120 @@ msgid "" "Use '\\!' for literal leading exclamation." msgstr "" +#: branch.c:60 +#, c-format +msgid "Not setting branch %s as its own upstream." +msgstr "" + +#: branch.c:82 +#, c-format +msgid "Branch %s set up to track remote branch %s from %s by rebasing." +msgstr "" + +#: branch.c:83 +#, c-format +msgid "Branch %s set up to track remote branch %s from %s." +msgstr "" + +#: branch.c:87 +#, c-format +msgid "Branch %s set up to track local branch %s by rebasing." +msgstr "" + +#: branch.c:88 +#, c-format +msgid "Branch %s set up to track local branch %s." +msgstr "" + +#: branch.c:92 +#, c-format +msgid "Branch %s set up to track remote ref %s by rebasing." +msgstr "" + +#: branch.c:93 +#, c-format +msgid "Branch %s set up to track remote ref %s." +msgstr "" + +#: branch.c:97 +#, c-format +msgid "Branch %s set up to track local ref %s by rebasing." +msgstr "" + +#: branch.c:98 +#, c-format +msgid "Branch %s set up to track local ref %s." +msgstr "" + +#: branch.c:118 +#, c-format +msgid "Tracking not set up: name too long: %s" +msgstr "" + +#: branch.c:137 +#, c-format +msgid "Not tracking: ambiguous information for ref %s" +msgstr "" + +#: branch.c:182 +#, c-format +msgid "'%s' is not a valid branch name." +msgstr "" + +#: branch.c:187 +#, c-format +msgid "A branch named '%s' already exists." +msgstr "" + +#: branch.c:195 +msgid "Cannot force update the current branch." +msgstr "" + +#: branch.c:215 +#, c-format +msgid "Cannot setup tracking information; starting point '%s' is not a branch." +msgstr "" + +#: branch.c:217 +#, c-format +msgid "the requested upstream branch '%s' does not exist" +msgstr "" + +#: branch.c:219 +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:264 +#, c-format +msgid "Not a valid object name: '%s'." +msgstr "" + +#: branch.c:284 +#, c-format +msgid "Ambiguous object name: '%s'." +msgstr "" + +#: branch.c:289 +#, c-format +msgid "Not a valid branch point: '%s'." +msgstr "" + +#: branch.c:295 +msgid "Failed to lock ref for update" +msgstr "" + +#: branch.c:313 +msgid "Failed to write ref" +msgstr "" + #: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -136,7 +255,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:89 builtin/commit.c:674 +#: bundle.c:89 builtin/commit.c:706 #, c-format msgid "could not open '%s'" msgstr "" @@ -145,27 +264,27 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299 -#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347 -#: builtin/shortlog.c:157 +#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 +#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364 +#: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "" #: bundle.c:186 #, c-format -msgid "The bundle contains %d ref" -msgid_plural "The bundle contains %d refs" +msgid "The bundle contains this ref:" +msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:192 +#: bundle.c:193 msgid "The bundle records a complete history." msgstr "" #: bundle.c:195 #, c-format -msgid "The bundle requires this ref" -msgid_plural "The bundle requires these %d refs" +msgid "The bundle requires this ref:" +msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" @@ -173,7 +292,7 @@ msgstr[1] "" msgid "rev-list died" msgstr "" -#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260 +#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -204,12 +323,12 @@ msgstr "" msgid "index-pack died" msgstr "" -#: commit.c:50 +#: commit.c:53 #, c-format msgid "could not parse %s" msgstr "" -#: commit.c:52 +#: commit.c:55 #, c-format msgid "%s %s is not a commit!" msgstr "" @@ -218,16 +337,16 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: connected.c:39 +#: connected.c:60 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:48 +#: connected.c:80 #, c-format msgid "failed write to rev-list: %s" msgstr "" -#: connected.c:56 +#: connected.c:88 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "" @@ -321,19 +440,19 @@ msgid "" "%s" msgstr "" -#: diff.c:3468 +#: diff.c:3490 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3482 +#: diff.c:3504 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: gpg-interface.c:59 gpg-interface.c:127 +#: gpg-interface.c:59 gpg-interface.c:131 msgid "could not run gpg." msgstr "" @@ -345,73 +464,73 @@ msgstr "" msgid "gpg failed to sign the data" msgstr "" -#: gpg-interface.c:112 +#: gpg-interface.c:115 #, c-format msgid "could not create temporary file '%s': %s" msgstr "" -#: gpg-interface.c:115 +#: gpg-interface.c:118 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "" -#: grep.c:1622 +#: grep.c:1695 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1639 +#: grep.c:1712 #, c-format msgid "'%s': %s" msgstr "" -#: grep.c:1650 +#: grep.c:1723 #, c-format msgid "'%s': short read %s" msgstr "" -#: help.c:212 +#: help.c:210 #, c-format msgid "available git commands in '%s'" msgstr "" -#: help.c:219 +#: help.c:217 msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:235 +#: help.c:233 msgid "The most commonly used git commands are:" msgstr "" -#: help.c:292 +#: help.c:290 #, 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:349 +#: help.c:347 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:371 +#: help.c:369 #, 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:376 +#: help.c:374 #, c-format msgid "in %0.1f seconds automatically..." msgstr "" -#: help.c:383 +#: help.c:381 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:387 +#: help.c:385 help.c:444 msgid "" "\n" "Did you mean this?" @@ -421,12 +540,17 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#: help.c:440 +#, c-format +msgid "%s: %s - %s" +msgstr "" + #: merge.c:56 msgid "failed to read the cache" msgstr "" -#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534 -#: builtin/clone.c:586 +#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559 +#: builtin/clone.c:655 msgid "unable to write new index file" msgstr "" @@ -440,289 +564,378 @@ msgstr "" msgid "addinfo_cache failed for path '%s'" msgstr "" -#: merge-recursive.c:268 +#: merge-recursive.c:269 msgid "error building trees" msgstr "" -#: merge-recursive.c:672 +#: merge-recursive.c:673 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:683 +#: merge-recursive.c:684 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" #. something else exists #. .. but not some other error (who really cares what?) -#: merge-recursive.c:697 merge-recursive.c:718 +#: merge-recursive.c:698 merge-recursive.c:719 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:708 +#: merge-recursive.c:709 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:748 +#: merge-recursive.c:749 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:750 +#: merge-recursive.c:751 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:773 builtin/clone.c:302 +#: merge-recursive.c:774 builtin/clone.c:311 #, c-format msgid "failed to open '%s'" msgstr "" -#: merge-recursive.c:781 +#: merge-recursive.c:782 #, c-format msgid "failed to symlink '%s'" msgstr "" -#: merge-recursive.c:784 +#: merge-recursive.c:785 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:922 +#: merge-recursive.c:923 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:926 +#: merge-recursive.c:927 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:942 +#: merge-recursive.c:943 msgid "unsupported object type in the tree" msgstr "" -#: merge-recursive.c:1021 merge-recursive.c:1035 +#: merge-recursive.c:1022 merge-recursive.c:1036 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -#: merge-recursive.c:1027 merge-recursive.c:1040 +#: merge-recursive.c:1028 merge-recursive.c:1041 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -#: merge-recursive.c:1081 +#: merge-recursive.c:1082 msgid "rename" msgstr "" -#: merge-recursive.c:1081 +#: merge-recursive.c:1082 msgid "renamed" msgstr "" -#: merge-recursive.c:1137 +#: merge-recursive.c:1138 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1159 +#: merge-recursive.c:1160 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1164 +#: merge-recursive.c:1165 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1218 +#: merge-recursive.c:1219 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1248 +#: merge-recursive.c:1249 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1447 +#: merge-recursive.c:1448 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1457 +#: merge-recursive.c:1458 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1462 merge-recursive.c:1660 +#: merge-recursive.c:1463 merge-recursive.c:1661 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1513 +#: merge-recursive.c:1514 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1516 +#: merge-recursive.c:1517 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1564 +#: merge-recursive.c:1565 msgid "modify" msgstr "" -#: merge-recursive.c:1564 +#: merge-recursive.c:1565 msgid "modified" msgstr "" -#: merge-recursive.c:1574 +#: merge-recursive.c:1575 msgid "content" msgstr "" -#: merge-recursive.c:1581 +#: merge-recursive.c:1582 msgid "add/add" msgstr "" -#: merge-recursive.c:1615 +#: merge-recursive.c:1616 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1629 +#: merge-recursive.c:1630 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1633 git-submodule.sh:942 +#: merge-recursive.c:1634 git-submodule.sh:1125 msgid "submodule" msgstr "" -#: merge-recursive.c:1634 +#: merge-recursive.c:1635 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1724 +#: merge-recursive.c:1725 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1749 +#: merge-recursive.c:1750 msgid "file/directory" msgstr "" -#: merge-recursive.c:1755 +#: merge-recursive.c:1756 msgid "directory/file" msgstr "" -#: merge-recursive.c:1760 +#: merge-recursive.c:1761 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1770 +#: merge-recursive.c:1771 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1787 +#: merge-recursive.c:1788 msgid "Fatal merge failure, shouldn't happen." msgstr "" -#: merge-recursive.c:1806 +#: merge-recursive.c:1807 msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:1815 +#: merge-recursive.c:1816 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:1845 +#: merge-recursive.c:1846 #, c-format msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:1890 +#: merge-recursive.c:1891 msgid "Merging:" msgstr "" -#: merge-recursive.c:1903 +#: merge-recursive.c:1904 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:1940 +#: merge-recursive.c:1941 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:1997 +#: merge-recursive.c:1998 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2009 builtin/merge.c:643 +#: merge-recursive.c:2010 builtin/merge.c:672 msgid "Unable to write index." msgstr "" -#: parse-options.c:489 +#: notes-utils.c:40 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" + +#: notes-utils.c:81 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "" + +#: notes-utils.c:91 +#, 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 +#: notes-utils.c:118 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "" + +#: object.c:202 +#, c-format +msgid "unable to parse object: %s" +msgstr "" + +#: parse-options.c:537 msgid "..." msgstr "" -#: parse-options.c:507 +#: parse-options.c:555 #, c-format msgid "usage: %s" msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:511 +#: parse-options.c:559 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:514 +#: parse-options.c:562 #, c-format msgid " %s" msgstr "" -#: parse-options.c:548 +#: parse-options.c:596 msgid "-NUM" msgstr "" -#: pathspec.c:83 +#: pathspec.c:118 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible" +msgstr "" + +#: pathspec.c:128 +msgid "" +"global 'literal' pathspec setting is incompatible with all other global " +"pathspec settings" +msgstr "" + +#: pathspec.c:158 +msgid "invalid parameter for pathspec magic 'prefix'" +msgstr "" + +#: pathspec.c:164 +#, c-format +msgid "Invalid pathspec magic '%.*s' in '%s'" +msgstr "" + +#: pathspec.c:168 +#, c-format +msgid "Missing ')' at the end of pathspec magic in '%s'" +msgstr "" + +#: pathspec.c:186 #, c-format -msgid "Path '%s' is in submodule '%.*s'" +msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "" -#: pathspec.c:99 +#: pathspec.c:211 #, c-format -msgid "'%s' is beyond a symbolic link" +msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" -#: remote.c:1653 +#: pathspec.c:222 +#, c-format +msgid "%s: '%s' is outside repository" +msgstr "" + +#: pathspec.c:278 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "" + +#. +#. * We may want to substitute "this command" with a command +#. * name. E.g. when add--interactive dies when running +#. * "checkout -p" +#. +#: pathspec.c:340 +#, c-format +msgid "%s: pathspec magic not supported by this command: %s" +msgstr "" + +#: pathspec.c:415 +#, c-format +msgid "pathspec '%s' is beyond a symbolic link" +msgstr "" + +#: remote.c:1833 +#, c-format +msgid "Your branch is based on '%s', but the upstream is gone.\n" +msgstr "" + +#: remote.c:1837 +msgid " (use \"git branch --unset-upstream\" to fixup)\n" +msgstr "" + +#: remote.c:1840 +#, c-format +msgid "Your branch is up-to-date with '%s'.\n" +msgstr "" + +#: remote.c:1844 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" -#: remote.c:1659 +#: remote.c:1850 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:1662 +#: remote.c:1853 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -730,11 +943,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1670 +#: remote.c:1861 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:1673 +#: remote.c:1864 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -745,634 +958,808 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1683 +#: remote.c:1874 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984 -#: builtin/merge.c:994 +#: run-command.c:80 +msgid "open /dev/null failed" +msgstr "" + +#: run-command.c:82 +#, c-format +msgid "dup2(%d,%d) failed" +msgstr "" + +#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903 +#: builtin/merge.c:1013 builtin/merge.c:1023 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986 -#: builtin/merge.c:999 +#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793 +#: builtin/merge.c:1015 builtin/merge.c:1028 #, c-format msgid "Could not write to '%s'" msgstr "" -#: sequencer.c:146 +#: sequencer.c:229 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:149 +#: sequencer.c:232 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:162 sequencer.c:774 sequencer.c:857 +#: sequencer.c:245 sequencer.c:870 sequencer.c:953 #, c-format msgid "Could not write to %s" msgstr "" -#: sequencer.c:165 +#: sequencer.c:248 #, c-format msgid "Error wrapping up %s" msgstr "" -#: sequencer.c:180 +#: sequencer.c:263 msgid "Your local changes would be overwritten by cherry-pick." msgstr "" -#: sequencer.c:182 +#: sequencer.c:265 msgid "Your local changes would be overwritten by revert." msgstr "" -#: sequencer.c:185 +#: sequencer.c:268 msgid "Commit your changes or stash them to proceed." msgstr "" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:236 +#: sequencer.c:325 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:267 +#: sequencer.c:356 msgid "Could not resolve HEAD commit\n" msgstr "" -#: sequencer.c:288 +#: sequencer.c:378 msgid "Unable to update cache tree\n" msgstr "" -#: sequencer.c:333 +#: sequencer.c:423 #, c-format msgid "Could not parse commit %s\n" msgstr "" -#: sequencer.c:338 +#: sequencer.c:428 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" -#: sequencer.c:404 +#: sequencer.c:494 msgid "Your index file is unmerged." msgstr "" -#: sequencer.c:423 +#: sequencer.c:513 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:431 +#: sequencer.c:521 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: sequencer.c:435 +#: sequencer.c:525 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:448 +#: sequencer.c:538 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:452 +#: sequencer.c:542 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:536 +#: sequencer.c:628 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:537 +#: sequencer.c:629 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:569 +#: sequencer.c:665 msgid "empty commit set passed" msgstr "" -#: sequencer.c:577 +#: sequencer.c:673 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:582 +#: sequencer.c:678 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:640 +#: sequencer.c:736 #, c-format msgid "Cannot %s during a %s" msgstr "" -#: sequencer.c:662 +#: sequencer.c:758 #, c-format msgid "Could not parse line %d." msgstr "" -#: sequencer.c:667 +#: sequencer.c:763 msgid "No commits parsed." msgstr "" -#: sequencer.c:680 +#: sequencer.c:776 #, c-format msgid "Could not open %s" msgstr "" -#: sequencer.c:684 +#: sequencer.c:780 #, c-format msgid "Could not read %s." msgstr "" -#: sequencer.c:691 +#: sequencer.c:787 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" -#: sequencer.c:719 +#: sequencer.c:815 #, c-format msgid "Invalid key: %s" msgstr "" -#: sequencer.c:722 +#: sequencer.c:818 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: sequencer.c:734 +#: sequencer.c:830 #, c-format msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:755 +#: sequencer.c:851 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:756 +#: sequencer.c:852 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:760 +#: sequencer.c:856 #, c-format msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:776 sequencer.c:861 +#: sequencer.c:872 sequencer.c:957 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:795 sequencer.c:929 +#: sequencer.c:891 sequencer.c:1025 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:797 +#: sequencer.c:893 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:799 +#: sequencer.c:895 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:821 builtin/apply.c:4056 +#: sequencer.c:917 builtin/apply.c:4061 #, c-format msgid "cannot open %s: %s" msgstr "" -#: sequencer.c:824 +#: sequencer.c:920 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:825 +#: sequencer.c:921 msgid "unexpected end of file" msgstr "" -#: sequencer.c:831 +#: sequencer.c:927 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:854 +#: sequencer.c:950 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:1016 +#: sequencer.c:1093 +#, c-format +msgid "%s: can't cherry-pick a %s" +msgstr "" + +#: sequencer.c:1096 +#, c-format +msgid "%s: bad revision" +msgstr "" + +#: sequencer.c:1130 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:1017 +#: sequencer.c:1131 msgid "Can't cherry-pick into empty head" msgstr "" -#: sha1_name.c:1044 +#: sha1_name.c:440 +msgid "" +"Git normally never creates a ref that ends with 40 hex characters\n" +"because it will be ignored when you just specify 40-hex. These refs\n" +"may be created by mistake. For example,\n" +"\n" +" git checkout -b $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.objectNameWarning false\"" +msgstr "" + +#: sha1_name.c:1112 msgid "HEAD does not point to a branch" msgstr "" -#: sha1_name.c:1047 +#: sha1_name.c:1115 #, c-format msgid "No such branch: '%s'" msgstr "" -#: sha1_name.c:1049 +#: sha1_name.c:1117 #, c-format msgid "No upstream configured for branch '%s'" msgstr "" -#: sha1_name.c:1052 +#: sha1_name.c:1121 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: wrapper.c:408 +#: submodule.c:64 submodule.c:98 +msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" +msgstr "" + +#: submodule.c:68 submodule.c:102 +#, c-format +msgid "Could not find section in .gitmodules where path=%s" +msgstr "" + +#. Maybe the user already did that, don't error out here +#: submodule.c:76 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "" + +#. Maybe the user already did that, don't error out here +#: submodule.c:109 +#, c-format +msgid "Could not remove .gitmodules entry for %s" +msgstr "" + +#: submodule.c:127 +msgid "could not find .gitmodules in index" +msgstr "" + +#: submodule.c:133 +msgid "reading updated .gitmodules failed" +msgstr "" + +#: submodule.c:135 +msgid "unable to stat updated .gitmodules" +msgstr "" + +#: submodule.c:139 +msgid "unable to remove .gitmodules from index" +msgstr "" + +#: submodule.c:141 +msgid "adding updated .gitmodules failed" +msgstr "" + +#: submodule.c:143 +msgid "staging updated .gitmodules failed" +msgstr "" + +#: submodule.c:1144 builtin/init-db.c:363 +#, c-format +msgid "Could not create git link %s" +msgstr "" + +#: submodule.c:1155 +#, c-format +msgid "Could not set core.worktree in %s" +msgstr "" + +#: urlmatch.c:120 +msgid "invalid URL scheme name or missing '://' suffix" +msgstr "" + +#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 +#, c-format +msgid "invalid %XX escape sequence" +msgstr "" + +#: urlmatch.c:172 +msgid "missing host and scheme is not 'file:'" +msgstr "" + +#: urlmatch.c:189 +msgid "a 'file:' URL may not have a port number" +msgstr "" + +#: urlmatch.c:199 +msgid "invalid characters in host name" +msgstr "" + +#: urlmatch.c:244 urlmatch.c:255 +msgid "invalid port number" +msgstr "" + +#: urlmatch.c:322 +msgid "invalid '..' path segment" +msgstr "" + +#: wrapper.c:422 #, c-format msgid "unable to access '%s': %s" msgstr "" -#: wrapper.c:423 +#: wrapper.c:443 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:434 +#: wrapper.c:454 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" -#: wrapper.c:435 +#: wrapper.c:455 msgid "no such user" msgstr "" -#: wt-status.c:140 +#: wt-status.c:146 msgid "Unmerged paths:" msgstr "" -#: wt-status.c:167 wt-status.c:194 +#: wt-status.c:173 wt-status.c:200 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" -#: wt-status.c:169 wt-status.c:196 +#: wt-status.c:175 wt-status.c:202 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" -#: wt-status.c:173 +#: wt-status.c:179 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:175 wt-status.c:179 +#: wt-status.c:181 wt-status.c:185 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:177 +#: wt-status.c:183 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:188 +#: wt-status.c:194 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:206 +#: wt-status.c:212 msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:210 +#: wt-status.c:216 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:212 +#: wt-status.c:218 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:213 +#: wt-status.c:219 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:215 +#: wt-status.c:221 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:227 +#: wt-status.c:233 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -#: wt-status.c:244 +#: wt-status.c:250 msgid "bug" msgstr "" -#: wt-status.c:249 +#: wt-status.c:255 msgid "both deleted:" msgstr "" -#: wt-status.c:250 +#: wt-status.c:256 msgid "added by us:" msgstr "" -#: wt-status.c:251 +#: wt-status.c:257 msgid "deleted by them:" msgstr "" -#: wt-status.c:252 +#: wt-status.c:258 msgid "added by them:" msgstr "" -#: wt-status.c:253 +#: wt-status.c:259 msgid "deleted by us:" msgstr "" -#: wt-status.c:254 +#: wt-status.c:260 msgid "both added:" msgstr "" -#: wt-status.c:255 +#: wt-status.c:261 msgid "both modified:" msgstr "" -#: wt-status.c:285 +#: wt-status.c:291 msgid "new commits, " msgstr "" -#: wt-status.c:287 +#: wt-status.c:293 msgid "modified content, " msgstr "" -#: wt-status.c:289 +#: wt-status.c:295 msgid "untracked content, " msgstr "" -#: wt-status.c:303 +#: wt-status.c:312 #, c-format msgid "new file: %s" msgstr "" -#: wt-status.c:306 +#: wt-status.c:315 #, c-format msgid "copied: %s -> %s" msgstr "" -#: wt-status.c:309 +#: wt-status.c:318 #, c-format msgid "deleted: %s" msgstr "" -#: wt-status.c:312 +#: wt-status.c:321 #, c-format msgid "modified: %s" msgstr "" -#: wt-status.c:315 +#: wt-status.c:324 #, c-format msgid "renamed: %s -> %s" msgstr "" -#: wt-status.c:318 +#: wt-status.c:327 #, c-format msgid "typechange: %s" msgstr "" -#: wt-status.c:321 +#: wt-status.c:330 #, c-format msgid "unknown: %s" msgstr "" -#: wt-status.c:324 +#: wt-status.c:333 #, c-format msgid "unmerged: %s" msgstr "" -#: wt-status.c:327 +#: wt-status.c:336 #, c-format msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:789 +#: wt-status.c:703 +msgid "Submodules changed but not updated:" +msgstr "" + +#: wt-status.c:705 +msgid "Submodule changes to be committed:" +msgstr "" + +#: wt-status.c:848 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:792 wt-status.c:944 +#: wt-status.c:851 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:795 +#: wt-status.c:854 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:798 +#: wt-status.c:857 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:808 +#: wt-status.c:867 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:811 +#: wt-status.c:870 msgid "The current patch is empty." msgstr "" -#: wt-status.c:815 -msgid " (fix conflicts and then run \"git am --resolved\")" +#: wt-status.c:874 +msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:817 +#: wt-status.c:876 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:819 +#: wt-status.c:878 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:879 wt-status.c:896 +#: wt-status.c:938 wt-status.c:955 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:884 wt-status.c:901 +#: wt-status.c:943 wt-status.c:960 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:887 +#: wt-status.c:946 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:889 +#: wt-status.c:948 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:891 +#: wt-status.c:950 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:904 +#: wt-status.c:963 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:908 +#: wt-status.c:967 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:913 +#: wt-status.c:972 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:916 +#: wt-status.c:975 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:920 +#: wt-status.c:979 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:925 +#: wt-status.c:984 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:928 +#: wt-status.c:987 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:930 +#: wt-status.c:989 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:940 -msgid "You are currently cherry-picking." +#: wt-status.c:999 +#, c-format +msgid "You are currently cherry-picking commit %s." +msgstr "" + +#: wt-status.c:1004 +msgid " (fix conflicts and run \"git cherry-pick --continue\")" +msgstr "" + +#: wt-status.c:1007 +msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" +msgstr "" + +#: wt-status.c:1009 +msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" +msgstr "" + +#: wt-status.c:1018 +#, c-format +msgid "You are currently reverting commit %s." +msgstr "" + +#: wt-status.c:1023 +msgid " (fix conflicts and run \"git revert --continue\")" +msgstr "" + +#: wt-status.c:1026 +msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:947 -msgid " (all conflicts fixed: run \"git commit\")" +#: wt-status.c:1028 +msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:958 +#: wt-status.c:1039 #, c-format -msgid "You are currently bisecting branch '%s'." +msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:962 +#: wt-status.c:1043 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:965 +#: wt-status.c:1046 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1064 +#: wt-status.c:1221 msgid "On branch " msgstr "" -#: wt-status.c:1071 +#: wt-status.c:1228 +msgid "rebase in progress; onto " +msgstr "" + +#: wt-status.c:1235 +msgid "HEAD detached at " +msgstr "" + +#: wt-status.c:1237 +msgid "HEAD detached from " +msgstr "" + +#: wt-status.c:1240 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1083 +#: wt-status.c:1257 msgid "Initial commit" msgstr "" -#: wt-status.c:1097 +#: wt-status.c:1271 msgid "Untracked files" msgstr "" -#: wt-status.c:1099 +#: wt-status.c:1273 msgid "Ignored files" msgstr "" -#: wt-status.c:1101 +#: wt-status.c:1277 +#, 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:1283 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1103 +#: wt-status.c:1285 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1109 +#: wt-status.c:1291 msgid "No changes" msgstr "" -#: wt-status.c:1114 +#: wt-status.c:1296 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1117 +#: wt-status.c:1299 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1120 +#: wt-status.c:1302 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1123 +#: wt-status.c:1305 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1126 +#: wt-status.c:1308 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1129 wt-status.c:1134 +#: wt-status.c:1311 wt-status.c:1316 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1132 +#: wt-status.c:1314 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1136 +#: wt-status.c:1318 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1244 +#: wt-status.c:1427 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1250 +#: wt-status.c:1433 msgid "Initial commit on " msgstr "" -#: wt-status.c:1265 +#: wt-status.c:1463 +msgid "gone" +msgstr "" + +#: wt-status.c:1465 msgid "behind " msgstr "" -#: wt-status.c:1268 wt-status.c:1271 +#: wt-status.c:1468 wt-status.c:1471 msgid "ahead " msgstr "" -#: wt-status.c:1273 +#: wt-status.c:1473 msgid ", behind " msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:341 +#: compat/precompose_utf8.c:55 builtin/clone.c:350 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -1381,179 +1768,195 @@ msgstr "" msgid "git add [options] [--] <pathspec>..." msgstr "" -#: builtin/add.c:63 +#. +#. * To be consistent with "git add -p" and most Git +#. * commands, we should default to being tree-wide, but +#. * this is not the original behavior and can't be +#. * changed until users trained themselves not to type +#. * "git add -u" or "git add -A". For now, we warn and +#. * keep the old behavior. Later, the behavior can be changed +#. * to tree-wide, keeping the warning for a while, and +#. * eventually we can drop the warning. +#. +#: builtin/add.c:58 +#, c-format +msgid "" +"The behavior of 'git add %s (or %s)' with no path argument from a\n" +"subdirectory of the tree will change in Git 2.0 and should not be used " +"anymore.\n" +"To add content for the whole tree, run:\n" +"\n" +" git add %s :/\n" +" (or git add %s :/)\n" +"\n" +"To restrict the command to the current directory, run:\n" +"\n" +" git add %s .\n" +" (or git add %s .)\n" +"\n" +"With the current Git version, the command is restricted to the current " +"directory.\n" +msgstr "" + +#: builtin/add.c:100 +#, c-format +msgid "" +"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n" +"whose behaviour will change in Git 2.0 with respect to paths you removed.\n" +"Paths like '%s' that are\n" +"removed from your working tree are ignored with this version of Git.\n" +"\n" +"* 'git add --ignore-removal <pathspec>', which is the current default,\n" +" ignores paths you removed from your working tree.\n" +"\n" +"* 'git add --all <pathspec>' will let you also record the removals.\n" +"\n" +"Run 'git status' to check the paths you removed from your working tree.\n" +msgstr "" + +#: builtin/add.c:144 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:68 builtin/commit.c:231 +#: builtin/add.c:149 builtin/commit.c:260 msgid "updating files failed" msgstr "" -#: builtin/add.c:78 +#: builtin/add.c:163 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:148 +#: builtin/add.c:237 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275 -#, c-format -msgid "pathspec '%s' did not match any files" -msgstr "" - -#: builtin/add.c:234 +#: builtin/add.c:299 msgid "Could not read the index" msgstr "" -#: builtin/add.c:244 +#: builtin/add.c:310 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:248 +#: builtin/add.c:314 msgid "Could not write patch" msgstr "" -#: builtin/add.c:253 +#: builtin/add.c:319 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:255 +#: builtin/add.c:321 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:261 +#: builtin/add.c:327 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:271 +#: builtin/add.c:337 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 -#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 -#: builtin/rm.c:206 +#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66 +#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253 +#: builtin/rm.c:269 msgid "dry run" msgstr "" -#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19 -#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613 -#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112 +#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19 +#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612 +#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113 msgid "be verbose" msgstr "" -#: builtin/add.c:280 +#: builtin/add.c:357 msgid "interactive picking" msgstr "" -#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258 +#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:282 +#: builtin/add.c:359 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:283 +#: builtin/add.c:360 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:284 +#: builtin/add.c:361 msgid "update tracked files" msgstr "" -#: builtin/add.c:285 +#: builtin/add.c:362 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:286 +#: builtin/add.c:363 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:287 +#. takes no arguments +#: builtin/add.c:366 +msgid "ignore paths removed in the working tree (same as --no-all)" +msgstr "" + +#: builtin/add.c:368 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:288 +#: builtin/add.c:369 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:289 +#: builtin/add.c:370 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:311 +#: builtin/add.c:392 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:312 +#: builtin/add.c:393 msgid "no files added" msgstr "" -#: builtin/add.c:318 +#: builtin/add.c:399 msgid "adding files failed" msgstr "" -#. -#. * To be consistent with "git add -p" and most Git -#. * commands, we should default to being tree-wide, but -#. * this is not the original behavior and can't be -#. * changed until users trained themselves not to type -#. * "git add -u" or "git add -A". For now, we warn and -#. * keep the old behavior. Later, this warning can be -#. * turned into a die(...), and eventually we may -#. * reallow the command with a new behavior. -#. -#: builtin/add.c:335 -#, c-format -msgid "" -"The behavior of 'git add %s (or %s)' with no path argument from a\n" -"subdirectory of the tree will change in Git 2.0 and should not be used " -"anymore.\n" -"To add content for the whole tree, run:\n" -"\n" -" git add %s :/\n" -" (or git add %s :/)\n" -"\n" -"To restrict the command to the current directory, run:\n" -"\n" -" git add %s .\n" -" (or git add %s .)\n" -"\n" -"With the current Git version, the command is restricted to the current " -"directory." -msgstr "" - -#: builtin/add.c:381 +#: builtin/add.c:438 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:383 +#: builtin/add.c:456 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:414 +#: builtin/add.c:486 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:415 +#: builtin/add.c:487 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204 -#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235 +#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919 +#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299 msgid "index file corrupt" msgstr "" -#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370 +#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432 msgid "Unable to write new index file" msgstr "" @@ -1681,342 +2084,342 @@ msgstr "" msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2684 +#: builtin/apply.c:2688 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2802 +#: builtin/apply.c:2806 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:2814 +#: builtin/apply.c:2818 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2820 +#: builtin/apply.c:2824 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2839 +#: builtin/apply.c:2843 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:2942 +#: builtin/apply.c:2946 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:2948 +#: builtin/apply.c:2952 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:2969 +#: builtin/apply.c:2973 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3091 +#: builtin/apply.c:3095 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189 +#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3169 builtin/apply.c:3391 +#: builtin/apply.c:3174 builtin/apply.c:3396 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3250 builtin/apply.c:3405 +#: builtin/apply.c:3255 builtin/apply.c:3410 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419 +#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3259 builtin/apply.c:3413 +#: builtin/apply.c:3264 builtin/apply.c:3418 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3361 +#: builtin/apply.c:3366 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3430 +#: builtin/apply.c:3435 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3432 +#: builtin/apply.c:3437 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3533 +#: builtin/apply.c:3538 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3536 +#: builtin/apply.c:3541 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3556 +#: builtin/apply.c:3561 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3561 +#: builtin/apply.c:3566 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3569 +#: builtin/apply.c:3574 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3582 +#: builtin/apply.c:3587 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124 +#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:3818 +#: builtin/apply.c:3823 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3846 +#: builtin/apply.c:3851 #, c-format -msgid "corrupt patch for subproject %s" +msgid "corrupt patch for submodule %s" msgstr "" -#: builtin/apply.c:3850 +#: builtin/apply.c:3855 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3855 +#: builtin/apply.c:3860 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3858 builtin/apply.c:3966 +#: builtin/apply.c:3863 builtin/apply.c:3971 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3891 +#: builtin/apply.c:3896 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:3940 +#: builtin/apply.c:3945 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:4027 +#: builtin/apply.c:4032 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:4035 +#: builtin/apply.c:4040 msgid "internal error" msgstr "" #. Say this even without --verbose -#: builtin/apply.c:4038 +#: builtin/apply.c:4043 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4048 +#: builtin/apply.c:4053 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4069 +#: builtin/apply.c:4074 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4072 +#: builtin/apply.c:4077 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4222 +#: builtin/apply.c:4227 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4233 +#: builtin/apply.c:4238 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91 -#: builtin/fetch.c:63 +#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90 +#: builtin/fetch.c:77 msgid "path" msgstr "" -#: builtin/apply.c:4353 +#: builtin/apply.c:4358 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4356 +#: builtin/apply.c:4361 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4358 +#: builtin/apply.c:4363 msgid "num" msgstr "" -#: builtin/apply.c:4359 +#: builtin/apply.c:4364 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4362 +#: builtin/apply.c:4367 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4364 +#: builtin/apply.c:4369 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4368 +#: builtin/apply.c:4373 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4370 +#: builtin/apply.c:4375 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4372 +#: builtin/apply.c:4377 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4374 +#: builtin/apply.c:4379 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4376 +#: builtin/apply.c:4381 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4378 +#: builtin/apply.c:4383 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4380 +#: builtin/apply.c:4385 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4382 +#: builtin/apply.c:4387 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463 +#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4387 +#: builtin/apply.c:4392 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4388 +#: builtin/apply.c:4393 msgid "action" msgstr "" -#: builtin/apply.c:4389 +#: builtin/apply.c:4394 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4392 builtin/apply.c:4395 +#: builtin/apply.c:4397 builtin/apply.c:4400 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4398 +#: builtin/apply.c:4403 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4400 +#: builtin/apply.c:4405 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4402 +#: builtin/apply.c:4407 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4404 +#: builtin/apply.c:4409 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4407 +#: builtin/apply.c:4412 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4410 +#: builtin/apply.c:4415 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4412 +#: builtin/apply.c:4417 msgid "root" msgstr "" -#: builtin/apply.c:4413 +#: builtin/apply.c:4418 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4435 +#: builtin/apply.c:4440 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4443 +#: builtin/apply.c:4448 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4446 +#: builtin/apply.c:4451 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4462 +#: builtin/apply.c:4467 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4476 +#: builtin/apply.c:4481 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4482 builtin/apply.c:4492 +#: builtin/apply.c:4487 builtin/apply.c:4497 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2040,21 +2443,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 "" @@ -2070,434 +2473,486 @@ msgstr "" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" -#: builtin/blame.c:25 +#: builtin/blame.c:27 msgid "git blame [options] [rev-opts] [rev] [--] file" msgstr "" -#: builtin/blame.c:30 builtin/shortlog.c:15 +#: builtin/blame.c:32 msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:2350 +#: builtin/blame.c:2248 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2351 +#: builtin/blame.c:2249 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2352 +#: builtin/blame.c:2250 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2353 +#: builtin/blame.c:2251 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2354 +#: builtin/blame.c:2252 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2355 +#: builtin/blame.c:2253 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2356 +#: builtin/blame.c:2254 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2357 +#: builtin/blame.c:2255 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2358 +#: builtin/blame.c:2256 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2359 +#: builtin/blame.c:2257 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2360 +#: builtin/blame.c:2258 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2361 +#: builtin/blame.c:2259 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2362 +#: builtin/blame.c:2260 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2363 +#: builtin/blame.c:2261 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2364 +#: builtin/blame.c:2262 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2365 +#: builtin/blame.c:2263 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2366 +#: builtin/blame.c:2264 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2367 +#: builtin/blame.c:2265 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2368 builtin/blame.c:2369 +#: builtin/blame.c:2266 builtin/blame.c:2267 msgid "score" msgstr "" -#: builtin/blame.c:2368 +#: builtin/blame.c:2266 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2369 +#: builtin/blame.c:2267 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2370 +#: builtin/blame.c:2268 msgid "n,m" msgstr "" -#: builtin/blame.c:2370 +#: builtin/blame.c:2268 msgid "Process only line range n,m, counting from 1" msgstr "" -#: builtin/branch.c:23 +#: builtin/branch.c:24 msgid "git branch [options] [-r | -a] [--merged | --no-merged]" msgstr "" -#: builtin/branch.c:24 +#: builtin/branch.c:25 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" msgstr "" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [options] [-r] (-d | -D) <branchname>..." msgstr "" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" msgstr "" -#: builtin/branch.c:145 +#: builtin/branch.c:150 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -#: builtin/branch.c:149 +#: builtin/branch.c:154 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -#: builtin/branch.c:163 +#: builtin/branch.c:168 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" -#: builtin/branch.c:167 +#: builtin/branch.c:172 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -#: builtin/branch.c:180 +#: builtin/branch.c:185 msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:208 +#: builtin/branch.c:213 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:214 +#: builtin/branch.c:219 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:222 +#: builtin/branch.c:227 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "" -#: builtin/branch.c:235 +#: builtin/branch.c:240 #, c-format msgid "remote branch '%s' not found." msgstr "" -#: builtin/branch.c:236 +#: builtin/branch.c:241 #, c-format msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:250 +#: builtin/branch.c:255 #, c-format msgid "Error deleting remote branch '%s'" msgstr "" -#: builtin/branch.c:251 +#: builtin/branch.c:256 #, c-format msgid "Error deleting branch '%s'" msgstr "" -#: builtin/branch.c:258 +#: builtin/branch.c:263 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:259 +#: builtin/branch.c:264 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:361 +#: builtin/branch.c:366 #, c-format msgid "branch '%s' does not point at a commit" msgstr "" -#: builtin/branch.c:433 +#: builtin/branch.c:453 +#, c-format +msgid "[%s: gone]" +msgstr "" + +#: builtin/branch.c:456 +#, c-format +msgid "[%s]" +msgstr "" + +#: builtin/branch.c:459 #, c-format msgid "[%s: behind %d]" msgstr "" -#: builtin/branch.c:435 +#: builtin/branch.c:461 #, c-format msgid "[behind %d]" msgstr "" -#: builtin/branch.c:439 +#: builtin/branch.c:465 #, c-format msgid "[%s: ahead %d]" msgstr "" -#: builtin/branch.c:441 +#: builtin/branch.c:467 #, c-format msgid "[ahead %d]" msgstr "" -#: builtin/branch.c:444 +#: builtin/branch.c:470 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:447 +#: builtin/branch.c:473 #, c-format msgid "[ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:469 +#: builtin/branch.c:496 msgid " **** invalid ref ****" msgstr "" -#: builtin/branch.c:560 +#: builtin/branch.c:588 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "" + +#: builtin/branch.c:591 +#, c-format +msgid "(no branch, bisect started on %s)" +msgstr "" + +#: builtin/branch.c:594 +#, c-format +msgid "(detached from %s)" +msgstr "" + +#: builtin/branch.c:597 msgid "(no branch)" msgstr "" -#: builtin/branch.c:593 +#: builtin/branch.c:643 #, c-format msgid "object '%s' does not point to a commit" msgstr "" -#: builtin/branch.c:625 +#: builtin/branch.c:675 msgid "some refs could not be read" msgstr "" -#: builtin/branch.c:638 +#: builtin/branch.c:688 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:648 +#: builtin/branch.c:698 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:663 +#: builtin/branch.c:713 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:667 +#: builtin/branch.c:717 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:671 +#: builtin/branch.c:721 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:678 +#: builtin/branch.c:728 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:693 +#: builtin/branch.c:743 #, c-format msgid "malformed object name %s" msgstr "" -#: builtin/branch.c:717 +#: builtin/branch.c:767 #, c-format msgid "could not write branch description template: %s" msgstr "" -#: builtin/branch.c:747 +#: builtin/branch.c:797 msgid "Generic options" msgstr "" -#: builtin/branch.c:749 +#: builtin/branch.c:799 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:750 +#: builtin/branch.c:800 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:751 +#: builtin/branch.c:801 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:753 +#: builtin/branch.c:803 msgid "change upstream info" msgstr "" -#: builtin/branch.c:757 +#: builtin/branch.c:807 msgid "use colored output" msgstr "" -#: builtin/branch.c:758 +#: builtin/branch.c:808 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788 -#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367 -#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468 +#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838 +#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461 +#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468 msgid "commit" msgstr "" -#: builtin/branch.c:762 builtin/branch.c:768 +#: builtin/branch.c:812 builtin/branch.c:818 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:774 +#: builtin/branch.c:824 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:775 +#: builtin/branch.c:825 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:777 +#: builtin/branch.c:827 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:778 +#: builtin/branch.c:828 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:779 +#: builtin/branch.c:829 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:780 +#: builtin/branch.c:830 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:781 +#: builtin/branch.c:831 msgid "list branch names" msgstr "" -#: builtin/branch.c:782 +#: builtin/branch.c:832 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:784 +#: builtin/branch.c:834 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:785 +#: builtin/branch.c:835 msgid "force creation (when already exists)" msgstr "" -#: builtin/branch.c:788 +#: builtin/branch.c:838 msgid "print only not merged branches" msgstr "" -#: builtin/branch.c:794 +#: builtin/branch.c:844 msgid "print only merged branches" msgstr "" -#: builtin/branch.c:798 +#: builtin/branch.c:848 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:811 +#: builtin/branch.c:861 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:816 builtin/clone.c:561 +#: builtin/branch.c:866 builtin/clone.c:629 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:839 +#: builtin/branch.c:890 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:845 +#: builtin/branch.c:896 builtin/branch.c:935 msgid "branch name required" msgstr "" -#: builtin/branch.c:860 +#: builtin/branch.c:911 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:865 +#: builtin/branch.c:916 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:872 +#: builtin/branch.c:923 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:875 +#: builtin/branch.c:926 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:888 +#: builtin/branch.c:941 msgid "too many branches for a rename operation" msgstr "" -#: builtin/branch.c:893 +#: builtin/branch.c:946 +msgid "too many branches to set new upstream" +msgstr "" + +#: builtin/branch.c:950 +#, c-format +msgid "" +"could not set upstream of HEAD to %s when it does not point to any branch." +msgstr "" + +#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997 +#, c-format +msgid "no such branch '%s'" +msgstr "" + +#: builtin/branch.c:957 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:905 +#: builtin/branch.c:969 +msgid "too many branches to unset upstream" +msgstr "" + +#: builtin/branch.c:973 +msgid "could not unset upstream of HEAD when it does not point to any branch." +msgstr "" + +#: builtin/branch.c:979 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:920 +#: builtin/branch.c:994 +msgid "it does not make sense to create 'HEAD' manually" +msgstr "" + +#: builtin/branch.c:1000 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:923 +#: builtin/branch.c:1003 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" -#: builtin/branch.c:940 +#: builtin/branch.c:1020 #, c-format msgid "" "\n" @@ -2505,12 +2960,12 @@ msgid "" "\n" msgstr "" -#: builtin/branch.c:941 +#: builtin/branch.c:1021 #, c-format msgid " git branch -d %s\n" msgstr "" -#: builtin/branch.c:942 +#: builtin/branch.c:1022 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr "" @@ -2528,43 +2983,43 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:247 +#: builtin/cat-file.c:312 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "" -#: builtin/cat-file.c:248 +#: builtin/cat-file.c:313 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "" -#: builtin/cat-file.c:266 +#: builtin/cat-file.c:350 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:267 +#: builtin/cat-file.c:351 msgid "show object type" msgstr "" -#: builtin/cat-file.c:268 +#: builtin/cat-file.c:352 msgid "show object size" msgstr "" -#: builtin/cat-file.c:270 +#: builtin/cat-file.c:354 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:271 +#: builtin/cat-file.c:355 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:273 +#: builtin/cat-file.c:357 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:275 +#: builtin/cat-file.c:359 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:278 +#: builtin/cat-file.c:362 msgid "show info about objects fed from the standard input" msgstr "" @@ -2589,33 +3044,62 @@ msgid "read file names from stdin" msgstr "" #: builtin/check-attr.c:23 builtin/check-ignore.c:24 -msgid "input paths are terminated by a null character" +msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177 +#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259 msgid "suppress progress reporting" msgstr "" -#: builtin/check-ignore.c:151 -msgid "cannot specify pathnames with --stdin" +#: builtin/check-ignore.c:26 +msgid "show non-matching input paths" +msgstr "" + +#: builtin/check-ignore.c:28 +msgid "ignore index when checking" msgstr "" #: builtin/check-ignore.c:154 +msgid "cannot specify pathnames with --stdin" +msgstr "" + +#: builtin/check-ignore.c:157 msgid "-z only makes sense with --stdin" msgstr "" -#: builtin/check-ignore.c:156 +#: builtin/check-ignore.c:159 msgid "no path specified" msgstr "" -#: builtin/check-ignore.c:160 +#: builtin/check-ignore.c:163 msgid "--quiet is only valid with a single pathname" msgstr "" -#: builtin/check-ignore.c:162 +#: builtin/check-ignore.c:165 msgid "cannot have both --quiet and --verbose" msgstr "" +#: builtin/check-ignore.c:168 +msgid "--non-matching is only valid with --verbose" +msgstr "" + +#: builtin/check-mailmap.c:8 +msgid "git check-mailmap [options] <contact>..." +msgstr "" + +#: builtin/check-mailmap.c:13 +msgid "also read contacts from stdin" +msgstr "" + +#: builtin/check-mailmap.c:24 +#, c-format +msgid "unable to parse contact: %s" +msgstr "" + +#: builtin/check-mailmap.c:47 +msgid "no contacts specified" +msgstr "" + #: builtin/checkout-index.c:126 msgid "git checkout-index [options] [--] [<file>...]" msgstr "" @@ -2668,106 +3152,106 @@ msgstr "" msgid "git checkout [options] [<branch>] -- <file>..." msgstr "" -#: builtin/checkout.c:116 builtin/checkout.c:149 +#: builtin/checkout.c:114 builtin/checkout.c:147 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:118 builtin/checkout.c:151 +#: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:134 +#: builtin/checkout.c:132 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:178 +#: builtin/checkout.c:176 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:195 +#: builtin/checkout.c:193 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:212 +#: builtin/checkout.c:210 #, 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:232 builtin/checkout.c:235 builtin/checkout.c:238 +#: builtin/checkout.c:241 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:248 builtin/checkout.c:251 +#: builtin/checkout.c:244 builtin/checkout.c:247 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:254 +#: builtin/checkout.c:250 #, 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:261 builtin/checkout.c:451 msgid "corrupt index file" msgstr "" -#: builtin/checkout.c:295 builtin/checkout.c:302 +#: builtin/checkout.c:322 builtin/checkout.c:329 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:448 +#: builtin/checkout.c:473 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:569 +#: builtin/checkout.c:594 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "" -#: builtin/checkout.c:602 +#: builtin/checkout.c:632 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:609 +#: builtin/checkout.c:639 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:612 +#: builtin/checkout.c:642 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:616 +#: builtin/checkout.c:646 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:618 builtin/checkout.c:955 +#: builtin/checkout.c:648 builtin/checkout.c:1033 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:620 +#: builtin/checkout.c:650 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:676 +#: builtin/checkout.c:706 #, c-format msgid " ... and %d more.\n" msgstr "" #. The singular version -#: builtin/checkout.c:682 +#: builtin/checkout.c:712 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -2782,7 +3266,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:700 +#: builtin/checkout.c:730 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -2792,228 +3276,319 @@ msgid "" "\n" msgstr "" -#: builtin/checkout.c:730 +#: builtin/checkout.c:760 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:734 +#: builtin/checkout.c:764 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:761 builtin/checkout.c:950 +#: builtin/checkout.c:791 builtin/checkout.c:1028 msgid "You are on a branch yet to be born" msgstr "" -#. case (1) -#: builtin/checkout.c:886 +#: builtin/checkout.c:935 +#, c-format +msgid "only one reference expected, %d given." +msgstr "" + +#: builtin/checkout.c:974 #, c-format msgid "invalid reference: %s" msgstr "" #. case (1): want a tree -#: builtin/checkout.c:925 +#: builtin/checkout.c:1003 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:964 +#: builtin/checkout.c:1042 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:967 builtin/checkout.c:971 +#: builtin/checkout.c:1045 builtin/checkout.c:1049 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983 -#: builtin/checkout.c:986 +#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061 +#: builtin/checkout.c:1064 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:991 +#: builtin/checkout.c:1069 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89 +#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88 #: builtin/remote.c:169 builtin/remote.c:171 msgid "branch" msgstr "" -#: builtin/checkout.c:1014 +#: builtin/checkout.c:1092 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1016 +#: builtin/checkout.c:1094 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1017 +#: builtin/checkout.c:1095 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1018 +#: builtin/checkout.c:1096 msgid "detach the HEAD at named commit" msgstr "" -#: builtin/checkout.c:1019 +#: builtin/checkout.c:1097 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1021 +#: builtin/checkout.c:1099 msgid "new branch" msgstr "" -#: builtin/checkout.c:1021 +#: builtin/checkout.c:1099 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1022 +#: builtin/checkout.c:1100 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1024 +#: builtin/checkout.c:1102 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1026 +#: builtin/checkout.c:1104 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1027 +#: builtin/checkout.c:1105 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1028 builtin/merge.c:215 +#: builtin/checkout.c:1106 builtin/merge.c:232 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245 +#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251 msgid "style" msgstr "" -#: builtin/checkout.c:1030 +#: builtin/checkout.c:1108 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1033 +#: builtin/checkout.c:1111 +msgid "do not limit pathspecs to sparse entries only" +msgstr "" + +#: builtin/checkout.c:1113 msgid "second guess 'git checkout no-such-branch'" msgstr "" -#: builtin/checkout.c:1057 +#: builtin/checkout.c:1136 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1074 +#: builtin/checkout.c:1153 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1081 +#: builtin/checkout.c:1160 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1197 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1123 +#: builtin/checkout.c:1204 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1209 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1132 +#: builtin/checkout.c:1213 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/clean.c:20 -msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +#: builtin/clean.c:26 +msgid "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" -#: builtin/clean.c:24 +#: builtin/clean.c:30 #, c-format msgid "Removing %s\n" msgstr "" -#: builtin/clean.c:25 +#: builtin/clean.c:31 #, c-format msgid "Would remove %s\n" msgstr "" -#: builtin/clean.c:26 +#: builtin/clean.c:32 #, c-format msgid "Skipping repository %s\n" msgstr "" -#: builtin/clean.c:27 +#: builtin/clean.c:33 #, c-format msgid "Would skip repository %s\n" msgstr "" -#: builtin/clean.c:28 +#: builtin/clean.c:34 #, c-format msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:160 +#: builtin/clean.c:294 +msgid "" +"Prompt help:\n" +"1 - select a numbered item\n" +"foo - select item based on unique prefix\n" +" - (empty) select nothing" +msgstr "" + +#: builtin/clean.c:298 +msgid "" +"Prompt help:\n" +"1 - select a single item\n" +"3-5 - select a range of items\n" +"2-3,6-9 - select multiple ranges\n" +"foo - select item based on unique prefix\n" +"-... - unselect specified items\n" +"* - choose all items\n" +" - (empty) finish selecting" +msgstr "" + +#: builtin/clean.c:516 +#, c-format +msgid "Huh (%s)?" +msgstr "" + +#: builtin/clean.c:659 +#, c-format +msgid "Input ignore patterns>> " +msgstr "" + +#: builtin/clean.c:696 +#, c-format +msgid "WARNING: Cannot find items matched by: %s" +msgstr "" + +#: builtin/clean.c:717 +msgid "Select items to delete" +msgstr "" + +#: builtin/clean.c:757 +#, c-format +msgid "remove %s? " +msgstr "" + +#: builtin/clean.c:782 +msgid "Bye." +msgstr "" + +#: builtin/clean.c:790 +msgid "" +"clean - start cleaning\n" +"filter by pattern - exclude items from deletion\n" +"select by numbers - select items to be deleted by numbers\n" +"ask each - confirm each deletion (like \"rm -i\")\n" +"quit - stop cleaning\n" +"help - this screen\n" +"? - help for prompt selection" +msgstr "" + +#: builtin/clean.c:817 +msgid "*** Commands ***" +msgstr "" + +#: builtin/clean.c:818 +msgid "What now" +msgstr "" + +#: builtin/clean.c:826 +msgid "Would remove the following item:" +msgid_plural "Would remove the following items:" +msgstr[0] "" +msgstr[1] "" + +#: builtin/clean.c:843 +msgid "No more files to clean, exiting." +msgstr "" + +#: builtin/clean.c:874 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:162 +#: builtin/clean.c:876 msgid "force" msgstr "" -#: builtin/clean.c:164 +#: builtin/clean.c:877 +msgid "interactive cleaning" +msgstr "" + +#: builtin/clean.c:879 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717 -#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182 +#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718 +#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185 msgid "pattern" msgstr "" -#: builtin/clean.c:166 +#: builtin/clean.c:881 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:167 +#: builtin/clean.c:882 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:169 +#: builtin/clean.c:884 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:187 +#: builtin/clean.c:902 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:191 +#: builtin/clean.c:906 msgid "" -"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +"clean.requireForce set to true and neither -i, -n nor -f given; refusing to " +"clean" msgstr "" -#: builtin/clean.c:194 +#: builtin/clean.c:909 msgid "" -"clean.requireForce defaults to true and neither -n nor -f given; refusing to " -"clean" +"clean.requireForce defaults to true and neither -i, -n nor -f given; " +"refusing to clean" msgstr "" #: builtin/clone.c:36 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 -#: builtin/push.c:436 +#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229 +#: builtin/push.c:474 msgid "force progress reporting" msgstr "" @@ -3025,198 +3600,222 @@ msgstr "" msgid "create a bare repository" msgstr "" -#: builtin/clone.c:72 +#: builtin/clone.c:71 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:74 +#: builtin/clone.c:73 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:76 +#: builtin/clone.c:75 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:78 +#: builtin/clone.c:77 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:80 builtin/clone.c:82 +#: builtin/clone.c:79 builtin/clone.c:81 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:83 builtin/init-db.c:485 +#: builtin/clone.c:82 builtin/init-db.c:485 msgid "template-directory" msgstr "" -#: builtin/clone.c:84 builtin/init-db.c:486 +#: builtin/clone.c:83 builtin/init-db.c:486 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:86 +#: builtin/clone.c:85 msgid "reference repository" msgstr "" -#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "" -#: builtin/clone.c:88 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:90 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:92 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662 +#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663 msgid "depth" msgstr "" -#: builtin/clone.c:94 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:96 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:97 builtin/init-db.c:494 +#: builtin/clone.c:96 builtin/init-db.c:494 msgid "gitdir" msgstr "" -#: builtin/clone.c:98 builtin/init-db.c:495 +#: builtin/clone.c:97 builtin/init-db.c:495 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:99 +#: builtin/clone.c:98 msgid "key=value" msgstr "" -#: builtin/clone.c:100 +#: builtin/clone.c:99 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:243 +#: builtin/clone.c:252 #, 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:315 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/clone.c:308 builtin/diff.c:77 +#: builtin/clone.c:317 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" msgstr "" -#: builtin/clone.c:310 +#: builtin/clone.c:319 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:324 +#: builtin/clone.c:333 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:346 +#: builtin/clone.c:355 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:350 +#: builtin/clone.c:359 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:373 +#: builtin/clone.c:382 builtin/clone.c:559 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:443 +#: builtin/clone.c:395 +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:474 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:552 +#: builtin/clone.c:554 +#, c-format +msgid "Checking connectivity... " +msgstr "" + +#: builtin/clone.c:557 +msgid "remote did not send all necessary objects" +msgstr "" + +#: builtin/clone.c:620 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:690 +#: builtin/clone.c:651 +msgid "unable to checkout working tree" +msgstr "" + +#: builtin/clone.c:759 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:694 +#: builtin/clone.c:763 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:705 +#: builtin/clone.c:774 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:708 +#: builtin/clone.c:777 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:721 +#: builtin/clone.c:790 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:726 +#: builtin/clone.c:795 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:736 +#: builtin/clone.c:797 +msgid "--local is ignored" +msgstr "" + +#: builtin/clone.c:807 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:746 +#: builtin/clone.c:817 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:759 builtin/clone.c:771 +#: builtin/clone.c:830 builtin/clone.c:842 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:762 +#: builtin/clone.c:833 #, c-format msgid "could not create work tree dir '%s'." msgstr "" -#: builtin/clone.c:781 +#: builtin/clone.c:852 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:783 +#: builtin/clone.c:854 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:818 +#: builtin/clone.c:888 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:867 +#: builtin/clone.c:939 builtin/clone.c:947 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:874 +#: builtin/clone.c:950 msgid "You appear to have cloned an empty repository." msgstr "" @@ -3252,15 +3851,15 @@ msgstr "" msgid "--command must be the first argument" msgstr "" -#: builtin/commit.c:34 +#: builtin/commit.c:36 msgid "git commit [options] [--] <pathspec>..." msgstr "" -#: builtin/commit.c:39 +#: builtin/commit.c:41 msgid "git status [options] [--] <pathspec>..." msgstr "" -#: builtin/commit.c:44 +#: builtin/commit.c:46 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3274,110 +3873,123 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: builtin/commit.c:56 +#: builtin/commit.c:58 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -#: builtin/commit.c:61 +#: builtin/commit.c:63 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" "\n" " git commit --allow-empty\n" "\n" -"Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:258 +#: builtin/commit.c:70 +msgid "Otherwise, please use 'git reset'\n" +msgstr "" + +#: builtin/commit.c:73 +msgid "" +"If you wish to skip this commit, use:\n" +"\n" +" git reset\n" +"\n" +"Then \"git cherry-pick --continue\" will resume cherry-picking\n" +"the remaining commits.\n" +msgstr "" + +#: builtin/commit.c:287 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:300 +#: builtin/commit.c:329 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:306 +#: builtin/commit.c:335 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410 +#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:391 +#: builtin/commit.c:420 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:393 +#: builtin/commit.c:422 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:403 +#: builtin/commit.c:432 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:423 +#: builtin/commit.c:452 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:511 builtin/commit.c:517 +#: builtin/commit.c:543 builtin/commit.c:549 #, c-format msgid "invalid commit: %s" msgstr "" -#: builtin/commit.c:540 +#: builtin/commit.c:571 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:560 +#: builtin/commit.c:591 #, c-format msgid "Malformed ident string: '%s'" msgstr "" -#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954 +#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:610 builtin/shortlog.c:272 +#: builtin/commit.c:642 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:612 +#: builtin/commit.c:644 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:616 +#: builtin/commit.c:648 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:622 +#: builtin/commit.c:654 msgid "commit has empty message" msgstr "" -#: builtin/commit.c:638 +#: builtin/commit.c:670 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:642 +#: builtin/commit.c:674 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:646 +#: builtin/commit.c:678 #, c-format msgid "could not read '%s'" msgstr "" -#: builtin/commit.c:707 +#: builtin/commit.c:749 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:718 +#: builtin/commit.c:760 #, c-format msgid "" "\n" @@ -3387,7 +3999,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:723 +#: builtin/commit.c:765 #, c-format msgid "" "\n" @@ -3397,14 +4009,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:735 +#: builtin/commit.c:777 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:740 +#: builtin/commit.c:782 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -3412,605 +4024,625 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:753 +#: builtin/commit.c:795 #, c-format msgid "%sAuthor: %s" msgstr "" -#: builtin/commit.c:760 +#: builtin/commit.c:802 #, c-format msgid "%sCommitter: %s" msgstr "" -#: builtin/commit.c:780 +#: builtin/commit.c:822 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:817 +#: builtin/commit.c:865 msgid "Error building trees" msgstr "" -#: builtin/commit.c:832 builtin/tag.c:359 +#: builtin/commit.c:880 builtin/tag.c:359 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:929 +#: builtin/commit.c:982 #, c-format msgid "No existing author found with '%s'" msgstr "" -#: builtin/commit.c:944 builtin/commit.c:1138 +#: builtin/commit.c:997 builtin/commit.c:1237 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:974 +#: builtin/commit.c:1034 +msgid "--long and -z are incompatible" +msgstr "" + +#: builtin/commit.c:1064 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:985 +#: builtin/commit.c:1075 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:988 +#: builtin/commit.c:1078 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:990 +#: builtin/commit.c:1080 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:993 +#: builtin/commit.c:1083 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1003 +#: builtin/commit.c:1093 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1005 +#: builtin/commit.c:1095 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1013 +#: builtin/commit.c:1103 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1030 +#: builtin/commit.c:1120 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1032 +#: builtin/commit.c:1122 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1034 +#: builtin/commit.c:1124 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1036 +#: builtin/commit.c:1126 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1046 builtin/tag.c:575 +#: builtin/commit.c:1136 builtin/tag.c:572 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1051 +#: builtin/commit.c:1141 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1057 builtin/commit.c:1192 -msgid "--long and -z are incompatible" -msgstr "" - -#: builtin/commit.c:1152 builtin/commit.c:1388 +#: builtin/commit.c:1251 builtin/commit.c:1482 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1154 builtin/commit.c:1390 +#: builtin/commit.c:1253 builtin/commit.c:1484 msgid "show branch information" msgstr "" -#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426 +#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1159 builtin/commit.c:1394 +#: builtin/commit.c:1258 builtin/commit.c:1488 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1162 builtin/commit.c:1397 +#: builtin/commit.c:1261 builtin/commit.c:1491 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647 -#: builtin/fast-export.c:650 builtin/tag.c:459 +#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674 +#: builtin/fast-export.c:677 builtin/tag.c:459 msgid "mode" msgstr "" -#: builtin/commit.c:1165 builtin/commit.c:1400 +#: builtin/commit.c:1264 builtin/commit.c:1494 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1168 +#: builtin/commit.c:1267 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1169 parse-options.h:151 +#: builtin/commit.c:1268 parse-options.h:156 msgid "when" msgstr "" -#: builtin/commit.c:1170 +#: builtin/commit.c:1269 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1172 +#: builtin/commit.c:1271 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1246 +#: builtin/commit.c:1340 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1248 +#: builtin/commit.c:1342 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1289 +#: builtin/commit.c:1383 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1291 +#: builtin/commit.c:1385 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1358 +#: builtin/commit.c:1452 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1359 +#: builtin/commit.c:1453 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1361 +#: builtin/commit.c:1455 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1362 builtin/tag.c:457 +#: builtin/commit.c:1456 builtin/tag.c:457 msgid "read message from file" msgstr "" -#: builtin/commit.c:1363 +#: builtin/commit.c:1457 msgid "author" msgstr "" -#: builtin/commit.c:1363 +#: builtin/commit.c:1457 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1364 builtin/gc.c:178 +#: builtin/commit.c:1458 builtin/gc.c:260 msgid "date" msgstr "" -#: builtin/commit.c:1364 +#: builtin/commit.c:1458 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533 -#: builtin/notes.c:690 builtin/tag.c:455 +#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405 +#: builtin/notes.c:562 builtin/tag.c:455 msgid "message" msgstr "" -#: builtin/commit.c:1365 +#: builtin/commit.c:1459 msgid "commit message" msgstr "" -#: builtin/commit.c:1366 +#: builtin/commit.c:1460 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1367 +#: builtin/commit.c:1461 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1368 +#: builtin/commit.c:1462 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1369 +#: builtin/commit.c:1463 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1370 +#: builtin/commit.c:1464 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109 +#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1372 +#: builtin/commit.c:1466 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1373 +#: builtin/commit.c:1467 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1374 +#: builtin/commit.c:1468 msgid "default" msgstr "" -#: builtin/commit.c:1374 builtin/tag.c:460 +#: builtin/commit.c:1468 builtin/tag.c:460 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1375 +#: builtin/commit.c:1469 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461 +#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461 msgid "key id" msgstr "" -#: builtin/commit.c:1377 builtin/merge.c:214 +#: builtin/commit.c:1471 builtin/merge.c:231 msgid "GPG sign commit" msgstr "" #. end commit message options -#: builtin/commit.c:1380 +#: builtin/commit.c:1474 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1381 +#: builtin/commit.c:1475 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1382 +#: builtin/commit.c:1476 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1383 +#: builtin/commit.c:1477 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1384 +#: builtin/commit.c:1478 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1385 +#: builtin/commit.c:1479 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1386 +#: builtin/commit.c:1480 msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1387 +#: builtin/commit.c:1481 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1398 +#: builtin/commit.c:1492 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1399 +#: builtin/commit.c:1493 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1404 +#: builtin/commit.c:1498 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1407 +#: builtin/commit.c:1500 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1439 +#: builtin/commit.c:1529 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1477 builtin/merge.c:508 +#: builtin/commit.c:1567 builtin/merge.c:525 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1484 +#: builtin/commit.c:1574 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1491 +#: builtin/commit.c:1581 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1510 +#: builtin/commit.c:1600 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1524 +#: builtin/commit.c:1614 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1529 +#: builtin/commit.c:1619 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857 +#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1565 +#: builtin/commit.c:1655 msgid "cannot lock HEAD ref" msgstr "" -#: builtin/commit.c:1569 +#: builtin/commit.c:1659 msgid "cannot update HEAD ref" msgstr "" -#: builtin/commit.c:1580 +#: builtin/commit.c:1670 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" -#: builtin/config.c:7 +#: builtin/config.c:8 msgid "git config [options]" msgstr "" -#: builtin/config.c:51 +#: builtin/config.c:54 msgid "Config file location" msgstr "" -#: builtin/config.c:52 +#: builtin/config.c:55 msgid "use global config file" msgstr "" -#: builtin/config.c:53 +#: builtin/config.c:56 msgid "use system config file" msgstr "" -#: builtin/config.c:54 +#: builtin/config.c:57 msgid "use repository config file" msgstr "" -#: builtin/config.c:55 +#: builtin/config.c:58 msgid "use given config file" msgstr "" -#: builtin/config.c:56 +#: builtin/config.c:59 +msgid "blob-id" +msgstr "" + +#: builtin/config.c:59 +msgid "read config from given blob object" +msgstr "" + +#: builtin/config.c:60 msgid "Action" msgstr "" -#: builtin/config.c:57 +#: builtin/config.c:61 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:58 +#: builtin/config.c:62 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:59 +#: builtin/config.c:63 msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/config.c:60 +#: builtin/config.c:64 +msgid "get value specific for the URL: section[.var] URL" +msgstr "" + +#: builtin/config.c:65 msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/config.c:61 +#: builtin/config.c:66 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:62 +#: builtin/config.c:67 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:63 +#: builtin/config.c:68 msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/config.c:64 +#: builtin/config.c:69 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:65 +#: builtin/config.c:70 msgid "remove a section: name" msgstr "" -#: builtin/config.c:66 +#: builtin/config.c:71 msgid "list all" msgstr "" -#: builtin/config.c:67 +#: builtin/config.c:72 msgid "open an editor" msgstr "" -#: builtin/config.c:68 builtin/config.c:69 +#: builtin/config.c:73 builtin/config.c:74 msgid "slot" msgstr "" -#: builtin/config.c:68 +#: builtin/config.c:73 msgid "find the color configured: [default]" msgstr "" -#: builtin/config.c:69 +#: builtin/config.c:74 msgid "find the color setting: [stdout-is-tty]" msgstr "" -#: builtin/config.c:70 +#: builtin/config.c:75 msgid "Type" msgstr "" -#: builtin/config.c:71 +#: builtin/config.c:76 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:72 +#: builtin/config.c:77 msgid "value is decimal number" msgstr "" -#: builtin/config.c:73 +#: builtin/config.c:78 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:74 +#: builtin/config.c:79 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:75 +#: builtin/config.c:80 msgid "Other" msgstr "" -#: builtin/config.c:76 +#: builtin/config.c:81 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:77 +#: builtin/config.c:82 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/describe.c:15 -msgid "git describe [options] <committish>*" +#: builtin/count-objects.c:97 +msgid "print sizes in human readable format" msgstr "" #: builtin/describe.c:16 +msgid "git describe [options] <commit-ish>*" +msgstr "" + +#: builtin/describe.c:17 msgid "git describe [options] --dirty" msgstr "" -#: builtin/describe.c:234 +#: builtin/describe.c:237 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:238 +#: builtin/describe.c:241 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:240 +#: builtin/describe.c:243 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:267 +#: builtin/describe.c:270 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:270 +#: builtin/describe.c:273 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: builtin/describe.c:287 +#: builtin/describe.c:290 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:289 +#: builtin/describe.c:292 #, c-format msgid "searching to describe %s\n" msgstr "" -#: builtin/describe.c:329 +#: builtin/describe.c:332 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:353 +#: builtin/describe.c:359 #, 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:363 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:378 +#: builtin/describe.c:384 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:381 +#: builtin/describe.c:387 #, 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:409 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:404 +#: builtin/describe.c:410 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:405 -msgid "use any ref in .git/refs" +#: builtin/describe.c:411 +msgid "use any ref" msgstr "" -#: builtin/describe.c:406 -msgid "use any tag in .git/refs/tags" +#: builtin/describe.c:412 +msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:407 +#: builtin/describe.c:413 msgid "always use long format" msgstr "" -#: builtin/describe.c:410 +#: builtin/describe.c:414 +msgid "only follow first parent" +msgstr "" + +#: builtin/describe.c:417 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:412 +#: builtin/describe.c:419 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:414 +#: builtin/describe.c:421 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:416 builtin/name-rev.c:238 +#: builtin/describe.c:423 builtin/name-rev.c:322 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:417 +#: builtin/describe.c:424 msgid "mark" msgstr "" -#: builtin/describe.c:418 +#: builtin/describe.c:425 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:436 +#: builtin/describe.c:443 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:462 +#: builtin/describe.c:469 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:482 -msgid "--dirty is incompatible with committishes" +#: builtin/describe.c:489 +msgid "--dirty is incompatible with commit-ishes" msgstr "" #: builtin/diff.c:79 @@ -4018,31 +4650,26 @@ msgstr "" msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:228 +#: builtin/diff.c:230 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:305 +#: builtin/diff.c:307 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:348 +#: builtin/diff.c:350 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:353 -#, c-format -msgid "more than %d trees given: '%s'" -msgstr "" - -#: builtin/diff.c:363 +#: builtin/diff.c:359 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:371 +#: builtin/diff.c:366 #, c-format msgid "unhandled object '%s' given." msgstr "" @@ -4051,39 +4678,39 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:646 +#: builtin/fast-export.c:673 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:648 +#: builtin/fast-export.c:675 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:651 +#: builtin/fast-export.c:678 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:654 +#: builtin/fast-export.c:681 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:656 +#: builtin/fast-export.c:683 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:658 +#: builtin/fast-export.c:685 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:660 +#: builtin/fast-export.c:687 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:662 +#: builtin/fast-export.c:689 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:663 +#: builtin/fast-export.c:690 msgid "Skip output of blob data" msgstr "" @@ -4103,230 +4730,230 @@ msgstr "" msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:60 +#: builtin/fetch.c:74 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:62 +#: builtin/fetch.c:76 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:64 +#: builtin/fetch.c:78 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:65 +#: builtin/fetch.c:79 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:67 +#: builtin/fetch.c:81 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:69 +#: builtin/fetch.c:83 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:71 +#: builtin/fetch.c:85 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:73 +#: builtin/fetch.c:87 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:74 +#: builtin/fetch.c:88 msgid "on-demand" msgstr "" -#: builtin/fetch.c:75 +#: builtin/fetch.c:89 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:79 +#: builtin/fetch.c:93 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:81 +#: builtin/fetch.c:95 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:84 +#: builtin/fetch.c:98 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:86 +#: builtin/fetch.c:100 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:88 builtin/log.c:1119 +#: builtin/fetch.c:102 builtin/log.c:1197 msgid "dir" msgstr "" -#: builtin/fetch.c:89 +#: builtin/fetch.c:103 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:92 +#: builtin/fetch.c:106 msgid "default mode for recursion" msgstr "" -#: builtin/fetch.c:204 +#: builtin/fetch.c:236 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:257 +#: builtin/fetch.c:290 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:262 +#: builtin/fetch.c:295 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:276 +#: builtin/fetch.c:309 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:277 builtin/fetch.c:363 +#: builtin/fetch.c:310 builtin/fetch.c:396 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:288 +#: builtin/fetch.c:321 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 +#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376 msgid " (unable to update local ref)" msgstr "" -#: builtin/fetch.c:308 +#: builtin/fetch.c:341 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:311 +#: builtin/fetch.c:344 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:314 +#: builtin/fetch.c:347 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:359 +#: builtin/fetch.c:392 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:359 +#: builtin/fetch.c:392 msgid "forced update" msgstr "" -#: builtin/fetch.c:365 +#: builtin/fetch.c:398 msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:396 builtin/fetch.c:688 +#: builtin/fetch.c:429 builtin/fetch.c:735 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: builtin/fetch.c:405 +#: builtin/fetch.c:438 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:491 +#: builtin/fetch.c:537 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:502 +#: builtin/fetch.c:548 #, 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:552 +#: builtin/fetch.c:598 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:553 +#: builtin/fetch.c:599 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:560 +#: builtin/fetch.c:606 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:561 builtin/remote.c:1055 +#: builtin/fetch.c:607 builtin/remote.c:1055 msgid "(none)" msgstr "" -#: builtin/fetch.c:678 +#: builtin/fetch.c:725 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:712 +#: builtin/fetch.c:744 #, c-format -msgid "Don't know how to fetch from %s" +msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:789 +#: builtin/fetch.c:747 #, c-format -msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:792 +#: builtin/fetch.c:801 #, c-format -msgid "Option \"%s\" is ignored for %s\n" +msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:894 +#: builtin/fetch.c:976 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:896 builtin/remote.c:100 +#: builtin/fetch.c:978 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:915 +#: builtin/fetch.c:997 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:935 +#: builtin/fetch.c:1020 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:981 +#: builtin/fetch.c:1068 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:983 +#: builtin/fetch.c:1070 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1002 +#: builtin/fetch.c:1089 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1004 +#: builtin/fetch.c:1091 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1015 +#: builtin/fetch.c:1102 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1023 +#: builtin/fetch.c:1110 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -4334,159 +4961,170 @@ msgstr "" msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701 -#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175 -#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702 +#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178 +#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245 msgid "n" msgstr "" -#: builtin/fmt-merge-msg.c:660 +#: builtin/fmt-merge-msg.c:664 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:663 +#: builtin/fmt-merge-msg.c:667 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:670 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:671 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:668 +#: builtin/fmt-merge-msg.c:672 msgid "file to read from" msgstr "" -#: builtin/for-each-ref.c:979 +#: builtin/for-each-ref.c:995 msgid "git for-each-ref [options] [<pattern>]" msgstr "" -#: builtin/for-each-ref.c:994 +#: builtin/for-each-ref.c:1010 msgid "quote placeholders suitably for shells" msgstr "" -#: builtin/for-each-ref.c:996 +#: builtin/for-each-ref.c:1012 msgid "quote placeholders suitably for perl" msgstr "" -#: builtin/for-each-ref.c:998 +#: builtin/for-each-ref.c:1014 msgid "quote placeholders suitably for python" msgstr "" -#: builtin/for-each-ref.c:1000 +#: builtin/for-each-ref.c:1016 msgid "quote placeholders suitably for tcl" msgstr "" -#: builtin/for-each-ref.c:1003 +#: builtin/for-each-ref.c:1019 msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:1004 +#: builtin/for-each-ref.c:1020 msgid "format" msgstr "" -#: builtin/for-each-ref.c:1004 +#: builtin/for-each-ref.c:1020 msgid "format to use for the output" msgstr "" -#: builtin/for-each-ref.c:1005 +#: builtin/for-each-ref.c:1021 msgid "key" msgstr "" -#: builtin/for-each-ref.c:1006 +#: builtin/for-each-ref.c:1022 msgid "field name to sort on" msgstr "" -#: builtin/fsck.c:608 +#: builtin/fsck.c:607 msgid "git fsck [options] [<object>...]" msgstr "" -#: builtin/fsck.c:614 +#: builtin/fsck.c:613 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:615 +#: builtin/fsck.c:614 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:616 +#: builtin/fsck.c:615 msgid "report tags" msgstr "" -#: builtin/fsck.c:617 +#: builtin/fsck.c:616 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:618 +#: builtin/fsck.c:617 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:619 +#: builtin/fsck.c:618 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:620 +#: builtin/fsck.c:619 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:621 +#: builtin/fsck.c:620 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:623 +#: builtin/fsck.c:622 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:624 builtin/prune.c:134 +#: builtin/fsck.c:623 builtin/prune.c:134 msgid "show progress" msgstr "" -#: builtin/gc.c:22 +#: builtin/gc.c:23 msgid "git gc [options]" msgstr "" -#: builtin/gc.c:63 +#: builtin/gc.c:79 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: builtin/gc.c:90 +#: builtin/gc.c:106 #, c-format msgid "insanely long object directory %.*s" msgstr "" -#: builtin/gc.c:179 +#: builtin/gc.c:261 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:181 +#: builtin/gc.c:263 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:182 +#: builtin/gc.c:264 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:222 +#: builtin/gc.c:265 +msgid "force running gc even if there may be another gc running" +msgstr "" + +#: builtin/gc.c:305 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" "run \"git gc\" manually. See \"git help gc\" for more information.\n" msgstr "" -#: builtin/gc.c:249 +#. be quiet on --auto +#: builtin/gc.c:315 +#, c-format +msgid "" +"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" +msgstr "" + +#: builtin/gc.c:340 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -#: builtin/grep.c:22 +#: builtin/grep.c:23 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" -#: builtin/grep.c:217 +#: builtin/grep.c:218 #, c-format msgid "grep: failed to create thread: %s" msgstr "" @@ -4516,200 +5154,199 @@ msgstr "" msgid "cannot open '%s'" msgstr "" -#: builtin/grep.c:643 +#: builtin/grep.c:642 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:645 +#: builtin/grep.c:644 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:647 +#: builtin/grep.c:646 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:649 +#: builtin/grep.c:648 msgid "search also in ignored files" msgstr "" -#: builtin/grep.c:652 +#: builtin/grep.c:651 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:654 +#: builtin/grep.c:653 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:656 +#: builtin/grep.c:655 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:658 +#: builtin/grep.c:657 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:660 +#: builtin/grep.c:659 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:663 +#: builtin/grep.c:662 +msgid "process binary files with textconv filters" +msgstr "" + +#: builtin/grep.c:664 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:667 +#: builtin/grep.c:668 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:670 +#: builtin/grep.c:671 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:673 +#: builtin/grep.c:674 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:676 +#: builtin/grep.c:677 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:679 +#: builtin/grep.c:680 msgid "show line numbers" msgstr "" -#: builtin/grep.c:680 +#: builtin/grep.c:681 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:681 +#: builtin/grep.c:682 msgid "show filenames" msgstr "" -#: builtin/grep.c:683 +#: builtin/grep.c:684 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:685 +#: builtin/grep.c:686 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:687 +#: builtin/grep.c:688 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:690 +#: builtin/grep.c:691 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:692 +#: builtin/grep.c:693 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:694 +#: builtin/grep.c:695 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:695 +#: builtin/grep.c:696 msgid "highlight matches" msgstr "" -#: builtin/grep.c:697 +#: builtin/grep.c:698 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:699 +#: builtin/grep.c:700 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:702 +#: builtin/grep.c:703 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:705 +#: builtin/grep.c:706 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:707 +#: builtin/grep.c:708 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:708 +#: builtin/grep.c:709 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:711 +#: builtin/grep.c:712 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:713 +#: builtin/grep.c:714 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:716 +#: builtin/grep.c:717 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:718 +#: builtin/grep.c:719 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:720 +#: builtin/grep.c:721 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:732 +#: builtin/grep.c:733 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:734 +#: builtin/grep.c:735 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:736 +#: builtin/grep.c:737 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:740 +#: builtin/grep.c:741 msgid "pager" msgstr "" -#: builtin/grep.c:740 +#: builtin/grep.c:741 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:743 +#: builtin/grep.c:744 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:744 builtin/show-ref.c:184 +#: builtin/grep.c:745 builtin/show-ref.c:187 msgid "show usage" msgstr "" -#: builtin/grep.c:811 +#: builtin/grep.c:812 msgid "no pattern given." msgstr "" -#: builtin/grep.c:825 -#, c-format -msgid "bad object %s" -msgstr "" - -#: builtin/grep.c:868 +#: builtin/grep.c:870 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:891 +#: builtin/grep.c:893 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:896 +#: builtin/grep.c:898 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:907 +#: builtin/grep.c:909 msgid "both --cached and trees are given." msgstr "" @@ -4747,10 +5384,14 @@ msgstr "" msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:42 +#: builtin/help.c:41 msgid "print all available commands" msgstr "" +#: builtin/help.c:42 +msgid "print list of useful guides" +msgstr "" + #: builtin/help.c:43 msgid "show man page" msgstr "" @@ -4764,7 +5405,7 @@ msgid "show info page" msgstr "" #: builtin/help.c:52 -msgid "git help [--all] [--man|--web|--info] [command]" +msgid "git help [--all] [--guides] [--man|--web|--info] [command]" msgstr "" #: builtin/help.c:64 @@ -4817,290 +5458,322 @@ msgstr "" msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:429 builtin/help.c:436 +#: builtin/help.c:420 +msgid "Defining attributes per path" +msgstr "" + +#: builtin/help.c:421 +msgid "A Git glossary" +msgstr "" + +#: builtin/help.c:422 +msgid "Specifies intentionally untracked files to ignore" +msgstr "" + +#: builtin/help.c:423 +msgid "Defining submodule properties" +msgstr "" + +#: builtin/help.c:424 +msgid "Specifying revisions and ranges for Git" +msgstr "" + +#: builtin/help.c:425 +msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" +msgstr "" + +#: builtin/help.c:426 +msgid "An overview of recommended workflows with Git" +msgstr "" + +#: builtin/help.c:438 +msgid "The common Git guides are:\n" +msgstr "" + +#: builtin/help.c:460 builtin/help.c:476 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/help.c:452 +#: builtin/help.c:492 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "" -#: builtin/index-pack.c:170 +#: builtin/index-pack.c:184 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:190 +#: builtin/index-pack.c:204 msgid "object of unexpected type" msgstr "" -#: builtin/index-pack.c:227 +#: builtin/index-pack.c:244 #, 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:254 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:238 +#: builtin/index-pack.c:255 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:250 +#: builtin/index-pack.c:267 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:257 +#: builtin/index-pack.c:274 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:273 +#: builtin/index-pack.c:290 #, c-format msgid "unable to create '%s'" msgstr "" -#: builtin/index-pack.c:278 +#: builtin/index-pack.c:295 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:292 +#: builtin/index-pack.c:309 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:294 +#: builtin/index-pack.c:311 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:329 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "" -#: builtin/index-pack.c:434 +#: builtin/index-pack.c:451 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:483 +#: builtin/index-pack.c:500 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:491 +#: builtin/index-pack.c:508 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:499 +#: builtin/index-pack.c:516 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:547 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:532 +#: builtin/index-pack.c:549 #, 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:575 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:666 builtin/index-pack.c:672 builtin/index-pack.c:695 +#: builtin/index-pack.c:729 builtin/index-pack.c:738 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:652 builtin/pack-objects.c:170 -#: builtin/pack-objects.c:262 +#: builtin/index-pack.c:669 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:263 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:718 +#: builtin/index-pack.c:735 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:732 +#: builtin/index-pack.c:749 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:747 +#: builtin/index-pack.c:763 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:749 +#: builtin/index-pack.c:766 msgid "Error in object" msgstr "" -#: builtin/index-pack.c:751 +#: builtin/index-pack.c:768 #, 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:839 builtin/index-pack.c:869 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:986 +#: builtin/index-pack.c:1010 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:986 +#: builtin/index-pack.c:1010 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1012 +#: builtin/index-pack.c:1036 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1017 +#: builtin/index-pack.c:1041 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1020 +#: builtin/index-pack.c:1044 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1031 +#: builtin/index-pack.c:1055 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1054 +#: builtin/index-pack.c:1078 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1064 +#: builtin/index-pack.c:1088 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1106 +#: builtin/index-pack.c:1130 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1112 +#: builtin/index-pack.c:1138 #, c-format msgid "completed with %d local objects" msgstr "" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1148 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1125 +#: builtin/index-pack.c:1152 #, 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:1177 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1229 +#: builtin/index-pack.c:1256 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1253 +#: builtin/index-pack.c:1280 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1266 +#: builtin/index-pack.c:1293 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1274 +#: builtin/index-pack.c:1301 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1287 +#: builtin/index-pack.c:1314 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1298 +#: builtin/index-pack.c:1325 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1331 +#: builtin/index-pack.c:1358 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1337 +#: builtin/index-pack.c:1364 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/index-pack.c:1341 builtin/index-pack.c:1514 +#: builtin/index-pack.c:1368 builtin/index-pack.c:1546 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/index-pack.c:1399 +#: builtin/index-pack.c:1426 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1428 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1448 +#: builtin/index-pack.c:1475 #, 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:1482 #, 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:1510 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:1558 builtin/index-pack.c:1561 +#: builtin/index-pack.c:1573 builtin/index-pack.c:1577 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1559 +#: builtin/index-pack.c:1591 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1563 builtin/index-pack.c:1573 +#: builtin/index-pack.c:1595 builtin/index-pack.c:1605 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1582 +#: builtin/index-pack.c:1614 msgid "--verify with no packfile name given" msgstr "" @@ -5189,11 +5862,6 @@ msgstr "" msgid "unable to move %s to %s" msgstr "" -#: builtin/init-db.c:363 -#, c-format -msgid "Could not create git link %s" -msgstr "" - #. #. * TRANSLATORS: The first '%s' is either "Reinitialized #. * existing" or "Initialized empty", the second " shared" or @@ -5234,7 +5902,7 @@ msgstr "" msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:493 builtin/prune-packed.c:77 +#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155 msgid "be quiet" msgstr "" @@ -5264,381 +5932,389 @@ msgstr "" msgid "Cannot access work tree '%s'" msgstr "" -#: builtin/log.c:39 -msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" +#: builtin/log.c:41 +msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" msgstr "" -#: builtin/log.c:40 +#: builtin/log.c:42 msgid " or: git show [options] <object>..." msgstr "" -#: builtin/log.c:102 +#: builtin/log.c:125 msgid "suppress diff output" msgstr "" -#: builtin/log.c:103 +#: builtin/log.c:126 msgid "show source" msgstr "" -#: builtin/log.c:104 +#: builtin/log.c:127 msgid "Use mail map file" msgstr "" -#: builtin/log.c:105 +#: builtin/log.c:128 msgid "decorate options" msgstr "" -#: builtin/log.c:198 +#: builtin/log.c:231 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:419 builtin/log.c:511 +#: builtin/log.c:473 builtin/log.c:565 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:535 +#: builtin/log.c:589 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:627 +#: builtin/log.c:689 msgid "format.headers without value" msgstr "" -#: builtin/log.c:701 +#: builtin/log.c:771 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:717 +#: builtin/log.c:787 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:731 +#: builtin/log.c:801 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:739 +#: builtin/log.c:809 msgid "Not a range." msgstr "" -#: builtin/log.c:812 +#: builtin/log.c:911 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:885 +#: builtin/log.c:987 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:913 +#: builtin/log.c:1015 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "" -#: builtin/log.c:958 +#: builtin/log.c:1060 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1097 +#: builtin/log.c:1175 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1100 +#: builtin/log.c:1178 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1104 +#: builtin/log.c:1182 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1106 +#: builtin/log.c:1184 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1108 +#: builtin/log.c:1186 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1109 +#: builtin/log.c:1187 msgid "sfx" msgstr "" -#: builtin/log.c:1110 +#: builtin/log.c:1188 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1112 +#: builtin/log.c:1190 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1114 +#: builtin/log.c:1192 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1116 +#: builtin/log.c:1194 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1119 +#: builtin/log.c:1197 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1122 +#: builtin/log.c:1200 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1125 +#: builtin/log.c:1203 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1127 +#: builtin/log.c:1205 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1129 +#: builtin/log.c:1207 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1131 +#: builtin/log.c:1209 msgid "Messaging" msgstr "" -#: builtin/log.c:1132 +#: builtin/log.c:1210 msgid "header" msgstr "" -#: builtin/log.c:1133 +#: builtin/log.c:1211 msgid "add email header" msgstr "" -#: builtin/log.c:1134 builtin/log.c:1136 +#: builtin/log.c:1212 builtin/log.c:1214 msgid "email" msgstr "" -#: builtin/log.c:1134 +#: builtin/log.c:1212 msgid "add To: header" msgstr "" -#: builtin/log.c:1136 +#: builtin/log.c:1214 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1138 +#: builtin/log.c:1216 +msgid "ident" +msgstr "" + +#: builtin/log.c:1217 +msgid "set From address to <ident> (or committer ident if absent)" +msgstr "" + +#: builtin/log.c:1219 msgid "message-id" msgstr "" -#: builtin/log.c:1139 +#: builtin/log.c:1220 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1140 builtin/log.c:1143 +#: builtin/log.c:1221 builtin/log.c:1224 msgid "boundary" msgstr "" -#: builtin/log.c:1141 +#: builtin/log.c:1222 msgid "attach the patch" msgstr "" -#: builtin/log.c:1144 +#: builtin/log.c:1225 msgid "inline the patch" msgstr "" -#: builtin/log.c:1148 +#: builtin/log.c:1229 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1150 +#: builtin/log.c:1231 msgid "signature" msgstr "" -#: builtin/log.c:1151 +#: builtin/log.c:1232 msgid "add a signature" msgstr "" -#: builtin/log.c:1153 +#: builtin/log.c:1233 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1202 +#: builtin/log.c:1307 #, c-format -msgid "bogus committer info %s" +msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1247 +#: builtin/log.c:1322 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1249 +#: builtin/log.c:1324 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1257 +#: builtin/log.c:1332 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1259 +#: builtin/log.c:1334 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1261 +#: builtin/log.c:1336 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1284 +#: builtin/log.c:1359 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1286 +#: builtin/log.c:1361 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1439 +#: builtin/log.c:1509 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1488 +#: builtin/log.c:1558 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1543 +#: builtin/log.c:1613 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570 +#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640 #, c-format msgid "Unknown commit %s" msgstr "" -#: builtin/ls-files.c:409 +#: builtin/ls-files.c:398 msgid "git ls-files [options] [<file>...]" msgstr "" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:455 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:457 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:459 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:472 +#: builtin/ls-files.c:461 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:474 +#: builtin/ls-files.c:463 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:476 +#: builtin/ls-files.c:465 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:478 +#: builtin/ls-files.c:467 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:481 +#: builtin/ls-files.c:470 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:472 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:474 msgid "show 'other' directories' name only" msgstr "" -#: builtin/ls-files.c:488 +#: builtin/ls-files.c:477 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:491 +#: builtin/ls-files.c:480 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:482 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:484 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:487 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:490 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:492 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:506 +#: builtin/ls-files.c:495 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:509 +#: builtin/ls-files.c:498 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:510 +#: builtin/ls-files.c:499 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:511 +#: builtin/ls-files.c:500 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:513 +#: builtin/ls-files.c:502 msgid "show debugging data" msgstr "" -#: builtin/ls-tree.c:27 +#: builtin/ls-tree.c:28 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "" -#: builtin/ls-tree.c:125 +#: builtin/ls-tree.c:126 msgid "only show trees" msgstr "" -#: builtin/ls-tree.c:127 +#: builtin/ls-tree.c:128 msgid "recurse into subtrees" msgstr "" -#: builtin/ls-tree.c:129 +#: builtin/ls-tree.c:130 msgid "show trees when recursing" msgstr "" -#: builtin/ls-tree.c:132 +#: builtin/ls-tree.c:133 msgid "terminate entries with NUL byte" msgstr "" -#: builtin/ls-tree.c:133 +#: builtin/ls-tree.c:134 msgid "include object size" msgstr "" -#: builtin/ls-tree.c:135 builtin/ls-tree.c:137 +#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 msgid "list only filenames" msgstr "" -#: builtin/ls-tree.c:140 +#: builtin/ls-tree.c:141 msgid "use full path names" msgstr "" -#: builtin/ls-tree.c:142 +#: builtin/ls-tree.c:143 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" @@ -5654,163 +6330,167 @@ msgstr "" msgid "git merge --abort" msgstr "" -#: builtin/merge.c:90 +#: builtin/merge.c:98 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:127 +#: builtin/merge.c:135 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:128 +#: builtin/merge.c:136 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:133 +#: builtin/merge.c:141 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:183 +#: builtin/merge.c:198 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:186 +#: builtin/merge.c:201 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:187 +#: builtin/merge.c:202 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:189 +#: builtin/merge.c:204 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:192 +#: builtin/merge.c:207 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:194 +#: builtin/merge.c:209 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:196 +#: builtin/merge.c:211 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:198 +#: builtin/merge.c:212 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:200 +#: builtin/merge.c:214 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112 +#: builtin/merge.c:218 +msgid "Verify that the named commit has a valid GPG signature" +msgstr "" + +#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89 msgid "strategy" msgstr "" -#: builtin/merge.c:203 +#: builtin/merge.c:220 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:204 +#: builtin/merge.c:221 msgid "option=value" msgstr "" -#: builtin/merge.c:205 +#: builtin/merge.c:222 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:207 +#: builtin/merge.c:224 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:211 +#: builtin/merge.c:228 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:240 +#: builtin/merge.c:257 msgid "could not run stash." msgstr "" -#: builtin/merge.c:245 +#: builtin/merge.c:262 msgid "stash failed" msgstr "" -#: builtin/merge.c:250 +#: builtin/merge.c:267 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:269 builtin/merge.c:286 +#: builtin/merge.c:286 builtin/merge.c:303 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:316 +#: builtin/merge.c:333 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:329 +#: builtin/merge.c:346 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:361 +#: builtin/merge.c:378 msgid "Writing SQUASH_MSG" msgstr "" -#: builtin/merge.c:363 +#: builtin/merge.c:380 msgid "Finishing SQUASH_MSG" msgstr "" -#: builtin/merge.c:386 +#: builtin/merge.c:403 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:436 +#: builtin/merge.c:453 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:535 +#: builtin/merge.c:565 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:628 +#: builtin/merge.c:657 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/merge.c:656 +#: builtin/merge.c:685 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:670 +#: builtin/merge.c:699 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:684 +#: builtin/merge.c:713 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:773 +#: builtin/merge.c:802 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:782 +#: builtin/merge.c:811 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:788 +#: builtin/merge.c:817 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -5820,140 +6500,157 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:812 +#: builtin/merge.c:841 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:824 +#: builtin/merge.c:853 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:889 +#: builtin/merge.c:918 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:905 +#: builtin/merge.c:934 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:946 +#: builtin/merge.c:975 msgid "No current branch." msgstr "" -#: builtin/merge.c:948 +#: builtin/merge.c:977 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:950 +#: builtin/merge.c:979 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:955 +#: builtin/merge.c:984 #, c-format -msgid "No remote tracking branch for %s from %s" +msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1042 builtin/merge.c:1199 -#, c-format -msgid "%s - not something we can merge" -msgstr "" - -#: builtin/merge.c:1110 +#: builtin/merge.c:1140 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1126 git-pull.sh:31 +#: builtin/merge.c:1156 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -#: builtin/merge.c:1129 git-pull.sh:34 +#: builtin/merge.c:1159 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: builtin/merge.c:1133 +#: builtin/merge.c:1163 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -#: builtin/merge.c:1136 +#: builtin/merge.c:1166 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1145 +#: builtin/merge.c:1175 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1150 -msgid "You cannot combine --no-ff with --ff-only." -msgstr "" - -#: builtin/merge.c:1157 +#: builtin/merge.c:1184 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1189 +#: builtin/merge.c:1216 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1192 +#: builtin/merge.c:1219 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1194 +#: builtin/merge.c:1221 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1310 +#: builtin/merge.c:1226 +#, c-format +msgid "%s - not something we can merge" +msgstr "" + +#: builtin/merge.c:1277 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "" + +#: builtin/merge.c:1280 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "" + +#. 'N' +#: builtin/merge.c:1283 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "" + +#: builtin/merge.c:1286 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "" + +#: builtin/merge.c:1370 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1349 +#: builtin/merge.c:1409 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1356 +#: builtin/merge.c:1416 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1388 +#: builtin/merge.c:1448 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1411 builtin/merge.c:1490 +#: builtin/merge.c:1471 builtin/merge.c:1550 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1415 +#: builtin/merge.c:1475 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1481 +#: builtin/merge.c:1541 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1483 +#: builtin/merge.c:1543 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1492 +#: builtin/merge.c:1552 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1504 +#: builtin/merge.c:1564 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -6044,443 +6741,435 @@ msgstr "" msgid "allow creation of more than one tree" msgstr "" -#: builtin/mv.c:14 +#: builtin/mv.c:15 msgid "git mv [options] <source>... <destination>" msgstr "" -#: builtin/mv.c:64 +#: builtin/mv.c:67 msgid "force move/rename even if target exists" msgstr "" -#: builtin/mv.c:65 +#: builtin/mv.c:68 msgid "skip move/rename errors" msgstr "" -#: builtin/mv.c:108 +#: builtin/mv.c:113 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "" -#: builtin/mv.c:112 +#: builtin/mv.c:117 msgid "bad source" msgstr "" -#: builtin/mv.c:115 +#: builtin/mv.c:120 msgid "can not move directory into itself" msgstr "" -#: builtin/mv.c:118 +#: builtin/mv.c:123 msgid "cannot move directory over file" msgstr "" -#: builtin/mv.c:128 +#: builtin/mv.c:129 +#, c-format +msgid "Huh? Directory %s is in index and no submodule?" +msgstr "" + +#: builtin/mv.c:131 builtin/rm.c:318 +msgid "Please, stage your changes to .gitmodules or stash them to proceed" +msgstr "" + +#: builtin/mv.c:147 #, c-format msgid "Huh? %.*s is in index?" msgstr "" -#: builtin/mv.c:140 +#: builtin/mv.c:159 msgid "source directory is empty" msgstr "" -#: builtin/mv.c:171 +#: builtin/mv.c:191 msgid "not under version control" msgstr "" -#: builtin/mv.c:173 +#: builtin/mv.c:193 msgid "destination exists" msgstr "" -#: builtin/mv.c:181 +#: builtin/mv.c:201 #, c-format msgid "overwriting '%s'" msgstr "" -#: builtin/mv.c:184 +#: builtin/mv.c:204 msgid "Cannot overwrite" msgstr "" -#: builtin/mv.c:187 +#: builtin/mv.c:207 msgid "multiple sources for the same target" msgstr "" -#: builtin/mv.c:202 +#: builtin/mv.c:222 #, c-format msgid "%s, source=%s, destination=%s" msgstr "" -#: builtin/mv.c:212 +#: builtin/mv.c:232 #, c-format msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:215 builtin/remote.c:731 +#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:175 +#: builtin/name-rev.c:259 msgid "git name-rev [options] <commit>..." msgstr "" -#: builtin/name-rev.c:176 +#: builtin/name-rev.c:260 msgid "git name-rev [options] --all" msgstr "" -#: builtin/name-rev.c:177 +#: builtin/name-rev.c:261 msgid "git name-rev [options] --stdin" msgstr "" -#: builtin/name-rev.c:229 +#: builtin/name-rev.c:313 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:230 +#: builtin/name-rev.c:314 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:232 +#: builtin/name-rev.c:316 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:234 +#: builtin/name-rev.c:318 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:235 +#: builtin/name-rev.c:319 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:236 -msgid "allow to print `undefined` names" +#: builtin/name-rev.c:320 +msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/notes.c:26 +#: builtin/name-rev.c:326 +msgid "dereference tags in the input (internal use)" +msgstr "" + +#: builtin/notes.c:24 msgid "git notes [--ref <notes_ref>] [list [<object>]]" msgstr "" -#: builtin/notes.c:27 +#: builtin/notes.c:25 msgid "" "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " "<object>] [<object>]" msgstr "" -#: builtin/notes.c:28 +#: builtin/notes.c:26 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" msgstr "" -#: builtin/notes.c:29 +#: builtin/notes.c:27 msgid "" "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " "<object>] [<object>]" msgstr "" -#: builtin/notes.c:30 +#: builtin/notes.c:28 msgid "git notes [--ref <notes_ref>] edit [<object>]" msgstr "" -#: builtin/notes.c:31 +#: builtin/notes.c:29 msgid "git notes [--ref <notes_ref>] show [<object>]" msgstr "" -#: builtin/notes.c:32 +#: builtin/notes.c:30 msgid "" "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" msgstr "" -#: builtin/notes.c:33 +#: builtin/notes.c:31 msgid "git notes merge --commit [-v | -q]" msgstr "" -#: builtin/notes.c:34 +#: builtin/notes.c:32 msgid "git notes merge --abort [-v | -q]" msgstr "" -#: builtin/notes.c:35 +#: builtin/notes.c:33 msgid "git notes [--ref <notes_ref>] remove [<object>...]" msgstr "" -#: builtin/notes.c:36 +#: builtin/notes.c:34 msgid "git notes [--ref <notes_ref>] prune [-n | -v]" msgstr "" -#: builtin/notes.c:37 +#: builtin/notes.c:35 msgid "git notes [--ref <notes_ref>] get-ref" msgstr "" -#: builtin/notes.c:42 +#: builtin/notes.c:40 msgid "git notes [list [<object>]]" msgstr "" -#: builtin/notes.c:47 +#: builtin/notes.c:45 msgid "git notes add [<options>] [<object>]" msgstr "" -#: builtin/notes.c:52 +#: builtin/notes.c:50 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "" -#: builtin/notes.c:53 +#: builtin/notes.c:51 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "" -#: builtin/notes.c:58 +#: builtin/notes.c:56 msgid "git notes append [<options>] [<object>]" msgstr "" -#: builtin/notes.c:63 +#: builtin/notes.c:61 msgid "git notes edit [<object>]" msgstr "" -#: builtin/notes.c:68 +#: builtin/notes.c:66 msgid "git notes show [<object>]" msgstr "" -#: builtin/notes.c:73 +#: builtin/notes.c:71 msgid "git notes merge [<options>] <notes_ref>" msgstr "" -#: builtin/notes.c:74 +#: builtin/notes.c:72 msgid "git notes merge --commit [<options>]" msgstr "" -#: builtin/notes.c:75 +#: builtin/notes.c:73 msgid "git notes merge --abort [<options>]" msgstr "" -#: builtin/notes.c:80 +#: builtin/notes.c:78 msgid "git notes remove [<object>]" msgstr "" -#: builtin/notes.c:85 +#: builtin/notes.c:83 msgid "git notes prune [<options>]" msgstr "" -#: builtin/notes.c:90 +#: builtin/notes.c:88 msgid "git notes get-ref" msgstr "" -#: builtin/notes.c:139 +#: builtin/notes.c:137 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" -#: builtin/notes.c:143 +#: builtin/notes.c:141 msgid "could not read 'show' output" msgstr "" -#: builtin/notes.c:151 +#: builtin/notes.c:149 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:169 builtin/tag.c:341 +#: builtin/notes.c:167 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" msgstr "" -#: builtin/notes.c:188 +#: builtin/notes.c:186 msgid "Please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:209 builtin/notes.c:972 +#: builtin/notes.c:207 builtin/notes.c:844 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:214 +#: builtin/notes.c:212 msgid "unable to write note object" msgstr "" -#: builtin/notes.c:216 +#: builtin/notes.c:214 #, c-format msgid "The note contents has been left in %s" msgstr "" -#: builtin/notes.c:250 builtin/tag.c:540 +#: builtin/notes.c:248 builtin/tag.c:537 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:252 builtin/tag.c:543 +#: builtin/notes.c:250 builtin/tag.c:540 #, c-format msgid "could not open or read '%s'" msgstr "" -#: 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 +#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318 +#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515 +#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637 +#: builtin/notes.c:839 builtin/tag.c:553 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:274 +#: builtin/notes.c:272 #, c-format msgid "Failed to read object '%s'." msgstr "" -#: builtin/notes.c:298 -msgid "Cannot commit uninitialized/unreferenced notes tree" -msgstr "" - -#: builtin/notes.c:339 -#, c-format -msgid "Bad notes.rewriteMode value: '%s'" -msgstr "" - -#: 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:376 -#, c-format -msgid "Bad %s value: '%s'" -msgstr "" - -#: builtin/notes.c:440 +#: builtin/notes.c:312 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/notes.c:455 +#: builtin/notes.c:327 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: 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 +#: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498 +#: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630 +#: builtin/notes.c:904 msgid "too many parameters" msgstr "" -#: builtin/notes.c:512 builtin/notes.c:771 +#: builtin/notes.c:384 builtin/notes.c:643 #, c-format msgid "No note found for object %s." msgstr "" -#: builtin/notes.c:534 builtin/notes.c:691 +#: builtin/notes.c:406 builtin/notes.c:563 msgid "note contents as a string" msgstr "" -#: builtin/notes.c:537 builtin/notes.c:694 +#: builtin/notes.c:409 builtin/notes.c:566 msgid "note contents in a file" msgstr "" -#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 -#: builtin/notes.c:699 builtin/tag.c:474 +#: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568 +#: builtin/notes.c:571 builtin/tag.c:474 msgid "object" msgstr "" -#: builtin/notes.c:540 builtin/notes.c:697 +#: builtin/notes.c:412 builtin/notes.c:569 msgid "reuse and edit specified note object" msgstr "" -#: builtin/notes.c:543 builtin/notes.c:700 +#: builtin/notes.c:415 builtin/notes.c:572 msgid "reuse specified note object" msgstr "" -#: builtin/notes.c:545 builtin/notes.c:613 +#: builtin/notes.c:417 builtin/notes.c:485 msgid "replace existing notes" msgstr "" -#: builtin/notes.c:579 +#: builtin/notes.c:451 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:584 builtin/notes.c:661 +#: builtin/notes.c:456 builtin/notes.c:533 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:614 +#: builtin/notes.c:486 msgid "read objects from stdin" msgstr "" -#: builtin/notes.c:616 +#: builtin/notes.c:488 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" -#: builtin/notes.c:634 +#: builtin/notes.c:506 msgid "too few parameters" msgstr "" -#: builtin/notes.c:655 +#: builtin/notes.c:527 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:667 +#: builtin/notes.c:539 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:716 +#: builtin/notes.c:588 #, 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:863 +#: builtin/notes.c:735 msgid "General options" msgstr "" -#: builtin/notes.c:865 +#: builtin/notes.c:737 msgid "Merge options" msgstr "" -#: builtin/notes.c:867 +#: builtin/notes.c:739 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -#: builtin/notes.c:869 +#: builtin/notes.c:741 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:871 +#: builtin/notes.c:743 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:873 +#: builtin/notes.c:745 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:875 +#: builtin/notes.c:747 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:970 +#: builtin/notes.c:842 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:982 +#: builtin/notes.c:854 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:985 +#: builtin/notes.c:857 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:1066 +#: builtin/notes.c:938 msgid "notes_ref" msgstr "" -#: builtin/notes.c:1067 +#: builtin/notes.c:939 msgid "use notes from <notes_ref>" msgstr "" -#: builtin/notes.c:1102 builtin/remote.c:1598 +#: builtin/notes.c:974 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "" @@ -6493,148 +7182,148 @@ msgstr "" msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" -#: builtin/pack-objects.c:183 builtin/pack-objects.c:186 +#: builtin/pack-objects.c:184 builtin/pack-objects.c:187 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:2397 +#: builtin/pack-objects.c:2398 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2401 +#: builtin/pack-objects.c:2402 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2424 +#: builtin/pack-objects.c:2425 #, c-format msgid "option %s does not accept negative form" msgstr "" -#: builtin/pack-objects.c:2428 +#: builtin/pack-objects.c:2429 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "" -#: builtin/pack-objects.c:2447 +#: builtin/pack-objects.c:2448 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2449 +#: builtin/pack-objects.c:2450 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2451 +#: builtin/pack-objects.c:2452 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2454 +#: builtin/pack-objects.c:2455 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2455 +#: builtin/pack-objects.c:2456 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2457 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2459 +#: builtin/pack-objects.c:2460 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2461 +#: builtin/pack-objects.c:2462 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2463 +#: builtin/pack-objects.c:2464 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2465 +#: builtin/pack-objects.c:2466 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2467 +#: builtin/pack-objects.c:2468 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2469 +#: builtin/pack-objects.c:2470 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2471 +#: builtin/pack-objects.c:2472 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2473 +#: builtin/pack-objects.c:2474 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2475 +#: builtin/pack-objects.c:2476 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2477 +#: builtin/pack-objects.c:2478 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2479 +#: builtin/pack-objects.c:2480 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2481 +#: builtin/pack-objects.c:2482 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2483 +#: builtin/pack-objects.c:2484 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2486 +#: builtin/pack-objects.c:2487 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2489 +#: builtin/pack-objects.c:2490 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2492 +#: builtin/pack-objects.c:2493 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2494 +#: builtin/pack-objects.c:2495 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2496 +#: builtin/pack-objects.c:2497 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2497 parse-options.h:141 +#: builtin/pack-objects.c:2498 parse-options.h:143 msgid "time" msgstr "" -#: builtin/pack-objects.c:2498 +#: builtin/pack-objects.c:2499 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2501 +#: builtin/pack-objects.c:2502 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2503 +#: builtin/pack-objects.c:2504 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2505 +#: builtin/pack-objects.c:2506 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2507 +#: builtin/pack-objects.c:2508 msgid "do not hide commits by grafts" msgstr "" @@ -6674,21 +7363,21 @@ msgstr "" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/push.c:45 +#: builtin/push.c:47 msgid "tag shorthand without <tag>" msgstr "" -#: builtin/push.c:64 +#: builtin/push.c:66 msgid "--delete only accepts plain target ref names" msgstr "" -#: builtin/push.c:99 +#: builtin/push.c:101 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" -#: builtin/push.c:102 +#: builtin/push.c:104 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -6703,7 +7392,7 @@ msgid "" "%s" msgstr "" -#: builtin/push.c:121 +#: builtin/push.c:119 #, c-format msgid "" "You are not currently on a branch.\n" @@ -6713,7 +7402,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -#: builtin/push.c:128 +#: builtin/push.c:133 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -6722,12 +7411,12 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" -#: builtin/push.c:136 +#: builtin/push.c:141 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:139 +#: builtin/push.c:144 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -6735,7 +7424,7 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:151 +#: builtin/push.c:167 msgid "" "push.default is unset; its implicit value is changing in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -6753,20 +7442,20 @@ msgid "" "'current' instead of 'simple' if you sometimes use older versions of Git)" msgstr "" -#: builtin/push.c:199 +#: builtin/push.c:227 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:206 +#: builtin/push.c:234 msgid "" "Updates were rejected because the tip of your current branch is behind\n" -"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" -"before pushing again.\n" +"its remote counterpart. Integrate 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:212 +#: builtin/push.c:240 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" @@ -6774,50 +7463,50 @@ msgid "" "to 'simple', 'current' or 'upstream' to push only the current branch." msgstr "" -#: builtin/push.c:218 +#: builtin/push.c:246 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" -"counterpart. Check out this branch and merge the remote changes\n" -"(e.g. 'git pull') before pushing again.\n" +"counterpart. Check out this branch and integrate the remote changes\n" +"(e.g. 'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:224 +#: builtin/push.c:252 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" +"to the same ref. You may want to first integrate the remote changes\n" +"(e.g., 'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:231 +#: builtin/push.c:259 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" -#: builtin/push.c:234 +#: builtin/push.c:262 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 +#: builtin/push.c:328 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:298 +#: builtin/push.c:332 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:331 +#: builtin/push.c:365 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:332 +#: builtin/push.c:366 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -6830,83 +7519,95 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:347 +#: builtin/push.c:381 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:348 +#: builtin/push.c:382 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:353 +#: builtin/push.c:387 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:354 +#: builtin/push.c:388 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:359 +#: builtin/push.c:393 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:419 +#: builtin/push.c:453 msgid "repository" msgstr "" -#: builtin/push.c:420 +#: builtin/push.c:454 msgid "push all refs" msgstr "" -#: builtin/push.c:421 +#: builtin/push.c:455 msgid "mirror all refs" msgstr "" -#: builtin/push.c:423 +#: builtin/push.c:457 msgid "delete refs" msgstr "" -#: builtin/push.c:424 +#: builtin/push.c:458 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:427 +#: builtin/push.c:461 msgid "force updates" msgstr "" -#: builtin/push.c:428 +#: builtin/push.c:463 +msgid "refname>:<expect" +msgstr "" + +#: builtin/push.c:464 +msgid "require old value of ref to be at this value" +msgstr "" + +#: builtin/push.c:466 msgid "check" msgstr "" -#: builtin/push.c:429 +#: builtin/push.c:467 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:431 +#: builtin/push.c:469 msgid "use thin pack" msgstr "" -#: builtin/push.c:432 builtin/push.c:433 +#: builtin/push.c:470 builtin/push.c:471 msgid "receive pack program" msgstr "" -#: builtin/push.c:434 +#: builtin/push.c:472 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:437 +#: builtin/push.c:475 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:439 +#: builtin/push.c:477 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:448 +#: builtin/push.c:478 +msgid "push missing but relevant tags" +msgstr "" + +#: builtin/push.c:488 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:450 +#: builtin/push.c:490 msgid "--delete doesn't make sense without any refs" msgstr "" @@ -6917,70 +7618,80 @@ msgid "" "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -#: builtin/read-tree.c:108 +#: builtin/read-tree.c:109 msgid "write resulting index to <file>" msgstr "" -#: builtin/read-tree.c:111 +#: builtin/read-tree.c:112 msgid "only empty the index" msgstr "" -#: builtin/read-tree.c:113 +#: builtin/read-tree.c:114 msgid "Merging" msgstr "" -#: builtin/read-tree.c:115 +#: builtin/read-tree.c:116 msgid "perform a merge in addition to a read" msgstr "" -#: builtin/read-tree.c:117 +#: builtin/read-tree.c:118 msgid "3-way merge if no file level merging required" msgstr "" -#: builtin/read-tree.c:119 +#: builtin/read-tree.c:120 msgid "3-way merge in presence of adds and removes" msgstr "" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:122 msgid "same as -m, but discard unmerged entries" msgstr "" -#: builtin/read-tree.c:122 +#: builtin/read-tree.c:123 msgid "<subdirectory>/" msgstr "" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:124 msgid "read the tree into the index under <subdirectory>/" msgstr "" -#: builtin/read-tree.c:126 +#: builtin/read-tree.c:127 msgid "update working tree with merge result" msgstr "" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:129 msgid "gitignore" msgstr "" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:130 msgid "allow explicitly ignored files to be overwritten" msgstr "" -#: builtin/read-tree.c:132 +#: builtin/read-tree.c:133 msgid "don't check the working tree after merging" msgstr "" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:134 msgid "don't update the index or the work tree" msgstr "" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:136 msgid "skip applying sparse checkout filter" msgstr "" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:138 msgid "debug unpack-trees" msgstr "" +#: builtin/reflog.c:499 +#, c-format +msgid "%s' for '%s' is not a valid timestamp" +msgstr "" + +#: builtin/reflog.c:615 builtin/reflog.c:620 +#, c-format +msgid "'%s' is not a valid timestamp" +msgstr "" + #: builtin/remote.c:11 msgid "git remote [-v | --verbose]" msgstr "" @@ -6999,8 +7710,8 @@ msgstr "" msgid "git remote remove <name>" msgstr "" -#: builtin/remote.c:15 builtin/remote.c:42 -msgid "git remote set-head <name> (-a | -d | <branch>)" +#: builtin/remote.c:15 +msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" msgstr "" #: builtin/remote.c:16 @@ -7036,6 +7747,10 @@ msgstr "" msgid "git remote add [<options>] <name> <url>" msgstr "" +#: builtin/remote.c:42 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" +msgstr "" + #: builtin/remote.c:47 msgid "git remote set-branches <name> <branch>..." msgstr "" @@ -7463,6 +8178,67 @@ msgstr "" msgid "be verbose; must be placed before a subcommand" msgstr "" +#: builtin/repack.c:15 +msgid "git repack [options]" +msgstr "" + +#: builtin/repack.c:143 +msgid "pack everything in a single pack" +msgstr "" + +#: builtin/repack.c:145 +msgid "same as -a, and turn unreachable objects loose" +msgstr "" + +#: builtin/repack.c:148 +msgid "remove redundant packs, and run git-prune-packed" +msgstr "" + +#: builtin/repack.c:150 +msgid "pass --no-reuse-delta to git-pack-objects" +msgstr "" + +#: builtin/repack.c:152 +msgid "pass --no-reuse-object to git-pack-objects" +msgstr "" + +#: builtin/repack.c:154 +msgid "do not run git-update-server-info" +msgstr "" + +#: builtin/repack.c:157 +msgid "pass --local to git-pack-objects" +msgstr "" + +#: builtin/repack.c:158 +msgid "approxidate" +msgstr "" + +#: builtin/repack.c:159 +msgid "with -A, do not loosen objects older than this" +msgstr "" + +#: builtin/repack.c:161 +msgid "size of the window used for delta compression" +msgstr "" + +#: builtin/repack.c:163 +msgid "same as the above, but limit memory size instead of entries count" +msgstr "" + +#: builtin/repack.c:165 +msgid "limits the maximum delta depth" +msgstr "" + +#: builtin/repack.c:167 +msgid "maximum size of each packfile" +msgstr "" + +#: builtin/repack.c:345 +#, c-format +msgid "removing '%s' failed" +msgstr "" + #: builtin/replace.c:17 msgid "git replace [-f] <object> <replacement>" msgstr "" @@ -7475,23 +8251,23 @@ msgstr "" msgid "git replace -l [<pattern>]" msgstr "" -#: builtin/replace.c:121 +#: builtin/replace.c:131 msgid "list replace refs" msgstr "" -#: builtin/replace.c:122 +#: builtin/replace.c:132 msgid "delete replace refs" msgstr "" -#: builtin/replace.c:123 +#: builtin/replace.c:133 msgid "replace the ref if it exists" msgstr "" -#: builtin/rerere.c:11 +#: builtin/rerere.c:12 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" msgstr "" -#: builtin/rerere.c:56 +#: builtin/rerere.c:57 msgid "register clean resolutions in index" msgstr "" @@ -7541,95 +8317,95 @@ msgstr "" msgid "Failed to find tree of %s." msgstr "" -#: builtin/reset.c:98 +#: builtin/reset.c:99 #, c-format msgid "HEAD is now at %s" msgstr "" -#: builtin/reset.c:169 +#: builtin/reset.c:172 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:248 +#: builtin/reset.c:262 msgid "be quiet, only report errors" msgstr "" -#: builtin/reset.c:250 +#: builtin/reset.c:264 msgid "reset HEAD and index" msgstr "" -#: builtin/reset.c:251 +#: builtin/reset.c:265 msgid "reset only HEAD" msgstr "" -#: builtin/reset.c:253 builtin/reset.c:255 +#: builtin/reset.c:267 builtin/reset.c:269 msgid "reset HEAD, index and working tree" msgstr "" -#: builtin/reset.c:257 +#: builtin/reset.c:271 msgid "reset HEAD but keep local changes" msgstr "" -#: builtin/reset.c:275 +#: builtin/reset.c:289 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "" -#: builtin/reset.c:278 builtin/reset.c:286 +#: builtin/reset.c:292 builtin/reset.c:300 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/reset.c:283 +#: builtin/reset.c:297 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "" -#: builtin/reset.c:292 +#: builtin/reset.c:306 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:301 +#: builtin/reset.c:315 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:303 +#: builtin/reset.c:317 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:313 +#: builtin/reset.c:327 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" -#: builtin/reset.c:333 -#, c-format -msgid "Could not reset index file to revision '%s'." +#: builtin/reset.c:344 +msgid "Unstaged changes after reset:" msgstr "" -#: builtin/reset.c:339 -msgid "Unstaged changes after reset:" +#: builtin/reset.c:350 +#, c-format +msgid "Could not reset index file to revision '%s'." msgstr "" -#: builtin/reset.c:344 +#: builtin/reset.c:355 msgid "Could not write new index file." msgstr "" -#: builtin/rev-parse.c:339 +#: builtin/rev-parse.c:345 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "" -#: builtin/rev-parse.c:344 +#: builtin/rev-parse.c:350 msgid "keep the `--` passed as an arg" msgstr "" -#: builtin/rev-parse.c:346 +#: builtin/rev-parse.c:352 msgid "stop parsing after the first non-option argument" msgstr "" -#: builtin/rev-parse.c:464 +#: builtin/rev-parse.c:470 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -7639,7 +8415,7 @@ msgid "" msgstr "" #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>" +msgid "git revert [options] <commit-ish>..." msgstr "" #: builtin/revert.c:23 @@ -7647,174 +8423,196 @@ 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 msgid "git cherry-pick <subcommand>" msgstr "" -#: builtin/revert.c:70 builtin/revert.c:92 +#: builtin/revert.c:71 #, c-format msgid "%s: %s cannot be used with %s" msgstr "" -#: builtin/revert.c:103 +#: builtin/revert.c:80 msgid "end revert or cherry-pick sequence" msgstr "" -#: builtin/revert.c:104 +#: builtin/revert.c:81 msgid "resume revert or cherry-pick sequence" msgstr "" -#: builtin/revert.c:105 +#: builtin/revert.c:82 msgid "cancel revert or cherry-pick sequence" msgstr "" -#: builtin/revert.c:106 +#: builtin/revert.c:83 msgid "don't automatically commit" msgstr "" -#: builtin/revert.c:107 +#: builtin/revert.c:84 msgid "edit the commit message" msgstr "" -#: builtin/revert.c:110 +#: builtin/revert.c:87 msgid "parent number" msgstr "" -#: builtin/revert.c:112 +#: builtin/revert.c:89 msgid "merge strategy" msgstr "" -#: builtin/revert.c:113 +#: builtin/revert.c:90 msgid "option" msgstr "" -#: builtin/revert.c:114 +#: builtin/revert.c:91 msgid "option for merge strategy" msgstr "" -#: builtin/revert.c:125 +#: builtin/revert.c:102 msgid "append commit name" msgstr "" -#: builtin/revert.c:126 +#: builtin/revert.c:103 msgid "allow fast-forward" msgstr "" -#: builtin/revert.c:127 +#: builtin/revert.c:104 msgid "preserve initially empty commits" msgstr "" -#: builtin/revert.c:128 +#: builtin/revert.c:105 msgid "allow commits with empty messages" msgstr "" -#: builtin/revert.c:129 +#: builtin/revert.c:106 msgid "keep redundant, empty commits" msgstr "" -#: builtin/revert.c:133 +#: builtin/revert.c:110 msgid "program error" msgstr "" -#: builtin/revert.c:223 +#: builtin/revert.c:195 msgid "revert failed" msgstr "" -#: builtin/revert.c:238 +#: builtin/revert.c:210 msgid "cherry-pick failed" msgstr "" -#: builtin/rm.c:15 +#: builtin/rm.c:17 msgid "git rm [options] [--] <file>..." msgstr "" -#: builtin/rm.c:64 builtin/rm.c:186 -#, c-format +#: builtin/rm.c:65 +msgid "" +"the following submodule (or one of its nested submodules)\n" +"uses a .git directory:" +msgid_plural "" +"the following submodules (or one of its nested submodules)\n" +"use a .git directory:" +msgstr[0] "" +msgstr[1] "" + +#: builtin/rm.c:71 msgid "" -"submodule '%s' (or one of its nested submodules) uses a .git directory\n" +"\n" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" -#: builtin/rm.c:174 -#, c-format +#: builtin/rm.c:231 msgid "" -"'%s' has staged content different from both the file and the HEAD\n" -"(use -f to force removal)" -msgstr "" +"the following file has staged content different from both the\n" +"file and the HEAD:" +msgid_plural "" +"the following files have staged content different from both the\n" +"file and the HEAD:" +msgstr[0] "" +msgstr[1] "" -#: builtin/rm.c:180 -#, c-format +#: builtin/rm.c:236 msgid "" -"'%s' has changes staged in the index\n" -"(use --cached to keep the file, or -f to force removal)" +"\n" +"(use -f to force removal)" msgstr "" -#: builtin/rm.c:191 -#, c-format +#: builtin/rm.c:240 +msgid "the following file has changes staged in the index:" +msgid_plural "the following files have changes staged in the index:" +msgstr[0] "" +msgstr[1] "" + +#: builtin/rm.c:244 builtin/rm.c:255 msgid "" -"'%s' has local modifications\n" +"\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -#: builtin/rm.c:207 +#: builtin/rm.c:252 +msgid "the following file has local modifications:" +msgid_plural "the following files have local modifications:" +msgstr[0] "" +msgstr[1] "" + +#: builtin/rm.c:270 msgid "do not list removed files" msgstr "" -#: builtin/rm.c:208 +#: builtin/rm.c:271 msgid "only remove from the index" msgstr "" -#: builtin/rm.c:209 +#: builtin/rm.c:272 msgid "override the up-to-date check" msgstr "" -#: builtin/rm.c:210 +#: builtin/rm.c:273 msgid "allow recursive removal" msgstr "" -#: builtin/rm.c:212 +#: builtin/rm.c:275 msgid "exit with a zero status even if nothing matched" msgstr "" -#: builtin/rm.c:283 +#: builtin/rm.c:336 #, c-format msgid "not removing '%s' recursively without -r" msgstr "" -#: builtin/rm.c:322 +#: builtin/rm.c:375 #, 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:133 +#: builtin/shortlog.c:131 #, c-format msgid "Missing author: %s" msgstr "" -#: builtin/shortlog.c:229 +#: builtin/shortlog.c:230 msgid "sort output according to the number of commits per author" msgstr "" -#: builtin/shortlog.c:231 +#: builtin/shortlog.c:232 msgid "Suppress commit descriptions, only provides commit count" msgstr "" -#: builtin/shortlog.c:233 +#: builtin/shortlog.c:234 msgid "Show the email address of each author" msgstr "" -#: builtin/shortlog.c:234 +#: builtin/shortlog.c:235 msgid "w[,i1[,i2]]" msgstr "" -#: builtin/shortlog.c:235 +#: builtin/shortlog.c:236 msgid "Linewrap output" msgstr "" @@ -7830,47 +8628,47 @@ 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 "" @@ -7883,14 +8681,14 @@ msgid "show merges reachable from only one tip" msgstr "" #: builtin/show-branch.c:676 -msgid "show commits where no parent comes before its children" +msgid "topologically sort, maintaining date order where possible" msgstr "" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:679 msgid "<n>[,<base>]" msgstr "" -#: builtin/show-branch.c:679 +#: builtin/show-branch.c:680 msgid "show <n> most recent ref-log entries starting at base" msgstr "" @@ -7904,35 +8702,35 @@ msgstr "" msgid "git show-ref --exclude-existing[=pattern] < ref-list" msgstr "" -#: builtin/show-ref.c:165 +#: builtin/show-ref.c:168 msgid "only show tags (can be combined with heads)" msgstr "" -#: builtin/show-ref.c:166 +#: builtin/show-ref.c:169 msgid "only show heads (can be combined with tags)" msgstr "" -#: builtin/show-ref.c:167 +#: builtin/show-ref.c:170 msgid "stricter reference checking, requires exact ref path" msgstr "" -#: builtin/show-ref.c:170 builtin/show-ref.c:172 -msgid "show the HEAD reference" +#: builtin/show-ref.c:173 builtin/show-ref.c:175 +msgid "show the HEAD reference, even if it would be filtered out" msgstr "" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:177 msgid "dereference tags into object IDs" msgstr "" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:179 msgid "only show SHA1 hash using <n> digits" msgstr "" -#: builtin/show-ref.c:180 +#: builtin/show-ref.c:183 msgid "do not print results to stdout (useful with --verify)" msgstr "" -#: builtin/show-ref.c:182 +#: builtin/show-ref.c:185 msgid "show refs from stdin that aren't in local repository" msgstr "" @@ -7956,11 +8754,11 @@ msgstr "" msgid "shorten ref output" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254 msgid "reason" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254 msgid "reason of the update" msgstr "" @@ -8115,183 +8913,195 @@ msgstr "" msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:504 +#: builtin/tag.c:501 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:521 +#: builtin/tag.c:518 msgid "-n option is only allowed with -l." msgstr "" -#: builtin/tag.c:523 +#: builtin/tag.c:520 msgid "--contains option is only allowed with -l." msgstr "" -#: builtin/tag.c:525 +#: builtin/tag.c:522 msgid "--points-at option is only allowed with -l." msgstr "" -#: builtin/tag.c:533 +#: builtin/tag.c:530 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:553 +#: builtin/tag.c:550 msgid "too many params" msgstr "" -#: builtin/tag.c:559 +#: builtin/tag.c:556 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:564 +#: builtin/tag.c:561 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:582 +#: builtin/tag.c:579 #, c-format msgid "%s: cannot lock the ref" msgstr "" -#: builtin/tag.c:584 +#: builtin/tag.c:581 #, c-format msgid "%s: cannot update the ref" msgstr "" -#: builtin/tag.c:586 +#: builtin/tag.c:583 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" -#: builtin/update-index.c:401 +#: builtin/update-index.c:402 msgid "git update-index [options] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:718 +#: builtin/update-index.c:720 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:721 +#: builtin/update-index.c:723 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:724 +#: builtin/update-index.c:726 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:726 +#: builtin/update-index.c:728 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:728 +#: builtin/update-index.c:730 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:730 +#: builtin/update-index.c:732 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:733 +#: builtin/update-index.c:735 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:737 +#: builtin/update-index.c:739 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:741 +#: builtin/update-index.c:743 msgid "<mode> <object> <path>" msgstr "" -#: builtin/update-index.c:742 +#: builtin/update-index.c:744 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:746 +#: builtin/update-index.c:748 msgid "(+/-)x" msgstr "" -#: builtin/update-index.c:747 +#: builtin/update-index.c:749 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/update-index.c:751 +#: builtin/update-index.c:753 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:754 +#: builtin/update-index.c:756 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:757 +#: builtin/update-index.c:759 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:760 +#: builtin/update-index.c:762 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:763 +#: builtin/update-index.c:765 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:765 +#: builtin/update-index.c:767 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:767 +#: builtin/update-index.c:769 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:769 +#: builtin/update-index.c:771 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:773 +#: builtin/update-index.c:775 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:777 +#: builtin/update-index.c:779 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:781 +#: builtin/update-index.c:783 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:785 +#: builtin/update-index.c:787 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:788 +#: builtin/update-index.c:790 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:790 +#: builtin/update-index.c:792 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:794 +#: builtin/update-index.c:796 msgid "write index in this format" msgstr "" -#: builtin/update-ref.c:7 +#: builtin/update-ref.c:9 msgid "git update-ref [options] -d <refname> [<oldval>]" msgstr "" -#: builtin/update-ref.c:8 +#: builtin/update-ref.c:10 msgid "git update-ref [options] <refname> <newval> [<oldval>]" msgstr "" -#: builtin/update-ref.c:19 +#: builtin/update-ref.c:11 +msgid "git update-ref [options] --stdin [-z]" +msgstr "" + +#: builtin/update-ref.c:255 msgid "delete the reference" msgstr "" -#: builtin/update-ref.c:21 +#: builtin/update-ref.c:257 msgid "update <refname> not the one it points to" msgstr "" +#: builtin/update-ref.c:258 +msgid "stdin has NUL-terminated arguments" +msgstr "" + +#: builtin/update-ref.c:259 +msgid "read updates from stdin" +msgstr "" + #: builtin/update-server-info.c:6 msgid "git update-server-info [--force]" msgstr "" @@ -8336,23 +9146,30 @@ msgstr "" msgid "only useful for debugging" msgstr "" -#: git.c:16 -msgid "See 'git help <command>' for more information on a specific command." +#: git.c:17 +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 +#: parse-options.h:146 +msgid "expiry date" +msgstr "" + +#: parse-options.h:161 msgid "no-op (backward compatibility)" msgstr "" -#: parse-options.h:232 +#: parse-options.h:238 msgid "be more verbose" msgstr "" -#: parse-options.h:234 +#: parse-options.h:240 msgid "be more quiet" msgstr "" -#: parse-options.h:240 +#: parse-options.h:246 msgid "use <n> digits to display SHA-1s" msgstr "" @@ -8409,7 +9226,7 @@ msgid "Move or rename a file, a directory, or a symlink" msgstr "" #: common-cmds.h:21 -msgid "Fetch from and merge with another repository or a local branch" +msgid "Fetch from and integrate with another repository or a local branch" msgstr "" #: common-cmds.h:22 @@ -8453,7 +9270,7 @@ msgstr "" #: git-am.sh:105 #, sh-format msgid "" -"When you have resolved this problem, run \"$cmdline --resolved\".\n" +"When you have resolved this problem, run \"$cmdline --continue\".\n" "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" "To restore the original branch and stop patching, run \"$cmdline --abort\"." msgstr "" @@ -8503,25 +9320,32 @@ msgid "" "it will be removed. Please do not use it anymore." msgstr "" -#: git-am.sh:477 +#: git-am.sh:479 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" -#: git-am.sh:482 +#: git-am.sh:484 msgid "Please make up your mind. --skip or --abort?" msgstr "" -#: git-am.sh:509 +#: git-am.sh:520 +#, sh-format +msgid "" +"Stray $dotest directory found.\n" +"Use \"git am --abort\" to remove it." +msgstr "" + +#: git-am.sh:528 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: git-am.sh:575 +#: git-am.sh:594 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "" -#: git-am.sh:679 +#: git-am.sh:698 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -8529,60 +9353,60 @@ msgid "" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" -#: git-am.sh:706 +#: git-am.sh:725 msgid "Patch does not have a valid e-mail address." msgstr "" -#: git-am.sh:753 +#: git-am.sh:772 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: git-am.sh:757 +#: git-am.sh:776 msgid "Commit Body is:" msgstr "" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:764 +#: git-am.sh:783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "" -#: git-am.sh:800 +#: git-am.sh:819 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "" -#: git-am.sh:821 +#: git-am.sh:840 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: git-am.sh:829 +#: git-am.sh:848 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" msgstr "" -#: git-am.sh:845 +#: git-am.sh:864 msgid "No changes -- Patch already applied." msgstr "" -#: git-am.sh:855 +#: git-am.sh:874 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "" -#: git-am.sh:858 +#: git-am.sh:877 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" " $dotest/patch" msgstr "" -#: git-am.sh:876 +#: git-am.sh:895 msgid "applying to an empty history" msgstr "" @@ -8674,59 +9498,59 @@ msgid "" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" -#: git-bisect.sh:347 git-bisect.sh:474 +#: git-bisect.sh:363 git-bisect.sh:490 msgid "We are not bisecting." msgstr "" -#: git-bisect.sh:354 +#: git-bisect.sh:370 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "" -#: git-bisect.sh:363 +#: git-bisect.sh:379 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" "Try 'git bisect reset <commit>'." msgstr "" -#: git-bisect.sh:390 +#: git-bisect.sh:406 msgid "No logfile given" msgstr "" -#: git-bisect.sh:391 +#: git-bisect.sh:407 #, sh-format msgid "cannot read $file for replaying" msgstr "" -#: git-bisect.sh:408 +#: git-bisect.sh:424 msgid "?? what are you talking about?" msgstr "" -#: git-bisect.sh:420 +#: git-bisect.sh:436 #, sh-format msgid "running $command" msgstr "" -#: git-bisect.sh:427 +#: git-bisect.sh:443 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" -#: git-bisect.sh:453 +#: git-bisect.sh:469 msgid "bisect run cannot continue any more" msgstr "" -#: git-bisect.sh:459 +#: git-bisect.sh:475 #, sh-format msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" -#: git-bisect.sh:466 +#: git-bisect.sh:482 msgid "bisect run success" msgstr "" @@ -8741,7 +9565,7 @@ msgstr "" msgid "Pull is not possible because you have unmerged files." msgstr "" -#: git-pull.sh:197 +#: git-pull.sh:223 msgid "updating an unborn branch with changes added to the index" msgstr "" @@ -8749,7 +9573,7 @@ msgstr "" #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:229 +#: git-pull.sh:255 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -8757,15 +9581,15 @@ msgid "" "Warning: commit $orig_head." msgstr "" -#: git-pull.sh:254 +#: git-pull.sh:280 msgid "Cannot merge multiple branches into empty head" msgstr "" -#: git-pull.sh:258 +#: git-pull.sh:284 msgid "Cannot rebase onto multiple branches" msgstr "" -#: git-rebase.sh:53 +#: git-rebase.sh:54 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -8773,42 +9597,58 @@ msgid "" "\"." msgstr "" +#: git-rebase.sh:156 +msgid "Applied autostash." +msgstr "" + +#: git-rebase.sh:159 +#, sh-format +msgid "Cannot store $stash_sha1" +msgstr "" + #: git-rebase.sh:160 +msgid "" +"Applying autostash resulted in conflicts.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "" + +#: git-rebase.sh:199 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: git-rebase.sh:165 +#: git-rebase.sh:204 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" -#: git-rebase.sh:296 +#: git-rebase.sh:338 msgid "The --exec option must be used with the --interactive option" msgstr "" -#: git-rebase.sh:301 +#: git-rebase.sh:343 msgid "No rebase in progress?" msgstr "" -#: git-rebase.sh:312 +#: git-rebase.sh:354 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: git-rebase.sh:319 +#: git-rebase.sh:361 msgid "Cannot read HEAD" msgstr "" -#: git-rebase.sh:322 +#: git-rebase.sh:364 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: git-rebase.sh:340 +#: git-rebase.sh:382 #, sh-format msgid "Could not move back to $head_name" msgstr "" -#: git-rebase.sh:359 +#: git-rebase.sh:401 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -8821,56 +9661,65 @@ msgid "" "valuable there." msgstr "" -#: git-rebase.sh:404 +#: git-rebase.sh:446 #, sh-format msgid "invalid upstream $upstream_name" msgstr "" -#: git-rebase.sh:428 +#: git-rebase.sh:470 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" -#: git-rebase.sh:431 git-rebase.sh:435 +#: git-rebase.sh:473 git-rebase.sh:477 #, sh-format msgid "$onto_name: there is no merge base" msgstr "" -#: git-rebase.sh:440 +#: git-rebase.sh:482 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:463 +#: git-rebase.sh:505 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "" -#: git-rebase.sh:483 +#: git-rebase.sh:528 +msgid "Cannot autostash" +msgstr "" + +#: git-rebase.sh:533 +#, sh-format +msgid "Created autostash: $stash_abbrev" +msgstr "" + +#: git-rebase.sh:537 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:501 +#: git-rebase.sh:557 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:504 +#: git-rebase.sh:561 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:515 +#: git-rebase.sh:572 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" #. Detach HEAD and reset the tree -#: git-rebase.sh:524 +#: git-rebase.sh:581 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:532 +#: git-rebase.sh:591 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" @@ -8903,6 +9752,11 @@ msgstr "" msgid "Cannot record working tree state" msgstr "" +#: git-stash.sh:190 +#, sh-format +msgid "Cannot update $ref_stash with $w_commit" +msgstr "" + #. TRANSLATORS: $option is an invalid option, like #. `--blah-blah'. The 7 spaces at the beginning of the #. second line correspond to "error: ". So you should line @@ -8913,126 +9767,130 @@ msgstr "" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:202 +#: git-stash.sh:237 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" " To provide a message, use git stash save -- '$option'" msgstr "" -#: git-stash.sh:223 +#: git-stash.sh:258 msgid "No local changes to save" msgstr "" -#: git-stash.sh:227 +#: git-stash.sh:262 msgid "Cannot initialize stash" msgstr "" -#: git-stash.sh:235 +#: git-stash.sh:266 msgid "Cannot save the current status" msgstr "" -#: git-stash.sh:253 +#: git-stash.sh:284 msgid "Cannot remove worktree changes" msgstr "" -#: git-stash.sh:352 +#: git-stash.sh:383 msgid "No stash found." msgstr "" -#: git-stash.sh:359 +#: git-stash.sh:390 #, sh-format msgid "Too many revisions specified: $REV" msgstr "" -#: git-stash.sh:365 +#: git-stash.sh:396 #, sh-format msgid "$reference is not valid reference" msgstr "" -#: git-stash.sh:393 +#: git-stash.sh:424 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "" -#: git-stash.sh:404 +#: git-stash.sh:435 #, sh-format msgid "'$args' is not a stash reference" msgstr "" -#: git-stash.sh:412 +#: git-stash.sh:443 msgid "unable to refresh index" msgstr "" -#: git-stash.sh:416 +#: git-stash.sh:447 msgid "Cannot apply a stash in the middle of a merge" msgstr "" -#: git-stash.sh:424 +#: git-stash.sh:455 msgid "Conflicts in index. Try without --index." msgstr "" -#: git-stash.sh:426 +#: git-stash.sh:457 msgid "Could not save index tree" msgstr "" -#: git-stash.sh:460 +#: git-stash.sh:491 msgid "Cannot unstage modified files" msgstr "" -#: git-stash.sh:475 +#: git-stash.sh:506 msgid "Index was not unstashed." msgstr "" -#: git-stash.sh:492 +#: git-stash.sh:523 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "" -#: git-stash.sh:493 +#: git-stash.sh:524 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "" -#: git-stash.sh:500 +#: git-stash.sh:531 msgid "No branch name specified" msgstr "" -#: git-stash.sh:571 +#: git-stash.sh:603 msgid "(To restore them type \"git stash apply\")" msgstr "" -#: git-submodule.sh:90 +#: git-submodule.sh:95 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "" -#: git-submodule.sh:195 +#: git-submodule.sh:237 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "" -#: git-submodule.sh:238 +#: git-submodule.sh:281 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "" -#: git-submodule.sh:250 +#: git-submodule.sh:293 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "" -#: git-submodule.sh:343 +#: git-submodule.sh:403 +msgid "Relative path can only be used from the toplevel of the working tree" +msgstr "" + +#: git-submodule.sh:413 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:360 +#: git-submodule.sh:430 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:364 +#: git-submodule.sh:434 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -9040,180 +9898,236 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:382 +#: git-submodule.sh:452 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:384 +#: git-submodule.sh:454 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:392 +#: git-submodule.sh:462 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:394 +#: git-submodule.sh:464 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "" -#: git-submodule.sh:396 +#: git-submodule.sh:466 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" -#: git-submodule.sh:397 +#: git-submodule.sh:467 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "" -#: git-submodule.sh:399 +#: git-submodule.sh:469 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:411 +#: git-submodule.sh:481 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:416 +#: git-submodule.sh:486 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:425 +#: git-submodule.sh:495 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:468 +#: git-submodule.sh:539 #, sh-format -msgid "Entering '$prefix$sm_path'" +msgid "Entering '$prefix$displaypath'" msgstr "" -#: git-submodule.sh:482 +#: git-submodule.sh:554 #, sh-format -msgid "Stopping at '$sm_path'; script returned non-zero status." +msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." msgstr "" -#: git-submodule.sh:526 +#: git-submodule.sh:600 #, sh-format -msgid "No url found for submodule path '$sm_path' in .gitmodules" +msgid "No url found for submodule path '$displaypath' in .gitmodules" msgstr "" -#: git-submodule.sh:535 +#: git-submodule.sh:609 #, sh-format -msgid "Failed to register url for submodule path '$sm_path'" +msgid "Failed to register url for submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:537 +#: git-submodule.sh:611 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$sm_path'" +msgid "Submodule '$name' ($url) registered for path '$displaypath'" msgstr "" -#: git-submodule.sh:545 +#: git-submodule.sh:619 #, sh-format -msgid "Failed to register update mode for submodule path '$sm_path'" +msgid "Failed to register update mode for submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:649 +#: git-submodule.sh:656 +#, sh-format +msgid "Use '.' if you really want to deinitialize all submodules" +msgstr "" + +#: git-submodule.sh:673 +#, sh-format +msgid "Submodule work tree '$displaypath' contains a .git directory" +msgstr "" + +#: git-submodule.sh:674 +#, sh-format +msgid "" +"(use 'rm -rf' if you really want to remove it including all of its history)" +msgstr "" + +#: git-submodule.sh:680 #, sh-format msgid "" -"Submodule path '$sm_path' not initialized\n" +"Submodule work tree '$displaypath' contains local modifications; use '-f' to " +"discard them" +msgstr "" + +#: git-submodule.sh:683 +#, sh-format +msgid "Cleared directory '$displaypath'" +msgstr "" + +#: git-submodule.sh:684 +#, sh-format +msgid "Could not remove submodule work tree '$displaypath'" +msgstr "" + +#: git-submodule.sh:687 +#, sh-format +msgid "Could not create empty submodule directory '$displaypath'" +msgstr "" + +#: git-submodule.sh:696 +#, sh-format +msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" +msgstr "" + +#: git-submodule.sh:811 +#, sh-format +msgid "" +"Submodule path '$displaypath' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -#: git-submodule.sh:662 +#: git-submodule.sh:824 #, sh-format -msgid "Unable to find current revision in submodule path '$sm_path'" +msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:671 git-submodule.sh:695 +#: git-submodule.sh:833 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:709 +#: git-submodule.sh:857 #, sh-format -msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" +msgid "Unable to fetch in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:710 +#: git-submodule.sh:871 #, sh-format -msgid "Submodule path '$sm_path': rebased into '$sha1'" +msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:715 +#: git-submodule.sh:872 #, sh-format -msgid "Unable to merge '$sha1' in submodule path '$sm_path'" +msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:716 +#: git-submodule.sh:877 #, sh-format -msgid "Submodule path '$sm_path': merged in '$sha1'" +msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:721 +#: git-submodule.sh:878 #, sh-format -msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" +msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:722 +#: git-submodule.sh:883 #, sh-format -msgid "Submodule path '$sm_path': checked out '$sha1'" +msgid "" +"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:744 git-submodule.sh:1066 +#: git-submodule.sh:884 #, sh-format -msgid "Failed to recurse into submodule path '$sm_path'" +msgid "Submodule path '$prefix$sm_path': '$command $sha1'" +msgstr "" + +#: git-submodule.sh:889 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" +msgstr "" + +#: git-submodule.sh:890 +#, sh-format +msgid "Submodule path '$displaypath': checked out '$sha1'" +msgstr "" + +#: git-submodule.sh:917 +#, sh-format +msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:852 +#: git-submodule.sh:1025 msgid "The --cached option cannot be used with the --files option" msgstr "" #. unexpected type -#: git-submodule.sh:892 +#: git-submodule.sh:1073 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:910 +#: git-submodule.sh:1093 #, sh-format -msgid " Warn: $name doesn't contain commit $sha1_src" +msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:913 +#: git-submodule.sh:1096 #, sh-format -msgid " Warn: $name doesn't contain commit $sha1_dst" +msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:916 +#: git-submodule.sh:1099 #, sh-format -msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:941 +#: git-submodule.sh:1124 msgid "blob" msgstr "" -#: git-submodule.sh:979 -msgid "Submodules changed but not updated:" -msgstr "" - -#: git-submodule.sh:981 -msgid "Submodule changes to be committed:" +#: git-submodule.sh:1238 +#, sh-format +msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:1129 +#: git-submodule.sh:1302 #, sh-format -msgid "Synchronizing submodule url for '$prefix$sm_path'" +msgid "Synchronizing submodule url for '$displaypath'" msgstr "" |