diff options
Diffstat (limited to 'po/git.pot')
| -rw-r--r-- | po/git.pot | 5934 |
1 files changed, 3756 insertions, 2178 deletions
diff --git a/po/git.pot b/po/git.pot index e5611581e6..ee91402e63 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-10-16 08:38+0800\n" +"POT-Creation-Date: 2014-11-20 09:42+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,137 +18,244 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: advice.c:40 +#: advice.c:55 #, c-format msgid "hint: %.*s\n" msgstr "" -#. -#. * Message used both when 'git commit' fails and when -#. * other commands doing a merge do. -#. -#: advice.c:70 +#: advice.c:88 msgid "" -"Fix them up in the work tree,\n" -"and then use 'git add/rm <file>' as\n" -"appropriate to mark resolution and make a commit,\n" -"or use 'git commit -a'." +"Fix them up in the work tree, and then use 'git add/rm <file>'\n" +"as appropriate to mark resolution and make a commit." msgstr "" -#: archive.c:10 +#: archive.c:11 msgid "git archive [options] <tree-ish> [<path>...]" msgstr "" -#: archive.c:11 +#: archive.c:12 msgid "git archive --list" msgstr "" -#: archive.c:12 +#: archive.c:13 msgid "" "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" msgstr "" -#: archive.c:13 +#: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:322 +#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "" + +#: archive.c:419 msgid "fmt" msgstr "" -#: archive.c:322 +#: archive.c:419 msgid "archive format" msgstr "" -#: archive.c:323 builtin/log.c:1079 +#: archive.c:420 builtin/log.c:1204 msgid "prefix" msgstr "" -#: archive.c:324 +#: archive.c:421 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2389 -#: builtin/blame.c:2390 builtin/config.c:56 builtin/fast-export.c:642 -#: builtin/fast-export.c:644 builtin/grep.c:801 builtin/hash-object.c:77 -#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540 -#: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149 +#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517 +#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411 +#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "" -#: archive.c:326 builtin/archive.c:92 +#: archive.c:423 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" -#: archive.c:328 +#: archive.c:425 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:329 +#: archive.c:426 msgid "report archived files on stderr" msgstr "" -#: archive.c:330 +#: archive.c:427 msgid "store only" msgstr "" -#: archive.c:331 +#: archive.c:428 msgid "compress faster" msgstr "" -#: archive.c:339 +#: archive.c:436 msgid "compress better" msgstr "" -#: archive.c:342 +#: archive.c:439 msgid "list supported archive formats" msgstr "" -#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85 +#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85 msgid "repo" msgstr "" -#: archive.c:345 builtin/archive.c:94 +#: archive.c:442 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:346 builtin/archive.c:95 builtin/notes.c:619 +#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490 msgid "command" msgstr "" -#: archive.c:347 builtin/archive.c:96 +#: archive.c:444 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" -#: bundle.c:36 +#: attr.c:258 +msgid "" +"Negative patterns are ignored in git attributes\n" +"Use '\\!' for literal leading exclamation." +msgstr "" + +#: branch.c:60 +#, c-format +msgid "Not setting branch %s as its own upstream." +msgstr "" + +#: branch.c:83 +#, c-format +msgid "Branch %s set up to track remote branch %s from %s by rebasing." +msgstr "" + +#: branch.c:84 +#, c-format +msgid "Branch %s set up to track remote branch %s from %s." +msgstr "" + +#: branch.c:88 +#, c-format +msgid "Branch %s set up to track local branch %s by rebasing." +msgstr "" + +#: branch.c:89 +#, c-format +msgid "Branch %s set up to track local branch %s." +msgstr "" + +#: branch.c:94 +#, c-format +msgid "Branch %s set up to track remote ref %s by rebasing." +msgstr "" + +#: branch.c:95 +#, c-format +msgid "Branch %s set up to track remote ref %s." +msgstr "" + +#: branch.c:99 +#, c-format +msgid "Branch %s set up to track local ref %s by rebasing." +msgstr "" + +#: branch.c:100 +#, c-format +msgid "Branch %s set up to track local ref %s." +msgstr "" + +#: branch.c:133 +#, c-format +msgid "Not tracking: ambiguous information for ref %s" +msgstr "" + +#: branch.c:162 +#, c-format +msgid "'%s' is not a valid branch name." +msgstr "" + +#: branch.c:167 +#, c-format +msgid "A branch named '%s' already exists." +msgstr "" + +#: branch.c:175 +msgid "Cannot force update the current branch." +msgstr "" + +#: branch.c:195 +#, c-format +msgid "Cannot setup tracking information; starting point '%s' is not a branch." +msgstr "" + +#: branch.c:197 +#, c-format +msgid "the requested upstream branch '%s' does not exist" +msgstr "" + +#: branch.c:199 +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:243 +#, c-format +msgid "Not a valid object name: '%s'." +msgstr "" + +#: branch.c:263 +#, c-format +msgid "Ambiguous object name: '%s'." +msgstr "" + +#: branch.c:268 +#, c-format +msgid "Not a valid branch point: '%s'." +msgstr "" + +#: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "" -#: bundle.c:63 +#: bundle.c:61 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:89 builtin/commit.c:672 +#: bundle.c:87 builtin/commit.c:788 #, c-format msgid "could not open '%s'" msgstr "" -#: bundle.c:140 +#: bundle.c:139 msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290 -#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 -#: builtin/shortlog.c:181 +#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706 +#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357 +#: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "" -#: bundle.c:186 +#: bundle.c:185 #, 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] "" @@ -156,54 +263,59 @@ msgstr[1] "" msgid "The bundle records a complete history." msgstr "" -#: bundle.c:195 +#: bundle.c:194 #, 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] "" -#: bundle.c:294 -msgid "rev-list died" +#: bundle.c:251 +msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 -#, c-format -msgid "unrecognized argument: %s" +#: bundle.c:269 +msgid "pack-objects died" msgstr "" -#: bundle.c:335 -#, c-format -msgid "ref '%s' is excluded by the rev-list options" +#: bundle.c:309 +msgid "rev-list died" msgstr "" -#: bundle.c:380 -msgid "Refusing to create empty bundle." +#: bundle.c:358 +#, c-format +msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:398 -msgid "Could not spawn pack-objects" +#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#, c-format +msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:416 -msgid "pack-objects died" +#: bundle.c:444 +msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:419 +#: bundle.c:454 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:441 +#: bundle.c:475 msgid "index-pack died" msgstr "" -#: commit.c:50 +#: color.c:157 +#, c-format +msgid "invalid color value: %.*s" +msgstr "" + +#: commit.c:40 #, c-format msgid "could not parse %s" msgstr "" -#: commit.c:52 +#: commit.c:42 #, c-format msgid "%s %s is not a commit!" msgstr "" @@ -212,16 +324,69 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: connected.c:39 +#: config.c:469 config.c:471 +#, c-format +msgid "bad config file line %d in %s" +msgstr "" + +#: config.c:587 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "" + +#: config.c:589 +#, c-format +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "" + +#: config.c:674 +#, c-format +msgid "failed to expand user dir in: '%s'" +msgstr "" + +#: config.c:752 config.c:763 +#, c-format +msgid "bad zlib compression level %d" +msgstr "" + +#: config.c:885 +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "" + +#: config.c:1201 +msgid "unable to parse command-line config" +msgstr "" + +#: config.c:1262 +msgid "unknown error occured while reading the configuration files" +msgstr "" + +#: config.c:1586 +#, c-format +msgid "unable to parse '%s' from command-line config" +msgstr "" + +#: config.c:1588 +#, c-format +msgid "bad config variable '%s' in file '%s' at line %d" +msgstr "" + +#: config.c:1647 +#, c-format +msgid "%s has multiple values" +msgstr "" + +#: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:48 +#: connected.c:89 #, c-format msgid "failed write to rev-list: %s" msgstr "" -#: connected.c:56 +#: connected.c:97 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "" @@ -279,6 +444,7 @@ msgid_plural "%lu years" msgstr[0] "" msgstr[1] "" +#. TRANSLATORS: "%s" is "<n> years" #: date.c:149 #, c-format msgid "%s, %lu month ago" @@ -293,95 +459,137 @@ msgid_plural "%lu years ago" msgstr[0] "" msgstr[1] "" -#: diff.c:105 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "" + +#: diffcore-rename.c:516 +msgid "Performing inexact rename detection" +msgstr "" + +#: diff.c:114 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%s'\n" +msgstr "" + +#: diff.c:119 #, c-format -msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:110 +#: diff.c:214 #, c-format -msgid " Unknown dirstat parameter '%.*s'\n" +msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:210 +#: diff.c:266 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:3458 +#: diff.c:2957 +#, c-format +msgid "external diff died, stopping at %s" +msgstr "" + +#: diff.c:3352 +msgid "--follow requires exactly one pathspec" +msgstr "" + +#: diff.c:3515 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: gpg-interface.c:59 +#: diff.c:3529 +#, c-format +msgid "Failed to parse --submodule option parameter: '%s'" +msgstr "" + +#: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "" -#: gpg-interface.c:71 +#: gpg-interface.c:141 msgid "gpg did not accept the data" msgstr "" -#: gpg-interface.c:82 +#: gpg-interface.c:152 msgid "gpg failed to sign the data" msgstr "" -#: grep.c:1441 +#: gpg-interface.c:185 +#, c-format +msgid "could not create temporary file '%s': %s" +msgstr "" + +#: gpg-interface.c:188 +#, c-format +msgid "failed writing detached signature to '%s': %s" +msgstr "" + +#: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1458 +#: grep.c:1735 #, c-format msgid "'%s': %s" msgstr "" -#: grep.c:1469 +#: grep.c:1746 #, c-format msgid "'%s': short read %s" msgstr "" -#: help.c:212 +#: help.c:207 #, c-format msgid "available git commands in '%s'" msgstr "" -#: help.c:219 +#: help.c:214 msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:275 +#: help.c:230 +msgid "The most commonly used git commands are:" +msgstr "" + +#: help.c:289 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "" -#: help.c:332 +#: help.c:346 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:354 +#: help.c:368 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" "Continuing under the assumption that you meant '%s'" msgstr "" -#: help.c:359 +#: help.c:373 #, c-format msgid "in %0.1f seconds automatically..." msgstr "" -#: help.c:366 +#: help.c:380 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:370 +#: help.c:384 help.c:444 msgid "" "\n" "Did you mean this?" @@ -391,281 +599,450 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:190 +#: help.c:440 +#, c-format +msgid "%s: %s - %s" +msgstr "" + +#: lockfile.c:275 +msgid "BUG: reopen a lockfile that is still open" +msgstr "" + +#: lockfile.c:277 +msgid "BUG: reopen a lockfile that has been committed" +msgstr "" + +#: merge.c:41 +msgid "failed to read the cache" +msgstr "" + +#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562 +#: builtin/clone.c:659 +msgid "unable to write new index file" +msgstr "" + +#: merge-recursive.c:189 #, c-format msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:206 +#: merge-recursive.c:209 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "" -#: merge-recursive.c:268 +#: merge-recursive.c:270 msgid "error building trees" msgstr "" -#: merge-recursive.c:672 +#: merge-recursive.c:691 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:683 +#: merge-recursive.c:702 #, 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:716 merge-recursive.c:737 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:708 +#: merge-recursive.c:727 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:748 +#: merge-recursive.c:767 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:750 +#: merge-recursive.c:769 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:773 builtin/clone.c:302 +#: merge-recursive.c:792 builtin/clone.c:318 #, c-format msgid "failed to open '%s'" msgstr "" -#: merge-recursive.c:781 +#: merge-recursive.c:800 #, c-format msgid "failed to symlink '%s'" msgstr "" -#: merge-recursive.c:784 +#: merge-recursive.c:803 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:922 +#: merge-recursive.c:941 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:926 +#: merge-recursive.c:945 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:942 +#: merge-recursive.c:961 msgid "unsupported object type in the tree" msgstr "" -#: merge-recursive.c:1021 merge-recursive.c:1035 +#: merge-recursive.c:1036 merge-recursive.c:1050 #, 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:1042 merge-recursive.c:1055 #, 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:1096 msgid "rename" msgstr "" -#: merge-recursive.c:1081 +#: merge-recursive.c:1096 msgid "renamed" msgstr "" -#: merge-recursive.c:1137 +#: merge-recursive.c:1152 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1159 +#: merge-recursive.c:1174 #, 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:1179 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1218 +#: merge-recursive.c:1233 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1248 +#: merge-recursive.c:1263 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1447 +#: merge-recursive.c:1462 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1457 +#: merge-recursive.c:1472 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1462 merge-recursive.c:1660 +#: merge-recursive.c:1477 merge-recursive.c:1675 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1513 +#: merge-recursive.c:1528 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1516 +#: merge-recursive.c:1531 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1564 +#: merge-recursive.c:1579 msgid "modify" msgstr "" -#: merge-recursive.c:1564 +#: merge-recursive.c:1579 msgid "modified" msgstr "" -#: merge-recursive.c:1574 +#: merge-recursive.c:1589 msgid "content" msgstr "" -#: merge-recursive.c:1581 +#: merge-recursive.c:1596 msgid "add/add" msgstr "" -#: merge-recursive.c:1615 +#: merge-recursive.c:1630 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1629 +#: merge-recursive.c:1644 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1633 git-submodule.sh:869 +#: merge-recursive.c:1648 git-submodule.sh:1150 msgid "submodule" msgstr "" -#: merge-recursive.c:1634 +#: merge-recursive.c:1649 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1724 +#: merge-recursive.c:1735 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1749 +#: merge-recursive.c:1760 msgid "file/directory" msgstr "" -#: merge-recursive.c:1755 +#: merge-recursive.c:1766 msgid "directory/file" msgstr "" -#: merge-recursive.c:1760 +#: merge-recursive.c:1771 #, 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:1781 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1787 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "" -#: merge-recursive.c:1806 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:1815 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:1845 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:1890 +#: merge-recursive.c:1901 msgid "Merging:" msgstr "" -#: merge-recursive.c:1903 +#: merge-recursive.c:1914 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:1940 +#: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:1997 +#: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2009 builtin/merge.c:696 +#: merge-recursive.c:2019 builtin/merge.c:666 msgid "Unable to write index." msgstr "" -#: parse-options.c:494 +#: notes-utils.c:41 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" + +#: notes-utils.c:83 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "" + +#: notes-utils.c:93 +#, 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:120 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "" + +#: object.c:241 +#, c-format +msgid "unable to parse object: %s" +msgstr "" + +#: parse-options.c:546 msgid "..." msgstr "" -#: parse-options.c:512 +#: parse-options.c:564 #, c-format msgid "usage: %s" msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:516 +#: parse-options.c:568 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:519 +#: parse-options.c:571 #, c-format msgid " %s" msgstr "" -#: remote.c:1632 +#: parse-options.c:605 +msgid "-NUM" +msgstr "" + +#: pathspec.c:133 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible" +msgstr "" + +#: pathspec.c:143 +msgid "" +"global 'literal' pathspec setting is incompatible with all other global " +"pathspec settings" +msgstr "" + +#: pathspec.c:177 +msgid "invalid parameter for pathspec magic 'prefix'" +msgstr "" + +#: pathspec.c:183 +#, c-format +msgid "Invalid pathspec magic '%.*s' in '%s'" +msgstr "" + +#: pathspec.c:187 +#, c-format +msgid "Missing ')' at the end of pathspec magic in '%s'" +msgstr "" + +#: pathspec.c:205 +#, c-format +msgid "Unimplemented pathspec magic '%c' in '%s'" +msgstr "" + +#: pathspec.c:230 +#, c-format +msgid "%s: 'literal' and 'glob' are incompatible" +msgstr "" + +#: pathspec.c:241 +#, c-format +msgid "%s: '%s' is outside repository" +msgstr "" + +#: pathspec.c:291 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "" + +#: pathspec.c:353 +#, c-format +msgid "%s: pathspec magic not supported by this command: %s" +msgstr "" + +#: pathspec.c:432 +#, c-format +msgid "pathspec '%s' is beyond a symbolic link" +msgstr "" + +#: pathspec.c:441 +msgid "" +"There is nothing to exclude from by :(exclude) patterns.\n" +"Perhaps you forgot to add either ':/' or '.' ?" +msgstr "" + +#: pretty.c:968 +msgid "unable to parse --pretty format" +msgstr "" + +#: progress.c:225 +msgid "done" +msgstr "" + +#: read-cache.c:1261 +#, c-format +msgid "" +"index.version set, but the value is invalid.\n" +"Using version %i" +msgstr "" + +#: read-cache.c:1271 +#, c-format +msgid "" +"GIT_INDEX_VERSION set, but the value is invalid.\n" +"Using version %i" +msgstr "" + +#: remote.c:782 +#, c-format +msgid "Cannot fetch both %s and %s to %s" +msgstr "" + +#: remote.c:786 +#, c-format +msgid "%s usually tracks %s, not %s" +msgstr "" + +#: remote.c:790 +#, c-format +msgid "%s tracks both %s and %s" +msgstr "" + +#: remote.c:798 +msgid "Internal error" +msgstr "" + +#: remote.c:1968 +#, c-format +msgid "Your branch is based on '%s', but the upstream is gone.\n" +msgstr "" + +#: remote.c:1972 +msgid " (use \"git branch --unset-upstream\" to fixup)\n" +msgstr "" + +#: remote.c:1975 +#, c-format +msgid "Your branch is up-to-date with '%s'.\n" +msgstr "" + +#: remote.c:1979 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" -#: remote.c:1638 +#: remote.c:1985 +msgid " (use \"git push\" to publish your local commits)\n" +msgstr "" + +#: remote.c:1988 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -673,7 +1050,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1646 +#: remote.c:1996 +msgid " (use \"git pull\" to update your local branch)\n" +msgstr "" + +#: remote.c:1999 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -684,832 +1065,1031 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: sequencer.c:123 builtin/merge.c:864 builtin/merge.c:977 -#: builtin/merge.c:1087 builtin/merge.c:1097 +#: remote.c:2009 +msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgstr "" + +#: run-command.c:87 +msgid "open /dev/null failed" +msgstr "" + +#: run-command.c:89 +#, c-format +msgid "dup2(%d,%d) failed" +msgstr "" + +#: send-pack.c:265 +msgid "failed to sign the push certificate" +msgstr "" + +#: send-pack.c:322 +msgid "the receiving end does not support --signed push" +msgstr "" + +#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892 +#: builtin/merge.c:1002 builtin/merge.c:1012 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:867 -#: builtin/merge.c:1089 builtin/merge.c:1102 +#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784 +#: builtin/merge.c:1004 builtin/merge.c:1017 #, c-format msgid "Could not write to '%s'" msgstr "" -#: sequencer.c:146 +#: sequencer.c:195 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:149 +#: sequencer.c:198 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:162 sequencer.c:770 sequencer.c:853 +#: sequencer.c:211 sequencer.c:852 sequencer.c:935 #, c-format msgid "Could not write to %s" msgstr "" -#: sequencer.c:165 +#: sequencer.c:214 #, c-format msgid "Error wrapping up %s" msgstr "" -#: sequencer.c:180 +#: sequencer.c:229 msgid "Your local changes would be overwritten by cherry-pick." msgstr "" -#: sequencer.c:182 +#: sequencer.c:231 msgid "Your local changes would be overwritten by revert." msgstr "" -#: sequencer.c:185 +#: sequencer.c:234 msgid "Commit your changes or stash them to proceed." msgstr "" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:235 +#: sequencer.c:304 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:266 +#: sequencer.c:335 msgid "Could not resolve HEAD commit\n" msgstr "" -#: sequencer.c:287 +#: sequencer.c:355 msgid "Unable to update cache tree\n" msgstr "" -#: sequencer.c:332 +#: sequencer.c:402 #, c-format msgid "Could not parse commit %s\n" msgstr "" -#: sequencer.c:337 +#: sequencer.c:407 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" -#: sequencer.c:403 +#: sequencer.c:473 msgid "Your index file is unmerged." msgstr "" -#: sequencer.c:406 -msgid "You do not have a valid HEAD" -msgstr "" - -#: sequencer.c:421 +#: sequencer.c:492 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:429 +#: sequencer.c:500 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: sequencer.c:433 +#: sequencer.c:504 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:444 +#: sequencer.c:517 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:448 +#: sequencer.c:521 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:532 +#: sequencer.c:607 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:533 +#: sequencer.c:608 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:565 +#: sequencer.c:644 msgid "empty commit set passed" msgstr "" -#: sequencer.c:573 +#: sequencer.c:652 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:578 +#: sequencer.c:656 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:636 +#: sequencer.c:716 #, c-format msgid "Cannot %s during a %s" msgstr "" -#: sequencer.c:658 +#: sequencer.c:738 #, c-format msgid "Could not parse line %d." msgstr "" -#: sequencer.c:663 +#: sequencer.c:743 msgid "No commits parsed." msgstr "" -#: sequencer.c:676 +#: sequencer.c:756 #, c-format msgid "Could not open %s" msgstr "" -#: sequencer.c:680 +#: sequencer.c:760 #, c-format msgid "Could not read %s." msgstr "" -#: sequencer.c:687 +#: sequencer.c:767 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" -#: sequencer.c:715 +#: sequencer.c:797 #, c-format msgid "Invalid key: %s" msgstr "" -#: sequencer.c:718 +#: sequencer.c:800 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: sequencer.c:730 +#: sequencer.c:812 #, c-format msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:751 +#: sequencer.c:833 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:752 +#: sequencer.c:834 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:756 +#: sequencer.c:838 #, c-format msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:772 sequencer.c:857 +#: sequencer.c:854 sequencer.c:939 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:791 sequencer.c:925 +#: sequencer.c:873 sequencer.c:1009 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:793 +#: sequencer.c:875 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:795 +#: sequencer.c:877 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:817 builtin/apply.c:4005 +#: sequencer.c:899 builtin/apply.c:4128 #, c-format msgid "cannot open %s: %s" msgstr "" -#: sequencer.c:820 +#: sequencer.c:902 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:821 +#: sequencer.c:903 msgid "unexpected end of file" msgstr "" -#: sequencer.c:827 +#: sequencer.c:909 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:850 +#: sequencer.c:932 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:1012 +#: sequencer.c:1077 +#, c-format +msgid "%s: can't cherry-pick a %s" +msgstr "" + +#: sequencer.c:1080 +#, c-format +msgid "%s: bad revision" +msgstr "" + +#: sequencer.c:1114 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:1013 +#: sequencer.c:1115 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:1068 msgid "HEAD does not point to a branch" msgstr "" -#: sha1_name.c:1047 +#: sha1_name.c:1071 #, c-format msgid "No such branch: '%s'" msgstr "" -#: sha1_name.c:1049 +#: sha1_name.c:1073 #, c-format msgid "No upstream configured for branch '%s'" msgstr "" -#: sha1_name.c:1052 +#: sha1_name.c:1077 #, 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 "" + +#: submodule.c:76 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "" + +#: submodule.c:109 +#, c-format +msgid "Could not remove .gitmodules entry for %s" +msgstr "" + +#: submodule.c:120 +msgid "staging updated .gitmodules failed" +msgstr "" + +#: submodule.c:1111 builtin/init-db.c:363 +#, c-format +msgid "Could not create git link %s" +msgstr "" + +#: submodule.c:1122 +#, c-format +msgid "Could not set core.worktree in %s" +msgstr "" + +#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565 +#: trailer.c:569 +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "" + +#: trailer.c:551 trailer.c:556 builtin/remote.c:288 +#, c-format +msgid "more than one %s" +msgstr "" + +#: trailer.c:589 +#, c-format +msgid "empty trailer token in trailer '%.*s'" +msgstr "" + +#: trailer.c:709 +#, c-format +msgid "could not read input file '%s'" +msgstr "" + +#: trailer.c:712 +msgid "could not read from stdin" +msgstr "" + +#: unpack-trees.c:202 +msgid "Checking out files" +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:509 #, c-format msgid "unable to access '%s': %s" msgstr "" -#: wrapper.c:426 +#: wrapper.c:530 +#, c-format +msgid "unable to access '%s'" +msgstr "" + +#: wrapper.c:541 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" -#: wrapper.c:427 +#: wrapper.c:542 msgid "no such user" msgstr "" -#: wt-status.c:140 +#: wrapper.c:550 +msgid "unable to get current working directory" +msgstr "" + +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "" -#: wt-status.c:167 wt-status.c:194 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" -#: wt-status.c:169 wt-status.c:196 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" -#: wt-status.c:173 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:175 wt-status.c:179 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:177 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:188 +#: wt-status.c:198 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:206 +#: wt-status.c:216 msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:210 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:212 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:213 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:215 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:227 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -#: wt-status.c:244 -msgid "bug" -msgstr "" - -#: wt-status.c:249 +#: wt-status.c:252 msgid "both deleted:" msgstr "" -#: wt-status.c:250 +#: wt-status.c:254 msgid "added by us:" msgstr "" -#: wt-status.c:251 +#: wt-status.c:256 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:260 msgid "deleted by us:" msgstr "" -#: wt-status.c:254 +#: wt-status.c:262 msgid "both added:" msgstr "" -#: wt-status.c:255 +#: wt-status.c:264 msgid "both modified:" msgstr "" -#: wt-status.c:285 -msgid "new commits, " +#: wt-status.c:266 +#, c-format +msgid "bug: unhandled unmerged status %x" msgstr "" -#: wt-status.c:287 -msgid "modified content, " +#: wt-status.c:274 +msgid "new file:" msgstr "" -#: wt-status.c:289 -msgid "untracked content, " +#: wt-status.c:276 +msgid "copied:" msgstr "" -#: wt-status.c:303 -#, c-format -msgid "new file: %s" +#: wt-status.c:278 +msgid "deleted:" msgstr "" -#: wt-status.c:306 -#, c-format -msgid "copied: %s -> %s" +#: wt-status.c:280 +msgid "modified:" msgstr "" -#: wt-status.c:309 -#, c-format -msgid "deleted: %s" +#: wt-status.c:282 +msgid "renamed:" msgstr "" -#: wt-status.c:312 -#, c-format -msgid "modified: %s" +#: wt-status.c:284 +msgid "typechange:" msgstr "" -#: wt-status.c:315 -#, c-format -msgid "renamed: %s -> %s" +#: wt-status.c:286 +msgid "unknown:" msgstr "" -#: wt-status.c:318 -#, c-format -msgid "typechange: %s" +#: wt-status.c:288 +msgid "unmerged:" msgstr "" -#: wt-status.c:321 -#, c-format -msgid "unknown: %s" +#: wt-status.c:370 +msgid "new commits, " msgstr "" -#: wt-status.c:324 -#, c-format -msgid "unmerged: %s" +#: wt-status.c:372 +msgid "modified content, " +msgstr "" + +#: wt-status.c:374 +msgid "untracked content, " msgstr "" -#: wt-status.c:327 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:785 +#: wt-status.c:761 +msgid "Submodules changed but not updated:" +msgstr "" + +#: wt-status.c:763 +msgid "Submodule changes to be committed:" +msgstr "" + +#: wt-status.c:842 +msgid "" +"Do not touch the line above.\n" +"Everything below will be removed." +msgstr "" + +#: wt-status.c:933 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:788 wt-status.c:912 +#: wt-status.c:936 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:791 +#: wt-status.c:939 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:794 +#: wt-status.c:942 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:804 +#: wt-status.c:952 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:807 +#: wt-status.c:955 msgid "The current patch is empty." msgstr "" -#: wt-status.c:811 -msgid " (fix conflicts and then run \"git am --resolved\")" +#: wt-status.c:959 +msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:813 +#: wt-status.c:961 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:815 +#: wt-status.c:963 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:873 wt-status.c:883 +#: wt-status.c:1023 wt-status.c:1040 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "" + +#: wt-status.c:1028 wt-status.c:1045 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:876 +#: wt-status.c:1031 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:878 +#: wt-status.c:1033 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:880 +#: wt-status.c:1035 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:886 +#: wt-status.c:1048 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:888 +#: wt-status.c:1052 +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "" + +#: wt-status.c:1057 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:891 +#: wt-status.c:1060 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:893 +#: wt-status.c:1064 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "" + +#: wt-status.c:1069 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:896 +#: wt-status.c:1072 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:898 +#: wt-status.c:1074 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:908 -msgid "You are currently cherry-picking." +#: wt-status.c:1084 +#, c-format +msgid "You are currently cherry-picking commit %s." +msgstr "" + +#: wt-status.c:1089 +msgid " (fix conflicts and run \"git cherry-pick --continue\")" +msgstr "" + +#: wt-status.c:1092 +msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:915 -msgid " (all conflicts fixed: run \"git commit\")" +#: wt-status.c:1094 +msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:924 +#: wt-status.c:1103 +#, c-format +msgid "You are currently reverting commit %s." +msgstr "" + +#: wt-status.c:1108 +msgid " (fix conflicts and run \"git revert --continue\")" +msgstr "" + +#: wt-status.c:1111 +msgid " (all conflicts fixed: run \"git revert --continue\")" +msgstr "" + +#: wt-status.c:1113 +msgid " (use \"git revert --abort\" to cancel the revert operation)" +msgstr "" + +#: wt-status.c:1124 +#, c-format +msgid "You are currently bisecting, started from branch '%s'." +msgstr "" + +#: wt-status.c:1128 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:927 +#: wt-status.c:1131 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:978 +#: wt-status.c:1306 msgid "On branch " msgstr "" -#: wt-status.c:985 +#: wt-status.c:1313 +msgid "rebase in progress; onto " +msgstr "" + +#: wt-status.c:1320 +msgid "HEAD detached at " +msgstr "" + +#: wt-status.c:1322 +msgid "HEAD detached from " +msgstr "" + +#: wt-status.c:1325 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:997 +#: wt-status.c:1342 msgid "Initial commit" msgstr "" -#: wt-status.c:1011 +#: wt-status.c:1356 msgid "Untracked files" msgstr "" -#: wt-status.c:1013 +#: wt-status.c:1358 msgid "Ignored files" msgstr "" -#: wt-status.c:1015 +#: wt-status.c:1362 +#, 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:1368 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1017 +#: wt-status.c:1370 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1023 +#: wt-status.c:1376 msgid "No changes" msgstr "" -#: wt-status.c:1028 +#: wt-status.c:1381 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1031 +#: wt-status.c:1384 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1034 +#: wt-status.c:1387 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1037 +#: wt-status.c:1390 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1040 +#: wt-status.c:1393 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1043 wt-status.c:1048 +#: wt-status.c:1396 wt-status.c:1401 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1046 +#: wt-status.c:1399 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1050 +#: wt-status.c:1403 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1158 +#: wt-status.c:1512 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1164 +#: wt-status.c:1518 msgid "Initial commit on " msgstr "" -#: wt-status.c:1179 -msgid "behind " -msgstr "" - -#: wt-status.c:1182 wt-status.c:1185 -msgid "ahead " +#: wt-status.c:1550 +msgid "gone" msgstr "" -#: wt-status.c:1187 -msgid ", behind " +#: wt-status.c:1552 wt-status.c:1560 +msgid "behind " msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:341 +#: compat/precompose_utf8.c:55 builtin/clone.c:357 #, c-format msgid "failed to unlink '%s'" msgstr "" -#: builtin/add.c:19 -msgid "git add [options] [--] <filepattern>..." +#: builtin/add.c:22 +msgid "git add [options] [--] <pathspec>..." msgstr "" -#: builtin/add.c:62 +#: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:67 builtin/commit.c:230 +#: builtin/add.c:70 builtin/commit.c:275 msgid "updating files failed" msgstr "" -#: builtin/add.c:77 +#: builtin/add.c:80 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:176 -#, c-format -msgid "Path '%s' is in submodule '%.*s'" -msgstr "" - -#: builtin/add.c:192 +#: builtin/add.c:134 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186 -#, c-format -msgid "pathspec '%s' did not match any files" -msgstr "" - -#: builtin/add.c:209 -#, c-format -msgid "'%s' is beyond a symbolic link" -msgstr "" - -#: builtin/add.c:276 +#: builtin/add.c:194 builtin/rev-parse.c:785 msgid "Could not read the index" msgstr "" -#: builtin/add.c:286 +#: builtin/add.c:205 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:290 +#: builtin/add.c:209 msgid "Could not write patch" msgstr "" -#: builtin/add.c:295 +#: builtin/add.c:214 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:297 +#: builtin/add.c:216 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:303 +#: builtin/add.c:221 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:313 +#: builtin/add.c:231 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63 -#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253 -#: builtin/rm.c:133 +#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375 +#: builtin/rm.c:269 msgid "dry run" msgstr "" -#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1154 -#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477 -#: builtin/mv.c:62 builtin/read-tree.c:112 +#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 +#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "" -#: builtin/add.c:322 +#: builtin/add.c:251 msgid "interactive picking" msgstr "" -#: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:324 +#: builtin/add.c:253 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:325 +#: builtin/add.c:254 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:326 +#: builtin/add.c:255 msgid "update tracked files" msgstr "" -#: builtin/add.c:327 +#: builtin/add.c:256 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:328 +#: builtin/add.c:257 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:329 +#: builtin/add.c:260 +msgid "ignore paths removed in the working tree (same as --no-all)" +msgstr "" + +#: builtin/add.c:262 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:330 +#: builtin/add.c:263 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:331 +#: builtin/add.c:264 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:353 +#: builtin/add.c:286 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:354 +#: builtin/add.c:287 msgid "no files added" msgstr "" -#: builtin/add.c:360 +#: builtin/add.c:293 msgid "adding files failed" msgstr "" -#: builtin/add.c:392 +#: builtin/add.c:329 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:394 +#: builtin/add.c:336 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:414 +#: builtin/add.c:357 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:415 +#: builtin/add.c:358 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:290 builtin/mv.c:82 -#: builtin/rm.c:162 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 +#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "" -#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "" -#: builtin/apply.c:57 +#: builtin/apply.c:58 msgid "git apply [options] [<patch>...]" msgstr "" -#: builtin/apply.c:110 +#: builtin/apply.c:111 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" -#: builtin/apply.c:125 +#: builtin/apply.c:126 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: builtin/apply.c:823 +#: builtin/apply.c:826 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: builtin/apply.c:832 +#: builtin/apply.c:835 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: builtin/apply.c:913 +#: builtin/apply.c:916 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: builtin/apply.c:945 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: builtin/apply.c:949 +#: builtin/apply.c:952 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: builtin/apply.c:950 +#: builtin/apply.c:953 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: builtin/apply.c:957 +#: builtin/apply.c:960 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1420 +#: builtin/apply.c:1423 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1477 +#: builtin/apply.c:1480 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1494 +#: builtin/apply.c:1497 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1520,400 +2100,394 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1654 +#: builtin/apply.c:1657 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1656 +#: builtin/apply.c:1659 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1682 +#: builtin/apply.c:1685 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1718 +#: builtin/apply.c:1721 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1720 +#: builtin/apply.c:1723 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1723 +#: builtin/apply.c:1726 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1869 +#: builtin/apply.c:1872 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#. there has to be one hunk (forward hunk) -#: builtin/apply.c:1898 +#: builtin/apply.c:1901 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:1984 +#: builtin/apply.c:2052 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2074 +#: builtin/apply.c:2142 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2078 +#: builtin/apply.c:2146 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2149 -msgid "oops" -msgstr "" - -#: builtin/apply.c:2671 +#: builtin/apply.c:2754 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2789 +#: builtin/apply.c:2872 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:2801 +#: builtin/apply.c:2884 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2807 +#: builtin/apply.c:2890 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2826 +#: builtin/apply.c:2909 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:2929 +#: builtin/apply.c:3010 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:2935 +#: builtin/apply.c:3016 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:2956 +#: builtin/apply.c:3037 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3078 +#: builtin/apply.c:3161 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176 +#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3156 builtin/apply.c:3378 +#: builtin/apply.c:3240 builtin/apply.c:3462 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3237 builtin/apply.c:3392 +#: builtin/apply.c:3321 builtin/apply.c:3476 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406 +#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3246 builtin/apply.c:3400 +#: builtin/apply.c:3330 builtin/apply.c:3484 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3348 +#: builtin/apply.c:3432 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3417 +#: builtin/apply.c:3501 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3419 +#: builtin/apply.c:3503 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3520 +#: builtin/apply.c:3604 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3523 +#: builtin/apply.c:3607 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3543 +#: builtin/apply.c:3627 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3548 +#: builtin/apply.c:3632 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3556 +#: builtin/apply.c:3640 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3569 +#: builtin/apply.c:3653 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158 +#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:3767 +#: builtin/apply.c:3889 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3795 +#: builtin/apply.c:3918 #, c-format -msgid "corrupt patch for subproject %s" +msgid "corrupt patch for submodule %s" msgstr "" -#: builtin/apply.c:3799 +#: builtin/apply.c:3922 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3804 +#: builtin/apply.c:3927 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3807 builtin/apply.c:3915 +#: builtin/apply.c:3930 builtin/apply.c:4038 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3840 +#: builtin/apply.c:3963 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:3889 +#: builtin/apply.c:4012 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:3976 +#: builtin/apply.c:4099 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:3984 +#: builtin/apply.c:4107 msgid "internal error" msgstr "" -#. Say this even without --verbose -#: builtin/apply.c:3987 +#: builtin/apply.c:4110 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:3997 +#: builtin/apply.c:4120 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4018 +#: builtin/apply.c:4141 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4021 +#: builtin/apply.c:4144 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4171 +#: builtin/apply.c:4234 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4182 +#: builtin/apply.c:4245 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91 -#: builtin/fetch.c:63 +#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91 +#: builtin/fetch.c:93 msgid "path" msgstr "" -#: builtin/apply.c:4302 +#: builtin/apply.c:4363 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4305 +#: builtin/apply.c:4366 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4307 +#: builtin/apply.c:4368 msgid "num" msgstr "" -#: builtin/apply.c:4308 +#: builtin/apply.c:4369 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4311 +#: builtin/apply.c:4372 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4313 +#: builtin/apply.c:4374 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4317 +#: builtin/apply.c:4378 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4319 +#: builtin/apply.c:4380 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4321 +#: builtin/apply.c:4382 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4323 +#: builtin/apply.c:4384 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4325 +#: builtin/apply.c:4386 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4327 +#: builtin/apply.c:4388 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4329 +#: builtin/apply.c:4390 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4331 +#: builtin/apply.c:4392 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460 +#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4336 +#: builtin/apply.c:4397 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4337 +#: builtin/apply.c:4398 msgid "action" msgstr "" -#: builtin/apply.c:4338 +#: builtin/apply.c:4399 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4341 builtin/apply.c:4344 +#: builtin/apply.c:4402 builtin/apply.c:4405 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4347 +#: builtin/apply.c:4408 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4349 +#: builtin/apply.c:4410 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4351 +#: builtin/apply.c:4412 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4353 +#: builtin/apply.c:4414 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4356 +#: builtin/apply.c:4417 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4359 +#: builtin/apply.c:4420 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4361 +#: builtin/apply.c:4422 msgid "root" msgstr "" -#: builtin/apply.c:4362 +#: builtin/apply.c:4423 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4384 +#: builtin/apply.c:4445 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4392 +#: builtin/apply.c:4453 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4395 +#: builtin/apply.c:4456 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4411 +#: builtin/apply.c:4472 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4425 +#: builtin/apply.c:4486 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4431 builtin/apply.c:4441 +#: builtin/apply.c:4492 builtin/apply.c:4502 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1937,21 +2511,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 "" @@ -1967,399 +2541,497 @@ msgstr "" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" -#: builtin/blame.c:25 +#: builtin/blame.c:30 msgid "git blame [options] [rev-opts] [rev] [--] file" msgstr "" -#: builtin/blame.c:30 builtin/shortlog.c:15 +#: builtin/blame.c:35 msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:2373 +#: builtin/blame.c:2501 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2374 +#: builtin/blame.c:2502 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2375 +#: builtin/blame.c:2503 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2376 +#: builtin/blame.c:2504 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2377 +#: builtin/blame.c:2505 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2378 +#: builtin/blame.c:2506 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2379 +#: builtin/blame.c:2507 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2380 +#: builtin/blame.c:2508 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2381 +#: builtin/blame.c:2509 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2382 +#: builtin/blame.c:2510 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2383 +#: builtin/blame.c:2511 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2384 +#: builtin/blame.c:2512 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2385 +#: builtin/blame.c:2513 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2386 +#: builtin/blame.c:2514 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2387 +#: builtin/blame.c:2515 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2388 +#: builtin/blame.c:2516 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2389 +#: builtin/blame.c:2517 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2390 +#: builtin/blame.c:2518 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2391 builtin/blame.c:2392 +#: builtin/blame.c:2519 builtin/blame.c:2520 msgid "score" msgstr "" -#: builtin/blame.c:2391 +#: builtin/blame.c:2519 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2392 +#: builtin/blame.c:2520 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2393 +#: builtin/blame.c:2521 msgid "n,m" msgstr "" -#: builtin/blame.c:2393 +#: builtin/blame.c:2521 msgid "Process only line range n,m, counting from 1" msgstr "" -#: builtin/branch.c:23 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" +#. TRANSLATORS: This string is used to tell us the maximum +#. display width for a relative timestamp in "git blame" +#. output. For C locale, "4 years, 11 months ago", which +#. takes 22 places, is the longest among various forms of +#. relative timestamps, but your language may need more or +#. fewer display columns. +#: builtin/blame.c:2602 +msgid "4 years, 11 months ago" msgstr "" #: builtin/branch.c:24 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" +msgid "git branch [options] [-r | -a] [--merged | --no-merged]" msgstr "" #: builtin/branch.c:25 -msgid "git branch [options] [-r] (-d | -D) <branchname>..." +msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" msgstr "" #: builtin/branch.c:26 +msgid "git branch [options] [-r] (-d | -D) <branchname>..." +msgstr "" + +#: builtin/branch.c:27 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" msgstr "" -#: builtin/branch.c:145 +#: builtin/branch.c:152 #, 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:156 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -#: builtin/branch.c:181 -msgid "cannot use -a with -d" +#: builtin/branch.c:170 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "" + +#: builtin/branch.c:174 +#, 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:187 -msgid "Couldn't look up commit object for HEAD" +msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:192 -#, c-format -msgid "Cannot delete the branch '%s' which you are currently on." +#: builtin/branch.c:215 +msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:203 -#, c-format -msgid "remote branch '%s' not found." +#: builtin/branch.c:221 +msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:204 +#: builtin/branch.c:229 #, c-format -msgid "branch '%s' not found." +msgid "Cannot delete the branch '%s' which you are currently on." msgstr "" -#: builtin/branch.c:211 +#: builtin/branch.c:245 #, c-format -msgid "Couldn't look up commit object for '%s'" +msgid "remote branch '%s' not found." msgstr "" -#: builtin/branch.c:217 +#: builtin/branch.c:246 #, 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'." +msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:226 +#: builtin/branch.c:260 #, c-format msgid "Error deleting remote branch '%s'" msgstr "" -#: builtin/branch.c:227 +#: builtin/branch.c:261 #, c-format msgid "Error deleting branch '%s'" msgstr "" -#: builtin/branch.c:234 +#: builtin/branch.c:268 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:235 +#: builtin/branch.c:269 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:240 -msgid "Update of config-file failed" +#: builtin/branch.c:370 +#, c-format +msgid "branch '%s' does not point at a commit" msgstr "" -#: builtin/branch.c:338 +#: builtin/branch.c:459 #, c-format -msgid "branch '%s' does not point at a commit" +msgid "[%s: gone]" +msgstr "" + +#: builtin/branch.c:464 +#, c-format +msgid "[%s]" msgstr "" -#: builtin/branch.c:410 +#: builtin/branch.c:469 #, c-format msgid "[%s: behind %d]" msgstr "" -#: builtin/branch.c:412 +#: builtin/branch.c:471 #, c-format msgid "[behind %d]" msgstr "" -#: builtin/branch.c:416 +#: builtin/branch.c:475 #, c-format msgid "[%s: ahead %d]" msgstr "" -#: builtin/branch.c:418 +#: builtin/branch.c:477 #, c-format msgid "[ahead %d]" msgstr "" -#: builtin/branch.c:421 +#: builtin/branch.c:480 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:424 +#: builtin/branch.c:483 #, c-format msgid "[ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:537 +#: builtin/branch.c:496 +msgid " **** invalid ref ****" +msgstr "" + +#: builtin/branch.c:587 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "" + +#: builtin/branch.c:590 +#, c-format +msgid "(no branch, bisect started on %s)" +msgstr "" + +#: builtin/branch.c:593 +#, c-format +msgid "(detached from %s)" +msgstr "" + +#: builtin/branch.c:596 msgid "(no branch)" msgstr "" -#: builtin/branch.c:602 +#: builtin/branch.c:643 +#, c-format +msgid "object '%s' does not point to a commit" +msgstr "" + +#: builtin/branch.c:691 msgid "some refs could not be read" msgstr "" -#: builtin/branch.c:615 +#: builtin/branch.c:704 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:625 +#: builtin/branch.c:714 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:640 +#: builtin/branch.c:729 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:644 +#: builtin/branch.c:733 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:648 +#: builtin/branch.c:737 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:655 +#: builtin/branch.c:744 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:670 +#: builtin/branch.c:759 #, c-format msgid "malformed object name %s" msgstr "" -#: builtin/branch.c:694 +#: builtin/branch.c:783 #, c-format msgid "could not write branch description template: %s" msgstr "" -#: builtin/branch.c:724 +#: builtin/branch.c:813 msgid "Generic options" msgstr "" -#: builtin/branch.c:726 +#: builtin/branch.c:815 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:727 +#: builtin/branch.c:816 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:728 +#: builtin/branch.c:817 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:730 +#: builtin/branch.c:819 msgid "change upstream info" msgstr "" -#: builtin/branch.c:734 +#: builtin/branch.c:823 msgid "use colored output" msgstr "" -#: builtin/branch.c:735 +#: builtin/branch.c:824 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765 -#: builtin/branch.c:771 builtin/commit.c:1362 builtin/commit.c:1363 -#: builtin/commit.c:1364 builtin/commit.c:1365 builtin/tag.c:470 +#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 +#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623 +#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616 +#: builtin/tag.c:622 msgid "commit" msgstr "" -#: builtin/branch.c:739 builtin/branch.c:745 +#: builtin/branch.c:828 builtin/branch.c:834 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:751 +#: builtin/branch.c:840 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:752 +#: builtin/branch.c:841 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:754 +#: builtin/branch.c:843 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:755 +#: builtin/branch.c:844 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:756 +#: builtin/branch.c:845 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:757 +#: builtin/branch.c:846 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:758 +#: builtin/branch.c:847 msgid "list branch names" msgstr "" -#: builtin/branch.c:759 +#: builtin/branch.c:848 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:761 +#: builtin/branch.c:850 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:762 +#: builtin/branch.c:851 msgid "force creation (when already exists)" msgstr "" -#: builtin/branch.c:765 +#: builtin/branch.c:854 msgid "print only not merged branches" msgstr "" -#: builtin/branch.c:771 +#: builtin/branch.c:860 msgid "print only merged branches" msgstr "" -#: builtin/branch.c:775 +#: builtin/branch.c:864 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:788 +#: builtin/branch.c:877 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:793 builtin/clone.c:561 +#: builtin/branch.c:881 builtin/clone.c:634 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:813 +#: builtin/branch.c:903 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:864 +#: builtin/branch.c:909 builtin/branch.c:948 +msgid "branch name required" +msgstr "" + +#: builtin/branch.c:924 +msgid "Cannot give description to detached HEAD" +msgstr "" + +#: builtin/branch.c:929 +msgid "cannot edit description of more than one branch" +msgstr "" + +#: builtin/branch.c:936 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "" + +#: builtin/branch.c:939 +#, c-format +msgid "No branch named '%s'." +msgstr "" + +#: builtin/branch.c:954 +msgid "too many branches for a rename operation" +msgstr "" + +#: builtin/branch.c:959 +msgid "too many branches to set new upstream" +msgstr "" + +#: builtin/branch.c:963 +#, c-format +msgid "" +"could not set upstream of HEAD to %s when it does not point to any branch." +msgstr "" + +#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009 +#, c-format +msgid "no such branch '%s'" +msgstr "" + +#: builtin/branch.c:970 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:876 +#: builtin/branch.c:982 +msgid "too many branches to unset upstream" +msgstr "" + +#: builtin/branch.c:986 +msgid "could not unset upstream of HEAD when it does not point to any branch." +msgstr "" + +#: builtin/branch.c:992 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:891 +#: builtin/branch.c:1006 +msgid "it does not make sense to create 'HEAD' manually" +msgstr "" + +#: builtin/branch.c:1012 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:894 +#: builtin/branch.c:1015 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" -#: builtin/branch.c:911 +#: builtin/branch.c:1032 #, c-format msgid "" "\n" @@ -2367,12 +3039,12 @@ msgid "" "\n" msgstr "" -#: builtin/branch.c:912 +#: builtin/branch.c:1033 #, c-format msgid " git branch -d %s\n" msgstr "" -#: builtin/branch.c:913 +#: builtin/branch.c:1034 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr "" @@ -2390,43 +3062,43 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:247 +#: builtin/cat-file.c:332 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "" -#: builtin/cat-file.c:248 +#: builtin/cat-file.c:333 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "" -#: builtin/cat-file.c:266 +#: builtin/cat-file.c:370 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:267 +#: builtin/cat-file.c:371 msgid "show object type" msgstr "" -#: builtin/cat-file.c:268 +#: builtin/cat-file.c:372 msgid "show object size" msgstr "" -#: builtin/cat-file.c:270 +#: builtin/cat-file.c:374 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:271 +#: builtin/cat-file.c:375 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:273 +#: builtin/cat-file.c:377 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:275 +#: builtin/cat-file.c:379 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:278 +#: builtin/cat-file.c:382 msgid "show info about objects fed from the standard input" msgstr "" @@ -2446,55 +3118,108 @@ msgstr "" msgid "use .gitattributes only from the index" msgstr "" -#: builtin/check-attr.c:21 builtin/hash-object.c:75 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 msgid "read file names from stdin" msgstr "" -#: builtin/check-attr.c:23 -msgid "input paths are terminated by a null character" +#: builtin/check-attr.c:23 builtin/check-ignore.c:24 +msgid "terminate input and output records by a NUL character" +msgstr "" + +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274 +msgid "suppress progress reporting" +msgstr "" + +#: 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:159 +msgid "no path specified" +msgstr "" + +#: builtin/check-ignore.c:163 +msgid "--quiet is only valid with a single pathname" +msgstr "" + +#: 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 "" -#: builtin/checkout-index.c:187 +#: builtin/checkout-index.c:188 msgid "check out all files in the index" msgstr "" -#: builtin/checkout-index.c:188 +#: builtin/checkout-index.c:189 msgid "force overwrite of existing files" msgstr "" -#: builtin/checkout-index.c:190 +#: builtin/checkout-index.c:191 msgid "no warning for existing files and files not in index" msgstr "" -#: builtin/checkout-index.c:192 +#: builtin/checkout-index.c:193 msgid "don't checkout new files" msgstr "" -#: builtin/checkout-index.c:194 +#: builtin/checkout-index.c:195 msgid "update stat information in the index file" msgstr "" -#: builtin/checkout-index.c:200 +#: builtin/checkout-index.c:201 msgid "read list of paths from the standard input" msgstr "" -#: builtin/checkout-index.c:202 +#: builtin/checkout-index.c:203 msgid "write the content to temporary files" msgstr "" -#: builtin/checkout-index.c:203 builtin/column.c:30 +#: builtin/checkout-index.c:204 builtin/column.c:30 msgid "string" msgstr "" -#: builtin/checkout-index.c:204 +#: builtin/checkout-index.c:205 msgid "when creating files, prepend <string>" msgstr "" -#: builtin/checkout-index.c:207 +#: builtin/checkout-index.c:208 msgid "copy out the files from named stage" msgstr "" @@ -2506,111 +3231,105 @@ 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:231 builtin/checkout.c:234 builtin/checkout.c:237 +#: builtin/checkout.c:240 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:248 builtin/checkout.c:251 +#: builtin/checkout.c:243 builtin/checkout.c:246 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:254 +#: builtin/checkout.c:249 #, 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:260 builtin/checkout.c:449 msgid "corrupt index file" msgstr "" -#: builtin/checkout.c:295 builtin/checkout.c:302 +#: builtin/checkout.c:320 builtin/checkout.c:327 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:333 builtin/checkout.c:534 builtin/clone.c:586 -#: builtin/merge.c:811 -msgid "unable to write new index file" -msgstr "" - -#: builtin/checkout.c:448 +#: builtin/checkout.c:471 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:569 +#: builtin/checkout.c:597 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "" -#: builtin/checkout.c:602 +#: builtin/checkout.c:635 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:609 +#: builtin/checkout.c:642 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:612 +#: builtin/checkout.c:645 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:616 +#: builtin/checkout.c:649 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:618 +#: builtin/checkout.c:651 builtin/checkout.c:1032 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:620 +#: builtin/checkout.c:653 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:676 +#: builtin/checkout.c:705 #, c-format msgid " ... and %d more.\n" msgstr "" -#. The singular version -#: builtin/checkout.c:682 +#: builtin/checkout.c:711 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -2625,7 +3344,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:700 +#: builtin/checkout.c:729 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -2635,240 +3354,326 @@ msgid "" "\n" msgstr "" -#: builtin/checkout.c:730 +#: builtin/checkout.c:759 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:734 +#: builtin/checkout.c:763 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:761 builtin/checkout.c:950 +#: builtin/checkout.c:790 builtin/checkout.c:1027 msgid "You are on a branch yet to be born" msgstr "" -#. case (1) -#: builtin/checkout.c:886 +#: builtin/checkout.c:934 +#, c-format +msgid "only one reference expected, %d given." +msgstr "" + +#: builtin/checkout.c:973 #, c-format msgid "invalid reference: %s" msgstr "" -#. case (1): want a tree -#: builtin/checkout.c:925 +#: builtin/checkout.c:1002 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:961 +#: builtin/checkout.c:1041 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:964 builtin/checkout.c:968 +#: builtin/checkout.c:1044 builtin/checkout.c:1048 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980 -#: builtin/checkout.c:983 +#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060 +#: builtin/checkout.c:1063 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:988 +#: builtin/checkout.c:1068 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1009 builtin/gc.c:177 -msgid "suppress progress reporting" -msgstr "" - -#: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89 -#: builtin/remote.c:169 builtin/remote.c:171 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89 +#: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "" -#: builtin/checkout.c:1011 +#: builtin/checkout.c:1091 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1013 +#: builtin/checkout.c:1093 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1014 +#: builtin/checkout.c:1094 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1015 +#: builtin/checkout.c:1095 msgid "detach the HEAD at named commit" msgstr "" -#: builtin/checkout.c:1016 +#: builtin/checkout.c:1096 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1018 -msgid "new branch" +#: builtin/checkout.c:1098 +msgid "new-branch" msgstr "" -#: builtin/checkout.c:1018 +#: builtin/checkout.c:1098 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1019 +#: builtin/checkout.c:1099 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1021 +#: builtin/checkout.c:1101 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1103 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1024 +#: builtin/checkout.c:1104 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1025 builtin/merge.c:215 +#: builtin/checkout.c:1105 builtin/merge.c:226 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241 +#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245 msgid "style" msgstr "" -#: builtin/checkout.c:1027 +#: builtin/checkout.c:1107 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1030 +#: builtin/checkout.c:1110 +msgid "do not limit pathspecs to sparse entries only" +msgstr "" + +#: builtin/checkout.c:1112 msgid "second guess 'git checkout no-such-branch'" msgstr "" -#: builtin/checkout.c:1054 +#: builtin/checkout.c:1135 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1071 +#: builtin/checkout.c:1152 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1078 +#: builtin/checkout.c:1157 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1194 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1120 +#: builtin/checkout.c:1201 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/checkout.c:1125 +#: builtin/checkout.c:1206 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1129 +#: builtin/checkout.c:1210 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/clean.c:19 -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:51 -msgid "do not print names of files removed" +#: builtin/clean.c:30 +#, c-format +msgid "Removing %s\n" msgstr "" -#: builtin/clean.c:53 -msgid "force" +#: builtin/clean.c:31 +#, c-format +msgid "Would remove %s\n" msgstr "" -#: builtin/clean.c:55 -msgid "remove whole directories" +#: builtin/clean.c:32 +#, c-format +msgid "Skipping repository %s\n" msgstr "" -#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:803 -#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199 -msgid "pattern" +#: builtin/clean.c:33 +#, c-format +msgid "Would skip repository %s\n" msgstr "" -#: builtin/clean.c:57 -msgid "add <pattern> to ignore rules" +#: builtin/clean.c:34 +#, c-format +msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:58 -msgid "remove ignored files, too" +#: builtin/clean.c:295 +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:60 -msgid "remove only ignored files" +#: builtin/clean.c:299 +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:78 -msgid "-x and -X cannot be used together" +#: builtin/clean.c:517 +#, c-format +msgid "Huh (%s)?" msgstr "" -#: builtin/clean.c:82 -msgid "" -"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +#: builtin/clean.c:659 +#, c-format +msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:85 -msgid "" -"clean.requireForce defaults to true and neither -n nor -f given; refusing to " -"clean" +#: builtin/clean.c:696 +#, c-format +msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:155 builtin/clean.c:176 -#, c-format -msgid "Would remove %s\n" +#: builtin/clean.c:717 +msgid "Select items to delete" msgstr "" -#: builtin/clean.c:159 builtin/clean.c:179 +#: builtin/clean.c:757 #, c-format -msgid "Removing %s\n" +msgid "remove %s? " msgstr "" -#: builtin/clean.c:162 builtin/clean.c:182 -#, c-format -msgid "failed to remove %s" +#: builtin/clean.c:782 +msgid "Bye." msgstr "" -#: builtin/clean.c:166 -#, c-format -msgid "Would not remove %s\n" +#: 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:168 -#, c-format -msgid "Not removing %s\n" +#: 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:876 +msgid "force" +msgstr "" + +#: builtin/clean.c:877 +msgid "interactive cleaning" +msgstr "" + +#: builtin/clean.c:879 +msgid "remove whole directories" +msgstr "" + +#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 +msgid "pattern" +msgstr "" + +#: builtin/clean.c:881 +msgid "add <pattern> to ignore rules" +msgstr "" + +#: builtin/clean.c:882 +msgid "remove ignored files, too" +msgstr "" + +#: builtin/clean.c:884 +msgid "remove only ignored files" +msgstr "" + +#: builtin/clean.c:902 +msgid "-x and -X cannot be used together" +msgstr "" + +#: builtin/clean.c:906 +msgid "" +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " +"clean" +msgstr "" + +#: builtin/clean.c:909 +msgid "" +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " +"refusing to clean" msgstr "" -#: builtin/clone.c:36 +#: builtin/clone.c:37 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 -#: builtin/push.c:399 +#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223 +#: builtin/push.c:514 msgid "force progress reporting" msgstr "" -#: builtin/clone.c:66 +#: builtin/clone.c:67 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 +#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 msgid "create a bare repository" msgstr "" @@ -2920,7 +3725,7 @@ msgstr "" msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:748 +#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659 msgid "depth" msgstr "" @@ -2948,118 +3753,165 @@ msgstr "" msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:243 +#: builtin/clone.c:253 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "" + +#: builtin/clone.c:257 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "" + +#: builtin/clone.c:260 #, c-format -msgid "reference repository '%s' is not a local directory." +msgid "reference repository '%s' is grafted" msgstr "" -#: builtin/clone.c:306 +#: builtin/clone.c:322 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/clone.c:308 builtin/diff.c:77 +#: builtin/clone.c:324 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "" -#: builtin/clone.c:310 +#: builtin/clone.c:326 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:324 +#: builtin/clone.c:340 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:346 +#: builtin/clone.c:362 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:350 +#: builtin/clone.c:366 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:373 +#: builtin/clone.c:389 builtin/clone.c:563 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:443 +#: builtin/clone.c:401 +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:478 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:552 +#: builtin/clone.c:558 +#, c-format +msgid "Checking connectivity... " +msgstr "" + +#: builtin/clone.c:561 +msgid "remote did not send all necessary objects" +msgstr "" + +#: builtin/clone.c:625 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:690 +#: builtin/clone.c:656 +msgid "unable to checkout working tree" +msgstr "" + +#: builtin/clone.c:765 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:694 +#: builtin/clone.c:769 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:705 +#: builtin/clone.c:780 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:719 +#: builtin/clone.c:783 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "" + +#: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:724 -msgid "--depth is ignored in local clones; use file:// instead." +#: builtin/clone.c:802 builtin/fetch.c:1155 +#, c-format +msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:734 +#: builtin/clone.c:812 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:744 +#: builtin/clone.c:822 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:757 builtin/clone.c:771 +#: builtin/clone.c:835 builtin/clone.c:847 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:760 +#: builtin/clone.c:838 #, c-format msgid "could not create work tree dir '%s'." msgstr "" -#: builtin/clone.c:779 +#: builtin/clone.c:857 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:781 +#: builtin/clone.c:859 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:823 +#: builtin/clone.c:895 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:898 +msgid "source repository is shallow, ignoring --local" +msgstr "" + +#: builtin/clone.c:903 +msgid "--local is ignored" +msgstr "" + +#: builtin/clone.c:907 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:872 +#: builtin/clone.c:958 builtin/clone.c:966 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:879 +#: builtin/clone.c:969 msgid "You appear to have cloned an empty repository." msgstr "" @@ -3095,15 +3947,30 @@ msgstr "" msgid "--command must be the first argument" msgstr "" -#: builtin/commit.c:34 -msgid "git commit [options] [--] <filepattern>..." +#: builtin/commit.c:37 +msgid "git commit [options] [--] <pathspec>..." +msgstr "" + +#: builtin/commit.c:42 +msgid "git status [options] [--] <pathspec>..." msgstr "" -#: builtin/commit.c:39 -msgid "git status [options] [--] <filepattern>..." +#: builtin/commit.c:47 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" msgstr "" -#: builtin/commit.c:44 +#: builtin/commit.c:60 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3117,110 +3984,147 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: builtin/commit.c:56 +#: builtin/commit.c:72 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:77 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:257 +#: builtin/commit.c:84 +msgid "Otherwise, please use 'git reset'\n" +msgstr "" + +#: builtin/commit.c:87 +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:302 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:299 +#: builtin/commit.c:342 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:305 +#: builtin/commit.c:348 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:338 builtin/commit.c:359 builtin/commit.c:409 +#: builtin/commit.c:359 +msgid "unable to write index file" +msgstr "" + +#: builtin/commit.c:361 +msgid "unable to update temporary index" +msgstr "" + +#: builtin/commit.c:363 +msgid "Failed to update main cache tree" +msgstr "" + +#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:390 +#: builtin/commit.c:443 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:392 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:402 +#: builtin/commit.c:454 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:422 +#: builtin/commit.c:473 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:509 builtin/commit.c:515 +#: builtin/commit.c:592 +#, c-format +msgid "commit '%s' lacks author header" +msgstr "" + +#: builtin/commit.c:594 #, c-format -msgid "invalid commit: %s" +msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:538 +#: builtin/commit.c:613 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:558 +#: builtin/commit.c:621 +#, c-format +msgid "invalid date format: %s" +msgstr "" + +#: builtin/commit.c:642 #, c-format msgid "Malformed ident string: '%s'" msgstr "" -#: builtin/commit.c:596 builtin/commit.c:629 builtin/commit.c:952 +#: builtin/commit.c:675 +msgid "" +"unable to select a comment character that is not used\n" +"in the current commit message" +msgstr "" + +#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:608 builtin/shortlog.c:296 +#: builtin/commit.c:724 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:610 +#: builtin/commit.c:726 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:614 +#: builtin/commit.c:730 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:620 -msgid "commit has empty message" -msgstr "" - -#: builtin/commit.c:636 +#: builtin/commit.c:752 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:640 +#: builtin/commit.c:756 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:644 +#: builtin/commit.c:760 #, c-format msgid "could not read '%s'" msgstr "" -#: builtin/commit.c:705 +#: builtin/commit.c:831 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:716 +#: builtin/commit.c:849 #, c-format msgid "" "\n" @@ -3230,7 +4134,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:721 +#: builtin/commit.c:854 #, c-format msgid "" "\n" @@ -3240,686 +4144,739 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:733 +#: builtin/commit.c:867 +#, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '#' will be ignored, and an empty message aborts the commit.\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:738 +#: builtin/commit.c:874 +#, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '#' will be kept; you may remove them yourself if you want to.\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:751 +#: builtin/commit.c:888 +#, c-format +msgid "%sAuthor: %.*s <%.*s>" +msgstr "" + +#: builtin/commit.c:896 #, c-format -msgid "%sAuthor: %s" +msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:758 +#: builtin/commit.c:903 #, c-format -msgid "%sCommitter: %s" +msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:778 +#: builtin/commit.c:921 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:815 +#: builtin/commit.c:978 msgid "Error building trees" msgstr "" -#: builtin/commit.c:830 builtin/tag.c:361 +#: builtin/commit.c:993 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:927 +#: builtin/commit.c:1095 #, c-format msgid "No existing author found with '%s'" msgstr "" -#: builtin/commit.c:942 builtin/commit.c:1142 +#: builtin/commit.c:1110 builtin/commit.c:1350 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:982 +#: builtin/commit.c:1147 +msgid "--long and -z are incompatible" +msgstr "" + +#: builtin/commit.c:1177 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:993 +#: builtin/commit.c:1186 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:996 +#: builtin/commit.c:1189 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:998 +#: builtin/commit.c:1191 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1001 +#: builtin/commit.c:1194 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1011 +#: builtin/commit.c:1204 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1013 +#: builtin/commit.c:1206 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1021 +#: builtin/commit.c:1214 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1038 +#: builtin/commit.c:1231 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1040 +#: builtin/commit.c:1233 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1042 +#: builtin/commit.c:1235 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1044 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +#: builtin/commit.c:1237 +msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1054 builtin/tag.c:577 +#: builtin/commit.c:1249 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1059 +#: builtin/commit.c:1254 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1156 builtin/commit.c:1384 +#: builtin/commit.c:1364 builtin/commit.c:1644 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1158 builtin/commit.c:1386 +#: builtin/commit.c:1366 builtin/commit.c:1646 msgid "show branch information" msgstr "" -#: builtin/commit.c:1160 builtin/commit.c:1388 builtin/push.c:389 +#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1163 builtin/commit.c:1390 +#: builtin/commit.c:1371 builtin/commit.c:1650 +msgid "show status in long format (default)" +msgstr "" + +#: builtin/commit.c:1374 builtin/commit.c:1653 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1165 builtin/commit.c:1393 builtin/fast-export.c:636 -#: builtin/fast-export.c:639 builtin/tag.c:461 +#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980 +#: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "" -#: builtin/commit.c:1166 builtin/commit.c:1393 +#: builtin/commit.c:1377 builtin/commit.c:1656 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1169 +#: builtin/commit.c:1380 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1170 parse-options.h:151 +#: builtin/commit.c:1381 parse-options.h:153 msgid "when" msgstr "" -#: builtin/commit.c:1171 +#: builtin/commit.c:1382 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1173 +#: builtin/commit.c:1384 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1242 +#: builtin/commit.c:1471 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1244 +#: builtin/commit.c:1473 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1285 +#: builtin/commit.c:1518 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1287 +#: builtin/commit.c:1521 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1354 +#: builtin/commit.c:1614 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1355 +#: builtin/commit.c:1615 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1357 +#: builtin/commit.c:1617 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1358 builtin/tag.c:459 +#: builtin/commit.c:1618 builtin/tag.c:601 msgid "read message from file" msgstr "" -#: builtin/commit.c:1359 +#: builtin/commit.c:1619 msgid "author" msgstr "" -#: builtin/commit.c:1359 +#: builtin/commit.c:1619 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1360 builtin/gc.c:178 +#: builtin/commit.c:1620 builtin/gc.c:275 msgid "date" msgstr "" -#: builtin/commit.c:1360 +#: builtin/commit.c:1620 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1361 builtin/merge.c:206 builtin/notes.c:537 -#: builtin/notes.c:694 builtin/tag.c:457 +#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408 +#: builtin/notes.c:565 builtin/tag.c:599 msgid "message" msgstr "" -#: builtin/commit.c:1361 +#: builtin/commit.c:1621 msgid "commit message" msgstr "" -#: builtin/commit.c:1362 +#: builtin/commit.c:1622 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1363 +#: builtin/commit.c:1623 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1364 +#: builtin/commit.c:1624 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1365 +#: builtin/commit.c:1625 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1366 +#: builtin/commit.c:1626 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1367 builtin/log.c:1068 builtin/revert.c:109 +#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1368 +#: builtin/commit.c:1628 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1369 +#: builtin/commit.c:1629 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1370 +#: builtin/commit.c:1630 msgid "default" msgstr "" -#: builtin/commit.c:1370 builtin/tag.c:462 +#: builtin/commit.c:1630 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1371 +#: builtin/commit.c:1631 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1372 builtin/merge.c:213 builtin/tag.c:463 -msgid "key id" +#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92 +#: builtin/tag.c:605 +msgid "key-id" msgstr "" -#: builtin/commit.c:1373 builtin/merge.c:214 +#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93 msgid "GPG sign commit" msgstr "" -#. end commit message options -#: builtin/commit.c:1376 +#: builtin/commit.c:1636 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1377 +#: builtin/commit.c:1637 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1378 +#: builtin/commit.c:1638 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1379 +#: builtin/commit.c:1639 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1380 +#: builtin/commit.c:1640 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1381 +#: builtin/commit.c:1641 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1382 +#: builtin/commit.c:1642 msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1383 +#: builtin/commit.c:1643 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1391 +#: builtin/commit.c:1654 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1392 +#: builtin/commit.c:1655 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1397 +#: builtin/commit.c:1660 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1400 +#: builtin/commit.c:1662 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1432 +#: builtin/commit.c:1691 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1470 builtin/merge.c:508 +#: builtin/commit.c:1730 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1477 +#: builtin/commit.c:1737 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1484 +#: builtin/commit.c:1744 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1503 +#: builtin/commit.c:1763 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1517 +#: builtin/commit.c:1774 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1522 +#: builtin/commit.c:1779 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1537 builtin/merge.c:935 builtin/merge.c:960 +#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1558 -msgid "cannot lock HEAD ref" -msgstr "" - -#: builtin/commit.c:1562 -msgid "cannot update HEAD ref" -msgstr "" - -#: builtin/commit.c:1573 +#: builtin/commit.c:1827 msgid "" "Repository has been updated, but unable to write\n" -"new_index file. Check that disk is not full or quota is\n" +"new_index file. Check that disk is not full and 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:52 +#: builtin/config.c:53 msgid "Config file location" msgstr "" -#: builtin/config.c:53 +#: builtin/config.c:54 msgid "use global config file" msgstr "" -#: builtin/config.c:54 +#: builtin/config.c:55 msgid "use system config file" msgstr "" -#: builtin/config.c:55 +#: builtin/config.c:56 msgid "use repository config file" msgstr "" -#: builtin/config.c:56 +#: builtin/config.c:57 msgid "use given config file" msgstr "" -#: builtin/config.c:57 -msgid "Action" +#: builtin/config.c:58 +msgid "blob-id" msgstr "" #: builtin/config.c:58 -msgid "get value: name [value-regex]" +msgid "read config from given blob object" msgstr "" #: builtin/config.c:59 -msgid "get all values: key [value-regex]" +msgid "Action" msgstr "" #: builtin/config.c:60 -msgid "get values for regexp: name-regex [value-regex]" +msgid "get value: name [value-regex]" msgstr "" #: builtin/config.c:61 -msgid "replace all matching variables: name value [value_regex]" +msgid "get all values: key [value-regex]" msgstr "" #: builtin/config.c:62 -msgid "add a new variable: name value" +msgid "get values for regexp: name-regex [value-regex]" msgstr "" #: builtin/config.c:63 -msgid "remove a variable: name [value-regex]" +msgid "get value specific for the URL: section[.var] URL" msgstr "" #: builtin/config.c:64 -msgid "remove all matches: name [value-regex]" +msgid "replace all matching variables: name value [value_regex]" msgstr "" #: builtin/config.c:65 -msgid "rename section: old-name new-name" +msgid "add a new variable: name value" msgstr "" #: builtin/config.c:66 -msgid "remove a section: name" +msgid "remove a variable: name [value-regex]" msgstr "" #: builtin/config.c:67 -msgid "list all" +msgid "remove all matches: name [value-regex]" msgstr "" #: builtin/config.c:68 +msgid "rename section: old-name new-name" +msgstr "" + +#: builtin/config.c:69 +msgid "remove a section: name" +msgstr "" + +#: builtin/config.c:70 +msgid "list all" +msgstr "" + +#: builtin/config.c:71 msgid "open an editor" msgstr "" -#: builtin/config.c:69 builtin/config.c:70 +#: builtin/config.c:72 builtin/config.c:73 msgid "slot" msgstr "" -#: builtin/config.c:69 +#: builtin/config.c:72 msgid "find the color configured: [default]" msgstr "" -#: builtin/config.c:70 +#: builtin/config.c:73 msgid "find the color setting: [stdout-is-tty]" msgstr "" -#: builtin/config.c:71 +#: builtin/config.c:74 msgid "Type" msgstr "" -#: builtin/config.c:72 +#: builtin/config.c:75 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:73 +#: builtin/config.c:76 msgid "value is decimal number" msgstr "" -#: builtin/config.c:74 +#: builtin/config.c:77 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:75 +#: builtin/config.c:78 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:76 +#: builtin/config.c:79 msgid "Other" msgstr "" -#: builtin/config.c:77 +#: builtin/config.c:80 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:78 +#: builtin/config.c:81 msgid "respect include directives on lookup" msgstr "" -#: builtin/count-objects.c:69 -msgid "git count-objects [-v]" +#: builtin/config.c:315 +msgid "unable to parse default color value" +msgstr "" + +#: builtin/config.c:455 +#, c-format +msgid "" +"# This is Git's per-user configuration file.\n" +"[core]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tuser = %s\n" +"#\temail = %s\n" +msgstr "" + +#: builtin/config.c:590 +#, c-format +msgid "cannot create configuration file %s" +msgstr "" + +#: builtin/count-objects.c:55 +msgid "git count-objects [-v] [-H | --human-readable]" +msgstr "" + +#: builtin/count-objects.c:65 +msgid "print sizes in human readable format" msgstr "" -#: builtin/describe.c:15 -msgid "git describe [options] <committish>*" +#: builtin/describe.c:17 +msgid "git describe [options] <commit-ish>*" msgstr "" -#: builtin/describe.c:16 +#: builtin/describe.c:18 msgid "git describe [options] --dirty" msgstr "" -#: builtin/describe.c:234 +#: builtin/describe.c:217 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:238 +#: builtin/describe.c:221 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:240 +#: builtin/describe.c:223 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:267 +#: builtin/describe.c:250 builtin/log.c:452 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:270 +#: builtin/describe.c:253 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: builtin/describe.c:287 +#: builtin/describe.c:270 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:289 +#: builtin/describe.c:272 #, c-format msgid "searching to describe %s\n" msgstr "" -#: builtin/describe.c:329 +#: builtin/describe.c:319 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:353 +#: builtin/describe.c:346 #, 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:350 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:378 +#: builtin/describe.c:371 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:381 +#: builtin/describe.c:374 #, 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:396 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:404 +#: builtin/describe.c:397 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:405 -msgid "use any ref in .git/refs" +#: builtin/describe.c:398 +msgid "use any ref" msgstr "" -#: builtin/describe.c:406 -msgid "use any tag in .git/refs/tags" +#: builtin/describe.c:399 +msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:407 +#: builtin/describe.c:400 msgid "always use long format" msgstr "" -#: builtin/describe.c:410 +#: builtin/describe.c:401 +msgid "only follow first parent" +msgstr "" + +#: builtin/describe.c:404 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:412 +#: builtin/describe.c:406 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:414 +#: builtin/describe.c:408 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:416 builtin/name-rev.c:238 +#: builtin/describe.c:410 builtin/name-rev.c:318 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:417 +#: builtin/describe.c:411 msgid "mark" msgstr "" -#: builtin/describe.c:418 +#: builtin/describe.c:412 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:436 +#: builtin/describe.c:430 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:462 +#: builtin/describe.c:456 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:482 -msgid "--dirty is incompatible with committishes" +#: builtin/describe.c:476 +msgid "--dirty is incompatible with commit-ishes" msgstr "" -#: builtin/diff.c:79 +#: builtin/diff.c:86 #, c-format msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:224 +#: builtin/diff.c:237 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:301 +#: builtin/diff.c:358 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:344 +#: builtin/diff.c:401 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:349 -#, c-format -msgid "more than %d trees given: '%s'" -msgstr "" - -#: builtin/diff.c:359 +#: builtin/diff.c:410 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:367 +#: builtin/diff.c:417 #, c-format msgid "unhandled object '%s' given." msgstr "" -#: builtin/fast-export.c:22 +#: builtin/fast-export.c:24 msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:635 +#: builtin/fast-export.c:979 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:637 +#: builtin/fast-export.c:981 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:640 +#: builtin/fast-export.c:984 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:643 +#: builtin/fast-export.c:987 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:645 +#: builtin/fast-export.c:989 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:647 +#: builtin/fast-export.c:991 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:649 +#: builtin/fast-export.c:993 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:651 +#: builtin/fast-export.c:995 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:652 +#: builtin/fast-export.c:996 msgid "Skip output of blob data" msgstr "" +#: builtin/fast-export.c:997 +msgid "refspec" +msgstr "" + +#: builtin/fast-export.c:998 +msgid "Apply refspec to exported refs" +msgstr "" + +#: builtin/fast-export.c:999 +msgid "anonymize output" +msgstr "" + #: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" @@ -3936,218 +4893,247 @@ msgstr "" msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:60 +#: builtin/fetch.c:90 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:62 +#: builtin/fetch.c:92 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:64 +#: builtin/fetch.c:94 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:65 +#: builtin/fetch.c:95 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:67 +#: builtin/fetch.c:97 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:69 +#: builtin/fetch.c:99 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:71 +#: builtin/fetch.c:101 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:73 +#: builtin/fetch.c:103 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:74 +#: builtin/fetch.c:104 msgid "on-demand" msgstr "" -#: builtin/fetch.c:75 +#: builtin/fetch.c:105 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:79 +#: builtin/fetch.c:109 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:81 +#: builtin/fetch.c:111 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:84 +#: builtin/fetch.c:114 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:85 builtin/log.c:1083 +#: builtin/fetch.c:116 +msgid "convert to a complete repository" +msgstr "" + +#: builtin/fetch.c:118 builtin/log.c:1208 msgid "dir" msgstr "" -#: builtin/fetch.c:86 +#: builtin/fetch.c:119 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:89 +#: builtin/fetch.c:122 msgid "default mode for recursion" msgstr "" -#: builtin/fetch.c:201 +#: builtin/fetch.c:124 +msgid "accept refs that update .git/shallow" +msgstr "" + +#: builtin/fetch.c:125 +msgid "refmap" +msgstr "" + +#: builtin/fetch.c:126 +msgid "specify fetch refmap" +msgstr "" + +#: builtin/fetch.c:376 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:254 +#: builtin/fetch.c:454 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:259 +#: builtin/fetch.c:459 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:273 +#: builtin/fetch.c:473 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:274 builtin/fetch.c:360 +#: builtin/fetch.c:474 builtin/fetch.c:560 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:285 +#: builtin/fetch.c:485 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 msgid " (unable to update local ref)" msgstr "" -#: builtin/fetch.c:305 +#: builtin/fetch.c:505 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:308 +#: builtin/fetch.c:508 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:311 +#: builtin/fetch.c:511 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:356 +#: builtin/fetch.c:556 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:356 +#: builtin/fetch.c:556 msgid "forced update" msgstr "" -#: builtin/fetch.c:362 +#: builtin/fetch.c:562 msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:393 builtin/fetch.c:685 +#: builtin/fetch.c:595 builtin/fetch.c:828 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: builtin/fetch.c:402 +#: builtin/fetch.c:604 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:488 +#: builtin/fetch.c:622 +#, c-format +msgid "reject %s because shallow roots are not allowed to be updated" +msgstr "" + +#: builtin/fetch.c:710 builtin/fetch.c:793 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:499 +#: builtin/fetch.c:721 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:549 +#: builtin/fetch.c:773 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:550 +#: builtin/fetch.c:774 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:557 +#: builtin/fetch.c:798 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:558 builtin/remote.c:1055 +#: builtin/fetch.c:799 builtin/remote.c:1063 msgid "(none)" msgstr "" -#: builtin/fetch.c:675 +#: builtin/fetch.c:818 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:709 +#: builtin/fetch.c:837 #, 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:786 +#: builtin/fetch.c:840 #, c-format -msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:789 +#: builtin/fetch.c:896 #, c-format -msgid "Option \"%s\" is ignored for %s\n" +msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:891 +#: builtin/fetch.c:1058 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:893 builtin/remote.c:100 +#: builtin/fetch.c:1060 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:912 +#: builtin/fetch.c:1078 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:932 +#: builtin/fetch.c:1101 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:984 +#: builtin/fetch.c:1143 +msgid "--depth and --unshallow cannot be used together" +msgstr "" + +#: builtin/fetch.c:1145 +msgid "--unshallow on a complete repository does not make sense" +msgstr "" + +#: builtin/fetch.c:1168 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:986 +#: builtin/fetch.c:1170 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1181 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1005 +#: builtin/fetch.c:1189 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -4155,777 +5141,858 @@ msgstr "" msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:787 -#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192 -#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698 +#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590 +#: parse-options.h:132 parse-options.h:239 msgid "n" msgstr "" -#: builtin/fmt-merge-msg.c:654 +#: builtin/fmt-merge-msg.c:664 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:657 +#: builtin/fmt-merge-msg.c:667 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:660 +#: builtin/fmt-merge-msg.c:670 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:661 +#: builtin/fmt-merge-msg.c:671 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:662 +#: builtin/fmt-merge-msg.c:672 msgid "file to read from" msgstr "" -#: builtin/for-each-ref.c:979 +#: builtin/for-each-ref.c:676 +msgid "unable to parse format" +msgstr "" + +#: builtin/for-each-ref.c:1057 msgid "git for-each-ref [options] [<pattern>]" msgstr "" -#: builtin/for-each-ref.c:994 +#: builtin/for-each-ref.c:1072 msgid "quote placeholders suitably for shells" msgstr "" -#: builtin/for-each-ref.c:996 +#: builtin/for-each-ref.c:1074 msgid "quote placeholders suitably for perl" msgstr "" -#: builtin/for-each-ref.c:998 +#: builtin/for-each-ref.c:1076 msgid "quote placeholders suitably for python" msgstr "" -#: builtin/for-each-ref.c:1000 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for tcl" msgstr "" -#: builtin/for-each-ref.c:1003 +#: builtin/for-each-ref.c:1081 msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:1004 +#: builtin/for-each-ref.c:1082 builtin/replace.c:438 msgid "format" msgstr "" -#: builtin/for-each-ref.c:1004 +#: builtin/for-each-ref.c:1082 msgid "format to use for the output" msgstr "" -#: builtin/for-each-ref.c:1005 +#: builtin/for-each-ref.c:1083 msgid "key" msgstr "" -#: builtin/for-each-ref.c:1006 +#: builtin/for-each-ref.c:1084 msgid "field name to sort on" msgstr "" -#: builtin/fsck.c:608 +#: builtin/fsck.c:147 builtin/prune.c:136 +msgid "Checking connectivity" +msgstr "" + +#: builtin/fsck.c:540 +msgid "Checking object directories" +msgstr "" + +#: builtin/fsck.c:603 msgid "git fsck [options] [<object>...]" msgstr "" -#: builtin/fsck.c:614 +#: builtin/fsck.c:609 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:615 +#: builtin/fsck.c:610 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:616 +#: builtin/fsck.c:611 msgid "report tags" msgstr "" -#: builtin/fsck.c:617 +#: builtin/fsck.c:612 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:618 +#: builtin/fsck.c:613 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:619 +#: builtin/fsck.c:614 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:620 +#: builtin/fsck.c:615 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:621 +#: builtin/fsck.c:616 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:623 +#: builtin/fsck.c:618 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:624 builtin/prune.c:134 +#: builtin/fsck.c:619 builtin/prune.c:108 msgid "show progress" msgstr "" -#: builtin/gc.c:22 +#: builtin/fsck.c:669 +msgid "Checking objects" +msgstr "" + +#: builtin/gc.c:24 msgid "git gc [options]" msgstr "" -#: builtin/gc.c:63 +#: builtin/gc.c:79 #, c-format -msgid "Invalid %s: '%s'" +msgid "Invalid gc.pruneexpire: '%s'" msgstr "" -#: builtin/gc.c:90 +#: builtin/gc.c:107 #, c-format msgid "insanely long object directory %.*s" msgstr "" -#: builtin/gc.c:179 +#: builtin/gc.c:276 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:181 +#: builtin/gc.c:278 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:182 +#: builtin/gc.c:279 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:222 +#: builtin/gc.c:280 +msgid "force running gc even if there may be another gc running" +msgstr "" + +#: builtin/gc.c:321 +#, c-format +msgid "Auto packing the repository in background for optimum performance.\n" +msgstr "" + +#: builtin/gc.c:323 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "" + +#: builtin/gc.c:324 +#, c-format +msgid "See \"git help gc\" for manual housekeeping.\n" +msgstr "" + +#: builtin/gc.c:342 #, 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" +"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -#: builtin/gc.c:249 +#: builtin/gc.c:364 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 "" -#: builtin/grep.c:455 -#, c-format -msgid "Failed to chdir: %s" -msgstr "" - -#: builtin/grep.c:531 builtin/grep.c:565 +#: builtin/grep.c:441 builtin/grep.c:476 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:579 +#: builtin/grep.c:491 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:637 +#: builtin/grep.c:547 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:654 +#: builtin/grep.c:564 #, c-format msgid "cannot open '%s'" msgstr "" -#: builtin/grep.c:729 +#: builtin/grep.c:638 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:731 +#: builtin/grep.c:640 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:733 +#: builtin/grep.c:642 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:735 +#: builtin/grep.c:644 msgid "search also in ignored files" msgstr "" -#: builtin/grep.c:738 +#: builtin/grep.c:647 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:740 +#: builtin/grep.c:649 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:742 +#: builtin/grep.c:651 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:744 +#: builtin/grep.c:653 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:746 +#: builtin/grep.c:655 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:749 +#: builtin/grep.c:658 +msgid "process binary files with textconv filters" +msgstr "" + +#: builtin/grep.c:660 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:753 +#: builtin/grep.c:664 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:756 +#: builtin/grep.c:667 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:759 +#: builtin/grep.c:670 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:762 +#: builtin/grep.c:673 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:765 +#: builtin/grep.c:676 msgid "show line numbers" msgstr "" -#: builtin/grep.c:766 +#: builtin/grep.c:677 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:767 +#: builtin/grep.c:678 msgid "show filenames" msgstr "" -#: builtin/grep.c:769 +#: builtin/grep.c:680 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:771 +#: builtin/grep.c:682 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:773 +#: builtin/grep.c:684 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:776 +#: builtin/grep.c:687 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:778 +#: builtin/grep.c:689 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:780 +#: builtin/grep.c:691 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:781 +#: builtin/grep.c:692 msgid "highlight matches" msgstr "" -#: builtin/grep.c:783 +#: builtin/grep.c:694 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:785 +#: builtin/grep.c:696 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:788 +#: builtin/grep.c:699 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:791 +#: builtin/grep.c:702 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:793 +#: builtin/grep.c:704 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:794 +#: builtin/grep.c:705 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:797 +#: builtin/grep.c:708 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:799 +#: builtin/grep.c:710 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:802 +#: builtin/grep.c:713 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:804 +#: builtin/grep.c:715 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:806 +#: builtin/grep.c:717 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:818 +#: builtin/grep.c:729 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:820 +#: builtin/grep.c:731 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:822 +#: builtin/grep.c:733 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:826 +#: builtin/grep.c:737 msgid "pager" msgstr "" -#: builtin/grep.c:826 +#: builtin/grep.c:737 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:829 +#: builtin/grep.c:740 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:830 builtin/show-ref.c:201 +#: builtin/grep.c:741 builtin/show-ref.c:187 msgid "show usage" msgstr "" -#: builtin/grep.c:921 +#: builtin/grep.c:808 msgid "no pattern given." msgstr "" -#: builtin/grep.c:935 -#, c-format -msgid "bad object %s" -msgstr "" - -#: builtin/grep.c:976 +#: builtin/grep.c:866 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:999 +#: builtin/grep.c:892 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:1004 +#: builtin/grep.c:897 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:1007 +#: builtin/grep.c:900 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:1015 +#: builtin/grep.c:908 msgid "both --cached and trees are given." msgstr "" -#: builtin/hash-object.c:60 +#: builtin/hash-object.c:82 msgid "" "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " "<file>..." msgstr "" -#: builtin/hash-object.c:61 +#: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "" -#: builtin/hash-object.c:72 +#: builtin/hash-object.c:94 builtin/tag.c:610 msgid "type" msgstr "" -#: builtin/hash-object.c:72 +#: builtin/hash-object.c:94 msgid "object type" msgstr "" -#: builtin/hash-object.c:73 +#: builtin/hash-object.c:95 msgid "write the object into the object database" msgstr "" -#: builtin/hash-object.c:74 +#: builtin/hash-object.c:97 msgid "read the object from stdin" msgstr "" -#: builtin/hash-object.c:76 +#: builtin/hash-object.c:99 msgid "store file as is without filters" msgstr "" -#: builtin/hash-object.c:77 +#: builtin/hash-object.c:100 +msgid "" +"just hash any random garbage to create corrupt objects for debugging Git" +msgstr "" + +#: builtin/hash-object.c:101 msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:43 +#: builtin/help.c:41 msgid "print all available commands" msgstr "" -#: builtin/help.c:44 +#: builtin/help.c:42 +msgid "print list of useful guides" +msgstr "" + +#: builtin/help.c:43 msgid "show man page" msgstr "" -#: builtin/help.c:45 +#: builtin/help.c:44 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:47 +#: builtin/help.c:46 msgid "show info page" msgstr "" -#: builtin/help.c:53 -msgid "git help [--all] [--man|--web|--info] [command]" +#: builtin/help.c:52 +msgid "git help [--all] [--guides] [--man|--web|--info] [command]" msgstr "" -#: builtin/help.c:65 +#: builtin/help.c:64 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:93 +#: builtin/help.c:91 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:106 +#: builtin/help.c:104 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:114 +#: builtin/help.c:112 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 #, c-format msgid "failed to exec '%s': %s" msgstr "" -#: builtin/help.c:217 +#: builtin/help.c:215 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -#: builtin/help.c:229 +#: builtin/help.c:227 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" -#: builtin/help.c:299 -msgid "The most commonly used git commands are:" -msgstr "" - -#: builtin/help.c:367 +#: builtin/help.c:352 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:384 +#: builtin/help.c:369 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:392 +#: builtin/help.c:377 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:447 builtin/help.c:454 +#: builtin/help.c:423 +msgid "Defining attributes per path" +msgstr "" + +#: builtin/help.c:424 +msgid "Everyday Git With 20 Commands Or So" +msgstr "" + +#: builtin/help.c:425 +msgid "A Git glossary" +msgstr "" + +#: builtin/help.c:426 +msgid "Specifies intentionally untracked files to ignore" +msgstr "" + +#: builtin/help.c:427 +msgid "Defining submodule properties" +msgstr "" + +#: builtin/help.c:428 +msgid "Specifying revisions and ranges for Git" +msgstr "" + +#: builtin/help.c:429 +msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" +msgstr "" + +#: builtin/help.c:430 +msgid "An overview of recommended workflows with Git" +msgstr "" + +#: builtin/help.c:442 +msgid "The common Git guides are:\n" +msgstr "" + +#: builtin/help.c:463 builtin/help.c:480 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/help.c:470 +#: builtin/help.c:496 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "" -#: builtin/index-pack.c:170 +#: builtin/index-pack.c:150 +#, c-format +msgid "unable to open %s" +msgstr "" + +#: builtin/index-pack.c:200 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:190 -msgid "object of unexpected type" +#: builtin/index-pack.c:220 +#, c-format +msgid "did not receive expected object %s" +msgstr "" + +#: builtin/index-pack.c:223 +#, c-format +msgid "object %s: expected type %s, found %s" msgstr "" -#: builtin/index-pack.c:227 +#: builtin/index-pack.c:265 #, 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:275 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:238 +#: builtin/index-pack.c:276 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:250 +#: builtin/index-pack.c:288 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:257 +#: builtin/index-pack.c:295 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:273 +#: builtin/index-pack.c:311 #, c-format msgid "unable to create '%s'" msgstr "" -#: builtin/index-pack.c:278 +#: builtin/index-pack.c:316 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:292 +#: builtin/index-pack.c:330 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:294 +#: builtin/index-pack.c:332 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:350 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "" -#: builtin/index-pack.c:434 +#: builtin/index-pack.c:471 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:483 +#: builtin/index-pack.c:520 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:491 +#: builtin/index-pack.c:528 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:499 +#: builtin/index-pack.c:536 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:567 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:532 +#: builtin/index-pack.c:569 #, 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:595 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:686 builtin/index-pack.c:692 builtin/index-pack.c:715 +#: builtin/index-pack.c:749 builtin/index-pack.c:758 #, 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:689 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:718 +#: builtin/index-pack.c:755 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:732 +#: builtin/index-pack.c:769 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:747 +#: builtin/index-pack.c:783 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:749 +#: builtin/index-pack.c:787 msgid "Error in object" msgstr "" -#: builtin/index-pack.c:751 +#: builtin/index-pack.c:789 #, 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:861 builtin/index-pack.c:890 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:986 +#: builtin/index-pack.c:1055 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:986 +#: builtin/index-pack.c:1055 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1012 +#: builtin/index-pack.c:1081 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1017 +#: builtin/index-pack.c:1086 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1020 +#: builtin/index-pack.c:1089 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1031 +#: builtin/index-pack.c:1100 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1054 +#: builtin/index-pack.c:1123 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1064 +#: builtin/index-pack.c:1133 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1106 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1112 +#: builtin/index-pack.c:1181 #, c-format msgid "completed with %d local objects" msgstr "" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1191 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1125 +#: builtin/index-pack.c:1195 #, 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:1220 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1229 +#: builtin/index-pack.c:1299 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1253 +#: builtin/index-pack.c:1323 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1266 +#: builtin/index-pack.c:1336 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1274 +#: builtin/index-pack.c:1344 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1287 +#: builtin/index-pack.c:1357 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1298 +#: builtin/index-pack.c:1368 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1331 +#: builtin/index-pack.c:1401 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1337 +#: builtin/index-pack.c:1407 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/index-pack.c:1341 builtin/index-pack.c:1514 +#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/index-pack.c:1399 +#: builtin/index-pack.c:1469 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1471 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1448 +#: builtin/index-pack.c:1518 #, 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:1525 #, 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:1554 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:1602 builtin/index-pack.c:1605 +#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1559 +#: builtin/index-pack.c:1635 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1563 builtin/index-pack.c:1573 +#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1582 +#: builtin/index-pack.c:1656 msgid "--verify with no packfile name given" msgstr "" @@ -5014,41 +6081,30 @@ 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 -#. * "", and the last '%s%s' is the verbatim directory name. -#. -#: builtin/init-db.c:420 +#. TRANSLATORS: The first '%s' is either "Reinitialized +#. existing" or "Initialized empty", the second " shared" or +#. "", and the last '%s%s' is the verbatim directory name. +#: builtin/init-db.c:418 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:421 +#: builtin/init-db.c:419 msgid "Reinitialized existing" msgstr "" -#: builtin/init-db.c:421 +#: builtin/init-db.c:419 msgid "Initialized empty" msgstr "" -#: builtin/init-db.c:422 +#: builtin/init-db.c:420 msgid " shared" msgstr "" -#: builtin/init-db.c:441 -msgid "cannot tell cwd" -msgstr "" - #: builtin/init-db.c:467 msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" -"[=<permissions>]] [directory]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" +"shared[=<permissions>]] [directory]" msgstr "" #: builtin/init-db.c:490 @@ -5059,16 +6115,16 @@ 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:57 builtin/repack.c:172 msgid "be quiet" msgstr "" -#: builtin/init-db.c:522 builtin/init-db.c:529 +#: builtin/init-db.c:525 builtin/init-db.c:530 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:533 +#: builtin/init-db.c:534 #, c-format msgid "cannot chdir to %s" msgstr "" @@ -5080,736 +6136,814 @@ msgid "" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:579 -msgid "Cannot access current working directory" -msgstr "" - -#: builtin/init-db.c:586 +#: builtin/init-db.c:583 #, c-format msgid "Cannot access work tree '%s'" msgstr "" -#: builtin/log.c:37 -msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" +#: builtin/interpret-trailers.c:15 +msgid "" +"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " +"[<file>...]" +msgstr "" + +#: builtin/interpret-trailers.c:25 +msgid "trim empty trailers" +msgstr "" + +#: builtin/interpret-trailers.c:26 +msgid "trailer" +msgstr "" + +#: builtin/interpret-trailers.c:27 +msgid "trailer(s) to add" msgstr "" -#: builtin/log.c:38 +#: builtin/log.c:41 +msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" +msgstr "" + +#: builtin/log.c:42 msgid " or: git show [options] <object>..." msgstr "" -#: builtin/log.c:100 +#: builtin/log.c:81 +#, c-format +msgid "invalid --decorate option: %s" +msgstr "" + +#: builtin/log.c:127 msgid "suppress diff output" msgstr "" -#: builtin/log.c:101 +#: builtin/log.c:128 msgid "show source" msgstr "" -#: builtin/log.c:102 +#: builtin/log.c:129 +msgid "Use mail map file" +msgstr "" + +#: builtin/log.c:130 msgid "decorate options" msgstr "" -#: builtin/log.c:189 +#: builtin/log.c:133 +msgid "Process line range n,m in file, counting from 1" +msgstr "" + +#: builtin/log.c:229 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:403 builtin/log.c:494 +#: builtin/log.c:458 +#, c-format +msgid "git show %s: bad file" +msgstr "" + +#: builtin/log.c:472 builtin/log.c:564 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:518 +#: builtin/log.c:588 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:608 +#: builtin/log.c:689 msgid "format.headers without value" msgstr "" -#: builtin/log.c:682 +#: builtin/log.c:773 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:693 +#: builtin/log.c:789 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:707 +#: builtin/log.c:803 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:715 +#: builtin/log.c:811 msgid "Not a range." msgstr "" -#: builtin/log.c:789 +#: builtin/log.c:919 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:862 +#: builtin/log.c:998 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:890 +#: builtin/log.c:1026 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "" -#: builtin/log.c:935 +#: builtin/log.c:1071 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1063 +#: builtin/log.c:1186 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1066 +#: builtin/log.c:1189 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1070 +#: builtin/log.c:1193 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1072 +#: builtin/log.c:1195 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1074 +#: builtin/log.c:1197 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1075 +#: builtin/log.c:1198 msgid "sfx" msgstr "" -#: builtin/log.c:1076 +#: builtin/log.c:1199 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1078 +#: builtin/log.c:1201 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1080 +#: builtin/log.c:1203 +msgid "mark the series as Nth re-roll" +msgstr "" + +#: builtin/log.c:1205 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1083 +#: builtin/log.c:1208 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1086 +#: builtin/log.c:1211 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1089 +#: builtin/log.c:1214 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1091 +#: builtin/log.c:1216 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1093 +#: builtin/log.c:1218 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1095 +#: builtin/log.c:1220 msgid "Messaging" msgstr "" -#: builtin/log.c:1096 +#: builtin/log.c:1221 msgid "header" msgstr "" -#: builtin/log.c:1097 +#: builtin/log.c:1222 msgid "add email header" msgstr "" -#: builtin/log.c:1098 builtin/log.c:1100 +#: builtin/log.c:1223 builtin/log.c:1225 msgid "email" msgstr "" -#: builtin/log.c:1098 +#: builtin/log.c:1223 msgid "add To: header" msgstr "" -#: builtin/log.c:1100 +#: builtin/log.c:1225 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1102 +#: builtin/log.c:1227 +msgid "ident" +msgstr "" + +#: builtin/log.c:1228 +msgid "set From address to <ident> (or committer ident if absent)" +msgstr "" + +#: builtin/log.c:1230 msgid "message-id" msgstr "" -#: builtin/log.c:1103 +#: builtin/log.c:1231 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1104 builtin/log.c:1107 +#: builtin/log.c:1232 builtin/log.c:1235 msgid "boundary" msgstr "" -#: builtin/log.c:1105 +#: builtin/log.c:1233 msgid "attach the patch" msgstr "" -#: builtin/log.c:1108 +#: builtin/log.c:1236 msgid "inline the patch" msgstr "" -#: builtin/log.c:1112 +#: builtin/log.c:1240 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1114 +#: builtin/log.c:1242 msgid "signature" msgstr "" -#: builtin/log.c:1115 +#: builtin/log.c:1243 msgid "add a signature" msgstr "" -#: builtin/log.c:1117 +#: builtin/log.c:1245 +msgid "add a signature from a file" +msgstr "" + +#: builtin/log.c:1246 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1157 +#: builtin/log.c:1320 #, c-format -msgid "bogus committer info %s" +msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1202 +#: builtin/log.c:1335 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1204 +#: builtin/log.c:1337 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1212 +#: builtin/log.c:1345 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1214 +#: builtin/log.c:1347 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1216 +#: builtin/log.c:1349 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1239 +#: builtin/log.c:1372 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1241 +#: builtin/log.c:1374 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1394 +#: builtin/log.c:1472 +#, c-format +msgid "unable to read signature file '%s'" +msgstr "" + +#: builtin/log.c:1535 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1443 +#: builtin/log.c:1583 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1498 +#: builtin/log.c:1638 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 +#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 #, c-format msgid "Unknown commit %s" msgstr "" -#: builtin/ls-files.c:408 +#: builtin/ls-files.c:401 msgid "git ls-files [options] [<file>...]" msgstr "" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:458 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:460 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:467 +#: builtin/ls-files.c:462 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:464 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:466 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:468 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:470 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:478 +#: builtin/ls-files.c:473 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:475 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:482 -msgid "show 'other' directories' name only" +#: builtin/ls-files.c:477 +msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:480 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:488 +#: builtin/ls-files.c:483 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:485 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:492 +#: builtin/ls-files.c:487 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:490 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:493 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:500 +#: builtin/ls-files.c:495 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:498 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:506 +#: builtin/ls-files.c:501 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:507 +#: builtin/ls-files.c:502 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:508 +#: builtin/ls-files.c:503 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:510 +#: builtin/ls-files.c:505 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 "" -#: builtin/merge.c:43 +#: builtin/merge.c:44 msgid "git merge [options] [<commit>...]" msgstr "" -#: builtin/merge.c:44 +#: builtin/merge.c:45 msgid "git merge [options] <msg> HEAD <commit>" msgstr "" -#: builtin/merge.c:45 +#: builtin/merge.c:46 msgid "git merge --abort" msgstr "" -#: builtin/merge.c:90 +#: builtin/merge.c:99 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:127 +#: builtin/merge.c:136 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:128 +#: builtin/merge.c:137 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:133 +#: builtin/merge.c:142 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:183 +#: builtin/merge.c:192 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:186 +#: builtin/merge.c:195 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:187 +#: builtin/merge.c:196 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:189 +#: builtin/merge.c:198 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:192 +#: builtin/merge.c:201 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:194 +#: builtin/merge.c:203 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:196 +#: builtin/merge.c:205 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:198 +#: builtin/merge.c:206 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:200 +#: builtin/merge.c:208 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112 +#: builtin/merge.c:212 +msgid "Verify that the named commit has a valid GPG signature" +msgstr "" + +#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89 msgid "strategy" msgstr "" -#: builtin/merge.c:203 +#: builtin/merge.c:214 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:204 +#: builtin/merge.c:215 msgid "option=value" msgstr "" -#: builtin/merge.c:205 +#: builtin/merge.c:216 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:207 +#: builtin/merge.c:218 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:211 +#: builtin/merge.c:222 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:240 +#: builtin/merge.c:250 msgid "could not run stash." msgstr "" -#: builtin/merge.c:245 +#: builtin/merge.c:255 msgid "stash failed" msgstr "" -#: builtin/merge.c:250 +#: builtin/merge.c:260 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:269 builtin/merge.c:286 +#: builtin/merge.c:279 builtin/merge.c:296 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:316 +#: builtin/merge.c:326 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:329 +#: builtin/merge.c:339 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:361 +#: builtin/merge.c:371 msgid "Writing SQUASH_MSG" msgstr "" -#: builtin/merge.c:363 +#: builtin/merge.c:373 msgid "Finishing SQUASH_MSG" msgstr "" -#: builtin/merge.c:386 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:436 +#: builtin/merge.c:446 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:535 +#: builtin/merge.c:558 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:628 +#: builtin/merge.c:653 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/merge.c:678 -msgid "failed to read the cache" -msgstr "" - -#: builtin/merge.c:709 +#: builtin/merge.c:677 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:723 +#: builtin/merge.c:691 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:737 +#: builtin/merge.c:704 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:876 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:885 +#: builtin/merge.c:802 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:891 +#: builtin/merge.c:808 +#, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" -"Lines starting with '#' will be ignored, and an empty message aborts\n" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -#: builtin/merge.c:915 +#: builtin/merge.c:832 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:927 +#: builtin/merge.c:844 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:992 +#: builtin/merge.c:907 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:1008 +#: builtin/merge.c:923 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:1049 +#: builtin/merge.c:964 msgid "No current branch." msgstr "" -#: builtin/merge.c:1051 +#: builtin/merge.c:966 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:1053 +#: builtin/merge.c:968 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:1058 +#: builtin/merge.c:973 #, c-format -msgid "No remote tracking branch for %s from %s" +msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1145 builtin/merge.c:1302 -#, c-format -msgid "%s - not something we can merge" -msgstr "" - -#: builtin/merge.c:1213 +#: builtin/merge.c:1129 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1229 git-pull.sh:31 +#: builtin/merge.c:1145 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1232 git-pull.sh:34 +#: builtin/merge.c:1148 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: builtin/merge.c:1236 +#: builtin/merge.c:1152 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1239 +#: builtin/merge.c:1155 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1248 +#: builtin/merge.c:1164 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1253 -msgid "You cannot combine --no-ff with --ff-only." -msgstr "" - -#: builtin/merge.c:1260 +#: builtin/merge.c:1173 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1292 +#: builtin/merge.c:1205 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1295 +#: builtin/merge.c:1208 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1297 +#: builtin/merge.c:1210 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1412 +#: builtin/merge.c:1215 +#, c-format +msgid "%s - not something we can merge" +msgstr "" + +#: builtin/merge.c:1266 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "" + +#: builtin/merge.c:1269 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "" + +#: builtin/merge.c:1272 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "" + +#: builtin/merge.c:1275 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "" + +#: builtin/merge.c:1356 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1450 +#: builtin/merge.c:1395 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1457 +#: builtin/merge.c:1402 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1489 +#: builtin/merge.c:1434 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1512 builtin/merge.c:1591 +#: builtin/merge.c:1457 builtin/merge.c:1536 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1516 +#: builtin/merge.c:1461 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1582 +#: builtin/merge.c:1527 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1584 +#: builtin/merge.c:1529 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1593 +#: builtin/merge.c:1538 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1605 +#: builtin/merge.c:1550 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" -#: builtin/merge-base.c:26 +#: builtin/merge-base.c:29 msgid "git merge-base [-a|--all] <commit> <commit>..." msgstr "" -#: builtin/merge-base.c:27 +#: builtin/merge-base.c:30 msgid "git merge-base [-a|--all] --octopus <commit>..." msgstr "" -#: builtin/merge-base.c:28 +#: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." msgstr "" -#: builtin/merge-base.c:29 +#: builtin/merge-base.c:32 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "" -#: builtin/merge-base.c:98 +#: builtin/merge-base.c:33 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "" + +#: builtin/merge-base.c:214 msgid "output all common ancestors" msgstr "" -#: builtin/merge-base.c:99 +#: builtin/merge-base.c:216 msgid "find ancestors for a single n-way merge" msgstr "" -#: builtin/merge-base.c:100 +#: builtin/merge-base.c:218 msgid "list revs not reachable from others" msgstr "" -#: builtin/merge-base.c:102 +#: builtin/merge-base.c:220 msgid "is the first one ancestor of the other?" msgstr "" +#: builtin/merge-base.c:222 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "" + #: builtin/merge-file.c:8 msgid "" "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " @@ -5848,621 +6982,650 @@ msgstr "" msgid "set labels for file1/orig_file/file2" msgstr "" -#: builtin/mktree.c:67 +#: builtin/mktree.c:64 msgid "git mktree [-z] [--missing] [--batch]" msgstr "" -#: builtin/mktree.c:153 +#: builtin/mktree.c:150 msgid "input is NUL terminated" msgstr "" -#: builtin/mktree.c:154 builtin/write-tree.c:24 +#: builtin/mktree.c:151 builtin/write-tree.c:24 msgid "allow missing objects" msgstr "" -#: builtin/mktree.c:155 +#: builtin/mktree.c:152 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:69 +#, c-format +msgid "Directory %s is in index and no submodule?" +msgstr "" + +#: builtin/mv.c:71 +msgid "Please stage your changes to .gitmodules or stash them to proceed" +msgstr "" + +#: builtin/mv.c:89 +#, c-format +msgid "%.*s is in index" +msgstr "" + +#: builtin/mv.c:111 msgid "force move/rename even if target exists" msgstr "" -#: builtin/mv.c:65 +#: builtin/mv.c:112 msgid "skip move/rename errors" msgstr "" -#: builtin/mv.c:108 +#: builtin/mv.c:151 +#, c-format +msgid "destination '%s' is not a directory" +msgstr "" + +#: builtin/mv.c:162 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "" -#: builtin/mv.c:112 +#: builtin/mv.c:166 msgid "bad source" msgstr "" -#: builtin/mv.c:115 +#: builtin/mv.c:169 msgid "can not move directory into itself" msgstr "" -#: builtin/mv.c:118 +#: builtin/mv.c:172 msgid "cannot move directory over file" msgstr "" -#: builtin/mv.c:128 -#, c-format -msgid "Huh? %.*s is in index?" -msgstr "" - -#: builtin/mv.c:140 +#: builtin/mv.c:181 msgid "source directory is empty" msgstr "" -#: builtin/mv.c:171 +#: builtin/mv.c:206 msgid "not under version control" msgstr "" -#: builtin/mv.c:173 +#: builtin/mv.c:209 msgid "destination exists" msgstr "" -#: builtin/mv.c:181 +#: builtin/mv.c:217 #, c-format msgid "overwriting '%s'" msgstr "" -#: builtin/mv.c:184 +#: builtin/mv.c:220 msgid "Cannot overwrite" msgstr "" -#: builtin/mv.c:187 +#: builtin/mv.c:223 msgid "multiple sources for the same target" msgstr "" -#: builtin/mv.c:202 +#: builtin/mv.c:225 +msgid "destination directory does not exist" +msgstr "" + +#: builtin/mv.c:232 #, c-format msgid "%s, source=%s, destination=%s" msgstr "" -#: builtin/mv.c:212 +#: builtin/mv.c:253 #, c-format msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:215 builtin/remote.c:731 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:175 +#: builtin/name-rev.c:255 msgid "git name-rev [options] <commit>..." msgstr "" -#: builtin/name-rev.c:176 +#: builtin/name-rev.c:256 msgid "git name-rev [options] --all" msgstr "" -#: builtin/name-rev.c:177 +#: builtin/name-rev.c:257 msgid "git name-rev [options] --stdin" msgstr "" -#: builtin/name-rev.c:229 +#: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:230 +#: builtin/name-rev.c:310 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:232 +#: builtin/name-rev.c:312 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:234 +#: builtin/name-rev.c:314 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:235 +#: builtin/name-rev.c:315 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:236 -msgid "allow to print `undefined` names" +#: builtin/name-rev.c:316 +msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/notes.c:26 +#: builtin/name-rev.c:322 +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:142 +#: builtin/notes.c:136 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" -#: builtin/notes.c:148 -msgid "can't fdopen 'show' output fd" -msgstr "" - -#: builtin/notes.c:158 -#, c-format -msgid "failed to close pipe to 'show' for object '%s'" +#: builtin/notes.c:140 +msgid "could not read 'show' output" msgstr "" -#: builtin/notes.c:161 +#: builtin/notes.c:148 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:178 builtin/tag.c:347 +#: builtin/notes.c:166 builtin/tag.c:477 #, c-format msgid "could not create file '%s'" msgstr "" -#: builtin/notes.c:192 +#: builtin/notes.c:185 msgid "Please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:213 builtin/notes.c:976 +#: builtin/notes.c:206 builtin/notes.c:847 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:218 +#: builtin/notes.c:211 msgid "unable to write note object" msgstr "" -#: builtin/notes.c:220 +#: builtin/notes.c:213 #, c-format -msgid "The note contents has been left in %s" +msgid "The note contents have been left in %s" msgstr "" -#: builtin/notes.c:254 builtin/tag.c:542 +#: builtin/notes.c:247 builtin/tag.c:693 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:256 builtin/tag.c:545 +#: builtin/notes.c:249 builtin/tag.c:696 #, c-format msgid "could not open or read '%s'" msgstr "" -#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450 -#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647 -#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769 -#: builtin/notes.c:971 builtin/reset.c:293 builtin/tag.c:558 +#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321 +#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518 +#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640 +#: builtin/notes.c:842 builtin/tag.c:709 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:278 +#: builtin/notes.c:271 #, c-format msgid "Failed to read object '%s'." msgstr "" -#: builtin/notes.c:302 -msgid "Cannot commit uninitialized/unreferenced notes tree" -msgstr "" - -#: builtin/notes.c:343 -#, c-format -msgid "Bad notes.rewriteMode value: '%s'" -msgstr "" - -#: builtin/notes.c:353 -#, c-format -msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" -msgstr "" - -#. TRANSLATORS: The first %s is the name of the -#. environment variable, the second %s is its value -#: builtin/notes.c:380 +#: builtin/notes.c:275 #, c-format -msgid "Bad %s value: '%s'" +msgid "Cannot read note data from non-blob object '%s'." msgstr "" -#: builtin/notes.c:444 +#: builtin/notes.c:315 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/notes.c:459 +#: builtin/notes.c:330 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630 -#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762 -#: builtin/notes.c:1036 +#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501 +#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633 +#: builtin/notes.c:907 msgid "too many parameters" msgstr "" -#: builtin/notes.c:516 builtin/notes.c:775 +#: builtin/notes.c:387 builtin/notes.c:646 #, c-format msgid "No note found for object %s." msgstr "" -#: builtin/notes.c:538 builtin/notes.c:695 +#: builtin/notes.c:409 builtin/notes.c:566 msgid "note contents as a string" msgstr "" -#: builtin/notes.c:541 builtin/notes.c:698 +#: builtin/notes.c:412 builtin/notes.c:569 msgid "note contents in a file" msgstr "" -#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700 -#: builtin/notes.c:703 builtin/tag.c:476 +#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571 +#: builtin/notes.c:574 builtin/tag.c:628 msgid "object" msgstr "" -#: builtin/notes.c:544 builtin/notes.c:701 +#: builtin/notes.c:415 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "" -#: builtin/notes.c:547 builtin/notes.c:704 +#: builtin/notes.c:418 builtin/notes.c:575 msgid "reuse specified note object" msgstr "" -#: builtin/notes.c:549 builtin/notes.c:617 +#: builtin/notes.c:420 builtin/notes.c:488 msgid "replace existing notes" msgstr "" -#: builtin/notes.c:583 +#: builtin/notes.c:454 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:588 builtin/notes.c:665 +#: builtin/notes.c:459 builtin/notes.c:536 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:618 +#: builtin/notes.c:489 msgid "read objects from stdin" msgstr "" -#: builtin/notes.c:620 +#: builtin/notes.c:491 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" -#: builtin/notes.c:638 +#: builtin/notes.c:509 msgid "too few parameters" msgstr "" -#: builtin/notes.c:659 +#: builtin/notes.c:530 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:671 +#: builtin/notes.c:542 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:720 +#: builtin/notes.c:591 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" -#: builtin/notes.c:867 +#: builtin/notes.c:738 msgid "General options" msgstr "" -#: builtin/notes.c:869 +#: builtin/notes.c:740 msgid "Merge options" msgstr "" -#: builtin/notes.c:871 +#: builtin/notes.c:742 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -#: builtin/notes.c:873 +#: builtin/notes.c:744 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:875 +#: builtin/notes.c:746 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:877 +#: builtin/notes.c:748 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:879 +#: builtin/notes.c:750 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:974 +#: builtin/notes.c:845 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:986 +#: builtin/notes.c:857 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:989 +#: builtin/notes.c:860 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:1070 -msgid "notes_ref" +#: builtin/notes.c:941 +msgid "notes-ref" msgstr "" -#: builtin/notes.c:1071 +#: builtin/notes.c:942 msgid "use notes from <notes_ref>" msgstr "" -#: builtin/notes.c:1106 builtin/remote.c:1598 +#: builtin/notes.c:977 builtin/remote.c:1624 #, c-format msgid "Unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:23 +#: builtin/pack-objects.c:28 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" msgstr "" -#: builtin/pack-objects.c:24 +#: builtin/pack-objects.c:29 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:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:2398 +#: builtin/pack-objects.c:773 +msgid "Writing objects" +msgstr "" + +#: builtin/pack-objects.c:1015 +msgid "disabling bitmap writing, as some objects are not being packed" +msgstr "" + +#: builtin/pack-objects.c:2175 +msgid "Compressing objects" +msgstr "" + +#: builtin/pack-objects.c:2572 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2402 +#: builtin/pack-objects.c:2576 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2425 +#: builtin/pack-objects.c:2599 #, c-format msgid "option %s does not accept negative form" msgstr "" -#: builtin/pack-objects.c:2429 +#: builtin/pack-objects.c:2603 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "" -#: builtin/pack-objects.c:2448 +#: builtin/pack-objects.c:2622 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2450 +#: builtin/pack-objects.c:2624 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2452 +#: builtin/pack-objects.c:2626 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2455 +#: builtin/pack-objects.c:2629 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2630 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2457 +#: builtin/pack-objects.c:2631 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2460 +#: builtin/pack-objects.c:2634 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2462 +#: builtin/pack-objects.c:2636 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2464 +#: builtin/pack-objects.c:2638 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2466 +#: builtin/pack-objects.c:2640 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2468 +#: builtin/pack-objects.c:2642 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2470 +#: builtin/pack-objects.c:2644 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2472 +#: builtin/pack-objects.c:2646 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2474 +#: builtin/pack-objects.c:2648 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2476 +#: builtin/pack-objects.c:2650 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2478 +#: builtin/pack-objects.c:2652 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2480 +#: builtin/pack-objects.c:2654 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2482 +#: builtin/pack-objects.c:2656 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2484 +#: builtin/pack-objects.c:2658 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2487 +#: builtin/pack-objects.c:2661 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2490 +#: builtin/pack-objects.c:2664 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2493 +#: builtin/pack-objects.c:2667 +msgid "include objects referred to by the index" +msgstr "" + +#: builtin/pack-objects.c:2670 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2495 +#: builtin/pack-objects.c:2672 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2497 +#: builtin/pack-objects.c:2674 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2498 parse-options.h:141 +#: builtin/pack-objects.c:2675 parse-options.h:140 msgid "time" msgstr "" -#: builtin/pack-objects.c:2499 +#: builtin/pack-objects.c:2676 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2502 +#: builtin/pack-objects.c:2679 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2504 +#: builtin/pack-objects.c:2681 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2506 +#: builtin/pack-objects.c:2683 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2508 +#: builtin/pack-objects.c:2685 msgid "do not hide commits by grafts" msgstr "" +#: builtin/pack-objects.c:2687 +msgid "use a bitmap index if available to speed up counting objects" +msgstr "" + +#: builtin/pack-objects.c:2689 +msgid "write a bitmap index together with the pack index" +msgstr "" + +#: builtin/pack-objects.c:2778 +msgid "Counting objects" +msgstr "" + #: builtin/pack-refs.c:6 msgid "git pack-refs [options]" msgstr "" @@ -6479,19 +7642,23 @@ msgstr "" msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" msgstr "" +#: builtin/prune-packed.c:40 +msgid "Removing duplicate objects" +msgstr "" + #: builtin/prune.c:12 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "" -#: builtin/prune.c:132 +#: builtin/prune.c:106 msgid "do not remove, show only" msgstr "" -#: builtin/prune.c:133 +#: builtin/prune.c:107 msgid "report pruned objects" msgstr "" -#: builtin/prune.c:136 +#: builtin/prune.c:110 msgid "expire objects older than <time>" msgstr "" @@ -6499,21 +7666,21 @@ msgstr "" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/push.c:45 +#: builtin/push.c:85 msgid "tag shorthand without <tag>" msgstr "" -#: builtin/push.c:64 +#: builtin/push.c:95 msgid "--delete only accepts plain target ref names" msgstr "" -#: builtin/push.c:99 +#: builtin/push.c:139 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" -#: builtin/push.c:102 +#: builtin/push.c:142 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -6528,7 +7695,7 @@ msgid "" "%s" msgstr "" -#: builtin/push.c:121 +#: builtin/push.c:157 #, c-format msgid "" "You are not currently on a branch.\n" @@ -6538,7 +7705,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -#: builtin/push.c:128 +#: builtin/push.c:171 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -6547,12 +7714,12 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" -#: builtin/push.c:136 +#: builtin/push.c:179 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:139 +#: builtin/push.c:182 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -6560,11 +7727,11 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:151 +#: builtin/push.c:205 msgid "" -"push.default is unset; its implicit value is changing in\n" +"push.default is unset; its implicit value has changed in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" -"and maintain the current behavior after the default changes, use:\n" +"and maintain the traditional behavior, use:\n" "\n" " git config --global push.default matching\n" "\n" @@ -6572,57 +7739,76 @@ msgid "" "\n" " git config --global push.default simple\n" "\n" +"When push.default is set to 'matching', git will push local branches\n" +"to the remote branches that already exist with the same name.\n" +"\n" +"Since Git 2.0, Git defaults to the more conservative 'simple'\n" +"behavior, which only pushes the current branch to the corresponding\n" +"remote branch that 'git pull' uses to update the current branch.\n" +"\n" "See 'git help config' and search for 'push.default' for further " "information.\n" "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" "'current' instead of 'simple' if you sometimes use older versions of Git)" msgstr "" -#: builtin/push.c:199 +#: builtin/push.c:272 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:206 +#: builtin/push.c:279 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:285 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" -"specify branches to push or set the 'push.default' configuration variable\n" -"to 'simple', 'current' or 'upstream' to push only the current branch." +"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:218 +#: builtin/push.c:291 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" +"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 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:258 +#: builtin/push.c:298 +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "" + +#: builtin/push.c:301 +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:360 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:262 +#: builtin/push.c:364 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:294 +#: builtin/push.c:394 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:295 +#: builtin/push.c:395 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -6635,338 +7821,363 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:310 +#: builtin/push.c:410 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:311 +#: builtin/push.c:411 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:316 +#: builtin/push.c:416 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:317 +#: builtin/push.c:417 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:322 +#: builtin/push.c:422 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:382 +#: builtin/push.c:493 msgid "repository" msgstr "" -#: builtin/push.c:383 +#: builtin/push.c:494 msgid "push all refs" msgstr "" -#: builtin/push.c:384 +#: builtin/push.c:495 msgid "mirror all refs" msgstr "" -#: builtin/push.c:386 +#: builtin/push.c:497 msgid "delete refs" msgstr "" -#: builtin/push.c:387 +#: builtin/push.c:498 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:390 +#: builtin/push.c:501 msgid "force updates" msgstr "" -#: builtin/push.c:391 +#: builtin/push.c:503 +msgid "refname>:<expect" +msgstr "" + +#: builtin/push.c:504 +msgid "require old value of ref to be at this value" +msgstr "" + +#: builtin/push.c:506 msgid "check" msgstr "" -#: builtin/push.c:392 +#: builtin/push.c:507 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:394 +#: builtin/push.c:509 msgid "use thin pack" msgstr "" -#: builtin/push.c:395 builtin/push.c:396 +#: builtin/push.c:510 builtin/push.c:511 msgid "receive pack program" msgstr "" -#: builtin/push.c:397 +#: builtin/push.c:512 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:400 +#: builtin/push.c:515 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:410 +#: builtin/push.c:517 +msgid "bypass pre-push hook" +msgstr "" + +#: builtin/push.c:518 +msgid "push missing but relevant tags" +msgstr "" + +#: builtin/push.c:520 +msgid "GPG sign the push" +msgstr "" + +#: builtin/push.c:529 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:412 +#: builtin/push.c:531 msgid "--delete doesn't make sense without any refs" msgstr "" -#: builtin/read-tree.c:36 +#: builtin/read-tree.c:37 msgid "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -#: builtin/read-tree.c:108 +#: builtin/read-tree.c:110 msgid "write resulting index to <file>" msgstr "" -#: builtin/read-tree.c:111 +#: builtin/read-tree.c:113 msgid "only empty the index" msgstr "" -#: builtin/read-tree.c:113 +#: builtin/read-tree.c:115 msgid "Merging" msgstr "" -#: builtin/read-tree.c:115 +#: builtin/read-tree.c:117 msgid "perform a merge in addition to a read" msgstr "" -#: builtin/read-tree.c:117 +#: builtin/read-tree.c:119 msgid "3-way merge if no file level merging required" msgstr "" -#: builtin/read-tree.c:119 +#: builtin/read-tree.c:121 msgid "3-way merge in presence of adds and removes" msgstr "" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:123 msgid "same as -m, but discard unmerged entries" msgstr "" -#: builtin/read-tree.c:122 +#: builtin/read-tree.c:124 msgid "<subdirectory>/" msgstr "" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:125 msgid "read the tree into the index under <subdirectory>/" msgstr "" -#: builtin/read-tree.c:126 +#: builtin/read-tree.c:128 msgid "update working tree with merge result" msgstr "" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:130 msgid "gitignore" msgstr "" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:131 msgid "allow explicitly ignored files to be overwritten" msgstr "" -#: builtin/read-tree.c:132 +#: builtin/read-tree.c:134 msgid "don't check the working tree after merging" msgstr "" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:135 msgid "don't update the index or the work tree" msgstr "" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:137 msgid "skip applying sparse checkout filter" msgstr "" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:139 msgid "debug unpack-trees" msgstr "" -#: builtin/remote.c:11 -msgid "git remote [-v | --verbose]" +#: 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:12 +msgid "git remote [-v | --verbose]" +msgstr "" + +#: builtin/remote.c:13 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -#: builtin/remote.c:13 builtin/remote.c:32 +#: builtin/remote.c:14 builtin/remote.c:33 msgid "git remote rename <old> <new>" msgstr "" -#: builtin/remote.c:14 builtin/remote.c:37 +#: builtin/remote.c:15 builtin/remote.c:38 msgid "git remote remove <name>" msgstr "" -#: builtin/remote.c:15 -msgid "git remote set-head <name> (-a | -d | <branch>)" +#: builtin/remote.c:16 +msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" msgstr "" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "git remote prune [-n | --dry-run] <name>" msgstr "" -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "" -#: builtin/remote.c:20 builtin/remote.c:68 +#: builtin/remote.c:21 builtin/remote.c:69 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "" -#: builtin/remote.c:21 builtin/remote.c:69 +#: builtin/remote.c:22 builtin/remote.c:70 msgid "git remote set-url --add <name> <newurl>" msgstr "" -#: builtin/remote.c:22 builtin/remote.c:70 +#: builtin/remote.c:23 builtin/remote.c:71 msgid "git remote set-url --delete <name> <url>" msgstr "" -#: builtin/remote.c:27 +#: builtin/remote.c:28 msgid "git remote add [<options>] <name> <url>" msgstr "" -#: builtin/remote.c:42 -msgid "git remote set-head <name> (-a | -d | <branch>])" +#: builtin/remote.c:43 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "" -#: builtin/remote.c:47 +#: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "" -#: builtin/remote.c:48 +#: builtin/remote.c:49 msgid "git remote set-branches --add <name> <branch>..." msgstr "" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote show [<options>] <name>" msgstr "" -#: builtin/remote.c:58 +#: builtin/remote.c:59 msgid "git remote prune [<options>] <name>" msgstr "" -#: builtin/remote.c:63 +#: builtin/remote.c:64 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "" -#: builtin/remote.c:98 +#: builtin/remote.c:88 #, c-format msgid "Updating %s" msgstr "" -#: builtin/remote.c:130 +#: builtin/remote.c:120 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" -#: builtin/remote.c:147 +#: builtin/remote.c:137 #, c-format msgid "unknown mirror argument: %s" msgstr "" -#: builtin/remote.c:163 +#: builtin/remote.c:153 msgid "fetch the remote branches" msgstr "" -#: builtin/remote.c:165 +#: builtin/remote.c:155 msgid "import all tags and associated objects when fetching" msgstr "" -#: builtin/remote.c:168 +#: builtin/remote.c:158 msgid "or do not fetch any tag at all (--no-tags)" msgstr "" -#: builtin/remote.c:170 +#: builtin/remote.c:160 msgid "branch(es) to track" msgstr "" -#: builtin/remote.c:171 +#: builtin/remote.c:161 msgid "master branch" msgstr "" -#: builtin/remote.c:172 +#: builtin/remote.c:162 msgid "push|fetch" msgstr "" -#: builtin/remote.c:173 +#: builtin/remote.c:163 msgid "set up remote as a mirror to push to or fetch from" msgstr "" -#: builtin/remote.c:185 +#: builtin/remote.c:175 msgid "specifying a master branch makes no sense with --mirror" msgstr "" -#: builtin/remote.c:187 +#: builtin/remote.c:177 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -#: builtin/remote.c:195 builtin/remote.c:646 +#: builtin/remote.c:185 builtin/remote.c:641 #, c-format msgid "remote %s already exists." msgstr "" -#: builtin/remote.c:199 builtin/remote.c:650 +#: builtin/remote.c:189 builtin/remote.c:645 #, c-format msgid "'%s' is not a valid remote name" msgstr "" -#: builtin/remote.c:243 +#: builtin/remote.c:233 #, c-format msgid "Could not setup master '%s'" msgstr "" -#: builtin/remote.c:299 -#, c-format -msgid "more than one %s" -msgstr "" - -#: builtin/remote.c:339 +#: builtin/remote.c:333 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" -#: builtin/remote.c:440 builtin/remote.c:448 +#: builtin/remote.c:434 builtin/remote.c:442 msgid "(matching)" msgstr "" -#: builtin/remote.c:452 +#: builtin/remote.c:446 msgid "(delete)" msgstr "" -#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 #, c-format msgid "Could not append '%s' to '%s'" msgstr "" -#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 +#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898 #, c-format msgid "No such remote: %s" msgstr "" -#: builtin/remote.c:656 +#: builtin/remote.c:651 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" -#: builtin/remote.c:662 builtin/remote.c:799 +#: builtin/remote.c:657 builtin/remote.c:850 #, c-format msgid "Could not remove config section '%s'" msgstr "" -#: builtin/remote.c:677 +#: builtin/remote.c:672 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -6974,32 +8185,32 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "" -#: builtin/remote.c:683 +#: builtin/remote.c:678 #, c-format msgid "Could not append '%s'" msgstr "" -#: builtin/remote.c:694 +#: builtin/remote.c:689 #, c-format msgid "Could not set '%s'" msgstr "" -#: builtin/remote.c:716 +#: builtin/remote.c:711 #, c-format msgid "deleting '%s' failed" msgstr "" -#: builtin/remote.c:750 +#: builtin/remote.c:745 #, c-format msgid "creating '%s' failed" msgstr "" -#: builtin/remote.c:764 +#: builtin/remote.c:769 #, c-format msgid "Could not remove branch %s" msgstr "" -#: builtin/remote.c:834 +#: builtin/remote.c:836 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -7009,426 +8220,577 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:943 +#: builtin/remote.c:951 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr "" -#: builtin/remote.c:946 +#: builtin/remote.c:954 msgid " tracked" msgstr "" -#: builtin/remote.c:948 +#: builtin/remote.c:956 msgid " stale (use 'git remote prune' to remove)" msgstr "" -#: builtin/remote.c:950 +#: builtin/remote.c:958 msgid " ???" msgstr "" -#: builtin/remote.c:991 +#: builtin/remote.c:999 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -#: builtin/remote.c:998 +#: builtin/remote.c:1006 #, c-format msgid "rebases onto remote %s" msgstr "" -#: builtin/remote.c:1001 +#: builtin/remote.c:1009 #, c-format msgid " merges with remote %s" msgstr "" -#: builtin/remote.c:1002 +#: builtin/remote.c:1010 msgid " and with remote" msgstr "" -#: builtin/remote.c:1004 +#: builtin/remote.c:1012 #, c-format msgid "merges with remote %s" msgstr "" -#: builtin/remote.c:1005 +#: builtin/remote.c:1013 msgid " and with remote" msgstr "" -#: builtin/remote.c:1051 +#: builtin/remote.c:1059 msgid "create" msgstr "" -#: builtin/remote.c:1054 +#: builtin/remote.c:1062 msgid "delete" msgstr "" -#: builtin/remote.c:1058 +#: builtin/remote.c:1066 msgid "up to date" msgstr "" -#: builtin/remote.c:1061 +#: builtin/remote.c:1069 msgid "fast-forwardable" msgstr "" -#: builtin/remote.c:1064 +#: builtin/remote.c:1072 msgid "local out of date" msgstr "" -#: builtin/remote.c:1071 +#: builtin/remote.c:1079 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr "" -#: builtin/remote.c:1074 +#: builtin/remote.c:1082 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr "" -#: builtin/remote.c:1078 +#: builtin/remote.c:1086 #, c-format msgid " %-*s forces to %s" msgstr "" -#: builtin/remote.c:1081 +#: builtin/remote.c:1089 #, c-format msgid " %-*s pushes to %s" msgstr "" -#: builtin/remote.c:1091 +#: builtin/remote.c:1157 msgid "do not query remotes" msgstr "" -#: builtin/remote.c:1118 +#: builtin/remote.c:1184 #, c-format msgid "* remote %s" msgstr "" -#: builtin/remote.c:1119 +#: builtin/remote.c:1185 #, c-format msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1120 builtin/remote.c:1285 +#: builtin/remote.c:1186 builtin/remote.c:1333 msgid "(no URL)" msgstr "" -#: builtin/remote.c:1129 builtin/remote.c:1131 +#: builtin/remote.c:1195 builtin/remote.c:1197 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 +#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1139 +#: builtin/remote.c:1205 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1151 +#: builtin/remote.c:1217 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1154 builtin/remote.c:1181 +#: builtin/remote.c:1220 builtin/remote.c:1247 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1163 +#: builtin/remote.c:1229 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1171 +#: builtin/remote.c:1237 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1178 +#: builtin/remote.c:1244 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1199 +#: builtin/remote.c:1265 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1201 +#: builtin/remote.c:1267 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1216 +#: builtin/remote.c:1282 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1218 +#: builtin/remote.c:1284 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1228 +#: builtin/remote.c:1294 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1236 +#: builtin/remote.c:1302 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1238 +#: builtin/remote.c:1304 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1274 +#: builtin/remote.c:1322 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1275 +#: builtin/remote.c:1323 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1281 +#: builtin/remote.c:1329 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1282 +#: builtin/remote.c:1330 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1295 +#: builtin/remote.c:1357 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1298 +#: builtin/remote.c:1360 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1321 +#: builtin/remote.c:1405 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1387 builtin/remote.c:1461 +#: builtin/remote.c:1471 builtin/remote.c:1545 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1407 +#: builtin/remote.c:1491 msgid "add branch" msgstr "" -#: builtin/remote.c:1414 +#: builtin/remote.c:1498 msgid "no remote specified" msgstr "" -#: builtin/remote.c:1436 +#: builtin/remote.c:1520 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1438 +#: builtin/remote.c:1522 msgid "add URL" msgstr "" -#: builtin/remote.c:1440 +#: builtin/remote.c:1524 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1447 +#: builtin/remote.c:1531 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1487 +#: builtin/remote.c:1571 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1495 +#: builtin/remote.c:1579 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1497 +#: builtin/remote.c:1581 msgid "Will not delete all non-push URLs" msgstr "" -#: builtin/remote.c:1569 +#: builtin/remote.c:1595 msgid "be verbose; must be placed before a subcommand" msgstr "" -#: builtin/replace.c:17 +#: builtin/repack.c:17 +msgid "git repack [options]" +msgstr "" + +#: builtin/repack.c:160 +msgid "pack everything in a single pack" +msgstr "" + +#: builtin/repack.c:162 +msgid "same as -a, and turn unreachable objects loose" +msgstr "" + +#: builtin/repack.c:165 +msgid "remove redundant packs, and run git-prune-packed" +msgstr "" + +#: builtin/repack.c:167 +msgid "pass --no-reuse-delta to git-pack-objects" +msgstr "" + +#: builtin/repack.c:169 +msgid "pass --no-reuse-object to git-pack-objects" +msgstr "" + +#: builtin/repack.c:171 +msgid "do not run git-update-server-info" +msgstr "" + +#: builtin/repack.c:174 +msgid "pass --local to git-pack-objects" +msgstr "" + +#: builtin/repack.c:176 +msgid "write bitmap index" +msgstr "" + +#: builtin/repack.c:177 +msgid "approxidate" +msgstr "" + +#: builtin/repack.c:178 +msgid "with -A, do not loosen objects older than this" +msgstr "" + +#: builtin/repack.c:180 +msgid "size of the window used for delta compression" +msgstr "" + +#: builtin/repack.c:181 builtin/repack.c:185 +msgid "bytes" +msgstr "" + +#: builtin/repack.c:182 +msgid "same as the above, but limit memory size instead of entries count" +msgstr "" + +#: builtin/repack.c:184 +msgid "limits the maximum delta depth" +msgstr "" + +#: builtin/repack.c:186 +msgid "maximum size of each packfile" +msgstr "" + +#: builtin/repack.c:188 +msgid "repack objects in packs marked with .keep" +msgstr "" + +#: builtin/repack.c:374 +#, c-format +msgid "removing '%s' failed" +msgstr "" + +#: builtin/replace.c:19 msgid "git replace [-f] <object> <replacement>" msgstr "" -#: builtin/replace.c:18 +#: builtin/replace.c:20 +msgid "git replace [-f] --edit <object>" +msgstr "" + +#: builtin/replace.c:21 +msgid "git replace [-f] --graft <commit> [<parent>...]" +msgstr "" + +#: builtin/replace.c:22 msgid "git replace -d <object>..." msgstr "" -#: builtin/replace.c:19 -msgid "git replace -l [<pattern>]" +#: builtin/replace.c:23 +msgid "git replace [--format=<format>] [-l [<pattern>]]" +msgstr "" + +#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 +#, c-format +msgid "Not a valid object name: '%s'" +msgstr "" + +#: builtin/replace.c:355 +#, c-format +msgid "bad mergetag in commit '%s'" +msgstr "" + +#: builtin/replace.c:357 +#, c-format +msgid "malformed mergetag in commit '%s'" +msgstr "" + +#: builtin/replace.c:368 +#, c-format +msgid "" +"original commit '%s' contains mergetag '%s' that is discarded; use --edit " +"instead of --graft" +msgstr "" + +#: builtin/replace.c:401 +#, c-format +msgid "the original commit '%s' has a gpg signature." +msgstr "" + +#: builtin/replace.c:402 +msgid "the signature will be removed in the replacement commit!" +msgstr "" + +#: builtin/replace.c:408 +#, c-format +msgid "could not write replacement commit for: '%s'" msgstr "" -#: builtin/replace.c:118 +#: builtin/replace.c:432 msgid "list replace refs" msgstr "" -#: builtin/replace.c:119 +#: builtin/replace.c:433 msgid "delete replace refs" msgstr "" -#: builtin/replace.c:120 +#: builtin/replace.c:434 +msgid "edit existing object" +msgstr "" + +#: builtin/replace.c:435 +msgid "change a commit's parents" +msgstr "" + +#: builtin/replace.c:436 msgid "replace the ref if it exists" msgstr "" -#: builtin/rerere.c:11 +#: builtin/replace.c:437 +msgid "do not pretty-print contents for --edit" +msgstr "" + +#: builtin/replace.c:438 +msgid "use this format" +msgstr "" + +#: 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 "" -#: builtin/reset.c:25 +#: builtin/reset.c:26 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" -#: builtin/reset.c:26 -msgid "git reset [-q] <commit> [--] <paths>..." +#: builtin/reset.c:27 +msgid "git reset [-q] <tree-ish> [--] <paths>..." msgstr "" -#: builtin/reset.c:27 -msgid "git reset --patch [<commit>] [--] [<paths>...]" +#: builtin/reset.c:28 +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "mixed" msgstr "" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "soft" msgstr "" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "hard" msgstr "" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "merge" msgstr "" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "keep" msgstr "" -#: builtin/reset.c:77 +#: builtin/reset.c:74 msgid "You do not have a valid HEAD." msgstr "" -#: builtin/reset.c:79 +#: builtin/reset.c:76 msgid "Failed to find tree of HEAD." msgstr "" -#: builtin/reset.c:85 +#: builtin/reset.c:82 #, c-format msgid "Failed to find tree of %s." msgstr "" -#: builtin/reset.c:96 -msgid "Could not write new index file." -msgstr "" - -#: builtin/reset.c:106 +#: builtin/reset.c:100 #, c-format msgid "HEAD is now at %s" msgstr "" -#: builtin/reset.c:130 -msgid "Could not read index" -msgstr "" - -#: builtin/reset.c:133 -msgid "Unstaged changes after reset:" -msgstr "" - -#: builtin/reset.c:223 +#: builtin/reset.c:183 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:238 +#: builtin/reset.c:276 msgid "be quiet, only report errors" msgstr "" -#: builtin/reset.c:240 +#: builtin/reset.c:278 msgid "reset HEAD and index" msgstr "" -#: builtin/reset.c:241 +#: builtin/reset.c:279 msgid "reset only HEAD" msgstr "" -#: builtin/reset.c:243 builtin/reset.c:245 +#: builtin/reset.c:281 builtin/reset.c:283 msgid "reset HEAD, index and working tree" msgstr "" -#: builtin/reset.c:247 +#: builtin/reset.c:285 msgid "reset HEAD but keep local changes" msgstr "" -#: builtin/reset.c:303 +#: builtin/reset.c:288 +msgid "record only the fact that removed paths will be added later" +msgstr "" + +#: builtin/reset.c:305 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "" + +#: builtin/reset.c:308 builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/reset.c:308 +#: builtin/reset.c:313 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "" + +#: builtin/reset.c:322 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:317 +#: builtin/reset.c:331 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:319 +#: builtin/reset.c:333 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:331 +#: builtin/reset.c:343 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" #: builtin/reset.c:347 +msgid "-N can only be used with --mixed" +msgstr "" + +#: builtin/reset.c:364 +msgid "Unstaged changes after reset:" +msgstr "" + +#: builtin/reset.c:370 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "" -#: builtin/rev-parse.c:339 +#: builtin/reset.c:374 +msgid "Could not write new index file." +msgstr "" + +#: builtin/rev-parse.c:361 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "" -#: builtin/rev-parse.c:344 +#: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" msgstr "" -#: builtin/rev-parse.c:346 +#: builtin/rev-parse.c:368 msgid "stop parsing after the first non-option argument" msgstr "" -#: builtin/rev-parse.c:464 +#: builtin/rev-parse.c:371 +msgid "output in stuck long form" +msgstr "" + +#: builtin/rev-parse.c:499 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -7438,7 +8800,7 @@ msgid "" msgstr "" #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>" +msgid "git revert [options] <commit-ish>..." msgstr "" #: builtin/revert.c:23 @@ -7446,167 +8808,200 @@ 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:104 msgid "append commit name" msgstr "" -#: builtin/revert.c:126 +#: builtin/revert.c:105 msgid "allow fast-forward" msgstr "" -#: builtin/revert.c:127 +#: builtin/revert.c:106 msgid "preserve initially empty commits" msgstr "" -#: builtin/revert.c:128 +#: builtin/revert.c:107 msgid "allow commits with empty messages" msgstr "" -#: builtin/revert.c:129 +#: builtin/revert.c:108 msgid "keep redundant, empty commits" msgstr "" -#: builtin/revert.c:133 +#: builtin/revert.c:112 msgid "program error" msgstr "" -#: builtin/revert.c:223 +#: builtin/revert.c:197 msgid "revert failed" msgstr "" -#: builtin/revert.c:238 +#: builtin/revert.c:212 msgid "cherry-pick failed" msgstr "" -#: builtin/rm.c:14 +#: builtin/rm.c:17 msgid "git rm [options] [--] <file>..." msgstr "" -#: builtin/rm.c:109 -#, c-format +#: builtin/rm.c:65 msgid "" -"'%s' has staged content different from both the file and the HEAD\n" -"(use -f to force removal)" +"the following submodule (or one of its nested submodules)\n" +"uses a .git directory:" +msgid_plural "" +"the following submodules (or one of their nested submodules)\n" +"use a .git directory:" +msgstr[0] "" +msgstr[1] "" + +#: builtin/rm.c:71 +msgid "" +"\n" +"(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" -#: builtin/rm.c:115 -#, c-format +#: builtin/rm.c:231 msgid "" -"'%s' has changes staged in the index\n" -"(use --cached to keep the file, or -f to force removal)" +"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:236 +msgid "" +"\n" +"(use -f to force removal)" msgstr "" -#: builtin/rm.c:119 -#, 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:134 +#: 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:135 +#: builtin/rm.c:271 msgid "only remove from the index" msgstr "" -#: builtin/rm.c:136 +#: builtin/rm.c:272 msgid "override the up-to-date check" msgstr "" -#: builtin/rm.c:137 +#: builtin/rm.c:273 msgid "allow recursive removal" msgstr "" -#: builtin/rm.c:139 +#: builtin/rm.c:275 msgid "exit with a zero status even if nothing matched" msgstr "" -#: builtin/rm.c:194 +#: builtin/rm.c:318 +msgid "Please, stage your changes to .gitmodules or stash them to proceed" +msgstr "" + +#: builtin/rm.c:336 #, c-format msgid "not removing '%s' recursively without -r" msgstr "" -#: builtin/rm.c:230 +#: 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:157 +#: builtin/shortlog.c:131 #, c-format msgid "Missing author: %s" msgstr "" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:230 msgid "sort output according to the number of commits per author" msgstr "" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:232 msgid "Suppress commit descriptions, only provides commit count" msgstr "" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:234 msgid "Show the email address of each author" msgstr "" -#: builtin/shortlog.c:258 +#: builtin/shortlog.c:235 msgid "w[,i1[,i2]]" msgstr "" -#: builtin/shortlog.c:259 +#: builtin/shortlog.c:236 msgid "Linewrap output" msgstr "" @@ -7622,60 +9017,60 @@ msgstr "" msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:649 msgid "show remote-tracking and local branches" msgstr "" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c:651 msgid "show remote-tracking branches" msgstr "" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:653 msgid "color '*!+-' corresponding to the branch" msgstr "" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:655 msgid "show <n> more commits after the common ancestor" msgstr "" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:657 msgid "synonym to more=-1" msgstr "" -#: builtin/show-branch.c:660 +#: builtin/show-branch.c:658 msgid "suppress naming strings" msgstr "" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:660 msgid "include the current branch" msgstr "" -#: builtin/show-branch.c:664 +#: builtin/show-branch.c:662 msgid "name commits with their object names" msgstr "" -#: builtin/show-branch.c:666 +#: builtin/show-branch.c:664 msgid "show possible merge bases" msgstr "" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:666 msgid "show refs unreachable from any other ref" msgstr "" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:668 msgid "show commits in topological order" msgstr "" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:671 msgid "show only commits not on the first branch" msgstr "" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:673 msgid "show merges reachable from only one tip" msgstr "" -#: builtin/show-branch.c:676 -msgid "show commits where no parent comes before its children" +#: builtin/show-branch.c:675 +msgid "topologically sort, maintaining date order where possible" msgstr "" #: builtin/show-branch.c:678 @@ -7688,43 +9083,43 @@ msgstr "" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" -"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " msgstr "" #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" msgstr "" -#: builtin/show-ref.c:182 +#: builtin/show-ref.c:168 msgid "only show tags (can be combined with heads)" msgstr "" -#: builtin/show-ref.c:183 +#: builtin/show-ref.c:169 msgid "only show heads (can be combined with tags)" msgstr "" -#: builtin/show-ref.c:184 +#: builtin/show-ref.c:170 msgid "stricter reference checking, requires exact ref path" msgstr "" -#: builtin/show-ref.c:187 builtin/show-ref.c:189 -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:191 +#: builtin/show-ref.c:177 msgid "dereference tags into object IDs" msgstr "" -#: builtin/show-ref.c:193 +#: builtin/show-ref.c:179 msgid "only show SHA1 hash using <n> digits" msgstr "" -#: builtin/show-ref.c:197 +#: builtin/show-ref.c:183 msgid "do not print results to stdout (useful with --verify)" msgstr "" -#: builtin/show-ref.c:199 +#: builtin/show-ref.c:185 msgid "show refs from stdin that aren't in local repository" msgstr "" @@ -7732,19 +9127,27 @@ msgstr "" msgid "git symbolic-ref [options] name [ref]" msgstr "" -#: builtin/symbolic-ref.c:38 +#: builtin/symbolic-ref.c:8 +msgid "git symbolic-ref -d [-q] name" +msgstr "" + +#: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" msgstr "" -#: builtin/symbolic-ref.c:39 +#: builtin/symbolic-ref.c:41 +msgid "delete symbolic ref" +msgstr "" + +#: builtin/symbolic-ref.c:42 msgid "shorten ref output" msgstr "" -#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "" -#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "" @@ -7767,317 +9170,345 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "" -#: builtin/tag.c:60 +#: builtin/tag.c:69 #, c-format msgid "malformed object at '%s'" msgstr "" -#: builtin/tag.c:207 +#: builtin/tag.c:301 #, c-format msgid "tag name too long: %.*s..." msgstr "" -#: builtin/tag.c:212 +#: builtin/tag.c:306 #, c-format msgid "tag '%s' not found." msgstr "" -#: builtin/tag.c:227 +#: builtin/tag.c:321 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "" -#: builtin/tag.c:239 +#: builtin/tag.c:333 #, c-format msgid "could not verify the tag '%s'" msgstr "" -#: builtin/tag.c:249 +#: builtin/tag.c:343 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be ignored.\n" -"#\n" +"Write a message for tag:\n" +" %s\n" +"Lines starting with '%c' will be ignored.\n" msgstr "" -#: builtin/tag.c:256 +#: builtin/tag.c:347 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be kept; you may remove them yourself if you " +"Write a message for tag:\n" +" %s\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you " "want to.\n" -"#\n" msgstr "" -#: builtin/tag.c:298 +#: builtin/tag.c:371 +#, c-format +msgid "unsupported sort specification '%s'" +msgstr "" + +#: builtin/tag.c:373 +#, c-format +msgid "unsupported sort specification '%s' in variable '%s'" +msgstr "" + +#: builtin/tag.c:428 msgid "unable to sign the tag" msgstr "" -#: builtin/tag.c:300 +#: builtin/tag.c:430 msgid "unable to write tag file" msgstr "" -#: builtin/tag.c:325 +#: builtin/tag.c:455 msgid "bad object type." msgstr "" -#: builtin/tag.c:338 +#: builtin/tag.c:468 msgid "tag header too big." msgstr "" -#: builtin/tag.c:370 +#: builtin/tag.c:504 msgid "no tag message?" msgstr "" -#: builtin/tag.c:376 +#: builtin/tag.c:510 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:425 +#: builtin/tag.c:559 msgid "switch 'points-at' requires an object" msgstr "" -#: builtin/tag.c:427 +#: builtin/tag.c:561 #, c-format msgid "malformed object name '%s'" msgstr "" -#: builtin/tag.c:447 +#: builtin/tag.c:589 msgid "list tag names" msgstr "" -#: builtin/tag.c:449 +#: builtin/tag.c:591 msgid "print <n> lines of each tag message" msgstr "" -#: builtin/tag.c:451 +#: builtin/tag.c:593 msgid "delete tags" msgstr "" -#: builtin/tag.c:452 +#: builtin/tag.c:594 msgid "verify tags" msgstr "" -#: builtin/tag.c:454 +#: builtin/tag.c:596 msgid "Tag creation options" msgstr "" -#: builtin/tag.c:456 +#: builtin/tag.c:598 msgid "annotated tag, needs a message" msgstr "" -#: builtin/tag.c:458 +#: builtin/tag.c:600 msgid "tag message" msgstr "" -#: builtin/tag.c:460 +#: builtin/tag.c:602 msgid "annotated and GPG-signed tag" msgstr "" -#: builtin/tag.c:464 +#: builtin/tag.c:606 msgid "use another key to sign the tag" msgstr "" -#: builtin/tag.c:465 +#: builtin/tag.c:607 msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:466 +#: builtin/tag.c:608 msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:468 +#: builtin/tag.c:610 +msgid "sort tags" +msgstr "" + +#: builtin/tag.c:614 msgid "Tag listing options" msgstr "" -#: builtin/tag.c:471 +#: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "" -#: builtin/tag.c:477 +#: builtin/tag.c:629 msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:506 +#: builtin/tag.c:655 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:523 +#: builtin/tag.c:667 +msgid "--sort and -n are incompatible" +msgstr "" + +#: builtin/tag.c:674 msgid "-n option is only allowed with -l." msgstr "" -#: builtin/tag.c:525 +#: builtin/tag.c:676 msgid "--contains option is only allowed with -l." msgstr "" -#: builtin/tag.c:527 +#: builtin/tag.c:678 msgid "--points-at option is only allowed with -l." msgstr "" -#: builtin/tag.c:535 +#: builtin/tag.c:686 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:555 +#: builtin/tag.c:706 msgid "too many params" msgstr "" -#: builtin/tag.c:561 +#: builtin/tag.c:712 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:566 +#: builtin/tag.c:717 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:584 -#, c-format -msgid "%s: cannot lock the ref" -msgstr "" - -#: builtin/tag.c:586 +#: builtin/tag.c:741 #, c-format -msgid "%s: cannot update the ref" +msgid "Updated tag '%s' (was %s)\n" msgstr "" -#: builtin/tag.c:588 -#, c-format -msgid "Updated tag '%s' (was %s)\n" +#: builtin/unpack-objects.c:489 +msgid "Unpacking objects" msgstr "" -#: builtin/update-index.c:401 +#: builtin/update-index.c:403 msgid "git update-index [options] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:717 +#: builtin/update-index.c:756 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:720 +#: builtin/update-index.c:759 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:723 +#: builtin/update-index.c:762 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:725 +#: builtin/update-index.c:764 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:727 +#: builtin/update-index.c:766 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:729 +#: builtin/update-index.c:768 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:732 +#: builtin/update-index.c:771 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:736 +#: builtin/update-index.c:775 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:740 -msgid "<mode> <object> <path>" +#: builtin/update-index.c:779 +msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:741 +#: builtin/update-index.c:780 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:745 +#: builtin/update-index.c:784 msgid "(+/-)x" msgstr "" -#: builtin/update-index.c:746 +#: builtin/update-index.c:785 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/update-index.c:750 +#: builtin/update-index.c:789 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:753 +#: builtin/update-index.c:792 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:756 +#: builtin/update-index.c:795 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:759 +#: builtin/update-index.c:798 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:762 +#: builtin/update-index.c:801 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:764 +#: builtin/update-index.c:803 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:766 +#: builtin/update-index.c:805 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:768 +#: builtin/update-index.c:807 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:772 +#: builtin/update-index.c:811 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:776 +#: builtin/update-index.c:815 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:780 +#: builtin/update-index.c:819 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:784 +#: builtin/update-index.c:823 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:787 +#: builtin/update-index.c:826 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:789 +#: builtin/update-index.c:828 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:793 +#: builtin/update-index.c:832 msgid "write index in this format" msgstr "" -#: builtin/update-ref.c:7 +#: builtin/update-index.c:834 +msgid "enable or disable split index" +msgstr "" + +#: 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:363 msgid "delete the reference" msgstr "" -#: builtin/update-ref.c:21 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "" +#: builtin/update-ref.c:366 +msgid "stdin has NUL-terminated arguments" +msgstr "" + +#: builtin/update-ref.c:367 +msgid "read updates from stdin" +msgstr "" + #: builtin/update-server-info.c:6 msgid "git update-server-info [--force]" msgstr "" @@ -8086,15 +9517,23 @@ msgstr "" msgid "update the info files from scratch" msgstr "" -#: builtin/verify-pack.c:56 +#: builtin/verify-commit.c:17 +msgid "git verify-commit [-v|--verbose] <commit>..." +msgstr "" + +#: builtin/verify-commit.c:75 +msgid "print commit contents" +msgstr "" + +#: builtin/verify-pack.c:54 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." msgstr "" -#: builtin/verify-pack.c:66 +#: builtin/verify-pack.c:64 msgid "verbose" msgstr "" -#: builtin/verify-pack.c:68 +#: builtin/verify-pack.c:66 msgid "show statistics only" msgstr "" @@ -8122,24 +9561,15 @@ msgstr "" msgid "only useful for debugging" msgstr "" -#: git.c:16 -msgid "See 'git help <command>' for more information on a specific command." -msgstr "" - -#: parse-options.h:156 -msgid "no-op (backward compatibility)" -msgstr "" - -#: parse-options.h:228 -msgid "be more verbose" -msgstr "" - -#: parse-options.h:230 -msgid "be more quiet" +#: credential-cache--daemon.c:267 +msgid "print debugging messages to stderr" msgstr "" -#: parse-options.h:236 -msgid "use <n> digits to display SHA-1s" +#: git.c:17 +msgid "" +"'git help -a' and 'git help -g' list 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 "" #: common-cmds.h:8 @@ -8179,7 +9609,7 @@ msgid "Print lines matching a pattern" msgstr "" #: common-cmds.h:17 -msgid "Create an empty git repository or reinitialize an existing one" +msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" #: common-cmds.h:18 @@ -8195,7 +9625,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 @@ -8226,88 +9656,119 @@ msgstr "" msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" -#: git-am.sh:50 +#: parse-options.h:143 +msgid "expiry-date" +msgstr "" + +#: parse-options.h:158 +msgid "no-op (backward compatibility)" +msgstr "" + +#: parse-options.h:232 +msgid "be more verbose" +msgstr "" + +#: parse-options.h:234 +msgid "be more quiet" +msgstr "" + +#: parse-options.h:240 +msgid "use <n> digits to display SHA-1s" +msgstr "" + +#: rerere.h:27 +msgid "update the index with reused conflict resolution if possible" +msgstr "" + +#: git-am.sh:52 msgid "You need to set your committer info first" msgstr "" -#: git-am.sh:95 +#: git-am.sh:97 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: git-am.sh:105 +#: git-am.sh:107 #, 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 "" -#: git-am.sh:121 +#: git-am.sh:123 msgid "Cannot fall back to three-way merge." msgstr "" -#: git-am.sh:137 +#: git-am.sh:139 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: git-am.sh:139 +#: git-am.sh:141 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: git-am.sh:154 +#: git-am.sh:156 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: git-am.sh:163 +#: git-am.sh:165 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: git-am.sh:179 +#: git-am.sh:181 msgid "Failed to merge in the changes." msgstr "" -#: git-am.sh:274 +#: git-am.sh:276 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: git-am.sh:361 +#: git-am.sh:363 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "" -#: git-am.sh:363 +#: git-am.sh:365 msgid "Patch format detection failed." msgstr "" -#: git-am.sh:389 +#: git-am.sh:392 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" -#: git-am.sh:477 +#: git-am.sh:486 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" -#: git-am.sh:482 +#: git-am.sh:491 msgid "Please make up your mind. --skip or --abort?" msgstr "" -#: git-am.sh:509 +#: git-am.sh:527 +#, sh-format +msgid "" +"Stray $dotest directory found.\n" +"Use \"git am --abort\" to remove it." +msgstr "" + +#: git-am.sh:535 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: git-am.sh:575 +#: git-am.sh:601 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "" -#: git-am.sh:679 +#: git-am.sh:705 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -8315,60 +9776,60 @@ msgid "" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" -#: git-am.sh:706 +#: git-am.sh:732 msgid "Patch does not have a valid e-mail address." msgstr "" -#: git-am.sh:753 +#: git-am.sh:779 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: git-am.sh:757 +#: git-am.sh:783 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:790 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "" -#: git-am.sh:800 +#: git-am.sh:826 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "" -#: git-am.sh:821 +#: git-am.sh:847 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:855 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:871 msgid "No changes -- Patch already applied." msgstr "" -#: git-am.sh:855 +#: git-am.sh:881 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "" -#: git-am.sh:858 +#: git-am.sh:884 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" " $dotest/patch" msgstr "" -#: git-am.sh:876 +#: git-am.sh:902 msgid "applying to an empty history" msgstr "" @@ -8404,7 +9865,7 @@ msgid "" msgstr "" #: git-bisect.sh:140 -msgid "won't bisect on seeked tree" +msgid "won't bisect on cg-seek'ed tree" msgstr "" #: git-bisect.sh:144 @@ -8434,8 +9895,6 @@ msgstr "" msgid "'git bisect bad' can take only one argument." msgstr "" -#. have bad but not good. we could bisect although -#. this is less optimum. #: git-bisect.sh:273 msgid "Warning: bisecting only with a bad commit." msgstr "" @@ -8449,70 +9908,70 @@ msgstr "" #: git-bisect.sh:289 msgid "" -"You need to give me at least one good and one bad revisions.\n" +"You need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" #: git-bisect.sh:292 msgid "" "You need to start by \"git bisect start\".\n" -"You then need to give me at least one good and one bad revisions.\n" +"You then need to give me at least one good and one bad revision.\n" "(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 "" @@ -8520,22 +9979,24 @@ msgstr "" msgid "" "Pull is not possible because you have unmerged files.\n" "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" -"as appropriate to mark resolution, or use 'git commit -a'." +"as appropriate to mark resolution and make a commit." msgstr "" #: git-pull.sh:25 msgid "Pull is not possible because you have unmerged files." msgstr "" -#: git-pull.sh:197 +#: git-pull.sh:31 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" + +#: git-pull.sh:245 msgid "updating an unborn branch with changes added to the index" msgstr "" -#. The fetch involved updating the current branch. -#. The working tree and the index file is still based on the -#. $orig_head commit, but we are merging into $curr_head. -#. First update the working tree to match $curr_head. -#: git-pull.sh:228 +#: git-pull.sh:269 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -8543,15 +10004,15 @@ msgid "" "Warning: commit $orig_head." msgstr "" -#: git-pull.sh:253 +#: git-pull.sh:294 msgid "Cannot merge multiple branches into empty head" msgstr "" -#: git-pull.sh:257 +#: git-pull.sh:298 msgid "Cannot rebase onto multiple branches" msgstr "" -#: git-rebase.sh:53 +#: git-rebase.sh:57 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" @@ -8559,42 +10020,58 @@ msgid "" "\"." msgstr "" -#: git-rebase.sh:160 +#: git-rebase.sh:165 +msgid "Applied autostash." +msgstr "" + +#: git-rebase.sh:168 +#, sh-format +msgid "Cannot store $stash_sha1" +msgstr "" + +#: git-rebase.sh:169 +msgid "" +"Applying autostash resulted in conflicts.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "" + +#: git-rebase.sh:208 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: git-rebase.sh:165 +#: git-rebase.sh:213 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" -#: git-rebase.sh:296 +#: git-rebase.sh:351 msgid "The --exec option must be used with the --interactive option" msgstr "" -#: git-rebase.sh:301 +#: git-rebase.sh:356 msgid "No rebase in progress?" msgstr "" -#: git-rebase.sh:312 +#: git-rebase.sh:367 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: git-rebase.sh:319 +#: git-rebase.sh:374 msgid "Cannot read HEAD" msgstr "" -#: git-rebase.sh:322 +#: git-rebase.sh:377 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:395 #, sh-format msgid "Could not move back to $head_name" msgstr "" -#: git-rebase.sh:359 +#: git-rebase.sh:414 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -8607,56 +10084,64 @@ msgid "" "valuable there." msgstr "" -#: git-rebase.sh:404 +#: git-rebase.sh:465 #, sh-format msgid "invalid upstream $upstream_name" msgstr "" -#: git-rebase.sh:428 +#: git-rebase.sh:489 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" -#: git-rebase.sh:431 git-rebase.sh:435 +#: git-rebase.sh:492 git-rebase.sh:496 #, sh-format msgid "$onto_name: there is no merge base" msgstr "" -#: git-rebase.sh:440 +#: git-rebase.sh:501 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:463 +#: git-rebase.sh:524 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "" -#: git-rebase.sh:483 +#: git-rebase.sh:557 +msgid "Cannot autostash" +msgstr "" + +#: git-rebase.sh:562 +#, sh-format +msgid "Created autostash: $stash_abbrev" +msgstr "" + +#: git-rebase.sh:566 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:501 +#: git-rebase.sh:586 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:504 +#: git-rebase.sh:590 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:515 +#: git-rebase.sh:601 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" -#. Detach HEAD and reset the tree -#: git-rebase.sh:524 +#: git-rebase.sh:610 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:532 +#: git-rebase.sh:620 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" @@ -8673,22 +10158,27 @@ msgstr "" msgid "Cannot save the current index state" msgstr "" -#: git-stash.sh:123 git-stash.sh:136 +#: git-stash.sh:124 git-stash.sh:137 msgid "Cannot save the current worktree state" msgstr "" -#: git-stash.sh:140 +#: git-stash.sh:141 msgid "No changes selected" msgstr "" -#: git-stash.sh:143 +#: git-stash.sh:144 msgid "Cannot remove temporary index (can't happen)" msgstr "" -#: git-stash.sh:156 +#: git-stash.sh:157 msgid "Cannot record working tree state" msgstr "" +#: git-stash.sh:191 +#, 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 @@ -8699,126 +10189,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:238 #, 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:259 msgid "No local changes to save" msgstr "" -#: git-stash.sh:227 +#: git-stash.sh:263 msgid "Cannot initialize stash" msgstr "" -#: git-stash.sh:235 +#: git-stash.sh:267 msgid "Cannot save the current status" msgstr "" -#: git-stash.sh:253 +#: git-stash.sh:285 msgid "Cannot remove worktree changes" msgstr "" -#: git-stash.sh:352 +#: git-stash.sh:384 msgid "No stash found." msgstr "" -#: git-stash.sh:359 +#: git-stash.sh:391 #, sh-format msgid "Too many revisions specified: $REV" msgstr "" -#: git-stash.sh:365 +#: git-stash.sh:397 #, sh-format -msgid "$reference is not valid reference" +msgid "$reference is not a valid reference" msgstr "" -#: git-stash.sh:393 +#: git-stash.sh:425 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "" -#: git-stash.sh:404 +#: git-stash.sh:436 #, sh-format msgid "'$args' is not a stash reference" msgstr "" -#: git-stash.sh:412 +#: git-stash.sh:444 msgid "unable to refresh index" msgstr "" -#: git-stash.sh:416 +#: git-stash.sh:448 msgid "Cannot apply a stash in the middle of a merge" msgstr "" -#: git-stash.sh:424 +#: git-stash.sh:456 msgid "Conflicts in index. Try without --index." msgstr "" -#: git-stash.sh:426 +#: git-stash.sh:458 msgid "Could not save index tree" msgstr "" -#: git-stash.sh:460 +#: git-stash.sh:492 msgid "Cannot unstage modified files" msgstr "" -#: git-stash.sh:475 +#: git-stash.sh:507 msgid "Index was not unstashed." msgstr "" -#: git-stash.sh:492 +#: git-stash.sh:530 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "" -#: git-stash.sh:493 +#: git-stash.sh:531 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "" -#: git-stash.sh:500 +#: git-stash.sh:539 msgid "No branch name specified" msgstr "" -#: git-stash.sh:571 +#: git-stash.sh:611 msgid "(To restore them type \"git stash apply\")" msgstr "" -#: git-submodule.sh:88 +#: git-submodule.sh:95 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "" -#: git-submodule.sh:167 +#: git-submodule.sh:237 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "" -#: git-submodule.sh:211 +#: git-submodule.sh:287 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "" -#: git-submodule.sh:223 +#: git-submodule.sh:296 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "" -#: git-submodule.sh:312 +#: git-submodule.sh:406 +msgid "Relative path can only be used from the toplevel of the working tree" +msgstr "" + +#: git-submodule.sh:416 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:329 +#: git-submodule.sh:433 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:333 +#: git-submodule.sh:437 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -8826,151 +10320,235 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:344 +#: git-submodule.sh:455 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:346 +#: git-submodule.sh:457 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:360 +#: git-submodule.sh:465 +#, sh-format +msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgstr "" + +#: git-submodule.sh:467 +#, sh-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from" +msgstr "" + +#: git-submodule.sh:469 +#, sh-format +msgid "" +"use the '--force' option. If the local git directory is not the correct repo" +msgstr "" + +#: git-submodule.sh:470 +#, sh-format +msgid "" +"or you are unsure what this means choose another name with the '--name' " +"option." +msgstr "" + +#: git-submodule.sh:472 +#, sh-format +msgid "Reactivating local git directory for submodule '$sm_name'." +msgstr "" + +#: git-submodule.sh:484 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:365 +#: git-submodule.sh:489 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:370 +#: git-submodule.sh:498 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:413 +#: git-submodule.sh:542 +#, sh-format +msgid "Entering '$prefix$displaypath'" +msgstr "" + +#: git-submodule.sh:562 +#, sh-format +msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." +msgstr "" + +#: git-submodule.sh:608 +#, sh-format +msgid "No url found for submodule path '$displaypath' in .gitmodules" +msgstr "" + +#: git-submodule.sh:617 +#, sh-format +msgid "Failed to register url for submodule path '$displaypath'" +msgstr "" + +#: git-submodule.sh:619 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$displaypath'" +msgstr "" + +#: git-submodule.sh:636 +#, sh-format +msgid "Failed to register update mode for submodule path '$displaypath'" +msgstr "" + +#: git-submodule.sh:674 +#, sh-format +msgid "Use '.' if you really want to deinitialize all submodules" +msgstr "" + +#: git-submodule.sh:691 +#, sh-format +msgid "Submodule work tree '$displaypath' contains a .git directory" +msgstr "" + +#: git-submodule.sh:692 #, sh-format -msgid "Entering '$prefix$sm_path'" +msgid "" +"(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" -#: git-submodule.sh:427 +#: git-submodule.sh:698 #, sh-format -msgid "Stopping at '$sm_path'; script returned non-zero status." +msgid "" +"Submodule work tree '$displaypath' contains local modifications; use '-f' to " +"discard them" msgstr "" -#: git-submodule.sh:471 +#: git-submodule.sh:701 #, sh-format -msgid "No url found for submodule path '$sm_path' in .gitmodules" +msgid "Cleared directory '$displaypath'" msgstr "" -#: git-submodule.sh:480 +#: git-submodule.sh:702 #, sh-format -msgid "Failed to register url for submodule path '$sm_path'" +msgid "Could not remove submodule work tree '$displaypath'" msgstr "" -#: git-submodule.sh:482 +#: git-submodule.sh:705 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$sm_path'" +msgid "Could not create empty submodule directory '$displaypath'" msgstr "" -#: git-submodule.sh:490 +#: git-submodule.sh:714 #, sh-format -msgid "Failed to register update mode for submodule path '$sm_path'" +msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" -#: git-submodule.sh:590 +#: git-submodule.sh:830 #, sh-format msgid "" -"Submodule path '$sm_path' not initialized\n" +"Submodule path '$displaypath' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -#: git-submodule.sh:603 +#: git-submodule.sh:843 #, 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:622 +#: git-submodule.sh:852 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:636 +#: git-submodule.sh:876 #, sh-format -msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" +msgid "Unable to fetch in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:637 +#: git-submodule.sh:890 #, sh-format -msgid "Submodule path '$sm_path': rebased into '$sha1'" +msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:642 +#: git-submodule.sh:891 #, sh-format -msgid "Unable to merge '$sha1' in submodule path '$sm_path'" +msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:643 +#: git-submodule.sh:895 #, sh-format -msgid "Submodule path '$sm_path': merged in '$sha1'" +msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:648 +#: git-submodule.sh:896 #, sh-format -msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" +msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:649 +#: git-submodule.sh:901 #, sh-format -msgid "Submodule path '$sm_path': checked out '$sha1'" +msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:671 git-submodule.sh:995 +#: git-submodule.sh:902 #, sh-format -msgid "Failed to recurse into submodule path '$sm_path'" +msgid "Submodule path '$displaypath': merged in '$sha1'" +msgstr "" + +#: git-submodule.sh:907 +#, sh-format +msgid "" +"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" +msgstr "" + +#: git-submodule.sh:908 +#, sh-format +msgid "Submodule path '$prefix$sm_path': '$command $sha1'" +msgstr "" + +#: git-submodule.sh:938 +#, sh-format +msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:779 +#: git-submodule.sh:1046 msgid "The --cached option cannot be used with the --files option" msgstr "" -#. unexpected type -#: git-submodule.sh:819 +#: git-submodule.sh:1098 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:837 +#: git-submodule.sh:1118 #, 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:840 +#: git-submodule.sh:1121 #, 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:843 +#: git-submodule.sh:1124 #, 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:868 +#: git-submodule.sh:1149 msgid "blob" msgstr "" -#: git-submodule.sh:906 -msgid "# Submodules changed but not updated:" -msgstr "" - -#: git-submodule.sh:908 -msgid "# Submodule changes to be committed:" +#: git-submodule.sh:1267 +#, sh-format +msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:1054 +#: git-submodule.sh:1331 #, sh-format -msgid "Synchronizing submodule url for '$name'" +msgid "Synchronizing submodule url for '$displaypath'" msgstr "" |