diff options
Diffstat (limited to 'po/git.pot')
| -rw-r--r-- | po/git.pot | 3567 |
1 files changed, 1854 insertions, 1713 deletions
diff --git a/po/git.pot b/po/git.pot index 33cc31d51b..1c8309a887 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: 2014-02-01 08:06+0800\n" +"POT-Creation-Date: 2014-08-04 14:48+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,21 +18,16 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: advice.c:57 +#: 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:87 +#: 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, or use\n" +"'git commit -a'." msgstr "" #: archive.c:10 @@ -52,76 +47,76 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328 +#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:327 +#: archive.c:328 msgid "fmt" msgstr "" -#: archive.c:327 +#: archive.c:328 msgid "archive format" msgstr "" -#: archive.c:328 builtin/log.c:1193 +#: archive.c:329 builtin/log.c:1201 msgid "prefix" msgstr "" -#: archive.c:329 +#: archive.c:330 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265 -#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680 -#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77 -#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408 -#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154 +#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517 +#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709 +#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412 +#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151 msgid "file" msgstr "" -#: archive.c:331 builtin/archive.c:89 +#: archive.c:332 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" -#: archive.c:333 +#: archive.c:334 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:334 +#: archive.c:335 msgid "report archived files on stderr" msgstr "" -#: archive.c:335 +#: archive.c:336 msgid "store only" msgstr "" -#: archive.c:336 +#: archive.c:337 msgid "compress faster" msgstr "" -#: archive.c:344 +#: archive.c:345 msgid "compress better" msgstr "" -#: archive.c:347 +#: archive.c:348 msgid "list supported archive formats" msgstr "" -#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84 +#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84 msgid "repo" msgstr "" -#: archive.c:350 builtin/archive.c:91 +#: archive.c:351 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487 +#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491 msgid "command" msgstr "" -#: archive.c:352 builtin/archive.c:93 +#: archive.c:353 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" @@ -136,81 +131,76 @@ msgstr "" msgid "Not setting branch %s as its own upstream." msgstr "" -#: branch.c:82 +#: branch.c:83 #, c-format msgid "Branch %s set up to track remote branch %s from %s by rebasing." msgstr "" -#: branch.c:83 +#: branch.c:84 #, c-format msgid "Branch %s set up to track remote branch %s from %s." msgstr "" -#: branch.c:87 +#: branch.c:88 #, c-format msgid "Branch %s set up to track local branch %s by rebasing." msgstr "" -#: branch.c:88 +#: branch.c:89 #, c-format msgid "Branch %s set up to track local branch %s." msgstr "" -#: branch.c:92 +#: branch.c:94 #, c-format msgid "Branch %s set up to track remote ref %s by rebasing." msgstr "" -#: branch.c:93 +#: branch.c:95 #, c-format msgid "Branch %s set up to track remote ref %s." msgstr "" -#: branch.c:97 +#: branch.c:99 #, c-format msgid "Branch %s set up to track local ref %s by rebasing." msgstr "" -#: branch.c:98 +#: branch.c:100 #, c-format msgid "Branch %s set up to track local ref %s." msgstr "" -#: branch.c:118 -#, c-format -msgid "Tracking not set up: name too long: %s" -msgstr "" - -#: branch.c:137 +#: branch.c:133 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "" -#: branch.c:182 +#: branch.c:178 #, c-format msgid "'%s' is not a valid branch name." msgstr "" -#: branch.c:187 +#: branch.c:183 #, c-format msgid "A branch named '%s' already exists." msgstr "" -#: branch.c:195 +#: branch.c:191 msgid "Cannot force update the current branch." msgstr "" -#: branch.c:215 +#: branch.c:211 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" -#: branch.c:217 +#: branch.c:213 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "" -#: branch.c:219 +#: branch.c:215 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -222,113 +212,113 @@ msgid "" "\"git push -u\" to set the upstream config as you push." msgstr "" -#: branch.c:264 +#: branch.c:260 #, c-format msgid "Not a valid object name: '%s'." msgstr "" -#: branch.c:284 +#: branch.c:280 #, c-format msgid "Ambiguous object name: '%s'." msgstr "" -#: branch.c:289 +#: branch.c:285 #, c-format msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:295 +#: branch.c:291 msgid "Failed to lock ref for update" msgstr "" -#: branch.c:313 +#: branch.c:309 msgid "Failed to write ref" msgstr "" -#: bundle.c:37 +#: bundle.c:33 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "" -#: bundle.c:64 +#: bundle.c:60 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:90 builtin/commit.c:706 +#: bundle.c:86 builtin/commit.c:755 #, c-format msgid "could not open '%s'" msgstr "" -#: bundle.c:141 +#: bundle.c:138 msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 -#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357 +#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330 +#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "" -#: bundle.c:187 +#: bundle.c:184 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:194 +#: bundle.c:191 msgid "The bundle records a complete history." msgstr "" -#: bundle.c:196 +#: bundle.c:193 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:296 +#: bundle.c:289 msgid "rev-list died" msgstr "" -#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261 +#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:337 +#: bundle.c:330 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:382 +#: bundle.c:375 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:398 +#: bundle.c:390 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:416 +#: bundle.c:408 msgid "pack-objects died" msgstr "" -#: bundle.c:419 +#: bundle.c:411 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:441 +#: bundle.c:433 msgid "index-pack died" msgstr "" -#: commit.c:53 +#: commit.c:40 #, c-format msgid "could not parse %s" msgstr "" -#: commit.c:55 +#: commit.c:42 #, c-format msgid "%s %s is not a commit!" msgstr "" @@ -404,6 +394,7 @@ msgid_plural "%lu years" msgstr[0] "" msgstr[1] "" +#. TRANSLATORS: "%s" is "<n> years" #: date.c:149 #, c-format msgid "%s, %lu month ago" @@ -423,119 +414,132 @@ msgstr[1] "" msgid "failed to read orderfile '%s'" msgstr "" -#: diff.c:113 +#: diffcore-rename.c:514 +msgid "Performing inexact rename detection" +msgstr "" + +#: diff.c:114 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:118 +#: diff.c:119 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:213 +#: diff.c:214 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:263 +#: diff.c:267 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:3509 +#: diff.c:2934 +#, c-format +msgid "external diff died, stopping at %s" +msgstr "" + +#: diff.c:3329 +msgid "--follow requires exactly one pathspec" +msgstr "" + +#: diff.c:3492 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3523 +#: diff.c:3506 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: gpg-interface.c:59 gpg-interface.c:131 +#: gpg-interface.c:73 gpg-interface.c:145 msgid "could not run gpg." msgstr "" -#: gpg-interface.c:71 +#: gpg-interface.c:85 msgid "gpg did not accept the data" msgstr "" -#: gpg-interface.c:82 +#: gpg-interface.c:96 msgid "gpg failed to sign the data" msgstr "" -#: gpg-interface.c:115 +#: gpg-interface.c:129 #, c-format msgid "could not create temporary file '%s': %s" msgstr "" -#: gpg-interface.c:118 +#: gpg-interface.c:132 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "" -#: grep.c:1695 +#: grep.c:1703 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1712 +#: grep.c:1720 #, c-format msgid "'%s': %s" msgstr "" -#: grep.c:1723 +#: grep.c:1731 #, c-format msgid "'%s': short read %s" msgstr "" -#: help.c:210 +#: help.c:207 #, c-format msgid "available git commands in '%s'" msgstr "" -#: help.c:217 +#: help.c:214 msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:233 +#: help.c:230 msgid "The most commonly used git commands are:" msgstr "" -#: help.c:290 +#: 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:347 +#: help.c:346 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:369 +#: 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:374 +#: help.c:373 #, c-format msgid "in %0.1f seconds automatically..." msgstr "" -#: help.c:381 +#: help.c:380 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:385 help.c:444 +#: help.c:384 help.c:444 msgid "" "\n" "Did you mean this?" @@ -550,11 +554,11 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "" -#: merge.c:56 +#: merge.c:40 msgid "failed to read the cache" msgstr "" -#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559 +#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556 #: builtin/clone.c:661 msgid "unable to write new index file" msgstr "" @@ -564,295 +568,293 @@ msgstr "" msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:206 +#: merge-recursive.c:210 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "" -#: merge-recursive.c:269 +#: merge-recursive.c:271 msgid "error building trees" msgstr "" -#: merge-recursive.c:673 +#: merge-recursive.c:692 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:684 +#: merge-recursive.c:703 #, 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:698 merge-recursive.c:719 +#: merge-recursive.c:717 merge-recursive.c:738 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:709 +#: merge-recursive.c:728 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:749 +#: merge-recursive.c:768 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:751 +#: merge-recursive.c:770 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:774 builtin/clone.c:317 +#: merge-recursive.c:793 builtin/clone.c:317 #, c-format msgid "failed to open '%s'" msgstr "" -#: merge-recursive.c:782 +#: merge-recursive.c:801 #, c-format msgid "failed to symlink '%s'" msgstr "" -#: merge-recursive.c:785 +#: merge-recursive.c:804 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:923 +#: merge-recursive.c:942 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:927 +#: merge-recursive.c:946 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:943 +#: merge-recursive.c:962 msgid "unsupported object type in the tree" msgstr "" -#: merge-recursive.c:1022 merge-recursive.c:1036 +#: merge-recursive.c:1037 merge-recursive.c:1051 #, 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:1028 merge-recursive.c:1041 +#: merge-recursive.c:1043 merge-recursive.c:1056 #, 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:1082 +#: merge-recursive.c:1097 msgid "rename" msgstr "" -#: merge-recursive.c:1082 wt-status.c:283 +#: merge-recursive.c:1097 msgid "renamed" msgstr "" -#: merge-recursive.c:1138 +#: merge-recursive.c:1153 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1160 +#: merge-recursive.c:1175 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1165 +#: merge-recursive.c:1180 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1219 +#: merge-recursive.c:1234 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1249 +#: merge-recursive.c:1264 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1448 +#: merge-recursive.c:1463 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1458 +#: merge-recursive.c:1473 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1463 merge-recursive.c:1661 +#: merge-recursive.c:1478 merge-recursive.c:1676 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1514 +#: merge-recursive.c:1529 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1517 +#: merge-recursive.c:1532 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1565 +#: merge-recursive.c:1580 msgid "modify" msgstr "" -#: merge-recursive.c:1565 wt-status.c:281 +#: merge-recursive.c:1580 msgid "modified" msgstr "" -#: merge-recursive.c:1575 +#: merge-recursive.c:1590 msgid "content" msgstr "" -#: merge-recursive.c:1582 +#: merge-recursive.c:1597 msgid "add/add" msgstr "" -#: merge-recursive.c:1616 +#: merge-recursive.c:1631 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1630 +#: merge-recursive.c:1645 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1634 git-submodule.sh:1148 +#: merge-recursive.c:1649 git-submodule.sh:1150 msgid "submodule" msgstr "" -#: merge-recursive.c:1635 +#: merge-recursive.c:1650 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1725 +#: merge-recursive.c:1740 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1750 +#: merge-recursive.c:1765 msgid "file/directory" msgstr "" -#: merge-recursive.c:1756 +#: merge-recursive.c:1771 msgid "directory/file" msgstr "" -#: merge-recursive.c:1761 +#: merge-recursive.c:1776 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1771 +#: merge-recursive.c:1786 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1788 +#: merge-recursive.c:1803 msgid "Fatal merge failure, shouldn't happen." msgstr "" -#: merge-recursive.c:1807 +#: merge-recursive.c:1822 msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:1816 +#: merge-recursive.c:1831 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:1846 +#: merge-recursive.c:1861 #, c-format msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:1891 +#: merge-recursive.c:1906 msgid "Merging:" msgstr "" -#: merge-recursive.c:1904 +#: merge-recursive.c:1919 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:1941 +#: merge-recursive.c:1956 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:1998 +#: merge-recursive.c:2013 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2010 builtin/merge.c:665 +#: merge-recursive.c:2024 builtin/merge.c:666 msgid "Unable to write index." msgstr "" -#: notes-utils.c:40 +#: notes-utils.c:41 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -#: notes-utils.c:81 +#: notes-utils.c:83 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" -#: notes-utils.c:91 +#: 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:118 +#: notes-utils.c:120 #, c-format msgid "Bad %s value: '%s'" msgstr "" -#: object.c:202 +#: object.c:234 #, c-format msgid "unable to parse object: %s" msgstr "" -#: parse-options.c:537 +#: parse-options.c:534 msgid "..." msgstr "" -#: parse-options.c:555 +#: parse-options.c:552 #, c-format msgid "usage: %s" msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:559 +#: parse-options.c:556 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:562 +#: parse-options.c:559 #, c-format msgid " %s" msgstr "" -#: parse-options.c:596 +#: parse-options.c:593 msgid "-NUM" msgstr "" @@ -900,27 +902,40 @@ msgstr "" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" -#. -#. * We may want to substitute "this command" with a command -#. * name. E.g. when add--interactive dies when running -#. * "checkout -p" -#. #: pathspec.c:353 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:433 +#: pathspec.c:432 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" -#: pathspec.c:442 +#: pathspec.c:441 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" msgstr "" +#: progress.c:225 +msgid "done" +msgstr "" + +#: read-cache.c:1260 +#, c-format +msgid "" +"index.version set, but the value is invalid.\n" +"Using version %i" +msgstr "" + +#: read-cache.c:1270 +#, c-format +msgid "" +"GIT_INDEX_VERSION set, but the value is invalid.\n" +"Using version %i" +msgstr "" + #: remote.c:753 #, c-format msgid "Cannot fetch both %s and %s to %s" @@ -936,41 +951,36 @@ msgstr "" msgid "%s tracks both %s and %s" msgstr "" -#. -#. * This last possibility doesn't occur because -#. * FETCH_HEAD_IGNORE entries always appear at -#. * the end of the list. -#. #: remote.c:769 msgid "Internal error" msgstr "" -#: remote.c:1871 +#: remote.c:1943 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:1875 +#: remote.c:1947 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:1878 +#: remote.c:1950 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "" -#: remote.c:1882 +#: remote.c:1954 #, 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:1888 +#: remote.c:1960 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:1891 +#: remote.c:1963 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -978,11 +988,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1899 +#: remote.c:1971 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:1902 +#: remote.c:1974 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -993,7 +1003,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1912 +#: remote.c:1984 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" @@ -1006,245 +1016,249 @@ msgstr "" msgid "dup2(%d,%d) failed" msgstr "" -#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896 -#: builtin/merge.c:1006 builtin/merge.c:1016 +#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893 +#: builtin/merge.c:1003 builtin/merge.c:1013 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786 -#: builtin/merge.c:1008 builtin/merge.c:1021 +#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785 +#: builtin/merge.c:1005 builtin/merge.c:1018 #, c-format msgid "Could not write to '%s'" msgstr "" -#: sequencer.c:229 +#: sequencer.c:194 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:232 +#: sequencer.c:197 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:245 sequencer.c:870 sequencer.c:953 +#: sequencer.c:210 sequencer.c:841 sequencer.c:924 #, c-format msgid "Could not write to %s" msgstr "" -#: sequencer.c:248 +#: sequencer.c:213 #, c-format msgid "Error wrapping up %s" msgstr "" -#: sequencer.c:263 +#: sequencer.c:228 msgid "Your local changes would be overwritten by cherry-pick." msgstr "" -#: sequencer.c:265 +#: sequencer.c:230 msgid "Your local changes would be overwritten by revert." msgstr "" -#: sequencer.c:268 +#: sequencer.c:233 msgid "Commit your changes or stash them to proceed." msgstr "" +#: sequencer.c:250 +msgid "Failed to lock HEAD during fast_forward_to" +msgstr "" + #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:325 +#: sequencer.c:293 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:356 +#: sequencer.c:324 msgid "Could not resolve HEAD commit\n" msgstr "" -#: sequencer.c:378 +#: sequencer.c:344 msgid "Unable to update cache tree\n" msgstr "" -#: sequencer.c:423 +#: sequencer.c:391 #, c-format msgid "Could not parse commit %s\n" msgstr "" -#: sequencer.c:428 +#: sequencer.c:396 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" -#: sequencer.c:494 +#: sequencer.c:462 msgid "Your index file is unmerged." msgstr "" -#: sequencer.c:513 +#: sequencer.c:481 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:521 +#: sequencer.c:489 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: sequencer.c:525 +#: sequencer.c:493 #, 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:538 +#: sequencer.c:506 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:542 +#: sequencer.c:510 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:628 +#: sequencer.c:596 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:629 +#: sequencer.c:597 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:665 +#: sequencer.c:633 msgid "empty commit set passed" msgstr "" -#: sequencer.c:673 +#: sequencer.c:641 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:678 +#: sequencer.c:645 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:736 +#: sequencer.c:705 #, c-format msgid "Cannot %s during a %s" msgstr "" -#: sequencer.c:758 +#: sequencer.c:727 #, c-format msgid "Could not parse line %d." msgstr "" -#: sequencer.c:763 +#: sequencer.c:732 msgid "No commits parsed." msgstr "" -#: sequencer.c:776 +#: sequencer.c:745 #, c-format msgid "Could not open %s" msgstr "" -#: sequencer.c:780 +#: sequencer.c:749 #, c-format msgid "Could not read %s." msgstr "" -#: sequencer.c:787 +#: sequencer.c:756 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" -#: sequencer.c:815 +#: sequencer.c:786 #, c-format msgid "Invalid key: %s" msgstr "" -#: sequencer.c:818 +#: sequencer.c:789 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: sequencer.c:830 +#: sequencer.c:801 #, c-format msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:851 +#: sequencer.c:822 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:852 +#: sequencer.c:823 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:856 +#: sequencer.c:827 #, c-format msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:872 sequencer.c:957 +#: sequencer.c:843 sequencer.c:928 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:891 sequencer.c:1025 +#: sequencer.c:862 sequencer.c:998 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:893 +#: sequencer.c:864 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:895 +#: sequencer.c:866 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:917 builtin/apply.c:4061 +#: sequencer.c:888 builtin/apply.c:4062 #, c-format msgid "cannot open %s: %s" msgstr "" -#: sequencer.c:920 +#: sequencer.c:891 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:921 +#: sequencer.c:892 msgid "unexpected end of file" msgstr "" -#: sequencer.c:927 +#: sequencer.c:898 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:950 +#: sequencer.c:921 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:1093 +#: sequencer.c:1066 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:1096 +#: sequencer.c:1069 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:1130 +#: sequencer.c:1103 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:1131 +#: sequencer.c:1104 msgid "Can't cherry-pick into empty head" msgstr "" @@ -1261,21 +1275,21 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" -#: sha1_name.c:1070 +#: sha1_name.c:1060 msgid "HEAD does not point to a branch" msgstr "" -#: sha1_name.c:1073 +#: sha1_name.c:1063 #, c-format msgid "No such branch: '%s'" msgstr "" -#: sha1_name.c:1075 +#: sha1_name.c:1065 #, c-format msgid "No upstream configured for branch '%s'" msgstr "" -#: sha1_name.c:1079 +#: sha1_name.c:1069 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" @@ -1289,52 +1303,34 @@ msgstr "" msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#. Maybe the user already did that, don't error out here #: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" -#. Maybe the user already did that, don't error out here #: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "" -#: submodule.c:127 -msgid "could not find .gitmodules in index" -msgstr "" - -#: submodule.c:133 -msgid "reading updated .gitmodules failed" -msgstr "" - -#: submodule.c:135 -msgid "unable to stat updated .gitmodules" -msgstr "" - -#: submodule.c:139 -msgid "unable to remove .gitmodules from index" -msgstr "" - -#: submodule.c:141 -msgid "adding updated .gitmodules failed" -msgstr "" - -#: submodule.c:143 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:1144 builtin/init-db.c:363 +#: submodule.c:1118 builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "" -#: submodule.c:1155 +#: submodule.c:1129 #, c-format msgid "Could not set core.worktree in %s" msgstr "" +#: unpack-trees.c:202 +msgid "Checking out files" +msgstr "" + #: urlmatch.c:120 msgid "invalid URL scheme name or missing '://' suffix" msgstr "" @@ -1364,22 +1360,22 @@ msgstr "" msgid "invalid '..' path segment" msgstr "" -#: wrapper.c:422 +#: wrapper.c:460 #, c-format msgid "unable to access '%s': %s" msgstr "" -#: wrapper.c:443 +#: wrapper.c:481 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:454 +#: wrapper.c:492 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" -#: wrapper.c:455 +#: wrapper.c:493 msgid "no such user" msgstr "" @@ -1438,266 +1434,275 @@ msgstr "" msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -#: wt-status.c:254 -msgid "bug" -msgstr "" - -#: wt-status.c:259 +#: wt-status.c:252 msgid "both deleted:" msgstr "" -#: wt-status.c:260 +#: wt-status.c:254 msgid "added by us:" msgstr "" -#: wt-status.c:261 +#: wt-status.c:256 msgid "deleted by them:" msgstr "" -#: wt-status.c:262 +#: wt-status.c:258 msgid "added by them:" msgstr "" -#: wt-status.c:263 +#: wt-status.c:260 msgid "deleted by us:" msgstr "" -#: wt-status.c:264 +#: wt-status.c:262 msgid "both added:" msgstr "" -#: wt-status.c:265 +#: wt-status.c:264 msgid "both modified:" msgstr "" -#: wt-status.c:275 -msgid "new file" +#: wt-status.c:266 +#, c-format +msgid "bug: unhandled unmerged status %x" +msgstr "" + +#: wt-status.c:274 +msgid "new file:" +msgstr "" + +#: wt-status.c:276 +msgid "copied:" +msgstr "" + +#: wt-status.c:278 +msgid "deleted:" msgstr "" -#: wt-status.c:277 -msgid "copied" +#: wt-status.c:280 +msgid "modified:" msgstr "" -#: wt-status.c:279 -msgid "deleted" +#: wt-status.c:282 +msgid "renamed:" msgstr "" -#: wt-status.c:285 -msgid "typechange" +#: wt-status.c:284 +msgid "typechange:" msgstr "" -#: wt-status.c:287 -msgid "unknown" +#: wt-status.c:286 +msgid "unknown:" msgstr "" -#: wt-status.c:289 -msgid "unmerged" +#: wt-status.c:288 +msgid "unmerged:" msgstr "" -#: wt-status.c:336 +#: wt-status.c:370 msgid "new commits, " msgstr "" -#: wt-status.c:338 +#: wt-status.c:372 msgid "modified content, " msgstr "" -#: wt-status.c:340 +#: wt-status.c:374 msgid "untracked content, " msgstr "" -#: wt-status.c:357 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:732 +#: wt-status.c:764 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:734 +#: wt-status.c:766 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:836 +#: wt-status.c:845 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "" -#: wt-status.c:899 +#: wt-status.c:936 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:902 +#: wt-status.c:939 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:905 +#: wt-status.c:942 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:908 +#: wt-status.c:945 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:918 +#: wt-status.c:955 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:921 +#: wt-status.c:958 msgid "The current patch is empty." msgstr "" -#: wt-status.c:925 +#: wt-status.c:962 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:927 +#: wt-status.c:964 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:929 +#: wt-status.c:966 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:989 wt-status.c:1006 +#: wt-status.c:1026 wt-status.c:1043 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:994 wt-status.c:1011 +#: wt-status.c:1031 wt-status.c:1048 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:997 +#: wt-status.c:1034 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:999 +#: wt-status.c:1036 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1001 +#: wt-status.c:1038 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1014 +#: wt-status.c:1051 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1018 +#: wt-status.c:1055 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1023 +#: wt-status.c:1060 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1026 +#: wt-status.c:1063 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1030 +#: wt-status.c:1067 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1035 +#: wt-status.c:1072 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1038 +#: wt-status.c:1075 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1040 +#: wt-status.c:1077 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1050 +#: wt-status.c:1087 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1055 +#: wt-status.c:1092 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1058 +#: wt-status.c:1095 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1060 +#: wt-status.c:1097 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1069 +#: wt-status.c:1106 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1074 +#: wt-status.c:1111 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1077 +#: wt-status.c:1114 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1079 +#: wt-status.c:1116 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1090 +#: wt-status.c:1127 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1094 +#: wt-status.c:1131 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1097 +#: wt-status.c:1134 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1272 +#: wt-status.c:1309 msgid "On branch " msgstr "" -#: wt-status.c:1279 +#: wt-status.c:1316 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1286 +#: wt-status.c:1323 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1288 +#: wt-status.c:1325 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1291 +#: wt-status.c:1328 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1308 +#: wt-status.c:1345 msgid "Initial commit" msgstr "" -#: wt-status.c:1322 +#: wt-status.c:1359 msgid "Untracked files" msgstr "" -#: wt-status.c:1324 +#: wt-status.c:1361 msgid "Ignored files" msgstr "" -#: wt-status.c:1328 +#: wt-status.c:1365 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1705,283 +1710,228 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1334 +#: wt-status.c:1371 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1336 +#: wt-status.c:1373 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1342 +#: wt-status.c:1379 msgid "No changes" msgstr "" -#: wt-status.c:1347 +#: wt-status.c:1384 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1350 +#: wt-status.c:1387 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1353 +#: wt-status.c:1390 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1356 +#: wt-status.c:1393 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1359 +#: wt-status.c:1396 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1362 wt-status.c:1367 +#: wt-status.c:1399 wt-status.c:1404 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1365 +#: wt-status.c:1402 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1369 +#: wt-status.c:1406 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1478 +#: wt-status.c:1515 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1484 +#: wt-status.c:1521 msgid "Initial commit on " msgstr "" -#: wt-status.c:1514 +#: wt-status.c:1553 msgid "gone" msgstr "" -#: wt-status.c:1516 +#: wt-status.c:1555 wt-status.c:1563 msgid "behind " msgstr "" -#: wt-status.c:1519 wt-status.c:1522 -msgid "ahead " -msgstr "" - -#: wt-status.c:1524 -msgid ", behind " -msgstr "" - #: compat/precompose_utf8.c:55 builtin/clone.c:356 #, c-format msgid "failed to unlink '%s'" msgstr "" -#: builtin/add.c:20 +#: builtin/add.c:21 msgid "git add [options] [--] <pathspec>..." msgstr "" -#. -#. * To be consistent with "git add -p" and most Git -#. * commands, we should default to being tree-wide, but -#. * this is not the original behavior and can't be -#. * changed until users trained themselves not to type -#. * "git add -u" or "git add -A". For now, we warn and -#. * keep the old behavior. Later, the behavior can be changed -#. * to tree-wide, keeping the warning for a while, and -#. * eventually we can drop the warning. -#. -#: builtin/add.c:58 -#, c-format -msgid "" -"The behavior of 'git add %s (or %s)' with no path argument from a\n" -"subdirectory of the tree will change in Git 2.0 and should not be used " -"anymore.\n" -"To add content for the whole tree, run:\n" -"\n" -" git add %s :/\n" -" (or git add %s :/)\n" -"\n" -"To restrict the command to the current directory, run:\n" -"\n" -" git add %s .\n" -" (or git add %s .)\n" -"\n" -"With the current Git version, the command is restricted to the current " -"directory.\n" -msgstr "" - -#: builtin/add.c:100 -#, c-format -msgid "" -"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n" -"whose behaviour will change in Git 2.0 with respect to paths you removed.\n" -"Paths like '%s' that are\n" -"removed from your working tree are ignored with this version of Git.\n" -"\n" -"* 'git add --ignore-removal <pathspec>', which is the current default,\n" -" ignores paths you removed from your working tree.\n" -"\n" -"* 'git add --all <pathspec>' will let you also record the removals.\n" -"\n" -"Run 'git status' to check the paths you removed from your working tree.\n" -msgstr "" - -#: builtin/add.c:144 +#: builtin/add.c:64 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:149 builtin/commit.c:260 +#: builtin/add.c:69 builtin/commit.c:261 msgid "updating files failed" msgstr "" -#: builtin/add.c:163 +#: builtin/add.c:79 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:237 +#: builtin/add.c:133 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:299 +#: builtin/add.c:193 builtin/rev-parse.c:781 msgid "Could not read the index" msgstr "" -#: builtin/add.c:310 +#: builtin/add.c:204 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:314 +#: builtin/add.c:208 msgid "Could not write patch" msgstr "" -#: builtin/add.c:319 +#: builtin/add.c:213 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:321 +#: builtin/add.c:215 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:327 +#: builtin/add.c:221 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:337 +#: builtin/add.c:231 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70 -#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344 +#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70 +#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367 #: builtin/rm.c:269 msgid "dry run" msgstr "" -#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19 -#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612 -#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113 +#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19 +#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606 +#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113 msgid "be verbose" msgstr "" -#: builtin/add.c:357 +#: builtin/add.c:251 msgid "interactive picking" msgstr "" -#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272 +#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:359 +#: builtin/add.c:253 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:360 +#: builtin/add.c:254 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:361 +#: builtin/add.c:255 msgid "update tracked files" msgstr "" -#: builtin/add.c:362 +#: builtin/add.c:256 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:363 +#: builtin/add.c:257 msgid "add changes from all tracked and untracked files" msgstr "" -#. takes no arguments -#: builtin/add.c:366 +#: builtin/add.c:260 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:368 +#: builtin/add.c:262 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:369 +#: builtin/add.c:263 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:370 +#: builtin/add.c:264 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:392 +#: builtin/add.c:286 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:393 +#: builtin/add.c:287 msgid "no files added" msgstr "" -#: builtin/add.c:399 +#: builtin/add.c:293 msgid "adding files failed" msgstr "" -#: builtin/add.c:438 +#: builtin/add.c:329 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:456 +#: builtin/add.c:336 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:486 +#: builtin/add.c:357 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:487 +#: builtin/add.c:358 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919 -#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 +#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299 msgid "index file corrupt" msgstr "" -#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432 +#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "" @@ -1999,37 +1949,37 @@ msgstr "" msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: builtin/apply.c:823 +#: builtin/apply.c:825 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: builtin/apply.c:832 +#: builtin/apply.c:834 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: builtin/apply.c:913 +#: builtin/apply.c:915 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: builtin/apply.c:945 +#: builtin/apply.c:947 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: builtin/apply.c:949 +#: builtin/apply.c:951 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: builtin/apply.c:950 +#: builtin/apply.c:952 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: builtin/apply.c:957 +#: builtin/apply.c:959 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" @@ -2088,7 +2038,6 @@ msgstr "" msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#. there has to be one hunk (forward hunk) #: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" @@ -2138,17 +2087,17 @@ msgstr "" msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:2946 +#: builtin/apply.c:2944 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:2952 +#: builtin/apply.c:2950 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:2973 +#: builtin/apply.c:2971 #, c-format msgid "patch failed: %s:%ld" msgstr "" @@ -2227,7 +2176,7 @@ msgstr "" msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127 +#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" @@ -2237,214 +2186,213 @@ msgstr "" msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3851 +#: builtin/apply.c:3852 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: builtin/apply.c:3855 +#: builtin/apply.c:3856 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3860 +#: builtin/apply.c:3861 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3863 builtin/apply.c:3971 +#: builtin/apply.c:3864 builtin/apply.c:3972 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3896 +#: builtin/apply.c:3897 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:3945 +#: builtin/apply.c:3946 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:4032 +#: builtin/apply.c:4033 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:4040 +#: builtin/apply.c:4041 msgid "internal error" msgstr "" -#. Say this even without --verbose -#: builtin/apply.c:4043 +#: builtin/apply.c:4044 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4053 +#: builtin/apply.c:4054 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4074 +#: builtin/apply.c:4075 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4077 +#: builtin/apply.c:4078 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4227 +#: builtin/apply.c:4228 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4238 +#: builtin/apply.c:4239 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90 -#: builtin/fetch.c:78 +#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90 +#: builtin/fetch.c:93 msgid "path" msgstr "" -#: builtin/apply.c:4358 +#: builtin/apply.c:4359 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4361 +#: builtin/apply.c:4362 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4363 +#: builtin/apply.c:4364 msgid "num" msgstr "" -#: builtin/apply.c:4364 +#: builtin/apply.c:4365 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4367 +#: builtin/apply.c:4368 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4369 +#: builtin/apply.c:4370 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4373 +#: builtin/apply.c:4374 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4375 +#: builtin/apply.c:4376 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4377 +#: builtin/apply.c:4378 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4379 +#: builtin/apply.c:4380 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4381 +#: builtin/apply.c:4382 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4383 +#: builtin/apply.c:4384 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4385 +#: builtin/apply.c:4386 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4387 +#: builtin/apply.c:4388 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452 +#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4392 +#: builtin/apply.c:4393 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4393 +#: builtin/apply.c:4394 msgid "action" msgstr "" -#: builtin/apply.c:4394 +#: builtin/apply.c:4395 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4397 builtin/apply.c:4400 +#: builtin/apply.c:4398 builtin/apply.c:4401 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4403 +#: builtin/apply.c:4404 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4405 +#: builtin/apply.c:4406 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4407 +#: builtin/apply.c:4408 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4409 +#: builtin/apply.c:4410 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4412 +#: builtin/apply.c:4413 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4415 +#: builtin/apply.c:4416 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4417 +#: builtin/apply.c:4418 msgid "root" msgstr "" -#: builtin/apply.c:4418 +#: builtin/apply.c:4419 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4440 +#: builtin/apply.c:4441 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4448 +#: builtin/apply.c:4449 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4451 +#: builtin/apply.c:4452 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4467 +#: builtin/apply.c:4468 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4481 +#: builtin/apply.c:4482 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4487 builtin/apply.c:4497 +#: builtin/apply.c:4488 builtin/apply.c:4498 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2498,106 +2446,116 @@ msgstr "" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" -#: builtin/blame.c:27 +#: builtin/blame.c:30 msgid "git blame [options] [rev-opts] [rev] [--] file" msgstr "" -#: builtin/blame.c:32 +#: builtin/blame.c:35 msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:2249 +#: builtin/blame.c:2501 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2250 +#: builtin/blame.c:2502 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2251 +#: builtin/blame.c:2503 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2252 +#: builtin/blame.c:2504 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2253 +#: builtin/blame.c:2505 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2254 +#: builtin/blame.c:2506 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2255 +#: builtin/blame.c:2507 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2256 +#: builtin/blame.c:2508 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2257 +#: builtin/blame.c:2509 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2258 +#: builtin/blame.c:2510 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2259 +#: builtin/blame.c:2511 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2260 +#: builtin/blame.c:2512 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2261 +#: builtin/blame.c:2513 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2262 +#: builtin/blame.c:2514 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2263 +#: builtin/blame.c:2515 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2264 +#: builtin/blame.c:2516 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2265 +#: builtin/blame.c:2517 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2266 +#: builtin/blame.c:2518 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2267 builtin/blame.c:2268 +#: builtin/blame.c:2519 builtin/blame.c:2520 msgid "score" msgstr "" -#: builtin/blame.c:2267 +#: builtin/blame.c:2519 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2268 +#: builtin/blame.c:2520 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2269 +#: builtin/blame.c:2521 msgid "n,m" msgstr "" -#: builtin/blame.c:2269 +#: builtin/blame.c:2521 msgid "Process only line range n,m, counting from 1" msgstr "" +#. 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:2599 +msgid "4 years, 11 months ago" +msgstr "" + #: builtin/branch.c:24 msgid "git branch [options] [-r | -a] [--merged | --no-merged]" msgstr "" @@ -2830,8 +2788,9 @@ msgid "act on remote-tracking branches" msgstr "" #: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 -#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461 -#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468 +#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574 +#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615 +#: builtin/tag.c:621 msgid "commit" msgstr "" @@ -2895,7 +2854,7 @@ msgstr "" msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:872 builtin/clone.c:635 +#: builtin/branch.c:872 builtin/clone.c:636 msgid "HEAD not found below refs/heads!" msgstr "" @@ -3008,43 +2967,43 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:328 +#: builtin/cat-file.c:331 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "" -#: builtin/cat-file.c:329 +#: builtin/cat-file.c:332 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "" -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:369 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:367 +#: builtin/cat-file.c:370 msgid "show object type" msgstr "" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:371 msgid "show object size" msgstr "" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:373 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:374 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:376 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:375 +#: builtin/cat-file.c:378 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:381 msgid "show info about objects fed from the standard input" msgstr "" @@ -3072,7 +3031,7 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260 +#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285 msgid "suppress progress reporting" msgstr "" @@ -3129,43 +3088,43 @@ msgstr "" 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 "" @@ -3207,76 +3166,75 @@ msgstr "" msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238 -#: builtin/checkout.c:241 +#: 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:244 builtin/checkout.c:247 +#: builtin/checkout.c:243 builtin/checkout.c:246 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:250 +#: builtin/checkout.c:249 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:261 builtin/checkout.c:451 +#: builtin/checkout.c:260 builtin/checkout.c:449 msgid "corrupt index file" msgstr "" -#: builtin/checkout.c:322 builtin/checkout.c:329 +#: builtin/checkout.c:320 builtin/checkout.c:327 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:473 +#: builtin/checkout.c:471 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:594 +#: builtin/checkout.c:591 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "" -#: builtin/checkout.c:632 +#: builtin/checkout.c:629 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:639 +#: builtin/checkout.c:636 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:642 +#: builtin/checkout.c:639 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:646 +#: builtin/checkout.c:643 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:648 builtin/checkout.c:1033 +#: builtin/checkout.c:645 builtin/checkout.c:1026 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:650 +#: builtin/checkout.c:647 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:706 +#: builtin/checkout.c:699 #, c-format msgid " ... and %d more.\n" msgstr "" -#. The singular version -#: builtin/checkout.c:712 +#: builtin/checkout.c:705 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3291,7 +3249,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:730 +#: builtin/checkout.c:723 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -3301,152 +3259,151 @@ msgid "" "\n" msgstr "" -#: builtin/checkout.c:760 +#: builtin/checkout.c:753 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:764 +#: builtin/checkout.c:757 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:791 builtin/checkout.c:1028 +#: builtin/checkout.c:784 builtin/checkout.c:1021 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:935 +#: builtin/checkout.c:928 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:974 +#: builtin/checkout.c:967 #, c-format msgid "invalid reference: %s" msgstr "" -#. case (1): want a tree -#: builtin/checkout.c:1003 +#: builtin/checkout.c:996 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1042 +#: builtin/checkout.c:1035 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1045 builtin/checkout.c:1049 +#: builtin/checkout.c:1038 builtin/checkout.c:1042 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061 -#: builtin/checkout.c:1064 +#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054 +#: builtin/checkout.c:1057 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1069 +#: builtin/checkout.c:1062 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88 +#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1085 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1094 +#: builtin/checkout.c:1087 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1088 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1096 +#: builtin/checkout.c:1089 msgid "detach the HEAD at named commit" msgstr "" -#: builtin/checkout.c:1097 +#: builtin/checkout.c:1090 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1099 -msgid "new branch" +#: builtin/checkout.c:1092 +msgid "new-branch" msgstr "" -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1092 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1100 +#: builtin/checkout.c:1093 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1102 +#: builtin/checkout.c:1095 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1097 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1105 +#: builtin/checkout.c:1098 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1106 builtin/merge.c:225 +#: builtin/checkout.c:1099 builtin/merge.c:225 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248 +#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245 msgid "style" msgstr "" -#: builtin/checkout.c:1108 +#: builtin/checkout.c:1101 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1104 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1106 msgid "second guess 'git checkout no-such-branch'" msgstr "" -#: builtin/checkout.c:1136 +#: builtin/checkout.c:1129 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1146 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1153 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1190 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1204 +#: builtin/checkout.c:1197 #, 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:1209 +#: builtin/checkout.c:1202 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1213 +#: builtin/checkout.c:1206 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3482,7 +3439,7 @@ msgstr "" msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:294 +#: builtin/clean.c:295 msgid "" "Prompt help:\n" "1 - select a numbered item\n" @@ -3490,7 +3447,7 @@ msgid "" " - (empty) select nothing" msgstr "" -#: builtin/clean.c:298 +#: builtin/clean.c:299 msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -3502,7 +3459,7 @@ msgid "" " - (empty) finish selecting" msgstr "" -#: builtin/clean.c:516 +#: builtin/clean.c:517 #, c-format msgid "Huh (%s)?" msgstr "" @@ -3575,8 +3532,8 @@ msgstr "" msgid "remove whole directories" msgstr "" -#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718 -#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185 +#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714 +#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "" @@ -3598,13 +3555,13 @@ msgstr "" #: builtin/clean.c:906 msgid "" -"clean.requireForce set to true and neither -i, -n nor -f given; refusing to " +"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; " +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" @@ -3612,8 +3569,8 @@ msgstr "" msgid "git clone [options] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222 -#: builtin/push.c:521 +#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222 +#: builtin/push.c:503 msgid "force progress reporting" msgstr "" @@ -3621,7 +3578,7 @@ msgstr "" msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486 msgid "create a bare repository" msgstr "" @@ -3645,11 +3602,11 @@ msgstr "" msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:82 builtin/init-db.c:485 +#: builtin/clone.c:82 builtin/init-db.c:483 msgid "template-directory" msgstr "" -#: builtin/clone.c:83 builtin/init-db.c:486 +#: builtin/clone.c:83 builtin/init-db.c:484 msgid "directory from which templates will be used" msgstr "" @@ -3673,7 +3630,7 @@ msgstr "" msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663 +#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659 msgid "depth" msgstr "" @@ -3685,11 +3642,11 @@ msgstr "" msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:96 builtin/init-db.c:494 +#: builtin/clone.c:96 builtin/init-db.c:492 msgid "gitdir" msgstr "" -#: builtin/clone.c:97 builtin/init-db.c:495 +#: builtin/clone.c:97 builtin/init-db.c:493 msgid "separate git dir from working tree" msgstr "" @@ -3772,94 +3729,94 @@ msgstr "" msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:626 +#: builtin/clone.c:627 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:657 +#: builtin/clone.c:658 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:765 +#: builtin/clone.c:768 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:769 +#: builtin/clone.c:772 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:780 +#: builtin/clone.c:783 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:783 +#: builtin/clone.c:786 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:796 +#: builtin/clone.c:799 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:802 -msgid "--depth is ignored in local clones; use file:// instead." -msgstr "" - -#: builtin/clone.c:805 -msgid "source repository is shallow, ignoring --local" -msgstr "" - -#: builtin/clone.c:810 -msgid "--local is ignored" -msgstr "" - -#: builtin/clone.c:814 builtin/fetch.c:1119 +#: builtin/clone.c:805 builtin/fetch.c:1143 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:824 +#: builtin/clone.c:815 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:834 +#: builtin/clone.c:825 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:847 builtin/clone.c:859 +#: builtin/clone.c:838 builtin/clone.c:850 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:850 +#: builtin/clone.c:841 #, c-format msgid "could not create work tree dir '%s'." msgstr "" -#: builtin/clone.c:869 +#: builtin/clone.c:860 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:871 +#: builtin/clone.c:862 #, c-format msgid "Cloning into '%s'...\n" msgstr "" +#: builtin/clone.c:898 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:901 +msgid "source repository is shallow, ignoring --local" +msgstr "" + #: builtin/clone.c:906 +msgid "--local is ignored" +msgstr "" + +#: builtin/clone.c:910 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:957 builtin/clone.c:965 +#: builtin/clone.c:961 builtin/clone.c:969 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:968 +#: builtin/clone.c:972 msgid "You appear to have cloned an empty repository." msgstr "" @@ -3947,93 +3904,100 @@ msgid "" "the remaining commits.\n" msgstr "" -#: builtin/commit.c:287 +#: builtin/commit.c:288 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:329 +#: builtin/commit.c:328 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:335 +#: builtin/commit.c:334 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439 +#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:420 +#: builtin/commit.c:418 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:422 +#: builtin/commit.c:420 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:432 +#: builtin/commit.c:429 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:452 +#: builtin/commit.c:447 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:543 builtin/commit.c:549 +#: builtin/commit.c:557 builtin/commit.c:563 #, c-format msgid "invalid commit: %s" msgstr "" -#: builtin/commit.c:571 +#: builtin/commit.c:585 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:591 +#: builtin/commit.c:592 +#, c-format +msgid "invalid date format: %s" +msgstr "" + +#: builtin/commit.c:609 #, c-format msgid "Malformed ident string: '%s'" msgstr "" -#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007 +#: builtin/commit.c:642 +msgid "" +"unable to select a comment character that is not used\n" +"in the current commit message" +msgstr "" + +#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:642 builtin/shortlog.c:273 +#: builtin/commit.c:691 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:644 +#: builtin/commit.c:693 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:648 +#: builtin/commit.c:697 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:654 -msgid "commit has empty message" -msgstr "" - -#: builtin/commit.c:670 +#: builtin/commit.c:719 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:674 +#: builtin/commit.c:723 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:678 +#: builtin/commit.c:727 #, c-format msgid "could not read '%s'" msgstr "" -#: builtin/commit.c:749 +#: builtin/commit.c:798 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:760 +#: builtin/commit.c:816 #, c-format msgid "" "\n" @@ -4043,7 +4007,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:765 +#: builtin/commit.c:821 #, c-format msgid "" "\n" @@ -4053,14 +4017,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:777 +#: builtin/commit.c:834 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:782 +#: builtin/commit.c:841 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4068,351 +4032,356 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:795 +#: builtin/commit.c:855 +#, c-format +msgid "%sAuthor: %.*s <%.*s>" +msgstr "" + +#: builtin/commit.c:863 #, c-format -msgid "%sAuthor: %s" +msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:802 +#: builtin/commit.c:870 #, c-format -msgid "%sCommitter: %s" +msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:822 +#: builtin/commit.c:888 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:865 +#: builtin/commit.c:945 msgid "Error building trees" msgstr "" -#: builtin/commit.c:880 builtin/tag.c:359 +#: builtin/commit.c:960 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:982 +#: builtin/commit.c:1061 #, c-format msgid "No existing author found with '%s'" msgstr "" -#: builtin/commit.c:997 builtin/commit.c:1237 +#: builtin/commit.c:1076 builtin/commit.c:1316 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1034 +#: builtin/commit.c:1113 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1064 +#: builtin/commit.c:1143 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1075 +#: builtin/commit.c:1152 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1078 +#: builtin/commit.c:1155 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1080 +#: builtin/commit.c:1157 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1083 +#: builtin/commit.c:1160 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1093 +#: builtin/commit.c:1170 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1095 +#: builtin/commit.c:1172 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1103 +#: builtin/commit.c:1180 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1120 +#: builtin/commit.c:1197 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1122 +#: builtin/commit.c:1199 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1124 +#: builtin/commit.c:1201 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1126 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +#: builtin/commit.c:1203 +msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1136 builtin/tag.c:572 +#: builtin/commit.c:1215 builtin/tag.c:727 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1141 +#: builtin/commit.c:1220 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1251 builtin/commit.c:1482 +#: builtin/commit.c:1330 builtin/commit.c:1595 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1253 builtin/commit.c:1484 +#: builtin/commit.c:1332 builtin/commit.c:1597 msgid "show branch information" msgstr "" -#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507 +#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1258 builtin/commit.c:1488 +#: builtin/commit.c:1337 builtin/commit.c:1601 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1261 builtin/commit.c:1491 +#: builtin/commit.c:1340 builtin/commit.c:1604 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674 -#: builtin/fast-export.c:677 builtin/tag.c:459 +#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703 +#: builtin/fast-export.c:706 builtin/tag.c:602 msgid "mode" msgstr "" -#: builtin/commit.c:1264 builtin/commit.c:1494 +#: builtin/commit.c:1343 builtin/commit.c:1607 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1267 +#: builtin/commit.c:1346 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1268 parse-options.h:156 +#: builtin/commit.c:1347 parse-options.h:153 msgid "when" msgstr "" -#: builtin/commit.c:1269 +#: builtin/commit.c:1348 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1271 +#: builtin/commit.c:1350 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1340 +#: builtin/commit.c:1419 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1342 +#: builtin/commit.c:1421 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1383 +#: builtin/commit.c:1469 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1385 +#: builtin/commit.c:1471 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1452 +#: builtin/commit.c:1565 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1453 +#: builtin/commit.c:1566 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1455 +#: builtin/commit.c:1568 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1456 builtin/tag.c:457 +#: builtin/commit.c:1569 builtin/tag.c:600 msgid "read message from file" msgstr "" -#: builtin/commit.c:1457 +#: builtin/commit.c:1570 msgid "author" msgstr "" -#: builtin/commit.c:1457 +#: builtin/commit.c:1570 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1458 builtin/gc.c:261 +#: builtin/commit.c:1571 builtin/gc.c:286 msgid "date" msgstr "" -#: builtin/commit.c:1458 +#: builtin/commit.c:1571 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405 -#: builtin/notes.c:562 builtin/tag.c:455 +#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409 +#: builtin/notes.c:566 builtin/tag.c:598 msgid "message" msgstr "" -#: builtin/commit.c:1459 +#: builtin/commit.c:1572 msgid "commit message" msgstr "" -#: builtin/commit.c:1460 +#: builtin/commit.c:1573 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1461 +#: builtin/commit.c:1574 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1462 +#: builtin/commit.c:1575 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1463 +#: builtin/commit.c:1576 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1464 +#: builtin/commit.c:1577 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86 +#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1466 +#: builtin/commit.c:1579 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1467 +#: builtin/commit.c:1580 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1468 +#: builtin/commit.c:1581 msgid "default" msgstr "" -#: builtin/commit.c:1468 builtin/tag.c:460 +#: builtin/commit.c:1581 builtin/tag.c:603 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1469 +#: builtin/commit.c:1582 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461 -msgid "key id" +#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92 +#: builtin/tag.c:604 +msgid "key-id" msgstr "" -#: builtin/commit.c:1471 builtin/merge.c:224 +#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93 msgid "GPG sign commit" msgstr "" -#. end commit message options -#: builtin/commit.c:1474 +#: builtin/commit.c:1587 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1475 +#: builtin/commit.c:1588 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1476 +#: builtin/commit.c:1589 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1477 +#: builtin/commit.c:1590 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1478 +#: builtin/commit.c:1591 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1479 +#: builtin/commit.c:1592 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1480 +#: builtin/commit.c:1593 msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1481 +#: builtin/commit.c:1594 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1492 +#: builtin/commit.c:1605 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1493 +#: builtin/commit.c:1606 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1498 +#: builtin/commit.c:1611 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1500 +#: builtin/commit.c:1613 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1529 +#: builtin/commit.c:1641 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1567 builtin/merge.c:518 +#: builtin/commit.c:1680 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1574 +#: builtin/commit.c:1687 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1581 +#: builtin/commit.c:1694 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1600 +#: builtin/commit.c:1713 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1611 +#: builtin/commit.c:1724 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1616 +#: builtin/commit.c:1729 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879 +#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1652 +#: builtin/commit.c:1756 msgid "cannot lock HEAD ref" msgstr "" -#: builtin/commit.c:1656 +#: builtin/commit.c:1769 msgid "cannot update HEAD ref" msgstr "" -#: builtin/commit.c:1667 +#: builtin/commit.c:1780 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -4423,127 +4392,127 @@ msgstr "" msgid "git config [options]" msgstr "" -#: builtin/config.c:54 +#: builtin/config.c:53 msgid "Config file location" msgstr "" -#: builtin/config.c:55 +#: builtin/config.c:54 msgid "use global config file" msgstr "" -#: builtin/config.c:56 +#: builtin/config.c:55 msgid "use system config file" msgstr "" -#: builtin/config.c:57 +#: builtin/config.c:56 msgid "use repository config file" msgstr "" -#: builtin/config.c:58 +#: builtin/config.c:57 msgid "use given config file" msgstr "" -#: builtin/config.c:59 +#: builtin/config.c:58 msgid "blob-id" msgstr "" -#: builtin/config.c:59 +#: builtin/config.c:58 msgid "read config from given blob object" msgstr "" -#: builtin/config.c:60 +#: builtin/config.c:59 msgid "Action" msgstr "" -#: builtin/config.c:61 +#: builtin/config.c:60 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:62 +#: builtin/config.c:61 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:63 +#: builtin/config.c:62 msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/config.c:64 +#: builtin/config.c:63 msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:65 +#: builtin/config.c:64 msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/config.c:66 +#: builtin/config.c:65 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:67 +#: builtin/config.c:66 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:68 +#: builtin/config.c:67 msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/config.c:69 +#: builtin/config.c:68 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:70 +#: builtin/config.c:69 msgid "remove a section: name" msgstr "" -#: builtin/config.c:71 +#: builtin/config.c:70 msgid "list all" msgstr "" -#: builtin/config.c:72 +#: builtin/config.c:71 msgid "open an editor" msgstr "" -#: builtin/config.c:73 builtin/config.c:74 +#: builtin/config.c:72 builtin/config.c:73 msgid "slot" msgstr "" -#: builtin/config.c:73 +#: builtin/config.c:72 msgid "find the color configured: [default]" msgstr "" -#: builtin/config.c:74 +#: builtin/config.c:73 msgid "find the color setting: [stdout-is-tty]" msgstr "" -#: builtin/config.c:75 +#: builtin/config.c:74 msgid "Type" msgstr "" -#: builtin/config.c:76 +#: builtin/config.c:75 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:77 +#: builtin/config.c:76 msgid "value is decimal number" msgstr "" -#: builtin/config.c:78 +#: builtin/config.c:77 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:79 +#: builtin/config.c:78 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:80 +#: builtin/config.c:79 msgid "Other" msgstr "" -#: builtin/config.c:81 +#: builtin/config.c:80 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:82 +#: builtin/config.c:81 msgid "respect include directives on lookup" msgstr "" @@ -4563,129 +4532,129 @@ msgstr "" msgid "git describe [options] --dirty" msgstr "" -#: builtin/describe.c:237 +#: builtin/describe.c:216 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:241 +#: builtin/describe.c:220 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:243 +#: builtin/describe.c:222 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:270 +#: builtin/describe.c:249 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:273 +#: builtin/describe.c:252 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: builtin/describe.c:290 +#: builtin/describe.c:269 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:292 +#: builtin/describe.c:271 #, c-format msgid "searching to describe %s\n" msgstr "" -#: builtin/describe.c:332 +#: builtin/describe.c:318 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:359 +#: builtin/describe.c:345 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:363 +#: builtin/describe.c:349 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:384 +#: builtin/describe.c:370 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:387 +#: builtin/describe.c:373 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:409 +#: builtin/describe.c:395 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:410 +#: builtin/describe.c:396 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:411 +#: builtin/describe.c:397 msgid "use any ref" msgstr "" -#: builtin/describe.c:412 +#: builtin/describe.c:398 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:413 +#: builtin/describe.c:399 msgid "always use long format" msgstr "" -#: builtin/describe.c:414 +#: builtin/describe.c:400 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:417 +#: builtin/describe.c:403 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:419 +#: builtin/describe.c:405 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:421 +#: builtin/describe.c:407 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:423 builtin/name-rev.c:321 +#: builtin/describe.c:409 builtin/name-rev.c:318 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:424 +#: builtin/describe.c:410 msgid "mark" msgstr "" -#: builtin/describe.c:425 +#: builtin/describe.c:411 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:443 +#: builtin/describe.c:429 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:469 +#: builtin/describe.c:455 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:489 +#: builtin/describe.c:475 msgid "--dirty is incompatible with commit-ishes" msgstr "" @@ -4718,46 +4687,54 @@ msgstr "" msgid "unhandled object '%s' given." msgstr "" -#: builtin/fast-export.c:22 +#: builtin/fast-export.c:23 msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:673 +#: builtin/fast-export.c:702 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:675 +#: builtin/fast-export.c:704 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:678 +#: builtin/fast-export.c:707 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:681 +#: builtin/fast-export.c:710 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:683 +#: builtin/fast-export.c:712 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:685 +#: builtin/fast-export.c:714 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:687 +#: builtin/fast-export.c:716 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:689 +#: builtin/fast-export.c:718 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:690 +#: builtin/fast-export.c:719 msgid "Skip output of blob data" msgstr "" +#: builtin/fast-export.c:720 +msgid "refspec" +msgstr "" + +#: builtin/fast-export.c:721 +msgid "Apply refspec to exported refs" +msgstr "" + #: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" @@ -4774,239 +4751,247 @@ msgstr "" msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:75 +#: builtin/fetch.c:90 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:77 +#: builtin/fetch.c:92 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:79 +#: builtin/fetch.c:94 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:80 +#: builtin/fetch.c:95 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:82 +#: builtin/fetch.c:97 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:84 +#: builtin/fetch.c:99 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:86 +#: builtin/fetch.c:101 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:88 +#: builtin/fetch.c:103 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:89 +#: builtin/fetch.c:104 msgid "on-demand" msgstr "" -#: builtin/fetch.c:90 +#: builtin/fetch.c:105 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:94 +#: builtin/fetch.c:109 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:96 +#: builtin/fetch.c:111 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:99 +#: builtin/fetch.c:114 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:101 +#: builtin/fetch.c:116 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:103 builtin/log.c:1197 +#: builtin/fetch.c:118 builtin/log.c:1205 msgid "dir" msgstr "" -#: builtin/fetch.c:104 +#: builtin/fetch.c:119 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:107 +#: builtin/fetch.c:122 msgid "default mode for recursion" msgstr "" -#: builtin/fetch.c:109 +#: builtin/fetch.c:124 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:347 +#: 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:411 +#: builtin/fetch.c:440 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:416 +#: builtin/fetch.c:445 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:430 +#: builtin/fetch.c:459 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:431 builtin/fetch.c:517 +#: builtin/fetch.c:460 builtin/fetch.c:546 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:442 +#: builtin/fetch.c:471 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497 +#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526 msgid " (unable to update local ref)" msgstr "" -#: builtin/fetch.c:462 +#: builtin/fetch.c:491 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:465 +#: builtin/fetch.c:494 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:468 +#: builtin/fetch.c:497 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:513 +#: builtin/fetch.c:542 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:513 +#: builtin/fetch.c:542 msgid "forced update" msgstr "" -#: builtin/fetch.c:519 +#: builtin/fetch.c:548 msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:552 builtin/fetch.c:785 +#: builtin/fetch.c:581 builtin/fetch.c:814 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: builtin/fetch.c:561 +#: builtin/fetch.c:590 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:579 +#: builtin/fetch.c:608 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:667 builtin/fetch.c:750 +#: builtin/fetch.c:696 builtin/fetch.c:779 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:678 +#: builtin/fetch.c:707 #, 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:730 +#: builtin/fetch.c:759 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:731 +#: builtin/fetch.c:760 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:755 +#: builtin/fetch.c:784 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:756 builtin/remote.c:1050 +#: builtin/fetch.c:785 builtin/remote.c:1059 msgid "(none)" msgstr "" -#: builtin/fetch.c:775 +#: builtin/fetch.c:804 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:794 +#: builtin/fetch.c:823 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:797 +#: builtin/fetch.c:826 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:853 +#: builtin/fetch.c:882 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:1015 +#: builtin/fetch.c:1044 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1017 builtin/remote.c:90 +#: builtin/fetch.c:1046 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1036 +#: builtin/fetch.c:1064 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:1059 +#: builtin/fetch.c:1087 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1107 +#: builtin/fetch.c:1131 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1109 +#: builtin/fetch.c:1133 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1132 +#: builtin/fetch.c:1156 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1158 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1145 +#: builtin/fetch.c:1169 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1153 +#: builtin/fetch.c:1177 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -5014,10 +4999,10 @@ msgstr "" msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702 -#: builtin/merge.c:196 builtin/repack.c:160 builtin/repack.c:164 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:446 -#: parse-options.h:135 parse-options.h:242 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698 +#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589 +#: parse-options.h:132 parse-options.h:239 msgid "n" msgstr "" @@ -5041,135 +5026,154 @@ msgstr "" msgid "file to read from" msgstr "" -#: builtin/for-each-ref.c:1063 +#: builtin/for-each-ref.c:1051 msgid "git for-each-ref [options] [<pattern>]" msgstr "" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:1066 msgid "quote placeholders suitably for shells" msgstr "" -#: builtin/for-each-ref.c:1080 +#: builtin/for-each-ref.c:1068 msgid "quote placeholders suitably for perl" msgstr "" -#: builtin/for-each-ref.c:1082 +#: builtin/for-each-ref.c:1070 msgid "quote placeholders suitably for python" msgstr "" -#: builtin/for-each-ref.c:1084 +#: builtin/for-each-ref.c:1072 msgid "quote placeholders suitably for tcl" msgstr "" -#: builtin/for-each-ref.c:1087 +#: builtin/for-each-ref.c:1075 msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:1088 builtin/replace.c:177 +#: builtin/for-each-ref.c:1076 builtin/replace.c:435 msgid "format" msgstr "" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1076 msgid "format to use for the output" msgstr "" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1077 msgid "key" msgstr "" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1078 msgid "field name to sort on" msgstr "" -#: builtin/fsck.c:607 +#: builtin/fsck.c:147 builtin/prune.c:172 +msgid "Checking connectivity" +msgstr "" + +#: builtin/fsck.c:538 +msgid "Checking object directories" +msgstr "" + +#: builtin/fsck.c:601 msgid "git fsck [options] [<object>...]" msgstr "" -#: builtin/fsck.c:613 +#: builtin/fsck.c:607 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:614 +#: builtin/fsck.c:608 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:615 +#: builtin/fsck.c:609 msgid "report tags" msgstr "" -#: builtin/fsck.c:616 +#: builtin/fsck.c:610 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:617 +#: builtin/fsck.c:611 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:618 +#: builtin/fsck.c:612 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:619 +#: builtin/fsck.c:613 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:620 +#: builtin/fsck.c:614 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:622 +#: builtin/fsck.c:616 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:623 builtin/prune.c:144 +#: builtin/fsck.c:617 builtin/prune.c:144 msgid "show progress" msgstr "" +#: builtin/fsck.c:667 +msgid "Checking objects" +msgstr "" + #: builtin/gc.c:24 msgid "git gc [options]" msgstr "" -#: builtin/gc.c:80 +#: builtin/gc.c:91 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: builtin/gc.c:107 +#: builtin/gc.c:118 #, c-format msgid "insanely long object directory %.*s" msgstr "" -#: builtin/gc.c:262 +#: builtin/gc.c:287 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:264 +#: builtin/gc.c:289 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:265 +#: builtin/gc.c:290 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:266 +#: builtin/gc.c:291 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:306 +#: builtin/gc.c:332 #, 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" +msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -#. be quiet on --auto -#: builtin/gc.c:316 +#: builtin/gc.c:334 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "" + +#: builtin/gc.c:335 +#, c-format +msgid "See \"git help gc\" for manual housekeeping.\n" +msgstr "" + +#: builtin/gc.c:353 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -#: builtin/gc.c:341 +#: builtin/gc.c:375 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5183,224 +5187,219 @@ msgstr "" msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/grep.c:365 -#, c-format -msgid "Failed to chdir: %s" -msgstr "" - -#: builtin/grep.c:443 builtin/grep.c:478 +#: builtin/grep.c:441 builtin/grep.c:476 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:493 +#: builtin/grep.c:491 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:551 +#: builtin/grep.c:547 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:568 +#: builtin/grep.c:564 #, c-format msgid "cannot open '%s'" msgstr "" -#: builtin/grep.c:642 +#: builtin/grep.c:638 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:644 +#: builtin/grep.c:640 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:646 +#: builtin/grep.c:642 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:648 +#: builtin/grep.c:644 msgid "search also in ignored files" msgstr "" -#: builtin/grep.c:651 +#: builtin/grep.c:647 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:653 +#: builtin/grep.c:649 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:655 +#: builtin/grep.c:651 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:657 +#: builtin/grep.c:653 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:659 +#: builtin/grep.c:655 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:662 +#: builtin/grep.c:658 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:664 +#: builtin/grep.c:660 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:668 +#: builtin/grep.c:664 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:671 +#: builtin/grep.c:667 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:674 +#: builtin/grep.c:670 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:677 +#: builtin/grep.c:673 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:680 +#: builtin/grep.c:676 msgid "show line numbers" msgstr "" -#: builtin/grep.c:681 +#: builtin/grep.c:677 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:682 +#: builtin/grep.c:678 msgid "show filenames" msgstr "" -#: builtin/grep.c:684 +#: builtin/grep.c:680 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:686 +#: builtin/grep.c:682 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:688 +#: builtin/grep.c:684 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:691 +#: builtin/grep.c:687 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:693 +#: builtin/grep.c:689 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:695 +#: builtin/grep.c:691 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:696 +#: builtin/grep.c:692 msgid "highlight matches" msgstr "" -#: builtin/grep.c:698 +#: builtin/grep.c:694 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:700 +#: builtin/grep.c:696 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:703 +#: builtin/grep.c:699 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:706 +#: builtin/grep.c:702 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:708 +#: builtin/grep.c:704 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:709 +#: builtin/grep.c:705 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:712 +#: builtin/grep.c:708 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:714 +#: builtin/grep.c:710 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:717 +#: builtin/grep.c:713 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:719 +#: builtin/grep.c:715 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:721 +#: builtin/grep.c:717 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:733 +#: builtin/grep.c:729 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:735 +#: builtin/grep.c:731 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:737 +#: builtin/grep.c:733 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:741 +#: builtin/grep.c:737 msgid "pager" msgstr "" -#: builtin/grep.c:741 +#: builtin/grep.c:737 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:744 +#: builtin/grep.c:740 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:745 builtin/show-ref.c:187 +#: builtin/grep.c:741 builtin/show-ref.c:187 msgid "show usage" msgstr "" -#: builtin/grep.c:812 +#: builtin/grep.c:808 msgid "no pattern given." msgstr "" -#: builtin/grep.c:870 +#: builtin/grep.c:866 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:893 +#: builtin/grep.c:892 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:898 +#: builtin/grep.c:897 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:901 +#: builtin/grep.c:900 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:909 +#: builtin/grep.c:908 msgid "both --cached and trees are given." msgstr "" @@ -5414,7 +5413,7 @@ msgstr "" msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "" -#: builtin/hash-object.c:72 +#: builtin/hash-object.c:72 builtin/tag.c:609 msgid "type" msgstr "" @@ -5554,280 +5553,291 @@ msgstr "" msgid "`git %s' is aliased to `%s'" msgstr "" -#: builtin/index-pack.c:184 +#: builtin/index-pack.c:145 +#, c-format +msgid "unable to open %s" +msgstr "" + +#: builtin/index-pack.c:191 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:204 -msgid "object of unexpected type" +#: builtin/index-pack.c:211 +#, c-format +msgid "did not receive expected object %s" msgstr "" -#: builtin/index-pack.c:244 +#: builtin/index-pack.c:214 +#, c-format +msgid "object %s: expected type %s, found %s" +msgstr "" + +#: builtin/index-pack.c:256 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:254 +#: builtin/index-pack.c:266 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:255 +#: builtin/index-pack.c:267 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:279 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:274 +#: builtin/index-pack.c:286 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:290 +#: builtin/index-pack.c:302 #, c-format msgid "unable to create '%s'" msgstr "" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:307 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:309 +#: builtin/index-pack.c:321 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:311 +#: builtin/index-pack.c:323 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "" -#: builtin/index-pack.c:329 +#: builtin/index-pack.c:341 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "" -#: builtin/index-pack.c:451 +#: builtin/index-pack.c:462 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:500 +#: builtin/index-pack.c:511 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:508 +#: builtin/index-pack.c:519 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:516 +#: builtin/index-pack.c:527 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:547 +#: builtin/index-pack.c:558 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:549 +#: builtin/index-pack.c:560 #, 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:575 +#: builtin/index-pack.c:586 msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695 -#: builtin/index-pack.c:729 builtin/index-pack.c:738 +#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706 +#: builtin/index-pack.c:740 builtin/index-pack.c:749 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:669 builtin/pack-objects.c:171 -#: builtin/pack-objects.c:263 +#: builtin/index-pack.c:680 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:735 +#: builtin/index-pack.c:746 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:749 +#: builtin/index-pack.c:760 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:763 +#: builtin/index-pack.c:774 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:766 +#: builtin/index-pack.c:777 msgid "Error in object" msgstr "" -#: builtin/index-pack.c:768 +#: builtin/index-pack.c:779 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:839 builtin/index-pack.c:869 +#: builtin/index-pack.c:851 builtin/index-pack.c:881 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1010 +#: builtin/index-pack.c:1022 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1010 +#: builtin/index-pack.c:1022 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1036 +#: builtin/index-pack.c:1048 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1041 +#: builtin/index-pack.c:1053 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1044 +#: builtin/index-pack.c:1056 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1055 +#: builtin/index-pack.c:1067 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1078 +#: builtin/index-pack.c:1090 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1088 +#: builtin/index-pack.c:1100 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1130 +#: builtin/index-pack.c:1142 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1138 +#: builtin/index-pack.c:1150 #, c-format msgid "completed with %d local objects" msgstr "" -#: builtin/index-pack.c:1148 +#: builtin/index-pack.c:1160 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1164 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1177 +#: builtin/index-pack.c:1189 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1256 +#: builtin/index-pack.c:1268 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1280 +#: builtin/index-pack.c:1292 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1293 +#: builtin/index-pack.c:1305 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1301 +#: builtin/index-pack.c:1313 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1314 +#: builtin/index-pack.c:1326 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1325 +#: builtin/index-pack.c:1337 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1358 +#: builtin/index-pack.c:1370 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1364 +#: builtin/index-pack.c:1376 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/index-pack.c:1368 builtin/index-pack.c:1546 +#: builtin/index-pack.c:1380 builtin/index-pack.c:1559 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/index-pack.c:1426 +#: builtin/index-pack.c:1438 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1428 +#: builtin/index-pack.c:1440 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1475 +#: builtin/index-pack.c:1487 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1482 +#: builtin/index-pack.c:1494 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1510 +#: builtin/index-pack.c:1523 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1558 builtin/index-pack.c:1561 -#: builtin/index-pack.c:1573 builtin/index-pack.c:1577 +#: builtin/index-pack.c:1571 builtin/index-pack.c:1574 +#: builtin/index-pack.c:1586 builtin/index-pack.c:1590 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1591 +#: builtin/index-pack.c:1604 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1595 builtin/index-pack.c:1605 +#: builtin/index-pack.c:1608 builtin/index-pack.c:1617 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1614 +#: builtin/index-pack.c:1625 msgid "--verify with no packfile name given" msgstr "" @@ -5916,72 +5926,70 @@ msgstr "" msgid "unable to move %s to %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 +#: builtin/init-db.c:439 msgid "cannot tell cwd" msgstr "" -#: builtin/init-db.c:467 +#: builtin/init-db.c:465 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [directory]" msgstr "" -#: builtin/init-db.c:490 +#: builtin/init-db.c:488 msgid "permissions" msgstr "" -#: builtin/init-db.c:491 +#: builtin/init-db.c:489 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155 +#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:172 msgid "be quiet" msgstr "" -#: builtin/init-db.c:525 builtin/init-db.c:530 +#: builtin/init-db.c:523 builtin/init-db.c:528 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:534 +#: builtin/init-db.c:532 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:556 +#: builtin/init-db.c:554 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:580 +#: builtin/init-db.c:578 msgid "Cannot access current working directory" msgstr "" -#: builtin/init-db.c:587 +#: builtin/init-db.c:585 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -5994,38 +6002,38 @@ msgstr "" msgid " or: git show [options] <object>..." msgstr "" -#: builtin/log.c:125 +#: builtin/log.c:127 msgid "suppress diff output" msgstr "" -#: builtin/log.c:126 +#: builtin/log.c:128 msgid "show source" msgstr "" -#: builtin/log.c:127 +#: builtin/log.c:129 msgid "Use mail map file" msgstr "" -#: builtin/log.c:128 +#: builtin/log.c:130 msgid "decorate options" msgstr "" -#: builtin/log.c:231 +#: builtin/log.c:229 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:473 builtin/log.c:565 +#: builtin/log.c:470 builtin/log.c:562 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:589 +#: builtin/log.c:586 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:689 +#: builtin/log.c:687 msgid "format.headers without value" msgstr "" @@ -6046,293 +6054,302 @@ msgstr "" msgid "Not a range." msgstr "" -#: builtin/log.c:911 +#: builtin/log.c:916 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:987 +#: builtin/log.c:995 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1015 +#: builtin/log.c:1023 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "" -#: builtin/log.c:1060 +#: builtin/log.c:1068 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1175 +#: builtin/log.c:1183 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1178 +#: builtin/log.c:1186 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1182 +#: builtin/log.c:1190 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1184 +#: builtin/log.c:1192 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1186 +#: builtin/log.c:1194 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1187 +#: builtin/log.c:1195 msgid "sfx" msgstr "" -#: builtin/log.c:1188 +#: builtin/log.c:1196 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1190 +#: builtin/log.c:1198 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1192 +#: builtin/log.c:1200 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1194 +#: builtin/log.c:1202 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1197 +#: builtin/log.c:1205 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1200 +#: builtin/log.c:1208 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1203 +#: builtin/log.c:1211 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1205 +#: builtin/log.c:1213 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1207 +#: builtin/log.c:1215 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1209 +#: builtin/log.c:1217 msgid "Messaging" msgstr "" -#: builtin/log.c:1210 +#: builtin/log.c:1218 msgid "header" msgstr "" -#: builtin/log.c:1211 +#: builtin/log.c:1219 msgid "add email header" msgstr "" -#: builtin/log.c:1212 builtin/log.c:1214 +#: builtin/log.c:1220 builtin/log.c:1222 msgid "email" msgstr "" -#: builtin/log.c:1212 +#: builtin/log.c:1220 msgid "add To: header" msgstr "" -#: builtin/log.c:1214 +#: builtin/log.c:1222 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1216 +#: builtin/log.c:1224 msgid "ident" msgstr "" -#: builtin/log.c:1217 +#: builtin/log.c:1225 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1219 +#: builtin/log.c:1227 msgid "message-id" msgstr "" -#: builtin/log.c:1220 +#: builtin/log.c:1228 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1221 builtin/log.c:1224 +#: builtin/log.c:1229 builtin/log.c:1232 msgid "boundary" msgstr "" -#: builtin/log.c:1222 +#: builtin/log.c:1230 msgid "attach the patch" msgstr "" -#: builtin/log.c:1225 +#: builtin/log.c:1233 msgid "inline the patch" msgstr "" -#: builtin/log.c:1229 +#: builtin/log.c:1237 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1231 +#: builtin/log.c:1239 msgid "signature" msgstr "" -#: builtin/log.c:1232 +#: builtin/log.c:1240 msgid "add a signature" msgstr "" -#: builtin/log.c:1233 +#: builtin/log.c:1242 +msgid "add a signature from a file" +msgstr "" + +#: builtin/log.c:1243 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1307 +#: builtin/log.c:1317 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1322 +#: builtin/log.c:1332 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1324 +#: builtin/log.c:1334 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1332 +#: builtin/log.c:1342 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1334 +#: builtin/log.c:1344 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1336 +#: builtin/log.c:1346 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1359 +#: builtin/log.c:1369 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1361 +#: builtin/log.c:1371 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1509 +#: builtin/log.c:1468 +#, c-format +msgid "unable to read signature file '%s'" +msgstr "" + +#: builtin/log.c:1531 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1558 +#: builtin/log.c:1579 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1613 +#: builtin/log.c:1634 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640 +#: builtin/log.c:1647 builtin/log.c:1649 builtin/log.c:1661 #, c-format msgid "Unknown commit %s" msgstr "" -#: builtin/ls-files.c:398 +#: builtin/ls-files.c:401 msgid "git ls-files [options] [<file>...]" msgstr "" -#: builtin/ls-files.c:455 +#: builtin/ls-files.c:458 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:457 +#: builtin/ls-files.c:460 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:459 +#: builtin/ls-files.c:462 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:461 +#: builtin/ls-files.c:464 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:466 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:468 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:467 +#: builtin/ls-files.c:470 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:473 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:472 +#: builtin/ls-files.c:475 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:474 +#: builtin/ls-files.c:477 msgid "show 'other' directories' name only" msgstr "" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:480 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:483 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:482 +#: builtin/ls-files.c:485 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:484 +#: builtin/ls-files.c:487 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:490 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:493 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:492 +#: builtin/ls-files.c:495 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:498 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:501 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:499 +#: builtin/ls-files.c:502 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:500 +#: builtin/ls-files.c:503 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:505 msgid "show debugging data" msgstr "" @@ -6443,7 +6460,7 @@ msgstr "" msgid "Verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89 +#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89 msgid "strategy" msgstr "" @@ -6516,7 +6533,7 @@ msgstr "" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:650 +#: builtin/merge.c:653 msgid "git write-tree failed to write a tree" msgstr "" @@ -6529,22 +6546,22 @@ msgstr "" msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:706 +#: builtin/merge.c:705 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:795 +#: builtin/merge.c:794 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:804 +#: builtin/merge.c:803 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:810 +#: builtin/merge.c:809 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6554,157 +6571,156 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:834 +#: builtin/merge.c:833 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:846 +#: builtin/merge.c:845 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:911 +#: builtin/merge.c:908 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:927 +#: builtin/merge.c:924 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:968 +#: builtin/merge.c:965 msgid "No current branch." msgstr "" -#: builtin/merge.c:970 +#: builtin/merge.c:967 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:972 +#: builtin/merge.c:969 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:977 +#: builtin/merge.c:974 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1133 +#: builtin/merge.c:1130 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1149 git-pull.sh:31 +#: builtin/merge.c:1146 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -#: builtin/merge.c:1152 git-pull.sh:34 +#: builtin/merge.c:1149 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: builtin/merge.c:1156 +#: builtin/merge.c:1153 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -#: builtin/merge.c:1159 +#: builtin/merge.c:1156 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1168 +#: builtin/merge.c:1165 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1177 +#: builtin/merge.c:1174 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1209 +#: builtin/merge.c:1206 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1212 +#: builtin/merge.c:1209 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1214 +#: builtin/merge.c:1211 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1219 +#: builtin/merge.c:1216 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1270 +#: builtin/merge.c:1267 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1273 +#: builtin/merge.c:1270 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#. 'N' -#: builtin/merge.c:1276 +#: builtin/merge.c:1273 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1279 +#: builtin/merge.c:1276 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1363 +#: builtin/merge.c:1357 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1402 +#: builtin/merge.c:1396 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1409 +#: builtin/merge.c:1403 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1441 +#: builtin/merge.c:1435 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1464 builtin/merge.c:1543 +#: builtin/merge.c:1458 builtin/merge.c:1537 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1468 +#: builtin/merge.c:1462 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1534 +#: builtin/merge.c:1528 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1536 +#: builtin/merge.c:1530 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1545 +#: builtin/merge.c:1539 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1557 +#: builtin/merge.c:1551 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -6787,19 +6803,19 @@ 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 "" @@ -6846,87 +6862,87 @@ msgstr "" msgid "Huh? %.*s is in index?" msgstr "" -#: builtin/mv.c:168 +#: builtin/mv.c:169 msgid "source directory is empty" msgstr "" -#: builtin/mv.c:200 +#: builtin/mv.c:205 msgid "not under version control" msgstr "" -#: builtin/mv.c:202 +#: builtin/mv.c:208 msgid "destination exists" msgstr "" -#: builtin/mv.c:210 +#: builtin/mv.c:216 #, c-format msgid "overwriting '%s'" msgstr "" -#: builtin/mv.c:213 +#: builtin/mv.c:219 msgid "Cannot overwrite" msgstr "" -#: builtin/mv.c:216 +#: builtin/mv.c:222 msgid "multiple sources for the same target" msgstr "" -#: builtin/mv.c:218 +#: builtin/mv.c:224 msgid "destination directory does not exist" msgstr "" -#: builtin/mv.c:233 +#: builtin/mv.c:244 #, c-format msgid "%s, source=%s, destination=%s" msgstr "" -#: builtin/mv.c:243 +#: builtin/mv.c:254 #, c-format msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328 +#: builtin/mv.c:257 builtin/remote.c:725 builtin/repack.c:358 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:258 +#: builtin/name-rev.c:255 msgid "git name-rev [options] <commit>..." msgstr "" -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:256 msgid "git name-rev [options] --all" msgstr "" -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:257 msgid "git name-rev [options] --stdin" msgstr "" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:310 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:315 +#: builtin/name-rev.c:312 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:317 +#: builtin/name-rev.c:314 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:315 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:316 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:325 +#: builtin/name-rev.c:322 msgid "dereference tags in the input (internal use)" msgstr "" @@ -7049,7 +7065,7 @@ msgstr "" msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:167 builtin/tag.c:341 +#: builtin/notes.c:167 builtin/tag.c:477 #, c-format msgid "could not create file '%s'" msgstr "" @@ -7058,7 +7074,7 @@ msgstr "" msgid "Please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:207 builtin/notes.c:844 +#: builtin/notes.c:207 builtin/notes.c:848 #, c-format msgid "Removing note for object %s\n" msgstr "" @@ -7072,20 +7088,20 @@ msgstr "" msgid "The note contents has been left in %s" msgstr "" -#: builtin/notes.c:248 builtin/tag.c:537 +#: builtin/notes.c:248 builtin/tag.c:692 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:250 builtin/tag.c:540 +#: builtin/notes.c:250 builtin/tag.c:695 #, c-format msgid "could not open or read '%s'" msgstr "" -#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318 -#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515 -#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637 -#: builtin/notes.c:839 builtin/tag.c:553 +#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322 +#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519 +#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641 +#: builtin/notes.c:843 builtin/tag.c:708 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" @@ -7095,304 +7111,333 @@ msgstr "" msgid "Failed to read object '%s'." msgstr "" -#: builtin/notes.c:312 +#: builtin/notes.c:276 +#, c-format +msgid "Cannot read note data from non-blob object '%s'." +msgstr "" + +#: builtin/notes.c:316 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/notes.c:327 +#: builtin/notes.c:331 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498 -#: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630 -#: builtin/notes.c:904 +#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502 +#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634 +#: builtin/notes.c:908 msgid "too many parameters" msgstr "" -#: builtin/notes.c:384 builtin/notes.c:643 +#: builtin/notes.c:388 builtin/notes.c:647 #, c-format msgid "No note found for object %s." msgstr "" -#: builtin/notes.c:406 builtin/notes.c:563 +#: builtin/notes.c:410 builtin/notes.c:567 msgid "note contents as a string" msgstr "" -#: builtin/notes.c:409 builtin/notes.c:566 +#: builtin/notes.c:413 builtin/notes.c:570 msgid "note contents in a file" msgstr "" -#: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568 -#: builtin/notes.c:571 builtin/tag.c:474 +#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572 +#: builtin/notes.c:575 builtin/tag.c:627 msgid "object" msgstr "" -#: builtin/notes.c:412 builtin/notes.c:569 +#: builtin/notes.c:416 builtin/notes.c:573 msgid "reuse and edit specified note object" msgstr "" -#: builtin/notes.c:415 builtin/notes.c:572 +#: builtin/notes.c:419 builtin/notes.c:576 msgid "reuse specified note object" msgstr "" -#: builtin/notes.c:417 builtin/notes.c:485 +#: builtin/notes.c:421 builtin/notes.c:489 msgid "replace existing notes" msgstr "" -#: builtin/notes.c:451 +#: builtin/notes.c:455 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:456 builtin/notes.c:533 +#: builtin/notes.c:460 builtin/notes.c:537 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:486 +#: builtin/notes.c:490 msgid "read objects from stdin" msgstr "" -#: builtin/notes.c:488 +#: builtin/notes.c:492 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" -#: builtin/notes.c:506 +#: builtin/notes.c:510 msgid "too few parameters" msgstr "" -#: builtin/notes.c:527 +#: builtin/notes.c:531 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:539 +#: builtin/notes.c:543 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:588 +#: builtin/notes.c:592 #, 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:735 +#: builtin/notes.c:739 msgid "General options" msgstr "" -#: builtin/notes.c:737 +#: builtin/notes.c:741 msgid "Merge options" msgstr "" -#: builtin/notes.c:739 +#: builtin/notes.c:743 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -#: builtin/notes.c:741 +#: builtin/notes.c:745 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:743 +#: builtin/notes.c:747 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:745 +#: builtin/notes.c:749 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:747 +#: builtin/notes.c:751 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:842 +#: builtin/notes.c:846 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:854 +#: builtin/notes.c:858 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:857 +#: builtin/notes.c:861 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:938 -msgid "notes_ref" +#: builtin/notes.c:942 +msgid "notes-ref" msgstr "" -#: builtin/notes.c:939 +#: builtin/notes.c:943 msgid "use notes from <notes_ref>" msgstr "" -#: builtin/notes.c:974 builtin/remote.c:1593 +#: builtin/notes.c:978 builtin/remote.c:1616 #, c-format msgid "Unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:23 +#: builtin/pack-objects.c:25 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" msgstr "" -#: builtin/pack-objects.c:24 +#: builtin/pack-objects.c:26 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" -#: builtin/pack-objects.c:184 builtin/pack-objects.c:187 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:2396 +#: builtin/pack-objects.c:771 +msgid "Writing objects" +msgstr "" + +#: builtin/pack-objects.c:1012 +msgid "disabling bitmap writing, as some objects are not being packed" +msgstr "" + +#: builtin/pack-objects.c:2174 +msgid "Compressing objects" +msgstr "" + +#: builtin/pack-objects.c:2526 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2400 +#: builtin/pack-objects.c:2530 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2423 +#: builtin/pack-objects.c:2553 #, c-format msgid "option %s does not accept negative form" msgstr "" -#: builtin/pack-objects.c:2427 +#: builtin/pack-objects.c:2557 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "" -#: builtin/pack-objects.c:2446 +#: builtin/pack-objects.c:2576 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2448 +#: builtin/pack-objects.c:2578 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2450 +#: builtin/pack-objects.c:2580 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2453 +#: builtin/pack-objects.c:2583 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2454 +#: builtin/pack-objects.c:2584 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2455 +#: builtin/pack-objects.c:2585 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2458 +#: builtin/pack-objects.c:2588 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2460 +#: builtin/pack-objects.c:2590 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2462 +#: builtin/pack-objects.c:2592 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2464 +#: builtin/pack-objects.c:2594 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2466 +#: builtin/pack-objects.c:2596 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2468 +#: builtin/pack-objects.c:2598 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2470 +#: builtin/pack-objects.c:2600 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2472 +#: builtin/pack-objects.c:2602 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2474 +#: builtin/pack-objects.c:2604 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2476 +#: builtin/pack-objects.c:2606 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2478 +#: builtin/pack-objects.c:2608 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2480 +#: builtin/pack-objects.c:2610 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2482 +#: builtin/pack-objects.c:2612 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2485 +#: builtin/pack-objects.c:2615 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2488 +#: builtin/pack-objects.c:2618 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2491 +#: builtin/pack-objects.c:2621 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2493 +#: builtin/pack-objects.c:2623 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2495 +#: builtin/pack-objects.c:2625 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2496 parse-options.h:143 +#: builtin/pack-objects.c:2626 parse-options.h:140 msgid "time" msgstr "" -#: builtin/pack-objects.c:2497 +#: builtin/pack-objects.c:2627 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2500 +#: builtin/pack-objects.c:2630 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2502 +#: builtin/pack-objects.c:2632 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2504 +#: builtin/pack-objects.c:2634 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2506 +#: builtin/pack-objects.c:2636 msgid "do not hide commits by grafts" msgstr "" +#: builtin/pack-objects.c:2638 +msgid "use a bitmap index if available to speed up counting objects" +msgstr "" + +#: builtin/pack-objects.c:2640 +msgid "write a bitmap index together with the pack index" +msgstr "" + +#: builtin/pack-objects.c:2719 +msgid "Counting objects" +msgstr "" + #: builtin/pack-refs.c:6 msgid "git pack-refs [options]" msgstr "" @@ -7409,6 +7454,10 @@ msgstr "" msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" msgstr "" +#: builtin/prune-packed.c:49 +msgid "Removing duplicate objects" +msgstr "" + #: builtin/prune.c:12 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "" @@ -7429,21 +7478,21 @@ msgstr "" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/push.c:86 +#: builtin/push.c:85 msgid "tag shorthand without <tag>" msgstr "" -#: builtin/push.c:96 +#: builtin/push.c:95 msgid "--delete only accepts plain target ref names" msgstr "" -#: builtin/push.c:141 +#: builtin/push.c:139 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" -#: builtin/push.c:144 +#: builtin/push.c:142 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -7458,7 +7507,7 @@ msgid "" "%s" msgstr "" -#: builtin/push.c:159 +#: builtin/push.c:157 #, c-format msgid "" "You are not currently on a branch.\n" @@ -7468,7 +7517,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -#: builtin/push.c:173 +#: builtin/push.c:171 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -7477,12 +7526,12 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" -#: builtin/push.c:181 +#: builtin/push.c:179 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:184 +#: builtin/push.c:182 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -7490,11 +7539,11 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:207 +#: 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" @@ -7505,7 +7554,7 @@ msgid "" "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" -"In Git 2.0, Git will default to the more conservative 'simple'\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" @@ -7515,12 +7564,12 @@ msgid "" "'current' instead of 'simple' if you sometimes use older versions of Git)" msgstr "" -#: builtin/push.c:274 +#: builtin/push.c:272 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:281 +#: builtin/push.c:279 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -7528,15 +7577,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:287 -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." -msgstr "" - -#: builtin/push.c:293 +#: builtin/push.c:285 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -7544,7 +7585,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:299 +#: builtin/push.c:291 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -7553,33 +7594,33 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:306 +#: builtin/push.c:298 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" -#: builtin/push.c:309 +#: 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:375 +#: builtin/push.c:360 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:379 +#: builtin/push.c:364 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:412 +#: builtin/push.c:394 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:413 +#: builtin/push.c:395 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -7592,95 +7633,95 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:428 +#: builtin/push.c:410 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:429 +#: builtin/push.c:411 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:434 +#: builtin/push.c:416 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:435 +#: builtin/push.c:417 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:440 +#: builtin/push.c:422 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:500 +#: builtin/push.c:482 msgid "repository" msgstr "" -#: builtin/push.c:501 +#: builtin/push.c:483 msgid "push all refs" msgstr "" -#: builtin/push.c:502 +#: builtin/push.c:484 msgid "mirror all refs" msgstr "" -#: builtin/push.c:504 +#: builtin/push.c:486 msgid "delete refs" msgstr "" -#: builtin/push.c:505 +#: builtin/push.c:487 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:508 +#: builtin/push.c:490 msgid "force updates" msgstr "" -#: builtin/push.c:510 +#: builtin/push.c:492 msgid "refname>:<expect" msgstr "" -#: builtin/push.c:511 +#: builtin/push.c:493 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:513 +#: builtin/push.c:495 msgid "check" msgstr "" -#: builtin/push.c:514 +#: builtin/push.c:496 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:516 +#: builtin/push.c:498 msgid "use thin pack" msgstr "" -#: builtin/push.c:517 builtin/push.c:518 +#: builtin/push.c:499 builtin/push.c:500 msgid "receive pack program" msgstr "" -#: builtin/push.c:519 +#: builtin/push.c:501 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:522 +#: builtin/push.c:504 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:524 +#: builtin/push.c:506 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:525 +#: builtin/push.c:507 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:535 +#: builtin/push.c:517 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:537 +#: builtin/push.c:519 msgid "--delete doesn't make sense without any refs" msgstr "" @@ -7896,12 +7937,12 @@ msgstr "" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -#: builtin/remote.c:185 builtin/remote.c:641 +#: builtin/remote.c:185 builtin/remote.c:640 #, c-format msgid "remote %s already exists." msgstr "" -#: builtin/remote.c:189 builtin/remote.c:645 +#: builtin/remote.c:189 builtin/remote.c:644 #, c-format msgid "'%s' is not a valid remote name" msgstr "" @@ -7911,45 +7952,45 @@ msgstr "" msgid "Could not setup master '%s'" msgstr "" -#: builtin/remote.c:289 +#: builtin/remote.c:288 #, c-format msgid "more than one %s" msgstr "" -#: builtin/remote.c:334 +#: builtin/remote.c:333 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" -#: builtin/remote.c:435 builtin/remote.c:443 +#: builtin/remote.c:434 builtin/remote.c:442 msgid "(matching)" msgstr "" -#: builtin/remote.c:447 +#: builtin/remote.c:446 msgid "(delete)" msgstr "" -#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 +#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 #, c-format msgid "Could not append '%s' to '%s'" msgstr "" -#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885 +#: builtin/remote.c:633 builtin/remote.c:794 builtin/remote.c:894 #, c-format msgid "No such remote: %s" msgstr "" -#: builtin/remote.c:651 +#: builtin/remote.c:650 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" -#: builtin/remote.c:657 builtin/remote.c:794 +#: builtin/remote.c:656 builtin/remote.c:846 #, c-format msgid "Could not remove config section '%s'" msgstr "" -#: builtin/remote.c:672 +#: builtin/remote.c:671 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -7957,32 +7998,32 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "" -#: builtin/remote.c:678 +#: builtin/remote.c:677 #, c-format msgid "Could not append '%s'" msgstr "" -#: builtin/remote.c:689 +#: builtin/remote.c:688 #, c-format msgid "Could not set '%s'" msgstr "" -#: builtin/remote.c:711 +#: builtin/remote.c:710 #, c-format msgid "deleting '%s' failed" msgstr "" -#: builtin/remote.c:745 +#: builtin/remote.c:744 #, c-format msgid "creating '%s' failed" msgstr "" -#: builtin/remote.c:759 +#: builtin/remote.c:765 #, c-format msgid "Could not remove branch %s" msgstr "" -#: builtin/remote.c:829 +#: builtin/remote.c:832 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -7992,355 +8033,419 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:938 +#: builtin/remote.c:947 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr "" -#: builtin/remote.c:941 +#: builtin/remote.c:950 msgid " tracked" msgstr "" -#: builtin/remote.c:943 +#: builtin/remote.c:952 msgid " stale (use 'git remote prune' to remove)" msgstr "" -#: builtin/remote.c:945 +#: builtin/remote.c:954 msgid " ???" msgstr "" -#: builtin/remote.c:986 +#: builtin/remote.c:995 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -#: builtin/remote.c:993 +#: builtin/remote.c:1002 #, c-format msgid "rebases onto remote %s" msgstr "" -#: builtin/remote.c:996 +#: builtin/remote.c:1005 #, c-format msgid " merges with remote %s" msgstr "" -#: builtin/remote.c:997 +#: builtin/remote.c:1006 msgid " and with remote" msgstr "" -#: builtin/remote.c:999 +#: builtin/remote.c:1008 #, c-format msgid "merges with remote %s" msgstr "" -#: builtin/remote.c:1000 +#: builtin/remote.c:1009 msgid " and with remote" msgstr "" -#: builtin/remote.c:1046 +#: builtin/remote.c:1055 msgid "create" msgstr "" -#: builtin/remote.c:1049 +#: builtin/remote.c:1058 msgid "delete" msgstr "" -#: builtin/remote.c:1053 +#: builtin/remote.c:1062 msgid "up to date" msgstr "" -#: builtin/remote.c:1056 +#: builtin/remote.c:1065 msgid "fast-forwardable" msgstr "" -#: builtin/remote.c:1059 +#: builtin/remote.c:1068 msgid "local out of date" msgstr "" -#: builtin/remote.c:1066 +#: builtin/remote.c:1075 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr "" -#: builtin/remote.c:1069 +#: builtin/remote.c:1078 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr "" -#: builtin/remote.c:1073 +#: builtin/remote.c:1082 #, c-format msgid " %-*s forces to %s" msgstr "" -#: builtin/remote.c:1076 +#: builtin/remote.c:1085 #, c-format msgid " %-*s pushes to %s" msgstr "" -#: builtin/remote.c:1144 +#: builtin/remote.c:1153 msgid "do not query remotes" msgstr "" -#: builtin/remote.c:1171 +#: builtin/remote.c:1180 #, c-format msgid "* remote %s" msgstr "" -#: builtin/remote.c:1172 +#: builtin/remote.c:1181 #, c-format msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1173 builtin/remote.c:1318 +#: builtin/remote.c:1182 builtin/remote.c:1329 msgid "(no URL)" msgstr "" -#: builtin/remote.c:1182 builtin/remote.c:1184 +#: builtin/remote.c:1191 builtin/remote.c:1193 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190 +#: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1192 +#: builtin/remote.c:1201 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1204 +#: builtin/remote.c:1213 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1207 builtin/remote.c:1234 +#: builtin/remote.c:1216 builtin/remote.c:1243 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1216 +#: builtin/remote.c:1225 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1224 +#: builtin/remote.c:1233 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1231 +#: builtin/remote.c:1240 #, 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:1252 +#: builtin/remote.c:1261 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1254 +#: builtin/remote.c:1263 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1269 +#: builtin/remote.c:1278 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1271 +#: builtin/remote.c:1280 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1281 +#: builtin/remote.c:1290 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1289 +#: builtin/remote.c:1298 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1291 +#: builtin/remote.c:1300 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1307 +#: builtin/remote.c:1318 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1308 +#: builtin/remote.c:1319 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1314 +#: builtin/remote.c:1325 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1315 +#: builtin/remote.c:1326 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1328 +#: builtin/remote.c:1349 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1331 +#: builtin/remote.c:1352 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1374 +#: builtin/remote.c:1397 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1440 builtin/remote.c:1514 +#: builtin/remote.c:1463 builtin/remote.c:1537 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1460 +#: builtin/remote.c:1483 msgid "add branch" msgstr "" -#: builtin/remote.c:1467 +#: builtin/remote.c:1490 msgid "no remote specified" msgstr "" -#: builtin/remote.c:1489 +#: builtin/remote.c:1512 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1491 +#: builtin/remote.c:1514 msgid "add URL" msgstr "" -#: builtin/remote.c:1493 +#: builtin/remote.c:1516 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1500 +#: builtin/remote.c:1523 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1540 +#: builtin/remote.c:1563 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1548 +#: builtin/remote.c:1571 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1550 +#: builtin/remote.c:1573 msgid "Will not delete all non-push URLs" msgstr "" -#: builtin/remote.c:1564 +#: builtin/remote.c:1587 msgid "be verbose; must be placed before a subcommand" msgstr "" -#: builtin/repack.c:15 +#: builtin/repack.c:17 msgid "git repack [options]" msgstr "" -#: builtin/repack.c:143 +#: builtin/repack.c:160 msgid "pack everything in a single pack" msgstr "" -#: builtin/repack.c:145 +#: builtin/repack.c:162 msgid "same as -a, and turn unreachable objects loose" msgstr "" -#: builtin/repack.c:148 +#: builtin/repack.c:165 msgid "remove redundant packs, and run git-prune-packed" msgstr "" -#: builtin/repack.c:150 +#: builtin/repack.c:167 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "" -#: builtin/repack.c:152 +#: builtin/repack.c:169 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" -#: builtin/repack.c:154 +#: builtin/repack.c:171 msgid "do not run git-update-server-info" msgstr "" -#: builtin/repack.c:157 +#: builtin/repack.c:174 msgid "pass --local to git-pack-objects" msgstr "" -#: builtin/repack.c:158 +#: builtin/repack.c:176 +msgid "write bitmap index" +msgstr "" + +#: builtin/repack.c:177 msgid "approxidate" msgstr "" -#: builtin/repack.c:159 +#: builtin/repack.c:178 msgid "with -A, do not loosen objects older than this" msgstr "" -#: builtin/repack.c:161 +#: builtin/repack.c:180 msgid "size of the window used for delta compression" msgstr "" -#: builtin/repack.c:162 builtin/repack.c:166 +#: builtin/repack.c:181 builtin/repack.c:185 msgid "bytes" msgstr "" -#: builtin/repack.c:163 +#: builtin/repack.c:182 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -#: builtin/repack.c:165 +#: builtin/repack.c:184 msgid "limits the maximum delta depth" msgstr "" -#: builtin/repack.c:167 +#: builtin/repack.c:186 msgid "maximum size of each packfile" msgstr "" -#: builtin/repack.c:343 +#: 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:17 +#: 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 +#: builtin/replace.c:23 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "" -#: builtin/replace.c:174 +#: builtin/replace.c:322 builtin/replace.c:360 builtin/replace.c:388 +#, c-format +msgid "Not a valid object name: '%s'" +msgstr "" + +#: builtin/replace.c:352 +#, c-format +msgid "bad mergetag in commit '%s'" +msgstr "" + +#: builtin/replace.c:354 +#, c-format +msgid "malformed mergetag in commit '%s'" +msgstr "" + +#: builtin/replace.c:365 +#, c-format +msgid "" +"original commit '%s' contains mergetag '%s' that is discarded; use --edit " +"instead of --graft" +msgstr "" + +#: builtin/replace.c:398 +#, c-format +msgid "the original commit '%s' has a gpg signature." +msgstr "" + +#: builtin/replace.c:399 +msgid "the signature will be removed in the replacement commit!" +msgstr "" + +#: builtin/replace.c:405 +#, c-format +msgid "could not write replacement commit for: '%s'" +msgstr "" + +#: builtin/replace.c:429 msgid "list replace refs" msgstr "" -#: builtin/replace.c:175 +#: builtin/replace.c:430 msgid "delete replace refs" msgstr "" -#: builtin/replace.c:176 +#: builtin/replace.c:431 +msgid "edit existing object" +msgstr "" + +#: builtin/replace.c:432 +msgid "change a commit's parents" +msgstr "" + +#: builtin/replace.c:433 msgid "replace the ref if it exists" msgstr "" -#: builtin/replace.c:177 +#: builtin/replace.c:434 +msgid "do not pretty-print contents for --edit" +msgstr "" + +#: builtin/replace.c:435 msgid "use this format" msgstr "" @@ -8403,94 +8508,102 @@ msgstr "" msgid "HEAD is now at %s" msgstr "" -#: builtin/reset.c:172 +#: builtin/reset.c:182 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:262 +#: builtin/reset.c:275 msgid "be quiet, only report errors" msgstr "" -#: builtin/reset.c:264 +#: builtin/reset.c:277 msgid "reset HEAD and index" msgstr "" -#: builtin/reset.c:265 +#: builtin/reset.c:278 msgid "reset only HEAD" msgstr "" -#: builtin/reset.c:267 builtin/reset.c:269 +#: builtin/reset.c:280 builtin/reset.c:282 msgid "reset HEAD, index and working tree" msgstr "" -#: builtin/reset.c:271 +#: builtin/reset.c:284 msgid "reset HEAD but keep local changes" msgstr "" -#: builtin/reset.c:289 +#: builtin/reset.c:287 +msgid "record only the fact that removed paths will be added later" +msgstr "" + +#: builtin/reset.c:304 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "" -#: builtin/reset.c:292 builtin/reset.c:300 +#: builtin/reset.c:307 builtin/reset.c:315 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/reset.c:297 +#: builtin/reset.c:312 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "" -#: builtin/reset.c:306 +#: builtin/reset.c:321 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:315 +#: builtin/reset.c:330 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:317 +#: builtin/reset.c:332 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:327 +#: builtin/reset.c:342 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" -#: builtin/reset.c:344 +#: builtin/reset.c:346 +msgid "-N can only be used with --mixed" +msgstr "" + +#: builtin/reset.c:363 msgid "Unstaged changes after reset:" msgstr "" -#: builtin/reset.c:350 +#: builtin/reset.c:369 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "" -#: builtin/reset.c:355 +#: builtin/reset.c:373 msgid "Could not write new index file." msgstr "" -#: builtin/rev-parse.c:359 +#: builtin/rev-parse.c:360 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "" -#: builtin/rev-parse.c:364 +#: builtin/rev-parse.c:365 msgid "keep the `--` passed as an arg" msgstr "" -#: builtin/rev-parse.c:366 +#: builtin/rev-parse.c:367 msgid "stop parsing after the first non-option argument" msgstr "" -#: builtin/rev-parse.c:369 +#: builtin/rev-parse.c:370 msgid "output in stuck long form" msgstr "" -#: builtin/rev-parse.c:486 +#: builtin/rev-parse.c:498 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -8556,35 +8669,35 @@ msgstr "" msgid "option for merge strategy" msgstr "" -#: builtin/revert.c:102 +#: builtin/revert.c:104 msgid "append commit name" msgstr "" -#: builtin/revert.c:103 +#: builtin/revert.c:105 msgid "allow fast-forward" msgstr "" -#: builtin/revert.c:104 +#: builtin/revert.c:106 msgid "preserve initially empty commits" msgstr "" -#: builtin/revert.c:105 +#: builtin/revert.c:107 msgid "allow commits with empty messages" msgstr "" -#: builtin/revert.c:106 +#: builtin/revert.c:108 msgid "keep redundant, empty commits" msgstr "" -#: builtin/revert.c:110 +#: builtin/revert.c:112 msgid "program error" msgstr "" -#: builtin/revert.c:195 +#: builtin/revert.c:197 msgid "revert failed" msgstr "" -#: builtin/revert.c:210 +#: builtin/revert.c:212 msgid "cherry-pick failed" msgstr "" @@ -8839,11 +8952,11 @@ msgstr "" msgid "shorten ref output" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 msgid "reason" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 msgid "reason of the update" msgstr "" @@ -8866,299 +8979,327 @@ 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" -"Write a tag message\n" +"Write a message for tag:\n" +" %s\n" "Lines starting with '%c' will be ignored.\n" msgstr "" -#: builtin/tag.c:253 +#: builtin/tag.c:347 #, c-format msgid "" "\n" -"Write a tag message\n" +"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" msgstr "" -#: builtin/tag.c:292 +#: 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:294 +#: builtin/tag.c:430 msgid "unable to write tag file" msgstr "" -#: builtin/tag.c:319 +#: builtin/tag.c:455 msgid "bad object type." msgstr "" -#: builtin/tag.c:332 +#: builtin/tag.c:468 msgid "tag header too big." msgstr "" -#: builtin/tag.c:368 +#: builtin/tag.c:504 msgid "no tag message?" msgstr "" -#: builtin/tag.c:374 +#: builtin/tag.c:510 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:423 +#: builtin/tag.c:559 msgid "switch 'points-at' requires an object" msgstr "" -#: builtin/tag.c:425 +#: builtin/tag.c:561 #, c-format msgid "malformed object name '%s'" msgstr "" -#: builtin/tag.c:445 +#: builtin/tag.c:588 msgid "list tag names" msgstr "" -#: builtin/tag.c:447 +#: builtin/tag.c:590 msgid "print <n> lines of each tag message" msgstr "" -#: builtin/tag.c:449 +#: builtin/tag.c:592 msgid "delete tags" msgstr "" -#: builtin/tag.c:450 +#: builtin/tag.c:593 msgid "verify tags" msgstr "" -#: builtin/tag.c:452 +#: builtin/tag.c:595 msgid "Tag creation options" msgstr "" -#: builtin/tag.c:454 +#: builtin/tag.c:597 msgid "annotated tag, needs a message" msgstr "" -#: builtin/tag.c:456 +#: builtin/tag.c:599 msgid "tag message" msgstr "" -#: builtin/tag.c:458 +#: builtin/tag.c:601 msgid "annotated and GPG-signed tag" msgstr "" -#: builtin/tag.c:462 +#: builtin/tag.c:605 msgid "use another key to sign the tag" msgstr "" -#: builtin/tag.c:463 +#: builtin/tag.c:606 msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:464 +#: builtin/tag.c:607 msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:466 +#: builtin/tag.c:609 +msgid "sort tags" +msgstr "" + +#: builtin/tag.c:613 msgid "Tag listing options" msgstr "" -#: builtin/tag.c:469 +#: builtin/tag.c:616 builtin/tag.c:622 msgid "print only tags that contain the commit" msgstr "" -#: builtin/tag.c:475 +#: builtin/tag.c:628 msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:501 +#: builtin/tag.c:654 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:518 +#: builtin/tag.c:666 +msgid "--sort and -n are incompatible" +msgstr "" + +#: builtin/tag.c:673 msgid "-n option is only allowed with -l." msgstr "" -#: builtin/tag.c:520 +#: builtin/tag.c:675 msgid "--contains option is only allowed with -l." msgstr "" -#: builtin/tag.c:522 +#: builtin/tag.c:677 msgid "--points-at option is only allowed with -l." msgstr "" -#: builtin/tag.c:530 +#: builtin/tag.c:685 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:550 +#: builtin/tag.c:705 msgid "too many params" msgstr "" -#: builtin/tag.c:556 +#: builtin/tag.c:711 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:561 +#: builtin/tag.c:716 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:579 +#: builtin/tag.c:734 #, c-format msgid "%s: cannot lock the ref" msgstr "" -#: builtin/tag.c:581 +#: builtin/tag.c:736 #, c-format msgid "%s: cannot update the ref" msgstr "" -#: builtin/tag.c:583 +#: builtin/tag.c:738 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" +#: builtin/unpack-objects.c:483 +msgid "Unpacking objects" +msgstr "" + #: builtin/update-index.c:402 msgid "git update-index [options] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:720 +#: builtin/update-index.c:755 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:723 +#: builtin/update-index.c:758 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:726 +#: builtin/update-index.c:761 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:728 +#: builtin/update-index.c:763 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:730 +#: builtin/update-index.c:765 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:732 +#: builtin/update-index.c:767 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:735 +#: builtin/update-index.c:770 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:739 +#: builtin/update-index.c:774 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:743 -msgid "<mode> <object> <path>" +#: builtin/update-index.c:778 +msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:744 +#: builtin/update-index.c:779 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:748 +#: builtin/update-index.c:783 msgid "(+/-)x" msgstr "" -#: builtin/update-index.c:749 +#: builtin/update-index.c:784 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/update-index.c:753 +#: builtin/update-index.c:788 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:756 +#: builtin/update-index.c:791 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:759 +#: builtin/update-index.c:794 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:762 +#: builtin/update-index.c:797 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:765 +#: builtin/update-index.c:800 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:767 +#: builtin/update-index.c:802 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:769 +#: builtin/update-index.c:804 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:771 +#: builtin/update-index.c:806 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:775 +#: builtin/update-index.c:810 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:779 +#: builtin/update-index.c:814 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:783 +#: builtin/update-index.c:818 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:787 +#: builtin/update-index.c:822 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:790 +#: builtin/update-index.c:825 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:792 +#: builtin/update-index.c:827 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:796 +#: builtin/update-index.c:831 msgid "write index in this format" msgstr "" +#: builtin/update-index.c:833 +msgid "enable or disable split index" +msgstr "" + #: builtin/update-ref.c:9 msgid "git update-ref [options] -d <refname> [<oldval>]" msgstr "" @@ -9171,19 +9312,19 @@ msgstr "" msgid "git update-ref [options] --stdin [-z]" msgstr "" -#: builtin/update-ref.c:255 +#: builtin/update-ref.c:350 msgid "delete the reference" msgstr "" -#: builtin/update-ref.c:257 +#: builtin/update-ref.c:352 msgid "update <refname> not the one it points to" msgstr "" -#: builtin/update-ref.c:258 +#: builtin/update-ref.c:353 msgid "stdin has NUL-terminated arguments" msgstr "" -#: builtin/update-ref.c:259 +#: builtin/update-ref.c:354 msgid "read updates from stdin" msgstr "" @@ -9195,15 +9336,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:55 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." msgstr "" -#: builtin/verify-pack.c:66 +#: builtin/verify-pack.c:65 msgid "verbose" msgstr "" -#: builtin/verify-pack.c:68 +#: builtin/verify-pack.c:67 msgid "show statistics only" msgstr "" @@ -9238,23 +9387,23 @@ msgid "" "to read about a specific subcommand or concept." msgstr "" -#: parse-options.h:146 -msgid "expiry date" +#: parse-options.h:143 +msgid "expiry-date" msgstr "" -#: parse-options.h:161 +#: parse-options.h:158 msgid "no-op (backward compatibility)" msgstr "" -#: parse-options.h:235 +#: parse-options.h:232 msgid "be more verbose" msgstr "" -#: parse-options.h:237 +#: parse-options.h:234 msgid "be more quiet" msgstr "" -#: parse-options.h:243 +#: parse-options.h:240 msgid "use <n> digits to display SHA-1s" msgstr "" @@ -9342,17 +9491,17 @@ msgstr "" msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" -#: git-am.sh:50 +#: 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 --continue\".\n" @@ -9360,77 +9509,77 @@ msgid "" "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:479 +#: git-am.sh:486 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" -#: git-am.sh:484 +#: git-am.sh:491 msgid "Please make up your mind. --skip or --abort?" msgstr "" -#: git-am.sh:520 +#: git-am.sh:527 #, sh-format msgid "" "Stray $dotest directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: git-am.sh:528 +#: git-am.sh:535 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: git-am.sh:594 +#: git-am.sh:601 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "" -#: git-am.sh:698 +#: git-am.sh:705 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -9438,60 +9587,60 @@ msgid "" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" -#: git-am.sh:725 +#: git-am.sh:732 msgid "Patch does not have a valid e-mail address." msgstr "" -#: git-am.sh:772 +#: git-am.sh:779 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: git-am.sh:776 +#: 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:783 +#: git-am.sh:790 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "" -#: git-am.sh:819 +#: git-am.sh:826 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "" -#: git-am.sh:840 +#: 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:848 +#: 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:864 +#: git-am.sh:871 msgid "No changes -- Patch already applied." msgstr "" -#: git-am.sh:874 +#: git-am.sh:881 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "" -#: git-am.sh:877 +#: git-am.sh:884 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" " $dotest/patch" msgstr "" -#: git-am.sh:895 +#: git-am.sh:902 msgid "applying to an empty history" msgstr "" @@ -9557,8 +9706,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 "" @@ -9650,15 +9797,11 @@ msgstr "" msgid "Pull is not possible because you have unmerged files." msgstr "" -#: git-pull.sh:223 +#: 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:247 +#: git-pull.sh:269 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -9666,15 +9809,15 @@ msgid "" "Warning: commit $orig_head." msgstr "" -#: git-pull.sh:272 +#: git-pull.sh:294 msgid "Cannot merge multiple branches into empty head" msgstr "" -#: git-pull.sh:276 +#: git-pull.sh:298 msgid "Cannot rebase onto multiple branches" msgstr "" -#: git-rebase.sh:55 +#: 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" @@ -9682,58 +9825,58 @@ msgid "" "\"." msgstr "" -#: git-rebase.sh:158 +#: git-rebase.sh:165 msgid "Applied autostash." msgstr "" -#: git-rebase.sh:161 +#: git-rebase.sh:168 #, sh-format msgid "Cannot store $stash_sha1" msgstr "" -#: git-rebase.sh:162 +#: 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:201 +#: git-rebase.sh:208 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: git-rebase.sh:206 +#: git-rebase.sh:213 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" -#: git-rebase.sh:346 +#: git-rebase.sh:351 msgid "The --exec option must be used with the --interactive option" msgstr "" -#: git-rebase.sh:351 +#: git-rebase.sh:356 msgid "No rebase in progress?" msgstr "" -#: git-rebase.sh:362 +#: git-rebase.sh:367 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: git-rebase.sh:369 +#: git-rebase.sh:374 msgid "Cannot read HEAD" msgstr "" -#: git-rebase.sh:372 +#: 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:390 +#: git-rebase.sh:395 #, sh-format msgid "Could not move back to $head_name" msgstr "" -#: git-rebase.sh:409 +#: git-rebase.sh:414 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -9746,65 +9889,64 @@ msgid "" "valuable there." msgstr "" -#: git-rebase.sh:456 +#: git-rebase.sh:465 #, sh-format msgid "invalid upstream $upstream_name" msgstr "" -#: git-rebase.sh:480 +#: git-rebase.sh:489 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" -#: git-rebase.sh:483 git-rebase.sh:487 +#: git-rebase.sh:492 git-rebase.sh:496 #, sh-format msgid "$onto_name: there is no merge base" msgstr "" -#: git-rebase.sh:492 +#: git-rebase.sh:501 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:515 +#: git-rebase.sh:524 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "" -#: git-rebase.sh:548 +#: git-rebase.sh:557 msgid "Cannot autostash" msgstr "" -#: git-rebase.sh:553 +#: git-rebase.sh:562 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "" -#: git-rebase.sh:557 +#: git-rebase.sh:566 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:577 +#: git-rebase.sh:586 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:581 +#: git-rebase.sh:590 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:592 +#: git-rebase.sh:601 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" -#. Detach HEAD and reset the tree -#: git-rebase.sh:601 +#: git-rebase.sh:610 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:611 +#: git-rebase.sh:620 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" @@ -9821,23 +9963,23 @@ 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:190 +#: git-stash.sh:191 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "" @@ -9852,92 +9994,92 @@ 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:237 +#: 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:258 +#: git-stash.sh:259 msgid "No local changes to save" msgstr "" -#: git-stash.sh:262 +#: git-stash.sh:263 msgid "Cannot initialize stash" msgstr "" -#: git-stash.sh:266 +#: git-stash.sh:267 msgid "Cannot save the current status" msgstr "" -#: git-stash.sh:284 +#: git-stash.sh:285 msgid "Cannot remove worktree changes" msgstr "" -#: git-stash.sh:383 +#: git-stash.sh:384 msgid "No stash found." msgstr "" -#: git-stash.sh:390 +#: git-stash.sh:391 #, sh-format msgid "Too many revisions specified: $REV" msgstr "" -#: git-stash.sh:396 +#: git-stash.sh:397 #, sh-format msgid "$reference is not valid reference" msgstr "" -#: git-stash.sh:424 +#: git-stash.sh:425 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "" -#: git-stash.sh:435 +#: git-stash.sh:436 #, sh-format msgid "'$args' is not a stash reference" msgstr "" -#: git-stash.sh:443 +#: git-stash.sh:444 msgid "unable to refresh index" msgstr "" -#: git-stash.sh:447 +#: git-stash.sh:448 msgid "Cannot apply a stash in the middle of a merge" msgstr "" -#: git-stash.sh:455 +#: git-stash.sh:456 msgid "Conflicts in index. Try without --index." msgstr "" -#: git-stash.sh:457 +#: git-stash.sh:458 msgid "Could not save index tree" msgstr "" -#: git-stash.sh:491 +#: git-stash.sh:492 msgid "Cannot unstage modified files" msgstr "" -#: git-stash.sh:506 +#: git-stash.sh:507 msgid "Index was not unstashed." msgstr "" -#: git-stash.sh:523 +#: git-stash.sh:530 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "" -#: git-stash.sh:524 +#: git-stash.sh:531 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "" -#: git-stash.sh:531 +#: git-stash.sh:538 msgid "No branch name specified" msgstr "" -#: git-stash.sh:603 +#: git-stash.sh:610 msgid "(To restore them type \"git stash apply\")" msgstr "" @@ -9951,31 +10093,31 @@ msgstr "" msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "" -#: git-submodule.sh:281 +#: git-submodule.sh:287 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "" -#: git-submodule.sh:293 +#: git-submodule.sh:296 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "" -#: git-submodule.sh:403 +#: git-submodule.sh:406 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -#: git-submodule.sh:413 +#: git-submodule.sh:416 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:430 +#: git-submodule.sh:433 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:434 +#: git-submodule.sh:437 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -9983,236 +10125,235 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:452 +#: git-submodule.sh:455 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:454 +#: git-submodule.sh:457 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:462 +#: git-submodule.sh:465 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:464 +#: 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:466 +#: 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:467 +#: 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:469 +#: git-submodule.sh:472 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:481 +#: git-submodule.sh:484 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:486 +#: git-submodule.sh:489 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:495 +#: git-submodule.sh:498 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:539 +#: git-submodule.sh:542 #, sh-format msgid "Entering '$prefix$displaypath'" msgstr "" -#: git-submodule.sh:559 +#: git-submodule.sh:562 #, sh-format msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." msgstr "" -#: git-submodule.sh:605 +#: git-submodule.sh:608 #, sh-format msgid "No url found for submodule path '$displaypath' in .gitmodules" msgstr "" -#: git-submodule.sh:614 +#: git-submodule.sh:617 #, sh-format msgid "Failed to register url for submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:616 +#: git-submodule.sh:619 #, sh-format msgid "Submodule '$name' ($url) registered for path '$displaypath'" msgstr "" -#: git-submodule.sh:633 +#: git-submodule.sh:636 #, sh-format msgid "Failed to register update mode for submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:671 +#: git-submodule.sh:674 #, sh-format msgid "Use '.' if you really want to deinitialize all submodules" msgstr "" -#: git-submodule.sh:688 +#: git-submodule.sh:691 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" -#: git-submodule.sh:689 +#: git-submodule.sh:692 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" -#: git-submodule.sh:695 +#: git-submodule.sh:698 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "" -#: git-submodule.sh:698 +#: git-submodule.sh:701 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "" -#: git-submodule.sh:699 +#: git-submodule.sh:702 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" -#: git-submodule.sh:702 +#: git-submodule.sh:705 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "" -#: git-submodule.sh:711 +#: git-submodule.sh:714 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" -#: git-submodule.sh:834 +#: git-submodule.sh:830 #, sh-format msgid "" "Submodule path '$displaypath' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -#: git-submodule.sh:847 +#: git-submodule.sh:843 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:856 +#: git-submodule.sh:852 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:880 +#: git-submodule.sh:876 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:894 +#: git-submodule.sh:890 #, sh-format -msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" +msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" +msgstr "" + +#: git-submodule.sh:891 +#, sh-format +msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" #: git-submodule.sh:895 #, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" +msgstr "" + +#: git-submodule.sh:896 +#, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:900 +#: git-submodule.sh:901 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:901 +#: git-submodule.sh:902 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:906 +#: git-submodule.sh:907 #, sh-format msgid "" "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:907 +#: git-submodule.sh:908 #, sh-format msgid "Submodule path '$prefix$sm_path': '$command $sha1'" msgstr "" -#: git-submodule.sh:912 -#, sh-format -msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" -msgstr "" - -#: git-submodule.sh:913 -#, sh-format -msgid "Submodule path '$displaypath': checked out '$sha1'" -msgstr "" - -#: git-submodule.sh:940 +#: git-submodule.sh:938 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:1048 +#: git-submodule.sh:1046 msgid "The --cached option cannot be used with the --files option" msgstr "" -#. unexpected type -#: git-submodule.sh:1096 +#: git-submodule.sh:1098 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:1116 +#: git-submodule.sh:1118 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:1119 +#: git-submodule.sh:1121 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:1122 +#: git-submodule.sh:1124 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:1147 +#: git-submodule.sh:1149 msgid "blob" msgstr "" -#: git-submodule.sh:1261 +#: git-submodule.sh:1267 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:1325 +#: git-submodule.sh:1331 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "" |