1 # SOME DESCRIPTIVE TITLE.
2 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3 # This file is distributed under the same license as the PACKAGE package.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11 "POT-Creation-Date: 2015-04-03 08:13+0800\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
17 "Content-Type: text/plain; charset=CHARSET\n"
18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
28 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
29 "as appropriate to mark resolution and make a commit."
33 msgid "git archive [<options>] <tree-ish> [<path>...]"
37 msgid "git archive --list"
42 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
46 msgid "git archive --remote <repo> [--exec <cmd>] --list"
49 #: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328
51 msgid "pathspec '%s' did not match any files"
59 msgid "archive format"
62 #: archive.c:428 builtin/log.c:1204
67 msgid "prepend prefix to each pathname in the archive"
70 #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516
71 #: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986
72 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101
73 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394
74 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151
78 #: archive.c:431 builtin/archive.c:89
79 msgid "write the archive to this file"
83 msgid "read .gitattributes in working directory"
87 msgid "report archived files on stderr"
95 msgid "compress faster"
99 msgid "compress better"
103 msgid "list supported archive formats"
106 #: archive.c:449 builtin/archive.c:90 builtin/clone.c:86
110 #: archive.c:450 builtin/archive.c:91
111 msgid "retrieve the archive from remote repository <repo>"
114 #: archive.c:451 builtin/archive.c:92 builtin/notes.c:478
118 #: archive.c:452 builtin/archive.c:93
119 msgid "path to the remote git-upload-archive command"
124 "Negative patterns are ignored in git attributes\n"
125 "Use '\\!' for literal leading exclamation."
130 msgid "Not setting branch %s as its own upstream."
135 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
140 msgid "Branch %s set up to track remote branch %s from %s."
145 msgid "Branch %s set up to track local branch %s by rebasing."
150 msgid "Branch %s set up to track local branch %s."
155 msgid "Branch %s set up to track remote ref %s by rebasing."
160 msgid "Branch %s set up to track remote ref %s."
165 msgid "Branch %s set up to track local ref %s by rebasing."
170 msgid "Branch %s set up to track local ref %s."
175 msgid "Not tracking: ambiguous information for ref %s"
180 msgid "'%s' is not a valid branch name."
185 msgid "A branch named '%s' already exists."
189 msgid "Cannot force update the current branch."
194 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
199 msgid "the requested upstream branch '%s' does not exist"
205 "If you are planning on basing your work on an upstream\n"
206 "branch that already exists at the remote, you may need to\n"
207 "run \"git fetch\" to retrieve it.\n"
209 "If you are planning to push out a new local branch that\n"
210 "will track its remote counterpart, you may want to use\n"
211 "\"git push -u\" to set the upstream config as you push."
216 msgid "Not a valid object name: '%s'."
221 msgid "Ambiguous object name: '%s'."
226 msgid "Not a valid branch point: '%s'."
231 msgid "'%s' does not look like a v2 bundle file"
236 msgid "unrecognized header: %s%s (%d)"
239 #: bundle.c:87 builtin/commit.c:766
241 msgid "could not open '%s'"
245 msgid "Repository lacks these prerequisite commits:"
248 #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
249 #: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330
250 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358
251 #: builtin/shortlog.c:158
252 msgid "revision walk setup failed"
257 msgid "The bundle contains this ref:"
258 msgid_plural "The bundle contains these %d refs:"
263 msgid "The bundle records a complete history."
268 msgid "The bundle requires this ref:"
269 msgid_plural "The bundle requires these %d refs:"
274 msgid "Could not spawn pack-objects"
278 msgid "pack-objects died"
282 msgid "rev-list died"
287 msgid "ref '%s' is excluded by the rev-list options"
290 #: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
292 msgid "unrecognized argument: %s"
296 msgid "Refusing to create empty bundle."
301 msgid "cannot create '%s'"
305 msgid "index-pack died"
310 msgid "invalid color value: %.*s"
315 msgid "could not parse %s"
320 msgid "%s %s is not a commit!"
323 #: compat/obstack.c:406 compat/obstack.c:408
324 msgid "memory exhausted"
327 #: config.c:474 config.c:476
329 msgid "bad config file line %d in %s"
334 msgid "bad numeric config value '%s' for '%s' in %s: %s"
339 msgid "bad numeric config value '%s' for '%s': %s"
344 msgid "failed to expand user dir in: '%s'"
347 #: config.c:757 config.c:768
349 msgid "bad zlib compression level %d"
354 msgid "invalid mode for object creation: %s"
358 msgid "unable to parse command-line config"
362 msgid "unknown error occured while reading the configuration files"
367 msgid "unable to parse '%s' from command-line config"
372 msgid "bad config variable '%s' in file '%s' at line %d"
377 msgid "%s has multiple values"
381 msgid "Could not run 'git rev-list'"
386 msgid "failed write to rev-list: %s"
391 msgid "failed to close rev-list's stdin: %s"
395 msgid "in the future"
400 msgid "%lu second ago"
401 msgid_plural "%lu seconds ago"
407 msgid "%lu minute ago"
408 msgid_plural "%lu minutes ago"
415 msgid_plural "%lu hours ago"
422 msgid_plural "%lu days ago"
429 msgid_plural "%lu weeks ago"
435 msgid "%lu month ago"
436 msgid_plural "%lu months ago"
443 msgid_plural "%lu years"
447 #. TRANSLATORS: "%s" is "<n> years"
450 msgid "%s, %lu month ago"
451 msgid_plural "%s, %lu months ago"
455 #: date.c:154 date.c:159
458 msgid_plural "%lu years ago"
462 #: diffcore-order.c:24
464 msgid "failed to read orderfile '%s'"
467 #: diffcore-rename.c:536
468 msgid "Performing inexact rename detection"
473 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
478 msgid " Unknown dirstat parameter '%s'\n"
483 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
489 "Found errors in 'diff.dirstat' config variable:\n"
495 msgid "external diff died, stopping at %s"
499 msgid "--follow requires exactly one pathspec"
505 "Failed to parse --dirstat/-X option parameter:\n"
511 msgid "Failed to parse --submodule option parameter: '%s'"
514 #: gpg-interface.c:129 gpg-interface.c:200
515 msgid "could not run gpg."
518 #: gpg-interface.c:141
519 msgid "gpg did not accept the data"
522 #: gpg-interface.c:152
523 msgid "gpg failed to sign the data"
526 #: gpg-interface.c:185
528 msgid "could not create temporary file '%s': %s"
531 #: gpg-interface.c:188
533 msgid "failed writing detached signature to '%s': %s"
538 msgid "'%s': unable to read %s"
548 msgid "'%s': short read %s"
553 msgid "available git commands in '%s'"
557 msgid "git commands available from elsewhere on your $PATH"
561 msgid "The most commonly used git commands are:"
567 "'%s' appears to be a git command, but we were not\n"
568 "able to execute it. Maybe git-%s is broken?"
572 msgid "Uh oh. Your system reports no Git commands at all."
578 "WARNING: You called a Git command named '%s', which does not exist.\n"
579 "Continuing under the assumption that you meant '%s'"
584 msgid "in %0.1f seconds automatically..."
589 msgid "git: '%s' is not a git command. See 'git --help'."
592 #: help.c:384 help.c:444
598 "Did you mean one of these?"
608 msgid "BUG: reopen a lockfile that is still open"
612 msgid "BUG: reopen a lockfile that has been committed"
616 msgid "failed to read the cache"
619 #: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580
620 #: builtin/clone.c:662
621 msgid "unable to write new index file"
624 #: merge-recursive.c:189
626 msgid "(bad commit)\n"
629 #: merge-recursive.c:209
631 msgid "addinfo_cache failed for path '%s'"
634 #: merge-recursive.c:270
635 msgid "error building trees"
638 #: merge-recursive.c:688
640 msgid "failed to create path '%s'%s"
643 #: merge-recursive.c:699
645 msgid "Removing %s to make room for subdirectory\n"
648 #: merge-recursive.c:713 merge-recursive.c:734
649 msgid ": perhaps a D/F conflict?"
652 #: merge-recursive.c:724
654 msgid "refusing to lose untracked file at '%s'"
657 #: merge-recursive.c:764
659 msgid "cannot read object %s '%s'"
662 #: merge-recursive.c:766
664 msgid "blob expected for %s '%s'"
667 #: merge-recursive.c:789 builtin/clone.c:321
669 msgid "failed to open '%s'"
672 #: merge-recursive.c:797
674 msgid "failed to symlink '%s'"
677 #: merge-recursive.c:800
679 msgid "do not know what to do with %06o %s '%s'"
682 #: merge-recursive.c:938
683 msgid "Failed to execute internal merge"
686 #: merge-recursive.c:942
688 msgid "Unable to add %s to database"
691 #: merge-recursive.c:958
692 msgid "unsupported object type in the tree"
695 #: merge-recursive.c:1033 merge-recursive.c:1047
698 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
702 #: merge-recursive.c:1039 merge-recursive.c:1052
705 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
709 #: merge-recursive.c:1093
713 #: merge-recursive.c:1093
717 #: merge-recursive.c:1149
719 msgid "%s is a directory in %s adding as %s instead"
722 #: merge-recursive.c:1171
725 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
726 "\"->\"%s\" in \"%s\"%s"
729 #: merge-recursive.c:1176
730 msgid " (left unresolved)"
733 #: merge-recursive.c:1230
735 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
738 #: merge-recursive.c:1260
740 msgid "Renaming %s to %s and %s to %s instead"
743 #: merge-recursive.c:1459
745 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
748 #: merge-recursive.c:1469
750 msgid "Adding merged %s"
753 #: merge-recursive.c:1474 merge-recursive.c:1672
755 msgid "Adding as %s instead"
758 #: merge-recursive.c:1525
760 msgid "cannot read object %s"
763 #: merge-recursive.c:1528
765 msgid "object %s is not a blob"
768 #: merge-recursive.c:1576
772 #: merge-recursive.c:1576
776 #: merge-recursive.c:1586
780 #: merge-recursive.c:1593
784 #: merge-recursive.c:1627
786 msgid "Skipped %s (merged same as existing)"
789 #: merge-recursive.c:1641
791 msgid "Auto-merging %s"
794 #: merge-recursive.c:1645 git-submodule.sh:1150
798 #: merge-recursive.c:1646
800 msgid "CONFLICT (%s): Merge conflict in %s"
803 #: merge-recursive.c:1732
808 #: merge-recursive.c:1757
809 msgid "file/directory"
812 #: merge-recursive.c:1763
813 msgid "directory/file"
816 #: merge-recursive.c:1768
818 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
821 #: merge-recursive.c:1778
826 #: merge-recursive.c:1795
827 msgid "Fatal merge failure, shouldn't happen."
830 #: merge-recursive.c:1814
831 msgid "Already up-to-date!"
834 #: merge-recursive.c:1823
836 msgid "merging of trees %s and %s failed"
839 #: merge-recursive.c:1853
841 msgid "Unprocessed path??? %s"
844 #: merge-recursive.c:1901
848 #: merge-recursive.c:1914
850 msgid "found %u common ancestor:"
851 msgid_plural "found %u common ancestors:"
855 #: merge-recursive.c:1951
856 msgid "merge returned no commit"
859 #: merge-recursive.c:2008
861 msgid "Could not parse object '%s'"
864 #: merge-recursive.c:2019 builtin/merge.c:667
865 msgid "Unable to write index."
869 msgid "Cannot commit uninitialized/unreferenced notes tree"
874 msgid "Bad notes.rewriteMode value: '%s'"
879 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
882 #. TRANSLATORS: The first %s is the name of the
883 #. environment variable, the second %s is its value
886 msgid "Bad %s value: '%s'"
891 msgid "unable to parse object: %s"
894 #: parse-options.c:546
898 #: parse-options.c:564
903 #. TRANSLATORS: the colon here should align with the
904 #. one in "usage: %s" translation
905 #: parse-options.c:568
910 #: parse-options.c:571
915 #: parse-options.c:605
920 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
925 "global 'literal' pathspec setting is incompatible with all other global "
930 msgid "invalid parameter for pathspec magic 'prefix'"
935 msgid "Invalid pathspec magic '%.*s' in '%s'"
940 msgid "Missing ')' at the end of pathspec magic in '%s'"
945 msgid "Unimplemented pathspec magic '%c' in '%s'"
950 msgid "%s: 'literal' and 'glob' are incompatible"
955 msgid "%s: '%s' is outside repository"
960 msgid "Pathspec '%s' is in submodule '%.*s'"
965 msgid "%s: pathspec magic not supported by this command: %s"
970 msgid "pathspec '%s' is beyond a symbolic link"
975 "There is nothing to exclude from by :(exclude) patterns.\n"
976 "Perhaps you forgot to add either ':/' or '.' ?"
980 msgid "unable to parse --pretty format"
990 "index.version set, but the value is invalid.\n"
997 "GIT_INDEX_VERSION set, but the value is invalid.\n"
1003 msgid "Cannot fetch both %s and %s to %s"
1008 msgid "%s usually tracks %s, not %s"
1013 msgid "%s tracks both %s and %s"
1017 msgid "Internal error"
1022 msgid "Your branch is based on '%s', but the upstream is gone.\n"
1026 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1031 msgid "Your branch is up-to-date with '%s'.\n"
1036 msgid "Your branch is ahead of '%s' by %d commit.\n"
1037 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1042 msgid " (use \"git push\" to publish your local commits)\n"
1047 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1049 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1054 msgid " (use \"git pull\" to update your local branch)\n"
1060 "Your branch and '%s' have diverged,\n"
1061 "and have %d and %d different commit each, respectively.\n"
1063 "Your branch and '%s' have diverged,\n"
1064 "and have %d and %d different commits each, respectively.\n"
1069 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1073 msgid "--first-parent is incompatible with --bisect"
1077 msgid "open /dev/null failed"
1082 msgid "dup2(%d,%d) failed"
1086 msgid "failed to sign the push certificate"
1090 msgid "the receiving end does not support --signed push"
1094 msgid "the receiving end does not support --atomic push"
1097 #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995
1098 #: builtin/merge.c:1005
1100 msgid "Could not open '%s' for writing"
1103 #: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997
1104 #: builtin/merge.c:1010
1106 msgid "Could not write to '%s'"
1111 "after resolving the conflicts, mark the corrected paths\n"
1112 "with 'git add <paths>' or 'git rm <paths>'"
1117 "after resolving the conflicts, mark the corrected paths\n"
1118 "with 'git add <paths>' or 'git rm <paths>'\n"
1119 "and commit the result with 'git commit'"
1122 #: sequencer.c:211 sequencer.c:861 sequencer.c:944
1124 msgid "Could not write to %s"
1129 msgid "Error wrapping up %s"
1133 msgid "Your local changes would be overwritten by cherry-pick."
1137 msgid "Your local changes would be overwritten by revert."
1141 msgid "Commit your changes or stash them to proceed."
1144 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1147 msgid "%s: Unable to write new index file"
1151 msgid "Could not resolve HEAD commit\n"
1155 msgid "Unable to update cache tree\n"
1160 msgid "Could not parse commit %s\n"
1165 msgid "Could not parse parent commit %s\n"
1169 msgid "Your index file is unmerged."
1174 msgid "Commit %s is a merge but no -m option was given."
1179 msgid "Commit %s does not have parent %d"
1184 msgid "Mainline was specified but commit %s is not a merge."
1187 #. TRANSLATORS: The first %s will be "revert" or
1188 #. "cherry-pick", the second %s a SHA1
1191 msgid "%s: cannot parse parent commit %s"
1196 msgid "Cannot get commit message for %s"
1201 msgid "could not revert %s... %s"
1206 msgid "could not apply %s... %s"
1210 msgid "empty commit set passed"
1215 msgid "git %s: failed to read the index"
1220 msgid "git %s: failed to refresh the index"
1225 msgid "Cannot %s during a %s"
1230 msgid "Could not parse line %d."
1234 msgid "No commits parsed."
1239 msgid "Could not open %s"
1244 msgid "Could not read %s."
1249 msgid "Unusable instruction sheet: %s"
1254 msgid "Invalid key: %s"
1259 msgid "Invalid value for %s: %s"
1264 msgid "Malformed options sheet: %s"
1268 msgid "a cherry-pick or revert is already in progress"
1272 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1277 msgid "Could not create sequencer directory %s"
1280 #: sequencer.c:863 sequencer.c:948
1282 msgid "Error wrapping up %s."
1285 #: sequencer.c:882 sequencer.c:1018
1286 msgid "no cherry-pick or revert in progress"
1290 msgid "cannot resolve HEAD"
1294 msgid "cannot abort from a branch yet to be born"
1297 #: sequencer.c:908 builtin/apply.c:4288
1299 msgid "cannot open %s: %s"
1304 msgid "cannot read %s: %s"
1308 msgid "unexpected end of file"
1313 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1318 msgid "Could not format %s."
1323 msgid "%s: can't cherry-pick a %s"
1328 msgid "%s: bad revision"
1332 msgid "Can't revert as initial commit"
1336 msgid "Can't cherry-pick into empty head"
1341 "Git normally never creates a ref that ends with 40 hex characters\n"
1342 "because it will be ignored when you just specify 40-hex. These refs\n"
1343 "may be created by mistake. For example,\n"
1345 " git checkout -b $br $(git rev-parse ...)\n"
1347 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1348 "examine these refs and maybe delete them. Turn this message off by\n"
1349 "running \"git config advice.objectNameWarning false\""
1353 msgid "HEAD does not point to a branch"
1358 msgid "No such branch: '%s'"
1363 msgid "No upstream configured for branch '%s'"
1368 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1371 #: submodule.c:64 submodule.c:98
1372 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1375 #: submodule.c:68 submodule.c:102
1377 msgid "Could not find section in .gitmodules where path=%s"
1382 msgid "Could not update .gitmodules entry %s"
1387 msgid "Could not remove .gitmodules entry for %s"
1391 msgid "staging updated .gitmodules failed"
1394 #: submodule.c:1109 builtin/init-db.c:371
1396 msgid "Could not create git link %s"
1401 msgid "Could not set core.worktree in %s"
1404 #: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1407 msgid "unknown value '%s' for key '%s'"
1410 #: trailer.c:543 trailer.c:548 builtin/remote.c:290
1412 msgid "more than one %s"
1417 msgid "empty trailer token in trailer '%.*s'"
1422 msgid "could not read input file '%s'"
1426 msgid "could not read from stdin"
1429 #: unpack-trees.c:202
1430 msgid "Checking out files"
1434 msgid "invalid URL scheme name or missing '://' suffix"
1437 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1439 msgid "invalid %XX escape sequence"
1443 msgid "missing host and scheme is not 'file:'"
1447 msgid "a 'file:' URL may not have a port number"
1451 msgid "invalid characters in host name"
1454 #: urlmatch.c:244 urlmatch.c:255
1455 msgid "invalid port number"
1459 msgid "invalid '..' path segment"
1464 msgid "unable to access '%s': %s"
1469 msgid "unable to access '%s'"
1474 msgid "unable to look up current user in the passwd file: %s"
1478 msgid "no such user"
1482 msgid "unable to get current working directory"
1486 msgid "Unmerged paths:"
1489 #: wt-status.c:177 wt-status.c:204
1491 msgid " (use \"git reset %s <file>...\" to unstage)"
1494 #: wt-status.c:179 wt-status.c:206
1495 msgid " (use \"git rm --cached <file>...\" to unstage)"
1499 msgid " (use \"git add <file>...\" to mark resolution)"
1502 #: wt-status.c:185 wt-status.c:189
1503 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1507 msgid " (use \"git rm <file>...\" to mark resolution)"
1510 #: wt-status.c:198 wt-status.c:878
1511 msgid "Changes to be committed:"
1514 #: wt-status.c:216 wt-status.c:887
1515 msgid "Changes not staged for commit:"
1519 msgid " (use \"git add <file>...\" to update what will be committed)"
1523 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1528 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1532 msgid " (commit or discard the untracked or modified content in submodules)"
1537 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1541 msgid "both deleted:"
1545 msgid "added by us:"
1549 msgid "deleted by them:"
1553 msgid "added by them:"
1557 msgid "deleted by us:"
1565 msgid "both modified:"
1570 msgid "bug: unhandled unmerged status %x"
1606 msgid "new commits, "
1610 msgid "modified content, "
1614 msgid "untracked content, "
1619 msgid "bug: unhandled diff status %c"
1623 msgid "Submodules changed but not updated:"
1627 msgid "Submodule changes to be committed:"
1632 "Do not touch the line above.\n"
1633 "Everything below will be removed."
1637 msgid "You have unmerged paths."
1641 msgid " (fix conflicts and run \"git commit\")"
1645 msgid "All conflicts fixed but you are still merging."
1649 msgid " (use \"git commit\" to conclude merge)"
1653 msgid "You are in the middle of an am session."
1657 msgid "The current patch is empty."
1661 msgid " (fix conflicts and then run \"git am --continue\")"
1665 msgid " (use \"git am --skip\" to skip this patch)"
1669 msgid " (use \"git am --abort\" to restore the original branch)"
1672 #: wt-status.c:1036 wt-status.c:1053
1674 msgid "You are currently rebasing branch '%s' on '%s'."
1677 #: wt-status.c:1041 wt-status.c:1058
1678 msgid "You are currently rebasing."
1682 msgid " (fix conflicts and then run \"git rebase --continue\")"
1686 msgid " (use \"git rebase --skip\" to skip this patch)"
1690 msgid " (use \"git rebase --abort\" to check out the original branch)"
1694 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1700 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1704 msgid "You are currently splitting a commit during a rebase."
1708 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1713 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1717 msgid "You are currently editing a commit during a rebase."
1721 msgid " (use \"git commit --amend\" to amend the current commit)"
1726 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1731 msgid "You are currently cherry-picking commit %s."
1735 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1739 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1743 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1748 msgid "You are currently reverting commit %s."
1752 msgid " (fix conflicts and run \"git revert --continue\")"
1756 msgid " (all conflicts fixed: run \"git revert --continue\")"
1760 msgid " (use \"git revert --abort\" to cancel the revert operation)"
1765 msgid "You are currently bisecting, started from branch '%s'."
1769 msgid "You are currently bisecting."
1773 msgid " (use \"git bisect reset\" to get back to the original branch)"
1781 msgid "rebase in progress; onto "
1785 msgid "HEAD detached at "
1789 msgid "HEAD detached from "
1793 msgid "Not currently on any branch."
1797 msgid "Initial commit"
1801 msgid "Untracked files"
1805 msgid "Ignored files"
1811 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1812 "may speed it up, but you have to be careful not to forget to add\n"
1813 "new files yourself (see 'git help status')."
1818 msgid "Untracked files not listed%s"
1822 msgid " (use -u option to show untracked files)"
1831 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1836 msgid "no changes added to commit\n"
1842 "nothing added to commit but untracked files present (use \"git add\" to "
1848 msgid "nothing added to commit but untracked files present\n"
1853 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1856 #: wt-status.c:1409 wt-status.c:1414
1858 msgid "nothing to commit\n"
1863 msgid "nothing to commit (use -u to show untracked files)\n"
1868 msgid "nothing to commit, working directory clean\n"
1872 msgid "HEAD (no branch)"
1876 msgid "Initial commit on "
1883 #: wt-status.c:1565 wt-status.c:1573
1887 #: compat/precompose_utf8.c:55 builtin/clone.c:360
1889 msgid "failed to unlink '%s'"
1893 msgid "git add [<options>] [--] <pathspec>..."
1898 msgid "unexpected diff status %c"
1901 #: builtin/add.c:70 builtin/commit.c:277
1902 msgid "updating files failed"
1907 msgid "remove '%s'\n"
1910 #: builtin/add.c:134
1911 msgid "Unstaged changes after refreshing the index:"
1914 #: builtin/add.c:194 builtin/rev-parse.c:785
1915 msgid "Could not read the index"
1918 #: builtin/add.c:205
1920 msgid "Could not open '%s' for writing."
1923 #: builtin/add.c:209
1924 msgid "Could not write patch"
1927 #: builtin/add.c:214
1929 msgid "Could not stat '%s'"
1932 #: builtin/add.c:216
1933 msgid "Empty patch. Aborted."
1936 #: builtin/add.c:221
1938 msgid "Could not apply '%s'"
1941 #: builtin/add.c:231
1942 msgid "The following paths are ignored by one of your .gitignore files:\n"
1945 #: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110
1946 #: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372
1951 #: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19
1952 #: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608
1953 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
1957 #: builtin/add.c:251
1958 msgid "interactive picking"
1961 #: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286
1962 msgid "select hunks interactively"
1965 #: builtin/add.c:253
1966 msgid "edit current diff and apply"
1969 #: builtin/add.c:254
1970 msgid "allow adding otherwise ignored files"
1973 #: builtin/add.c:255
1974 msgid "update tracked files"
1977 #: builtin/add.c:256
1978 msgid "record only the fact that the path will be added later"
1981 #: builtin/add.c:257
1982 msgid "add changes from all tracked and untracked files"
1985 #: builtin/add.c:260
1986 msgid "ignore paths removed in the working tree (same as --no-all)"
1989 #: builtin/add.c:262
1990 msgid "don't add, only refresh the index"
1993 #: builtin/add.c:263
1994 msgid "just skip files which cannot be added because of errors"
1997 #: builtin/add.c:264
1998 msgid "check if - even missing - files are ignored in dry run"
2001 #: builtin/add.c:286
2003 msgid "Use -f if you really want to add them.\n"
2006 #: builtin/add.c:293
2007 msgid "adding files failed"
2010 #: builtin/add.c:329
2011 msgid "-A and -u are mutually incompatible"
2014 #: builtin/add.c:336
2015 msgid "Option --ignore-missing can only be used together with --dry-run"
2018 #: builtin/add.c:357
2020 msgid "Nothing specified, nothing added.\n"
2023 #: builtin/add.c:358
2025 msgid "Maybe you wanted to say 'git add .'?\n"
2028 #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920
2029 #: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
2030 msgid "index file corrupt"
2033 #: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431
2034 msgid "Unable to write new index file"
2037 #: builtin/apply.c:59
2038 msgid "git apply [<options>] [<patch>...]"
2041 #: builtin/apply.c:112
2043 msgid "unrecognized whitespace option '%s'"
2046 #: builtin/apply.c:127
2048 msgid "unrecognized whitespace ignore option '%s'"
2051 #: builtin/apply.c:822
2053 msgid "Cannot prepare timestamp regexp %s"
2056 #: builtin/apply.c:831
2058 msgid "regexec returned %d for input: %s"
2061 #: builtin/apply.c:912
2063 msgid "unable to find filename in patch at line %d"
2066 #: builtin/apply.c:944
2068 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2071 #: builtin/apply.c:948
2073 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2076 #: builtin/apply.c:949
2078 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2081 #: builtin/apply.c:956
2083 msgid "git apply: bad git-diff - expected /dev/null on line %d"
2086 #: builtin/apply.c:1419
2088 msgid "recount: unexpected line: %.*s"
2091 #: builtin/apply.c:1476
2093 msgid "patch fragment without header at line %d: %.*s"
2096 #: builtin/apply.c:1493
2099 "git diff header lacks filename information when removing %d leading pathname "
2100 "component (line %d)"
2102 "git diff header lacks filename information when removing %d leading pathname "
2103 "components (line %d)"
2107 #: builtin/apply.c:1656
2108 msgid "new file depends on old contents"
2111 #: builtin/apply.c:1658
2112 msgid "deleted file still has contents"
2115 #: builtin/apply.c:1684
2117 msgid "corrupt patch at line %d"
2120 #: builtin/apply.c:1720
2122 msgid "new file %s depends on old contents"
2125 #: builtin/apply.c:1722
2127 msgid "deleted file %s still has contents"
2130 #: builtin/apply.c:1725
2132 msgid "** warning: file %s becomes empty but is not deleted"
2135 #: builtin/apply.c:1871
2137 msgid "corrupt binary patch at line %d: %.*s"
2140 #: builtin/apply.c:1900
2142 msgid "unrecognized binary patch at line %d"
2145 #: builtin/apply.c:2051
2147 msgid "patch with only garbage at line %d"
2150 #: builtin/apply.c:2141
2152 msgid "unable to read symlink %s"
2155 #: builtin/apply.c:2145
2157 msgid "unable to open or read %s"
2160 #: builtin/apply.c:2778
2162 msgid "invalid start of line: '%c'"
2165 #: builtin/apply.c:2897
2167 msgid "Hunk #%d succeeded at %d (offset %d line)."
2168 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2172 #: builtin/apply.c:2909
2174 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2177 #: builtin/apply.c:2915
2180 "while searching for:\n"
2184 #: builtin/apply.c:2935
2186 msgid "missing binary patch data for '%s'"
2189 #: builtin/apply.c:3036
2191 msgid "binary patch does not apply to '%s'"
2194 #: builtin/apply.c:3042
2196 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2199 #: builtin/apply.c:3063
2201 msgid "patch failed: %s:%ld"
2204 #: builtin/apply.c:3187
2206 msgid "cannot checkout %s"
2209 #: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288
2211 msgid "read of %s failed"
2214 #: builtin/apply.c:3240
2216 msgid "reading from '%s' beyond a symbolic link"
2219 #: builtin/apply.c:3268 builtin/apply.c:3490
2221 msgid "path %s has been renamed/deleted"
2224 #: builtin/apply.c:3349 builtin/apply.c:3504
2226 msgid "%s: does not exist in index"
2229 #: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518
2234 #: builtin/apply.c:3358 builtin/apply.c:3512
2236 msgid "%s: does not match index"
2239 #: builtin/apply.c:3460
2240 msgid "removal patch leaves file contents"
2243 #: builtin/apply.c:3529
2245 msgid "%s: wrong type"
2248 #: builtin/apply.c:3531
2250 msgid "%s has type %o, expected %o"
2253 #: builtin/apply.c:3690 builtin/apply.c:3692
2255 msgid "invalid path '%s'"
2258 #: builtin/apply.c:3747
2260 msgid "%s: already exists in index"
2263 #: builtin/apply.c:3750
2265 msgid "%s: already exists in working directory"
2268 #: builtin/apply.c:3770
2270 msgid "new mode (%o) of %s does not match old mode (%o)"
2273 #: builtin/apply.c:3775
2275 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2278 #: builtin/apply.c:3795
2280 msgid "affected file '%s' is beyond a symbolic link"
2283 #: builtin/apply.c:3799
2285 msgid "%s: patch does not apply"
2288 #: builtin/apply.c:3813
2290 msgid "Checking patch %s..."
2293 #: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135
2295 msgid "make_cache_entry failed for path '%s'"
2298 #: builtin/apply.c:4049
2300 msgid "unable to remove %s from index"
2303 #: builtin/apply.c:4078
2305 msgid "corrupt patch for submodule %s"
2308 #: builtin/apply.c:4082
2310 msgid "unable to stat newly created file '%s'"
2313 #: builtin/apply.c:4087
2315 msgid "unable to create backing store for newly created file %s"
2318 #: builtin/apply.c:4090 builtin/apply.c:4198
2320 msgid "unable to add cache entry for %s"
2323 #: builtin/apply.c:4123
2325 msgid "closing file '%s'"
2328 #: builtin/apply.c:4172
2330 msgid "unable to write file '%s' mode %o"
2333 #: builtin/apply.c:4259
2335 msgid "Applied patch %s cleanly."
2338 #: builtin/apply.c:4267
2339 msgid "internal error"
2342 #: builtin/apply.c:4270
2344 msgid "Applying patch %%s with %d reject..."
2345 msgid_plural "Applying patch %%s with %d rejects..."
2349 #: builtin/apply.c:4280
2351 msgid "truncating .rej filename to %.*s.rej"
2354 #: builtin/apply.c:4301
2356 msgid "Hunk #%d applied cleanly."
2359 #: builtin/apply.c:4304
2361 msgid "Rejected hunk #%d."
2364 #: builtin/apply.c:4394
2365 msgid "unrecognized input"
2368 #: builtin/apply.c:4405
2369 msgid "unable to read index file"
2372 #: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92
2373 #: builtin/fetch.c:92
2377 #: builtin/apply.c:4523
2378 msgid "don't apply changes matching the given path"
2381 #: builtin/apply.c:4526
2382 msgid "apply changes matching the given path"
2385 #: builtin/apply.c:4528
2389 #: builtin/apply.c:4529
2390 msgid "remove <num> leading slashes from traditional diff paths"
2393 #: builtin/apply.c:4532
2394 msgid "ignore additions made by the patch"
2397 #: builtin/apply.c:4534
2398 msgid "instead of applying the patch, output diffstat for the input"
2401 #: builtin/apply.c:4538
2402 msgid "show number of added and deleted lines in decimal notation"
2405 #: builtin/apply.c:4540
2406 msgid "instead of applying the patch, output a summary for the input"
2409 #: builtin/apply.c:4542
2410 msgid "instead of applying the patch, see if the patch is applicable"
2413 #: builtin/apply.c:4544
2414 msgid "make sure the patch is applicable to the current index"
2417 #: builtin/apply.c:4546
2418 msgid "apply a patch without touching the working tree"
2421 #: builtin/apply.c:4548
2422 msgid "accept a patch that touches outside the working area"
2425 #: builtin/apply.c:4550
2426 msgid "also apply the patch (use with --stat/--summary/--check)"
2429 #: builtin/apply.c:4552
2430 msgid "attempt three-way merge if a patch does not apply"
2433 #: builtin/apply.c:4554
2434 msgid "build a temporary index based on embedded index information"
2437 #: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412
2438 msgid "paths are separated with NUL character"
2441 #: builtin/apply.c:4559
2442 msgid "ensure at least <n> lines of context match"
2445 #: builtin/apply.c:4560
2449 #: builtin/apply.c:4561
2450 msgid "detect new or modified lines that have whitespace errors"
2453 #: builtin/apply.c:4564 builtin/apply.c:4567
2454 msgid "ignore changes in whitespace when finding context"
2457 #: builtin/apply.c:4570
2458 msgid "apply the patch in reverse"
2461 #: builtin/apply.c:4572
2462 msgid "don't expect at least one line of context"
2465 #: builtin/apply.c:4574
2466 msgid "leave the rejected hunks in corresponding *.rej files"
2469 #: builtin/apply.c:4576
2470 msgid "allow overlapping hunks"
2473 #: builtin/apply.c:4579
2474 msgid "tolerate incorrectly detected missing new-line at the end of file"
2477 #: builtin/apply.c:4582
2478 msgid "do not trust the line counts in the hunk headers"
2481 #: builtin/apply.c:4584
2485 #: builtin/apply.c:4585
2486 msgid "prepend <root> to all filenames"
2489 #: builtin/apply.c:4607
2490 msgid "--3way outside a repository"
2493 #: builtin/apply.c:4615
2494 msgid "--index outside a repository"
2497 #: builtin/apply.c:4618
2498 msgid "--cached outside a repository"
2501 #: builtin/apply.c:4637
2503 msgid "can't open patch '%s'"
2506 #: builtin/apply.c:4651
2508 msgid "squelched %d whitespace error"
2509 msgid_plural "squelched %d whitespace errors"
2513 #: builtin/apply.c:4657 builtin/apply.c:4667
2515 msgid "%d line adds whitespace errors."
2516 msgid_plural "%d lines add whitespace errors."
2520 #: builtin/archive.c:17
2522 msgid "could not create archive file '%s'"
2525 #: builtin/archive.c:20
2526 msgid "could not redirect output"
2529 #: builtin/archive.c:37
2530 msgid "git archive: Remote with no URL"
2533 #: builtin/archive.c:58
2534 msgid "git archive: expected ACK/NAK, got EOF"
2537 #: builtin/archive.c:61
2539 msgid "git archive: NACK %s"
2542 #: builtin/archive.c:63
2544 msgid "remote error: %s"
2547 #: builtin/archive.c:64
2548 msgid "git archive: protocol error"
2551 #: builtin/archive.c:68
2552 msgid "git archive: expected a flush"
2555 #: builtin/bisect--helper.c:7
2556 msgid "git bisect--helper --next-all [--no-checkout]"
2559 #: builtin/bisect--helper.c:17
2560 msgid "perform 'git bisect next'"
2563 #: builtin/bisect--helper.c:19
2564 msgid "update BISECT_HEAD instead of checking out the current commit"
2567 #: builtin/blame.c:30
2568 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file"
2571 #: builtin/blame.c:35
2572 msgid "<rev-opts> are documented in git-rev-list(1)"
2575 #: builtin/blame.c:2500
2576 msgid "Show blame entries as we find them, incrementally"
2579 #: builtin/blame.c:2501
2580 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2583 #: builtin/blame.c:2502
2584 msgid "Do not treat root commits as boundaries (Default: off)"
2587 #: builtin/blame.c:2503
2588 msgid "Show work cost statistics"
2591 #: builtin/blame.c:2504
2592 msgid "Show output score for blame entries"
2595 #: builtin/blame.c:2505
2596 msgid "Show original filename (Default: auto)"
2599 #: builtin/blame.c:2506
2600 msgid "Show original linenumber (Default: off)"
2603 #: builtin/blame.c:2507
2604 msgid "Show in a format designed for machine consumption"
2607 #: builtin/blame.c:2508
2608 msgid "Show porcelain format with per-line commit information"
2611 #: builtin/blame.c:2509
2612 msgid "Use the same output mode as git-annotate (Default: off)"
2615 #: builtin/blame.c:2510
2616 msgid "Show raw timestamp (Default: off)"
2619 #: builtin/blame.c:2511
2620 msgid "Show long commit SHA1 (Default: off)"
2623 #: builtin/blame.c:2512
2624 msgid "Suppress author name and timestamp (Default: off)"
2627 #: builtin/blame.c:2513
2628 msgid "Show author email instead of name (Default: off)"
2631 #: builtin/blame.c:2514
2632 msgid "Ignore whitespace differences"
2635 #: builtin/blame.c:2515
2636 msgid "Spend extra cycles to find better match"
2639 #: builtin/blame.c:2516
2640 msgid "Use revisions from <file> instead of calling git-rev-list"
2643 #: builtin/blame.c:2517
2644 msgid "Use <file>'s contents as the final image"
2647 #: builtin/blame.c:2518 builtin/blame.c:2519
2651 #: builtin/blame.c:2518
2652 msgid "Find line copies within and across files"
2655 #: builtin/blame.c:2519
2656 msgid "Find line movements within and across files"
2659 #: builtin/blame.c:2520
2663 #: builtin/blame.c:2520
2664 msgid "Process only line range n,m, counting from 1"
2667 #. TRANSLATORS: This string is used to tell us the maximum
2668 #. display width for a relative timestamp in "git blame"
2669 #. output. For C locale, "4 years, 11 months ago", which
2670 #. takes 22 places, is the longest among various forms of
2671 #. relative timestamps, but your language may need more or
2672 #. fewer display columns.
2673 #: builtin/blame.c:2601
2674 msgid "4 years, 11 months ago"
2677 #: builtin/branch.c:24
2678 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
2681 #: builtin/branch.c:25
2682 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
2685 #: builtin/branch.c:26
2686 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
2689 #: builtin/branch.c:27
2690 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
2693 #: builtin/branch.c:152
2696 "deleting branch '%s' that has been merged to\n"
2697 " '%s', but not yet merged to HEAD."
2700 #: builtin/branch.c:156
2703 "not deleting branch '%s' that is not yet merged to\n"
2704 " '%s', even though it is merged to HEAD."
2707 #: builtin/branch.c:170
2709 msgid "Couldn't look up commit object for '%s'"
2712 #: builtin/branch.c:174
2715 "The branch '%s' is not fully merged.\n"
2716 "If you are sure you want to delete it, run 'git branch -D %s'."
2719 #: builtin/branch.c:187
2720 msgid "Update of config-file failed"
2723 #: builtin/branch.c:215
2724 msgid "cannot use -a with -d"
2727 #: builtin/branch.c:221
2728 msgid "Couldn't look up commit object for HEAD"
2731 #: builtin/branch.c:229
2733 msgid "Cannot delete the branch '%s' which you are currently on."
2736 #: builtin/branch.c:245
2738 msgid "remote branch '%s' not found."
2741 #: builtin/branch.c:246
2743 msgid "branch '%s' not found."
2746 #: builtin/branch.c:260
2748 msgid "Error deleting remote branch '%s'"
2751 #: builtin/branch.c:261
2753 msgid "Error deleting branch '%s'"
2756 #: builtin/branch.c:268
2758 msgid "Deleted remote branch %s (was %s).\n"
2761 #: builtin/branch.c:269
2763 msgid "Deleted branch %s (was %s).\n"
2766 #: builtin/branch.c:370
2768 msgid "branch '%s' does not point at a commit"
2771 #: builtin/branch.c:459
2776 #: builtin/branch.c:464
2781 #: builtin/branch.c:469
2783 msgid "[%s: behind %d]"
2786 #: builtin/branch.c:471
2791 #: builtin/branch.c:475
2793 msgid "[%s: ahead %d]"
2796 #: builtin/branch.c:477
2801 #: builtin/branch.c:480
2803 msgid "[%s: ahead %d, behind %d]"
2806 #: builtin/branch.c:483
2808 msgid "[ahead %d, behind %d]"
2811 #: builtin/branch.c:496
2812 msgid " **** invalid ref ****"
2815 #: builtin/branch.c:587
2817 msgid "(no branch, rebasing %s)"
2820 #: builtin/branch.c:590
2822 msgid "(no branch, bisect started on %s)"
2825 #: builtin/branch.c:596
2827 msgid "(HEAD detached at %s)"
2830 #: builtin/branch.c:599
2832 msgid "(HEAD detached from %s)"
2835 #: builtin/branch.c:603
2839 #: builtin/branch.c:650
2841 msgid "object '%s' does not point to a commit"
2844 #: builtin/branch.c:698
2845 msgid "some refs could not be read"
2848 #: builtin/branch.c:711
2849 msgid "cannot rename the current branch while not on any."
2852 #: builtin/branch.c:721
2854 msgid "Invalid branch name: '%s'"
2857 #: builtin/branch.c:736
2858 msgid "Branch rename failed"
2861 #: builtin/branch.c:740
2863 msgid "Renamed a misnamed branch '%s' away"
2866 #: builtin/branch.c:744
2868 msgid "Branch renamed to %s, but HEAD is not updated!"
2871 #: builtin/branch.c:751
2872 msgid "Branch is renamed, but update of config-file failed"
2875 #: builtin/branch.c:766
2877 msgid "malformed object name %s"
2880 #: builtin/branch.c:790
2882 msgid "could not write branch description template: %s"
2885 #: builtin/branch.c:820
2886 msgid "Generic options"
2889 #: builtin/branch.c:822
2890 msgid "show hash and subject, give twice for upstream branch"
2893 #: builtin/branch.c:823
2894 msgid "suppress informational messages"
2897 #: builtin/branch.c:824
2898 msgid "set up tracking mode (see git-pull(1))"
2901 #: builtin/branch.c:826
2902 msgid "change upstream info"
2905 #: builtin/branch.c:830
2906 msgid "use colored output"
2909 #: builtin/branch.c:831
2910 msgid "act on remote-tracking branches"
2913 #: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861
2914 #: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583
2915 #: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616
2916 #: builtin/tag.c:622
2920 #: builtin/branch.c:835 builtin/branch.c:841
2921 msgid "print only branches that contain the commit"
2924 #: builtin/branch.c:847
2925 msgid "Specific git-branch actions:"
2928 #: builtin/branch.c:848
2929 msgid "list both remote-tracking and local branches"
2932 #: builtin/branch.c:850
2933 msgid "delete fully merged branch"
2936 #: builtin/branch.c:851
2937 msgid "delete branch (even if not merged)"
2940 #: builtin/branch.c:852
2941 msgid "move/rename a branch and its reflog"
2944 #: builtin/branch.c:853
2945 msgid "move/rename a branch, even if target exists"
2948 #: builtin/branch.c:854
2949 msgid "list branch names"
2952 #: builtin/branch.c:855
2953 msgid "create the branch's reflog"
2956 #: builtin/branch.c:857
2957 msgid "edit the description for the branch"
2960 #: builtin/branch.c:858
2961 msgid "force creation, move/rename, deletion"
2964 #: builtin/branch.c:861
2965 msgid "print only not merged branches"
2968 #: builtin/branch.c:867
2969 msgid "print only merged branches"
2972 #: builtin/branch.c:871
2973 msgid "list branches in columns"
2976 #: builtin/branch.c:884
2977 msgid "Failed to resolve HEAD as a valid ref."
2980 #: builtin/branch.c:888 builtin/clone.c:637
2981 msgid "HEAD not found below refs/heads!"
2984 #: builtin/branch.c:910
2985 msgid "--column and --verbose are incompatible"
2988 #: builtin/branch.c:921 builtin/branch.c:960
2989 msgid "branch name required"
2992 #: builtin/branch.c:936
2993 msgid "Cannot give description to detached HEAD"
2996 #: builtin/branch.c:941
2997 msgid "cannot edit description of more than one branch"
3000 #: builtin/branch.c:948
3002 msgid "No commit on branch '%s' yet."
3005 #: builtin/branch.c:951
3007 msgid "No branch named '%s'."
3010 #: builtin/branch.c:966
3011 msgid "too many branches for a rename operation"
3014 #: builtin/branch.c:971
3015 msgid "too many branches to set new upstream"
3018 #: builtin/branch.c:975
3021 "could not set upstream of HEAD to %s when it does not point to any branch."
3024 #: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021
3026 msgid "no such branch '%s'"
3029 #: builtin/branch.c:982
3031 msgid "branch '%s' does not exist"
3034 #: builtin/branch.c:994
3035 msgid "too many branches to unset upstream"
3038 #: builtin/branch.c:998
3039 msgid "could not unset upstream of HEAD when it does not point to any branch."
3042 #: builtin/branch.c:1004
3044 msgid "Branch '%s' has no upstream information"
3047 #: builtin/branch.c:1018
3048 msgid "it does not make sense to create 'HEAD' manually"
3051 #: builtin/branch.c:1024
3052 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3055 #: builtin/branch.c:1027
3058 "The --set-upstream flag is deprecated and will be removed. Consider using --"
3059 "track or --set-upstream-to\n"
3062 #: builtin/branch.c:1044
3066 "If you wanted to make '%s' track '%s', do this:\n"
3070 #: builtin/branch.c:1045
3072 msgid " git branch -d %s\n"
3075 #: builtin/branch.c:1046
3077 msgid " git branch --set-upstream-to %s\n"
3080 #: builtin/bundle.c:47
3082 msgid "%s is okay\n"
3085 #: builtin/bundle.c:56
3086 msgid "Need a repository to create a bundle."
3089 #: builtin/bundle.c:60
3090 msgid "Need a repository to unbundle."
3093 #: builtin/cat-file.c:326
3094 msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>"
3097 #: builtin/cat-file.c:327
3098 msgid "git cat-file (--batch | --batch-check) < <list-of-objects>"
3101 #: builtin/cat-file.c:364
3102 msgid "<type> can be one of: blob, tree, commit, tag"
3105 #: builtin/cat-file.c:365
3106 msgid "show object type"
3109 #: builtin/cat-file.c:366
3110 msgid "show object size"
3113 #: builtin/cat-file.c:368
3114 msgid "exit with zero when there's no error"
3117 #: builtin/cat-file.c:369
3118 msgid "pretty-print object's content"
3121 #: builtin/cat-file.c:371
3122 msgid "for blob objects, run textconv on object's content"
3125 #: builtin/cat-file.c:373
3126 msgid "show info and content of objects fed from the standard input"
3129 #: builtin/cat-file.c:376
3130 msgid "show info about objects fed from the standard input"
3133 #: builtin/check-attr.c:11
3134 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3137 #: builtin/check-attr.c:12
3138 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
3141 #: builtin/check-attr.c:19
3142 msgid "report all attributes set on file"
3145 #: builtin/check-attr.c:20
3146 msgid "use .gitattributes only from the index"
3149 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
3150 msgid "read file names from stdin"
3153 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
3154 msgid "terminate input and output records by a NUL character"
3157 #: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274
3158 msgid "suppress progress reporting"
3161 #: builtin/check-ignore.c:26
3162 msgid "show non-matching input paths"
3165 #: builtin/check-ignore.c:28
3166 msgid "ignore index when checking"
3169 #: builtin/check-ignore.c:154
3170 msgid "cannot specify pathnames with --stdin"
3173 #: builtin/check-ignore.c:157
3174 msgid "-z only makes sense with --stdin"
3177 #: builtin/check-ignore.c:159
3178 msgid "no path specified"
3181 #: builtin/check-ignore.c:163
3182 msgid "--quiet is only valid with a single pathname"
3185 #: builtin/check-ignore.c:165
3186 msgid "cannot have both --quiet and --verbose"
3189 #: builtin/check-ignore.c:168
3190 msgid "--non-matching is only valid with --verbose"
3193 #: builtin/check-mailmap.c:8
3194 msgid "git check-mailmap [<options>] <contact>..."
3197 #: builtin/check-mailmap.c:13
3198 msgid "also read contacts from stdin"
3201 #: builtin/check-mailmap.c:24
3203 msgid "unable to parse contact: %s"
3206 #: builtin/check-mailmap.c:47
3207 msgid "no contacts specified"
3210 #: builtin/checkout-index.c:126
3211 msgid "git checkout-index [<options>] [--] [<file>...]"
3214 #: builtin/checkout-index.c:188
3215 msgid "check out all files in the index"
3218 #: builtin/checkout-index.c:189
3219 msgid "force overwrite of existing files"
3222 #: builtin/checkout-index.c:191
3223 msgid "no warning for existing files and files not in index"
3226 #: builtin/checkout-index.c:193
3227 msgid "don't checkout new files"
3230 #: builtin/checkout-index.c:195
3231 msgid "update stat information in the index file"
3234 #: builtin/checkout-index.c:201
3235 msgid "read list of paths from the standard input"
3238 #: builtin/checkout-index.c:203
3239 msgid "write the content to temporary files"
3242 #: builtin/checkout-index.c:204 builtin/column.c:30
3246 #: builtin/checkout-index.c:205
3247 msgid "when creating files, prepend <string>"
3250 #: builtin/checkout-index.c:208
3251 msgid "copy out the files from named stage"
3254 #: builtin/checkout.c:25
3255 msgid "git checkout [<options>] <branch>"
3258 #: builtin/checkout.c:26
3259 msgid "git checkout [<options>] [<branch>] -- <file>..."
3262 #: builtin/checkout.c:132 builtin/checkout.c:165
3264 msgid "path '%s' does not have our version"
3267 #: builtin/checkout.c:134 builtin/checkout.c:167
3269 msgid "path '%s' does not have their version"
3272 #: builtin/checkout.c:150
3274 msgid "path '%s' does not have all necessary versions"
3277 #: builtin/checkout.c:194
3279 msgid "path '%s' does not have necessary versions"
3282 #: builtin/checkout.c:211
3284 msgid "path '%s': cannot merge"
3287 #: builtin/checkout.c:228
3289 msgid "Unable to add merge result for '%s'"
3292 #: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255
3293 #: builtin/checkout.c:258
3295 msgid "'%s' cannot be used with updating paths"
3298 #: builtin/checkout.c:261 builtin/checkout.c:264
3300 msgid "'%s' cannot be used with %s"
3303 #: builtin/checkout.c:267
3305 msgid "Cannot update paths and switch to branch '%s' at the same time."
3308 #: builtin/checkout.c:278 builtin/checkout.c:467
3309 msgid "corrupt index file"
3312 #: builtin/checkout.c:338 builtin/checkout.c:345
3314 msgid "path '%s' is unmerged"
3317 #: builtin/checkout.c:489
3318 msgid "you need to resolve your current index first"
3321 #: builtin/checkout.c:615
3323 msgid "Can not do reflog for '%s'\n"
3326 #: builtin/checkout.c:653
3327 msgid "HEAD is now at"
3330 #: builtin/checkout.c:660
3332 msgid "Reset branch '%s'\n"
3335 #: builtin/checkout.c:663
3337 msgid "Already on '%s'\n"
3340 #: builtin/checkout.c:667
3342 msgid "Switched to and reset branch '%s'\n"
3345 #: builtin/checkout.c:669 builtin/checkout.c:1050
3347 msgid "Switched to a new branch '%s'\n"
3350 #: builtin/checkout.c:671
3352 msgid "Switched to branch '%s'\n"
3355 #: builtin/checkout.c:723
3357 msgid " ... and %d more.\n"
3360 #: builtin/checkout.c:729
3363 "Warning: you are leaving %d commit behind, not connected to\n"
3364 "any of your branches:\n"
3368 "Warning: you are leaving %d commits behind, not connected to\n"
3369 "any of your branches:\n"
3375 #: builtin/checkout.c:747
3378 "If you want to keep them by creating a new branch, this may be a good time\n"
3381 " git branch <new-branch-name> %s\n"
3385 #: builtin/checkout.c:777
3386 msgid "internal error in revision walk"
3389 #: builtin/checkout.c:781
3390 msgid "Previous HEAD position was"
3393 #: builtin/checkout.c:808 builtin/checkout.c:1045
3394 msgid "You are on a branch yet to be born"
3397 #: builtin/checkout.c:952
3399 msgid "only one reference expected, %d given."
3402 #: builtin/checkout.c:991
3404 msgid "invalid reference: %s"
3407 #: builtin/checkout.c:1020
3409 msgid "reference is not a tree: %s"
3412 #: builtin/checkout.c:1059
3413 msgid "paths cannot be used with switching branches"
3416 #: builtin/checkout.c:1062 builtin/checkout.c:1066
3418 msgid "'%s' cannot be used with switching branches"
3421 #: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078
3422 #: builtin/checkout.c:1081
3424 msgid "'%s' cannot be used with '%s'"
3427 #: builtin/checkout.c:1086
3429 msgid "Cannot switch branch to a non-commit '%s'"
3432 #: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90
3433 #: builtin/remote.c:159 builtin/remote.c:161
3437 #: builtin/checkout.c:1109
3438 msgid "create and checkout a new branch"
3441 #: builtin/checkout.c:1111
3442 msgid "create/reset and checkout a branch"
3445 #: builtin/checkout.c:1112
3446 msgid "create reflog for new branch"
3449 #: builtin/checkout.c:1113
3450 msgid "detach the HEAD at named commit"
3453 #: builtin/checkout.c:1114
3454 msgid "set upstream info for new branch"
3457 #: builtin/checkout.c:1116
3461 #: builtin/checkout.c:1116
3462 msgid "new unparented branch"
3465 #: builtin/checkout.c:1117
3466 msgid "checkout our version for unmerged files"
3469 #: builtin/checkout.c:1119
3470 msgid "checkout their version for unmerged files"
3473 #: builtin/checkout.c:1121
3474 msgid "force checkout (throw away local modifications)"
3477 #: builtin/checkout.c:1122
3478 msgid "perform a 3-way merge with the new branch"
3481 #: builtin/checkout.c:1123 builtin/merge.c:227
3482 msgid "update ignored files (default)"
3485 #: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245
3489 #: builtin/checkout.c:1125
3490 msgid "conflict style (merge or diff3)"
3493 #: builtin/checkout.c:1128
3494 msgid "do not limit pathspecs to sparse entries only"
3497 #: builtin/checkout.c:1130
3498 msgid "second guess 'git checkout <no-such-branch>'"
3501 #: builtin/checkout.c:1153
3502 msgid "-b, -B and --orphan are mutually exclusive"
3505 #: builtin/checkout.c:1170
3506 msgid "--track needs a branch name"
3509 #: builtin/checkout.c:1175
3510 msgid "Missing branch name; try -b"
3513 #: builtin/checkout.c:1212
3514 msgid "invalid path specification"
3517 #: builtin/checkout.c:1219
3520 "Cannot update paths and switch to branch '%s' at the same time.\n"
3521 "Did you intend to checkout '%s' which can not be resolved as commit?"
3524 #: builtin/checkout.c:1224
3526 msgid "git checkout: --detach does not take a path argument '%s'"
3529 #: builtin/checkout.c:1228
3531 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3532 "checking out of the index."
3535 #: builtin/clean.c:26
3537 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3540 #: builtin/clean.c:30
3542 msgid "Removing %s\n"
3545 #: builtin/clean.c:31
3547 msgid "Would remove %s\n"
3550 #: builtin/clean.c:32
3552 msgid "Skipping repository %s\n"
3555 #: builtin/clean.c:33
3557 msgid "Would skip repository %s\n"
3560 #: builtin/clean.c:34
3562 msgid "failed to remove %s"
3565 #: builtin/clean.c:295
3568 "1 - select a numbered item\n"
3569 "foo - select item based on unique prefix\n"
3570 " - (empty) select nothing"
3573 #: builtin/clean.c:299
3576 "1 - select a single item\n"
3577 "3-5 - select a range of items\n"
3578 "2-3,6-9 - select multiple ranges\n"
3579 "foo - select item based on unique prefix\n"
3580 "-... - unselect specified items\n"
3581 "* - choose all items\n"
3582 " - (empty) finish selecting"
3585 #: builtin/clean.c:517
3590 #: builtin/clean.c:659
3592 msgid "Input ignore patterns>> "
3595 #: builtin/clean.c:696
3597 msgid "WARNING: Cannot find items matched by: %s"
3600 #: builtin/clean.c:717
3601 msgid "Select items to delete"
3604 #. TRANSLATORS: Make sure to keep [y/N] as is
3605 #: builtin/clean.c:758
3607 msgid "Remove %s [y/N]? "
3610 #: builtin/clean.c:783
3614 #: builtin/clean.c:791
3616 "clean - start cleaning\n"
3617 "filter by pattern - exclude items from deletion\n"
3618 "select by numbers - select items to be deleted by numbers\n"
3619 "ask each - confirm each deletion (like \"rm -i\")\n"
3620 "quit - stop cleaning\n"
3621 "help - this screen\n"
3622 "? - help for prompt selection"
3625 #: builtin/clean.c:818
3626 msgid "*** Commands ***"
3629 #: builtin/clean.c:819
3633 #: builtin/clean.c:827
3634 msgid "Would remove the following item:"
3635 msgid_plural "Would remove the following items:"
3639 #: builtin/clean.c:844
3640 msgid "No more files to clean, exiting."
3643 #: builtin/clean.c:875
3644 msgid "do not print names of files removed"
3647 #: builtin/clean.c:877
3651 #: builtin/clean.c:878
3652 msgid "interactive cleaning"
3655 #: builtin/clean.c:880
3656 msgid "remove whole directories"
3659 #: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714
3660 #: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185
3664 #: builtin/clean.c:882
3665 msgid "add <pattern> to ignore rules"
3668 #: builtin/clean.c:883
3669 msgid "remove ignored files, too"
3672 #: builtin/clean.c:885
3673 msgid "remove only ignored files"
3676 #: builtin/clean.c:903
3677 msgid "-x and -X cannot be used together"
3680 #: builtin/clean.c:907
3682 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
3686 #: builtin/clean.c:910
3688 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
3692 #: builtin/clone.c:37
3693 msgid "git clone [<options>] [--] <repo> [<dir>]"
3696 #: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224
3697 #: builtin/push.c:523
3698 msgid "force progress reporting"
3701 #: builtin/clone.c:68
3702 msgid "don't create a checkout"
3705 #: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496
3706 msgid "create a bare repository"
3709 #: builtin/clone.c:73
3710 msgid "create a mirror repository (implies bare)"
3713 #: builtin/clone.c:75
3714 msgid "to clone from a local repository"
3717 #: builtin/clone.c:77
3718 msgid "don't use local hardlinks, always copy"
3721 #: builtin/clone.c:79
3722 msgid "setup as shared repository"
3725 #: builtin/clone.c:81 builtin/clone.c:83
3726 msgid "initialize submodules in the clone"
3729 #: builtin/clone.c:84 builtin/init-db.c:493
3730 msgid "template-directory"
3733 #: builtin/clone.c:85 builtin/init-db.c:494
3734 msgid "directory from which templates will be used"
3737 #: builtin/clone.c:87
3738 msgid "reference repository"
3741 #: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44
3745 #: builtin/clone.c:89
3746 msgid "use <name> instead of 'origin' to track upstream"
3749 #: builtin/clone.c:91
3750 msgid "checkout <branch> instead of the remote's HEAD"
3753 #: builtin/clone.c:93
3754 msgid "path to git-upload-pack on the remote"
3757 #: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659
3761 #: builtin/clone.c:95
3762 msgid "create a shallow clone of that depth"
3765 #: builtin/clone.c:97
3766 msgid "clone only one branch, HEAD or --branch"
3769 #: builtin/clone.c:99
3770 msgid "use --reference only while cloning"
3773 #: builtin/clone.c:100 builtin/init-db.c:502
3777 #: builtin/clone.c:101 builtin/init-db.c:503
3778 msgid "separate git dir from working tree"
3781 #: builtin/clone.c:102
3785 #: builtin/clone.c:103
3786 msgid "set config inside the new repository"
3789 #: builtin/clone.c:256
3791 msgid "reference repository '%s' is not a local repository."
3794 #: builtin/clone.c:260
3796 msgid "reference repository '%s' is shallow"
3799 #: builtin/clone.c:263
3801 msgid "reference repository '%s' is grafted"
3804 #: builtin/clone.c:325
3806 msgid "failed to create directory '%s'"
3809 #: builtin/clone.c:327 builtin/diff.c:84
3811 msgid "failed to stat '%s'"
3814 #: builtin/clone.c:329
3816 msgid "%s exists and is not a directory"
3819 #: builtin/clone.c:343
3821 msgid "failed to stat %s\n"
3824 #: builtin/clone.c:365
3826 msgid "failed to create link '%s'"
3829 #: builtin/clone.c:369
3831 msgid "failed to copy file to '%s'"
3834 #: builtin/clone.c:392 builtin/clone.c:566
3839 #: builtin/clone.c:404
3841 "Clone succeeded, but checkout failed.\n"
3842 "You can inspect what was checked out with 'git status'\n"
3843 "and retry the checkout with 'git checkout -f HEAD'\n"
3846 #: builtin/clone.c:481
3848 msgid "Could not find remote branch %s to clone."
3851 #: builtin/clone.c:561
3853 msgid "Checking connectivity... "
3856 #: builtin/clone.c:564
3857 msgid "remote did not send all necessary objects"
3860 #: builtin/clone.c:628
3861 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3864 #: builtin/clone.c:659
3865 msgid "unable to checkout working tree"
3868 #: builtin/clone.c:746
3869 msgid "cannot repack to clean up"
3872 #: builtin/clone.c:748
3873 msgid "cannot unlink temporary alternates file"
3876 #: builtin/clone.c:778
3877 msgid "Too many arguments."
3880 #: builtin/clone.c:782
3881 msgid "You must specify a repository to clone."
3884 #: builtin/clone.c:793
3886 msgid "--bare and --origin %s options are incompatible."
3889 #: builtin/clone.c:796
3890 msgid "--bare and --separate-git-dir are incompatible."
3893 #: builtin/clone.c:809
3895 msgid "repository '%s' does not exist"
3898 #: builtin/clone.c:815 builtin/fetch.c:1156
3900 msgid "depth %s is not a positive number"
3903 #: builtin/clone.c:825
3905 msgid "destination path '%s' already exists and is not an empty directory."
3908 #: builtin/clone.c:835
3910 msgid "working tree '%s' already exists."
3913 #: builtin/clone.c:850 builtin/clone.c:861
3915 msgid "could not create leading directories of '%s'"
3918 #: builtin/clone.c:853
3920 msgid "could not create work tree dir '%s'"
3923 #: builtin/clone.c:871
3925 msgid "Cloning into bare repository '%s'...\n"
3928 #: builtin/clone.c:873
3930 msgid "Cloning into '%s'...\n"
3933 #: builtin/clone.c:898
3934 msgid "--dissociate given, but there is no --reference"
3937 #: builtin/clone.c:913
3938 msgid "--depth is ignored in local clones; use file:// instead."
3941 #: builtin/clone.c:916
3942 msgid "source repository is shallow, ignoring --local"
3945 #: builtin/clone.c:921
3946 msgid "--local is ignored"
3949 #: builtin/clone.c:925
3951 msgid "Don't know how to clone %s"
3954 #: builtin/clone.c:976 builtin/clone.c:984
3956 msgid "Remote branch %s not found in upstream %s"
3959 #: builtin/clone.c:987
3960 msgid "You appear to have cloned an empty repository."
3963 #: builtin/column.c:9
3964 msgid "git column [<options>]"
3967 #: builtin/column.c:26
3968 msgid "lookup config vars"
3971 #: builtin/column.c:27 builtin/column.c:28
3972 msgid "layout to use"
3975 #: builtin/column.c:29
3976 msgid "Maximum width"
3979 #: builtin/column.c:30
3980 msgid "Padding space on left border"
3983 #: builtin/column.c:31
3984 msgid "Padding space on right border"
3987 #: builtin/column.c:32
3988 msgid "Padding space between columns"
3991 #: builtin/column.c:51
3992 msgid "--command must be the first argument"
3995 #: builtin/commit.c:37
3996 msgid "git commit [<options>] [--] <pathspec>..."
3999 #: builtin/commit.c:42
4000 msgid "git status [<options>] [--] <pathspec>..."
4003 #: builtin/commit.c:47
4005 "Your name and email address were configured automatically based\n"
4006 "on your username and hostname. Please check that they are accurate.\n"
4007 "You can suppress this message by setting them explicitly. Run the\n"
4008 "following command and follow the instructions in your editor to edit\n"
4009 "your configuration file:\n"
4011 " git config --global --edit\n"
4013 "After doing this, you may fix the identity used for this commit with:\n"
4015 " git commit --amend --reset-author\n"
4018 #: builtin/commit.c:60
4020 "Your name and email address were configured automatically based\n"
4021 "on your username and hostname. Please check that they are accurate.\n"
4022 "You can suppress this message by setting them explicitly:\n"
4024 " git config --global user.name \"Your Name\"\n"
4025 " git config --global user.email you@example.com\n"
4027 "After doing this, you may fix the identity used for this commit with:\n"
4029 " git commit --amend --reset-author\n"
4032 #: builtin/commit.c:72
4034 "You asked to amend the most recent commit, but doing so would make\n"
4035 "it empty. You can repeat your command with --allow-empty, or you can\n"
4036 "remove the commit entirely with \"git reset HEAD^\".\n"
4039 #: builtin/commit.c:77
4041 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4042 "If you wish to commit it anyway, use:\n"
4044 " git commit --allow-empty\n"
4048 #: builtin/commit.c:84
4049 msgid "Otherwise, please use 'git reset'\n"
4052 #: builtin/commit.c:87
4054 "If you wish to skip this commit, use:\n"
4058 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4059 "the remaining commits.\n"
4062 #: builtin/commit.c:304
4063 msgid "failed to unpack HEAD tree object"
4066 #: builtin/commit.c:344
4067 msgid "unable to create temporary index"
4070 #: builtin/commit.c:350
4071 msgid "interactive add failed"
4074 #: builtin/commit.c:361
4075 msgid "unable to write index file"
4078 #: builtin/commit.c:363
4079 msgid "unable to update temporary index"
4082 #: builtin/commit.c:365
4083 msgid "Failed to update main cache tree"
4086 #: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
4087 msgid "unable to write new_index file"
4090 #: builtin/commit.c:445
4091 msgid "cannot do a partial commit during a merge."
4094 #: builtin/commit.c:447
4095 msgid "cannot do a partial commit during a cherry-pick."
4098 #: builtin/commit.c:456
4099 msgid "cannot read the index"
4102 #: builtin/commit.c:475
4103 msgid "unable to write temporary index file"
4106 #: builtin/commit.c:580
4108 msgid "commit '%s' lacks author header"
4111 #: builtin/commit.c:582
4113 msgid "commit '%s' has malformed author line"
4116 #: builtin/commit.c:601
4117 msgid "malformed --author parameter"
4120 #: builtin/commit.c:609
4122 msgid "invalid date format: %s"
4125 #: builtin/commit.c:653
4127 "unable to select a comment character that is not used\n"
4128 "in the current commit message"
4131 #: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
4133 msgid "could not lookup commit %s"
4136 #: builtin/commit.c:702 builtin/shortlog.c:273
4138 msgid "(reading log message from standard input)\n"
4141 #: builtin/commit.c:704
4142 msgid "could not read log from standard input"
4145 #: builtin/commit.c:708
4147 msgid "could not read log file '%s'"
4150 #: builtin/commit.c:730
4151 msgid "could not read MERGE_MSG"
4154 #: builtin/commit.c:734
4155 msgid "could not read SQUASH_MSG"
4158 #: builtin/commit.c:738
4160 msgid "could not read '%s'"
4163 #: builtin/commit.c:785
4164 msgid "could not write commit template"
4167 #: builtin/commit.c:803
4171 "It looks like you may be committing a merge.\n"
4172 "If this is not correct, please remove the file\n"
4177 #: builtin/commit.c:808
4181 "It looks like you may be committing a cherry-pick.\n"
4182 "If this is not correct, please remove the file\n"
4187 #: builtin/commit.c:821
4190 "Please enter the commit message for your changes. Lines starting\n"
4191 "with '%c' will be ignored, and an empty message aborts the commit.\n"
4194 #: builtin/commit.c:828
4197 "Please enter the commit message for your changes. Lines starting\n"
4198 "with '%c' will be kept; you may remove them yourself if you want to.\n"
4199 "An empty message aborts the commit.\n"
4202 #: builtin/commit.c:848
4204 msgid "%sAuthor: %.*s <%.*s>"
4207 #: builtin/commit.c:856
4212 #: builtin/commit.c:863
4214 msgid "%sCommitter: %.*s <%.*s>"
4217 #: builtin/commit.c:881
4218 msgid "Cannot read index"
4221 #: builtin/commit.c:938
4222 msgid "Error building trees"
4225 #: builtin/commit.c:953 builtin/tag.c:495
4227 msgid "Please supply the message using either -m or -F option.\n"
4230 #: builtin/commit.c:1055
4232 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4235 #: builtin/commit.c:1070 builtin/commit.c:1310
4237 msgid "Invalid untracked files mode '%s'"
4240 #: builtin/commit.c:1107
4241 msgid "--long and -z are incompatible"
4244 #: builtin/commit.c:1137
4245 msgid "Using both --reset-author and --author does not make sense"
4248 #: builtin/commit.c:1146
4249 msgid "You have nothing to amend."
4252 #: builtin/commit.c:1149
4253 msgid "You are in the middle of a merge -- cannot amend."
4256 #: builtin/commit.c:1151
4257 msgid "You are in the middle of a cherry-pick -- cannot amend."
4260 #: builtin/commit.c:1154
4261 msgid "Options --squash and --fixup cannot be used together"
4264 #: builtin/commit.c:1164
4265 msgid "Only one of -c/-C/-F/--fixup can be used."
4268 #: builtin/commit.c:1166
4269 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4272 #: builtin/commit.c:1174
4273 msgid "--reset-author can be used only with -C, -c or --amend."
4276 #: builtin/commit.c:1191
4277 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4280 #: builtin/commit.c:1193
4281 msgid "No paths with --include/--only does not make sense."
4284 #: builtin/commit.c:1195
4285 msgid "Clever... amending the last one with dirty index."
4288 #: builtin/commit.c:1197
4289 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4292 #: builtin/commit.c:1209 builtin/tag.c:728
4294 msgid "Invalid cleanup mode %s"
4297 #: builtin/commit.c:1214
4298 msgid "Paths with -a does not make sense."
4301 #: builtin/commit.c:1324 builtin/commit.c:1604
4302 msgid "show status concisely"
4305 #: builtin/commit.c:1326 builtin/commit.c:1606
4306 msgid "show branch information"
4309 #: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509
4310 msgid "machine-readable output"
4313 #: builtin/commit.c:1331 builtin/commit.c:1610
4314 msgid "show status in long format (default)"
4317 #: builtin/commit.c:1334 builtin/commit.c:1613
4318 msgid "terminate entries with NUL"
4321 #: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980
4322 #: builtin/fast-export.c:983 builtin/tag.c:603
4326 #: builtin/commit.c:1337 builtin/commit.c:1616
4327 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4330 #: builtin/commit.c:1340
4331 msgid "show ignored files"
4334 #: builtin/commit.c:1341 parse-options.h:153
4338 #: builtin/commit.c:1342
4340 "ignore changes to submodules, optional when: all, dirty, untracked. "
4344 #: builtin/commit.c:1344
4345 msgid "list untracked files in columns"
4348 #: builtin/commit.c:1431
4349 msgid "couldn't look up newly created commit"
4352 #: builtin/commit.c:1433
4353 msgid "could not parse newly created commit"
4356 #: builtin/commit.c:1478
4357 msgid "detached HEAD"
4360 #: builtin/commit.c:1481
4361 msgid " (root-commit)"
4364 #: builtin/commit.c:1574
4365 msgid "suppress summary after successful commit"
4368 #: builtin/commit.c:1575
4369 msgid "show diff in commit message template"
4372 #: builtin/commit.c:1577
4373 msgid "Commit message options"
4376 #: builtin/commit.c:1578 builtin/tag.c:601
4377 msgid "read message from file"
4380 #: builtin/commit.c:1579
4384 #: builtin/commit.c:1579
4385 msgid "override author for commit"
4388 #: builtin/commit.c:1580 builtin/gc.c:275
4392 #: builtin/commit.c:1580
4393 msgid "override date for commit"
4396 #: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391
4397 #: builtin/notes.c:554 builtin/tag.c:599
4401 #: builtin/commit.c:1581
4402 msgid "commit message"
4405 #: builtin/commit.c:1582
4406 msgid "reuse and edit message from specified commit"
4409 #: builtin/commit.c:1583
4410 msgid "reuse message from specified commit"
4413 #: builtin/commit.c:1584
4414 msgid "use autosquash formatted message to fixup specified commit"
4417 #: builtin/commit.c:1585
4418 msgid "use autosquash formatted message to squash specified commit"
4421 #: builtin/commit.c:1586
4422 msgid "the commit is authored by me now (used with -C/-c/--amend)"
4425 #: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86
4426 msgid "add Signed-off-by:"
4429 #: builtin/commit.c:1588
4430 msgid "use specified template file"
4433 #: builtin/commit.c:1589
4434 msgid "force edit of commit"
4437 #: builtin/commit.c:1590
4441 #: builtin/commit.c:1590 builtin/tag.c:604
4442 msgid "how to strip spaces and #comments from message"
4445 #: builtin/commit.c:1591
4446 msgid "include status in commit message template"
4449 #: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92
4450 #: builtin/tag.c:605
4454 #: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93
4455 msgid "GPG sign commit"
4458 #: builtin/commit.c:1596
4459 msgid "Commit contents options"
4462 #: builtin/commit.c:1597
4463 msgid "commit all changed files"
4466 #: builtin/commit.c:1598
4467 msgid "add specified files to index for commit"
4470 #: builtin/commit.c:1599
4471 msgid "interactively add files"
4474 #: builtin/commit.c:1600
4475 msgid "interactively add changes"
4478 #: builtin/commit.c:1601
4479 msgid "commit only specified files"
4482 #: builtin/commit.c:1602
4483 msgid "bypass pre-commit hook"
4486 #: builtin/commit.c:1603
4487 msgid "show what would be committed"
4490 #: builtin/commit.c:1614
4491 msgid "amend previous commit"
4494 #: builtin/commit.c:1615
4495 msgid "bypass post-rewrite hook"
4498 #: builtin/commit.c:1620
4499 msgid "ok to record an empty change"
4502 #: builtin/commit.c:1622
4503 msgid "ok to record a change with an empty message"
4506 #: builtin/commit.c:1651
4507 msgid "could not parse HEAD commit"
4510 #: builtin/commit.c:1690 builtin/merge.c:519
4512 msgid "could not open '%s' for reading"
4515 #: builtin/commit.c:1697
4517 msgid "Corrupt MERGE_HEAD file (%s)"
4520 #: builtin/commit.c:1704
4521 msgid "could not read MERGE_MODE"
4524 #: builtin/commit.c:1723
4526 msgid "could not read commit message: %s"
4529 #: builtin/commit.c:1734
4531 msgid "Aborting commit; you did not edit the message.\n"
4534 #: builtin/commit.c:1739
4536 msgid "Aborting commit due to empty commit message.\n"
4539 #: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876
4540 msgid "failed to write commit object"
4543 #: builtin/commit.c:1787
4545 "Repository has been updated, but unable to write\n"
4546 "new_index file. Check that disk is not full and quota is\n"
4547 "not exceeded, and then \"git reset HEAD\" to recover."
4550 #: builtin/config.c:8
4551 msgid "git config [<options>]"
4554 #: builtin/config.c:53
4555 msgid "Config file location"
4558 #: builtin/config.c:54
4559 msgid "use global config file"
4562 #: builtin/config.c:55
4563 msgid "use system config file"
4566 #: builtin/config.c:56
4567 msgid "use repository config file"
4570 #: builtin/config.c:57
4571 msgid "use given config file"
4574 #: builtin/config.c:58
4578 #: builtin/config.c:58
4579 msgid "read config from given blob object"
4582 #: builtin/config.c:59
4586 #: builtin/config.c:60
4587 msgid "get value: name [value-regex]"
4590 #: builtin/config.c:61
4591 msgid "get all values: key [value-regex]"
4594 #: builtin/config.c:62
4595 msgid "get values for regexp: name-regex [value-regex]"
4598 #: builtin/config.c:63
4599 msgid "get value specific for the URL: section[.var] URL"
4602 #: builtin/config.c:64
4603 msgid "replace all matching variables: name value [value_regex]"
4606 #: builtin/config.c:65
4607 msgid "add a new variable: name value"
4610 #: builtin/config.c:66
4611 msgid "remove a variable: name [value-regex]"
4614 #: builtin/config.c:67
4615 msgid "remove all matches: name [value-regex]"
4618 #: builtin/config.c:68
4619 msgid "rename section: old-name new-name"
4622 #: builtin/config.c:69
4623 msgid "remove a section: name"
4626 #: builtin/config.c:70
4630 #: builtin/config.c:71
4631 msgid "open an editor"
4634 #: builtin/config.c:72
4635 msgid "find the color configured: slot [default]"
4638 #: builtin/config.c:73
4639 msgid "find the color setting: slot [stdout-is-tty]"
4642 #: builtin/config.c:74
4646 #: builtin/config.c:75
4647 msgid "value is \"true\" or \"false\""
4650 #: builtin/config.c:76
4651 msgid "value is decimal number"
4654 #: builtin/config.c:77
4655 msgid "value is --bool or --int"
4658 #: builtin/config.c:78
4659 msgid "value is a path (file or directory name)"
4662 #: builtin/config.c:79
4666 #: builtin/config.c:80
4667 msgid "terminate values with NUL byte"
4670 #: builtin/config.c:81
4671 msgid "respect include directives on lookup"
4674 #: builtin/config.c:316
4675 msgid "unable to parse default color value"
4678 #: builtin/config.c:457
4681 "# This is Git's per-user configuration file.\n"
4683 "# Please adapt and uncomment the following lines:\n"
4688 #: builtin/config.c:589
4690 msgid "cannot create configuration file %s"
4693 #: builtin/count-objects.c:55
4694 msgid "git count-objects [-v] [-H | --human-readable]"
4697 #: builtin/count-objects.c:65
4698 msgid "print sizes in human readable format"
4701 #: builtin/describe.c:17
4702 msgid "git describe [<options>] [<commit-ish>...]"
4705 #: builtin/describe.c:18
4706 msgid "git describe [<options>] --dirty"
4709 #: builtin/describe.c:217
4711 msgid "annotated tag %s not available"
4714 #: builtin/describe.c:221
4716 msgid "annotated tag %s has no embedded name"
4719 #: builtin/describe.c:223
4721 msgid "tag '%s' is really '%s' here"
4724 #: builtin/describe.c:250 builtin/log.c:452
4726 msgid "Not a valid object name %s"
4729 #: builtin/describe.c:253
4731 msgid "%s is not a valid '%s' object"
4734 #: builtin/describe.c:270
4736 msgid "no tag exactly matches '%s'"
4739 #: builtin/describe.c:272
4741 msgid "searching to describe %s\n"
4744 #: builtin/describe.c:319
4746 msgid "finished search at %s\n"
4749 #: builtin/describe.c:346
4752 "No annotated tags can describe '%s'.\n"
4753 "However, there were unannotated tags: try --tags."
4756 #: builtin/describe.c:350
4759 "No tags can describe '%s'.\n"
4760 "Try --always, or create some tags."
4763 #: builtin/describe.c:371
4765 msgid "traversed %lu commits\n"
4768 #: builtin/describe.c:374
4771 "more than %i tags found; listed %i most recent\n"
4772 "gave up search at %s\n"
4775 #: builtin/describe.c:396
4776 msgid "find the tag that comes after the commit"
4779 #: builtin/describe.c:397
4780 msgid "debug search strategy on stderr"
4783 #: builtin/describe.c:398
4787 #: builtin/describe.c:399
4788 msgid "use any tag, even unannotated"
4791 #: builtin/describe.c:400
4792 msgid "always use long format"
4795 #: builtin/describe.c:401
4796 msgid "only follow first parent"
4799 #: builtin/describe.c:404
4800 msgid "only output exact matches"
4803 #: builtin/describe.c:406
4804 msgid "consider <n> most recent tags (default: 10)"
4807 #: builtin/describe.c:408
4808 msgid "only consider tags matching <pattern>"
4811 #: builtin/describe.c:410 builtin/name-rev.c:318
4812 msgid "show abbreviated commit object as fallback"
4815 #: builtin/describe.c:411
4819 #: builtin/describe.c:412
4820 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4823 #: builtin/describe.c:430
4824 msgid "--long is incompatible with --abbrev=0"
4827 #: builtin/describe.c:456
4828 msgid "No names found, cannot describe anything."
4831 #: builtin/describe.c:476
4832 msgid "--dirty is incompatible with commit-ishes"
4835 #: builtin/diff.c:86
4837 msgid "'%s': not a regular file or symlink"
4840 #: builtin/diff.c:237
4842 msgid "invalid option: %s"
4845 #: builtin/diff.c:358
4846 msgid "Not a git repository"
4849 #: builtin/diff.c:401
4851 msgid "invalid object '%s' given."
4854 #: builtin/diff.c:410
4856 msgid "more than two blobs given: '%s'"
4859 #: builtin/diff.c:417
4861 msgid "unhandled object '%s' given."
4864 #: builtin/fast-export.c:24
4865 msgid "git fast-export [rev-list-opts]"
4868 #: builtin/fast-export.c:979
4869 msgid "show progress after <n> objects"
4872 #: builtin/fast-export.c:981
4873 msgid "select handling of signed tags"
4876 #: builtin/fast-export.c:984
4877 msgid "select handling of tags that tag filtered objects"
4880 #: builtin/fast-export.c:987
4881 msgid "Dump marks to this file"
4884 #: builtin/fast-export.c:989
4885 msgid "Import marks from this file"
4888 #: builtin/fast-export.c:991
4889 msgid "Fake a tagger when tags lack one"
4892 #: builtin/fast-export.c:993
4893 msgid "Output full tree for each commit"
4896 #: builtin/fast-export.c:995
4897 msgid "Use the done feature to terminate the stream"
4900 #: builtin/fast-export.c:996
4901 msgid "Skip output of blob data"
4904 #: builtin/fast-export.c:997
4908 #: builtin/fast-export.c:998
4909 msgid "Apply refspec to exported refs"
4912 #: builtin/fast-export.c:999
4913 msgid "anonymize output"
4916 #: builtin/fetch.c:19
4917 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4920 #: builtin/fetch.c:20
4921 msgid "git fetch [<options>] <group>"
4924 #: builtin/fetch.c:21
4925 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4928 #: builtin/fetch.c:22
4929 msgid "git fetch --all [<options>]"
4932 #: builtin/fetch.c:89
4933 msgid "fetch from all remotes"
4936 #: builtin/fetch.c:91
4937 msgid "append to .git/FETCH_HEAD instead of overwriting"
4940 #: builtin/fetch.c:93
4941 msgid "path to upload pack on remote end"
4944 #: builtin/fetch.c:94
4945 msgid "force overwrite of local branch"
4948 #: builtin/fetch.c:96
4949 msgid "fetch from multiple remotes"
4952 #: builtin/fetch.c:98
4953 msgid "fetch all tags and associated objects"
4956 #: builtin/fetch.c:100
4957 msgid "do not fetch all tags (--no-tags)"
4960 #: builtin/fetch.c:102
4961 msgid "prune remote-tracking branches no longer on remote"
4964 #: builtin/fetch.c:103
4968 #: builtin/fetch.c:104
4969 msgid "control recursive fetching of submodules"
4972 #: builtin/fetch.c:108
4973 msgid "keep downloaded pack"
4976 #: builtin/fetch.c:110
4977 msgid "allow updating of HEAD ref"
4980 #: builtin/fetch.c:113
4981 msgid "deepen history of shallow clone"
4984 #: builtin/fetch.c:115
4985 msgid "convert to a complete repository"
4988 #: builtin/fetch.c:117 builtin/log.c:1208
4992 #: builtin/fetch.c:118
4993 msgid "prepend this to submodule path output"
4996 #: builtin/fetch.c:121
4997 msgid "default mode for recursion"
5000 #: builtin/fetch.c:123
5001 msgid "accept refs that update .git/shallow"
5004 #: builtin/fetch.c:124
5008 #: builtin/fetch.c:125
5009 msgid "specify fetch refmap"
5012 #: builtin/fetch.c:375
5013 msgid "Couldn't find remote ref HEAD"
5016 #: builtin/fetch.c:455
5018 msgid "object %s not found"
5021 #: builtin/fetch.c:460
5022 msgid "[up to date]"
5025 #: builtin/fetch.c:474
5027 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5030 #: builtin/fetch.c:475 builtin/fetch.c:561
5034 #: builtin/fetch.c:486
5035 msgid "[tag update]"
5038 #: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541
5039 msgid " (unable to update local ref)"
5042 #: builtin/fetch.c:506
5046 #: builtin/fetch.c:509
5047 msgid "[new branch]"
5050 #: builtin/fetch.c:512
5054 #: builtin/fetch.c:557
5055 msgid "unable to update local ref"
5058 #: builtin/fetch.c:557
5059 msgid "forced update"
5062 #: builtin/fetch.c:563
5063 msgid "(non-fast-forward)"
5066 #: builtin/fetch.c:596 builtin/fetch.c:829
5068 msgid "cannot open %s: %s\n"
5071 #: builtin/fetch.c:605
5073 msgid "%s did not send all necessary objects\n"
5076 #: builtin/fetch.c:623
5078 msgid "reject %s because shallow roots are not allowed to be updated"
5081 #: builtin/fetch.c:711 builtin/fetch.c:794
5086 #: builtin/fetch.c:722
5089 "some local refs could not be updated; try running\n"
5090 " 'git remote prune %s' to remove any old, conflicting branches"
5093 #: builtin/fetch.c:774
5095 msgid " (%s will become dangling)"
5098 #: builtin/fetch.c:775
5100 msgid " (%s has become dangling)"
5103 #: builtin/fetch.c:799
5107 #: builtin/fetch.c:800 builtin/remote.c:1060
5111 #: builtin/fetch.c:819
5113 msgid "Refusing to fetch into current branch %s of non-bare repository"
5116 #: builtin/fetch.c:838
5118 msgid "Option \"%s\" value \"%s\" is not valid for %s"
5121 #: builtin/fetch.c:841
5123 msgid "Option \"%s\" is ignored for %s\n"
5126 #: builtin/fetch.c:897
5128 msgid "Don't know how to fetch from %s"
5131 #: builtin/fetch.c:1059
5133 msgid "Fetching %s\n"
5136 #: builtin/fetch.c:1061 builtin/remote.c:90
5138 msgid "Could not fetch %s"
5141 #: builtin/fetch.c:1079
5143 "No remote repository specified. Please, specify either a URL or a\n"
5144 "remote name from which new revisions should be fetched."
5147 #: builtin/fetch.c:1102
5148 msgid "You need to specify a tag name."
5151 #: builtin/fetch.c:1144
5152 msgid "--depth and --unshallow cannot be used together"
5155 #: builtin/fetch.c:1146
5156 msgid "--unshallow on a complete repository does not make sense"
5159 #: builtin/fetch.c:1169
5160 msgid "fetch --all does not take a repository argument"
5163 #: builtin/fetch.c:1171
5164 msgid "fetch --all does not make sense with refspecs"
5167 #: builtin/fetch.c:1182
5169 msgid "No such remote or remote group: %s"
5172 #: builtin/fetch.c:1190
5173 msgid "Fetching a group and specifying refspecs does not make sense"
5176 #: builtin/fmt-merge-msg.c:13
5178 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
5181 #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698
5182 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
5183 #: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590
5184 #: parse-options.h:132 parse-options.h:239
5188 #: builtin/fmt-merge-msg.c:663
5189 msgid "populate log with at most <n> entries from shortlog"
5192 #: builtin/fmt-merge-msg.c:666
5193 msgid "alias for --log (deprecated)"
5196 #: builtin/fmt-merge-msg.c:669
5200 #: builtin/fmt-merge-msg.c:670
5201 msgid "use <text> as start of message"
5204 #: builtin/fmt-merge-msg.c:671
5205 msgid "file to read from"
5208 #: builtin/for-each-ref.c:675
5209 msgid "unable to parse format"
5212 #: builtin/for-each-ref.c:1063
5213 msgid "git for-each-ref [<options>] [<pattern>]"
5216 #: builtin/for-each-ref.c:1078
5217 msgid "quote placeholders suitably for shells"
5220 #: builtin/for-each-ref.c:1080
5221 msgid "quote placeholders suitably for perl"
5224 #: builtin/for-each-ref.c:1082
5225 msgid "quote placeholders suitably for python"
5228 #: builtin/for-each-ref.c:1084
5229 msgid "quote placeholders suitably for Tcl"
5232 #: builtin/for-each-ref.c:1087
5233 msgid "show only <n> matched refs"
5236 #: builtin/for-each-ref.c:1088 builtin/replace.c:438
5240 #: builtin/for-each-ref.c:1088
5241 msgid "format to use for the output"
5244 #: builtin/for-each-ref.c:1089
5248 #: builtin/for-each-ref.c:1090
5249 msgid "field name to sort on"
5252 #: builtin/fsck.c:147 builtin/prune.c:137
5253 msgid "Checking connectivity"
5256 #: builtin/fsck.c:540
5257 msgid "Checking object directories"
5260 #: builtin/fsck.c:603
5261 msgid "git fsck [<options>] [<object>...]"
5264 #: builtin/fsck.c:609
5265 msgid "show unreachable objects"
5268 #: builtin/fsck.c:610
5269 msgid "show dangling objects"
5272 #: builtin/fsck.c:611
5276 #: builtin/fsck.c:612
5277 msgid "report root nodes"
5280 #: builtin/fsck.c:613
5281 msgid "make index objects head nodes"
5284 #: builtin/fsck.c:614
5285 msgid "make reflogs head nodes (default)"
5288 #: builtin/fsck.c:615
5289 msgid "also consider packs and alternate objects"
5292 #: builtin/fsck.c:616
5293 msgid "enable more strict checking"
5296 #: builtin/fsck.c:618
5297 msgid "write dangling objects in .git/lost-found"
5300 #: builtin/fsck.c:619 builtin/prune.c:108
5301 msgid "show progress"
5304 #: builtin/fsck.c:669
5305 msgid "Checking objects"
5309 msgid "git gc [<options>]"
5314 msgid "Invalid gc.pruneexpire: '%s'"
5319 msgid "insanely long object directory %.*s"
5323 msgid "prune unreferenced objects"
5327 msgid "be more thorough (increased runtime)"
5331 msgid "enable auto-gc mode"
5335 msgid "force running gc even if there may be another gc running"
5340 msgid "Auto packing the repository in background for optimum performance.\n"
5345 msgid "Auto packing the repository for optimum performance.\n"
5350 msgid "See \"git help gc\" for manual housekeeping.\n"
5356 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5361 "There are too many unreachable loose objects; run 'git prune' to remove them."
5364 #: builtin/grep.c:23
5365 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
5368 #: builtin/grep.c:218
5370 msgid "grep: failed to create thread: %s"
5373 #: builtin/grep.c:441 builtin/grep.c:476
5375 msgid "unable to read tree (%s)"
5378 #: builtin/grep.c:491
5380 msgid "unable to grep from object of type %s"
5383 #: builtin/grep.c:547
5385 msgid "switch `%c' expects a numerical value"
5388 #: builtin/grep.c:564
5390 msgid "cannot open '%s'"
5393 #: builtin/grep.c:638
5394 msgid "search in index instead of in the work tree"
5397 #: builtin/grep.c:640
5398 msgid "find in contents not managed by git"
5401 #: builtin/grep.c:642
5402 msgid "search in both tracked and untracked files"
5405 #: builtin/grep.c:644
5406 msgid "ignore files specified via '.gitignore'"
5409 #: builtin/grep.c:647
5410 msgid "show non-matching lines"
5413 #: builtin/grep.c:649
5414 msgid "case insensitive matching"
5417 #: builtin/grep.c:651
5418 msgid "match patterns only at word boundaries"
5421 #: builtin/grep.c:653
5422 msgid "process binary files as text"
5425 #: builtin/grep.c:655
5426 msgid "don't match patterns in binary files"
5429 #: builtin/grep.c:658
5430 msgid "process binary files with textconv filters"
5433 #: builtin/grep.c:660
5434 msgid "descend at most <depth> levels"
5437 #: builtin/grep.c:664
5438 msgid "use extended POSIX regular expressions"
5441 #: builtin/grep.c:667
5442 msgid "use basic POSIX regular expressions (default)"
5445 #: builtin/grep.c:670
5446 msgid "interpret patterns as fixed strings"
5449 #: builtin/grep.c:673
5450 msgid "use Perl-compatible regular expressions"
5453 #: builtin/grep.c:676
5454 msgid "show line numbers"
5457 #: builtin/grep.c:677
5458 msgid "don't show filenames"
5461 #: builtin/grep.c:678
5462 msgid "show filenames"
5465 #: builtin/grep.c:680
5466 msgid "show filenames relative to top directory"
5469 #: builtin/grep.c:682
5470 msgid "show only filenames instead of matching lines"
5473 #: builtin/grep.c:684
5474 msgid "synonym for --files-with-matches"
5477 #: builtin/grep.c:687
5478 msgid "show only the names of files without match"
5481 #: builtin/grep.c:689
5482 msgid "print NUL after filenames"
5485 #: builtin/grep.c:691
5486 msgid "show the number of matches instead of matching lines"
5489 #: builtin/grep.c:692
5490 msgid "highlight matches"
5493 #: builtin/grep.c:694
5494 msgid "print empty line between matches from different files"
5497 #: builtin/grep.c:696
5498 msgid "show filename only once above matches from same file"
5501 #: builtin/grep.c:699
5502 msgid "show <n> context lines before and after matches"
5505 #: builtin/grep.c:702
5506 msgid "show <n> context lines before matches"
5509 #: builtin/grep.c:704
5510 msgid "show <n> context lines after matches"
5513 #: builtin/grep.c:705
5514 msgid "shortcut for -C NUM"
5517 #: builtin/grep.c:708
5518 msgid "show a line with the function name before matches"
5521 #: builtin/grep.c:710
5522 msgid "show the surrounding function"
5525 #: builtin/grep.c:713
5526 msgid "read patterns from file"
5529 #: builtin/grep.c:715
5530 msgid "match <pattern>"
5533 #: builtin/grep.c:717
5534 msgid "combine patterns specified with -e"
5537 #: builtin/grep.c:729
5538 msgid "indicate hit with exit status without output"
5541 #: builtin/grep.c:731
5542 msgid "show only matches from files that match all patterns"
5545 #: builtin/grep.c:733
5546 msgid "show parse tree for grep expression"
5549 #: builtin/grep.c:737
5553 #: builtin/grep.c:737
5554 msgid "show matching files in the pager"
5557 #: builtin/grep.c:740
5558 msgid "allow calling of grep(1) (ignored by this build)"
5561 #: builtin/grep.c:741 builtin/show-ref.c:187
5565 #: builtin/grep.c:808
5566 msgid "no pattern given."
5569 #: builtin/grep.c:866
5570 msgid "--open-files-in-pager only works on the worktree"
5573 #: builtin/grep.c:892
5574 msgid "--cached or --untracked cannot be used with --no-index."
5577 #: builtin/grep.c:897
5578 msgid "--no-index or --untracked cannot be used with revs."
5581 #: builtin/grep.c:900
5582 msgid "--[no-]exclude-standard cannot be used for tracked contents."
5585 #: builtin/grep.c:908
5586 msgid "both --cached and trees are given."
5589 #: builtin/hash-object.c:82
5591 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
5595 #: builtin/hash-object.c:83
5596 msgid "git hash-object --stdin-paths < <list-of-paths>"
5599 #: builtin/hash-object.c:94 builtin/tag.c:612
5603 #: builtin/hash-object.c:94
5607 #: builtin/hash-object.c:95
5608 msgid "write the object into the object database"
5611 #: builtin/hash-object.c:97
5612 msgid "read the object from stdin"
5615 #: builtin/hash-object.c:99
5616 msgid "store file as is without filters"
5619 #: builtin/hash-object.c:100
5621 "just hash any random garbage to create corrupt objects for debugging Git"
5624 #: builtin/hash-object.c:101
5625 msgid "process file as it were from this path"
5628 #: builtin/help.c:41
5629 msgid "print all available commands"
5632 #: builtin/help.c:42
5633 msgid "print list of useful guides"
5636 #: builtin/help.c:43
5637 msgid "show man page"
5640 #: builtin/help.c:44
5641 msgid "show manual in web browser"
5644 #: builtin/help.c:46
5645 msgid "show info page"
5648 #: builtin/help.c:52
5649 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
5652 #: builtin/help.c:64
5654 msgid "unrecognized help format '%s'"
5657 #: builtin/help.c:91
5658 msgid "Failed to start emacsclient."
5661 #: builtin/help.c:104
5662 msgid "Failed to parse emacsclient version."
5665 #: builtin/help.c:112
5667 msgid "emacsclient version '%d' too old (< 22)."
5670 #: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
5672 msgid "failed to exec '%s': %s"
5675 #: builtin/help.c:215
5678 "'%s': path for unsupported man viewer.\n"
5679 "Please consider using 'man.<tool>.cmd' instead."
5682 #: builtin/help.c:227
5685 "'%s': cmd for supported man viewer.\n"
5686 "Please consider using 'man.<tool>.path' instead."
5689 #: builtin/help.c:354
5691 msgid "'%s': unknown man viewer."
5694 #: builtin/help.c:371
5695 msgid "no man viewer handled the request"
5698 #: builtin/help.c:379
5699 msgid "no info viewer handled the request"
5702 #: builtin/help.c:428
5703 msgid "Defining attributes per path"
5706 #: builtin/help.c:429
5707 msgid "Everyday Git With 20 Commands Or So"
5710 #: builtin/help.c:430
5711 msgid "A Git glossary"
5714 #: builtin/help.c:431
5715 msgid "Specifies intentionally untracked files to ignore"
5718 #: builtin/help.c:432
5719 msgid "Defining submodule properties"
5722 #: builtin/help.c:433
5723 msgid "Specifying revisions and ranges for Git"
5726 #: builtin/help.c:434
5727 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5730 #: builtin/help.c:435
5731 msgid "An overview of recommended workflows with Git"
5734 #: builtin/help.c:447
5735 msgid "The common Git guides are:\n"
5738 #: builtin/help.c:468 builtin/help.c:485
5743 #: builtin/help.c:501
5745 msgid "`git %s' is aliased to `%s'"
5748 #: builtin/index-pack.c:150
5750 msgid "unable to open %s"
5753 #: builtin/index-pack.c:200
5755 msgid "object type mismatch at %s"
5758 #: builtin/index-pack.c:220
5760 msgid "did not receive expected object %s"
5763 #: builtin/index-pack.c:223
5765 msgid "object %s: expected type %s, found %s"
5768 #: builtin/index-pack.c:265
5770 msgid "cannot fill %d byte"
5771 msgid_plural "cannot fill %d bytes"
5775 #: builtin/index-pack.c:275
5779 #: builtin/index-pack.c:276
5780 msgid "read error on input"
5783 #: builtin/index-pack.c:288
5784 msgid "used more bytes than were available"
5787 #: builtin/index-pack.c:295
5788 msgid "pack too large for current definition of off_t"
5791 #: builtin/index-pack.c:311
5793 msgid "unable to create '%s'"
5796 #: builtin/index-pack.c:316
5798 msgid "cannot open packfile '%s'"
5801 #: builtin/index-pack.c:330
5802 msgid "pack signature mismatch"
5805 #: builtin/index-pack.c:332
5807 msgid "pack version %<PRIu32> unsupported"
5810 #: builtin/index-pack.c:350
5812 msgid "pack has bad object at offset %lu: %s"
5815 #: builtin/index-pack.c:471
5817 msgid "inflate returned %d"
5820 #: builtin/index-pack.c:520
5821 msgid "offset value overflow for delta base object"
5824 #: builtin/index-pack.c:528
5825 msgid "delta base offset is out of bound"
5828 #: builtin/index-pack.c:536
5830 msgid "unknown object type %d"
5833 #: builtin/index-pack.c:567
5834 msgid "cannot pread pack file"
5837 #: builtin/index-pack.c:569
5839 msgid "premature end of pack file, %lu byte missing"
5840 msgid_plural "premature end of pack file, %lu bytes missing"
5844 #: builtin/index-pack.c:595
5845 msgid "serious inflate inconsistency"
5848 #: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715
5849 #: builtin/index-pack.c:749 builtin/index-pack.c:758
5851 msgid "SHA1 COLLISION FOUND WITH %s !"
5854 #: builtin/index-pack.c:689 builtin/pack-objects.c:162
5855 #: builtin/pack-objects.c:254
5857 msgid "unable to read %s"
5860 #: builtin/index-pack.c:755
5862 msgid "cannot read existing object %s"
5865 #: builtin/index-pack.c:769
5867 msgid "invalid blob object %s"
5870 #: builtin/index-pack.c:783
5875 #: builtin/index-pack.c:787
5876 msgid "Error in object"
5879 #: builtin/index-pack.c:789
5881 msgid "Not all child objects of %s are reachable"
5884 #: builtin/index-pack.c:861 builtin/index-pack.c:890
5885 msgid "failed to apply delta"
5888 #: builtin/index-pack.c:1055
5889 msgid "Receiving objects"
5892 #: builtin/index-pack.c:1055
5893 msgid "Indexing objects"
5896 #: builtin/index-pack.c:1081
5897 msgid "pack is corrupted (SHA1 mismatch)"
5900 #: builtin/index-pack.c:1086
5901 msgid "cannot fstat packfile"
5904 #: builtin/index-pack.c:1089
5905 msgid "pack has junk at the end"
5908 #: builtin/index-pack.c:1100
5909 msgid "confusion beyond insanity in parse_pack_objects()"
5912 #: builtin/index-pack.c:1123
5913 msgid "Resolving deltas"
5916 #: builtin/index-pack.c:1133
5918 msgid "unable to create thread: %s"
5921 #: builtin/index-pack.c:1175
5922 msgid "confusion beyond insanity"
5925 #: builtin/index-pack.c:1181
5927 msgid "completed with %d local objects"
5930 #: builtin/index-pack.c:1191
5932 msgid "Unexpected tail checksum for %s (disk corruption?)"
5935 #: builtin/index-pack.c:1195
5937 msgid "pack has %d unresolved delta"
5938 msgid_plural "pack has %d unresolved deltas"
5942 #: builtin/index-pack.c:1219
5944 msgid "unable to deflate appended object (%d)"
5947 #: builtin/index-pack.c:1298
5949 msgid "local object %s is corrupt"
5952 #: builtin/index-pack.c:1322
5953 msgid "error while closing pack file"
5956 #: builtin/index-pack.c:1335
5958 msgid "cannot write keep file '%s'"
5961 #: builtin/index-pack.c:1343
5963 msgid "cannot close written keep file '%s'"
5966 #: builtin/index-pack.c:1356
5967 msgid "cannot store pack file"
5970 #: builtin/index-pack.c:1367
5971 msgid "cannot store index file"
5974 #: builtin/index-pack.c:1400
5976 msgid "bad pack.indexversion=%<PRIu32>"
5979 #: builtin/index-pack.c:1406
5981 msgid "invalid number of threads specified (%d)"
5984 #: builtin/index-pack.c:1410 builtin/index-pack.c:1589
5986 msgid "no threads support, ignoring %s"
5989 #: builtin/index-pack.c:1468
5991 msgid "Cannot open existing pack file '%s'"
5994 #: builtin/index-pack.c:1470
5996 msgid "Cannot open existing pack idx file for '%s'"
5999 #: builtin/index-pack.c:1517
6001 msgid "non delta: %d object"
6002 msgid_plural "non delta: %d objects"
6006 #: builtin/index-pack.c:1524
6008 msgid "chain length = %d: %lu object"
6009 msgid_plural "chain length = %d: %lu objects"
6013 #: builtin/index-pack.c:1553
6014 msgid "Cannot come back to cwd"
6017 #: builtin/index-pack.c:1601 builtin/index-pack.c:1604
6018 #: builtin/index-pack.c:1616 builtin/index-pack.c:1620
6023 #: builtin/index-pack.c:1634
6024 msgid "--fix-thin cannot be used without --stdin"
6027 #: builtin/index-pack.c:1638 builtin/index-pack.c:1647
6029 msgid "packfile name '%s' does not end with '.pack'"
6032 #: builtin/index-pack.c:1655
6033 msgid "--verify with no packfile name given"
6036 #: builtin/init-db.c:35
6038 msgid "Could not make %s writable by group"
6041 #: builtin/init-db.c:62
6043 msgid "insanely long template name %s"
6046 #: builtin/init-db.c:67
6048 msgid "cannot stat '%s'"
6051 #: builtin/init-db.c:73
6053 msgid "cannot stat template '%s'"
6056 #: builtin/init-db.c:80
6058 msgid "cannot opendir '%s'"
6061 #: builtin/init-db.c:97
6063 msgid "cannot readlink '%s'"
6066 #: builtin/init-db.c:99
6068 msgid "insanely long symlink %s"
6071 #: builtin/init-db.c:102
6073 msgid "cannot symlink '%s' '%s'"
6076 #: builtin/init-db.c:106
6078 msgid "cannot copy '%s' to '%s'"
6081 #: builtin/init-db.c:110
6083 msgid "ignoring template %s"
6086 #: builtin/init-db.c:136
6088 msgid "insanely long template path %s"
6091 #: builtin/init-db.c:144
6093 msgid "templates not found %s"
6096 #: builtin/init-db.c:157
6098 msgid "not copying templates of a wrong format version %d from '%s'"
6101 #: builtin/init-db.c:197
6103 msgid "insane git directory %s"
6106 #: builtin/init-db.c:331 builtin/init-db.c:334
6108 msgid "%s already exists"
6111 #: builtin/init-db.c:363
6113 msgid "unable to handle file type %d"
6116 #: builtin/init-db.c:366
6118 msgid "unable to move %s to %s"
6121 #. TRANSLATORS: The first '%s' is either "Reinitialized
6122 #. existing" or "Initialized empty", the second " shared" or
6123 #. "", and the last '%s%s' is the verbatim directory name.
6124 #: builtin/init-db.c:426
6126 msgid "%s%s Git repository in %s%s\n"
6129 #: builtin/init-db.c:427
6130 msgid "Reinitialized existing"
6133 #: builtin/init-db.c:427
6134 msgid "Initialized empty"
6137 #: builtin/init-db.c:428
6141 #: builtin/init-db.c:475
6143 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6144 "shared[=<permissions>]] [<directory>]"
6147 #: builtin/init-db.c:498
6151 #: builtin/init-db.c:499
6152 msgid "specify that the git repository is to be shared amongst several users"
6155 #: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171
6159 #: builtin/init-db.c:533 builtin/init-db.c:538
6161 msgid "cannot mkdir %s"
6164 #: builtin/init-db.c:542
6166 msgid "cannot chdir to %s"
6169 #: builtin/init-db.c:563
6172 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6176 #: builtin/init-db.c:591
6178 msgid "Cannot access work tree '%s'"
6181 #: builtin/interpret-trailers.c:15
6183 "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6187 #: builtin/interpret-trailers.c:25
6188 msgid "trim empty trailers"
6191 #: builtin/interpret-trailers.c:26
6195 #: builtin/interpret-trailers.c:27
6196 msgid "trailer(s) to add"
6200 msgid "git log [<options>] [<revision range>] [[--] <path>...]"
6204 msgid "git show [<options>] <object>..."
6209 msgid "invalid --decorate option: %s"
6212 #: builtin/log.c:127
6213 msgid "suppress diff output"
6216 #: builtin/log.c:128
6220 #: builtin/log.c:129
6221 msgid "Use mail map file"
6224 #: builtin/log.c:130
6225 msgid "decorate options"
6228 #: builtin/log.c:133
6229 msgid "Process line range n,m in file, counting from 1"
6232 #: builtin/log.c:229
6234 msgid "Final output: %d %s\n"
6237 #: builtin/log.c:458
6239 msgid "git show %s: bad file"
6242 #: builtin/log.c:472 builtin/log.c:564
6244 msgid "Could not read object %s"
6247 #: builtin/log.c:588
6249 msgid "Unknown type: %d"
6252 #: builtin/log.c:689
6253 msgid "format.headers without value"
6256 #: builtin/log.c:773
6257 msgid "name of output directory is too long"
6260 #: builtin/log.c:789
6262 msgid "Cannot open patch file %s"
6265 #: builtin/log.c:803
6266 msgid "Need exactly one range."
6269 #: builtin/log.c:811
6270 msgid "Not a range."
6273 #: builtin/log.c:919
6274 msgid "Cover letter needs email format"
6277 #: builtin/log.c:998
6279 msgid "insane in-reply-to: %s"
6282 #: builtin/log.c:1026
6283 msgid "git format-patch [<options>] [<since> | <revision-range>]"
6286 #: builtin/log.c:1071
6287 msgid "Two output directories?"
6290 #: builtin/log.c:1186
6291 msgid "use [PATCH n/m] even with a single patch"
6294 #: builtin/log.c:1189
6295 msgid "use [PATCH] even with multiple patches"
6298 #: builtin/log.c:1193
6299 msgid "print patches to standard out"
6302 #: builtin/log.c:1195
6303 msgid "generate a cover letter"
6306 #: builtin/log.c:1197
6307 msgid "use simple number sequence for output file names"
6310 #: builtin/log.c:1198
6314 #: builtin/log.c:1199
6315 msgid "use <sfx> instead of '.patch'"
6318 #: builtin/log.c:1201
6319 msgid "start numbering patches at <n> instead of 1"
6322 #: builtin/log.c:1203
6323 msgid "mark the series as Nth re-roll"
6326 #: builtin/log.c:1205
6327 msgid "Use [<prefix>] instead of [PATCH]"
6330 #: builtin/log.c:1208
6331 msgid "store resulting files in <dir>"
6334 #: builtin/log.c:1211
6335 msgid "don't strip/add [PATCH]"
6338 #: builtin/log.c:1214
6339 msgid "don't output binary diffs"
6342 #: builtin/log.c:1216
6343 msgid "don't include a patch matching a commit upstream"
6346 #: builtin/log.c:1218
6347 msgid "show patch format instead of default (patch + stat)"
6350 #: builtin/log.c:1220
6354 #: builtin/log.c:1221
6358 #: builtin/log.c:1222
6359 msgid "add email header"
6362 #: builtin/log.c:1223 builtin/log.c:1225
6366 #: builtin/log.c:1223
6367 msgid "add To: header"
6370 #: builtin/log.c:1225
6371 msgid "add Cc: header"
6374 #: builtin/log.c:1227
6378 #: builtin/log.c:1228
6379 msgid "set From address to <ident> (or committer ident if absent)"
6382 #: builtin/log.c:1230
6386 #: builtin/log.c:1231
6387 msgid "make first mail a reply to <message-id>"
6390 #: builtin/log.c:1232 builtin/log.c:1235
6394 #: builtin/log.c:1233
6395 msgid "attach the patch"
6398 #: builtin/log.c:1236
6399 msgid "inline the patch"
6402 #: builtin/log.c:1240
6403 msgid "enable message threading, styles: shallow, deep"
6406 #: builtin/log.c:1242
6410 #: builtin/log.c:1243
6411 msgid "add a signature"
6414 #: builtin/log.c:1245
6415 msgid "add a signature from a file"
6418 #: builtin/log.c:1246
6419 msgid "don't print the patch filenames"
6422 #: builtin/log.c:1320
6424 msgid "invalid ident line: %s"
6427 #: builtin/log.c:1335
6428 msgid "-n and -k are mutually exclusive."
6431 #: builtin/log.c:1337
6432 msgid "--subject-prefix and -k are mutually exclusive."
6435 #: builtin/log.c:1345
6436 msgid "--name-only does not make sense"
6439 #: builtin/log.c:1347
6440 msgid "--name-status does not make sense"
6443 #: builtin/log.c:1349
6444 msgid "--check does not make sense"
6447 #: builtin/log.c:1372
6448 msgid "standard output, or directory, which one?"
6451 #: builtin/log.c:1374
6453 msgid "Could not create directory '%s'"
6456 #: builtin/log.c:1472
6458 msgid "unable to read signature file '%s'"
6461 #: builtin/log.c:1535
6462 msgid "Failed to create output files"
6465 #: builtin/log.c:1583
6466 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6469 #: builtin/log.c:1638
6472 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
6475 #: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665
6477 msgid "Unknown commit %s"
6480 #: builtin/ls-files.c:358
6481 msgid "git ls-files [<options>] [<file>...]"
6484 #: builtin/ls-files.c:415
6485 msgid "identify the file status with tags"
6488 #: builtin/ls-files.c:417
6489 msgid "use lowercase letters for 'assume unchanged' files"
6492 #: builtin/ls-files.c:419
6493 msgid "show cached files in the output (default)"
6496 #: builtin/ls-files.c:421
6497 msgid "show deleted files in the output"
6500 #: builtin/ls-files.c:423
6501 msgid "show modified files in the output"
6504 #: builtin/ls-files.c:425
6505 msgid "show other files in the output"
6508 #: builtin/ls-files.c:427
6509 msgid "show ignored files in the output"
6512 #: builtin/ls-files.c:430
6513 msgid "show staged contents' object name in the output"
6516 #: builtin/ls-files.c:432
6517 msgid "show files on the filesystem that need to be removed"
6520 #: builtin/ls-files.c:434
6521 msgid "show 'other' directories' names only"
6524 #: builtin/ls-files.c:437
6525 msgid "don't show empty directories"
6528 #: builtin/ls-files.c:440
6529 msgid "show unmerged files in the output"
6532 #: builtin/ls-files.c:442
6533 msgid "show resolve-undo information"
6536 #: builtin/ls-files.c:444
6537 msgid "skip files matching pattern"
6540 #: builtin/ls-files.c:447
6541 msgid "exclude patterns are read from <file>"
6544 #: builtin/ls-files.c:450
6545 msgid "read additional per-directory exclude patterns in <file>"
6548 #: builtin/ls-files.c:452
6549 msgid "add the standard git exclusions"
6552 #: builtin/ls-files.c:455
6553 msgid "make the output relative to the project top directory"
6556 #: builtin/ls-files.c:458
6557 msgid "if any <file> is not in the index, treat this as an error"
6560 #: builtin/ls-files.c:459
6564 #: builtin/ls-files.c:460
6565 msgid "pretend that paths removed since <tree-ish> are still present"
6568 #: builtin/ls-files.c:462
6569 msgid "show debugging data"
6572 #: builtin/ls-tree.c:28
6573 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
6576 #: builtin/ls-tree.c:127
6577 msgid "only show trees"
6580 #: builtin/ls-tree.c:129
6581 msgid "recurse into subtrees"
6584 #: builtin/ls-tree.c:131
6585 msgid "show trees when recursing"
6588 #: builtin/ls-tree.c:134
6589 msgid "terminate entries with NUL byte"
6592 #: builtin/ls-tree.c:135
6593 msgid "include object size"
6596 #: builtin/ls-tree.c:137 builtin/ls-tree.c:139
6597 msgid "list only filenames"
6600 #: builtin/ls-tree.c:142
6601 msgid "use full path names"
6604 #: builtin/ls-tree.c:144
6605 msgid "list entire tree; not just current directory (implies --full-name)"
6608 #: builtin/merge.c:45
6609 msgid "git merge [<options>] [<commit>...]"
6612 #: builtin/merge.c:46
6613 msgid "git merge [<options>] <msg> HEAD <commit>"
6616 #: builtin/merge.c:47
6617 msgid "git merge --abort"
6620 #: builtin/merge.c:100
6621 msgid "switch `m' requires a value"
6624 #: builtin/merge.c:137
6626 msgid "Could not find merge strategy '%s'.\n"
6629 #: builtin/merge.c:138
6631 msgid "Available strategies are:"
6634 #: builtin/merge.c:143
6636 msgid "Available custom strategies are:"
6639 #: builtin/merge.c:193
6640 msgid "do not show a diffstat at the end of the merge"
6643 #: builtin/merge.c:196
6644 msgid "show a diffstat at the end of the merge"
6647 #: builtin/merge.c:197
6648 msgid "(synonym to --stat)"
6651 #: builtin/merge.c:199
6652 msgid "add (at most <n>) entries from shortlog to merge commit message"
6655 #: builtin/merge.c:202
6656 msgid "create a single commit instead of doing a merge"
6659 #: builtin/merge.c:204
6660 msgid "perform a commit if the merge succeeds (default)"
6663 #: builtin/merge.c:206
6664 msgid "edit message before committing"
6667 #: builtin/merge.c:207
6668 msgid "allow fast-forward (default)"
6671 #: builtin/merge.c:209
6672 msgid "abort if fast-forward is not possible"
6675 #: builtin/merge.c:213
6676 msgid "Verify that the named commit has a valid GPG signature"
6679 #: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
6683 #: builtin/merge.c:215
6684 msgid "merge strategy to use"
6687 #: builtin/merge.c:216
6688 msgid "option=value"
6691 #: builtin/merge.c:217
6692 msgid "option for selected merge strategy"
6695 #: builtin/merge.c:219
6696 msgid "merge commit message (for a non-fast-forward merge)"
6699 #: builtin/merge.c:223
6700 msgid "abort the current in-progress merge"
6703 #: builtin/merge.c:251
6704 msgid "could not run stash."
6707 #: builtin/merge.c:256
6708 msgid "stash failed"
6711 #: builtin/merge.c:261
6713 msgid "not a valid object: %s"
6716 #: builtin/merge.c:280 builtin/merge.c:297
6717 msgid "read-tree failed"
6720 #: builtin/merge.c:327
6721 msgid " (nothing to squash)"
6724 #: builtin/merge.c:340
6726 msgid "Squash commit -- not updating HEAD\n"
6729 #: builtin/merge.c:372
6730 msgid "Writing SQUASH_MSG"
6733 #: builtin/merge.c:374
6734 msgid "Finishing SQUASH_MSG"
6737 #: builtin/merge.c:397
6739 msgid "No merge message -- not updating HEAD\n"
6742 #: builtin/merge.c:447
6744 msgid "'%s' does not point to a commit"
6747 #: builtin/merge.c:559
6749 msgid "Bad branch.%s.mergeoptions string: %s"
6752 #: builtin/merge.c:654
6753 msgid "git write-tree failed to write a tree"
6756 #: builtin/merge.c:678
6757 msgid "Not handling anything other than two heads merge."
6760 #: builtin/merge.c:692
6762 msgid "Unknown option for merge-recursive: -X%s"
6765 #: builtin/merge.c:705
6767 msgid "unable to write %s"
6770 #: builtin/merge.c:794
6772 msgid "Could not read from '%s'"
6775 #: builtin/merge.c:803
6777 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6780 #: builtin/merge.c:809
6783 "Please enter a commit message to explain why this merge is necessary,\n"
6784 "especially if it merges an updated upstream into a topic branch.\n"
6786 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
6790 #: builtin/merge.c:833
6791 msgid "Empty commit message."
6794 #: builtin/merge.c:845
6796 msgid "Wonderful.\n"
6799 #: builtin/merge.c:900
6801 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6804 #: builtin/merge.c:916
6806 msgid "'%s' is not a commit"
6809 #: builtin/merge.c:957
6810 msgid "No current branch."
6813 #: builtin/merge.c:959
6814 msgid "No remote for the current branch."
6817 #: builtin/merge.c:961
6818 msgid "No default upstream defined for the current branch."
6821 #: builtin/merge.c:966
6823 msgid "No remote-tracking branch for %s from %s"
6826 #: builtin/merge.c:1122
6827 msgid "There is no merge to abort (MERGE_HEAD missing)."
6830 #: builtin/merge.c:1138
6832 "You have not concluded your merge (MERGE_HEAD exists).\n"
6833 "Please, commit your changes before you merge."
6836 #: builtin/merge.c:1141 git-pull.sh:34
6837 msgid "You have not concluded your merge (MERGE_HEAD exists)."
6840 #: builtin/merge.c:1145
6842 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6843 "Please, commit your changes before you merge."
6846 #: builtin/merge.c:1148
6847 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6850 #: builtin/merge.c:1157
6851 msgid "You cannot combine --squash with --no-ff."
6854 #: builtin/merge.c:1166
6855 msgid "No commit specified and merge.defaultToUpstream not set."
6858 #: builtin/merge.c:1198
6859 msgid "Can merge only exactly one commit into empty head"
6862 #: builtin/merge.c:1201
6863 msgid "Squash commit into empty head not supported yet"
6866 #: builtin/merge.c:1203
6867 msgid "Non-fast-forward commit does not make sense into an empty head"
6870 #: builtin/merge.c:1208
6872 msgid "%s - not something we can merge"
6875 #: builtin/merge.c:1259
6877 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6880 #: builtin/merge.c:1262
6882 msgid "Commit %s has a bad GPG signature allegedly by %s."
6885 #: builtin/merge.c:1265
6887 msgid "Commit %s does not have a GPG signature."
6890 #: builtin/merge.c:1268
6892 msgid "Commit %s has a good GPG signature by %s\n"
6895 #: builtin/merge.c:1349
6897 msgid "Updating %s..%s\n"
6900 #: builtin/merge.c:1388
6902 msgid "Trying really trivial in-index merge...\n"
6905 #: builtin/merge.c:1395
6910 #: builtin/merge.c:1427
6911 msgid "Not possible to fast-forward, aborting."
6914 #: builtin/merge.c:1450 builtin/merge.c:1529
6916 msgid "Rewinding the tree to pristine...\n"
6919 #: builtin/merge.c:1454
6921 msgid "Trying merge strategy %s...\n"
6924 #: builtin/merge.c:1520
6926 msgid "No merge strategy handled the merge.\n"
6929 #: builtin/merge.c:1522
6931 msgid "Merge with strategy %s failed.\n"
6934 #: builtin/merge.c:1531
6936 msgid "Using the %s to prepare resolving by hand.\n"
6939 #: builtin/merge.c:1543
6941 msgid "Automatic merge went well; stopped before committing as requested\n"
6944 #: builtin/merge-base.c:29
6945 msgid "git merge-base [-a | --all] <commit> <commit>..."
6948 #: builtin/merge-base.c:30
6949 msgid "git merge-base [-a | --all] --octopus <commit>..."
6952 #: builtin/merge-base.c:31
6953 msgid "git merge-base --independent <commit>..."
6956 #: builtin/merge-base.c:32
6957 msgid "git merge-base --is-ancestor <commit> <commit>"
6960 #: builtin/merge-base.c:33
6961 msgid "git merge-base --fork-point <ref> [<commit>]"
6964 #: builtin/merge-base.c:214
6965 msgid "output all common ancestors"
6968 #: builtin/merge-base.c:216
6969 msgid "find ancestors for a single n-way merge"
6972 #: builtin/merge-base.c:218
6973 msgid "list revs not reachable from others"
6976 #: builtin/merge-base.c:220
6977 msgid "is the first one ancestor of the other?"
6980 #: builtin/merge-base.c:222
6981 msgid "find where <commit> forked from reflog of <ref>"
6984 #: builtin/merge-file.c:8
6986 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
6987 "<orig-file> <file2>"
6990 #: builtin/merge-file.c:33
6991 msgid "send results to standard output"
6994 #: builtin/merge-file.c:34
6995 msgid "use a diff3 based merge"
6998 #: builtin/merge-file.c:35
6999 msgid "for conflicts, use our version"
7002 #: builtin/merge-file.c:37
7003 msgid "for conflicts, use their version"
7006 #: builtin/merge-file.c:39
7007 msgid "for conflicts, use a union version"
7010 #: builtin/merge-file.c:42
7011 msgid "for conflicts, use this marker size"
7014 #: builtin/merge-file.c:43
7015 msgid "do not warn about conflicts"
7018 #: builtin/merge-file.c:45
7019 msgid "set labels for file1/orig-file/file2"
7022 #: builtin/mktree.c:64
7023 msgid "git mktree [-z] [--missing] [--batch]"
7026 #: builtin/mktree.c:150
7027 msgid "input is NUL terminated"
7030 #: builtin/mktree.c:151 builtin/write-tree.c:24
7031 msgid "allow missing objects"
7034 #: builtin/mktree.c:152
7035 msgid "allow creation of more than one tree"
7039 msgid "git mv [<options>] <source>... <destination>"
7044 msgid "Directory %s is in index and no submodule?"
7048 msgid "Please stage your changes to .gitmodules or stash them to proceed"
7053 msgid "%.*s is in index"
7057 msgid "force move/rename even if target exists"
7061 msgid "skip move/rename errors"
7066 msgid "destination '%s' is not a directory"
7071 msgid "Checking rename of '%s' to '%s'\n"
7079 msgid "can not move directory into itself"
7083 msgid "cannot move directory over file"
7087 msgid "source directory is empty"
7091 msgid "not under version control"
7095 msgid "destination exists"
7100 msgid "overwriting '%s'"
7104 msgid "Cannot overwrite"
7108 msgid "multiple sources for the same target"
7112 msgid "destination directory does not exist"
7117 msgid "%s, source=%s, destination=%s"
7122 msgid "Renaming %s to %s\n"
7125 #: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359
7127 msgid "renaming '%s' failed"
7130 #: builtin/name-rev.c:255
7131 msgid "git name-rev [<options>] <commit>..."
7134 #: builtin/name-rev.c:256
7135 msgid "git name-rev [<options>] --all"
7138 #: builtin/name-rev.c:257
7139 msgid "git name-rev [<options>] --stdin"
7142 #: builtin/name-rev.c:309
7143 msgid "print only names (no SHA-1)"
7146 #: builtin/name-rev.c:310
7147 msgid "only use tags to name the commits"
7150 #: builtin/name-rev.c:312
7151 msgid "only use refs matching <pattern>"
7154 #: builtin/name-rev.c:314
7155 msgid "list all commits reachable from all refs"
7158 #: builtin/name-rev.c:315
7159 msgid "read from stdin"
7162 #: builtin/name-rev.c:316
7163 msgid "allow to print `undefined` names (default)"
7166 #: builtin/name-rev.c:322
7167 msgid "dereference tags in the input (internal use)"
7170 #: builtin/notes.c:24
7171 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
7174 #: builtin/notes.c:25
7176 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
7177 "| (-c | -C) <object>] [<object>]"
7180 #: builtin/notes.c:26
7181 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
7184 #: builtin/notes.c:27
7186 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
7187 "(-c | -C) <object>] [<object>]"
7190 #: builtin/notes.c:28
7191 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
7194 #: builtin/notes.c:29
7195 msgid "git notes [--ref <notes-ref>] show [<object>]"
7198 #: builtin/notes.c:30
7200 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
7203 #: builtin/notes.c:31
7204 msgid "git notes merge --commit [-v | -q]"
7207 #: builtin/notes.c:32
7208 msgid "git notes merge --abort [-v | -q]"
7211 #: builtin/notes.c:33
7212 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
7215 #: builtin/notes.c:34
7216 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
7219 #: builtin/notes.c:35
7220 msgid "git notes [--ref <notes-ref>] get-ref"
7223 #: builtin/notes.c:40
7224 msgid "git notes [list [<object>]]"
7227 #: builtin/notes.c:45
7228 msgid "git notes add [<options>] [<object>]"
7231 #: builtin/notes.c:50
7232 msgid "git notes copy [<options>] <from-object> <to-object>"
7235 #: builtin/notes.c:51
7236 msgid "git notes copy --stdin [<from-object> <to-object>]..."
7239 #: builtin/notes.c:56
7240 msgid "git notes append [<options>] [<object>]"
7243 #: builtin/notes.c:61
7244 msgid "git notes edit [<object>]"
7247 #: builtin/notes.c:66
7248 msgid "git notes show [<object>]"
7251 #: builtin/notes.c:71
7252 msgid "git notes merge [<options>] <notes-ref>"
7255 #: builtin/notes.c:72
7256 msgid "git notes merge --commit [<options>]"
7259 #: builtin/notes.c:73
7260 msgid "git notes merge --abort [<options>]"
7263 #: builtin/notes.c:78
7264 msgid "git notes remove [<object>]"
7267 #: builtin/notes.c:83
7268 msgid "git notes prune [<options>]"
7271 #: builtin/notes.c:88
7272 msgid "git notes get-ref"
7275 #: builtin/notes.c:146
7277 msgid "unable to start 'show' for object '%s'"
7280 #: builtin/notes.c:150
7281 msgid "could not read 'show' output"
7284 #: builtin/notes.c:158
7286 msgid "failed to finish 'show' for object '%s'"
7289 #: builtin/notes.c:173 builtin/tag.c:477
7291 msgid "could not create file '%s'"
7294 #: builtin/notes.c:192
7295 msgid "Please supply the note contents using either -m or -F option"
7298 #: builtin/notes.c:201
7299 msgid "unable to write note object"
7302 #: builtin/notes.c:203
7304 msgid "The note contents have been left in %s"
7307 #: builtin/notes.c:231 builtin/tag.c:693
7309 msgid "cannot read '%s'"
7312 #: builtin/notes.c:233 builtin/tag.c:696
7314 msgid "could not open or read '%s'"
7317 #: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
7318 #: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
7319 #: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
7320 #: builtin/notes.c:854 builtin/tag.c:709
7322 msgid "Failed to resolve '%s' as a valid ref."
7325 #: builtin/notes.c:255
7327 msgid "Failed to read object '%s'."
7330 #: builtin/notes.c:259
7332 msgid "Cannot read note data from non-blob object '%s'."
7335 #: builtin/notes.c:299
7337 msgid "Malformed input line: '%s'."
7340 #: builtin/notes.c:314
7342 msgid "Failed to copy notes from '%s' to '%s'"
7345 #: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
7346 #: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
7347 #: builtin/notes.c:919
7348 msgid "too many parameters"
7351 #: builtin/notes.c:371 builtin/notes.c:658
7353 msgid "No note found for object %s."
7356 #: builtin/notes.c:392 builtin/notes.c:555
7357 msgid "note contents as a string"
7360 #: builtin/notes.c:395 builtin/notes.c:558
7361 msgid "note contents in a file"
7364 #: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
7365 #: builtin/notes.c:563 builtin/tag.c:628
7369 #: builtin/notes.c:398 builtin/notes.c:561
7370 msgid "reuse and edit specified note object"
7373 #: builtin/notes.c:401 builtin/notes.c:564
7374 msgid "reuse specified note object"
7377 #: builtin/notes.c:404 builtin/notes.c:567
7378 msgid "allow storing empty note"
7381 #: builtin/notes.c:405 builtin/notes.c:476
7382 msgid "replace existing notes"
7385 #: builtin/notes.c:430
7388 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7392 #: builtin/notes.c:445 builtin/notes.c:524
7394 msgid "Overwriting existing notes for object %s\n"
7397 #: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
7399 msgid "Removing note for object %s\n"
7402 #: builtin/notes.c:477
7403 msgid "read objects from stdin"
7406 #: builtin/notes.c:479
7407 msgid "load rewriting config for <command> (implies --stdin)"
7410 #: builtin/notes.c:497
7411 msgid "too few parameters"
7414 #: builtin/notes.c:518
7417 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7421 #: builtin/notes.c:530
7423 msgid "Missing notes on source object %s. Cannot copy."
7426 #: builtin/notes.c:582
7429 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7430 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7433 #: builtin/notes.c:750
7434 msgid "General options"
7437 #: builtin/notes.c:752
7438 msgid "Merge options"
7441 #: builtin/notes.c:754
7443 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7447 #: builtin/notes.c:756
7448 msgid "Committing unmerged notes"
7451 #: builtin/notes.c:758
7452 msgid "finalize notes merge by committing unmerged notes"
7455 #: builtin/notes.c:760
7456 msgid "Aborting notes merge resolution"
7459 #: builtin/notes.c:762
7460 msgid "abort notes merge"
7463 #: builtin/notes.c:857
7465 msgid "Object %s has no note\n"
7468 #: builtin/notes.c:869
7469 msgid "attempt to remove non-existent note is not an error"
7472 #: builtin/notes.c:872
7473 msgid "read object names from the standard input"
7476 #: builtin/notes.c:953
7480 #: builtin/notes.c:954
7481 msgid "use notes from <notes-ref>"
7484 #: builtin/notes.c:989 builtin/remote.c:1621
7486 msgid "Unknown subcommand: %s"
7489 #: builtin/pack-objects.c:28
7490 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7493 #: builtin/pack-objects.c:29
7494 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7497 #: builtin/pack-objects.c:175 builtin/pack-objects.c:178
7499 msgid "deflate error (%d)"
7502 #: builtin/pack-objects.c:771
7503 msgid "Writing objects"
7506 #: builtin/pack-objects.c:1013
7507 msgid "disabling bitmap writing, as some objects are not being packed"
7510 #: builtin/pack-objects.c:2173
7511 msgid "Compressing objects"
7514 #: builtin/pack-objects.c:2570
7516 msgid "unsupported index version %s"
7519 #: builtin/pack-objects.c:2574
7521 msgid "bad index version '%s'"
7524 #: builtin/pack-objects.c:2597
7526 msgid "option %s does not accept negative form"
7529 #: builtin/pack-objects.c:2601
7531 msgid "unable to parse value '%s' for option %s"
7534 #: builtin/pack-objects.c:2621
7535 msgid "do not show progress meter"
7538 #: builtin/pack-objects.c:2623
7539 msgid "show progress meter"
7542 #: builtin/pack-objects.c:2625
7543 msgid "show progress meter during object writing phase"
7546 #: builtin/pack-objects.c:2628
7547 msgid "similar to --all-progress when progress meter is shown"
7550 #: builtin/pack-objects.c:2629
7551 msgid "version[,offset]"
7554 #: builtin/pack-objects.c:2630
7555 msgid "write the pack index file in the specified idx format version"
7558 #: builtin/pack-objects.c:2633
7559 msgid "maximum size of each output pack file"
7562 #: builtin/pack-objects.c:2635
7563 msgid "ignore borrowed objects from alternate object store"
7566 #: builtin/pack-objects.c:2637
7567 msgid "ignore packed objects"
7570 #: builtin/pack-objects.c:2639
7571 msgid "limit pack window by objects"
7574 #: builtin/pack-objects.c:2641
7575 msgid "limit pack window by memory in addition to object limit"
7578 #: builtin/pack-objects.c:2643
7579 msgid "maximum length of delta chain allowed in the resulting pack"
7582 #: builtin/pack-objects.c:2645
7583 msgid "reuse existing deltas"
7586 #: builtin/pack-objects.c:2647
7587 msgid "reuse existing objects"
7590 #: builtin/pack-objects.c:2649
7591 msgid "use OFS_DELTA objects"
7594 #: builtin/pack-objects.c:2651
7595 msgid "use threads when searching for best delta matches"
7598 #: builtin/pack-objects.c:2653
7599 msgid "do not create an empty pack output"
7602 #: builtin/pack-objects.c:2655
7603 msgid "read revision arguments from standard input"
7606 #: builtin/pack-objects.c:2657
7607 msgid "limit the objects to those that are not yet packed"
7610 #: builtin/pack-objects.c:2660
7611 msgid "include objects reachable from any reference"
7614 #: builtin/pack-objects.c:2663
7615 msgid "include objects referred by reflog entries"
7618 #: builtin/pack-objects.c:2666
7619 msgid "include objects referred to by the index"
7622 #: builtin/pack-objects.c:2669
7623 msgid "output pack to stdout"
7626 #: builtin/pack-objects.c:2671
7627 msgid "include tag objects that refer to objects to be packed"
7630 #: builtin/pack-objects.c:2673
7631 msgid "keep unreachable objects"
7634 #: builtin/pack-objects.c:2674 parse-options.h:140
7638 #: builtin/pack-objects.c:2675
7639 msgid "unpack unreachable objects newer than <time>"
7642 #: builtin/pack-objects.c:2678
7643 msgid "create thin packs"
7646 #: builtin/pack-objects.c:2680
7647 msgid "create packs suitable for shallow fetches"
7650 #: builtin/pack-objects.c:2682
7651 msgid "ignore packs that have companion .keep file"
7654 #: builtin/pack-objects.c:2684
7655 msgid "pack compression level"
7658 #: builtin/pack-objects.c:2686
7659 msgid "do not hide commits by grafts"
7662 #: builtin/pack-objects.c:2688
7663 msgid "use a bitmap index if available to speed up counting objects"
7666 #: builtin/pack-objects.c:2690
7667 msgid "write a bitmap index together with the pack index"
7670 #: builtin/pack-objects.c:2781
7671 msgid "Counting objects"
7674 #: builtin/pack-refs.c:6
7675 msgid "git pack-refs [<options>]"
7678 #: builtin/pack-refs.c:14
7679 msgid "pack everything"
7682 #: builtin/pack-refs.c:15
7683 msgid "prune loose refs (default)"
7686 #: builtin/prune-packed.c:7
7687 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
7690 #: builtin/prune-packed.c:40
7691 msgid "Removing duplicate objects"
7694 #: builtin/prune.c:12
7695 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7698 #: builtin/prune.c:106
7699 msgid "do not remove, show only"
7702 #: builtin/prune.c:107
7703 msgid "report pruned objects"
7706 #: builtin/prune.c:110
7707 msgid "expire objects older than <time>"
7710 #: builtin/push.c:14
7711 msgid "git push [<options>] [<repository> [<refspec>...]]"
7714 #: builtin/push.c:85
7715 msgid "tag shorthand without <tag>"
7718 #: builtin/push.c:95
7719 msgid "--delete only accepts plain target ref names"
7722 #: builtin/push.c:139
7725 "To choose either option permanently, see push.default in 'git help config'."
7728 #: builtin/push.c:142
7731 "The upstream branch of your current branch does not match\n"
7732 "the name of your current branch. To push to the upstream branch\n"
7733 "on the remote, use\n"
7735 " git push %s HEAD:%s\n"
7737 "To push to the branch of the same name on the remote, use\n"
7743 #: builtin/push.c:157
7746 "You are not currently on a branch.\n"
7747 "To push the history leading to the current (detached HEAD)\n"
7750 " git push %s HEAD:<name-of-remote-branch>\n"
7753 #: builtin/push.c:171
7756 "The current branch %s has no upstream branch.\n"
7757 "To push the current branch and set the remote as upstream, use\n"
7759 " git push --set-upstream %s %s\n"
7762 #: builtin/push.c:179
7764 msgid "The current branch %s has multiple upstream branches, refusing to push."
7767 #: builtin/push.c:182
7770 "You are pushing to remote '%s', which is not the upstream of\n"
7771 "your current branch '%s', without telling me what to push\n"
7772 "to update which remote branch."
7775 #: builtin/push.c:205
7777 "push.default is unset; its implicit value has changed in\n"
7778 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7779 "and maintain the traditional behavior, use:\n"
7781 " git config --global push.default matching\n"
7783 "To squelch this message and adopt the new behavior now, use:\n"
7785 " git config --global push.default simple\n"
7787 "When push.default is set to 'matching', git will push local branches\n"
7788 "to the remote branches that already exist with the same name.\n"
7790 "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
7791 "behavior, which only pushes the current branch to the corresponding\n"
7792 "remote branch that 'git pull' uses to update the current branch.\n"
7794 "See 'git help config' and search for 'push.default' for further "
7796 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7797 "'current' instead of 'simple' if you sometimes use older versions of Git)"
7800 #: builtin/push.c:272
7802 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
7805 #: builtin/push.c:279
7807 "Updates were rejected because the tip of your current branch is behind\n"
7808 "its remote counterpart. Integrate the remote changes (e.g.\n"
7809 "'git pull ...') before pushing again.\n"
7810 "See the 'Note about fast-forwards' in 'git push --help' for details."
7813 #: builtin/push.c:285
7815 "Updates were rejected because a pushed branch tip is behind its remote\n"
7816 "counterpart. Check out this branch and integrate the remote changes\n"
7817 "(e.g. 'git pull ...') before pushing again.\n"
7818 "See the 'Note about fast-forwards' in 'git push --help' for details."
7821 #: builtin/push.c:291
7823 "Updates were rejected because the remote contains work that you do\n"
7824 "not have locally. This is usually caused by another repository pushing\n"
7825 "to the same ref. You may want to first integrate the remote changes\n"
7826 "(e.g., 'git pull ...') before pushing again.\n"
7827 "See the 'Note about fast-forwards' in 'git push --help' for details."
7830 #: builtin/push.c:298
7831 msgid "Updates were rejected because the tag already exists in the remote."
7834 #: builtin/push.c:301
7836 "You cannot update a remote ref that points at a non-commit object,\n"
7837 "or update a remote ref to make it point at a non-commit object,\n"
7838 "without using the '--force' option.\n"
7841 #: builtin/push.c:360
7843 msgid "Pushing to %s\n"
7846 #: builtin/push.c:364
7848 msgid "failed to push some refs to '%s'"
7851 #: builtin/push.c:394
7853 msgid "bad repository '%s'"
7856 #: builtin/push.c:395
7858 "No configured push destination.\n"
7859 "Either specify the URL from the command-line or configure a remote "
7860 "repository using\n"
7862 " git remote add <name> <url>\n"
7864 "and then push using the remote name\n"
7866 " git push <name>\n"
7869 #: builtin/push.c:410
7870 msgid "--all and --tags are incompatible"
7873 #: builtin/push.c:411
7874 msgid "--all can't be combined with refspecs"
7877 #: builtin/push.c:416
7878 msgid "--mirror and --tags are incompatible"
7881 #: builtin/push.c:417
7882 msgid "--mirror can't be combined with refspecs"
7885 #: builtin/push.c:422
7886 msgid "--all and --mirror are incompatible"
7889 #: builtin/push.c:502
7893 #: builtin/push.c:503
7894 msgid "push all refs"
7897 #: builtin/push.c:504
7898 msgid "mirror all refs"
7901 #: builtin/push.c:506
7905 #: builtin/push.c:507
7906 msgid "push tags (can't be used with --all or --mirror)"
7909 #: builtin/push.c:510
7910 msgid "force updates"
7913 #: builtin/push.c:512
7914 msgid "refname>:<expect"
7917 #: builtin/push.c:513
7918 msgid "require old value of ref to be at this value"
7921 #: builtin/push.c:516
7922 msgid "control recursive pushing of submodules"
7925 #: builtin/push.c:518
7926 msgid "use thin pack"
7929 #: builtin/push.c:519 builtin/push.c:520
7930 msgid "receive pack program"
7933 #: builtin/push.c:521
7934 msgid "set upstream for git pull/status"
7937 #: builtin/push.c:524
7938 msgid "prune locally removed refs"
7941 #: builtin/push.c:526
7942 msgid "bypass pre-push hook"
7945 #: builtin/push.c:527
7946 msgid "push missing but relevant tags"
7949 #: builtin/push.c:529
7950 msgid "GPG sign the push"
7953 #: builtin/push.c:530
7954 msgid "request atomic transaction on remote side"
7957 #: builtin/push.c:539
7958 msgid "--delete is incompatible with --all, --mirror and --tags"
7961 #: builtin/push.c:541
7962 msgid "--delete doesn't make sense without any refs"
7965 #: builtin/read-tree.c:37
7967 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7968 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7969 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7972 #: builtin/read-tree.c:110
7973 msgid "write resulting index to <file>"
7976 #: builtin/read-tree.c:113
7977 msgid "only empty the index"
7980 #: builtin/read-tree.c:115
7984 #: builtin/read-tree.c:117
7985 msgid "perform a merge in addition to a read"
7988 #: builtin/read-tree.c:119
7989 msgid "3-way merge if no file level merging required"
7992 #: builtin/read-tree.c:121
7993 msgid "3-way merge in presence of adds and removes"
7996 #: builtin/read-tree.c:123
7997 msgid "same as -m, but discard unmerged entries"
8000 #: builtin/read-tree.c:124
8001 msgid "<subdirectory>/"
8004 #: builtin/read-tree.c:125
8005 msgid "read the tree into the index under <subdirectory>/"
8008 #: builtin/read-tree.c:128
8009 msgid "update working tree with merge result"
8012 #: builtin/read-tree.c:130
8016 #: builtin/read-tree.c:131
8017 msgid "allow explicitly ignored files to be overwritten"
8020 #: builtin/read-tree.c:134
8021 msgid "don't check the working tree after merging"
8024 #: builtin/read-tree.c:135
8025 msgid "don't update the index or the work tree"
8028 #: builtin/read-tree.c:137
8029 msgid "skip applying sparse checkout filter"
8032 #: builtin/read-tree.c:139
8033 msgid "debug unpack-trees"
8036 #: builtin/reflog.c:429
8038 msgid "%s' for '%s' is not a valid timestamp"
8041 #: builtin/reflog.c:546 builtin/reflog.c:551
8043 msgid "'%s' is not a valid timestamp"
8046 #: builtin/remote.c:12
8047 msgid "git remote [-v | --verbose]"
8050 #: builtin/remote.c:13
8052 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
8053 "mirror=<fetch|push>] <name> <url>"
8056 #: builtin/remote.c:14 builtin/remote.c:33
8057 msgid "git remote rename <old> <new>"
8060 #: builtin/remote.c:15 builtin/remote.c:38
8061 msgid "git remote remove <name>"
8064 #: builtin/remote.c:16 builtin/remote.c:43
8065 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8068 #: builtin/remote.c:17
8069 msgid "git remote [-v | --verbose] show [-n] <name>"
8072 #: builtin/remote.c:18
8073 msgid "git remote prune [-n | --dry-run] <name>"
8076 #: builtin/remote.c:19
8078 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8081 #: builtin/remote.c:20
8082 msgid "git remote set-branches [--add] <name> <branch>..."
8085 #: builtin/remote.c:21 builtin/remote.c:69
8086 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
8089 #: builtin/remote.c:22 builtin/remote.c:70
8090 msgid "git remote set-url --add <name> <newurl>"
8093 #: builtin/remote.c:23 builtin/remote.c:71
8094 msgid "git remote set-url --delete <name> <url>"
8097 #: builtin/remote.c:28
8098 msgid "git remote add [<options>] <name> <url>"
8101 #: builtin/remote.c:48
8102 msgid "git remote set-branches <name> <branch>..."
8105 #: builtin/remote.c:49
8106 msgid "git remote set-branches --add <name> <branch>..."
8109 #: builtin/remote.c:54
8110 msgid "git remote show [<options>] <name>"
8113 #: builtin/remote.c:59
8114 msgid "git remote prune [<options>] <name>"
8117 #: builtin/remote.c:64
8118 msgid "git remote update [<options>] [<group> | <remote>]..."
8121 #: builtin/remote.c:88
8126 #: builtin/remote.c:120
8128 "--mirror is dangerous and deprecated; please\n"
8129 "\t use --mirror=fetch or --mirror=push instead"
8132 #: builtin/remote.c:137
8134 msgid "unknown mirror argument: %s"
8137 #: builtin/remote.c:153
8138 msgid "fetch the remote branches"
8141 #: builtin/remote.c:155
8142 msgid "import all tags and associated objects when fetching"
8145 #: builtin/remote.c:158
8146 msgid "or do not fetch any tag at all (--no-tags)"
8149 #: builtin/remote.c:160
8150 msgid "branch(es) to track"
8153 #: builtin/remote.c:161
8154 msgid "master branch"
8157 #: builtin/remote.c:162
8161 #: builtin/remote.c:163
8162 msgid "set up remote as a mirror to push to or fetch from"
8165 #: builtin/remote.c:175
8166 msgid "specifying a master branch makes no sense with --mirror"
8169 #: builtin/remote.c:177
8170 msgid "specifying branches to track makes sense only with fetch mirrors"
8173 #: builtin/remote.c:187 builtin/remote.c:643
8175 msgid "remote %s already exists."
8178 #: builtin/remote.c:191 builtin/remote.c:647
8180 msgid "'%s' is not a valid remote name"
8183 #: builtin/remote.c:235
8185 msgid "Could not setup master '%s'"
8188 #: builtin/remote.c:335
8190 msgid "Could not get fetch map for refspec %s"
8193 #: builtin/remote.c:436 builtin/remote.c:444
8197 #: builtin/remote.c:448
8201 #: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604
8203 msgid "Could not append '%s' to '%s'"
8206 #: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895
8208 msgid "No such remote: %s"
8211 #: builtin/remote.c:653
8213 msgid "Could not rename config section '%s' to '%s'"
8216 #: builtin/remote.c:659 builtin/remote.c:847
8218 msgid "Could not remove config section '%s'"
8221 #: builtin/remote.c:674
8224 "Not updating non-default fetch refspec\n"
8226 "\tPlease update the configuration manually if necessary."
8229 #: builtin/remote.c:680
8231 msgid "Could not append '%s'"
8234 #: builtin/remote.c:691
8236 msgid "Could not set '%s'"
8239 #: builtin/remote.c:713
8241 msgid "deleting '%s' failed"
8244 #: builtin/remote.c:747
8246 msgid "creating '%s' failed"
8249 #: builtin/remote.c:766
8251 msgid "Could not remove branch %s"
8254 #: builtin/remote.c:833
8256 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8257 "to delete it, use:"
8259 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8260 "to delete them, use:"
8264 #: builtin/remote.c:948
8266 msgid " new (next fetch will store in remotes/%s)"
8269 #: builtin/remote.c:951
8273 #: builtin/remote.c:953
8274 msgid " stale (use 'git remote prune' to remove)"
8277 #: builtin/remote.c:955
8281 #: builtin/remote.c:996
8283 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8286 #: builtin/remote.c:1003
8288 msgid "rebases onto remote %s"
8291 #: builtin/remote.c:1006
8293 msgid " merges with remote %s"
8296 #: builtin/remote.c:1007
8297 msgid " and with remote"
8300 #: builtin/remote.c:1009
8302 msgid "merges with remote %s"
8305 #: builtin/remote.c:1010
8306 msgid " and with remote"
8309 #: builtin/remote.c:1056
8313 #: builtin/remote.c:1059
8317 #: builtin/remote.c:1063
8321 #: builtin/remote.c:1066
8322 msgid "fast-forwardable"
8325 #: builtin/remote.c:1069
8326 msgid "local out of date"
8329 #: builtin/remote.c:1076
8331 msgid " %-*s forces to %-*s (%s)"
8334 #: builtin/remote.c:1079
8336 msgid " %-*s pushes to %-*s (%s)"
8339 #: builtin/remote.c:1083
8341 msgid " %-*s forces to %s"
8344 #: builtin/remote.c:1086
8346 msgid " %-*s pushes to %s"
8349 #: builtin/remote.c:1154
8350 msgid "do not query remotes"
8353 #: builtin/remote.c:1181
8358 #: builtin/remote.c:1182
8360 msgid " Fetch URL: %s"
8363 #: builtin/remote.c:1183 builtin/remote.c:1334
8367 #: builtin/remote.c:1192 builtin/remote.c:1194
8369 msgid " Push URL: %s"
8372 #: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200
8374 msgid " HEAD branch: %s"
8377 #: builtin/remote.c:1202
8380 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8383 #: builtin/remote.c:1214
8385 msgid " Remote branch:%s"
8386 msgid_plural " Remote branches:%s"
8390 #: builtin/remote.c:1217 builtin/remote.c:1244
8391 msgid " (status not queried)"
8394 #: builtin/remote.c:1226
8395 msgid " Local branch configured for 'git pull':"
8396 msgid_plural " Local branches configured for 'git pull':"
8400 #: builtin/remote.c:1234
8401 msgid " Local refs will be mirrored by 'git push'"
8404 #: builtin/remote.c:1241
8406 msgid " Local ref configured for 'git push'%s:"
8407 msgid_plural " Local refs configured for 'git push'%s:"
8411 #: builtin/remote.c:1262
8412 msgid "set refs/remotes/<name>/HEAD according to remote"
8415 #: builtin/remote.c:1264
8416 msgid "delete refs/remotes/<name>/HEAD"
8419 #: builtin/remote.c:1279
8420 msgid "Cannot determine remote HEAD"
8423 #: builtin/remote.c:1281
8424 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8427 #: builtin/remote.c:1291
8429 msgid "Could not delete %s"
8432 #: builtin/remote.c:1299
8434 msgid "Not a valid ref: %s"
8437 #: builtin/remote.c:1301
8439 msgid "Could not setup %s"
8442 #: builtin/remote.c:1319
8444 msgid " %s will become dangling!"
8447 #: builtin/remote.c:1320
8449 msgid " %s has become dangling!"
8452 #: builtin/remote.c:1330
8457 #: builtin/remote.c:1331
8462 #: builtin/remote.c:1354
8464 msgid " * [would prune] %s"
8467 #: builtin/remote.c:1357
8469 msgid " * [pruned] %s"
8472 #: builtin/remote.c:1402
8473 msgid "prune remotes after fetching"
8476 #: builtin/remote.c:1468 builtin/remote.c:1542
8478 msgid "No such remote '%s'"
8481 #: builtin/remote.c:1488
8485 #: builtin/remote.c:1495
8486 msgid "no remote specified"
8489 #: builtin/remote.c:1517
8490 msgid "manipulate push URLs"
8493 #: builtin/remote.c:1519
8497 #: builtin/remote.c:1521
8501 #: builtin/remote.c:1528
8502 msgid "--add --delete doesn't make sense"
8505 #: builtin/remote.c:1568
8507 msgid "Invalid old URL pattern: %s"
8510 #: builtin/remote.c:1576
8512 msgid "No such URL found: %s"
8515 #: builtin/remote.c:1578
8516 msgid "Will not delete all non-push URLs"
8519 #: builtin/remote.c:1592
8520 msgid "be verbose; must be placed before a subcommand"
8523 #: builtin/repack.c:17
8524 msgid "git repack [<options>]"
8527 #: builtin/repack.c:159
8528 msgid "pack everything in a single pack"
8531 #: builtin/repack.c:161
8532 msgid "same as -a, and turn unreachable objects loose"
8535 #: builtin/repack.c:164
8536 msgid "remove redundant packs, and run git-prune-packed"
8539 #: builtin/repack.c:166
8540 msgid "pass --no-reuse-delta to git-pack-objects"
8543 #: builtin/repack.c:168
8544 msgid "pass --no-reuse-object to git-pack-objects"
8547 #: builtin/repack.c:170
8548 msgid "do not run git-update-server-info"
8551 #: builtin/repack.c:173
8552 msgid "pass --local to git-pack-objects"
8555 #: builtin/repack.c:175
8556 msgid "write bitmap index"
8559 #: builtin/repack.c:176
8563 #: builtin/repack.c:177
8564 msgid "with -A, do not loosen objects older than this"
8567 #: builtin/repack.c:179
8568 msgid "size of the window used for delta compression"
8571 #: builtin/repack.c:180 builtin/repack.c:184
8575 #: builtin/repack.c:181
8576 msgid "same as the above, but limit memory size instead of entries count"
8579 #: builtin/repack.c:183
8580 msgid "limits the maximum delta depth"
8583 #: builtin/repack.c:185
8584 msgid "maximum size of each packfile"
8587 #: builtin/repack.c:187
8588 msgid "repack objects in packs marked with .keep"
8591 #: builtin/repack.c:375
8593 msgid "removing '%s' failed"
8596 #: builtin/replace.c:19
8597 msgid "git replace [-f] <object> <replacement>"
8600 #: builtin/replace.c:20
8601 msgid "git replace [-f] --edit <object>"
8604 #: builtin/replace.c:21
8605 msgid "git replace [-f] --graft <commit> [<parent>...]"
8608 #: builtin/replace.c:22
8609 msgid "git replace -d <object>..."
8612 #: builtin/replace.c:23
8613 msgid "git replace [--format=<format>] [-l [<pattern>]]"
8616 #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
8618 msgid "Not a valid object name: '%s'"
8621 #: builtin/replace.c:355
8623 msgid "bad mergetag in commit '%s'"
8626 #: builtin/replace.c:357
8628 msgid "malformed mergetag in commit '%s'"
8631 #: builtin/replace.c:368
8634 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
8635 "instead of --graft"
8638 #: builtin/replace.c:401
8640 msgid "the original commit '%s' has a gpg signature."
8643 #: builtin/replace.c:402
8644 msgid "the signature will be removed in the replacement commit!"
8647 #: builtin/replace.c:408
8649 msgid "could not write replacement commit for: '%s'"
8652 #: builtin/replace.c:432
8653 msgid "list replace refs"
8656 #: builtin/replace.c:433
8657 msgid "delete replace refs"
8660 #: builtin/replace.c:434
8661 msgid "edit existing object"
8664 #: builtin/replace.c:435
8665 msgid "change a commit's parents"
8668 #: builtin/replace.c:436
8669 msgid "replace the ref if it exists"
8672 #: builtin/replace.c:437
8673 msgid "do not pretty-print contents for --edit"
8676 #: builtin/replace.c:438
8677 msgid "use this format"
8680 #: builtin/rerere.c:12
8681 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
8684 #: builtin/rerere.c:57
8685 msgid "register clean resolutions in index"
8688 #: builtin/reset.c:26
8690 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
8693 #: builtin/reset.c:27
8694 msgid "git reset [-q] <tree-ish> [--] <paths>..."
8697 #: builtin/reset.c:28
8698 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
8701 #: builtin/reset.c:34
8705 #: builtin/reset.c:34
8709 #: builtin/reset.c:34
8713 #: builtin/reset.c:34
8717 #: builtin/reset.c:34
8721 #: builtin/reset.c:74
8722 msgid "You do not have a valid HEAD."
8725 #: builtin/reset.c:76
8726 msgid "Failed to find tree of HEAD."
8729 #: builtin/reset.c:82
8731 msgid "Failed to find tree of %s."
8734 #: builtin/reset.c:100
8736 msgid "HEAD is now at %s"
8739 #: builtin/reset.c:183
8741 msgid "Cannot do a %s reset in the middle of a merge."
8744 #: builtin/reset.c:276
8745 msgid "be quiet, only report errors"
8748 #: builtin/reset.c:278
8749 msgid "reset HEAD and index"
8752 #: builtin/reset.c:279
8753 msgid "reset only HEAD"
8756 #: builtin/reset.c:281 builtin/reset.c:283
8757 msgid "reset HEAD, index and working tree"
8760 #: builtin/reset.c:285
8761 msgid "reset HEAD but keep local changes"
8764 #: builtin/reset.c:288
8765 msgid "record only the fact that removed paths will be added later"
8768 #: builtin/reset.c:305
8770 msgid "Failed to resolve '%s' as a valid revision."
8773 #: builtin/reset.c:308 builtin/reset.c:316
8775 msgid "Could not parse object '%s'."
8778 #: builtin/reset.c:313
8780 msgid "Failed to resolve '%s' as a valid tree."
8783 #: builtin/reset.c:322
8784 msgid "--patch is incompatible with --{hard,mixed,soft}"
8787 #: builtin/reset.c:331
8788 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
8791 #: builtin/reset.c:333
8793 msgid "Cannot do %s reset with paths."
8796 #: builtin/reset.c:343
8798 msgid "%s reset is not allowed in a bare repository"
8801 #: builtin/reset.c:347
8802 msgid "-N can only be used with --mixed"
8805 #: builtin/reset.c:364
8806 msgid "Unstaged changes after reset:"
8809 #: builtin/reset.c:370
8811 msgid "Could not reset index file to revision '%s'."
8814 #: builtin/reset.c:374
8815 msgid "Could not write new index file."
8818 #: builtin/rev-parse.c:361
8819 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
8822 #: builtin/rev-parse.c:366
8823 msgid "keep the `--` passed as an arg"
8826 #: builtin/rev-parse.c:368
8827 msgid "stop parsing after the first non-option argument"
8830 #: builtin/rev-parse.c:371
8831 msgid "output in stuck long form"
8834 #: builtin/rev-parse.c:499
8836 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
8837 " or: git rev-parse --sq-quote [<arg>...]\n"
8838 " or: git rev-parse [<options>] [<arg>...]\n"
8840 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
8843 #: builtin/revert.c:22
8844 msgid "git revert [<options>] <commit-ish>..."
8847 #: builtin/revert.c:23
8848 msgid "git revert <subcommand>"
8851 #: builtin/revert.c:28
8852 msgid "git cherry-pick [<options>] <commit-ish>..."
8855 #: builtin/revert.c:29
8856 msgid "git cherry-pick <subcommand>"
8859 #: builtin/revert.c:71
8861 msgid "%s: %s cannot be used with %s"
8864 #: builtin/revert.c:80
8865 msgid "end revert or cherry-pick sequence"
8868 #: builtin/revert.c:81
8869 msgid "resume revert or cherry-pick sequence"
8872 #: builtin/revert.c:82
8873 msgid "cancel revert or cherry-pick sequence"
8876 #: builtin/revert.c:83
8877 msgid "don't automatically commit"
8880 #: builtin/revert.c:84
8881 msgid "edit the commit message"
8884 #: builtin/revert.c:87
8885 msgid "parent number"
8888 #: builtin/revert.c:89
8889 msgid "merge strategy"
8892 #: builtin/revert.c:90
8896 #: builtin/revert.c:91
8897 msgid "option for merge strategy"
8900 #: builtin/revert.c:104
8901 msgid "append commit name"
8904 #: builtin/revert.c:105
8905 msgid "allow fast-forward"
8908 #: builtin/revert.c:106
8909 msgid "preserve initially empty commits"
8912 #: builtin/revert.c:107
8913 msgid "allow commits with empty messages"
8916 #: builtin/revert.c:108
8917 msgid "keep redundant, empty commits"
8920 #: builtin/revert.c:112
8921 msgid "program error"
8924 #: builtin/revert.c:197
8925 msgid "revert failed"
8928 #: builtin/revert.c:212
8929 msgid "cherry-pick failed"
8933 msgid "git rm [<options>] [--] <file>..."
8938 "the following submodule (or one of its nested submodules)\n"
8939 "uses a .git directory:"
8941 "the following submodules (or one of their nested submodules)\n"
8942 "use a .git directory:"
8949 "(use 'rm -rf' if you really want to remove it including all of its history)"
8954 "the following file has staged content different from both the\n"
8955 "file and the HEAD:"
8957 "the following files have staged content different from both the\n"
8958 "file and the HEAD:"
8965 "(use -f to force removal)"
8969 msgid "the following file has changes staged in the index:"
8970 msgid_plural "the following files have changes staged in the index:"
8974 #: builtin/rm.c:244 builtin/rm.c:255
8977 "(use --cached to keep the file, or -f to force removal)"
8981 msgid "the following file has local modifications:"
8982 msgid_plural "the following files have local modifications:"
8987 msgid "do not list removed files"
8991 msgid "only remove from the index"
8995 msgid "override the up-to-date check"
8999 msgid "allow recursive removal"
9003 msgid "exit with a zero status even if nothing matched"
9007 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9012 msgid "not removing '%s' recursively without -r"
9017 msgid "git rm: unable to remove %s"
9020 #: builtin/shortlog.c:13
9021 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
9024 #: builtin/shortlog.c:131
9026 msgid "Missing author: %s"
9029 #: builtin/shortlog.c:230
9030 msgid "sort output according to the number of commits per author"
9033 #: builtin/shortlog.c:232
9034 msgid "Suppress commit descriptions, only provides commit count"
9037 #: builtin/shortlog.c:234
9038 msgid "Show the email address of each author"
9041 #: builtin/shortlog.c:235
9045 #: builtin/shortlog.c:236
9046 msgid "Linewrap output"
9049 #: builtin/show-branch.c:9
9051 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9052 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9053 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9054 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9057 #: builtin/show-branch.c:13
9058 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
9061 #: builtin/show-branch.c:652
9062 msgid "show remote-tracking and local branches"
9065 #: builtin/show-branch.c:654
9066 msgid "show remote-tracking branches"
9069 #: builtin/show-branch.c:656
9070 msgid "color '*!+-' corresponding to the branch"
9073 #: builtin/show-branch.c:658
9074 msgid "show <n> more commits after the common ancestor"
9077 #: builtin/show-branch.c:660
9078 msgid "synonym to more=-1"
9081 #: builtin/show-branch.c:661
9082 msgid "suppress naming strings"
9085 #: builtin/show-branch.c:663
9086 msgid "include the current branch"
9089 #: builtin/show-branch.c:665
9090 msgid "name commits with their object names"
9093 #: builtin/show-branch.c:667
9094 msgid "show possible merge bases"
9097 #: builtin/show-branch.c:669
9098 msgid "show refs unreachable from any other ref"
9101 #: builtin/show-branch.c:671
9102 msgid "show commits in topological order"
9105 #: builtin/show-branch.c:674
9106 msgid "show only commits not on the first branch"
9109 #: builtin/show-branch.c:676
9110 msgid "show merges reachable from only one tip"
9113 #: builtin/show-branch.c:678
9114 msgid "topologically sort, maintaining date order where possible"
9117 #: builtin/show-branch.c:681
9118 msgid "<n>[,<base>]"
9121 #: builtin/show-branch.c:682
9122 msgid "show <n> most recent ref-log entries starting at base"
9125 #: builtin/show-ref.c:10
9127 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9128 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
9131 #: builtin/show-ref.c:11
9132 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
9135 #: builtin/show-ref.c:168
9136 msgid "only show tags (can be combined with heads)"
9139 #: builtin/show-ref.c:169
9140 msgid "only show heads (can be combined with tags)"
9143 #: builtin/show-ref.c:170
9144 msgid "stricter reference checking, requires exact ref path"
9147 #: builtin/show-ref.c:173 builtin/show-ref.c:175
9148 msgid "show the HEAD reference, even if it would be filtered out"
9151 #: builtin/show-ref.c:177
9152 msgid "dereference tags into object IDs"
9155 #: builtin/show-ref.c:179
9156 msgid "only show SHA1 hash using <n> digits"
9159 #: builtin/show-ref.c:183
9160 msgid "do not print results to stdout (useful with --verify)"
9163 #: builtin/show-ref.c:185
9164 msgid "show refs from stdin that aren't in local repository"
9167 #: builtin/symbolic-ref.c:7
9168 msgid "git symbolic-ref [<options>] <name> [<ref>]"
9171 #: builtin/symbolic-ref.c:8
9172 msgid "git symbolic-ref -d [-q] <name>"
9175 #: builtin/symbolic-ref.c:40
9176 msgid "suppress error message for non-symbolic (detached) refs"
9179 #: builtin/symbolic-ref.c:41
9180 msgid "delete symbolic ref"
9183 #: builtin/symbolic-ref.c:42
9184 msgid "shorten ref output"
9187 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9191 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9192 msgid "reason of the update"
9197 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
9202 msgid "git tag -d <tagname>..."
9207 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
9208 "\t\t[<pattern>...]"
9212 msgid "git tag -v <tagname>..."
9217 msgid "malformed object at '%s'"
9220 #: builtin/tag.c:301
9222 msgid "tag name too long: %.*s..."
9225 #: builtin/tag.c:306
9227 msgid "tag '%s' not found."
9230 #: builtin/tag.c:321
9232 msgid "Deleted tag '%s' (was %s)\n"
9235 #: builtin/tag.c:333
9237 msgid "could not verify the tag '%s'"
9240 #: builtin/tag.c:343
9244 "Write a message for tag:\n"
9246 "Lines starting with '%c' will be ignored.\n"
9249 #: builtin/tag.c:347
9253 "Write a message for tag:\n"
9255 "Lines starting with '%c' will be kept; you may remove them yourself if you "
9259 #: builtin/tag.c:371
9261 msgid "unsupported sort specification '%s'"
9264 #: builtin/tag.c:373
9266 msgid "unsupported sort specification '%s' in variable '%s'"
9269 #: builtin/tag.c:428
9270 msgid "unable to sign the tag"
9273 #: builtin/tag.c:430
9274 msgid "unable to write tag file"
9277 #: builtin/tag.c:455
9278 msgid "bad object type."
9281 #: builtin/tag.c:468
9282 msgid "tag header too big."
9285 #: builtin/tag.c:504
9286 msgid "no tag message?"
9289 #: builtin/tag.c:510
9291 msgid "The tag message has been left in %s\n"
9294 #: builtin/tag.c:559
9295 msgid "switch 'points-at' requires an object"
9298 #: builtin/tag.c:561
9300 msgid "malformed object name '%s'"
9303 #: builtin/tag.c:589
9304 msgid "list tag names"
9307 #: builtin/tag.c:591
9308 msgid "print <n> lines of each tag message"
9311 #: builtin/tag.c:593
9315 #: builtin/tag.c:594
9319 #: builtin/tag.c:596
9320 msgid "Tag creation options"
9323 #: builtin/tag.c:598
9324 msgid "annotated tag, needs a message"
9327 #: builtin/tag.c:600
9331 #: builtin/tag.c:602
9332 msgid "annotated and GPG-signed tag"
9335 #: builtin/tag.c:606
9336 msgid "use another key to sign the tag"
9339 #: builtin/tag.c:607
9340 msgid "replace the tag if exists"
9343 #: builtin/tag.c:609
9344 msgid "Tag listing options"
9347 #: builtin/tag.c:610
9348 msgid "show tag list in columns"
9351 #: builtin/tag.c:612
9355 #: builtin/tag.c:617 builtin/tag.c:623
9356 msgid "print only tags that contain the commit"
9359 #: builtin/tag.c:629
9360 msgid "print only tags of the object"
9363 #: builtin/tag.c:655
9364 msgid "--column and -n are incompatible"
9367 #: builtin/tag.c:667
9368 msgid "--sort and -n are incompatible"
9371 #: builtin/tag.c:674
9372 msgid "-n option is only allowed with -l."
9375 #: builtin/tag.c:676
9376 msgid "--contains option is only allowed with -l."
9379 #: builtin/tag.c:678
9380 msgid "--points-at option is only allowed with -l."
9383 #: builtin/tag.c:686
9384 msgid "only one -F or -m option is allowed."
9387 #: builtin/tag.c:706
9388 msgid "too many params"
9391 #: builtin/tag.c:712
9393 msgid "'%s' is not a valid tag name."
9396 #: builtin/tag.c:717
9398 msgid "tag '%s' already exists"
9401 #: builtin/tag.c:741
9403 msgid "Updated tag '%s' (was %s)\n"
9406 #: builtin/unpack-objects.c:489
9407 msgid "Unpacking objects"
9410 #: builtin/update-index.c:403
9411 msgid "git update-index [<options>] [--] [<file>...]"
9414 #: builtin/update-index.c:757
9415 msgid "continue refresh even when index needs update"
9418 #: builtin/update-index.c:760
9419 msgid "refresh: ignore submodules"
9422 #: builtin/update-index.c:763
9423 msgid "do not ignore new files"
9426 #: builtin/update-index.c:765
9427 msgid "let files replace directories and vice-versa"
9430 #: builtin/update-index.c:767
9431 msgid "notice files missing from worktree"
9434 #: builtin/update-index.c:769
9435 msgid "refresh even if index contains unmerged entries"
9438 #: builtin/update-index.c:772
9439 msgid "refresh stat information"
9442 #: builtin/update-index.c:776
9443 msgid "like --refresh, but ignore assume-unchanged setting"
9446 #: builtin/update-index.c:780
9447 msgid "<mode>,<object>,<path>"
9450 #: builtin/update-index.c:781
9451 msgid "add the specified entry to the index"
9454 #: builtin/update-index.c:785
9458 #: builtin/update-index.c:786
9459 msgid "override the executable bit of the listed files"
9462 #: builtin/update-index.c:790
9463 msgid "mark files as \"not changing\""
9466 #: builtin/update-index.c:793
9467 msgid "clear assumed-unchanged bit"
9470 #: builtin/update-index.c:796
9471 msgid "mark files as \"index-only\""
9474 #: builtin/update-index.c:799
9475 msgid "clear skip-worktree bit"
9478 #: builtin/update-index.c:802
9479 msgid "add to index only; do not add content to object database"
9482 #: builtin/update-index.c:804
9483 msgid "remove named paths even if present in worktree"
9486 #: builtin/update-index.c:806
9487 msgid "with --stdin: input lines are terminated by null bytes"
9490 #: builtin/update-index.c:808
9491 msgid "read list of paths to be updated from standard input"
9494 #: builtin/update-index.c:812
9495 msgid "add entries from standard input to the index"
9498 #: builtin/update-index.c:816
9499 msgid "repopulate stages #2 and #3 for the listed paths"
9502 #: builtin/update-index.c:820
9503 msgid "only update entries that differ from HEAD"
9506 #: builtin/update-index.c:824
9507 msgid "ignore files missing from worktree"
9510 #: builtin/update-index.c:827
9511 msgid "report actions to standard output"
9514 #: builtin/update-index.c:829
9515 msgid "(for porcelains) forget saved unresolved conflicts"
9518 #: builtin/update-index.c:833
9519 msgid "write index in this format"
9522 #: builtin/update-index.c:835
9523 msgid "enable or disable split index"
9526 #: builtin/update-ref.c:9
9527 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
9530 #: builtin/update-ref.c:10
9531 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
9534 #: builtin/update-ref.c:11
9535 msgid "git update-ref [<options>] --stdin [-z]"
9538 #: builtin/update-ref.c:359
9539 msgid "delete the reference"
9542 #: builtin/update-ref.c:361
9543 msgid "update <refname> not the one it points to"
9546 #: builtin/update-ref.c:362
9547 msgid "stdin has NUL-terminated arguments"
9550 #: builtin/update-ref.c:363
9551 msgid "read updates from stdin"
9554 #: builtin/update-server-info.c:6
9555 msgid "git update-server-info [--force]"
9558 #: builtin/update-server-info.c:14
9559 msgid "update the info files from scratch"
9562 #: builtin/verify-commit.c:17
9563 msgid "git verify-commit [-v | --verbose] <commit>..."
9566 #: builtin/verify-commit.c:75
9567 msgid "print commit contents"
9570 #: builtin/verify-pack.c:54
9571 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
9574 #: builtin/verify-pack.c:64
9578 #: builtin/verify-pack.c:66
9579 msgid "show statistics only"
9582 #: builtin/verify-tag.c:17
9583 msgid "git verify-tag [-v | --verbose] <tag>..."
9586 #: builtin/verify-tag.c:73
9587 msgid "print tag contents"
9590 #: builtin/write-tree.c:13
9591 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
9594 #: builtin/write-tree.c:26
9598 #: builtin/write-tree.c:27
9599 msgid "write tree object for a subdirectory <prefix>"
9602 #: builtin/write-tree.c:30
9603 msgid "only useful for debugging"
9606 #: credential-cache--daemon.c:267
9607 msgid "print debugging messages to stderr"
9612 "'git help -a' and 'git help -g' list available subcommands and some\n"
9613 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
9614 "to read about a specific subcommand or concept."
9618 msgid "Add file contents to the index"
9622 msgid "Find by binary search the change that introduced a bug"
9626 msgid "List, create, or delete branches"
9630 msgid "Checkout a branch or paths to the working tree"
9634 msgid "Clone a repository into a new directory"
9638 msgid "Record changes to the repository"
9642 msgid "Show changes between commits, commit and working tree, etc"
9646 msgid "Download objects and refs from another repository"
9650 msgid "Print lines matching a pattern"
9654 msgid "Create an empty Git repository or reinitialize an existing one"
9658 msgid "Show commit logs"
9662 msgid "Join two or more development histories together"
9666 msgid "Move or rename a file, a directory, or a symlink"
9670 msgid "Fetch from and integrate with another repository or a local branch"
9674 msgid "Update remote refs along with associated objects"
9678 msgid "Forward-port local commits to the updated upstream head"
9682 msgid "Reset current HEAD to the specified state"
9686 msgid "Remove files from the working tree and from the index"
9690 msgid "Show various types of objects"
9694 msgid "Show the working tree status"
9698 msgid "Create, list, delete or verify a tag object signed with GPG"
9701 #: parse-options.h:143
9705 #: parse-options.h:158
9706 msgid "no-op (backward compatibility)"
9709 #: parse-options.h:232
9710 msgid "be more verbose"
9713 #: parse-options.h:234
9714 msgid "be more quiet"
9717 #: parse-options.h:240
9718 msgid "use <n> digits to display SHA-1s"
9722 msgid "update the index with reused conflict resolution if possible"
9726 msgid "You need to set your committer info first"
9731 "You seem to have moved HEAD since the last 'am' failure.\n"
9732 "Not rewinding to ORIG_HEAD"
9738 "When you have resolved this problem, run \"$cmdline --continue\".\n"
9739 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
9740 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
9744 msgid "Cannot fall back to three-way merge."
9748 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
9752 msgid "Using index info to reconstruct a base tree..."
9757 "Did you hand edit your patch?\n"
9758 "It does not apply to blobs recorded in its index."
9762 msgid "Falling back to patching base and 3-way merge..."
9766 msgid "Failed to merge in the changes."
9770 msgid "Only one StGIT patch series can be applied at once"
9775 msgid "Patch format $patch_format is not supported."
9779 msgid "Patch format detection failed."
9784 "The -b/--binary option has been a no-op for long time, and\n"
9785 "it will be removed. Please do not use it anymore."
9790 msgid "previous rebase directory $dotest still exists but mbox given."
9794 msgid "Please make up your mind. --skip or --abort?"
9800 "Stray $dotest directory found.\n"
9801 "Use \"git am --abort\" to remove it."
9805 msgid "Resolve operation not in progress, we are not resuming."
9810 msgid "Dirty index: cannot apply patches (dirty: $files)"
9816 "Patch is empty. Was it split wrong?\n"
9817 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
9818 "To restore the original branch and stop patching run \"$cmdline --abort\"."
9822 msgid "Patch does not have a valid e-mail address."
9826 msgid "cannot be interactive without stdin connected to a terminal."
9830 msgid "Commit Body is:"
9833 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9834 #. in your translation. The program will only accept English
9835 #. input at this point.
9837 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9842 msgid "Applying: $FIRSTLINE"
9847 "No changes - did you forget to use 'git add'?\n"
9848 "If there is nothing left to stage, chances are that something else\n"
9849 "already introduced the same changes; you might want to skip this patch."
9854 "You still have unmerged paths in your index\n"
9855 "did you forget to use 'git add'?"
9859 msgid "No changes -- Patch already applied."
9864 msgid "Patch failed at $msgnum $FIRSTLINE"
9870 "The copy of the patch that failed is found in:\n"
9875 msgid "applying to an empty history"
9879 msgid "You need to start by \"git bisect start\""
9882 #. TRANSLATORS: Make sure to include [Y] and [n] in your
9883 #. translation. The program will only accept English input
9886 msgid "Do you want me to do it for you [Y/n]? "
9891 msgid "unrecognised option: '$arg'"
9896 msgid "'$arg' does not appear to be a valid revision"
9899 #: git-bisect.sh:117
9900 msgid "Bad HEAD - I need a HEAD"
9903 #: git-bisect.sh:130
9906 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
9909 #: git-bisect.sh:140
9910 msgid "won't bisect on cg-seek'ed tree"
9913 #: git-bisect.sh:144
9914 msgid "Bad HEAD - strange symbolic ref"
9917 #: git-bisect.sh:189
9919 msgid "Bad bisect_write argument: $state"
9922 #: git-bisect.sh:218
9924 msgid "Bad rev input: $arg"
9927 #: git-bisect.sh:232
9928 msgid "Please call 'bisect_state' with at least one argument."
9931 #: git-bisect.sh:244
9933 msgid "Bad rev input: $rev"
9936 #: git-bisect.sh:253
9937 msgid "'git bisect bad' can take only one argument."
9940 #: git-bisect.sh:276
9941 msgid "Warning: bisecting only with a bad commit."
9944 #. TRANSLATORS: Make sure to include [Y] and [n] in your
9945 #. translation. The program will only accept English input
9947 #: git-bisect.sh:282
9948 msgid "Are you sure [Y/n]? "
9951 #: git-bisect.sh:292
9953 "You need to give me at least one good and one bad revision.\n"
9954 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9957 #: git-bisect.sh:295
9959 "You need to start by \"git bisect start\".\n"
9960 "You then need to give me at least one good and one bad revision.\n"
9961 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9964 #: git-bisect.sh:366 git-bisect.sh:493
9965 msgid "We are not bisecting."
9968 #: git-bisect.sh:373
9970 msgid "'$invalid' is not a valid commit"
9973 #: git-bisect.sh:382
9976 "Could not check out original HEAD '$branch'.\n"
9977 "Try 'git bisect reset <commit>'."
9980 #: git-bisect.sh:409
9981 msgid "No logfile given"
9984 #: git-bisect.sh:410
9986 msgid "cannot read $file for replaying"
9989 #: git-bisect.sh:427
9990 msgid "?? what are you talking about?"
9993 #: git-bisect.sh:439
9995 msgid "running $command"
9998 #: git-bisect.sh:446
10001 "bisect run failed:\n"
10002 "exit code $res from '$command' is < 0 or >= 128"
10005 #: git-bisect.sh:472
10006 msgid "bisect run cannot continue any more"
10009 #: git-bisect.sh:478
10012 "bisect run failed:\n"
10013 "'bisect_state $state' exited with error code $res"
10016 #: git-bisect.sh:485
10017 msgid "bisect run success"
10022 "Pull is not possible because you have unmerged files.\n"
10023 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
10024 "as appropriate to mark resolution and make a commit."
10028 msgid "Pull is not possible because you have unmerged files."
10033 "You have not concluded your merge (MERGE_HEAD exists).\n"
10034 "Please, commit your changes before you can merge."
10038 msgid "updating an unborn branch with changes added to the index"
10044 "Warning: fetch updated the current branch head.\n"
10045 "Warning: fast-forwarding your working tree from\n"
10046 "Warning: commit $orig_head."
10050 msgid "Cannot merge multiple branches into empty head"
10054 msgid "Cannot rebase onto multiple branches"
10057 #: git-rebase.sh:57
10059 "When you have resolved this problem, run \"git rebase --continue\".\n"
10060 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10061 "To check out the original branch and stop rebasing, run \"git rebase --abort"
10065 #: git-rebase.sh:165
10066 msgid "Applied autostash."
10069 #: git-rebase.sh:168
10071 msgid "Cannot store $stash_sha1"
10074 #: git-rebase.sh:169
10076 "Applying autostash resulted in conflicts.\n"
10077 "Your changes are safe in the stash.\n"
10078 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
10081 #: git-rebase.sh:208
10082 msgid "The pre-rebase hook refused to rebase."
10085 #: git-rebase.sh:213
10086 msgid "It looks like git-am is in progress. Cannot rebase."
10089 #: git-rebase.sh:351
10090 msgid "The --exec option must be used with the --interactive option"
10093 #: git-rebase.sh:356
10094 msgid "No rebase in progress?"
10097 #: git-rebase.sh:367
10098 msgid "The --edit-todo action can only be used during interactive rebase."
10101 #: git-rebase.sh:374
10102 msgid "Cannot read HEAD"
10105 #: git-rebase.sh:377
10107 "You must edit all merge conflicts and then\n"
10108 "mark them as resolved using git add"
10111 #: git-rebase.sh:395
10113 msgid "Could not move back to $head_name"
10116 #: git-rebase.sh:414
10119 "It seems that there is already a $state_dir_base directory, and\n"
10120 "I wonder if you are in the middle of another rebase. If that is the\n"
10121 "case, please try\n"
10122 "\t$cmd_live_rebase\n"
10123 "If that is not the case, please\n"
10124 "\t$cmd_clear_stale_rebase\n"
10125 "and run me again. I am stopping in case you still have something\n"
10129 #: git-rebase.sh:465
10131 msgid "invalid upstream $upstream_name"
10134 #: git-rebase.sh:489
10136 msgid "$onto_name: there are more than one merge bases"
10139 #: git-rebase.sh:492 git-rebase.sh:496
10141 msgid "$onto_name: there is no merge base"
10144 #: git-rebase.sh:501
10146 msgid "Does not point to a valid commit: $onto_name"
10149 #: git-rebase.sh:524
10151 msgid "fatal: no such branch: $branch_name"
10154 #: git-rebase.sh:557
10155 msgid "Cannot autostash"
10158 #: git-rebase.sh:562
10160 msgid "Created autostash: $stash_abbrev"
10163 #: git-rebase.sh:566
10164 msgid "Please commit or stash them."
10167 #: git-rebase.sh:586
10169 msgid "Current branch $branch_name is up to date."
10172 #: git-rebase.sh:590
10174 msgid "Current branch $branch_name is up to date, rebase forced."
10177 #: git-rebase.sh:601
10179 msgid "Changes from $mb to $onto:"
10182 #: git-rebase.sh:610
10183 msgid "First, rewinding head to replay your work on top of it..."
10186 #: git-rebase.sh:620
10188 msgid "Fast-forwarded $branch_name to $onto_name."
10192 msgid "git stash clear with parameters is unimplemented"
10196 msgid "You do not have the initial commit yet"
10200 msgid "Cannot save the current index state"
10203 #: git-stash.sh:124 git-stash.sh:137
10204 msgid "Cannot save the current worktree state"
10207 #: git-stash.sh:141
10208 msgid "No changes selected"
10211 #: git-stash.sh:144
10212 msgid "Cannot remove temporary index (can't happen)"
10215 #: git-stash.sh:157
10216 msgid "Cannot record working tree state"
10219 #: git-stash.sh:191
10221 msgid "Cannot update $ref_stash with $w_commit"
10224 #. TRANSLATORS: $option is an invalid option, like
10225 #. `--blah-blah'. The 7 spaces at the beginning of the
10226 #. second line correspond to "error: ". So you should line
10227 #. up the second line with however many characters the
10228 #. translation of "error: " takes in your language. E.g. in
10229 #. English this is:
10231 #. $ git stash save --blah-blah 2>&1 | head -n 2
10232 #. error: unknown option for 'stash save': --blah-blah
10233 #. To provide a message, use git stash save -- '--blah-blah'
10234 #: git-stash.sh:238
10237 "error: unknown option for 'stash save': $option\n"
10238 " To provide a message, use git stash save -- '$option'"
10241 #: git-stash.sh:259
10242 msgid "No local changes to save"
10245 #: git-stash.sh:263
10246 msgid "Cannot initialize stash"
10249 #: git-stash.sh:267
10250 msgid "Cannot save the current status"
10253 #: git-stash.sh:285
10254 msgid "Cannot remove worktree changes"
10257 #: git-stash.sh:384
10258 msgid "No stash found."
10261 #: git-stash.sh:391
10263 msgid "Too many revisions specified: $REV"
10266 #: git-stash.sh:397
10268 msgid "$reference is not a valid reference"
10271 #: git-stash.sh:425
10273 msgid "'$args' is not a stash-like commit"
10276 #: git-stash.sh:436
10278 msgid "'$args' is not a stash reference"
10281 #: git-stash.sh:444
10282 msgid "unable to refresh index"
10285 #: git-stash.sh:448
10286 msgid "Cannot apply a stash in the middle of a merge"
10289 #: git-stash.sh:456
10290 msgid "Conflicts in index. Try without --index."
10293 #: git-stash.sh:458
10294 msgid "Could not save index tree"
10297 #: git-stash.sh:492
10298 msgid "Cannot unstage modified files"
10301 #: git-stash.sh:507
10302 msgid "Index was not unstashed."
10305 #: git-stash.sh:530
10307 msgid "Dropped ${REV} ($s)"
10310 #: git-stash.sh:531
10312 msgid "${REV}: Could not drop stash entry"
10315 #: git-stash.sh:539
10316 msgid "No branch name specified"
10319 #: git-stash.sh:611
10320 msgid "(To restore them type \"git stash apply\")"
10323 #: git-submodule.sh:95
10325 msgid "cannot strip one component off url '$remoteurl'"
10328 #: git-submodule.sh:237
10330 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10333 #: git-submodule.sh:287
10335 msgid "Clone of '$url' into submodule path '$sm_path' failed"
10338 #: git-submodule.sh:296
10340 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
10343 #: git-submodule.sh:406
10344 msgid "Relative path can only be used from the toplevel of the working tree"
10347 #: git-submodule.sh:416
10349 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
10352 #: git-submodule.sh:433
10354 msgid "'$sm_path' already exists in the index"
10357 #: git-submodule.sh:437
10360 "The following path is ignored by one of your .gitignore files:\n"
10362 "Use -f if you really want to add it."
10365 #: git-submodule.sh:455
10367 msgid "Adding existing repo at '$sm_path' to the index"
10370 #: git-submodule.sh:457
10372 msgid "'$sm_path' already exists and is not a valid git repo"
10375 #: git-submodule.sh:465
10377 msgid "A git directory for '$sm_name' is found locally with remote(s):"
10380 #: git-submodule.sh:467
10383 "If you want to reuse this local git directory instead of cloning again from"
10386 #: git-submodule.sh:469
10389 "use the '--force' option. If the local git directory is not the correct repo"
10392 #: git-submodule.sh:470
10395 "or you are unsure what this means choose another name with the '--name' "
10399 #: git-submodule.sh:472
10401 msgid "Reactivating local git directory for submodule '$sm_name'."
10404 #: git-submodule.sh:484
10406 msgid "Unable to checkout submodule '$sm_path'"
10409 #: git-submodule.sh:489
10411 msgid "Failed to add submodule '$sm_path'"
10414 #: git-submodule.sh:498
10416 msgid "Failed to register submodule '$sm_path'"
10419 #: git-submodule.sh:542
10421 msgid "Entering '$prefix$displaypath'"
10424 #: git-submodule.sh:562
10426 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
10429 #: git-submodule.sh:608
10431 msgid "No url found for submodule path '$displaypath' in .gitmodules"
10434 #: git-submodule.sh:617
10436 msgid "Failed to register url for submodule path '$displaypath'"
10439 #: git-submodule.sh:619
10441 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
10444 #: git-submodule.sh:636
10446 msgid "Failed to register update mode for submodule path '$displaypath'"
10449 #: git-submodule.sh:674
10451 msgid "Use '.' if you really want to deinitialize all submodules"
10454 #: git-submodule.sh:691
10456 msgid "Submodule work tree '$displaypath' contains a .git directory"
10459 #: git-submodule.sh:692
10462 "(use 'rm -rf' if you really want to remove it including all of its history)"
10465 #: git-submodule.sh:698
10468 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
10472 #: git-submodule.sh:701
10474 msgid "Cleared directory '$displaypath'"
10477 #: git-submodule.sh:702
10479 msgid "Could not remove submodule work tree '$displaypath'"
10482 #: git-submodule.sh:705
10484 msgid "Could not create empty submodule directory '$displaypath'"
10487 #: git-submodule.sh:714
10489 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
10492 #: git-submodule.sh:830
10495 "Submodule path '$displaypath' not initialized\n"
10496 "Maybe you want to use 'update --init'?"
10499 #: git-submodule.sh:843
10501 msgid "Unable to find current revision in submodule path '$displaypath'"
10504 #: git-submodule.sh:852
10506 msgid "Unable to fetch in submodule path '$sm_path'"
10509 #: git-submodule.sh:876
10511 msgid "Unable to fetch in submodule path '$displaypath'"
10514 #: git-submodule.sh:890
10516 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
10519 #: git-submodule.sh:891
10521 msgid "Submodule path '$displaypath': checked out '$sha1'"
10524 #: git-submodule.sh:895
10526 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
10529 #: git-submodule.sh:896
10531 msgid "Submodule path '$displaypath': rebased into '$sha1'"
10534 #: git-submodule.sh:901
10536 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
10539 #: git-submodule.sh:902
10541 msgid "Submodule path '$displaypath': merged in '$sha1'"
10544 #: git-submodule.sh:907
10547 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
10550 #: git-submodule.sh:908
10552 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
10555 #: git-submodule.sh:938
10557 msgid "Failed to recurse into submodule path '$displaypath'"
10560 #: git-submodule.sh:1046
10561 msgid "The --cached option cannot be used with the --files option"
10564 #: git-submodule.sh:1098
10566 msgid "unexpected mode $mod_dst"
10569 #: git-submodule.sh:1118
10571 msgid " Warn: $display_name doesn't contain commit $sha1_src"
10574 #: git-submodule.sh:1121
10576 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
10579 #: git-submodule.sh:1124
10581 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
10584 #: git-submodule.sh:1149
10588 #: git-submodule.sh:1267
10590 msgid "Failed to recurse into submodule path '$sm_path'"
10593 #: git-submodule.sh:1331
10595 msgid "Synchronizing submodule url for '$displaypath'"