diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2014-04-19 04:53:28 (GMT) |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2014-04-19 04:55:29 (GMT) |
| commit | 5e078fcd83b32abb447c9567da439fe3741dae1a (patch) | |
| tree | 49e7070222ab5094f47a5f0a6ca01f78f6cd1de4 /po | |
| parent | cc291953df19aa4a97bee3590e708dc1fc557500 (diff) | |
| download | git-5e078fcd83b32abb447c9567da439fe3741dae1a.zip git-5e078fcd83b32abb447c9567da439fe3741dae1a.tar.gz git-5e078fcd83b32abb447c9567da439fe3741dae1a.tar.bz2 | |
l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed)
Generate po/git.pot from v2.0.0-rc0 for git v2.0.0 l10n round 1.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Diffstat (limited to 'po')
| -rw-r--r-- | po/git.pot | 2527 |
1 files changed, 1264 insertions, 1263 deletions
@@ -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-04-19 12:50+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,16 +18,12 @@ 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:85 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -52,76 +48,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:428 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:1193 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:2258 +#: builtin/blame.c:2259 builtin/config.c:57 builtin/fast-export.c:680 +#: builtin/fast-export.c:682 builtin/grep.c:714 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 +132,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 +213,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:706 #, 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 +#: bundle.c:162 sequencer.c:669 sequencer.c:1123 builtin/log.c:332 #: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 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:293 msgid "rev-list died" msgstr "" -#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261 +#: bundle.c:299 builtin/log.c:1329 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:337 +#: bundle.c:334 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:382 +#: bundle.c:379 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:398 +#: bundle.c:395 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:416 +#: bundle.c:413 msgid "pack-objects died" msgstr "" -#: bundle.c:419 +#: bundle.c:416 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:441 +#: bundle.c:438 msgid "index-pack died" msgstr "" -#: commit.c:53 +#: commit.c:54 #, c-format msgid "could not parse %s" msgstr "" -#: commit.c:55 +#: commit.c:56 #, c-format msgid "%s %s is not a commit!" msgstr "" @@ -404,6 +395,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,6 +415,10 @@ msgstr[1] "" msgid "failed to read orderfile '%s'" msgstr "" +#: diffcore-rename.c:517 +msgid "Performing inexact rename detection" +msgstr "" + #: diff.c:113 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" @@ -445,14 +441,14 @@ msgid "" "%s" msgstr "" -#: diff.c:3509 +#: diff.c:3495 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3523 +#: diff.c:3509 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" @@ -479,63 +475,63 @@ msgstr "" msgid "failed writing detached signature to '%s': %s" msgstr "" -#: grep.c:1695 +#: grep.c:1698 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1712 +#: grep.c:1715 #, c-format msgid "'%s': %s" msgstr "" -#: grep.c:1723 +#: grep.c:1726 #, c-format msgid "'%s': short read %s" msgstr "" -#: help.c:210 +#: help.c:209 #, c-format msgid "available git commands in '%s'" msgstr "" -#: help.c:217 +#: help.c:216 msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:233 +#: help.c:232 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:443 msgid "" "\n" "Did you mean this?" @@ -545,7 +541,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: help.c:440 +#: help.c:439 #, c-format msgid "%s: %s - %s" msgstr "" @@ -554,7 +550,7 @@ msgstr "" msgid "failed to read the cache" msgstr "" -#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559 +#: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558 #: builtin/clone.c:661 msgid "unable to write new index file" msgstr "" @@ -564,244 +560,242 @@ msgstr "" msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:206 +#: merge-recursive.c:208 #, 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:675 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:684 +#: merge-recursive.c:686 #, 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:700 merge-recursive.c:721 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:709 +#: merge-recursive.c:711 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:749 +#: merge-recursive.c:751 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:751 +#: merge-recursive.c:753 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:774 builtin/clone.c:317 +#: merge-recursive.c:776 builtin/clone.c:317 #, c-format msgid "failed to open '%s'" msgstr "" -#: merge-recursive.c:782 +#: merge-recursive.c:784 #, c-format msgid "failed to symlink '%s'" msgstr "" -#: merge-recursive.c:785 +#: merge-recursive.c:787 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:923 +#: merge-recursive.c:925 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:927 +#: merge-recursive.c:929 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:943 +#: merge-recursive.c:945 msgid "unsupported object type in the tree" msgstr "" -#: merge-recursive.c:1022 merge-recursive.c:1036 +#: merge-recursive.c:1024 merge-recursive.c:1038 #, 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:1030 merge-recursive.c:1043 #, 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:1084 msgid "rename" msgstr "" -#: merge-recursive.c:1082 wt-status.c:283 +#: merge-recursive.c:1084 msgid "renamed" msgstr "" -#: merge-recursive.c:1138 +#: merge-recursive.c:1140 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1160 +#: merge-recursive.c:1162 #, 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:1167 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1219 +#: merge-recursive.c:1221 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1249 +#: merge-recursive.c:1251 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1448 +#: merge-recursive.c:1450 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1458 +#: merge-recursive.c:1460 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1463 merge-recursive.c:1661 +#: merge-recursive.c:1465 merge-recursive.c:1663 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1514 +#: merge-recursive.c:1516 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1517 +#: merge-recursive.c:1519 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1565 +#: merge-recursive.c:1567 msgid "modify" msgstr "" -#: merge-recursive.c:1565 wt-status.c:281 +#: merge-recursive.c:1567 msgid "modified" msgstr "" -#: merge-recursive.c:1575 +#: merge-recursive.c:1577 msgid "content" msgstr "" -#: merge-recursive.c:1582 +#: merge-recursive.c:1584 msgid "add/add" msgstr "" -#: merge-recursive.c:1616 +#: merge-recursive.c:1618 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1630 +#: merge-recursive.c:1632 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1634 git-submodule.sh:1148 +#: merge-recursive.c:1636 git-submodule.sh:1149 msgid "submodule" msgstr "" -#: merge-recursive.c:1635 +#: merge-recursive.c:1637 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1725 +#: merge-recursive.c:1727 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1750 +#: merge-recursive.c:1752 msgid "file/directory" msgstr "" -#: merge-recursive.c:1756 +#: merge-recursive.c:1758 msgid "directory/file" msgstr "" -#: merge-recursive.c:1761 +#: merge-recursive.c:1763 #, 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:1773 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1788 +#: merge-recursive.c:1790 msgid "Fatal merge failure, shouldn't happen." msgstr "" -#: merge-recursive.c:1807 +#: merge-recursive.c:1809 msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:1816 +#: merge-recursive.c:1818 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:1846 +#: merge-recursive.c:1848 #, c-format msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:1891 +#: merge-recursive.c:1893 msgid "Merging:" msgstr "" -#: merge-recursive.c:1904 +#: merge-recursive.c:1906 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:1941 +#: merge-recursive.c:1943 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:1998 +#: merge-recursive.c:2000 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2010 builtin/merge.c:665 +#: merge-recursive.c:2012 builtin/merge.c:668 msgid "Unable to write index." msgstr "" @@ -826,33 +820,33 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "" -#: object.c:202 +#: object.c:229 #, c-format msgid "unable to parse object: %s" msgstr "" -#: parse-options.c:537 +#: parse-options.c:532 msgid "..." msgstr "" -#: parse-options.c:555 +#: parse-options.c:550 #, 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:554 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:562 +#: parse-options.c:557 #, c-format msgid " %s" msgstr "" -#: parse-options.c:596 +#: parse-options.c:591 msgid "-NUM" msgstr "" @@ -900,11 +894,6 @@ 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" @@ -921,56 +910,69 @@ msgid "" "Perhaps you forgot to add either ':/' or '.' ?" msgstr "" -#: remote.c:753 +#: progress.c:224 +msgid "done" +msgstr "" + +#: read-cache.c:1238 +#, c-format +msgid "" +"index.version set, but the value is invalid.\n" +"Using version %i" +msgstr "" + +#: read-cache.c:1248 +#, c-format +msgid "" +"GIT_INDEX_VERSION set, but the value is invalid.\n" +"Using version %i" +msgstr "" + +#: remote.c:758 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:757 +#: remote.c:762 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:761 +#: remote.c:766 #, c-format 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 +#: remote.c:774 msgid "Internal error" msgstr "" -#: remote.c:1871 +#: remote.c:1948 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:1875 +#: remote.c:1952 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:1878 +#: remote.c:1955 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "" -#: remote.c:1882 +#: remote.c:1959 #, 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:1965 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:1891 +#: remote.c:1968 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -978,11 +980,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1899 +#: remote.c:1976 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:1902 +#: remote.c:1979 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -993,7 +995,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1912 +#: remote.c:1989 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" @@ -1006,14 +1008,14 @@ 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:206 builtin/merge.c:786 builtin/merge.c:899 +#: builtin/merge.c:1009 builtin/merge.c:1019 #, 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:208 builtin/merge.c:343 builtin/merge.c:789 +#: builtin/merge.c:1011 builtin/merge.c:1024 #, c-format msgid "Could not write to '%s'" msgstr "" @@ -1031,7 +1033,7 @@ msgid "" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:245 sequencer.c:870 sequencer.c:953 +#: sequencer.c:245 sequencer.c:879 sequencer.c:962 #, c-format msgid "Could not write to %s" msgstr "" @@ -1067,184 +1069,184 @@ msgstr "" msgid "Unable to update cache tree\n" msgstr "" -#: sequencer.c:423 +#: sequencer.c:430 #, c-format msgid "Could not parse commit %s\n" msgstr "" -#: sequencer.c:428 +#: sequencer.c:435 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" -#: sequencer.c:494 +#: sequencer.c:501 msgid "Your index file is unmerged." msgstr "" -#: sequencer.c:513 +#: sequencer.c:520 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:521 +#: sequencer.c:528 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: sequencer.c:525 +#: sequencer.c:532 #, 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:545 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:542 +#: sequencer.c:549 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:628 +#: sequencer.c:635 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:629 +#: sequencer.c:636 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:665 +#: sequencer.c:672 msgid "empty commit set passed" msgstr "" -#: sequencer.c:673 +#: sequencer.c:680 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:678 +#: sequencer.c:685 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:736 +#: sequencer.c:743 #, c-format msgid "Cannot %s during a %s" msgstr "" -#: sequencer.c:758 +#: sequencer.c:765 #, c-format msgid "Could not parse line %d." msgstr "" -#: sequencer.c:763 +#: sequencer.c:770 msgid "No commits parsed." msgstr "" -#: sequencer.c:776 +#: sequencer.c:783 #, c-format msgid "Could not open %s" msgstr "" -#: sequencer.c:780 +#: sequencer.c:787 #, c-format msgid "Could not read %s." msgstr "" -#: sequencer.c:787 +#: sequencer.c:794 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" -#: sequencer.c:815 +#: sequencer.c:824 #, c-format msgid "Invalid key: %s" msgstr "" -#: sequencer.c:818 +#: sequencer.c:827 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: sequencer.c:830 +#: sequencer.c:839 #, c-format msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:851 +#: sequencer.c:860 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:852 +#: sequencer.c:861 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:856 +#: sequencer.c:865 #, c-format msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:872 sequencer.c:957 +#: sequencer.c:881 sequencer.c:966 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:891 sequencer.c:1025 +#: sequencer.c:900 sequencer.c:1036 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:893 +#: sequencer.c:902 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:895 +#: sequencer.c:904 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:917 builtin/apply.c:4061 +#: sequencer.c:926 builtin/apply.c:4061 #, c-format msgid "cannot open %s: %s" msgstr "" -#: sequencer.c:920 +#: sequencer.c:929 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:921 +#: sequencer.c:930 msgid "unexpected end of file" msgstr "" -#: sequencer.c:927 +#: sequencer.c:936 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:950 +#: sequencer.c:959 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:1093 +#: sequencer.c:1104 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:1096 +#: sequencer.c:1107 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:1130 +#: sequencer.c:1141 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:1131 +#: sequencer.c:1142 msgid "Can't cherry-pick into empty head" msgstr "" @@ -1261,21 +1263,21 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" -#: sha1_name.c:1070 +#: sha1_name.c:1072 msgid "HEAD does not point to a branch" msgstr "" -#: sha1_name.c:1073 +#: sha1_name.c:1075 #, c-format msgid "No such branch: '%s'" msgstr "" -#: sha1_name.c:1075 +#: sha1_name.c:1077 #, c-format msgid "No upstream configured for branch '%s'" msgstr "" -#: sha1_name.c:1079 +#: sha1_name.c:1081 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" @@ -1289,52 +1291,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:1121 builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "" -#: submodule.c:1155 +#: submodule.c:1132 #, c-format msgid "Could not set core.worktree in %s" msgstr "" +#: unpack-trees.c:206 +msgid "Checking out files" +msgstr "" + #: urlmatch.c:120 msgid "invalid URL scheme name or missing '://' suffix" msgstr "" @@ -1438,266 +1422,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:765 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:734 +#: wt-status.c:767 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:836 +#: wt-status.c:846 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "" -#: wt-status.c:899 +#: wt-status.c:937 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:902 +#: wt-status.c:940 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:905 +#: wt-status.c:943 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:908 +#: wt-status.c:946 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:918 +#: wt-status.c:956 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:921 +#: wt-status.c:959 msgid "The current patch is empty." msgstr "" -#: wt-status.c:925 +#: wt-status.c:963 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:927 +#: wt-status.c:965 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:929 +#: wt-status.c:967 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:989 wt-status.c:1006 +#: wt-status.c:1027 wt-status.c:1044 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:994 wt-status.c:1011 +#: wt-status.c:1032 wt-status.c:1049 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:997 +#: wt-status.c:1035 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:999 +#: wt-status.c:1037 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1001 +#: wt-status.c:1039 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1014 +#: wt-status.c:1052 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1018 +#: wt-status.c:1056 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1023 +#: wt-status.c:1061 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1026 +#: wt-status.c:1064 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1030 +#: wt-status.c:1068 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1035 +#: wt-status.c:1073 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1038 +#: wt-status.c:1076 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1040 +#: wt-status.c:1078 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1050 +#: wt-status.c:1088 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1055 +#: wt-status.c:1093 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1058 +#: wt-status.c:1096 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1060 +#: wt-status.c:1098 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1069 +#: wt-status.c:1107 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1074 +#: wt-status.c:1112 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1077 +#: wt-status.c:1115 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1079 +#: wt-status.c:1117 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1090 +#: wt-status.c:1128 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1094 +#: wt-status.c:1132 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1097 +#: wt-status.c:1135 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1272 +#: wt-status.c:1310 msgid "On branch " msgstr "" -#: wt-status.c:1279 +#: wt-status.c:1317 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1286 +#: wt-status.c:1324 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1288 +#: wt-status.c:1326 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1291 +#: wt-status.c:1329 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1308 +#: wt-status.c:1346 msgid "Initial commit" msgstr "" -#: wt-status.c:1322 +#: wt-status.c:1360 msgid "Untracked files" msgstr "" -#: wt-status.c:1324 +#: wt-status.c:1362 msgid "Ignored files" msgstr "" -#: wt-status.c:1328 +#: wt-status.c:1366 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1705,283 +1698,228 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1334 +#: wt-status.c:1372 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1336 +#: wt-status.c:1374 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1342 +#: wt-status.c:1380 msgid "No changes" msgstr "" -#: wt-status.c:1347 +#: wt-status.c:1385 #, 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:1388 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1353 +#: wt-status.c:1391 #, 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:1394 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1359 +#: wt-status.c:1397 #, 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:1400 wt-status.c:1405 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1365 +#: wt-status.c:1403 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1369 +#: wt-status.c:1407 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1478 +#: wt-status.c:1516 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1484 +#: wt-status.c:1522 msgid "Initial commit on " msgstr "" -#: wt-status.c:1514 +#: wt-status.c:1554 msgid "gone" msgstr "" -#: wt-status.c:1516 +#: wt-status.c:1556 wt-status.c:1564 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 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:876 builtin/fetch.c:93 builtin/mv.c:70 +#: builtin/prune-packed.c:77 builtin/push.c:489 builtin/remote.c:1344 #: 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/add.c:249 builtin/apply.c:4410 builtin/check-ignore.c:19 +#: builtin/commit.c:1256 builtin/count-objects.c:95 builtin/fsck.c:612 #: builtin/log.c:1592 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:1108 builtin/reset.c:283 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:330 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:456 +#: builtin/add.c:337 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:486 +#: builtin/add.c:358 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:487 +#: builtin/add.c:359 #, 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:364 builtin/check-ignore.c:172 builtin/clean.c:920 +#: builtin/commit.c:320 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:448 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:432 msgid "Unable to write new index file" msgstr "" @@ -2088,7 +2026,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" @@ -2227,7 +2164,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 "" @@ -2276,7 +2213,6 @@ msgstr "" msgid "internal error" msgstr "" -#. Say this even without --verbose #: builtin/apply.c:4043 #, c-format msgid "Applying patch %%s with %d reject..." @@ -2368,7 +2304,7 @@ msgstr "" 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:4389 builtin/checkout-index.c:197 builtin/ls-files.c:455 msgid "paths are separated with NUL character" msgstr "" @@ -2506,95 +2442,95 @@ msgstr "" msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:2249 +#: builtin/blame.c:2242 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2250 +#: builtin/blame.c:2243 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2251 +#: builtin/blame.c:2244 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2252 +#: builtin/blame.c:2245 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2253 +#: builtin/blame.c:2246 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2254 +#: builtin/blame.c:2247 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2255 +#: builtin/blame.c:2248 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2256 +#: builtin/blame.c:2249 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2257 +#: builtin/blame.c:2250 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2258 +#: builtin/blame.c:2251 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2259 +#: builtin/blame.c:2252 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2260 +#: builtin/blame.c:2253 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2261 +#: builtin/blame.c:2254 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2262 +#: builtin/blame.c:2255 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2263 +#: builtin/blame.c:2256 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2264 +#: builtin/blame.c:2257 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2265 +#: builtin/blame.c:2258 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2266 +#: builtin/blame.c:2259 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2267 builtin/blame.c:2268 +#: builtin/blame.c:2260 builtin/blame.c:2261 msgid "score" msgstr "" -#: builtin/blame.c:2267 +#: builtin/blame.c:2260 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2268 +#: builtin/blame.c:2261 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2269 +#: builtin/blame.c:2262 msgid "n,m" msgstr "" -#: builtin/blame.c:2269 +#: builtin/blame.c:2262 msgid "Process only line range n,m, counting from 1" msgstr "" @@ -2830,8 +2766,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:1494 builtin/commit.c:1495 +#: builtin/commit.c:1496 builtin/commit.c:1497 builtin/tag.c:527 +#: builtin/tag.c:533 msgid "commit" msgstr "" @@ -3008,43 +2945,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 +3009,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:1089 builtin/gc.c:271 msgid "suppress progress reporting" msgstr "" @@ -3223,60 +3160,59 @@ msgstr "" 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:261 builtin/checkout.c:450 msgid "corrupt index file" msgstr "" -#: builtin/checkout.c:322 builtin/checkout.c:329 +#: builtin/checkout.c:321 builtin/checkout.c:328 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:473 +#: builtin/checkout.c:472 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:594 +#: builtin/checkout.c:593 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "" -#: builtin/checkout.c:632 +#: builtin/checkout.c:631 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:639 +#: builtin/checkout.c:638 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:642 +#: builtin/checkout.c:641 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:646 +#: builtin/checkout.c:645 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:648 builtin/checkout.c:1033 +#: builtin/checkout.c:647 builtin/checkout.c:1032 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:650 +#: builtin/checkout.c:649 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:706 +#: builtin/checkout.c:705 #, c-format msgid " ... and %d more.\n" msgstr "" -#. The singular version -#: builtin/checkout.c:712 +#: builtin/checkout.c:711 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3291,7 +3227,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:730 +#: builtin/checkout.c:729 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -3301,152 +3237,151 @@ msgid "" "\n" msgstr "" -#: builtin/checkout.c:760 +#: builtin/checkout.c:759 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:764 +#: builtin/checkout.c:763 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:791 builtin/checkout.c:1028 +#: builtin/checkout.c:790 builtin/checkout.c:1027 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:935 +#: builtin/checkout.c:934 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:974 +#: builtin/checkout.c:973 #, c-format msgid "invalid reference: %s" msgstr "" -#. case (1): want a tree -#: builtin/checkout.c:1003 +#: builtin/checkout.c:1002 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1042 +#: builtin/checkout.c:1041 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1045 builtin/checkout.c:1049 +#: builtin/checkout.c:1044 builtin/checkout.c:1048 #, 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:1052 builtin/checkout.c:1055 builtin/checkout.c:1060 +#: builtin/checkout.c:1063 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1069 +#: builtin/checkout.c:1068 #, 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:1090 builtin/checkout.c:1092 builtin/clone.c:88 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1091 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1094 +#: builtin/checkout.c:1093 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1094 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1096 +#: builtin/checkout.c:1095 msgid "detach the HEAD at named commit" msgstr "" -#: builtin/checkout.c:1097 +#: builtin/checkout.c:1096 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1099 -msgid "new branch" +#: builtin/checkout.c:1098 +msgid "new-branch" msgstr "" -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1098 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1100 +#: builtin/checkout.c:1099 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1102 +#: builtin/checkout.c:1101 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1105 +#: builtin/checkout.c:1104 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1106 builtin/merge.c:225 +#: builtin/checkout.c:1105 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:1106 builtin/log.c:1228 parse-options.h:245 msgid "style" msgstr "" -#: builtin/checkout.c:1108 +#: builtin/checkout.c:1107 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1110 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1112 msgid "second guess 'git checkout no-such-branch'" msgstr "" -#: builtin/checkout.c:1136 +#: builtin/checkout.c:1135 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1152 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1159 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1196 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1204 +#: builtin/checkout.c:1203 #, 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:1208 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1213 +#: builtin/checkout.c:1212 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3482,7 +3417,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 +3425,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,35 +3437,35 @@ msgid "" " - (empty) finish selecting" msgstr "" -#: builtin/clean.c:516 +#: builtin/clean.c:517 #, c-format msgid "Huh (%s)?" msgstr "" -#: builtin/clean.c:659 +#: builtin/clean.c:660 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:696 +#: builtin/clean.c:697 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:717 +#: builtin/clean.c:718 msgid "Select items to delete" msgstr "" -#: builtin/clean.c:757 +#: builtin/clean.c:758 #, c-format msgid "remove %s? " msgstr "" -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "" -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3541,70 +3476,70 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:879 +#: builtin/clean.c:880 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:881 builtin/describe.c:415 builtin/grep.c:716 +#: builtin/ls-files.c:486 builtin/name-rev.c:314 builtin/show-ref.c:185 msgid "pattern" msgstr "" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:906 +#: builtin/clean.c:907 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 +#: builtin/clean.c:910 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 "" @@ -3613,7 +3548,7 @@ msgid "git clone [options] [--] <repo> [<dir>]" msgstr "" #: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222 -#: builtin/push.c:521 +#: builtin/push.c:504 msgid "force progress reporting" msgstr "" @@ -3621,7 +3556,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 +3580,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 +3608,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:98 builtin/grep.c:661 msgid "depth" msgstr "" @@ -3685,11 +3620,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 "" @@ -3947,67 +3882,67 @@ 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:330 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:335 +#: builtin/commit.c:336 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439 +#: builtin/commit.c:369 builtin/commit.c:390 builtin/commit.c:440 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:420 +#: builtin/commit.c:421 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:422 +#: builtin/commit.c:423 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:432 +#: builtin/commit.c:433 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:452 +#: builtin/commit.c:453 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:543 builtin/commit.c:549 +#: builtin/commit.c:544 builtin/commit.c:550 #, c-format msgid "invalid commit: %s" msgstr "" -#: builtin/commit.c:571 +#: builtin/commit.c:572 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:591 +#: builtin/commit.c:592 #, c-format msgid "Malformed ident string: '%s'" msgstr "" -#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007 +#: builtin/commit.c:629 builtin/commit.c:663 builtin/commit.c:1014 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:642 builtin/shortlog.c:273 +#: builtin/commit.c:641 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:644 +#: builtin/commit.c:643 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:648 +#: builtin/commit.c:647 #, c-format msgid "could not read log file '%s'" msgstr "" @@ -4033,7 +3968,7 @@ msgstr "" msgid "could not write commit template" msgstr "" -#: builtin/commit.c:760 +#: builtin/commit.c:764 #, c-format msgid "" "\n" @@ -4043,7 +3978,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:765 +#: builtin/commit.c:769 #, c-format msgid "" "\n" @@ -4053,14 +3988,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:777 +#: builtin/commit.c:782 #, 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:789 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4068,351 +4003,351 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:795 +#: builtin/commit.c:802 #, c-format msgid "%sAuthor: %s" msgstr "" -#: builtin/commit.c:802 +#: builtin/commit.c:809 #, c-format msgid "%sCommitter: %s" msgstr "" -#: builtin/commit.c:822 +#: builtin/commit.c:829 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:865 +#: builtin/commit.c:872 msgid "Error building trees" msgstr "" -#: builtin/commit.c:880 builtin/tag.c:359 +#: builtin/commit.c:887 builtin/tag.c:391 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:982 +#: builtin/commit.c:989 #, c-format msgid "No existing author found with '%s'" msgstr "" -#: builtin/commit.c:997 builtin/commit.c:1237 +#: builtin/commit.c:1004 builtin/commit.c:1244 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1034 +#: builtin/commit.c:1041 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1064 +#: builtin/commit.c:1071 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1075 +#: builtin/commit.c:1080 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1078 +#: builtin/commit.c:1083 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1080 +#: builtin/commit.c:1085 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1083 +#: builtin/commit.c:1088 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1093 +#: builtin/commit.c:1098 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1095 +#: builtin/commit.c:1100 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1103 +#: builtin/commit.c:1108 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1120 +#: builtin/commit.c:1125 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1122 +#: builtin/commit.c:1127 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1124 +#: builtin/commit.c:1129 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:1131 +msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1136 builtin/tag.c:572 +#: builtin/commit.c:1143 builtin/tag.c:639 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1141 +#: builtin/commit.c:1148 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1251 builtin/commit.c:1482 +#: builtin/commit.c:1258 builtin/commit.c:1516 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1253 builtin/commit.c:1484 +#: builtin/commit.c:1260 builtin/commit.c:1518 msgid "show branch information" msgstr "" -#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507 +#: builtin/commit.c:1262 builtin/commit.c:1520 builtin/push.c:490 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1258 builtin/commit.c:1488 +#: builtin/commit.c:1265 builtin/commit.c:1522 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1261 builtin/commit.c:1491 +#: builtin/commit.c:1268 builtin/commit.c:1525 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:1270 builtin/commit.c:1528 builtin/fast-export.c:674 +#: builtin/fast-export.c:677 builtin/tag.c:514 msgid "mode" msgstr "" -#: builtin/commit.c:1264 builtin/commit.c:1494 +#: builtin/commit.c:1271 builtin/commit.c:1528 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1267 +#: builtin/commit.c:1274 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1268 parse-options.h:156 +#: builtin/commit.c:1275 parse-options.h:153 msgid "when" msgstr "" -#: builtin/commit.c:1269 +#: builtin/commit.c:1276 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1271 +#: builtin/commit.c:1278 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1340 +#: builtin/commit.c:1347 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1342 +#: builtin/commit.c:1349 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1383 +#: builtin/commit.c:1390 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1385 +#: builtin/commit.c:1392 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1452 +#: builtin/commit.c:1486 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1453 +#: builtin/commit.c:1487 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1455 +#: builtin/commit.c:1489 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1456 builtin/tag.c:457 +#: builtin/commit.c:1490 builtin/tag.c:512 msgid "read message from file" msgstr "" -#: builtin/commit.c:1457 +#: builtin/commit.c:1491 msgid "author" msgstr "" -#: builtin/commit.c:1457 +#: builtin/commit.c:1491 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1458 builtin/gc.c:261 +#: builtin/commit.c:1492 builtin/gc.c:272 msgid "date" msgstr "" -#: builtin/commit.c:1458 +#: builtin/commit.c:1492 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:1493 builtin/merge.c:216 builtin/notes.c:409 +#: builtin/notes.c:566 builtin/tag.c:510 msgid "message" msgstr "" -#: builtin/commit.c:1459 +#: builtin/commit.c:1493 msgid "commit message" msgstr "" -#: builtin/commit.c:1460 +#: builtin/commit.c:1494 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1461 +#: builtin/commit.c:1495 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1462 +#: builtin/commit.c:1496 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1463 +#: builtin/commit.c:1497 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1464 +#: builtin/commit.c:1498 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:1499 builtin/log.c:1180 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1466 +#: builtin/commit.c:1500 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1467 +#: builtin/commit.c:1501 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1468 +#: builtin/commit.c:1502 msgid "default" msgstr "" -#: builtin/commit.c:1468 builtin/tag.c:460 +#: builtin/commit.c:1502 builtin/tag.c:515 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1469 +#: builtin/commit.c:1503 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:1504 builtin/merge.c:223 builtin/revert.c:92 +#: builtin/tag.c:516 +msgid "key-id" msgstr "" -#: builtin/commit.c:1471 builtin/merge.c:224 +#: builtin/commit.c:1505 builtin/merge.c:224 builtin/revert.c:93 msgid "GPG sign commit" msgstr "" -#. end commit message options -#: builtin/commit.c:1474 +#: builtin/commit.c:1508 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1475 +#: builtin/commit.c:1509 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1476 +#: builtin/commit.c:1510 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1477 +#: builtin/commit.c:1511 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1478 +#: builtin/commit.c:1512 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1479 +#: builtin/commit.c:1513 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1480 +#: builtin/commit.c:1514 msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1481 +#: builtin/commit.c:1515 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1492 +#: builtin/commit.c:1526 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1493 +#: builtin/commit.c:1527 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1498 +#: builtin/commit.c:1532 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1500 +#: builtin/commit.c:1534 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1529 +#: builtin/commit.c:1562 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1567 builtin/merge.c:518 +#: builtin/commit.c:1601 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1574 +#: builtin/commit.c:1608 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1581 +#: builtin/commit.c:1615 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1600 +#: builtin/commit.c:1634 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1611 +#: builtin/commit.c:1645 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1616 +#: builtin/commit.c:1650 #, 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:1665 builtin/merge.c:857 builtin/merge.c:882 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1652 +#: builtin/commit.c:1686 msgid "cannot lock HEAD ref" msgstr "" -#: builtin/commit.c:1656 +#: builtin/commit.c:1690 msgid "cannot update HEAD ref" msgstr "" -#: builtin/commit.c:1667 +#: builtin/commit.c:1701 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 +4358,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 +4498,129 @@ msgstr "" msgid "git describe [options] --dirty" msgstr "" -#: builtin/describe.c:237 +#: builtin/describe.c:225 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:241 +#: builtin/describe.c:229 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:243 +#: builtin/describe.c:231 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:270 +#: builtin/describe.c:258 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:273 +#: builtin/describe.c:261 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: builtin/describe.c:290 +#: builtin/describe.c:278 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:292 +#: builtin/describe.c:280 #, c-format msgid "searching to describe %s\n" msgstr "" -#: builtin/describe.c:332 +#: builtin/describe.c:327 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:359 +#: builtin/describe.c:354 #, 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:358 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:384 +#: builtin/describe.c:379 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:387 +#: builtin/describe.c:382 #, 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:404 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:410 +#: builtin/describe.c:405 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:411 +#: builtin/describe.c:406 msgid "use any ref" msgstr "" -#: builtin/describe.c:412 +#: builtin/describe.c:407 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:413 +#: builtin/describe.c:408 msgid "always use long format" msgstr "" -#: builtin/describe.c:414 +#: builtin/describe.c:409 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:417 +#: builtin/describe.c:412 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:419 +#: builtin/describe.c:414 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:421 +#: builtin/describe.c:416 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:423 builtin/name-rev.c:321 +#: builtin/describe.c:418 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:424 +#: builtin/describe.c:419 msgid "mark" msgstr "" -#: builtin/describe.c:425 +#: builtin/describe.c:420 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:443 +#: builtin/describe.c:438 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:469 +#: builtin/describe.c:464 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:489 +#: builtin/describe.c:484 msgid "--dirty is incompatible with commit-ishes" msgstr "" @@ -4975,7 +4910,7 @@ msgstr "" msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1036 +#: builtin/fetch.c:1035 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5014,10 +4949,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:700 +#: builtin/merge.c:196 builtin/repack.c:175 builtin/repack.c:179 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:501 +#: parse-options.h:132 parse-options.h:239 msgid "n" msgstr "" @@ -5081,6 +5016,14 @@ msgstr "" msgid "field name to sort on" msgstr "" +#: builtin/fsck.c:147 builtin/prune.c:172 +msgid "Checking connectivity" +msgstr "" + +#: builtin/fsck.c:544 +msgid "Checking object directories" +msgstr "" + #: builtin/fsck.c:607 msgid "git fsck [options] [<object>...]" msgstr "" @@ -5125,51 +5068,62 @@ msgstr "" msgid "show progress" msgstr "" +#: builtin/fsck.c:673 +msgid "Checking objects" +msgstr "" + #: builtin/gc.c:24 msgid "git gc [options]" msgstr "" -#: builtin/gc.c:80 +#: builtin/gc.c:90 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: builtin/gc.c:107 +#: builtin/gc.c:117 #, c-format msgid "insanely long object directory %.*s" msgstr "" -#: builtin/gc.c:262 +#: builtin/gc.c:273 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:264 +#: builtin/gc.c:275 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:265 +#: builtin/gc.c:276 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:266 +#: builtin/gc.c:277 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:306 +#: builtin/gc.c:318 #, 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 "" + +#: builtin/gc.c:320 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "" + +#: builtin/gc.c:321 +#, c-format +msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -#. be quiet on --auto -#: builtin/gc.c:316 +#: builtin/gc.c:336 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -#: builtin/gc.c:341 +#: builtin/gc.c:361 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5198,209 +5152,209 @@ msgstr "" msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:551 +#: builtin/grep.c:549 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:568 +#: builtin/grep.c:566 #, c-format msgid "cannot open '%s'" msgstr "" -#: builtin/grep.c:642 +#: builtin/grep.c:640 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:644 +#: builtin/grep.c:642 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:646 +#: builtin/grep.c:644 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:648 +#: builtin/grep.c:646 msgid "search also in ignored files" msgstr "" -#: builtin/grep.c:651 +#: builtin/grep.c:649 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:653 +#: builtin/grep.c:651 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:655 +#: builtin/grep.c:653 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:657 +#: builtin/grep.c:655 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:659 +#: builtin/grep.c:657 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:662 +#: builtin/grep.c:660 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:664 +#: builtin/grep.c:662 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:668 +#: builtin/grep.c:666 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:671 +#: builtin/grep.c:669 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:674 +#: builtin/grep.c:672 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:677 +#: builtin/grep.c:675 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:680 +#: builtin/grep.c:678 msgid "show line numbers" msgstr "" -#: builtin/grep.c:681 +#: builtin/grep.c:679 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:682 +#: builtin/grep.c:680 msgid "show filenames" msgstr "" -#: builtin/grep.c:684 +#: builtin/grep.c:682 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:686 +#: builtin/grep.c:684 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:688 +#: builtin/grep.c:686 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:691 +#: builtin/grep.c:689 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:693 +#: builtin/grep.c:691 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:695 +#: builtin/grep.c:693 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:696 +#: builtin/grep.c:694 msgid "highlight matches" msgstr "" -#: builtin/grep.c:698 +#: builtin/grep.c:696 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:700 +#: builtin/grep.c:698 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:703 +#: builtin/grep.c:701 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:706 +#: builtin/grep.c:704 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:708 +#: builtin/grep.c:706 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:709 +#: builtin/grep.c:707 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:712 +#: builtin/grep.c:710 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:714 +#: builtin/grep.c:712 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:717 +#: builtin/grep.c:715 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:719 +#: builtin/grep.c:717 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:721 +#: builtin/grep.c:719 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:733 +#: builtin/grep.c:731 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:735 +#: builtin/grep.c:733 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:737 +#: builtin/grep.c:735 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:741 +#: builtin/grep.c:739 msgid "pager" msgstr "" -#: builtin/grep.c:741 +#: builtin/grep.c:739 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:744 +#: builtin/grep.c:742 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:745 builtin/show-ref.c:187 +#: builtin/grep.c:743 builtin/show-ref.c:187 msgid "show usage" msgstr "" -#: builtin/grep.c:812 +#: builtin/grep.c:810 msgid "no pattern given." msgstr "" -#: builtin/grep.c:870 +#: builtin/grep.c:868 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:893 +#: builtin/grep.c:891 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:898 +#: builtin/grep.c:896 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:901 +#: builtin/grep.c:899 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:909 +#: builtin/grep.c:907 msgid "both --cached and trees are given." msgstr "" @@ -5414,7 +5368,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:521 msgid "type" msgstr "" @@ -5649,8 +5603,8 @@ msgstr "" 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:669 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "" @@ -5916,72 +5870,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:168 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 "" @@ -6244,95 +6196,95 @@ msgstr "" 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 +6395,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,35 +6468,35 @@ 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 "" -#: builtin/merge.c:678 +#: builtin/merge.c:681 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:692 +#: builtin/merge.c:695 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:706 +#: builtin/merge.c:709 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:795 +#: builtin/merge.c:798 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:804 +#: builtin/merge.c:807 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:810 +#: builtin/merge.c:813 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6554,157 +6506,156 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:834 +#: builtin/merge.c:837 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:846 +#: builtin/merge.c:849 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:911 +#: builtin/merge.c:914 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:927 +#: builtin/merge.c:930 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:968 +#: builtin/merge.c:971 msgid "No current branch." msgstr "" -#: builtin/merge.c:970 +#: builtin/merge.c:973 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:972 +#: builtin/merge.c:975 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:977 +#: builtin/merge.c:980 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1133 +#: builtin/merge.c:1136 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1149 git-pull.sh:31 +#: builtin/merge.c:1152 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:1155 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: builtin/merge.c:1156 +#: builtin/merge.c:1159 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:1162 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1168 +#: builtin/merge.c:1171 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1177 +#: builtin/merge.c:1180 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1209 +#: builtin/merge.c:1212 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1212 +#: builtin/merge.c:1215 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1214 +#: builtin/merge.c:1217 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1219 +#: builtin/merge.c:1222 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1270 +#: builtin/merge.c:1273 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1273 +#: builtin/merge.c:1276 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#. 'N' -#: builtin/merge.c:1276 +#: builtin/merge.c:1279 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1279 +#: builtin/merge.c:1282 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1363 +#: builtin/merge.c:1366 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1402 +#: builtin/merge.c:1405 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1409 +#: builtin/merge.c:1412 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1441 +#: builtin/merge.c:1444 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1464 builtin/merge.c:1543 +#: builtin/merge.c:1467 builtin/merge.c:1546 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1468 +#: builtin/merge.c:1471 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1534 +#: builtin/merge.c:1537 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1536 +#: builtin/merge.c:1539 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1545 +#: builtin/merge.c:1548 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1557 +#: builtin/merge.c:1560 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -6787,19 +6738,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,46 +6797,46 @@ 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:207 msgid "destination exists" msgstr "" -#: builtin/mv.c:210 +#: builtin/mv.c:215 #, c-format msgid "overwriting '%s'" msgstr "" -#: builtin/mv.c:213 +#: builtin/mv.c:218 msgid "Cannot overwrite" msgstr "" -#: builtin/mv.c:216 +#: builtin/mv.c:221 msgid "multiple sources for the same target" msgstr "" -#: builtin/mv.c:218 +#: builtin/mv.c:223 msgid "destination directory does not exist" msgstr "" -#: builtin/mv.c:233 +#: builtin/mv.c:243 #, c-format msgid "%s, source=%s, destination=%s" msgstr "" -#: builtin/mv.c:243 +#: builtin/mv.c:253 #, c-format msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355 #, c-format msgid "renaming '%s' failed" msgstr "" @@ -7049,7 +7000,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:373 #, c-format msgid "could not create file '%s'" msgstr "" @@ -7058,7 +7009,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 +7023,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:604 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:250 builtin/tag.c:540 +#: builtin/notes.c:250 builtin/tag.c:607 #, 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:620 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" @@ -7095,304 +7046,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:539 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:1593 #, 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:2530 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2400 +#: builtin/pack-objects.c:2534 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2423 +#: builtin/pack-objects.c:2557 #, c-format msgid "option %s does not accept negative form" msgstr "" -#: builtin/pack-objects.c:2427 +#: builtin/pack-objects.c:2561 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "" -#: builtin/pack-objects.c:2446 +#: builtin/pack-objects.c:2580 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2448 +#: builtin/pack-objects.c:2582 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2450 +#: builtin/pack-objects.c:2584 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2453 +#: builtin/pack-objects.c:2587 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2454 +#: builtin/pack-objects.c:2588 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2455 +#: builtin/pack-objects.c:2589 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2458 +#: builtin/pack-objects.c:2592 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2460 +#: builtin/pack-objects.c:2594 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2462 +#: builtin/pack-objects.c:2596 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2464 +#: builtin/pack-objects.c:2598 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2466 +#: builtin/pack-objects.c:2600 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2468 +#: builtin/pack-objects.c:2602 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2470 +#: builtin/pack-objects.c:2604 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2472 +#: builtin/pack-objects.c:2606 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2474 +#: builtin/pack-objects.c:2608 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2476 +#: builtin/pack-objects.c:2610 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2478 +#: builtin/pack-objects.c:2612 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2480 +#: builtin/pack-objects.c:2614 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2482 +#: builtin/pack-objects.c:2616 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2485 +#: builtin/pack-objects.c:2619 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2488 +#: builtin/pack-objects.c:2622 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2491 +#: builtin/pack-objects.c:2625 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2493 +#: builtin/pack-objects.c:2627 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2495 +#: builtin/pack-objects.c:2629 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2496 parse-options.h:143 +#: builtin/pack-objects.c:2630 parse-options.h:140 msgid "time" msgstr "" -#: builtin/pack-objects.c:2497 +#: builtin/pack-objects.c:2631 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2500 +#: builtin/pack-objects.c:2634 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2502 +#: builtin/pack-objects.c:2636 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2504 +#: builtin/pack-objects.c:2638 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2506 +#: builtin/pack-objects.c:2640 msgid "do not hide commits by grafts" msgstr "" +#: builtin/pack-objects.c:2642 +msgid "use a bitmap index if available to speed up counting objects" +msgstr "" + +#: builtin/pack-objects.c:2644 +msgid "write a bitmap index together with the pack index" +msgstr "" + +#: builtin/pack-objects.c:2723 +msgid "Counting objects" +msgstr "" + #: builtin/pack-refs.c:6 msgid "git pack-refs [options]" msgstr "" @@ -7409,6 +7389,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 +7413,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:140 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" -#: builtin/push.c:144 +#: builtin/push.c:143 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -7458,7 +7442,7 @@ msgid "" "%s" msgstr "" -#: builtin/push.c:159 +#: builtin/push.c:158 #, c-format msgid "" "You are not currently on a branch.\n" @@ -7468,7 +7452,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -#: builtin/push.c:173 +#: builtin/push.c:172 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -7477,12 +7461,12 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" -#: builtin/push.c:181 +#: builtin/push.c:180 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:184 +#: builtin/push.c:183 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -7490,11 +7474,11 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:207 +#: builtin/push.c:206 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 +7489,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 +7499,12 @@ msgid "" "'current' instead of 'simple' if you sometimes use older versions of Git)" msgstr "" -#: builtin/push.c:274 +#: builtin/push.c:273 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:281 +#: builtin/push.c:280 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 +7512,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:286 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 +7520,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:299 +#: builtin/push.c:292 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 +7529,33 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:306 +#: builtin/push.c:299 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" -#: builtin/push.c:309 +#: builtin/push.c:302 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:361 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:379 +#: builtin/push.c:365 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:412 +#: builtin/push.c:395 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:413 +#: builtin/push.c:396 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -7592,95 +7568,95 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:428 +#: builtin/push.c:411 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:429 +#: builtin/push.c:412 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:434 +#: builtin/push.c:417 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:435 +#: builtin/push.c:418 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:440 +#: builtin/push.c:423 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:500 +#: builtin/push.c:483 msgid "repository" msgstr "" -#: builtin/push.c:501 +#: builtin/push.c:484 msgid "push all refs" msgstr "" -#: builtin/push.c:502 +#: builtin/push.c:485 msgid "mirror all refs" msgstr "" -#: builtin/push.c:504 +#: builtin/push.c:487 msgid "delete refs" msgstr "" -#: builtin/push.c:505 +#: builtin/push.c:488 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:508 +#: builtin/push.c:491 msgid "force updates" msgstr "" -#: builtin/push.c:510 +#: builtin/push.c:493 msgid "refname>:<expect" msgstr "" -#: builtin/push.c:511 +#: builtin/push.c:494 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:513 +#: builtin/push.c:496 msgid "check" msgstr "" -#: builtin/push.c:514 +#: builtin/push.c:497 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:516 +#: builtin/push.c:499 msgid "use thin pack" msgstr "" -#: builtin/push.c:517 builtin/push.c:518 +#: builtin/push.c:500 builtin/push.c:501 msgid "receive pack program" msgstr "" -#: builtin/push.c:519 +#: builtin/push.c:502 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:522 +#: builtin/push.c:505 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:524 +#: builtin/push.c:507 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:525 +#: builtin/push.c:508 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:535 +#: builtin/push.c:518 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:537 +#: builtin/push.c:520 msgid "--delete doesn't make sense without any refs" msgstr "" @@ -8251,67 +8227,75 @@ msgstr "" msgid "be verbose; must be placed before a subcommand" msgstr "" -#: builtin/repack.c:15 +#: builtin/repack.c:16 msgid "git repack [options]" msgstr "" -#: builtin/repack.c:143 +#: builtin/repack.c:156 msgid "pack everything in a single pack" msgstr "" -#: builtin/repack.c:145 +#: builtin/repack.c:158 msgid "same as -a, and turn unreachable objects loose" msgstr "" -#: builtin/repack.c:148 +#: builtin/repack.c:161 msgid "remove redundant packs, and run git-prune-packed" msgstr "" -#: builtin/repack.c:150 +#: builtin/repack.c:163 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "" -#: builtin/repack.c:152 +#: builtin/repack.c:165 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" -#: builtin/repack.c:154 +#: builtin/repack.c:167 msgid "do not run git-update-server-info" msgstr "" -#: builtin/repack.c:157 +#: builtin/repack.c:170 msgid "pass --local to git-pack-objects" msgstr "" -#: builtin/repack.c:158 +#: builtin/repack.c:172 +msgid "write bitmap index" +msgstr "" + +#: builtin/repack.c:173 msgid "approxidate" msgstr "" -#: builtin/repack.c:159 +#: builtin/repack.c:174 msgid "with -A, do not loosen objects older than this" msgstr "" -#: builtin/repack.c:161 +#: builtin/repack.c:176 msgid "size of the window used for delta compression" msgstr "" -#: builtin/repack.c:162 builtin/repack.c:166 +#: builtin/repack.c:177 builtin/repack.c:181 msgid "bytes" msgstr "" -#: builtin/repack.c:163 +#: builtin/repack.c:178 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -#: builtin/repack.c:165 +#: builtin/repack.c:180 msgid "limits the maximum delta depth" msgstr "" -#: builtin/repack.c:167 +#: builtin/repack.c:182 msgid "maximum size of each packfile" msgstr "" -#: builtin/repack.c:343 +#: builtin/repack.c:184 +msgid "repack objects in packs marked with .keep" +msgstr "" + +#: builtin/repack.c:371 #, c-format msgid "removing '%s' failed" msgstr "" @@ -8403,74 +8387,82 @@ 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:273 msgid "be quiet, only report errors" msgstr "" -#: builtin/reset.c:264 +#: builtin/reset.c:275 msgid "reset HEAD and index" msgstr "" -#: builtin/reset.c:265 +#: builtin/reset.c:276 msgid "reset only HEAD" msgstr "" -#: builtin/reset.c:267 builtin/reset.c:269 +#: builtin/reset.c:278 builtin/reset.c:280 msgid "reset HEAD, index and working tree" msgstr "" -#: builtin/reset.c:271 +#: builtin/reset.c:282 msgid "reset HEAD but keep local changes" msgstr "" -#: builtin/reset.c:289 +#: builtin/reset.c:285 +msgid "record only the fact that removed paths will be added later" +msgstr "" + +#: builtin/reset.c:302 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "" -#: builtin/reset.c:292 builtin/reset.c:300 +#: builtin/reset.c:305 builtin/reset.c:313 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/reset.c:297 +#: builtin/reset.c:310 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "" -#: builtin/reset.c:306 +#: builtin/reset.c:319 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:315 +#: builtin/reset.c:328 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:317 +#: builtin/reset.c:330 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:327 +#: builtin/reset.c:340 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" #: builtin/reset.c:344 +msgid "-N can only be used with --mixed" +msgstr "" + +#: builtin/reset.c:361 msgid "Unstaged changes after reset:" msgstr "" -#: builtin/reset.c:350 +#: builtin/reset.c:367 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "" -#: builtin/reset.c:355 +#: builtin/reset.c:372 msgid "Could not write new index file." msgstr "" @@ -8490,7 +8482,7 @@ msgstr "" msgid "output in stuck long form" msgstr "" -#: builtin/rev-parse.c:486 +#: builtin/rev-parse.c:497 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -8556,35 +8548,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 +8831,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:255 msgid "reason" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:255 msgid "reason of the update" msgstr "" @@ -8866,32 +8858,32 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "" -#: builtin/tag.c:60 +#: builtin/tag.c:67 #, c-format msgid "malformed object at '%s'" msgstr "" -#: builtin/tag.c:207 +#: builtin/tag.c:239 #, c-format msgid "tag name too long: %.*s..." msgstr "" -#: builtin/tag.c:212 +#: builtin/tag.c:244 #, c-format msgid "tag '%s' not found." msgstr "" -#: builtin/tag.c:227 +#: builtin/tag.c:259 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "" -#: builtin/tag.c:239 +#: builtin/tag.c:271 #, c-format msgid "could not verify the tag '%s'" msgstr "" -#: builtin/tag.c:249 +#: builtin/tag.c:281 #, c-format msgid "" "\n" @@ -8899,7 +8891,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "" -#: builtin/tag.c:253 +#: builtin/tag.c:285 #, c-format msgid "" "\n" @@ -8908,254 +8900,271 @@ msgid "" "want to.\n" msgstr "" -#: builtin/tag.c:292 +#: builtin/tag.c:324 msgid "unable to sign the tag" msgstr "" -#: builtin/tag.c:294 +#: builtin/tag.c:326 msgid "unable to write tag file" msgstr "" -#: builtin/tag.c:319 +#: builtin/tag.c:351 msgid "bad object type." msgstr "" -#: builtin/tag.c:332 +#: builtin/tag.c:364 msgid "tag header too big." msgstr "" -#: builtin/tag.c:368 +#: builtin/tag.c:400 msgid "no tag message?" msgstr "" -#: builtin/tag.c:374 +#: builtin/tag.c:406 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:423 +#: builtin/tag.c:455 msgid "switch 'points-at' requires an object" msgstr "" -#: builtin/tag.c:425 +#: builtin/tag.c:457 #, c-format msgid "malformed object name '%s'" msgstr "" -#: builtin/tag.c:445 +#: builtin/tag.c:480 +#, c-format +msgid "unsupported sort specification %s" +msgstr "" + +#: builtin/tag.c:500 msgid "list tag names" msgstr "" -#: builtin/tag.c:447 +#: builtin/tag.c:502 msgid "print <n> lines of each tag message" msgstr "" -#: builtin/tag.c:449 +#: builtin/tag.c:504 msgid "delete tags" msgstr "" -#: builtin/tag.c:450 +#: builtin/tag.c:505 msgid "verify tags" msgstr "" -#: builtin/tag.c:452 +#: builtin/tag.c:507 msgid "Tag creation options" msgstr "" -#: builtin/tag.c:454 +#: builtin/tag.c:509 msgid "annotated tag, needs a message" msgstr "" -#: builtin/tag.c:456 +#: builtin/tag.c:511 msgid "tag message" msgstr "" -#: builtin/tag.c:458 +#: builtin/tag.c:513 msgid "annotated and GPG-signed tag" msgstr "" -#: builtin/tag.c:462 +#: builtin/tag.c:517 msgid "use another key to sign the tag" msgstr "" -#: builtin/tag.c:463 +#: builtin/tag.c:518 msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:464 +#: builtin/tag.c:519 msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:466 +#: builtin/tag.c:521 +msgid "sort tags" +msgstr "" + +#: builtin/tag.c:525 msgid "Tag listing options" msgstr "" -#: builtin/tag.c:469 +#: builtin/tag.c:528 builtin/tag.c:534 msgid "print only tags that contain the commit" msgstr "" -#: builtin/tag.c:475 +#: builtin/tag.c:540 msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:501 +#: builtin/tag.c:566 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:518 +#: builtin/tag.c:578 +msgid "--sort and -n are incompatible" +msgstr "" + +#: builtin/tag.c:585 msgid "-n option is only allowed with -l." msgstr "" -#: builtin/tag.c:520 +#: builtin/tag.c:587 msgid "--contains option is only allowed with -l." msgstr "" -#: builtin/tag.c:522 +#: builtin/tag.c:589 msgid "--points-at option is only allowed with -l." msgstr "" -#: builtin/tag.c:530 +#: builtin/tag.c:597 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:550 +#: builtin/tag.c:617 msgid "too many params" msgstr "" -#: builtin/tag.c:556 +#: builtin/tag.c:623 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:561 +#: builtin/tag.c:628 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:579 +#: builtin/tag.c:646 #, c-format msgid "%s: cannot lock the ref" msgstr "" -#: builtin/tag.c:581 +#: builtin/tag.c:648 #, c-format msgid "%s: cannot update the ref" msgstr "" -#: builtin/tag.c:583 +#: builtin/tag.c:650 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" -#: builtin/update-index.c:402 +#: builtin/unpack-objects.c:483 +msgid "Unpacking objects" +msgstr "" + +#: builtin/update-index.c:399 msgid "git update-index [options] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:720 +#: builtin/update-index.c:748 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:723 +#: builtin/update-index.c:751 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:726 +#: builtin/update-index.c:754 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:728 +#: builtin/update-index.c:756 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:730 +#: builtin/update-index.c:758 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:732 +#: builtin/update-index.c:760 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:735 +#: builtin/update-index.c:763 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:739 +#: builtin/update-index.c:767 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:743 -msgid "<mode> <object> <path>" +#: builtin/update-index.c:771 +msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:744 +#: builtin/update-index.c:772 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:748 +#: builtin/update-index.c:776 msgid "(+/-)x" msgstr "" -#: builtin/update-index.c:749 +#: builtin/update-index.c:777 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/update-index.c:753 +#: builtin/update-index.c:781 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:756 +#: builtin/update-index.c:784 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:759 +#: builtin/update-index.c:787 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:762 +#: builtin/update-index.c:790 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:765 +#: builtin/update-index.c:793 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:767 +#: builtin/update-index.c:795 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:769 +#: builtin/update-index.c:797 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:771 +#: builtin/update-index.c:799 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:775 +#: builtin/update-index.c:803 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:779 +#: builtin/update-index.c:807 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:783 +#: builtin/update-index.c:811 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:787 +#: builtin/update-index.c:815 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:790 +#: builtin/update-index.c:818 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:792 +#: builtin/update-index.c:820 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:796 +#: builtin/update-index.c:824 msgid "write index in this format" msgstr "" @@ -9171,19 +9180,19 @@ msgstr "" msgid "git update-ref [options] --stdin [-z]" msgstr "" -#: builtin/update-ref.c:255 +#: builtin/update-ref.c:256 msgid "delete the reference" msgstr "" -#: builtin/update-ref.c:257 +#: builtin/update-ref.c:258 msgid "update <refname> not the one it points to" msgstr "" -#: builtin/update-ref.c:258 +#: builtin/update-ref.c:259 msgid "stdin has NUL-terminated arguments" msgstr "" -#: builtin/update-ref.c:259 +#: builtin/update-ref.c:260 msgid "read updates from stdin" msgstr "" @@ -9238,23 +9247,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 +9351,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 +9369,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 +9447,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 +9566,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 +9657,11 @@ msgstr "" msgid "Pull is not possible because you have unmerged files." msgstr "" -#: git-pull.sh:223 +#: git-pull.sh:247 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:271 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -9666,15 +9669,15 @@ msgid "" "Warning: commit $orig_head." msgstr "" -#: git-pull.sh:272 +#: git-pull.sh:296 msgid "Cannot merge multiple branches into empty head" msgstr "" -#: git-pull.sh:276 +#: git-pull.sh:300 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 +9685,58 @@ msgid "" "\"." msgstr "" -#: git-rebase.sh:158 +#: git-rebase.sh:164 msgid "Applied autostash." msgstr "" -#: git-rebase.sh:161 +#: git-rebase.sh:167 #, sh-format msgid "Cannot store $stash_sha1" msgstr "" -#: git-rebase.sh:162 +#: git-rebase.sh:168 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:207 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: git-rebase.sh:206 +#: git-rebase.sh:212 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" -#: git-rebase.sh:346 +#: git-rebase.sh:350 msgid "The --exec option must be used with the --interactive option" msgstr "" -#: git-rebase.sh:351 +#: git-rebase.sh:355 msgid "No rebase in progress?" msgstr "" -#: git-rebase.sh:362 +#: git-rebase.sh:366 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: git-rebase.sh:369 +#: git-rebase.sh:373 msgid "Cannot read HEAD" msgstr "" -#: git-rebase.sh:372 +#: git-rebase.sh:376 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:394 #, sh-format msgid "Could not move back to $head_name" msgstr "" -#: git-rebase.sh:409 +#: git-rebase.sh:413 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -9746,65 +9749,64 @@ msgid "" "valuable there." msgstr "" -#: git-rebase.sh:456 +#: git-rebase.sh:464 #, sh-format msgid "invalid upstream $upstream_name" msgstr "" -#: git-rebase.sh:480 +#: git-rebase.sh:488 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" -#: git-rebase.sh:483 git-rebase.sh:487 +#: git-rebase.sh:491 git-rebase.sh:495 #, sh-format msgid "$onto_name: there is no merge base" msgstr "" -#: git-rebase.sh:492 +#: git-rebase.sh:500 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:515 +#: git-rebase.sh:523 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "" -#: git-rebase.sh:548 +#: git-rebase.sh:556 msgid "Cannot autostash" msgstr "" -#: git-rebase.sh:553 +#: git-rebase.sh:561 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "" -#: git-rebase.sh:557 +#: git-rebase.sh:565 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:577 +#: git-rebase.sh:585 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:581 +#: git-rebase.sh:589 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:592 +#: git-rebase.sh:600 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" -#. Detach HEAD and reset the tree -#: git-rebase.sh:601 +#: git-rebase.sh:609 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:611 +#: git-rebase.sh:619 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" @@ -9923,21 +9925,21 @@ msgstr "" msgid "Index was not unstashed." msgstr "" -#: git-stash.sh:523 +#: git-stash.sh:529 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "" -#: git-stash.sh:524 +#: git-stash.sh:530 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "" -#: git-stash.sh:531 +#: git-stash.sh:537 msgid "No branch name specified" msgstr "" -#: git-stash.sh:603 +#: git-stash.sh:609 msgid "(To restore them type \"git stash apply\")" msgstr "" @@ -9951,31 +9953,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:299 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "" -#: git-submodule.sh:403 +#: git-submodule.sh:409 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -#: git-submodule.sh:413 +#: git-submodule.sh:419 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:430 +#: git-submodule.sh:436 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:434 +#: git-submodule.sh:440 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -9983,236 +9985,235 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:452 +#: git-submodule.sh:458 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:454 +#: git-submodule.sh:460 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:462 +#: git-submodule.sh:468 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:464 +#: git-submodule.sh:470 #, 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:472 #, 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:473 #, 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:475 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:481 +#: git-submodule.sh:487 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:486 +#: git-submodule.sh:492 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:495 +#: git-submodule.sh:501 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:539 +#: git-submodule.sh:545 #, sh-format msgid "Entering '$prefix$displaypath'" msgstr "" -#: git-submodule.sh:559 +#: git-submodule.sh:565 #, sh-format msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." msgstr "" -#: git-submodule.sh:605 +#: git-submodule.sh:611 #, sh-format msgid "No url found for submodule path '$displaypath' in .gitmodules" msgstr "" -#: git-submodule.sh:614 +#: git-submodule.sh:620 #, sh-format msgid "Failed to register url for submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:616 +#: git-submodule.sh:622 #, sh-format msgid "Submodule '$name' ($url) registered for path '$displaypath'" msgstr "" -#: git-submodule.sh:633 +#: git-submodule.sh:639 #, sh-format msgid "Failed to register update mode for submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:671 +#: git-submodule.sh:677 #, sh-format msgid "Use '.' if you really want to deinitialize all submodules" msgstr "" -#: git-submodule.sh:688 +#: git-submodule.sh:694 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" -#: git-submodule.sh:689 +#: git-submodule.sh:695 #, 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:701 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "" -#: git-submodule.sh:698 +#: git-submodule.sh:704 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "" -#: git-submodule.sh:699 +#: git-submodule.sh:705 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" -#: git-submodule.sh:702 +#: git-submodule.sh:708 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "" -#: git-submodule.sh:711 +#: git-submodule.sh:717 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" -#: git-submodule.sh:834 +#: git-submodule.sh:833 #, sh-format msgid "" "Submodule path '$displaypath' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -#: git-submodule.sh:847 +#: git-submodule.sh:846 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:856 +#: git-submodule.sh:855 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:880 +#: git-submodule.sh:879 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "" +#: git-submodule.sh:893 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" +msgstr "" + #: git-submodule.sh:894 #, sh-format +msgid "Submodule path '$displaypath': checked out '$sha1'" +msgstr "" + +#: git-submodule.sh:898 +#, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:895 +#: git-submodule.sh:899 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:900 +#: git-submodule.sh:904 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:901 +#: git-submodule.sh:905 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:906 +#: git-submodule.sh:910 #, sh-format msgid "" "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:907 +#: git-submodule.sh:911 #, 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:941 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:1048 +#: git-submodule.sh:1049 msgid "The --cached option cannot be used with the --files option" msgstr "" -#. unexpected type -#: git-submodule.sh:1096 +#: git-submodule.sh:1097 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:1116 +#: git-submodule.sh:1117 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:1119 +#: git-submodule.sh:1120 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:1122 +#: git-submodule.sh:1123 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:1147 +#: git-submodule.sh:1148 msgid "blob" msgstr "" -#: git-submodule.sh:1261 +#: git-submodule.sh:1262 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:1325 +#: git-submodule.sh:1326 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "" |