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: 2014-08-04 14:48+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, or use\n"
34 msgid "git archive [options] <tree-ish> [<path>...]"
38 msgid "git archive --list"
43 "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
47 msgid "git archive --remote <repo> [--exec <cmd>] --list"
50 #: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328
52 msgid "pathspec '%s' did not match any files"
60 msgid "archive format"
63 #: archive.c:329 builtin/log.c:1201
68 msgid "prepend prefix to each pathname in the archive"
71 #: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517
72 #: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709
73 #: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77
74 #: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412
75 #: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151
79 #: archive.c:332 builtin/archive.c:89
80 msgid "write the archive to this file"
84 msgid "read .gitattributes in working directory"
88 msgid "report archived files on stderr"
96 msgid "compress faster"
100 msgid "compress better"
104 msgid "list supported archive formats"
107 #: archive.c:350 builtin/archive.c:90 builtin/clone.c:84
111 #: archive.c:351 builtin/archive.c:91
112 msgid "retrieve the archive from remote repository <repo>"
115 #: archive.c:352 builtin/archive.c:92 builtin/notes.c:491
119 #: archive.c:353 builtin/archive.c:93
120 msgid "path to the remote git-upload-archive command"
125 "Negative patterns are ignored in git attributes\n"
126 "Use '\\!' for literal leading exclamation."
131 msgid "Not setting branch %s as its own upstream."
136 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
141 msgid "Branch %s set up to track remote branch %s from %s."
146 msgid "Branch %s set up to track local branch %s by rebasing."
151 msgid "Branch %s set up to track local branch %s."
156 msgid "Branch %s set up to track remote ref %s by rebasing."
161 msgid "Branch %s set up to track remote ref %s."
166 msgid "Branch %s set up to track local ref %s by rebasing."
171 msgid "Branch %s set up to track local ref %s."
176 msgid "Not tracking: ambiguous information for ref %s"
181 msgid "'%s' is not a valid branch name."
186 msgid "A branch named '%s' already exists."
190 msgid "Cannot force update the current branch."
195 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
200 msgid "the requested upstream branch '%s' does not exist"
206 "If you are planning on basing your work on an upstream\n"
207 "branch that already exists at the remote, you may need to\n"
208 "run \"git fetch\" to retrieve it.\n"
210 "If you are planning to push out a new local branch that\n"
211 "will track its remote counterpart, you may want to use\n"
212 "\"git push -u\" to set the upstream config as you push."
217 msgid "Not a valid object name: '%s'."
222 msgid "Ambiguous object name: '%s'."
227 msgid "Not a valid branch point: '%s'."
231 msgid "Failed to lock ref for update"
235 msgid "Failed to write ref"
240 msgid "'%s' does not look like a v2 bundle file"
245 msgid "unrecognized header: %s%s (%d)"
248 #: bundle.c:86 builtin/commit.c:755
250 msgid "could not open '%s'"
254 msgid "Repository lacks these prerequisite commits:"
257 #: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330
258 #: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357
259 #: builtin/shortlog.c:158
260 msgid "revision walk setup failed"
265 msgid "The bundle contains this ref:"
266 msgid_plural "The bundle contains these %d refs:"
271 msgid "The bundle records a complete history."
276 msgid "The bundle requires this ref:"
277 msgid_plural "The bundle requires these %d refs:"
282 msgid "rev-list died"
285 #: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261
287 msgid "unrecognized argument: %s"
292 msgid "ref '%s' is excluded by the rev-list options"
296 msgid "Refusing to create empty bundle."
300 msgid "Could not spawn pack-objects"
304 msgid "pack-objects died"
309 msgid "cannot create '%s'"
313 msgid "index-pack died"
318 msgid "could not parse %s"
323 msgid "%s %s is not a commit!"
326 #: compat/obstack.c:406 compat/obstack.c:408
327 msgid "memory exhausted"
331 msgid "Could not run 'git rev-list'"
336 msgid "failed write to rev-list: %s"
341 msgid "failed to close rev-list's stdin: %s"
345 msgid "in the future"
350 msgid "%lu second ago"
351 msgid_plural "%lu seconds ago"
357 msgid "%lu minute ago"
358 msgid_plural "%lu minutes ago"
365 msgid_plural "%lu hours ago"
372 msgid_plural "%lu days ago"
379 msgid_plural "%lu weeks ago"
385 msgid "%lu month ago"
386 msgid_plural "%lu months ago"
393 msgid_plural "%lu years"
397 #. TRANSLATORS: "%s" is "<n> years"
400 msgid "%s, %lu month ago"
401 msgid_plural "%s, %lu months ago"
405 #: date.c:154 date.c:159
408 msgid_plural "%lu years ago"
412 #: diffcore-order.c:24
414 msgid "failed to read orderfile '%s'"
417 #: diffcore-rename.c:514
418 msgid "Performing inexact rename detection"
423 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
428 msgid " Unknown dirstat parameter '%s'\n"
433 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
439 "Found errors in 'diff.dirstat' config variable:\n"
445 msgid "external diff died, stopping at %s"
449 msgid "--follow requires exactly one pathspec"
455 "Failed to parse --dirstat/-X option parameter:\n"
461 msgid "Failed to parse --submodule option parameter: '%s'"
464 #: gpg-interface.c:73 gpg-interface.c:145
465 msgid "could not run gpg."
468 #: gpg-interface.c:85
469 msgid "gpg did not accept the data"
472 #: gpg-interface.c:96
473 msgid "gpg failed to sign the data"
476 #: gpg-interface.c:129
478 msgid "could not create temporary file '%s': %s"
481 #: gpg-interface.c:132
483 msgid "failed writing detached signature to '%s': %s"
488 msgid "'%s': unable to read %s"
498 msgid "'%s': short read %s"
503 msgid "available git commands in '%s'"
507 msgid "git commands available from elsewhere on your $PATH"
511 msgid "The most commonly used git commands are:"
517 "'%s' appears to be a git command, but we were not\n"
518 "able to execute it. Maybe git-%s is broken?"
522 msgid "Uh oh. Your system reports no Git commands at all."
528 "WARNING: You called a Git command named '%s', which does not exist.\n"
529 "Continuing under the assumption that you meant '%s'"
534 msgid "in %0.1f seconds automatically..."
539 msgid "git: '%s' is not a git command. See 'git --help'."
542 #: help.c:384 help.c:444
548 "Did you mean one of these?"
558 msgid "failed to read the cache"
561 #: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556
562 #: builtin/clone.c:661
563 msgid "unable to write new index file"
566 #: merge-recursive.c:190
568 msgid "(bad commit)\n"
571 #: merge-recursive.c:210
573 msgid "addinfo_cache failed for path '%s'"
576 #: merge-recursive.c:271
577 msgid "error building trees"
580 #: merge-recursive.c:692
582 msgid "failed to create path '%s'%s"
585 #: merge-recursive.c:703
587 msgid "Removing %s to make room for subdirectory\n"
590 #: merge-recursive.c:717 merge-recursive.c:738
591 msgid ": perhaps a D/F conflict?"
594 #: merge-recursive.c:728
596 msgid "refusing to lose untracked file at '%s'"
599 #: merge-recursive.c:768
601 msgid "cannot read object %s '%s'"
604 #: merge-recursive.c:770
606 msgid "blob expected for %s '%s'"
609 #: merge-recursive.c:793 builtin/clone.c:317
611 msgid "failed to open '%s'"
614 #: merge-recursive.c:801
616 msgid "failed to symlink '%s'"
619 #: merge-recursive.c:804
621 msgid "do not know what to do with %06o %s '%s'"
624 #: merge-recursive.c:942
625 msgid "Failed to execute internal merge"
628 #: merge-recursive.c:946
630 msgid "Unable to add %s to database"
633 #: merge-recursive.c:962
634 msgid "unsupported object type in the tree"
637 #: merge-recursive.c:1037 merge-recursive.c:1051
640 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
644 #: merge-recursive.c:1043 merge-recursive.c:1056
647 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
651 #: merge-recursive.c:1097
655 #: merge-recursive.c:1097
659 #: merge-recursive.c:1153
661 msgid "%s is a directory in %s adding as %s instead"
664 #: merge-recursive.c:1175
667 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
668 "\"->\"%s\" in \"%s\"%s"
671 #: merge-recursive.c:1180
672 msgid " (left unresolved)"
675 #: merge-recursive.c:1234
677 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
680 #: merge-recursive.c:1264
682 msgid "Renaming %s to %s and %s to %s instead"
685 #: merge-recursive.c:1463
687 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
690 #: merge-recursive.c:1473
692 msgid "Adding merged %s"
695 #: merge-recursive.c:1478 merge-recursive.c:1676
697 msgid "Adding as %s instead"
700 #: merge-recursive.c:1529
702 msgid "cannot read object %s"
705 #: merge-recursive.c:1532
707 msgid "object %s is not a blob"
710 #: merge-recursive.c:1580
714 #: merge-recursive.c:1580
718 #: merge-recursive.c:1590
722 #: merge-recursive.c:1597
726 #: merge-recursive.c:1631
728 msgid "Skipped %s (merged same as existing)"
731 #: merge-recursive.c:1645
733 msgid "Auto-merging %s"
736 #: merge-recursive.c:1649 git-submodule.sh:1150
740 #: merge-recursive.c:1650
742 msgid "CONFLICT (%s): Merge conflict in %s"
745 #: merge-recursive.c:1740
750 #: merge-recursive.c:1765
751 msgid "file/directory"
754 #: merge-recursive.c:1771
755 msgid "directory/file"
758 #: merge-recursive.c:1776
760 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
763 #: merge-recursive.c:1786
768 #: merge-recursive.c:1803
769 msgid "Fatal merge failure, shouldn't happen."
772 #: merge-recursive.c:1822
773 msgid "Already up-to-date!"
776 #: merge-recursive.c:1831
778 msgid "merging of trees %s and %s failed"
781 #: merge-recursive.c:1861
783 msgid "Unprocessed path??? %s"
786 #: merge-recursive.c:1906
790 #: merge-recursive.c:1919
792 msgid "found %u common ancestor:"
793 msgid_plural "found %u common ancestors:"
797 #: merge-recursive.c:1956
798 msgid "merge returned no commit"
801 #: merge-recursive.c:2013
803 msgid "Could not parse object '%s'"
806 #: merge-recursive.c:2024 builtin/merge.c:666
807 msgid "Unable to write index."
811 msgid "Cannot commit uninitialized/unreferenced notes tree"
816 msgid "Bad notes.rewriteMode value: '%s'"
821 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
824 #. TRANSLATORS: The first %s is the name of the
825 #. environment variable, the second %s is its value
828 msgid "Bad %s value: '%s'"
833 msgid "unable to parse object: %s"
836 #: parse-options.c:534
840 #: parse-options.c:552
845 #. TRANSLATORS: the colon here should align with the
846 #. one in "usage: %s" translation
847 #: parse-options.c:556
852 #: parse-options.c:559
857 #: parse-options.c:593
862 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
867 "global 'literal' pathspec setting is incompatible with all other global "
872 msgid "invalid parameter for pathspec magic 'prefix'"
877 msgid "Invalid pathspec magic '%.*s' in '%s'"
882 msgid "Missing ')' at the end of pathspec magic in '%s'"
887 msgid "Unimplemented pathspec magic '%c' in '%s'"
892 msgid "%s: 'literal' and 'glob' are incompatible"
897 msgid "%s: '%s' is outside repository"
902 msgid "Pathspec '%s' is in submodule '%.*s'"
907 msgid "%s: pathspec magic not supported by this command: %s"
912 msgid "pathspec '%s' is beyond a symbolic link"
917 "There is nothing to exclude from by :(exclude) patterns.\n"
918 "Perhaps you forgot to add either ':/' or '.' ?"
928 "index.version set, but the value is invalid.\n"
935 "GIT_INDEX_VERSION set, but the value is invalid.\n"
941 msgid "Cannot fetch both %s and %s to %s"
946 msgid "%s usually tracks %s, not %s"
951 msgid "%s tracks both %s and %s"
955 msgid "Internal error"
960 msgid "Your branch is based on '%s', but the upstream is gone.\n"
964 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
969 msgid "Your branch is up-to-date with '%s'.\n"
974 msgid "Your branch is ahead of '%s' by %d commit.\n"
975 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
980 msgid " (use \"git push\" to publish your local commits)\n"
985 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
987 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
992 msgid " (use \"git pull\" to update your local branch)\n"
998 "Your branch and '%s' have diverged,\n"
999 "and have %d and %d different commit each, respectively.\n"
1001 "Your branch and '%s' have diverged,\n"
1002 "and have %d and %d different commits each, respectively.\n"
1007 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1011 msgid "open /dev/null failed"
1016 msgid "dup2(%d,%d) failed"
1019 #: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893
1020 #: builtin/merge.c:1003 builtin/merge.c:1013
1022 msgid "Could not open '%s' for writing"
1025 #: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785
1026 #: builtin/merge.c:1005 builtin/merge.c:1018
1028 msgid "Could not write to '%s'"
1033 "after resolving the conflicts, mark the corrected paths\n"
1034 "with 'git add <paths>' or 'git rm <paths>'"
1039 "after resolving the conflicts, mark the corrected paths\n"
1040 "with 'git add <paths>' or 'git rm <paths>'\n"
1041 "and commit the result with 'git commit'"
1044 #: sequencer.c:210 sequencer.c:841 sequencer.c:924
1046 msgid "Could not write to %s"
1051 msgid "Error wrapping up %s"
1055 msgid "Your local changes would be overwritten by cherry-pick."
1059 msgid "Your local changes would be overwritten by revert."
1063 msgid "Commit your changes or stash them to proceed."
1067 msgid "Failed to lock HEAD during fast_forward_to"
1070 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1073 msgid "%s: Unable to write new index file"
1077 msgid "Could not resolve HEAD commit\n"
1081 msgid "Unable to update cache tree\n"
1086 msgid "Could not parse commit %s\n"
1091 msgid "Could not parse parent commit %s\n"
1095 msgid "Your index file is unmerged."
1100 msgid "Commit %s is a merge but no -m option was given."
1105 msgid "Commit %s does not have parent %d"
1110 msgid "Mainline was specified but commit %s is not a merge."
1113 #. TRANSLATORS: The first %s will be "revert" or
1114 #. "cherry-pick", the second %s a SHA1
1117 msgid "%s: cannot parse parent commit %s"
1122 msgid "Cannot get commit message for %s"
1127 msgid "could not revert %s... %s"
1132 msgid "could not apply %s... %s"
1136 msgid "empty commit set passed"
1141 msgid "git %s: failed to read the index"
1146 msgid "git %s: failed to refresh the index"
1151 msgid "Cannot %s during a %s"
1156 msgid "Could not parse line %d."
1160 msgid "No commits parsed."
1165 msgid "Could not open %s"
1170 msgid "Could not read %s."
1175 msgid "Unusable instruction sheet: %s"
1180 msgid "Invalid key: %s"
1185 msgid "Invalid value for %s: %s"
1190 msgid "Malformed options sheet: %s"
1194 msgid "a cherry-pick or revert is already in progress"
1198 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1203 msgid "Could not create sequencer directory %s"
1206 #: sequencer.c:843 sequencer.c:928
1208 msgid "Error wrapping up %s."
1211 #: sequencer.c:862 sequencer.c:998
1212 msgid "no cherry-pick or revert in progress"
1216 msgid "cannot resolve HEAD"
1220 msgid "cannot abort from a branch yet to be born"
1223 #: sequencer.c:888 builtin/apply.c:4062
1225 msgid "cannot open %s: %s"
1230 msgid "cannot read %s: %s"
1234 msgid "unexpected end of file"
1239 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1244 msgid "Could not format %s."
1249 msgid "%s: can't cherry-pick a %s"
1254 msgid "%s: bad revision"
1258 msgid "Can't revert as initial commit"
1262 msgid "Can't cherry-pick into empty head"
1267 "Git normally never creates a ref that ends with 40 hex characters\n"
1268 "because it will be ignored when you just specify 40-hex. These refs\n"
1269 "may be created by mistake. For example,\n"
1271 " git checkout -b $br $(git rev-parse ...)\n"
1273 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1274 "examine these refs and maybe delete them. Turn this message off by\n"
1275 "running \"git config advice.objectNameWarning false\""
1279 msgid "HEAD does not point to a branch"
1284 msgid "No such branch: '%s'"
1289 msgid "No upstream configured for branch '%s'"
1294 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1297 #: submodule.c:64 submodule.c:98
1298 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1301 #: submodule.c:68 submodule.c:102
1303 msgid "Could not find section in .gitmodules where path=%s"
1308 msgid "Could not update .gitmodules entry %s"
1313 msgid "Could not remove .gitmodules entry for %s"
1317 msgid "staging updated .gitmodules failed"
1320 #: submodule.c:1118 builtin/init-db.c:363
1322 msgid "Could not create git link %s"
1327 msgid "Could not set core.worktree in %s"
1330 #: unpack-trees.c:202
1331 msgid "Checking out files"
1335 msgid "invalid URL scheme name or missing '://' suffix"
1338 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1340 msgid "invalid %XX escape sequence"
1344 msgid "missing host and scheme is not 'file:'"
1348 msgid "a 'file:' URL may not have a port number"
1352 msgid "invalid characters in host name"
1355 #: urlmatch.c:244 urlmatch.c:255
1356 msgid "invalid port number"
1360 msgid "invalid '..' path segment"
1365 msgid "unable to access '%s': %s"
1370 msgid "unable to access '%s'"
1375 msgid "unable to look up current user in the passwd file: %s"
1379 msgid "no such user"
1383 msgid "Unmerged paths:"
1386 #: wt-status.c:177 wt-status.c:204
1388 msgid " (use \"git reset %s <file>...\" to unstage)"
1391 #: wt-status.c:179 wt-status.c:206
1392 msgid " (use \"git rm --cached <file>...\" to unstage)"
1396 msgid " (use \"git add <file>...\" to mark resolution)"
1399 #: wt-status.c:185 wt-status.c:189
1400 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1404 msgid " (use \"git rm <file>...\" to mark resolution)"
1408 msgid "Changes to be committed:"
1412 msgid "Changes not staged for commit:"
1416 msgid " (use \"git add <file>...\" to update what will be committed)"
1420 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1425 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1429 msgid " (commit or discard the untracked or modified content in submodules)"
1434 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1438 msgid "both deleted:"
1442 msgid "added by us:"
1446 msgid "deleted by them:"
1450 msgid "added by them:"
1454 msgid "deleted by us:"
1462 msgid "both modified:"
1467 msgid "bug: unhandled unmerged status %x"
1503 msgid "new commits, "
1507 msgid "modified content, "
1511 msgid "untracked content, "
1516 msgid "bug: unhandled diff status %c"
1520 msgid "Submodules changed but not updated:"
1524 msgid "Submodule changes to be committed:"
1529 "Do not touch the line above.\n"
1530 "Everything below will be removed."
1534 msgid "You have unmerged paths."
1538 msgid " (fix conflicts and run \"git commit\")"
1542 msgid "All conflicts fixed but you are still merging."
1546 msgid " (use \"git commit\" to conclude merge)"
1550 msgid "You are in the middle of an am session."
1554 msgid "The current patch is empty."
1558 msgid " (fix conflicts and then run \"git am --continue\")"
1562 msgid " (use \"git am --skip\" to skip this patch)"
1566 msgid " (use \"git am --abort\" to restore the original branch)"
1569 #: wt-status.c:1026 wt-status.c:1043
1571 msgid "You are currently rebasing branch '%s' on '%s'."
1574 #: wt-status.c:1031 wt-status.c:1048
1575 msgid "You are currently rebasing."
1579 msgid " (fix conflicts and then run \"git rebase --continue\")"
1583 msgid " (use \"git rebase --skip\" to skip this patch)"
1587 msgid " (use \"git rebase --abort\" to check out the original branch)"
1591 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1597 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1601 msgid "You are currently splitting a commit during a rebase."
1605 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1610 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1614 msgid "You are currently editing a commit during a rebase."
1618 msgid " (use \"git commit --amend\" to amend the current commit)"
1623 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1628 msgid "You are currently cherry-picking commit %s."
1632 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1636 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1640 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1645 msgid "You are currently reverting commit %s."
1649 msgid " (fix conflicts and run \"git revert --continue\")"
1653 msgid " (all conflicts fixed: run \"git revert --continue\")"
1657 msgid " (use \"git revert --abort\" to cancel the revert operation)"
1662 msgid "You are currently bisecting, started from branch '%s'."
1666 msgid "You are currently bisecting."
1670 msgid " (use \"git bisect reset\" to get back to the original branch)"
1678 msgid "rebase in progress; onto "
1682 msgid "HEAD detached at "
1686 msgid "HEAD detached from "
1690 msgid "Not currently on any branch."
1694 msgid "Initial commit"
1698 msgid "Untracked files"
1702 msgid "Ignored files"
1708 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1709 "may speed it up, but you have to be careful not to forget to add\n"
1710 "new files yourself (see 'git help status')."
1715 msgid "Untracked files not listed%s"
1719 msgid " (use -u option to show untracked files)"
1728 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1733 msgid "no changes added to commit\n"
1739 "nothing added to commit but untracked files present (use \"git add\" to "
1745 msgid "nothing added to commit but untracked files present\n"
1750 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1753 #: wt-status.c:1399 wt-status.c:1404
1755 msgid "nothing to commit\n"
1760 msgid "nothing to commit (use -u to show untracked files)\n"
1765 msgid "nothing to commit, working directory clean\n"
1769 msgid "HEAD (no branch)"
1773 msgid "Initial commit on "
1780 #: wt-status.c:1555 wt-status.c:1563
1784 #: compat/precompose_utf8.c:55 builtin/clone.c:356
1786 msgid "failed to unlink '%s'"
1790 msgid "git add [options] [--] <pathspec>..."
1795 msgid "unexpected diff status %c"
1798 #: builtin/add.c:69 builtin/commit.c:261
1799 msgid "updating files failed"
1804 msgid "remove '%s'\n"
1807 #: builtin/add.c:133
1808 msgid "Unstaged changes after refreshing the index:"
1811 #: builtin/add.c:193 builtin/rev-parse.c:781
1812 msgid "Could not read the index"
1815 #: builtin/add.c:204
1817 msgid "Could not open '%s' for writing."
1820 #: builtin/add.c:208
1821 msgid "Could not write patch"
1824 #: builtin/add.c:213
1826 msgid "Could not stat '%s'"
1829 #: builtin/add.c:215
1830 msgid "Empty patch. Aborted."
1833 #: builtin/add.c:221
1835 msgid "Could not apply '%s'"
1838 #: builtin/add.c:231
1839 msgid "The following paths are ignored by one of your .gitignore files:\n"
1842 #: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70
1843 #: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367
1848 #: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19
1849 #: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606
1850 #: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113
1854 #: builtin/add.c:251
1855 msgid "interactive picking"
1858 #: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285
1859 msgid "select hunks interactively"
1862 #: builtin/add.c:253
1863 msgid "edit current diff and apply"
1866 #: builtin/add.c:254
1867 msgid "allow adding otherwise ignored files"
1870 #: builtin/add.c:255
1871 msgid "update tracked files"
1874 #: builtin/add.c:256
1875 msgid "record only the fact that the path will be added later"
1878 #: builtin/add.c:257
1879 msgid "add changes from all tracked and untracked files"
1882 #: builtin/add.c:260
1883 msgid "ignore paths removed in the working tree (same as --no-all)"
1886 #: builtin/add.c:262
1887 msgid "don't add, only refresh the index"
1890 #: builtin/add.c:263
1891 msgid "just skip files which cannot be added because of errors"
1894 #: builtin/add.c:264
1895 msgid "check if - even missing - files are ignored in dry run"
1898 #: builtin/add.c:286
1900 msgid "Use -f if you really want to add them.\n"
1903 #: builtin/add.c:287
1904 msgid "no files added"
1907 #: builtin/add.c:293
1908 msgid "adding files failed"
1911 #: builtin/add.c:329
1912 msgid "-A and -u are mutually incompatible"
1915 #: builtin/add.c:336
1916 msgid "Option --ignore-missing can only be used together with --dry-run"
1919 #: builtin/add.c:357
1921 msgid "Nothing specified, nothing added.\n"
1924 #: builtin/add.c:358
1926 msgid "Maybe you wanted to say 'git add .'?\n"
1929 #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919
1930 #: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299
1931 msgid "index file corrupt"
1934 #: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431
1935 msgid "Unable to write new index file"
1938 #: builtin/apply.c:57
1939 msgid "git apply [options] [<patch>...]"
1942 #: builtin/apply.c:110
1944 msgid "unrecognized whitespace option '%s'"
1947 #: builtin/apply.c:125
1949 msgid "unrecognized whitespace ignore option '%s'"
1952 #: builtin/apply.c:825
1954 msgid "Cannot prepare timestamp regexp %s"
1957 #: builtin/apply.c:834
1959 msgid "regexec returned %d for input: %s"
1962 #: builtin/apply.c:915
1964 msgid "unable to find filename in patch at line %d"
1967 #: builtin/apply.c:947
1969 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1972 #: builtin/apply.c:951
1974 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1977 #: builtin/apply.c:952
1979 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1982 #: builtin/apply.c:959
1984 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1987 #: builtin/apply.c:1422
1989 msgid "recount: unexpected line: %.*s"
1992 #: builtin/apply.c:1479
1994 msgid "patch fragment without header at line %d: %.*s"
1997 #: builtin/apply.c:1496
2000 "git diff header lacks filename information when removing %d leading pathname "
2001 "component (line %d)"
2003 "git diff header lacks filename information when removing %d leading pathname "
2004 "components (line %d)"
2008 #: builtin/apply.c:1656
2009 msgid "new file depends on old contents"
2012 #: builtin/apply.c:1658
2013 msgid "deleted file still has contents"
2016 #: builtin/apply.c:1684
2018 msgid "corrupt patch at line %d"
2021 #: builtin/apply.c:1720
2023 msgid "new file %s depends on old contents"
2026 #: builtin/apply.c:1722
2028 msgid "deleted file %s still has contents"
2031 #: builtin/apply.c:1725
2033 msgid "** warning: file %s becomes empty but is not deleted"
2036 #: builtin/apply.c:1871
2038 msgid "corrupt binary patch at line %d: %.*s"
2041 #: builtin/apply.c:1900
2043 msgid "unrecognized binary patch at line %d"
2046 #: builtin/apply.c:1986
2048 msgid "patch with only garbage at line %d"
2051 #: builtin/apply.c:2076
2053 msgid "unable to read symlink %s"
2056 #: builtin/apply.c:2080
2058 msgid "unable to open or read %s"
2061 #: builtin/apply.c:2688
2063 msgid "invalid start of line: '%c'"
2066 #: builtin/apply.c:2806
2068 msgid "Hunk #%d succeeded at %d (offset %d line)."
2069 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2073 #: builtin/apply.c:2818
2075 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2078 #: builtin/apply.c:2824
2081 "while searching for:\n"
2085 #: builtin/apply.c:2843
2087 msgid "missing binary patch data for '%s'"
2090 #: builtin/apply.c:2944
2092 msgid "binary patch does not apply to '%s'"
2095 #: builtin/apply.c:2950
2097 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2100 #: builtin/apply.c:2971
2102 msgid "patch failed: %s:%ld"
2105 #: builtin/apply.c:3095
2107 msgid "cannot checkout %s"
2110 #: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194
2112 msgid "read of %s failed"
2115 #: builtin/apply.c:3174 builtin/apply.c:3396
2117 msgid "path %s has been renamed/deleted"
2120 #: builtin/apply.c:3255 builtin/apply.c:3410
2122 msgid "%s: does not exist in index"
2125 #: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424
2130 #: builtin/apply.c:3264 builtin/apply.c:3418
2132 msgid "%s: does not match index"
2135 #: builtin/apply.c:3366
2136 msgid "removal patch leaves file contents"
2139 #: builtin/apply.c:3435
2141 msgid "%s: wrong type"
2144 #: builtin/apply.c:3437
2146 msgid "%s has type %o, expected %o"
2149 #: builtin/apply.c:3538
2151 msgid "%s: already exists in index"
2154 #: builtin/apply.c:3541
2156 msgid "%s: already exists in working directory"
2159 #: builtin/apply.c:3561
2161 msgid "new mode (%o) of %s does not match old mode (%o)"
2164 #: builtin/apply.c:3566
2166 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2169 #: builtin/apply.c:3574
2171 msgid "%s: patch does not apply"
2174 #: builtin/apply.c:3587
2176 msgid "Checking patch %s..."
2179 #: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134
2181 msgid "make_cache_entry failed for path '%s'"
2184 #: builtin/apply.c:3823
2186 msgid "unable to remove %s from index"
2189 #: builtin/apply.c:3852
2191 msgid "corrupt patch for submodule %s"
2194 #: builtin/apply.c:3856
2196 msgid "unable to stat newly created file '%s'"
2199 #: builtin/apply.c:3861
2201 msgid "unable to create backing store for newly created file %s"
2204 #: builtin/apply.c:3864 builtin/apply.c:3972
2206 msgid "unable to add cache entry for %s"
2209 #: builtin/apply.c:3897
2211 msgid "closing file '%s'"
2214 #: builtin/apply.c:3946
2216 msgid "unable to write file '%s' mode %o"
2219 #: builtin/apply.c:4033
2221 msgid "Applied patch %s cleanly."
2224 #: builtin/apply.c:4041
2225 msgid "internal error"
2228 #: builtin/apply.c:4044
2230 msgid "Applying patch %%s with %d reject..."
2231 msgid_plural "Applying patch %%s with %d rejects..."
2235 #: builtin/apply.c:4054
2237 msgid "truncating .rej filename to %.*s.rej"
2240 #: builtin/apply.c:4075
2242 msgid "Hunk #%d applied cleanly."
2245 #: builtin/apply.c:4078
2247 msgid "Rejected hunk #%d."
2250 #: builtin/apply.c:4228
2251 msgid "unrecognized input"
2254 #: builtin/apply.c:4239
2255 msgid "unable to read index file"
2258 #: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90
2259 #: builtin/fetch.c:93
2263 #: builtin/apply.c:4359
2264 msgid "don't apply changes matching the given path"
2267 #: builtin/apply.c:4362
2268 msgid "apply changes matching the given path"
2271 #: builtin/apply.c:4364
2275 #: builtin/apply.c:4365
2276 msgid "remove <num> leading slashes from traditional diff paths"
2279 #: builtin/apply.c:4368
2280 msgid "ignore additions made by the patch"
2283 #: builtin/apply.c:4370
2284 msgid "instead of applying the patch, output diffstat for the input"
2287 #: builtin/apply.c:4374
2288 msgid "show number of added and deleted lines in decimal notation"
2291 #: builtin/apply.c:4376
2292 msgid "instead of applying the patch, output a summary for the input"
2295 #: builtin/apply.c:4378
2296 msgid "instead of applying the patch, see if the patch is applicable"
2299 #: builtin/apply.c:4380
2300 msgid "make sure the patch is applicable to the current index"
2303 #: builtin/apply.c:4382
2304 msgid "apply a patch without touching the working tree"
2307 #: builtin/apply.c:4384
2308 msgid "also apply the patch (use with --stat/--summary/--check)"
2311 #: builtin/apply.c:4386
2312 msgid "attempt three-way merge if a patch does not apply"
2315 #: builtin/apply.c:4388
2316 msgid "build a temporary index based on embedded index information"
2319 #: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455
2320 msgid "paths are separated with NUL character"
2323 #: builtin/apply.c:4393
2324 msgid "ensure at least <n> lines of context match"
2327 #: builtin/apply.c:4394
2331 #: builtin/apply.c:4395
2332 msgid "detect new or modified lines that have whitespace errors"
2335 #: builtin/apply.c:4398 builtin/apply.c:4401
2336 msgid "ignore changes in whitespace when finding context"
2339 #: builtin/apply.c:4404
2340 msgid "apply the patch in reverse"
2343 #: builtin/apply.c:4406
2344 msgid "don't expect at least one line of context"
2347 #: builtin/apply.c:4408
2348 msgid "leave the rejected hunks in corresponding *.rej files"
2351 #: builtin/apply.c:4410
2352 msgid "allow overlapping hunks"
2355 #: builtin/apply.c:4413
2356 msgid "tolerate incorrectly detected missing new-line at the end of file"
2359 #: builtin/apply.c:4416
2360 msgid "do not trust the line counts in the hunk headers"
2363 #: builtin/apply.c:4418
2367 #: builtin/apply.c:4419
2368 msgid "prepend <root> to all filenames"
2371 #: builtin/apply.c:4441
2372 msgid "--3way outside a repository"
2375 #: builtin/apply.c:4449
2376 msgid "--index outside a repository"
2379 #: builtin/apply.c:4452
2380 msgid "--cached outside a repository"
2383 #: builtin/apply.c:4468
2385 msgid "can't open patch '%s'"
2388 #: builtin/apply.c:4482
2390 msgid "squelched %d whitespace error"
2391 msgid_plural "squelched %d whitespace errors"
2395 #: builtin/apply.c:4488 builtin/apply.c:4498
2397 msgid "%d line adds whitespace errors."
2398 msgid_plural "%d lines add whitespace errors."
2402 #: builtin/archive.c:17
2404 msgid "could not create archive file '%s'"
2407 #: builtin/archive.c:20
2408 msgid "could not redirect output"
2411 #: builtin/archive.c:37
2412 msgid "git archive: Remote with no URL"
2415 #: builtin/archive.c:58
2416 msgid "git archive: expected ACK/NAK, got EOF"
2419 #: builtin/archive.c:61
2421 msgid "git archive: NACK %s"
2424 #: builtin/archive.c:63
2426 msgid "remote error: %s"
2429 #: builtin/archive.c:64
2430 msgid "git archive: protocol error"
2433 #: builtin/archive.c:68
2434 msgid "git archive: expected a flush"
2437 #: builtin/bisect--helper.c:7
2438 msgid "git bisect--helper --next-all [--no-checkout]"
2441 #: builtin/bisect--helper.c:17
2442 msgid "perform 'git bisect next'"
2445 #: builtin/bisect--helper.c:19
2446 msgid "update BISECT_HEAD instead of checking out the current commit"
2449 #: builtin/blame.c:30
2450 msgid "git blame [options] [rev-opts] [rev] [--] file"
2453 #: builtin/blame.c:35
2454 msgid "[rev-opts] are documented in git-rev-list(1)"
2457 #: builtin/blame.c:2501
2458 msgid "Show blame entries as we find them, incrementally"
2461 #: builtin/blame.c:2502
2462 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2465 #: builtin/blame.c:2503
2466 msgid "Do not treat root commits as boundaries (Default: off)"
2469 #: builtin/blame.c:2504
2470 msgid "Show work cost statistics"
2473 #: builtin/blame.c:2505
2474 msgid "Show output score for blame entries"
2477 #: builtin/blame.c:2506
2478 msgid "Show original filename (Default: auto)"
2481 #: builtin/blame.c:2507
2482 msgid "Show original linenumber (Default: off)"
2485 #: builtin/blame.c:2508
2486 msgid "Show in a format designed for machine consumption"
2489 #: builtin/blame.c:2509
2490 msgid "Show porcelain format with per-line commit information"
2493 #: builtin/blame.c:2510
2494 msgid "Use the same output mode as git-annotate (Default: off)"
2497 #: builtin/blame.c:2511
2498 msgid "Show raw timestamp (Default: off)"
2501 #: builtin/blame.c:2512
2502 msgid "Show long commit SHA1 (Default: off)"
2505 #: builtin/blame.c:2513
2506 msgid "Suppress author name and timestamp (Default: off)"
2509 #: builtin/blame.c:2514
2510 msgid "Show author email instead of name (Default: off)"
2513 #: builtin/blame.c:2515
2514 msgid "Ignore whitespace differences"
2517 #: builtin/blame.c:2516
2518 msgid "Spend extra cycles to find better match"
2521 #: builtin/blame.c:2517
2522 msgid "Use revisions from <file> instead of calling git-rev-list"
2525 #: builtin/blame.c:2518
2526 msgid "Use <file>'s contents as the final image"
2529 #: builtin/blame.c:2519 builtin/blame.c:2520
2533 #: builtin/blame.c:2519
2534 msgid "Find line copies within and across files"
2537 #: builtin/blame.c:2520
2538 msgid "Find line movements within and across files"
2541 #: builtin/blame.c:2521
2545 #: builtin/blame.c:2521
2546 msgid "Process only line range n,m, counting from 1"
2549 #. TRANSLATORS: This string is used to tell us the maximum
2550 #. display width for a relative timestamp in "git blame"
2551 #. output. For C locale, "4 years, 11 months ago", which
2552 #. takes 22 places, is the longest among various forms of
2553 #. relative timestamps, but your language may need more or
2554 #. fewer display columns.
2555 #: builtin/blame.c:2599
2556 msgid "4 years, 11 months ago"
2559 #: builtin/branch.c:24
2560 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2563 #: builtin/branch.c:25
2564 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2567 #: builtin/branch.c:26
2568 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2571 #: builtin/branch.c:27
2572 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2575 #: builtin/branch.c:150
2578 "deleting branch '%s' that has been merged to\n"
2579 " '%s', but not yet merged to HEAD."
2582 #: builtin/branch.c:154
2585 "not deleting branch '%s' that is not yet merged to\n"
2586 " '%s', even though it is merged to HEAD."
2589 #: builtin/branch.c:168
2591 msgid "Couldn't look up commit object for '%s'"
2594 #: builtin/branch.c:172
2597 "The branch '%s' is not fully merged.\n"
2598 "If you are sure you want to delete it, run 'git branch -D %s'."
2601 #: builtin/branch.c:185
2602 msgid "Update of config-file failed"
2605 #: builtin/branch.c:213
2606 msgid "cannot use -a with -d"
2609 #: builtin/branch.c:219
2610 msgid "Couldn't look up commit object for HEAD"
2613 #: builtin/branch.c:227
2615 msgid "Cannot delete the branch '%s' which you are currently on."
2618 #: builtin/branch.c:240
2620 msgid "remote branch '%s' not found."
2623 #: builtin/branch.c:241
2625 msgid "branch '%s' not found."
2628 #: builtin/branch.c:255
2630 msgid "Error deleting remote branch '%s'"
2633 #: builtin/branch.c:256
2635 msgid "Error deleting branch '%s'"
2638 #: builtin/branch.c:263
2640 msgid "Deleted remote branch %s (was %s).\n"
2643 #: builtin/branch.c:264
2645 msgid "Deleted branch %s (was %s).\n"
2648 #: builtin/branch.c:366
2650 msgid "branch '%s' does not point at a commit"
2653 #: builtin/branch.c:454
2658 #: builtin/branch.c:459
2663 #: builtin/branch.c:464
2665 msgid "[%s: behind %d]"
2668 #: builtin/branch.c:466
2673 #: builtin/branch.c:470
2675 msgid "[%s: ahead %d]"
2678 #: builtin/branch.c:472
2683 #: builtin/branch.c:475
2685 msgid "[%s: ahead %d, behind %d]"
2688 #: builtin/branch.c:478
2690 msgid "[ahead %d, behind %d]"
2693 #: builtin/branch.c:502
2694 msgid " **** invalid ref ****"
2697 #: builtin/branch.c:594
2699 msgid "(no branch, rebasing %s)"
2702 #: builtin/branch.c:597
2704 msgid "(no branch, bisect started on %s)"
2707 #: builtin/branch.c:600
2709 msgid "(detached from %s)"
2712 #: builtin/branch.c:603
2716 #: builtin/branch.c:649
2718 msgid "object '%s' does not point to a commit"
2721 #: builtin/branch.c:681
2722 msgid "some refs could not be read"
2725 #: builtin/branch.c:694
2726 msgid "cannot rename the current branch while not on any."
2729 #: builtin/branch.c:704
2731 msgid "Invalid branch name: '%s'"
2734 #: builtin/branch.c:719
2735 msgid "Branch rename failed"
2738 #: builtin/branch.c:723
2740 msgid "Renamed a misnamed branch '%s' away"
2743 #: builtin/branch.c:727
2745 msgid "Branch renamed to %s, but HEAD is not updated!"
2748 #: builtin/branch.c:734
2749 msgid "Branch is renamed, but update of config-file failed"
2752 #: builtin/branch.c:749
2754 msgid "malformed object name %s"
2757 #: builtin/branch.c:773
2759 msgid "could not write branch description template: %s"
2762 #: builtin/branch.c:803
2763 msgid "Generic options"
2766 #: builtin/branch.c:805
2767 msgid "show hash and subject, give twice for upstream branch"
2770 #: builtin/branch.c:806
2771 msgid "suppress informational messages"
2774 #: builtin/branch.c:807
2775 msgid "set up tracking mode (see git-pull(1))"
2778 #: builtin/branch.c:809
2779 msgid "change upstream info"
2782 #: builtin/branch.c:813
2783 msgid "use colored output"
2786 #: builtin/branch.c:814
2787 msgid "act on remote-tracking branches"
2790 #: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844
2791 #: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574
2792 #: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615
2793 #: builtin/tag.c:621
2797 #: builtin/branch.c:818 builtin/branch.c:824
2798 msgid "print only branches that contain the commit"
2801 #: builtin/branch.c:830
2802 msgid "Specific git-branch actions:"
2805 #: builtin/branch.c:831
2806 msgid "list both remote-tracking and local branches"
2809 #: builtin/branch.c:833
2810 msgid "delete fully merged branch"
2813 #: builtin/branch.c:834
2814 msgid "delete branch (even if not merged)"
2817 #: builtin/branch.c:835
2818 msgid "move/rename a branch and its reflog"
2821 #: builtin/branch.c:836
2822 msgid "move/rename a branch, even if target exists"
2825 #: builtin/branch.c:837
2826 msgid "list branch names"
2829 #: builtin/branch.c:838
2830 msgid "create the branch's reflog"
2833 #: builtin/branch.c:840
2834 msgid "edit the description for the branch"
2837 #: builtin/branch.c:841
2838 msgid "force creation (when already exists)"
2841 #: builtin/branch.c:844
2842 msgid "print only not merged branches"
2845 #: builtin/branch.c:850
2846 msgid "print only merged branches"
2849 #: builtin/branch.c:854
2850 msgid "list branches in columns"
2853 #: builtin/branch.c:867
2854 msgid "Failed to resolve HEAD as a valid ref."
2857 #: builtin/branch.c:872 builtin/clone.c:636
2858 msgid "HEAD not found below refs/heads!"
2861 #: builtin/branch.c:896
2862 msgid "--column and --verbose are incompatible"
2865 #: builtin/branch.c:902 builtin/branch.c:941
2866 msgid "branch name required"
2869 #: builtin/branch.c:917
2870 msgid "Cannot give description to detached HEAD"
2873 #: builtin/branch.c:922
2874 msgid "cannot edit description of more than one branch"
2877 #: builtin/branch.c:929
2879 msgid "No commit on branch '%s' yet."
2882 #: builtin/branch.c:932
2884 msgid "No branch named '%s'."
2887 #: builtin/branch.c:947
2888 msgid "too many branches for a rename operation"
2891 #: builtin/branch.c:952
2892 msgid "too many branches to set new upstream"
2895 #: builtin/branch.c:956
2898 "could not set upstream of HEAD to %s when it does not point to any branch."
2901 #: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002
2903 msgid "no such branch '%s'"
2906 #: builtin/branch.c:963
2908 msgid "branch '%s' does not exist"
2911 #: builtin/branch.c:975
2912 msgid "too many branches to unset upstream"
2915 #: builtin/branch.c:979
2916 msgid "could not unset upstream of HEAD when it does not point to any branch."
2919 #: builtin/branch.c:985
2921 msgid "Branch '%s' has no upstream information"
2924 #: builtin/branch.c:999
2925 msgid "it does not make sense to create 'HEAD' manually"
2928 #: builtin/branch.c:1005
2929 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2932 #: builtin/branch.c:1008
2935 "The --set-upstream flag is deprecated and will be removed. Consider using --"
2936 "track or --set-upstream-to\n"
2939 #: builtin/branch.c:1025
2943 "If you wanted to make '%s' track '%s', do this:\n"
2947 #: builtin/branch.c:1026
2949 msgid " git branch -d %s\n"
2952 #: builtin/branch.c:1027
2954 msgid " git branch --set-upstream-to %s\n"
2957 #: builtin/bundle.c:47
2959 msgid "%s is okay\n"
2962 #: builtin/bundle.c:56
2963 msgid "Need a repository to create a bundle."
2966 #: builtin/bundle.c:60
2967 msgid "Need a repository to unbundle."
2970 #: builtin/cat-file.c:331
2971 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2974 #: builtin/cat-file.c:332
2975 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2978 #: builtin/cat-file.c:369
2979 msgid "<type> can be one of: blob, tree, commit, tag"
2982 #: builtin/cat-file.c:370
2983 msgid "show object type"
2986 #: builtin/cat-file.c:371
2987 msgid "show object size"
2990 #: builtin/cat-file.c:373
2991 msgid "exit with zero when there's no error"
2994 #: builtin/cat-file.c:374
2995 msgid "pretty-print object's content"
2998 #: builtin/cat-file.c:376
2999 msgid "for blob objects, run textconv on object's content"
3002 #: builtin/cat-file.c:378
3003 msgid "show info and content of objects fed from the standard input"
3006 #: builtin/cat-file.c:381
3007 msgid "show info about objects fed from the standard input"
3010 #: builtin/check-attr.c:11
3011 msgid "git check-attr [-a | --all | attr...] [--] pathname..."
3014 #: builtin/check-attr.c:12
3015 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
3018 #: builtin/check-attr.c:19
3019 msgid "report all attributes set on file"
3022 #: builtin/check-attr.c:20
3023 msgid "use .gitattributes only from the index"
3026 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
3027 msgid "read file names from stdin"
3030 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
3031 msgid "terminate input and output records by a NUL character"
3034 #: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285
3035 msgid "suppress progress reporting"
3038 #: builtin/check-ignore.c:26
3039 msgid "show non-matching input paths"
3042 #: builtin/check-ignore.c:28
3043 msgid "ignore index when checking"
3046 #: builtin/check-ignore.c:154
3047 msgid "cannot specify pathnames with --stdin"
3050 #: builtin/check-ignore.c:157
3051 msgid "-z only makes sense with --stdin"
3054 #: builtin/check-ignore.c:159
3055 msgid "no path specified"
3058 #: builtin/check-ignore.c:163
3059 msgid "--quiet is only valid with a single pathname"
3062 #: builtin/check-ignore.c:165
3063 msgid "cannot have both --quiet and --verbose"
3066 #: builtin/check-ignore.c:168
3067 msgid "--non-matching is only valid with --verbose"
3070 #: builtin/check-mailmap.c:8
3071 msgid "git check-mailmap [options] <contact>..."
3074 #: builtin/check-mailmap.c:13
3075 msgid "also read contacts from stdin"
3078 #: builtin/check-mailmap.c:24
3080 msgid "unable to parse contact: %s"
3083 #: builtin/check-mailmap.c:47
3084 msgid "no contacts specified"
3087 #: builtin/checkout-index.c:126
3088 msgid "git checkout-index [options] [--] [<file>...]"
3091 #: builtin/checkout-index.c:188
3092 msgid "check out all files in the index"
3095 #: builtin/checkout-index.c:189
3096 msgid "force overwrite of existing files"
3099 #: builtin/checkout-index.c:191
3100 msgid "no warning for existing files and files not in index"
3103 #: builtin/checkout-index.c:193
3104 msgid "don't checkout new files"
3107 #: builtin/checkout-index.c:195
3108 msgid "update stat information in the index file"
3111 #: builtin/checkout-index.c:201
3112 msgid "read list of paths from the standard input"
3115 #: builtin/checkout-index.c:203
3116 msgid "write the content to temporary files"
3119 #: builtin/checkout-index.c:204 builtin/column.c:30
3123 #: builtin/checkout-index.c:205
3124 msgid "when creating files, prepend <string>"
3127 #: builtin/checkout-index.c:208
3128 msgid "copy out the files from named stage"
3131 #: builtin/checkout.c:25
3132 msgid "git checkout [options] <branch>"
3135 #: builtin/checkout.c:26
3136 msgid "git checkout [options] [<branch>] -- <file>..."
3139 #: builtin/checkout.c:114 builtin/checkout.c:147
3141 msgid "path '%s' does not have our version"
3144 #: builtin/checkout.c:116 builtin/checkout.c:149
3146 msgid "path '%s' does not have their version"
3149 #: builtin/checkout.c:132
3151 msgid "path '%s' does not have all necessary versions"
3154 #: builtin/checkout.c:176
3156 msgid "path '%s' does not have necessary versions"
3159 #: builtin/checkout.c:193
3161 msgid "path '%s': cannot merge"
3164 #: builtin/checkout.c:210
3166 msgid "Unable to add merge result for '%s'"
3169 #: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237
3170 #: builtin/checkout.c:240
3172 msgid "'%s' cannot be used with updating paths"
3175 #: builtin/checkout.c:243 builtin/checkout.c:246
3177 msgid "'%s' cannot be used with %s"
3180 #: builtin/checkout.c:249
3182 msgid "Cannot update paths and switch to branch '%s' at the same time."
3185 #: builtin/checkout.c:260 builtin/checkout.c:449
3186 msgid "corrupt index file"
3189 #: builtin/checkout.c:320 builtin/checkout.c:327
3191 msgid "path '%s' is unmerged"
3194 #: builtin/checkout.c:471
3195 msgid "you need to resolve your current index first"
3198 #: builtin/checkout.c:591
3200 msgid "Can not do reflog for '%s'\n"
3203 #: builtin/checkout.c:629
3204 msgid "HEAD is now at"
3207 #: builtin/checkout.c:636
3209 msgid "Reset branch '%s'\n"
3212 #: builtin/checkout.c:639
3214 msgid "Already on '%s'\n"
3217 #: builtin/checkout.c:643
3219 msgid "Switched to and reset branch '%s'\n"
3222 #: builtin/checkout.c:645 builtin/checkout.c:1026
3224 msgid "Switched to a new branch '%s'\n"
3227 #: builtin/checkout.c:647
3229 msgid "Switched to branch '%s'\n"
3232 #: builtin/checkout.c:699
3234 msgid " ... and %d more.\n"
3237 #: builtin/checkout.c:705
3240 "Warning: you are leaving %d commit behind, not connected to\n"
3241 "any of your branches:\n"
3245 "Warning: you are leaving %d commits behind, not connected to\n"
3246 "any of your branches:\n"
3252 #: builtin/checkout.c:723
3255 "If you want to keep them by creating a new branch, this may be a good time\n"
3258 " git branch new_branch_name %s\n"
3262 #: builtin/checkout.c:753
3263 msgid "internal error in revision walk"
3266 #: builtin/checkout.c:757
3267 msgid "Previous HEAD position was"
3270 #: builtin/checkout.c:784 builtin/checkout.c:1021
3271 msgid "You are on a branch yet to be born"
3274 #: builtin/checkout.c:928
3276 msgid "only one reference expected, %d given."
3279 #: builtin/checkout.c:967
3281 msgid "invalid reference: %s"
3284 #: builtin/checkout.c:996
3286 msgid "reference is not a tree: %s"
3289 #: builtin/checkout.c:1035
3290 msgid "paths cannot be used with switching branches"
3293 #: builtin/checkout.c:1038 builtin/checkout.c:1042
3295 msgid "'%s' cannot be used with switching branches"
3298 #: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054
3299 #: builtin/checkout.c:1057
3301 msgid "'%s' cannot be used with '%s'"
3304 #: builtin/checkout.c:1062
3306 msgid "Cannot switch branch to a non-commit '%s'"
3309 #: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88
3310 #: builtin/remote.c:159 builtin/remote.c:161
3314 #: builtin/checkout.c:1085
3315 msgid "create and checkout a new branch"
3318 #: builtin/checkout.c:1087
3319 msgid "create/reset and checkout a branch"
3322 #: builtin/checkout.c:1088
3323 msgid "create reflog for new branch"
3326 #: builtin/checkout.c:1089
3327 msgid "detach the HEAD at named commit"
3330 #: builtin/checkout.c:1090
3331 msgid "set upstream info for new branch"
3334 #: builtin/checkout.c:1092
3338 #: builtin/checkout.c:1092
3339 msgid "new unparented branch"
3342 #: builtin/checkout.c:1093
3343 msgid "checkout our version for unmerged files"
3346 #: builtin/checkout.c:1095
3347 msgid "checkout their version for unmerged files"
3350 #: builtin/checkout.c:1097
3351 msgid "force checkout (throw away local modifications)"
3354 #: builtin/checkout.c:1098
3355 msgid "perform a 3-way merge with the new branch"
3358 #: builtin/checkout.c:1099 builtin/merge.c:225
3359 msgid "update ignored files (default)"
3362 #: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245
3366 #: builtin/checkout.c:1101
3367 msgid "conflict style (merge or diff3)"
3370 #: builtin/checkout.c:1104
3371 msgid "do not limit pathspecs to sparse entries only"
3374 #: builtin/checkout.c:1106
3375 msgid "second guess 'git checkout no-such-branch'"
3378 #: builtin/checkout.c:1129
3379 msgid "-b, -B and --orphan are mutually exclusive"
3382 #: builtin/checkout.c:1146
3383 msgid "--track needs a branch name"
3386 #: builtin/checkout.c:1153
3387 msgid "Missing branch name; try -b"
3390 #: builtin/checkout.c:1190
3391 msgid "invalid path specification"
3394 #: builtin/checkout.c:1197
3397 "Cannot update paths and switch to branch '%s' at the same time.\n"
3398 "Did you intend to checkout '%s' which can not be resolved as commit?"
3401 #: builtin/checkout.c:1202
3403 msgid "git checkout: --detach does not take a path argument '%s'"
3406 #: builtin/checkout.c:1206
3408 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3409 "checking out of the index."
3412 #: builtin/clean.c:26
3414 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3417 #: builtin/clean.c:30
3419 msgid "Removing %s\n"
3422 #: builtin/clean.c:31
3424 msgid "Would remove %s\n"
3427 #: builtin/clean.c:32
3429 msgid "Skipping repository %s\n"
3432 #: builtin/clean.c:33
3434 msgid "Would skip repository %s\n"
3437 #: builtin/clean.c:34
3439 msgid "failed to remove %s"
3442 #: builtin/clean.c:295
3445 "1 - select a numbered item\n"
3446 "foo - select item based on unique prefix\n"
3447 " - (empty) select nothing"
3450 #: builtin/clean.c:299
3453 "1 - select a single item\n"
3454 "3-5 - select a range of items\n"
3455 "2-3,6-9 - select multiple ranges\n"
3456 "foo - select item based on unique prefix\n"
3457 "-... - unselect specified items\n"
3458 "* - choose all items\n"
3459 " - (empty) finish selecting"
3462 #: builtin/clean.c:517
3467 #: builtin/clean.c:659
3469 msgid "Input ignore patterns>> "
3472 #: builtin/clean.c:696
3474 msgid "WARNING: Cannot find items matched by: %s"
3477 #: builtin/clean.c:717
3478 msgid "Select items to delete"
3481 #: builtin/clean.c:757
3486 #: builtin/clean.c:782
3490 #: builtin/clean.c:790
3492 "clean - start cleaning\n"
3493 "filter by pattern - exclude items from deletion\n"
3494 "select by numbers - select items to be deleted by numbers\n"
3495 "ask each - confirm each deletion (like \"rm -i\")\n"
3496 "quit - stop cleaning\n"
3497 "help - this screen\n"
3498 "? - help for prompt selection"
3501 #: builtin/clean.c:817
3502 msgid "*** Commands ***"
3505 #: builtin/clean.c:818
3509 #: builtin/clean.c:826
3510 msgid "Would remove the following item:"
3511 msgid_plural "Would remove the following items:"
3515 #: builtin/clean.c:843
3516 msgid "No more files to clean, exiting."
3519 #: builtin/clean.c:874
3520 msgid "do not print names of files removed"
3523 #: builtin/clean.c:876
3527 #: builtin/clean.c:877
3528 msgid "interactive cleaning"
3531 #: builtin/clean.c:879
3532 msgid "remove whole directories"
3535 #: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714
3536 #: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185
3540 #: builtin/clean.c:881
3541 msgid "add <pattern> to ignore rules"
3544 #: builtin/clean.c:882
3545 msgid "remove ignored files, too"
3548 #: builtin/clean.c:884
3549 msgid "remove only ignored files"
3552 #: builtin/clean.c:902
3553 msgid "-x and -X cannot be used together"
3556 #: builtin/clean.c:906
3558 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
3562 #: builtin/clean.c:909
3564 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
3568 #: builtin/clone.c:36
3569 msgid "git clone [options] [--] <repo> [<dir>]"
3572 #: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222
3573 #: builtin/push.c:503
3574 msgid "force progress reporting"
3577 #: builtin/clone.c:66
3578 msgid "don't create a checkout"
3581 #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486
3582 msgid "create a bare repository"
3585 #: builtin/clone.c:71
3586 msgid "create a mirror repository (implies bare)"
3589 #: builtin/clone.c:73
3590 msgid "to clone from a local repository"
3593 #: builtin/clone.c:75
3594 msgid "don't use local hardlinks, always copy"
3597 #: builtin/clone.c:77
3598 msgid "setup as shared repository"
3601 #: builtin/clone.c:79 builtin/clone.c:81
3602 msgid "initialize submodules in the clone"
3605 #: builtin/clone.c:82 builtin/init-db.c:483
3606 msgid "template-directory"
3609 #: builtin/clone.c:83 builtin/init-db.c:484
3610 msgid "directory from which templates will be used"
3613 #: builtin/clone.c:85
3614 msgid "reference repository"
3617 #: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
3621 #: builtin/clone.c:87
3622 msgid "use <name> instead of 'origin' to track upstream"
3625 #: builtin/clone.c:89
3626 msgid "checkout <branch> instead of the remote's HEAD"
3629 #: builtin/clone.c:91
3630 msgid "path to git-upload-pack on the remote"
3633 #: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659
3637 #: builtin/clone.c:93
3638 msgid "create a shallow clone of that depth"
3641 #: builtin/clone.c:95
3642 msgid "clone only one branch, HEAD or --branch"
3645 #: builtin/clone.c:96 builtin/init-db.c:492
3649 #: builtin/clone.c:97 builtin/init-db.c:493
3650 msgid "separate git dir from working tree"
3653 #: builtin/clone.c:98
3657 #: builtin/clone.c:99
3658 msgid "set config inside the new repository"
3661 #: builtin/clone.c:252
3663 msgid "reference repository '%s' is not a local repository."
3666 #: builtin/clone.c:256
3668 msgid "reference repository '%s' is shallow"
3671 #: builtin/clone.c:259
3673 msgid "reference repository '%s' is grafted"
3676 #: builtin/clone.c:321
3678 msgid "failed to create directory '%s'"
3681 #: builtin/clone.c:323 builtin/diff.c:83
3683 msgid "failed to stat '%s'"
3686 #: builtin/clone.c:325
3688 msgid "%s exists and is not a directory"
3691 #: builtin/clone.c:339
3693 msgid "failed to stat %s\n"
3696 #: builtin/clone.c:361
3698 msgid "failed to create link '%s'"
3701 #: builtin/clone.c:365
3703 msgid "failed to copy file to '%s'"
3706 #: builtin/clone.c:388 builtin/clone.c:565
3711 #: builtin/clone.c:401
3713 "Clone succeeded, but checkout failed.\n"
3714 "You can inspect what was checked out with 'git status'\n"
3715 "and retry the checkout with 'git checkout -f HEAD'\n"
3718 #: builtin/clone.c:480
3720 msgid "Could not find remote branch %s to clone."
3723 #: builtin/clone.c:560
3725 msgid "Checking connectivity... "
3728 #: builtin/clone.c:563
3729 msgid "remote did not send all necessary objects"
3732 #: builtin/clone.c:627
3733 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3736 #: builtin/clone.c:658
3737 msgid "unable to checkout working tree"
3740 #: builtin/clone.c:768
3741 msgid "Too many arguments."
3744 #: builtin/clone.c:772
3745 msgid "You must specify a repository to clone."
3748 #: builtin/clone.c:783
3750 msgid "--bare and --origin %s options are incompatible."
3753 #: builtin/clone.c:786
3754 msgid "--bare and --separate-git-dir are incompatible."
3757 #: builtin/clone.c:799
3759 msgid "repository '%s' does not exist"
3762 #: builtin/clone.c:805 builtin/fetch.c:1143
3764 msgid "depth %s is not a positive number"
3767 #: builtin/clone.c:815
3769 msgid "destination path '%s' already exists and is not an empty directory."
3772 #: builtin/clone.c:825
3774 msgid "working tree '%s' already exists."
3777 #: builtin/clone.c:838 builtin/clone.c:850
3779 msgid "could not create leading directories of '%s'"
3782 #: builtin/clone.c:841
3784 msgid "could not create work tree dir '%s'."
3787 #: builtin/clone.c:860
3789 msgid "Cloning into bare repository '%s'...\n"
3792 #: builtin/clone.c:862
3794 msgid "Cloning into '%s'...\n"
3797 #: builtin/clone.c:898
3798 msgid "--depth is ignored in local clones; use file:// instead."
3801 #: builtin/clone.c:901
3802 msgid "source repository is shallow, ignoring --local"
3805 #: builtin/clone.c:906
3806 msgid "--local is ignored"
3809 #: builtin/clone.c:910
3811 msgid "Don't know how to clone %s"
3814 #: builtin/clone.c:961 builtin/clone.c:969
3816 msgid "Remote branch %s not found in upstream %s"
3819 #: builtin/clone.c:972
3820 msgid "You appear to have cloned an empty repository."
3823 #: builtin/column.c:9
3824 msgid "git column [options]"
3827 #: builtin/column.c:26
3828 msgid "lookup config vars"
3831 #: builtin/column.c:27 builtin/column.c:28
3832 msgid "layout to use"
3835 #: builtin/column.c:29
3836 msgid "Maximum width"
3839 #: builtin/column.c:30
3840 msgid "Padding space on left border"
3843 #: builtin/column.c:31
3844 msgid "Padding space on right border"
3847 #: builtin/column.c:32
3848 msgid "Padding space between columns"
3851 #: builtin/column.c:51
3852 msgid "--command must be the first argument"
3855 #: builtin/commit.c:36
3856 msgid "git commit [options] [--] <pathspec>..."
3859 #: builtin/commit.c:41
3860 msgid "git status [options] [--] <pathspec>..."
3863 #: builtin/commit.c:46
3865 "Your name and email address were configured automatically based\n"
3866 "on your username and hostname. Please check that they are accurate.\n"
3867 "You can suppress this message by setting them explicitly:\n"
3869 " git config --global user.name \"Your Name\"\n"
3870 " git config --global user.email you@example.com\n"
3872 "After doing this, you may fix the identity used for this commit with:\n"
3874 " git commit --amend --reset-author\n"
3877 #: builtin/commit.c:58
3879 "You asked to amend the most recent commit, but doing so would make\n"
3880 "it empty. You can repeat your command with --allow-empty, or you can\n"
3881 "remove the commit entirely with \"git reset HEAD^\".\n"
3884 #: builtin/commit.c:63
3886 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3887 "If you wish to commit it anyway, use:\n"
3889 " git commit --allow-empty\n"
3893 #: builtin/commit.c:70
3894 msgid "Otherwise, please use 'git reset'\n"
3897 #: builtin/commit.c:73
3899 "If you wish to skip this commit, use:\n"
3903 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
3904 "the remaining commits.\n"
3907 #: builtin/commit.c:288
3908 msgid "failed to unpack HEAD tree object"
3911 #: builtin/commit.c:328
3912 msgid "unable to create temporary index"
3915 #: builtin/commit.c:334
3916 msgid "interactive add failed"
3919 #: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435
3920 msgid "unable to write new_index file"
3923 #: builtin/commit.c:418
3924 msgid "cannot do a partial commit during a merge."
3927 #: builtin/commit.c:420
3928 msgid "cannot do a partial commit during a cherry-pick."
3931 #: builtin/commit.c:429
3932 msgid "cannot read the index"
3935 #: builtin/commit.c:447
3936 msgid "unable to write temporary index file"
3939 #: builtin/commit.c:557 builtin/commit.c:563
3941 msgid "invalid commit: %s"
3944 #: builtin/commit.c:585
3945 msgid "malformed --author parameter"
3948 #: builtin/commit.c:592
3950 msgid "invalid date format: %s"
3953 #: builtin/commit.c:609
3955 msgid "Malformed ident string: '%s'"
3958 #: builtin/commit.c:642
3960 "unable to select a comment character that is not used\n"
3961 "in the current commit message"
3964 #: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086
3966 msgid "could not lookup commit %s"
3969 #: builtin/commit.c:691 builtin/shortlog.c:273
3971 msgid "(reading log message from standard input)\n"
3974 #: builtin/commit.c:693
3975 msgid "could not read log from standard input"
3978 #: builtin/commit.c:697
3980 msgid "could not read log file '%s'"
3983 #: builtin/commit.c:719
3984 msgid "could not read MERGE_MSG"
3987 #: builtin/commit.c:723
3988 msgid "could not read SQUASH_MSG"
3991 #: builtin/commit.c:727
3993 msgid "could not read '%s'"
3996 #: builtin/commit.c:798
3997 msgid "could not write commit template"
4000 #: builtin/commit.c:816
4004 "It looks like you may be committing a merge.\n"
4005 "If this is not correct, please remove the file\n"
4010 #: builtin/commit.c:821
4014 "It looks like you may be committing a cherry-pick.\n"
4015 "If this is not correct, please remove the file\n"
4020 #: builtin/commit.c:834
4023 "Please enter the commit message for your changes. Lines starting\n"
4024 "with '%c' will be ignored, and an empty message aborts the commit.\n"
4027 #: builtin/commit.c:841
4030 "Please enter the commit message for your changes. Lines starting\n"
4031 "with '%c' will be kept; you may remove them yourself if you want to.\n"
4032 "An empty message aborts the commit.\n"
4035 #: builtin/commit.c:855
4037 msgid "%sAuthor: %.*s <%.*s>"
4040 #: builtin/commit.c:863
4045 #: builtin/commit.c:870
4047 msgid "%sCommitter: %.*s <%.*s>"
4050 #: builtin/commit.c:888
4051 msgid "Cannot read index"
4054 #: builtin/commit.c:945
4055 msgid "Error building trees"
4058 #: builtin/commit.c:960 builtin/tag.c:495
4060 msgid "Please supply the message using either -m or -F option.\n"
4063 #: builtin/commit.c:1061
4065 msgid "No existing author found with '%s'"
4068 #: builtin/commit.c:1076 builtin/commit.c:1316
4070 msgid "Invalid untracked files mode '%s'"
4073 #: builtin/commit.c:1113
4074 msgid "--long and -z are incompatible"
4077 #: builtin/commit.c:1143
4078 msgid "Using both --reset-author and --author does not make sense"
4081 #: builtin/commit.c:1152
4082 msgid "You have nothing to amend."
4085 #: builtin/commit.c:1155
4086 msgid "You are in the middle of a merge -- cannot amend."
4089 #: builtin/commit.c:1157
4090 msgid "You are in the middle of a cherry-pick -- cannot amend."
4093 #: builtin/commit.c:1160
4094 msgid "Options --squash and --fixup cannot be used together"
4097 #: builtin/commit.c:1170
4098 msgid "Only one of -c/-C/-F/--fixup can be used."
4101 #: builtin/commit.c:1172
4102 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4105 #: builtin/commit.c:1180
4106 msgid "--reset-author can be used only with -C, -c or --amend."
4109 #: builtin/commit.c:1197
4110 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4113 #: builtin/commit.c:1199
4114 msgid "No paths with --include/--only does not make sense."
4117 #: builtin/commit.c:1201
4118 msgid "Clever... amending the last one with dirty index."
4121 #: builtin/commit.c:1203
4122 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4125 #: builtin/commit.c:1215 builtin/tag.c:727
4127 msgid "Invalid cleanup mode %s"
4130 #: builtin/commit.c:1220
4131 msgid "Paths with -a does not make sense."
4134 #: builtin/commit.c:1330 builtin/commit.c:1595
4135 msgid "show status concisely"
4138 #: builtin/commit.c:1332 builtin/commit.c:1597
4139 msgid "show branch information"
4142 #: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489
4143 msgid "machine-readable output"
4146 #: builtin/commit.c:1337 builtin/commit.c:1601
4147 msgid "show status in long format (default)"
4150 #: builtin/commit.c:1340 builtin/commit.c:1604
4151 msgid "terminate entries with NUL"
4154 #: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703
4155 #: builtin/fast-export.c:706 builtin/tag.c:602
4159 #: builtin/commit.c:1343 builtin/commit.c:1607
4160 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4163 #: builtin/commit.c:1346
4164 msgid "show ignored files"
4167 #: builtin/commit.c:1347 parse-options.h:153
4171 #: builtin/commit.c:1348
4173 "ignore changes to submodules, optional when: all, dirty, untracked. "
4177 #: builtin/commit.c:1350
4178 msgid "list untracked files in columns"
4181 #: builtin/commit.c:1419
4182 msgid "couldn't look up newly created commit"
4185 #: builtin/commit.c:1421
4186 msgid "could not parse newly created commit"
4189 #: builtin/commit.c:1469
4190 msgid "detached HEAD"
4193 #: builtin/commit.c:1471
4194 msgid " (root-commit)"
4197 #: builtin/commit.c:1565
4198 msgid "suppress summary after successful commit"
4201 #: builtin/commit.c:1566
4202 msgid "show diff in commit message template"
4205 #: builtin/commit.c:1568
4206 msgid "Commit message options"
4209 #: builtin/commit.c:1569 builtin/tag.c:600
4210 msgid "read message from file"
4213 #: builtin/commit.c:1570
4217 #: builtin/commit.c:1570
4218 msgid "override author for commit"
4221 #: builtin/commit.c:1571 builtin/gc.c:286
4225 #: builtin/commit.c:1571
4226 msgid "override date for commit"
4229 #: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409
4230 #: builtin/notes.c:566 builtin/tag.c:598
4234 #: builtin/commit.c:1572
4235 msgid "commit message"
4238 #: builtin/commit.c:1573
4239 msgid "reuse and edit message from specified commit"
4242 #: builtin/commit.c:1574
4243 msgid "reuse message from specified commit"
4246 #: builtin/commit.c:1575
4247 msgid "use autosquash formatted message to fixup specified commit"
4250 #: builtin/commit.c:1576
4251 msgid "use autosquash formatted message to squash specified commit"
4254 #: builtin/commit.c:1577
4255 msgid "the commit is authored by me now (used with -C/-c/--amend)"
4258 #: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86
4259 msgid "add Signed-off-by:"
4262 #: builtin/commit.c:1579
4263 msgid "use specified template file"
4266 #: builtin/commit.c:1580
4267 msgid "force edit of commit"
4270 #: builtin/commit.c:1581
4274 #: builtin/commit.c:1581 builtin/tag.c:603
4275 msgid "how to strip spaces and #comments from message"
4278 #: builtin/commit.c:1582
4279 msgid "include status in commit message template"
4282 #: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92
4283 #: builtin/tag.c:604
4287 #: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93
4288 msgid "GPG sign commit"
4291 #: builtin/commit.c:1587
4292 msgid "Commit contents options"
4295 #: builtin/commit.c:1588
4296 msgid "commit all changed files"
4299 #: builtin/commit.c:1589
4300 msgid "add specified files to index for commit"
4303 #: builtin/commit.c:1590
4304 msgid "interactively add files"
4307 #: builtin/commit.c:1591
4308 msgid "interactively add changes"
4311 #: builtin/commit.c:1592
4312 msgid "commit only specified files"
4315 #: builtin/commit.c:1593
4316 msgid "bypass pre-commit hook"
4319 #: builtin/commit.c:1594
4320 msgid "show what would be committed"
4323 #: builtin/commit.c:1605
4324 msgid "amend previous commit"
4327 #: builtin/commit.c:1606
4328 msgid "bypass post-rewrite hook"
4331 #: builtin/commit.c:1611
4332 msgid "ok to record an empty change"
4335 #: builtin/commit.c:1613
4336 msgid "ok to record a change with an empty message"
4339 #: builtin/commit.c:1641
4340 msgid "could not parse HEAD commit"
4343 #: builtin/commit.c:1680 builtin/merge.c:518
4345 msgid "could not open '%s' for reading"
4348 #: builtin/commit.c:1687
4350 msgid "Corrupt MERGE_HEAD file (%s)"
4353 #: builtin/commit.c:1694
4354 msgid "could not read MERGE_MODE"
4357 #: builtin/commit.c:1713
4359 msgid "could not read commit message: %s"
4362 #: builtin/commit.c:1724
4364 msgid "Aborting commit; you did not edit the message.\n"
4367 #: builtin/commit.c:1729
4369 msgid "Aborting commit due to empty commit message.\n"
4372 #: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876
4373 msgid "failed to write commit object"
4376 #: builtin/commit.c:1756
4377 msgid "cannot lock HEAD ref"
4380 #: builtin/commit.c:1769
4381 msgid "cannot update HEAD ref"
4384 #: builtin/commit.c:1780
4386 "Repository has been updated, but unable to write\n"
4387 "new_index file. Check that disk is not full or quota is\n"
4388 "not exceeded, and then \"git reset HEAD\" to recover."
4391 #: builtin/config.c:8
4392 msgid "git config [options]"
4395 #: builtin/config.c:53
4396 msgid "Config file location"
4399 #: builtin/config.c:54
4400 msgid "use global config file"
4403 #: builtin/config.c:55
4404 msgid "use system config file"
4407 #: builtin/config.c:56
4408 msgid "use repository config file"
4411 #: builtin/config.c:57
4412 msgid "use given config file"
4415 #: builtin/config.c:58
4419 #: builtin/config.c:58
4420 msgid "read config from given blob object"
4423 #: builtin/config.c:59
4427 #: builtin/config.c:60
4428 msgid "get value: name [value-regex]"
4431 #: builtin/config.c:61
4432 msgid "get all values: key [value-regex]"
4435 #: builtin/config.c:62
4436 msgid "get values for regexp: name-regex [value-regex]"
4439 #: builtin/config.c:63
4440 msgid "get value specific for the URL: section[.var] URL"
4443 #: builtin/config.c:64
4444 msgid "replace all matching variables: name value [value_regex]"
4447 #: builtin/config.c:65
4448 msgid "add a new variable: name value"
4451 #: builtin/config.c:66
4452 msgid "remove a variable: name [value-regex]"
4455 #: builtin/config.c:67
4456 msgid "remove all matches: name [value-regex]"
4459 #: builtin/config.c:68
4460 msgid "rename section: old-name new-name"
4463 #: builtin/config.c:69
4464 msgid "remove a section: name"
4467 #: builtin/config.c:70
4471 #: builtin/config.c:71
4472 msgid "open an editor"
4475 #: builtin/config.c:72 builtin/config.c:73
4479 #: builtin/config.c:72
4480 msgid "find the color configured: [default]"
4483 #: builtin/config.c:73
4484 msgid "find the color setting: [stdout-is-tty]"
4487 #: builtin/config.c:74
4491 #: builtin/config.c:75
4492 msgid "value is \"true\" or \"false\""
4495 #: builtin/config.c:76
4496 msgid "value is decimal number"
4499 #: builtin/config.c:77
4500 msgid "value is --bool or --int"
4503 #: builtin/config.c:78
4504 msgid "value is a path (file or directory name)"
4507 #: builtin/config.c:79
4511 #: builtin/config.c:80
4512 msgid "terminate values with NUL byte"
4515 #: builtin/config.c:81
4516 msgid "respect include directives on lookup"
4519 #: builtin/count-objects.c:82
4520 msgid "git count-objects [-v] [-H | --human-readable]"
4523 #: builtin/count-objects.c:97
4524 msgid "print sizes in human readable format"
4527 #: builtin/describe.c:16
4528 msgid "git describe [options] <commit-ish>*"
4531 #: builtin/describe.c:17
4532 msgid "git describe [options] --dirty"
4535 #: builtin/describe.c:216
4537 msgid "annotated tag %s not available"
4540 #: builtin/describe.c:220
4542 msgid "annotated tag %s has no embedded name"
4545 #: builtin/describe.c:222
4547 msgid "tag '%s' is really '%s' here"
4550 #: builtin/describe.c:249
4552 msgid "Not a valid object name %s"
4555 #: builtin/describe.c:252
4557 msgid "%s is not a valid '%s' object"
4560 #: builtin/describe.c:269
4562 msgid "no tag exactly matches '%s'"
4565 #: builtin/describe.c:271
4567 msgid "searching to describe %s\n"
4570 #: builtin/describe.c:318
4572 msgid "finished search at %s\n"
4575 #: builtin/describe.c:345
4578 "No annotated tags can describe '%s'.\n"
4579 "However, there were unannotated tags: try --tags."
4582 #: builtin/describe.c:349
4585 "No tags can describe '%s'.\n"
4586 "Try --always, or create some tags."
4589 #: builtin/describe.c:370
4591 msgid "traversed %lu commits\n"
4594 #: builtin/describe.c:373
4597 "more than %i tags found; listed %i most recent\n"
4598 "gave up search at %s\n"
4601 #: builtin/describe.c:395
4602 msgid "find the tag that comes after the commit"
4605 #: builtin/describe.c:396
4606 msgid "debug search strategy on stderr"
4609 #: builtin/describe.c:397
4613 #: builtin/describe.c:398
4614 msgid "use any tag, even unannotated"
4617 #: builtin/describe.c:399
4618 msgid "always use long format"
4621 #: builtin/describe.c:400
4622 msgid "only follow first parent"
4625 #: builtin/describe.c:403
4626 msgid "only output exact matches"
4629 #: builtin/describe.c:405
4630 msgid "consider <n> most recent tags (default: 10)"
4633 #: builtin/describe.c:407
4634 msgid "only consider tags matching <pattern>"
4637 #: builtin/describe.c:409 builtin/name-rev.c:318
4638 msgid "show abbreviated commit object as fallback"
4641 #: builtin/describe.c:410
4645 #: builtin/describe.c:411
4646 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4649 #: builtin/describe.c:429
4650 msgid "--long is incompatible with --abbrev=0"
4653 #: builtin/describe.c:455
4654 msgid "No names found, cannot describe anything."
4657 #: builtin/describe.c:475
4658 msgid "--dirty is incompatible with commit-ishes"
4661 #: builtin/diff.c:85
4663 msgid "'%s': not a regular file or symlink"
4666 #: builtin/diff.c:236
4668 msgid "invalid option: %s"
4671 #: builtin/diff.c:357
4672 msgid "Not a git repository"
4675 #: builtin/diff.c:400
4677 msgid "invalid object '%s' given."
4680 #: builtin/diff.c:409
4682 msgid "more than two blobs given: '%s'"
4685 #: builtin/diff.c:416
4687 msgid "unhandled object '%s' given."
4690 #: builtin/fast-export.c:23
4691 msgid "git fast-export [rev-list-opts]"
4694 #: builtin/fast-export.c:702
4695 msgid "show progress after <n> objects"
4698 #: builtin/fast-export.c:704
4699 msgid "select handling of signed tags"
4702 #: builtin/fast-export.c:707
4703 msgid "select handling of tags that tag filtered objects"
4706 #: builtin/fast-export.c:710
4707 msgid "Dump marks to this file"
4710 #: builtin/fast-export.c:712
4711 msgid "Import marks from this file"
4714 #: builtin/fast-export.c:714
4715 msgid "Fake a tagger when tags lack one"
4718 #: builtin/fast-export.c:716
4719 msgid "Output full tree for each commit"
4722 #: builtin/fast-export.c:718
4723 msgid "Use the done feature to terminate the stream"
4726 #: builtin/fast-export.c:719
4727 msgid "Skip output of blob data"
4730 #: builtin/fast-export.c:720
4734 #: builtin/fast-export.c:721
4735 msgid "Apply refspec to exported refs"
4738 #: builtin/fetch.c:20
4739 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4742 #: builtin/fetch.c:21
4743 msgid "git fetch [<options>] <group>"
4746 #: builtin/fetch.c:22
4747 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4750 #: builtin/fetch.c:23
4751 msgid "git fetch --all [<options>]"
4754 #: builtin/fetch.c:90
4755 msgid "fetch from all remotes"
4758 #: builtin/fetch.c:92
4759 msgid "append to .git/FETCH_HEAD instead of overwriting"
4762 #: builtin/fetch.c:94
4763 msgid "path to upload pack on remote end"
4766 #: builtin/fetch.c:95
4767 msgid "force overwrite of local branch"
4770 #: builtin/fetch.c:97
4771 msgid "fetch from multiple remotes"
4774 #: builtin/fetch.c:99
4775 msgid "fetch all tags and associated objects"
4778 #: builtin/fetch.c:101
4779 msgid "do not fetch all tags (--no-tags)"
4782 #: builtin/fetch.c:103
4783 msgid "prune remote-tracking branches no longer on remote"
4786 #: builtin/fetch.c:104
4790 #: builtin/fetch.c:105
4791 msgid "control recursive fetching of submodules"
4794 #: builtin/fetch.c:109
4795 msgid "keep downloaded pack"
4798 #: builtin/fetch.c:111
4799 msgid "allow updating of HEAD ref"
4802 #: builtin/fetch.c:114
4803 msgid "deepen history of shallow clone"
4806 #: builtin/fetch.c:116
4807 msgid "convert to a complete repository"
4810 #: builtin/fetch.c:118 builtin/log.c:1205
4814 #: builtin/fetch.c:119
4815 msgid "prepend this to submodule path output"
4818 #: builtin/fetch.c:122
4819 msgid "default mode for recursion"
4822 #: builtin/fetch.c:124
4823 msgid "accept refs that update .git/shallow"
4826 #: builtin/fetch.c:125
4830 #: builtin/fetch.c:126
4831 msgid "specify fetch refmap"
4834 #: builtin/fetch.c:376
4835 msgid "Couldn't find remote ref HEAD"
4838 #: builtin/fetch.c:440
4840 msgid "object %s not found"
4843 #: builtin/fetch.c:445
4844 msgid "[up to date]"
4847 #: builtin/fetch.c:459
4849 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4852 #: builtin/fetch.c:460 builtin/fetch.c:546
4856 #: builtin/fetch.c:471
4857 msgid "[tag update]"
4860 #: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526
4861 msgid " (unable to update local ref)"
4864 #: builtin/fetch.c:491
4868 #: builtin/fetch.c:494
4869 msgid "[new branch]"
4872 #: builtin/fetch.c:497
4876 #: builtin/fetch.c:542
4877 msgid "unable to update local ref"
4880 #: builtin/fetch.c:542
4881 msgid "forced update"
4884 #: builtin/fetch.c:548
4885 msgid "(non-fast-forward)"
4888 #: builtin/fetch.c:581 builtin/fetch.c:814
4890 msgid "cannot open %s: %s\n"
4893 #: builtin/fetch.c:590
4895 msgid "%s did not send all necessary objects\n"
4898 #: builtin/fetch.c:608
4900 msgid "reject %s because shallow roots are not allowed to be updated"
4903 #: builtin/fetch.c:696 builtin/fetch.c:779
4908 #: builtin/fetch.c:707
4911 "some local refs could not be updated; try running\n"
4912 " 'git remote prune %s' to remove any old, conflicting branches"
4915 #: builtin/fetch.c:759
4917 msgid " (%s will become dangling)"
4920 #: builtin/fetch.c:760
4922 msgid " (%s has become dangling)"
4925 #: builtin/fetch.c:784
4929 #: builtin/fetch.c:785 builtin/remote.c:1059
4933 #: builtin/fetch.c:804
4935 msgid "Refusing to fetch into current branch %s of non-bare repository"
4938 #: builtin/fetch.c:823
4940 msgid "Option \"%s\" value \"%s\" is not valid for %s"
4943 #: builtin/fetch.c:826
4945 msgid "Option \"%s\" is ignored for %s\n"
4948 #: builtin/fetch.c:882
4950 msgid "Don't know how to fetch from %s"
4953 #: builtin/fetch.c:1044
4955 msgid "Fetching %s\n"
4958 #: builtin/fetch.c:1046 builtin/remote.c:90
4960 msgid "Could not fetch %s"
4963 #: builtin/fetch.c:1064
4965 "No remote repository specified. Please, specify either a URL or a\n"
4966 "remote name from which new revisions should be fetched."
4969 #: builtin/fetch.c:1087
4970 msgid "You need to specify a tag name."
4973 #: builtin/fetch.c:1131
4974 msgid "--depth and --unshallow cannot be used together"
4977 #: builtin/fetch.c:1133
4978 msgid "--unshallow on a complete repository does not make sense"
4981 #: builtin/fetch.c:1156
4982 msgid "fetch --all does not take a repository argument"
4985 #: builtin/fetch.c:1158
4986 msgid "fetch --all does not make sense with refspecs"
4989 #: builtin/fetch.c:1169
4991 msgid "No such remote or remote group: %s"
4994 #: builtin/fetch.c:1177
4995 msgid "Fetching a group and specifying refspecs does not make sense"
4998 #: builtin/fmt-merge-msg.c:13
4999 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5002 #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698
5003 #: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183
5004 #: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589
5005 #: parse-options.h:132 parse-options.h:239
5009 #: builtin/fmt-merge-msg.c:664
5010 msgid "populate log with at most <n> entries from shortlog"
5013 #: builtin/fmt-merge-msg.c:667
5014 msgid "alias for --log (deprecated)"
5017 #: builtin/fmt-merge-msg.c:670
5021 #: builtin/fmt-merge-msg.c:671
5022 msgid "use <text> as start of message"
5025 #: builtin/fmt-merge-msg.c:672
5026 msgid "file to read from"
5029 #: builtin/for-each-ref.c:1051
5030 msgid "git for-each-ref [options] [<pattern>]"
5033 #: builtin/for-each-ref.c:1066
5034 msgid "quote placeholders suitably for shells"
5037 #: builtin/for-each-ref.c:1068
5038 msgid "quote placeholders suitably for perl"
5041 #: builtin/for-each-ref.c:1070
5042 msgid "quote placeholders suitably for python"
5045 #: builtin/for-each-ref.c:1072
5046 msgid "quote placeholders suitably for tcl"
5049 #: builtin/for-each-ref.c:1075
5050 msgid "show only <n> matched refs"
5053 #: builtin/for-each-ref.c:1076 builtin/replace.c:435
5057 #: builtin/for-each-ref.c:1076
5058 msgid "format to use for the output"
5061 #: builtin/for-each-ref.c:1077
5065 #: builtin/for-each-ref.c:1078
5066 msgid "field name to sort on"
5069 #: builtin/fsck.c:147 builtin/prune.c:172
5070 msgid "Checking connectivity"
5073 #: builtin/fsck.c:538
5074 msgid "Checking object directories"
5077 #: builtin/fsck.c:601
5078 msgid "git fsck [options] [<object>...]"
5081 #: builtin/fsck.c:607
5082 msgid "show unreachable objects"
5085 #: builtin/fsck.c:608
5086 msgid "show dangling objects"
5089 #: builtin/fsck.c:609
5093 #: builtin/fsck.c:610
5094 msgid "report root nodes"
5097 #: builtin/fsck.c:611
5098 msgid "make index objects head nodes"
5101 #: builtin/fsck.c:612
5102 msgid "make reflogs head nodes (default)"
5105 #: builtin/fsck.c:613
5106 msgid "also consider packs and alternate objects"
5109 #: builtin/fsck.c:614
5110 msgid "enable more strict checking"
5113 #: builtin/fsck.c:616
5114 msgid "write dangling objects in .git/lost-found"
5117 #: builtin/fsck.c:617 builtin/prune.c:144
5118 msgid "show progress"
5121 #: builtin/fsck.c:667
5122 msgid "Checking objects"
5126 msgid "git gc [options]"
5131 msgid "Invalid %s: '%s'"
5136 msgid "insanely long object directory %.*s"
5140 msgid "prune unreferenced objects"
5144 msgid "be more thorough (increased runtime)"
5148 msgid "enable auto-gc mode"
5152 msgid "force running gc even if there may be another gc running"
5157 msgid "Auto packing the repository in background for optimum performance.\n"
5162 msgid "Auto packing the repository for optimum performance.\n"
5167 msgid "See \"git help gc\" for manual housekeeping.\n"
5173 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5178 "There are too many unreachable loose objects; run 'git prune' to remove them."
5181 #: builtin/grep.c:23
5182 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
5185 #: builtin/grep.c:218
5187 msgid "grep: failed to create thread: %s"
5190 #: builtin/grep.c:441 builtin/grep.c:476
5192 msgid "unable to read tree (%s)"
5195 #: builtin/grep.c:491
5197 msgid "unable to grep from object of type %s"
5200 #: builtin/grep.c:547
5202 msgid "switch `%c' expects a numerical value"
5205 #: builtin/grep.c:564
5207 msgid "cannot open '%s'"
5210 #: builtin/grep.c:638
5211 msgid "search in index instead of in the work tree"
5214 #: builtin/grep.c:640
5215 msgid "find in contents not managed by git"
5218 #: builtin/grep.c:642
5219 msgid "search in both tracked and untracked files"
5222 #: builtin/grep.c:644
5223 msgid "search also in ignored files"
5226 #: builtin/grep.c:647
5227 msgid "show non-matching lines"
5230 #: builtin/grep.c:649
5231 msgid "case insensitive matching"
5234 #: builtin/grep.c:651
5235 msgid "match patterns only at word boundaries"
5238 #: builtin/grep.c:653
5239 msgid "process binary files as text"
5242 #: builtin/grep.c:655
5243 msgid "don't match patterns in binary files"
5246 #: builtin/grep.c:658
5247 msgid "process binary files with textconv filters"
5250 #: builtin/grep.c:660
5251 msgid "descend at most <depth> levels"
5254 #: builtin/grep.c:664
5255 msgid "use extended POSIX regular expressions"
5258 #: builtin/grep.c:667
5259 msgid "use basic POSIX regular expressions (default)"
5262 #: builtin/grep.c:670
5263 msgid "interpret patterns as fixed strings"
5266 #: builtin/grep.c:673
5267 msgid "use Perl-compatible regular expressions"
5270 #: builtin/grep.c:676
5271 msgid "show line numbers"
5274 #: builtin/grep.c:677
5275 msgid "don't show filenames"
5278 #: builtin/grep.c:678
5279 msgid "show filenames"
5282 #: builtin/grep.c:680
5283 msgid "show filenames relative to top directory"
5286 #: builtin/grep.c:682
5287 msgid "show only filenames instead of matching lines"
5290 #: builtin/grep.c:684
5291 msgid "synonym for --files-with-matches"
5294 #: builtin/grep.c:687
5295 msgid "show only the names of files without match"
5298 #: builtin/grep.c:689
5299 msgid "print NUL after filenames"
5302 #: builtin/grep.c:691
5303 msgid "show the number of matches instead of matching lines"
5306 #: builtin/grep.c:692
5307 msgid "highlight matches"
5310 #: builtin/grep.c:694
5311 msgid "print empty line between matches from different files"
5314 #: builtin/grep.c:696
5315 msgid "show filename only once above matches from same file"
5318 #: builtin/grep.c:699
5319 msgid "show <n> context lines before and after matches"
5322 #: builtin/grep.c:702
5323 msgid "show <n> context lines before matches"
5326 #: builtin/grep.c:704
5327 msgid "show <n> context lines after matches"
5330 #: builtin/grep.c:705
5331 msgid "shortcut for -C NUM"
5334 #: builtin/grep.c:708
5335 msgid "show a line with the function name before matches"
5338 #: builtin/grep.c:710
5339 msgid "show the surrounding function"
5342 #: builtin/grep.c:713
5343 msgid "read patterns from file"
5346 #: builtin/grep.c:715
5347 msgid "match <pattern>"
5350 #: builtin/grep.c:717
5351 msgid "combine patterns specified with -e"
5354 #: builtin/grep.c:729
5355 msgid "indicate hit with exit status without output"
5358 #: builtin/grep.c:731
5359 msgid "show only matches from files that match all patterns"
5362 #: builtin/grep.c:733
5363 msgid "show parse tree for grep expression"
5366 #: builtin/grep.c:737
5370 #: builtin/grep.c:737
5371 msgid "show matching files in the pager"
5374 #: builtin/grep.c:740
5375 msgid "allow calling of grep(1) (ignored by this build)"
5378 #: builtin/grep.c:741 builtin/show-ref.c:187
5382 #: builtin/grep.c:808
5383 msgid "no pattern given."
5386 #: builtin/grep.c:866
5387 msgid "--open-files-in-pager only works on the worktree"
5390 #: builtin/grep.c:892
5391 msgid "--cached or --untracked cannot be used with --no-index."
5394 #: builtin/grep.c:897
5395 msgid "--no-index or --untracked cannot be used with revs."
5398 #: builtin/grep.c:900
5399 msgid "--[no-]exclude-standard cannot be used for tracked contents."
5402 #: builtin/grep.c:908
5403 msgid "both --cached and trees are given."
5406 #: builtin/hash-object.c:60
5408 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5412 #: builtin/hash-object.c:61
5413 msgid "git hash-object --stdin-paths < <list-of-paths>"
5416 #: builtin/hash-object.c:72 builtin/tag.c:609
5420 #: builtin/hash-object.c:72
5424 #: builtin/hash-object.c:73
5425 msgid "write the object into the object database"
5428 #: builtin/hash-object.c:74
5429 msgid "read the object from stdin"
5432 #: builtin/hash-object.c:76
5433 msgid "store file as is without filters"
5436 #: builtin/hash-object.c:77
5437 msgid "process file as it were from this path"
5440 #: builtin/help.c:41
5441 msgid "print all available commands"
5444 #: builtin/help.c:42
5445 msgid "print list of useful guides"
5448 #: builtin/help.c:43
5449 msgid "show man page"
5452 #: builtin/help.c:44
5453 msgid "show manual in web browser"
5456 #: builtin/help.c:46
5457 msgid "show info page"
5460 #: builtin/help.c:52
5461 msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5464 #: builtin/help.c:64
5466 msgid "unrecognized help format '%s'"
5469 #: builtin/help.c:92
5470 msgid "Failed to start emacsclient."
5473 #: builtin/help.c:105
5474 msgid "Failed to parse emacsclient version."
5477 #: builtin/help.c:113
5479 msgid "emacsclient version '%d' too old (< 22)."
5482 #: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
5484 msgid "failed to exec '%s': %s"
5487 #: builtin/help.c:216
5490 "'%s': path for unsupported man viewer.\n"
5491 "Please consider using 'man.<tool>.cmd' instead."
5494 #: builtin/help.c:228
5497 "'%s': cmd for supported man viewer.\n"
5498 "Please consider using 'man.<tool>.path' instead."
5501 #: builtin/help.c:353
5503 msgid "'%s': unknown man viewer."
5506 #: builtin/help.c:370
5507 msgid "no man viewer handled the request"
5510 #: builtin/help.c:378
5511 msgid "no info viewer handled the request"
5514 #: builtin/help.c:424
5515 msgid "Defining attributes per path"
5518 #: builtin/help.c:425
5519 msgid "A Git glossary"
5522 #: builtin/help.c:426
5523 msgid "Specifies intentionally untracked files to ignore"
5526 #: builtin/help.c:427
5527 msgid "Defining submodule properties"
5530 #: builtin/help.c:428
5531 msgid "Specifying revisions and ranges for Git"
5534 #: builtin/help.c:429
5535 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5538 #: builtin/help.c:430
5539 msgid "An overview of recommended workflows with Git"
5542 #: builtin/help.c:442
5543 msgid "The common Git guides are:\n"
5546 #: builtin/help.c:463 builtin/help.c:480
5551 #: builtin/help.c:496
5553 msgid "`git %s' is aliased to `%s'"
5556 #: builtin/index-pack.c:145
5558 msgid "unable to open %s"
5561 #: builtin/index-pack.c:191
5563 msgid "object type mismatch at %s"
5566 #: builtin/index-pack.c:211
5568 msgid "did not receive expected object %s"
5571 #: builtin/index-pack.c:214
5573 msgid "object %s: expected type %s, found %s"
5576 #: builtin/index-pack.c:256
5578 msgid "cannot fill %d byte"
5579 msgid_plural "cannot fill %d bytes"
5583 #: builtin/index-pack.c:266
5587 #: builtin/index-pack.c:267
5588 msgid "read error on input"
5591 #: builtin/index-pack.c:279
5592 msgid "used more bytes than were available"
5595 #: builtin/index-pack.c:286
5596 msgid "pack too large for current definition of off_t"
5599 #: builtin/index-pack.c:302
5601 msgid "unable to create '%s'"
5604 #: builtin/index-pack.c:307
5606 msgid "cannot open packfile '%s'"
5609 #: builtin/index-pack.c:321
5610 msgid "pack signature mismatch"
5613 #: builtin/index-pack.c:323
5615 msgid "pack version %<PRIu32> unsupported"
5618 #: builtin/index-pack.c:341
5620 msgid "pack has bad object at offset %lu: %s"
5623 #: builtin/index-pack.c:462
5625 msgid "inflate returned %d"
5628 #: builtin/index-pack.c:511
5629 msgid "offset value overflow for delta base object"
5632 #: builtin/index-pack.c:519
5633 msgid "delta base offset is out of bound"
5636 #: builtin/index-pack.c:527
5638 msgid "unknown object type %d"
5641 #: builtin/index-pack.c:558
5642 msgid "cannot pread pack file"
5645 #: builtin/index-pack.c:560
5647 msgid "premature end of pack file, %lu byte missing"
5648 msgid_plural "premature end of pack file, %lu bytes missing"
5652 #: builtin/index-pack.c:586
5653 msgid "serious inflate inconsistency"
5656 #: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706
5657 #: builtin/index-pack.c:740 builtin/index-pack.c:749
5659 msgid "SHA1 COLLISION FOUND WITH %s !"
5662 #: builtin/index-pack.c:680 builtin/pack-objects.c:162
5663 #: builtin/pack-objects.c:254
5665 msgid "unable to read %s"
5668 #: builtin/index-pack.c:746
5670 msgid "cannot read existing object %s"
5673 #: builtin/index-pack.c:760
5675 msgid "invalid blob object %s"
5678 #: builtin/index-pack.c:774
5683 #: builtin/index-pack.c:777
5684 msgid "Error in object"
5687 #: builtin/index-pack.c:779
5689 msgid "Not all child objects of %s are reachable"
5692 #: builtin/index-pack.c:851 builtin/index-pack.c:881
5693 msgid "failed to apply delta"
5696 #: builtin/index-pack.c:1022
5697 msgid "Receiving objects"
5700 #: builtin/index-pack.c:1022
5701 msgid "Indexing objects"
5704 #: builtin/index-pack.c:1048
5705 msgid "pack is corrupted (SHA1 mismatch)"
5708 #: builtin/index-pack.c:1053
5709 msgid "cannot fstat packfile"
5712 #: builtin/index-pack.c:1056
5713 msgid "pack has junk at the end"
5716 #: builtin/index-pack.c:1067
5717 msgid "confusion beyond insanity in parse_pack_objects()"
5720 #: builtin/index-pack.c:1090
5721 msgid "Resolving deltas"
5724 #: builtin/index-pack.c:1100
5726 msgid "unable to create thread: %s"
5729 #: builtin/index-pack.c:1142
5730 msgid "confusion beyond insanity"
5733 #: builtin/index-pack.c:1150
5735 msgid "completed with %d local objects"
5738 #: builtin/index-pack.c:1160
5740 msgid "Unexpected tail checksum for %s (disk corruption?)"
5743 #: builtin/index-pack.c:1164
5745 msgid "pack has %d unresolved delta"
5746 msgid_plural "pack has %d unresolved deltas"
5750 #: builtin/index-pack.c:1189
5752 msgid "unable to deflate appended object (%d)"
5755 #: builtin/index-pack.c:1268
5757 msgid "local object %s is corrupt"
5760 #: builtin/index-pack.c:1292
5761 msgid "error while closing pack file"
5764 #: builtin/index-pack.c:1305
5766 msgid "cannot write keep file '%s'"
5769 #: builtin/index-pack.c:1313
5771 msgid "cannot close written keep file '%s'"
5774 #: builtin/index-pack.c:1326
5775 msgid "cannot store pack file"
5778 #: builtin/index-pack.c:1337
5779 msgid "cannot store index file"
5782 #: builtin/index-pack.c:1370
5784 msgid "bad pack.indexversion=%<PRIu32>"
5787 #: builtin/index-pack.c:1376
5789 msgid "invalid number of threads specified (%d)"
5792 #: builtin/index-pack.c:1380 builtin/index-pack.c:1559
5794 msgid "no threads support, ignoring %s"
5797 #: builtin/index-pack.c:1438
5799 msgid "Cannot open existing pack file '%s'"
5802 #: builtin/index-pack.c:1440
5804 msgid "Cannot open existing pack idx file for '%s'"
5807 #: builtin/index-pack.c:1487
5809 msgid "non delta: %d object"
5810 msgid_plural "non delta: %d objects"
5814 #: builtin/index-pack.c:1494
5816 msgid "chain length = %d: %lu object"
5817 msgid_plural "chain length = %d: %lu objects"
5821 #: builtin/index-pack.c:1523
5822 msgid "Cannot come back to cwd"
5825 #: builtin/index-pack.c:1571 builtin/index-pack.c:1574
5826 #: builtin/index-pack.c:1586 builtin/index-pack.c:1590
5831 #: builtin/index-pack.c:1604
5832 msgid "--fix-thin cannot be used without --stdin"
5835 #: builtin/index-pack.c:1608 builtin/index-pack.c:1617
5837 msgid "packfile name '%s' does not end with '.pack'"
5840 #: builtin/index-pack.c:1625
5841 msgid "--verify with no packfile name given"
5844 #: builtin/init-db.c:35
5846 msgid "Could not make %s writable by group"
5849 #: builtin/init-db.c:62
5851 msgid "insanely long template name %s"
5854 #: builtin/init-db.c:67
5856 msgid "cannot stat '%s'"
5859 #: builtin/init-db.c:73
5861 msgid "cannot stat template '%s'"
5864 #: builtin/init-db.c:80
5866 msgid "cannot opendir '%s'"
5869 #: builtin/init-db.c:97
5871 msgid "cannot readlink '%s'"
5874 #: builtin/init-db.c:99
5876 msgid "insanely long symlink %s"
5879 #: builtin/init-db.c:102
5881 msgid "cannot symlink '%s' '%s'"
5884 #: builtin/init-db.c:106
5886 msgid "cannot copy '%s' to '%s'"
5889 #: builtin/init-db.c:110
5891 msgid "ignoring template %s"
5894 #: builtin/init-db.c:133
5896 msgid "insanely long template path %s"
5899 #: builtin/init-db.c:141
5901 msgid "templates not found %s"
5904 #: builtin/init-db.c:154
5906 msgid "not copying templates of a wrong format version %d from '%s'"
5909 #: builtin/init-db.c:192
5911 msgid "insane git directory %s"
5914 #: builtin/init-db.c:323 builtin/init-db.c:326
5916 msgid "%s already exists"
5919 #: builtin/init-db.c:355
5921 msgid "unable to handle file type %d"
5924 #: builtin/init-db.c:358
5926 msgid "unable to move %s to %s"
5929 #. TRANSLATORS: The first '%s' is either "Reinitialized
5930 #. existing" or "Initialized empty", the second " shared" or
5931 #. "", and the last '%s%s' is the verbatim directory name.
5932 #: builtin/init-db.c:418
5934 msgid "%s%s Git repository in %s%s\n"
5937 #: builtin/init-db.c:419
5938 msgid "Reinitialized existing"
5941 #: builtin/init-db.c:419
5942 msgid "Initialized empty"
5945 #: builtin/init-db.c:420
5949 #: builtin/init-db.c:439
5950 msgid "cannot tell cwd"
5953 #: builtin/init-db.c:465
5955 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5956 "shared[=<permissions>]] [directory]"
5959 #: builtin/init-db.c:488
5963 #: builtin/init-db.c:489
5964 msgid "specify that the git repository is to be shared amongst several users"
5967 #: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:172
5971 #: builtin/init-db.c:523 builtin/init-db.c:528
5973 msgid "cannot mkdir %s"
5976 #: builtin/init-db.c:532
5978 msgid "cannot chdir to %s"
5981 #: builtin/init-db.c:554
5984 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5988 #: builtin/init-db.c:578
5989 msgid "Cannot access current working directory"
5992 #: builtin/init-db.c:585
5994 msgid "Cannot access work tree '%s'"
5998 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
6002 msgid " or: git show [options] <object>..."
6005 #: builtin/log.c:127
6006 msgid "suppress diff output"
6009 #: builtin/log.c:128
6013 #: builtin/log.c:129
6014 msgid "Use mail map file"
6017 #: builtin/log.c:130
6018 msgid "decorate options"
6021 #: builtin/log.c:229
6023 msgid "Final output: %d %s\n"
6026 #: builtin/log.c:470 builtin/log.c:562
6028 msgid "Could not read object %s"
6031 #: builtin/log.c:586
6033 msgid "Unknown type: %d"
6036 #: builtin/log.c:687
6037 msgid "format.headers without value"
6040 #: builtin/log.c:771
6041 msgid "name of output directory is too long"
6044 #: builtin/log.c:787
6046 msgid "Cannot open patch file %s"
6049 #: builtin/log.c:801
6050 msgid "Need exactly one range."
6053 #: builtin/log.c:809
6054 msgid "Not a range."
6057 #: builtin/log.c:916
6058 msgid "Cover letter needs email format"
6061 #: builtin/log.c:995
6063 msgid "insane in-reply-to: %s"
6066 #: builtin/log.c:1023
6067 msgid "git format-patch [options] [<since> | <revision range>]"
6070 #: builtin/log.c:1068
6071 msgid "Two output directories?"
6074 #: builtin/log.c:1183
6075 msgid "use [PATCH n/m] even with a single patch"
6078 #: builtin/log.c:1186
6079 msgid "use [PATCH] even with multiple patches"
6082 #: builtin/log.c:1190
6083 msgid "print patches to standard out"
6086 #: builtin/log.c:1192
6087 msgid "generate a cover letter"
6090 #: builtin/log.c:1194
6091 msgid "use simple number sequence for output file names"
6094 #: builtin/log.c:1195
6098 #: builtin/log.c:1196
6099 msgid "use <sfx> instead of '.patch'"
6102 #: builtin/log.c:1198
6103 msgid "start numbering patches at <n> instead of 1"
6106 #: builtin/log.c:1200
6107 msgid "mark the series as Nth re-roll"
6110 #: builtin/log.c:1202
6111 msgid "Use [<prefix>] instead of [PATCH]"
6114 #: builtin/log.c:1205
6115 msgid "store resulting files in <dir>"
6118 #: builtin/log.c:1208
6119 msgid "don't strip/add [PATCH]"
6122 #: builtin/log.c:1211
6123 msgid "don't output binary diffs"
6126 #: builtin/log.c:1213
6127 msgid "don't include a patch matching a commit upstream"
6130 #: builtin/log.c:1215
6131 msgid "show patch format instead of default (patch + stat)"
6134 #: builtin/log.c:1217
6138 #: builtin/log.c:1218
6142 #: builtin/log.c:1219
6143 msgid "add email header"
6146 #: builtin/log.c:1220 builtin/log.c:1222
6150 #: builtin/log.c:1220
6151 msgid "add To: header"
6154 #: builtin/log.c:1222
6155 msgid "add Cc: header"
6158 #: builtin/log.c:1224
6162 #: builtin/log.c:1225
6163 msgid "set From address to <ident> (or committer ident if absent)"
6166 #: builtin/log.c:1227
6170 #: builtin/log.c:1228
6171 msgid "make first mail a reply to <message-id>"
6174 #: builtin/log.c:1229 builtin/log.c:1232
6178 #: builtin/log.c:1230
6179 msgid "attach the patch"
6182 #: builtin/log.c:1233
6183 msgid "inline the patch"
6186 #: builtin/log.c:1237
6187 msgid "enable message threading, styles: shallow, deep"
6190 #: builtin/log.c:1239
6194 #: builtin/log.c:1240
6195 msgid "add a signature"
6198 #: builtin/log.c:1242
6199 msgid "add a signature from a file"
6202 #: builtin/log.c:1243
6203 msgid "don't print the patch filenames"
6206 #: builtin/log.c:1317
6208 msgid "invalid ident line: %s"
6211 #: builtin/log.c:1332
6212 msgid "-n and -k are mutually exclusive."
6215 #: builtin/log.c:1334
6216 msgid "--subject-prefix and -k are mutually exclusive."
6219 #: builtin/log.c:1342
6220 msgid "--name-only does not make sense"
6223 #: builtin/log.c:1344
6224 msgid "--name-status does not make sense"
6227 #: builtin/log.c:1346
6228 msgid "--check does not make sense"
6231 #: builtin/log.c:1369
6232 msgid "standard output, or directory, which one?"
6235 #: builtin/log.c:1371
6237 msgid "Could not create directory '%s'"
6240 #: builtin/log.c:1468
6242 msgid "unable to read signature file '%s'"
6245 #: builtin/log.c:1531
6246 msgid "Failed to create output files"
6249 #: builtin/log.c:1579
6250 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6253 #: builtin/log.c:1634
6256 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
6259 #: builtin/log.c:1647 builtin/log.c:1649 builtin/log.c:1661
6261 msgid "Unknown commit %s"
6264 #: builtin/ls-files.c:401
6265 msgid "git ls-files [options] [<file>...]"
6268 #: builtin/ls-files.c:458
6269 msgid "identify the file status with tags"
6272 #: builtin/ls-files.c:460
6273 msgid "use lowercase letters for 'assume unchanged' files"
6276 #: builtin/ls-files.c:462
6277 msgid "show cached files in the output (default)"
6280 #: builtin/ls-files.c:464
6281 msgid "show deleted files in the output"
6284 #: builtin/ls-files.c:466
6285 msgid "show modified files in the output"
6288 #: builtin/ls-files.c:468
6289 msgid "show other files in the output"
6292 #: builtin/ls-files.c:470
6293 msgid "show ignored files in the output"
6296 #: builtin/ls-files.c:473
6297 msgid "show staged contents' object name in the output"
6300 #: builtin/ls-files.c:475
6301 msgid "show files on the filesystem that need to be removed"
6304 #: builtin/ls-files.c:477
6305 msgid "show 'other' directories' name only"
6308 #: builtin/ls-files.c:480
6309 msgid "don't show empty directories"
6312 #: builtin/ls-files.c:483
6313 msgid "show unmerged files in the output"
6316 #: builtin/ls-files.c:485
6317 msgid "show resolve-undo information"
6320 #: builtin/ls-files.c:487
6321 msgid "skip files matching pattern"
6324 #: builtin/ls-files.c:490
6325 msgid "exclude patterns are read from <file>"
6328 #: builtin/ls-files.c:493
6329 msgid "read additional per-directory exclude patterns in <file>"
6332 #: builtin/ls-files.c:495
6333 msgid "add the standard git exclusions"
6336 #: builtin/ls-files.c:498
6337 msgid "make the output relative to the project top directory"
6340 #: builtin/ls-files.c:501
6341 msgid "if any <file> is not in the index, treat this as an error"
6344 #: builtin/ls-files.c:502
6348 #: builtin/ls-files.c:503
6349 msgid "pretend that paths removed since <tree-ish> are still present"
6352 #: builtin/ls-files.c:505
6353 msgid "show debugging data"
6356 #: builtin/ls-tree.c:28
6357 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
6360 #: builtin/ls-tree.c:126
6361 msgid "only show trees"
6364 #: builtin/ls-tree.c:128
6365 msgid "recurse into subtrees"
6368 #: builtin/ls-tree.c:130
6369 msgid "show trees when recursing"
6372 #: builtin/ls-tree.c:133
6373 msgid "terminate entries with NUL byte"
6376 #: builtin/ls-tree.c:134
6377 msgid "include object size"
6380 #: builtin/ls-tree.c:136 builtin/ls-tree.c:138
6381 msgid "list only filenames"
6384 #: builtin/ls-tree.c:141
6385 msgid "use full path names"
6388 #: builtin/ls-tree.c:143
6389 msgid "list entire tree; not just current directory (implies --full-name)"
6392 #: builtin/merge.c:43
6393 msgid "git merge [options] [<commit>...]"
6396 #: builtin/merge.c:44
6397 msgid "git merge [options] <msg> HEAD <commit>"
6400 #: builtin/merge.c:45
6401 msgid "git merge --abort"
6404 #: builtin/merge.c:98
6405 msgid "switch `m' requires a value"
6408 #: builtin/merge.c:135
6410 msgid "Could not find merge strategy '%s'.\n"
6413 #: builtin/merge.c:136
6415 msgid "Available strategies are:"
6418 #: builtin/merge.c:141
6420 msgid "Available custom strategies are:"
6423 #: builtin/merge.c:191
6424 msgid "do not show a diffstat at the end of the merge"
6427 #: builtin/merge.c:194
6428 msgid "show a diffstat at the end of the merge"
6431 #: builtin/merge.c:195
6432 msgid "(synonym to --stat)"
6435 #: builtin/merge.c:197
6436 msgid "add (at most <n>) entries from shortlog to merge commit message"
6439 #: builtin/merge.c:200
6440 msgid "create a single commit instead of doing a merge"
6443 #: builtin/merge.c:202
6444 msgid "perform a commit if the merge succeeds (default)"
6447 #: builtin/merge.c:204
6448 msgid "edit message before committing"
6451 #: builtin/merge.c:205
6452 msgid "allow fast-forward (default)"
6455 #: builtin/merge.c:207
6456 msgid "abort if fast-forward is not possible"
6459 #: builtin/merge.c:211
6460 msgid "Verify that the named commit has a valid GPG signature"
6463 #: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89
6467 #: builtin/merge.c:213
6468 msgid "merge strategy to use"
6471 #: builtin/merge.c:214
6472 msgid "option=value"
6475 #: builtin/merge.c:215
6476 msgid "option for selected merge strategy"
6479 #: builtin/merge.c:217
6480 msgid "merge commit message (for a non-fast-forward merge)"
6483 #: builtin/merge.c:221
6484 msgid "abort the current in-progress merge"
6487 #: builtin/merge.c:250
6488 msgid "could not run stash."
6491 #: builtin/merge.c:255
6492 msgid "stash failed"
6495 #: builtin/merge.c:260
6497 msgid "not a valid object: %s"
6500 #: builtin/merge.c:279 builtin/merge.c:296
6501 msgid "read-tree failed"
6504 #: builtin/merge.c:326
6505 msgid " (nothing to squash)"
6508 #: builtin/merge.c:339
6510 msgid "Squash commit -- not updating HEAD\n"
6513 #: builtin/merge.c:371
6514 msgid "Writing SQUASH_MSG"
6517 #: builtin/merge.c:373
6518 msgid "Finishing SQUASH_MSG"
6521 #: builtin/merge.c:396
6523 msgid "No merge message -- not updating HEAD\n"
6526 #: builtin/merge.c:446
6528 msgid "'%s' does not point to a commit"
6531 #: builtin/merge.c:558
6533 msgid "Bad branch.%s.mergeoptions string: %s"
6536 #: builtin/merge.c:653
6537 msgid "git write-tree failed to write a tree"
6540 #: builtin/merge.c:678
6541 msgid "Not handling anything other than two heads merge."
6544 #: builtin/merge.c:692
6546 msgid "Unknown option for merge-recursive: -X%s"
6549 #: builtin/merge.c:705
6551 msgid "unable to write %s"
6554 #: builtin/merge.c:794
6556 msgid "Could not read from '%s'"
6559 #: builtin/merge.c:803
6561 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6564 #: builtin/merge.c:809
6567 "Please enter a commit message to explain why this merge is necessary,\n"
6568 "especially if it merges an updated upstream into a topic branch.\n"
6570 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
6574 #: builtin/merge.c:833
6575 msgid "Empty commit message."
6578 #: builtin/merge.c:845
6580 msgid "Wonderful.\n"
6583 #: builtin/merge.c:908
6585 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6588 #: builtin/merge.c:924
6590 msgid "'%s' is not a commit"
6593 #: builtin/merge.c:965
6594 msgid "No current branch."
6597 #: builtin/merge.c:967
6598 msgid "No remote for the current branch."
6601 #: builtin/merge.c:969
6602 msgid "No default upstream defined for the current branch."
6605 #: builtin/merge.c:974
6607 msgid "No remote-tracking branch for %s from %s"
6610 #: builtin/merge.c:1130
6611 msgid "There is no merge to abort (MERGE_HEAD missing)."
6614 #: builtin/merge.c:1146 git-pull.sh:31
6616 "You have not concluded your merge (MERGE_HEAD exists).\n"
6617 "Please, commit your changes before you can merge."
6620 #: builtin/merge.c:1149 git-pull.sh:34
6621 msgid "You have not concluded your merge (MERGE_HEAD exists)."
6624 #: builtin/merge.c:1153
6626 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6627 "Please, commit your changes before you can merge."
6630 #: builtin/merge.c:1156
6631 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6634 #: builtin/merge.c:1165
6635 msgid "You cannot combine --squash with --no-ff."
6638 #: builtin/merge.c:1174
6639 msgid "No commit specified and merge.defaultToUpstream not set."
6642 #: builtin/merge.c:1206
6643 msgid "Can merge only exactly one commit into empty head"
6646 #: builtin/merge.c:1209
6647 msgid "Squash commit into empty head not supported yet"
6650 #: builtin/merge.c:1211
6651 msgid "Non-fast-forward commit does not make sense into an empty head"
6654 #: builtin/merge.c:1216
6656 msgid "%s - not something we can merge"
6659 #: builtin/merge.c:1267
6661 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6664 #: builtin/merge.c:1270
6666 msgid "Commit %s has a bad GPG signature allegedly by %s."
6669 #: builtin/merge.c:1273
6671 msgid "Commit %s does not have a GPG signature."
6674 #: builtin/merge.c:1276
6676 msgid "Commit %s has a good GPG signature by %s\n"
6679 #: builtin/merge.c:1357
6681 msgid "Updating %s..%s\n"
6684 #: builtin/merge.c:1396
6686 msgid "Trying really trivial in-index merge...\n"
6689 #: builtin/merge.c:1403
6694 #: builtin/merge.c:1435
6695 msgid "Not possible to fast-forward, aborting."
6698 #: builtin/merge.c:1458 builtin/merge.c:1537
6700 msgid "Rewinding the tree to pristine...\n"
6703 #: builtin/merge.c:1462
6705 msgid "Trying merge strategy %s...\n"
6708 #: builtin/merge.c:1528
6710 msgid "No merge strategy handled the merge.\n"
6713 #: builtin/merge.c:1530
6715 msgid "Merge with strategy %s failed.\n"
6718 #: builtin/merge.c:1539
6720 msgid "Using the %s to prepare resolving by hand.\n"
6723 #: builtin/merge.c:1551
6725 msgid "Automatic merge went well; stopped before committing as requested\n"
6728 #: builtin/merge-base.c:29
6729 msgid "git merge-base [-a|--all] <commit> <commit>..."
6732 #: builtin/merge-base.c:30
6733 msgid "git merge-base [-a|--all] --octopus <commit>..."
6736 #: builtin/merge-base.c:31
6737 msgid "git merge-base --independent <commit>..."
6740 #: builtin/merge-base.c:32
6741 msgid "git merge-base --is-ancestor <commit> <commit>"
6744 #: builtin/merge-base.c:33
6745 msgid "git merge-base --fork-point <ref> [<commit>]"
6748 #: builtin/merge-base.c:214
6749 msgid "output all common ancestors"
6752 #: builtin/merge-base.c:216
6753 msgid "find ancestors for a single n-way merge"
6756 #: builtin/merge-base.c:218
6757 msgid "list revs not reachable from others"
6760 #: builtin/merge-base.c:220
6761 msgid "is the first one ancestor of the other?"
6764 #: builtin/merge-base.c:222
6765 msgid "find where <commit> forked from reflog of <ref>"
6768 #: builtin/merge-file.c:8
6770 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6774 #: builtin/merge-file.c:33
6775 msgid "send results to standard output"
6778 #: builtin/merge-file.c:34
6779 msgid "use a diff3 based merge"
6782 #: builtin/merge-file.c:35
6783 msgid "for conflicts, use our version"
6786 #: builtin/merge-file.c:37
6787 msgid "for conflicts, use their version"
6790 #: builtin/merge-file.c:39
6791 msgid "for conflicts, use a union version"
6794 #: builtin/merge-file.c:42
6795 msgid "for conflicts, use this marker size"
6798 #: builtin/merge-file.c:43
6799 msgid "do not warn about conflicts"
6802 #: builtin/merge-file.c:45
6803 msgid "set labels for file1/orig_file/file2"
6806 #: builtin/mktree.c:64
6807 msgid "git mktree [-z] [--missing] [--batch]"
6810 #: builtin/mktree.c:150
6811 msgid "input is NUL terminated"
6814 #: builtin/mktree.c:151 builtin/write-tree.c:24
6815 msgid "allow missing objects"
6818 #: builtin/mktree.c:152
6819 msgid "allow creation of more than one tree"
6823 msgid "git mv [options] <source>... <destination>"
6827 msgid "force move/rename even if target exists"
6831 msgid "skip move/rename errors"
6836 msgid "Checking rename of '%s' to '%s'\n"
6844 msgid "can not move directory into itself"
6848 msgid "cannot move directory over file"
6853 msgid "Huh? Directory %s is in index and no submodule?"
6856 #: builtin/mv.c:140 builtin/rm.c:318
6857 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
6862 msgid "Huh? %.*s is in index?"
6866 msgid "source directory is empty"
6870 msgid "not under version control"
6874 msgid "destination exists"
6879 msgid "overwriting '%s'"
6883 msgid "Cannot overwrite"
6887 msgid "multiple sources for the same target"
6891 msgid "destination directory does not exist"
6896 msgid "%s, source=%s, destination=%s"
6901 msgid "Renaming %s to %s\n"
6904 #: builtin/mv.c:257 builtin/remote.c:725 builtin/repack.c:358
6906 msgid "renaming '%s' failed"
6909 #: builtin/name-rev.c:255
6910 msgid "git name-rev [options] <commit>..."
6913 #: builtin/name-rev.c:256
6914 msgid "git name-rev [options] --all"
6917 #: builtin/name-rev.c:257
6918 msgid "git name-rev [options] --stdin"
6921 #: builtin/name-rev.c:309
6922 msgid "print only names (no SHA-1)"
6925 #: builtin/name-rev.c:310
6926 msgid "only use tags to name the commits"
6929 #: builtin/name-rev.c:312
6930 msgid "only use refs matching <pattern>"
6933 #: builtin/name-rev.c:314
6934 msgid "list all commits reachable from all refs"
6937 #: builtin/name-rev.c:315
6938 msgid "read from stdin"
6941 #: builtin/name-rev.c:316
6942 msgid "allow to print `undefined` names (default)"
6945 #: builtin/name-rev.c:322
6946 msgid "dereference tags in the input (internal use)"
6949 #: builtin/notes.c:24
6950 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
6953 #: builtin/notes.c:25
6955 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6956 "<object>] [<object>]"
6959 #: builtin/notes.c:26
6960 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6963 #: builtin/notes.c:27
6965 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6966 "<object>] [<object>]"
6969 #: builtin/notes.c:28
6970 msgid "git notes [--ref <notes_ref>] edit [<object>]"
6973 #: builtin/notes.c:29
6974 msgid "git notes [--ref <notes_ref>] show [<object>]"
6977 #: builtin/notes.c:30
6979 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6982 #: builtin/notes.c:31
6983 msgid "git notes merge --commit [-v | -q]"
6986 #: builtin/notes.c:32
6987 msgid "git notes merge --abort [-v | -q]"
6990 #: builtin/notes.c:33
6991 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6994 #: builtin/notes.c:34
6995 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6998 #: builtin/notes.c:35
6999 msgid "git notes [--ref <notes_ref>] get-ref"
7002 #: builtin/notes.c:40
7003 msgid "git notes [list [<object>]]"
7006 #: builtin/notes.c:45
7007 msgid "git notes add [<options>] [<object>]"
7010 #: builtin/notes.c:50
7011 msgid "git notes copy [<options>] <from-object> <to-object>"
7014 #: builtin/notes.c:51
7015 msgid "git notes copy --stdin [<from-object> <to-object>]..."
7018 #: builtin/notes.c:56
7019 msgid "git notes append [<options>] [<object>]"
7022 #: builtin/notes.c:61
7023 msgid "git notes edit [<object>]"
7026 #: builtin/notes.c:66
7027 msgid "git notes show [<object>]"
7030 #: builtin/notes.c:71
7031 msgid "git notes merge [<options>] <notes_ref>"
7034 #: builtin/notes.c:72
7035 msgid "git notes merge --commit [<options>]"
7038 #: builtin/notes.c:73
7039 msgid "git notes merge --abort [<options>]"
7042 #: builtin/notes.c:78
7043 msgid "git notes remove [<object>]"
7046 #: builtin/notes.c:83
7047 msgid "git notes prune [<options>]"
7050 #: builtin/notes.c:88
7051 msgid "git notes get-ref"
7054 #: builtin/notes.c:137
7056 msgid "unable to start 'show' for object '%s'"
7059 #: builtin/notes.c:141
7060 msgid "could not read 'show' output"
7063 #: builtin/notes.c:149
7065 msgid "failed to finish 'show' for object '%s'"
7068 #: builtin/notes.c:167 builtin/tag.c:477
7070 msgid "could not create file '%s'"
7073 #: builtin/notes.c:186
7074 msgid "Please supply the note contents using either -m or -F option"
7077 #: builtin/notes.c:207 builtin/notes.c:848
7079 msgid "Removing note for object %s\n"
7082 #: builtin/notes.c:212
7083 msgid "unable to write note object"
7086 #: builtin/notes.c:214
7088 msgid "The note contents has been left in %s"
7091 #: builtin/notes.c:248 builtin/tag.c:692
7093 msgid "cannot read '%s'"
7096 #: builtin/notes.c:250 builtin/tag.c:695
7098 msgid "could not open or read '%s'"
7101 #: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322
7102 #: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519
7103 #: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641
7104 #: builtin/notes.c:843 builtin/tag.c:708
7106 msgid "Failed to resolve '%s' as a valid ref."
7109 #: builtin/notes.c:272
7111 msgid "Failed to read object '%s'."
7114 #: builtin/notes.c:276
7116 msgid "Cannot read note data from non-blob object '%s'."
7119 #: builtin/notes.c:316
7121 msgid "Malformed input line: '%s'."
7124 #: builtin/notes.c:331
7126 msgid "Failed to copy notes from '%s' to '%s'"
7129 #: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502
7130 #: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634
7131 #: builtin/notes.c:908
7132 msgid "too many parameters"
7135 #: builtin/notes.c:388 builtin/notes.c:647
7137 msgid "No note found for object %s."
7140 #: builtin/notes.c:410 builtin/notes.c:567
7141 msgid "note contents as a string"
7144 #: builtin/notes.c:413 builtin/notes.c:570
7145 msgid "note contents in a file"
7148 #: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572
7149 #: builtin/notes.c:575 builtin/tag.c:627
7153 #: builtin/notes.c:416 builtin/notes.c:573
7154 msgid "reuse and edit specified note object"
7157 #: builtin/notes.c:419 builtin/notes.c:576
7158 msgid "reuse specified note object"
7161 #: builtin/notes.c:421 builtin/notes.c:489
7162 msgid "replace existing notes"
7165 #: builtin/notes.c:455
7168 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7172 #: builtin/notes.c:460 builtin/notes.c:537
7174 msgid "Overwriting existing notes for object %s\n"
7177 #: builtin/notes.c:490
7178 msgid "read objects from stdin"
7181 #: builtin/notes.c:492
7182 msgid "load rewriting config for <command> (implies --stdin)"
7185 #: builtin/notes.c:510
7186 msgid "too few parameters"
7189 #: builtin/notes.c:531
7192 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7196 #: builtin/notes.c:543
7198 msgid "Missing notes on source object %s. Cannot copy."
7201 #: builtin/notes.c:592
7204 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7205 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7208 #: builtin/notes.c:739
7209 msgid "General options"
7212 #: builtin/notes.c:741
7213 msgid "Merge options"
7216 #: builtin/notes.c:743
7218 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7222 #: builtin/notes.c:745
7223 msgid "Committing unmerged notes"
7226 #: builtin/notes.c:747
7227 msgid "finalize notes merge by committing unmerged notes"
7230 #: builtin/notes.c:749
7231 msgid "Aborting notes merge resolution"
7234 #: builtin/notes.c:751
7235 msgid "abort notes merge"
7238 #: builtin/notes.c:846
7240 msgid "Object %s has no note\n"
7243 #: builtin/notes.c:858
7244 msgid "attempt to remove non-existent note is not an error"
7247 #: builtin/notes.c:861
7248 msgid "read object names from the standard input"
7251 #: builtin/notes.c:942
7255 #: builtin/notes.c:943
7256 msgid "use notes from <notes_ref>"
7259 #: builtin/notes.c:978 builtin/remote.c:1616
7261 msgid "Unknown subcommand: %s"
7264 #: builtin/pack-objects.c:25
7265 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7268 #: builtin/pack-objects.c:26
7269 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7272 #: builtin/pack-objects.c:175 builtin/pack-objects.c:178
7274 msgid "deflate error (%d)"
7277 #: builtin/pack-objects.c:771
7278 msgid "Writing objects"
7281 #: builtin/pack-objects.c:1012
7282 msgid "disabling bitmap writing, as some objects are not being packed"
7285 #: builtin/pack-objects.c:2174
7286 msgid "Compressing objects"
7289 #: builtin/pack-objects.c:2526
7291 msgid "unsupported index version %s"
7294 #: builtin/pack-objects.c:2530
7296 msgid "bad index version '%s'"
7299 #: builtin/pack-objects.c:2553
7301 msgid "option %s does not accept negative form"
7304 #: builtin/pack-objects.c:2557
7306 msgid "unable to parse value '%s' for option %s"
7309 #: builtin/pack-objects.c:2576
7310 msgid "do not show progress meter"
7313 #: builtin/pack-objects.c:2578
7314 msgid "show progress meter"
7317 #: builtin/pack-objects.c:2580
7318 msgid "show progress meter during object writing phase"
7321 #: builtin/pack-objects.c:2583
7322 msgid "similar to --all-progress when progress meter is shown"
7325 #: builtin/pack-objects.c:2584
7326 msgid "version[,offset]"
7329 #: builtin/pack-objects.c:2585
7330 msgid "write the pack index file in the specified idx format version"
7333 #: builtin/pack-objects.c:2588
7334 msgid "maximum size of each output pack file"
7337 #: builtin/pack-objects.c:2590
7338 msgid "ignore borrowed objects from alternate object store"
7341 #: builtin/pack-objects.c:2592
7342 msgid "ignore packed objects"
7345 #: builtin/pack-objects.c:2594
7346 msgid "limit pack window by objects"
7349 #: builtin/pack-objects.c:2596
7350 msgid "limit pack window by memory in addition to object limit"
7353 #: builtin/pack-objects.c:2598
7354 msgid "maximum length of delta chain allowed in the resulting pack"
7357 #: builtin/pack-objects.c:2600
7358 msgid "reuse existing deltas"
7361 #: builtin/pack-objects.c:2602
7362 msgid "reuse existing objects"
7365 #: builtin/pack-objects.c:2604
7366 msgid "use OFS_DELTA objects"
7369 #: builtin/pack-objects.c:2606
7370 msgid "use threads when searching for best delta matches"
7373 #: builtin/pack-objects.c:2608
7374 msgid "do not create an empty pack output"
7377 #: builtin/pack-objects.c:2610
7378 msgid "read revision arguments from standard input"
7381 #: builtin/pack-objects.c:2612
7382 msgid "limit the objects to those that are not yet packed"
7385 #: builtin/pack-objects.c:2615
7386 msgid "include objects reachable from any reference"
7389 #: builtin/pack-objects.c:2618
7390 msgid "include objects referred by reflog entries"
7393 #: builtin/pack-objects.c:2621
7394 msgid "output pack to stdout"
7397 #: builtin/pack-objects.c:2623
7398 msgid "include tag objects that refer to objects to be packed"
7401 #: builtin/pack-objects.c:2625
7402 msgid "keep unreachable objects"
7405 #: builtin/pack-objects.c:2626 parse-options.h:140
7409 #: builtin/pack-objects.c:2627
7410 msgid "unpack unreachable objects newer than <time>"
7413 #: builtin/pack-objects.c:2630
7414 msgid "create thin packs"
7417 #: builtin/pack-objects.c:2632
7418 msgid "ignore packs that have companion .keep file"
7421 #: builtin/pack-objects.c:2634
7422 msgid "pack compression level"
7425 #: builtin/pack-objects.c:2636
7426 msgid "do not hide commits by grafts"
7429 #: builtin/pack-objects.c:2638
7430 msgid "use a bitmap index if available to speed up counting objects"
7433 #: builtin/pack-objects.c:2640
7434 msgid "write a bitmap index together with the pack index"
7437 #: builtin/pack-objects.c:2719
7438 msgid "Counting objects"
7441 #: builtin/pack-refs.c:6
7442 msgid "git pack-refs [options]"
7445 #: builtin/pack-refs.c:14
7446 msgid "pack everything"
7449 #: builtin/pack-refs.c:15
7450 msgid "prune loose refs (default)"
7453 #: builtin/prune-packed.c:7
7454 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
7457 #: builtin/prune-packed.c:49
7458 msgid "Removing duplicate objects"
7461 #: builtin/prune.c:12
7462 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7465 #: builtin/prune.c:142
7466 msgid "do not remove, show only"
7469 #: builtin/prune.c:143
7470 msgid "report pruned objects"
7473 #: builtin/prune.c:146
7474 msgid "expire objects older than <time>"
7477 #: builtin/push.c:14
7478 msgid "git push [<options>] [<repository> [<refspec>...]]"
7481 #: builtin/push.c:85
7482 msgid "tag shorthand without <tag>"
7485 #: builtin/push.c:95
7486 msgid "--delete only accepts plain target ref names"
7489 #: builtin/push.c:139
7492 "To choose either option permanently, see push.default in 'git help config'."
7495 #: builtin/push.c:142
7498 "The upstream branch of your current branch does not match\n"
7499 "the name of your current branch. To push to the upstream branch\n"
7500 "on the remote, use\n"
7502 " git push %s HEAD:%s\n"
7504 "To push to the branch of the same name on the remote, use\n"
7510 #: builtin/push.c:157
7513 "You are not currently on a branch.\n"
7514 "To push the history leading to the current (detached HEAD)\n"
7517 " git push %s HEAD:<name-of-remote-branch>\n"
7520 #: builtin/push.c:171
7523 "The current branch %s has no upstream branch.\n"
7524 "To push the current branch and set the remote as upstream, use\n"
7526 " git push --set-upstream %s %s\n"
7529 #: builtin/push.c:179
7531 msgid "The current branch %s has multiple upstream branches, refusing to push."
7534 #: builtin/push.c:182
7537 "You are pushing to remote '%s', which is not the upstream of\n"
7538 "your current branch '%s', without telling me what to push\n"
7539 "to update which remote branch."
7542 #: builtin/push.c:205
7544 "push.default is unset; its implicit value has changed in\n"
7545 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7546 "and maintain the traditional behavior, use:\n"
7548 " git config --global push.default matching\n"
7550 "To squelch this message and adopt the new behavior now, use:\n"
7552 " git config --global push.default simple\n"
7554 "When push.default is set to 'matching', git will push local branches\n"
7555 "to the remote branches that already exist with the same name.\n"
7557 "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
7558 "behavior, which only pushes the current branch to the corresponding\n"
7559 "remote branch that 'git pull' uses to update the current branch.\n"
7561 "See 'git help config' and search for 'push.default' for further "
7563 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7564 "'current' instead of 'simple' if you sometimes use older versions of Git)"
7567 #: builtin/push.c:272
7569 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
7572 #: builtin/push.c:279
7574 "Updates were rejected because the tip of your current branch is behind\n"
7575 "its remote counterpart. Integrate the remote changes (e.g.\n"
7576 "'git pull ...') before pushing again.\n"
7577 "See the 'Note about fast-forwards' in 'git push --help' for details."
7580 #: builtin/push.c:285
7582 "Updates were rejected because a pushed branch tip is behind its remote\n"
7583 "counterpart. Check out this branch and integrate the remote changes\n"
7584 "(e.g. 'git pull ...') before pushing again.\n"
7585 "See the 'Note about fast-forwards' in 'git push --help' for details."
7588 #: builtin/push.c:291
7590 "Updates were rejected because the remote contains work that you do\n"
7591 "not have locally. This is usually caused by another repository pushing\n"
7592 "to the same ref. You may want to first integrate the remote changes\n"
7593 "(e.g., 'git pull ...') before pushing again.\n"
7594 "See the 'Note about fast-forwards' in 'git push --help' for details."
7597 #: builtin/push.c:298
7598 msgid "Updates were rejected because the tag already exists in the remote."
7601 #: builtin/push.c:301
7603 "You cannot update a remote ref that points at a non-commit object,\n"
7604 "or update a remote ref to make it point at a non-commit object,\n"
7605 "without using the '--force' option.\n"
7608 #: builtin/push.c:360
7610 msgid "Pushing to %s\n"
7613 #: builtin/push.c:364
7615 msgid "failed to push some refs to '%s'"
7618 #: builtin/push.c:394
7620 msgid "bad repository '%s'"
7623 #: builtin/push.c:395
7625 "No configured push destination.\n"
7626 "Either specify the URL from the command-line or configure a remote "
7627 "repository using\n"
7629 " git remote add <name> <url>\n"
7631 "and then push using the remote name\n"
7633 " git push <name>\n"
7636 #: builtin/push.c:410
7637 msgid "--all and --tags are incompatible"
7640 #: builtin/push.c:411
7641 msgid "--all can't be combined with refspecs"
7644 #: builtin/push.c:416
7645 msgid "--mirror and --tags are incompatible"
7648 #: builtin/push.c:417
7649 msgid "--mirror can't be combined with refspecs"
7652 #: builtin/push.c:422
7653 msgid "--all and --mirror are incompatible"
7656 #: builtin/push.c:482
7660 #: builtin/push.c:483
7661 msgid "push all refs"
7664 #: builtin/push.c:484
7665 msgid "mirror all refs"
7668 #: builtin/push.c:486
7672 #: builtin/push.c:487
7673 msgid "push tags (can't be used with --all or --mirror)"
7676 #: builtin/push.c:490
7677 msgid "force updates"
7680 #: builtin/push.c:492
7681 msgid "refname>:<expect"
7684 #: builtin/push.c:493
7685 msgid "require old value of ref to be at this value"
7688 #: builtin/push.c:495
7692 #: builtin/push.c:496
7693 msgid "control recursive pushing of submodules"
7696 #: builtin/push.c:498
7697 msgid "use thin pack"
7700 #: builtin/push.c:499 builtin/push.c:500
7701 msgid "receive pack program"
7704 #: builtin/push.c:501
7705 msgid "set upstream for git pull/status"
7708 #: builtin/push.c:504
7709 msgid "prune locally removed refs"
7712 #: builtin/push.c:506
7713 msgid "bypass pre-push hook"
7716 #: builtin/push.c:507
7717 msgid "push missing but relevant tags"
7720 #: builtin/push.c:517
7721 msgid "--delete is incompatible with --all, --mirror and --tags"
7724 #: builtin/push.c:519
7725 msgid "--delete doesn't make sense without any refs"
7728 #: builtin/read-tree.c:36
7730 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7731 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7732 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7735 #: builtin/read-tree.c:109
7736 msgid "write resulting index to <file>"
7739 #: builtin/read-tree.c:112
7740 msgid "only empty the index"
7743 #: builtin/read-tree.c:114
7747 #: builtin/read-tree.c:116
7748 msgid "perform a merge in addition to a read"
7751 #: builtin/read-tree.c:118
7752 msgid "3-way merge if no file level merging required"
7755 #: builtin/read-tree.c:120
7756 msgid "3-way merge in presence of adds and removes"
7759 #: builtin/read-tree.c:122
7760 msgid "same as -m, but discard unmerged entries"
7763 #: builtin/read-tree.c:123
7764 msgid "<subdirectory>/"
7767 #: builtin/read-tree.c:124
7768 msgid "read the tree into the index under <subdirectory>/"
7771 #: builtin/read-tree.c:127
7772 msgid "update working tree with merge result"
7775 #: builtin/read-tree.c:129
7779 #: builtin/read-tree.c:130
7780 msgid "allow explicitly ignored files to be overwritten"
7783 #: builtin/read-tree.c:133
7784 msgid "don't check the working tree after merging"
7787 #: builtin/read-tree.c:134
7788 msgid "don't update the index or the work tree"
7791 #: builtin/read-tree.c:136
7792 msgid "skip applying sparse checkout filter"
7795 #: builtin/read-tree.c:138
7796 msgid "debug unpack-trees"
7799 #: builtin/reflog.c:499
7801 msgid "%s' for '%s' is not a valid timestamp"
7804 #: builtin/reflog.c:615 builtin/reflog.c:620
7806 msgid "'%s' is not a valid timestamp"
7809 #: builtin/remote.c:12
7810 msgid "git remote [-v | --verbose]"
7813 #: builtin/remote.c:13
7815 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7816 "mirror=<fetch|push>] <name> <url>"
7819 #: builtin/remote.c:14 builtin/remote.c:33
7820 msgid "git remote rename <old> <new>"
7823 #: builtin/remote.c:15 builtin/remote.c:38
7824 msgid "git remote remove <name>"
7827 #: builtin/remote.c:16
7828 msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
7831 #: builtin/remote.c:17
7832 msgid "git remote [-v | --verbose] show [-n] <name>"
7835 #: builtin/remote.c:18
7836 msgid "git remote prune [-n | --dry-run] <name>"
7839 #: builtin/remote.c:19
7841 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
7844 #: builtin/remote.c:20
7845 msgid "git remote set-branches [--add] <name> <branch>..."
7848 #: builtin/remote.c:21 builtin/remote.c:69
7849 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
7852 #: builtin/remote.c:22 builtin/remote.c:70
7853 msgid "git remote set-url --add <name> <newurl>"
7856 #: builtin/remote.c:23 builtin/remote.c:71
7857 msgid "git remote set-url --delete <name> <url>"
7860 #: builtin/remote.c:28
7861 msgid "git remote add [<options>] <name> <url>"
7864 #: builtin/remote.c:43
7865 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
7868 #: builtin/remote.c:48
7869 msgid "git remote set-branches <name> <branch>..."
7872 #: builtin/remote.c:49
7873 msgid "git remote set-branches --add <name> <branch>..."
7876 #: builtin/remote.c:54
7877 msgid "git remote show [<options>] <name>"
7880 #: builtin/remote.c:59
7881 msgid "git remote prune [<options>] <name>"
7884 #: builtin/remote.c:64
7885 msgid "git remote update [<options>] [<group> | <remote>]..."
7888 #: builtin/remote.c:88
7893 #: builtin/remote.c:120
7895 "--mirror is dangerous and deprecated; please\n"
7896 "\t use --mirror=fetch or --mirror=push instead"
7899 #: builtin/remote.c:137
7901 msgid "unknown mirror argument: %s"
7904 #: builtin/remote.c:153
7905 msgid "fetch the remote branches"
7908 #: builtin/remote.c:155
7909 msgid "import all tags and associated objects when fetching"
7912 #: builtin/remote.c:158
7913 msgid "or do not fetch any tag at all (--no-tags)"
7916 #: builtin/remote.c:160
7917 msgid "branch(es) to track"
7920 #: builtin/remote.c:161
7921 msgid "master branch"
7924 #: builtin/remote.c:162
7928 #: builtin/remote.c:163
7929 msgid "set up remote as a mirror to push to or fetch from"
7932 #: builtin/remote.c:175
7933 msgid "specifying a master branch makes no sense with --mirror"
7936 #: builtin/remote.c:177
7937 msgid "specifying branches to track makes sense only with fetch mirrors"
7940 #: builtin/remote.c:185 builtin/remote.c:640
7942 msgid "remote %s already exists."
7945 #: builtin/remote.c:189 builtin/remote.c:644
7947 msgid "'%s' is not a valid remote name"
7950 #: builtin/remote.c:233
7952 msgid "Could not setup master '%s'"
7955 #: builtin/remote.c:288
7957 msgid "more than one %s"
7960 #: builtin/remote.c:333
7962 msgid "Could not get fetch map for refspec %s"
7965 #: builtin/remote.c:434 builtin/remote.c:442
7969 #: builtin/remote.c:446
7973 #: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
7975 msgid "Could not append '%s' to '%s'"
7978 #: builtin/remote.c:633 builtin/remote.c:794 builtin/remote.c:894
7980 msgid "No such remote: %s"
7983 #: builtin/remote.c:650
7985 msgid "Could not rename config section '%s' to '%s'"
7988 #: builtin/remote.c:656 builtin/remote.c:846
7990 msgid "Could not remove config section '%s'"
7993 #: builtin/remote.c:671
7996 "Not updating non-default fetch refspec\n"
7998 "\tPlease update the configuration manually if necessary."
8001 #: builtin/remote.c:677
8003 msgid "Could not append '%s'"
8006 #: builtin/remote.c:688
8008 msgid "Could not set '%s'"
8011 #: builtin/remote.c:710
8013 msgid "deleting '%s' failed"
8016 #: builtin/remote.c:744
8018 msgid "creating '%s' failed"
8021 #: builtin/remote.c:765
8023 msgid "Could not remove branch %s"
8026 #: builtin/remote.c:832
8028 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8029 "to delete it, use:"
8031 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8032 "to delete them, use:"
8036 #: builtin/remote.c:947
8038 msgid " new (next fetch will store in remotes/%s)"
8041 #: builtin/remote.c:950
8045 #: builtin/remote.c:952
8046 msgid " stale (use 'git remote prune' to remove)"
8049 #: builtin/remote.c:954
8053 #: builtin/remote.c:995
8055 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8058 #: builtin/remote.c:1002
8060 msgid "rebases onto remote %s"
8063 #: builtin/remote.c:1005
8065 msgid " merges with remote %s"
8068 #: builtin/remote.c:1006
8069 msgid " and with remote"
8072 #: builtin/remote.c:1008
8074 msgid "merges with remote %s"
8077 #: builtin/remote.c:1009
8078 msgid " and with remote"
8081 #: builtin/remote.c:1055
8085 #: builtin/remote.c:1058
8089 #: builtin/remote.c:1062
8093 #: builtin/remote.c:1065
8094 msgid "fast-forwardable"
8097 #: builtin/remote.c:1068
8098 msgid "local out of date"
8101 #: builtin/remote.c:1075
8103 msgid " %-*s forces to %-*s (%s)"
8106 #: builtin/remote.c:1078
8108 msgid " %-*s pushes to %-*s (%s)"
8111 #: builtin/remote.c:1082
8113 msgid " %-*s forces to %s"
8116 #: builtin/remote.c:1085
8118 msgid " %-*s pushes to %s"
8121 #: builtin/remote.c:1153
8122 msgid "do not query remotes"
8125 #: builtin/remote.c:1180
8130 #: builtin/remote.c:1181
8132 msgid " Fetch URL: %s"
8135 #: builtin/remote.c:1182 builtin/remote.c:1329
8139 #: builtin/remote.c:1191 builtin/remote.c:1193
8141 msgid " Push URL: %s"
8144 #: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199
8146 msgid " HEAD branch: %s"
8149 #: builtin/remote.c:1201
8152 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8155 #: builtin/remote.c:1213
8157 msgid " Remote branch:%s"
8158 msgid_plural " Remote branches:%s"
8162 #: builtin/remote.c:1216 builtin/remote.c:1243
8163 msgid " (status not queried)"
8166 #: builtin/remote.c:1225
8167 msgid " Local branch configured for 'git pull':"
8168 msgid_plural " Local branches configured for 'git pull':"
8172 #: builtin/remote.c:1233
8173 msgid " Local refs will be mirrored by 'git push'"
8176 #: builtin/remote.c:1240
8178 msgid " Local ref configured for 'git push'%s:"
8179 msgid_plural " Local refs configured for 'git push'%s:"
8183 #: builtin/remote.c:1261
8184 msgid "set refs/remotes/<name>/HEAD according to remote"
8187 #: builtin/remote.c:1263
8188 msgid "delete refs/remotes/<name>/HEAD"
8191 #: builtin/remote.c:1278
8192 msgid "Cannot determine remote HEAD"
8195 #: builtin/remote.c:1280
8196 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8199 #: builtin/remote.c:1290
8201 msgid "Could not delete %s"
8204 #: builtin/remote.c:1298
8206 msgid "Not a valid ref: %s"
8209 #: builtin/remote.c:1300
8211 msgid "Could not setup %s"
8214 #: builtin/remote.c:1318
8216 msgid " %s will become dangling!"
8219 #: builtin/remote.c:1319
8221 msgid " %s has become dangling!"
8224 #: builtin/remote.c:1325
8229 #: builtin/remote.c:1326
8234 #: builtin/remote.c:1349
8236 msgid " * [would prune] %s"
8239 #: builtin/remote.c:1352
8241 msgid " * [pruned] %s"
8244 #: builtin/remote.c:1397
8245 msgid "prune remotes after fetching"
8248 #: builtin/remote.c:1463 builtin/remote.c:1537
8250 msgid "No such remote '%s'"
8253 #: builtin/remote.c:1483
8257 #: builtin/remote.c:1490
8258 msgid "no remote specified"
8261 #: builtin/remote.c:1512
8262 msgid "manipulate push URLs"
8265 #: builtin/remote.c:1514
8269 #: builtin/remote.c:1516
8273 #: builtin/remote.c:1523
8274 msgid "--add --delete doesn't make sense"
8277 #: builtin/remote.c:1563
8279 msgid "Invalid old URL pattern: %s"
8282 #: builtin/remote.c:1571
8284 msgid "No such URL found: %s"
8287 #: builtin/remote.c:1573
8288 msgid "Will not delete all non-push URLs"
8291 #: builtin/remote.c:1587
8292 msgid "be verbose; must be placed before a subcommand"
8295 #: builtin/repack.c:17
8296 msgid "git repack [options]"
8299 #: builtin/repack.c:160
8300 msgid "pack everything in a single pack"
8303 #: builtin/repack.c:162
8304 msgid "same as -a, and turn unreachable objects loose"
8307 #: builtin/repack.c:165
8308 msgid "remove redundant packs, and run git-prune-packed"
8311 #: builtin/repack.c:167
8312 msgid "pass --no-reuse-delta to git-pack-objects"
8315 #: builtin/repack.c:169
8316 msgid "pass --no-reuse-object to git-pack-objects"
8319 #: builtin/repack.c:171
8320 msgid "do not run git-update-server-info"
8323 #: builtin/repack.c:174
8324 msgid "pass --local to git-pack-objects"
8327 #: builtin/repack.c:176
8328 msgid "write bitmap index"
8331 #: builtin/repack.c:177
8335 #: builtin/repack.c:178
8336 msgid "with -A, do not loosen objects older than this"
8339 #: builtin/repack.c:180
8340 msgid "size of the window used for delta compression"
8343 #: builtin/repack.c:181 builtin/repack.c:185
8347 #: builtin/repack.c:182
8348 msgid "same as the above, but limit memory size instead of entries count"
8351 #: builtin/repack.c:184
8352 msgid "limits the maximum delta depth"
8355 #: builtin/repack.c:186
8356 msgid "maximum size of each packfile"
8359 #: builtin/repack.c:188
8360 msgid "repack objects in packs marked with .keep"
8363 #: builtin/repack.c:374
8365 msgid "removing '%s' failed"
8368 #: builtin/replace.c:19
8369 msgid "git replace [-f] <object> <replacement>"
8372 #: builtin/replace.c:20
8373 msgid "git replace [-f] --edit <object>"
8376 #: builtin/replace.c:21
8377 msgid "git replace [-f] --graft <commit> [<parent>...]"
8380 #: builtin/replace.c:22
8381 msgid "git replace -d <object>..."
8384 #: builtin/replace.c:23
8385 msgid "git replace [--format=<format>] [-l [<pattern>]]"
8388 #: builtin/replace.c:322 builtin/replace.c:360 builtin/replace.c:388
8390 msgid "Not a valid object name: '%s'"
8393 #: builtin/replace.c:352
8395 msgid "bad mergetag in commit '%s'"
8398 #: builtin/replace.c:354
8400 msgid "malformed mergetag in commit '%s'"
8403 #: builtin/replace.c:365
8406 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
8407 "instead of --graft"
8410 #: builtin/replace.c:398
8412 msgid "the original commit '%s' has a gpg signature."
8415 #: builtin/replace.c:399
8416 msgid "the signature will be removed in the replacement commit!"
8419 #: builtin/replace.c:405
8421 msgid "could not write replacement commit for: '%s'"
8424 #: builtin/replace.c:429
8425 msgid "list replace refs"
8428 #: builtin/replace.c:430
8429 msgid "delete replace refs"
8432 #: builtin/replace.c:431
8433 msgid "edit existing object"
8436 #: builtin/replace.c:432
8437 msgid "change a commit's parents"
8440 #: builtin/replace.c:433
8441 msgid "replace the ref if it exists"
8444 #: builtin/replace.c:434
8445 msgid "do not pretty-print contents for --edit"
8448 #: builtin/replace.c:435
8449 msgid "use this format"
8452 #: builtin/rerere.c:12
8453 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
8456 #: builtin/rerere.c:57
8457 msgid "register clean resolutions in index"
8460 #: builtin/reset.c:25
8462 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
8465 #: builtin/reset.c:26
8466 msgid "git reset [-q] <tree-ish> [--] <paths>..."
8469 #: builtin/reset.c:27
8470 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
8473 #: builtin/reset.c:33
8477 #: builtin/reset.c:33
8481 #: builtin/reset.c:33
8485 #: builtin/reset.c:33
8489 #: builtin/reset.c:33
8493 #: builtin/reset.c:73
8494 msgid "You do not have a valid HEAD."
8497 #: builtin/reset.c:75
8498 msgid "Failed to find tree of HEAD."
8501 #: builtin/reset.c:81
8503 msgid "Failed to find tree of %s."
8506 #: builtin/reset.c:99
8508 msgid "HEAD is now at %s"
8511 #: builtin/reset.c:182
8513 msgid "Cannot do a %s reset in the middle of a merge."
8516 #: builtin/reset.c:275
8517 msgid "be quiet, only report errors"
8520 #: builtin/reset.c:277
8521 msgid "reset HEAD and index"
8524 #: builtin/reset.c:278
8525 msgid "reset only HEAD"
8528 #: builtin/reset.c:280 builtin/reset.c:282
8529 msgid "reset HEAD, index and working tree"
8532 #: builtin/reset.c:284
8533 msgid "reset HEAD but keep local changes"
8536 #: builtin/reset.c:287
8537 msgid "record only the fact that removed paths will be added later"
8540 #: builtin/reset.c:304
8542 msgid "Failed to resolve '%s' as a valid revision."
8545 #: builtin/reset.c:307 builtin/reset.c:315
8547 msgid "Could not parse object '%s'."
8550 #: builtin/reset.c:312
8552 msgid "Failed to resolve '%s' as a valid tree."
8555 #: builtin/reset.c:321
8556 msgid "--patch is incompatible with --{hard,mixed,soft}"
8559 #: builtin/reset.c:330
8560 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
8563 #: builtin/reset.c:332
8565 msgid "Cannot do %s reset with paths."
8568 #: builtin/reset.c:342
8570 msgid "%s reset is not allowed in a bare repository"
8573 #: builtin/reset.c:346
8574 msgid "-N can only be used with --mixed"
8577 #: builtin/reset.c:363
8578 msgid "Unstaged changes after reset:"
8581 #: builtin/reset.c:369
8583 msgid "Could not reset index file to revision '%s'."
8586 #: builtin/reset.c:373
8587 msgid "Could not write new index file."
8590 #: builtin/rev-parse.c:360
8591 msgid "git rev-parse --parseopt [options] -- [<args>...]"
8594 #: builtin/rev-parse.c:365
8595 msgid "keep the `--` passed as an arg"
8598 #: builtin/rev-parse.c:367
8599 msgid "stop parsing after the first non-option argument"
8602 #: builtin/rev-parse.c:370
8603 msgid "output in stuck long form"
8606 #: builtin/rev-parse.c:498
8608 "git rev-parse --parseopt [options] -- [<args>...]\n"
8609 " or: git rev-parse --sq-quote [<arg>...]\n"
8610 " or: git rev-parse [options] [<arg>...]\n"
8612 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
8615 #: builtin/revert.c:22
8616 msgid "git revert [options] <commit-ish>..."
8619 #: builtin/revert.c:23
8620 msgid "git revert <subcommand>"
8623 #: builtin/revert.c:28
8624 msgid "git cherry-pick [options] <commit-ish>..."
8627 #: builtin/revert.c:29
8628 msgid "git cherry-pick <subcommand>"
8631 #: builtin/revert.c:71
8633 msgid "%s: %s cannot be used with %s"
8636 #: builtin/revert.c:80
8637 msgid "end revert or cherry-pick sequence"
8640 #: builtin/revert.c:81
8641 msgid "resume revert or cherry-pick sequence"
8644 #: builtin/revert.c:82
8645 msgid "cancel revert or cherry-pick sequence"
8648 #: builtin/revert.c:83
8649 msgid "don't automatically commit"
8652 #: builtin/revert.c:84
8653 msgid "edit the commit message"
8656 #: builtin/revert.c:87
8657 msgid "parent number"
8660 #: builtin/revert.c:89
8661 msgid "merge strategy"
8664 #: builtin/revert.c:90
8668 #: builtin/revert.c:91
8669 msgid "option for merge strategy"
8672 #: builtin/revert.c:104
8673 msgid "append commit name"
8676 #: builtin/revert.c:105
8677 msgid "allow fast-forward"
8680 #: builtin/revert.c:106
8681 msgid "preserve initially empty commits"
8684 #: builtin/revert.c:107
8685 msgid "allow commits with empty messages"
8688 #: builtin/revert.c:108
8689 msgid "keep redundant, empty commits"
8692 #: builtin/revert.c:112
8693 msgid "program error"
8696 #: builtin/revert.c:197
8697 msgid "revert failed"
8700 #: builtin/revert.c:212
8701 msgid "cherry-pick failed"
8705 msgid "git rm [options] [--] <file>..."
8710 "the following submodule (or one of its nested submodules)\n"
8711 "uses a .git directory:"
8713 "the following submodules (or one of its nested submodules)\n"
8714 "use a .git directory:"
8721 "(use 'rm -rf' if you really want to remove it including all of its history)"
8726 "the following file has staged content different from both the\n"
8727 "file and the HEAD:"
8729 "the following files have staged content different from both the\n"
8730 "file and the HEAD:"
8737 "(use -f to force removal)"
8741 msgid "the following file has changes staged in the index:"
8742 msgid_plural "the following files have changes staged in the index:"
8746 #: builtin/rm.c:244 builtin/rm.c:255
8749 "(use --cached to keep the file, or -f to force removal)"
8753 msgid "the following file has local modifications:"
8754 msgid_plural "the following files have local modifications:"
8759 msgid "do not list removed files"
8763 msgid "only remove from the index"
8767 msgid "override the up-to-date check"
8771 msgid "allow recursive removal"
8775 msgid "exit with a zero status even if nothing matched"
8780 msgid "not removing '%s' recursively without -r"
8785 msgid "git rm: unable to remove %s"
8788 #: builtin/shortlog.c:13
8789 msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
8792 #: builtin/shortlog.c:131
8794 msgid "Missing author: %s"
8797 #: builtin/shortlog.c:230
8798 msgid "sort output according to the number of commits per author"
8801 #: builtin/shortlog.c:232
8802 msgid "Suppress commit descriptions, only provides commit count"
8805 #: builtin/shortlog.c:234
8806 msgid "Show the email address of each author"
8809 #: builtin/shortlog.c:235
8813 #: builtin/shortlog.c:236
8814 msgid "Linewrap output"
8817 #: builtin/show-branch.c:9
8819 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8820 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8821 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8825 #: builtin/show-branch.c:10
8826 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8829 #: builtin/show-branch.c:649
8830 msgid "show remote-tracking and local branches"
8833 #: builtin/show-branch.c:651
8834 msgid "show remote-tracking branches"
8837 #: builtin/show-branch.c:653
8838 msgid "color '*!+-' corresponding to the branch"
8841 #: builtin/show-branch.c:655
8842 msgid "show <n> more commits after the common ancestor"
8845 #: builtin/show-branch.c:657
8846 msgid "synonym to more=-1"
8849 #: builtin/show-branch.c:658
8850 msgid "suppress naming strings"
8853 #: builtin/show-branch.c:660
8854 msgid "include the current branch"
8857 #: builtin/show-branch.c:662
8858 msgid "name commits with their object names"
8861 #: builtin/show-branch.c:664
8862 msgid "show possible merge bases"
8865 #: builtin/show-branch.c:666
8866 msgid "show refs unreachable from any other ref"
8869 #: builtin/show-branch.c:668
8870 msgid "show commits in topological order"
8873 #: builtin/show-branch.c:671
8874 msgid "show only commits not on the first branch"
8877 #: builtin/show-branch.c:673
8878 msgid "show merges reachable from only one tip"
8881 #: builtin/show-branch.c:675
8882 msgid "topologically sort, maintaining date order where possible"
8885 #: builtin/show-branch.c:678
8886 msgid "<n>[,<base>]"
8889 #: builtin/show-branch.c:679
8890 msgid "show <n> most recent ref-log entries starting at base"
8893 #: builtin/show-ref.c:10
8895 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8896 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8899 #: builtin/show-ref.c:11
8900 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
8903 #: builtin/show-ref.c:168
8904 msgid "only show tags (can be combined with heads)"
8907 #: builtin/show-ref.c:169
8908 msgid "only show heads (can be combined with tags)"
8911 #: builtin/show-ref.c:170
8912 msgid "stricter reference checking, requires exact ref path"
8915 #: builtin/show-ref.c:173 builtin/show-ref.c:175
8916 msgid "show the HEAD reference, even if it would be filtered out"
8919 #: builtin/show-ref.c:177
8920 msgid "dereference tags into object IDs"
8923 #: builtin/show-ref.c:179
8924 msgid "only show SHA1 hash using <n> digits"
8927 #: builtin/show-ref.c:183
8928 msgid "do not print results to stdout (useful with --verify)"
8931 #: builtin/show-ref.c:185
8932 msgid "show refs from stdin that aren't in local repository"
8935 #: builtin/symbolic-ref.c:7
8936 msgid "git symbolic-ref [options] name [ref]"
8939 #: builtin/symbolic-ref.c:8
8940 msgid "git symbolic-ref -d [-q] name"
8943 #: builtin/symbolic-ref.c:40
8944 msgid "suppress error message for non-symbolic (detached) refs"
8947 #: builtin/symbolic-ref.c:41
8948 msgid "delete symbolic ref"
8951 #: builtin/symbolic-ref.c:42
8952 msgid "shorten ref output"
8955 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:349
8959 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:349
8960 msgid "reason of the update"
8965 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
8969 msgid "git tag -d <tagname>..."
8974 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8975 "\t\t[<pattern>...]"
8979 msgid "git tag -v <tagname>..."
8984 msgid "malformed object at '%s'"
8987 #: builtin/tag.c:301
8989 msgid "tag name too long: %.*s..."
8992 #: builtin/tag.c:306
8994 msgid "tag '%s' not found."
8997 #: builtin/tag.c:321
8999 msgid "Deleted tag '%s' (was %s)\n"
9002 #: builtin/tag.c:333
9004 msgid "could not verify the tag '%s'"
9007 #: builtin/tag.c:343
9011 "Write a message for tag:\n"
9013 "Lines starting with '%c' will be ignored.\n"
9016 #: builtin/tag.c:347
9020 "Write a message for tag:\n"
9022 "Lines starting with '%c' will be kept; you may remove them yourself if you "
9026 #: builtin/tag.c:371
9028 msgid "unsupported sort specification '%s'"
9031 #: builtin/tag.c:373
9033 msgid "unsupported sort specification '%s' in variable '%s'"
9036 #: builtin/tag.c:428
9037 msgid "unable to sign the tag"
9040 #: builtin/tag.c:430
9041 msgid "unable to write tag file"
9044 #: builtin/tag.c:455
9045 msgid "bad object type."
9048 #: builtin/tag.c:468
9049 msgid "tag header too big."
9052 #: builtin/tag.c:504
9053 msgid "no tag message?"
9056 #: builtin/tag.c:510
9058 msgid "The tag message has been left in %s\n"
9061 #: builtin/tag.c:559
9062 msgid "switch 'points-at' requires an object"
9065 #: builtin/tag.c:561
9067 msgid "malformed object name '%s'"
9070 #: builtin/tag.c:588
9071 msgid "list tag names"
9074 #: builtin/tag.c:590
9075 msgid "print <n> lines of each tag message"
9078 #: builtin/tag.c:592
9082 #: builtin/tag.c:593
9086 #: builtin/tag.c:595
9087 msgid "Tag creation options"
9090 #: builtin/tag.c:597
9091 msgid "annotated tag, needs a message"
9094 #: builtin/tag.c:599
9098 #: builtin/tag.c:601
9099 msgid "annotated and GPG-signed tag"
9102 #: builtin/tag.c:605
9103 msgid "use another key to sign the tag"
9106 #: builtin/tag.c:606
9107 msgid "replace the tag if exists"
9110 #: builtin/tag.c:607
9111 msgid "show tag list in columns"
9114 #: builtin/tag.c:609
9118 #: builtin/tag.c:613
9119 msgid "Tag listing options"
9122 #: builtin/tag.c:616 builtin/tag.c:622
9123 msgid "print only tags that contain the commit"
9126 #: builtin/tag.c:628
9127 msgid "print only tags of the object"
9130 #: builtin/tag.c:654
9131 msgid "--column and -n are incompatible"
9134 #: builtin/tag.c:666
9135 msgid "--sort and -n are incompatible"
9138 #: builtin/tag.c:673
9139 msgid "-n option is only allowed with -l."
9142 #: builtin/tag.c:675
9143 msgid "--contains option is only allowed with -l."
9146 #: builtin/tag.c:677
9147 msgid "--points-at option is only allowed with -l."
9150 #: builtin/tag.c:685
9151 msgid "only one -F or -m option is allowed."
9154 #: builtin/tag.c:705
9155 msgid "too many params"
9158 #: builtin/tag.c:711
9160 msgid "'%s' is not a valid tag name."
9163 #: builtin/tag.c:716
9165 msgid "tag '%s' already exists"
9168 #: builtin/tag.c:734
9170 msgid "%s: cannot lock the ref"
9173 #: builtin/tag.c:736
9175 msgid "%s: cannot update the ref"
9178 #: builtin/tag.c:738
9180 msgid "Updated tag '%s' (was %s)\n"
9183 #: builtin/unpack-objects.c:483
9184 msgid "Unpacking objects"
9187 #: builtin/update-index.c:402
9188 msgid "git update-index [options] [--] [<file>...]"
9191 #: builtin/update-index.c:755
9192 msgid "continue refresh even when index needs update"
9195 #: builtin/update-index.c:758
9196 msgid "refresh: ignore submodules"
9199 #: builtin/update-index.c:761
9200 msgid "do not ignore new files"
9203 #: builtin/update-index.c:763
9204 msgid "let files replace directories and vice-versa"
9207 #: builtin/update-index.c:765
9208 msgid "notice files missing from worktree"
9211 #: builtin/update-index.c:767
9212 msgid "refresh even if index contains unmerged entries"
9215 #: builtin/update-index.c:770
9216 msgid "refresh stat information"
9219 #: builtin/update-index.c:774
9220 msgid "like --refresh, but ignore assume-unchanged setting"
9223 #: builtin/update-index.c:778
9224 msgid "<mode>,<object>,<path>"
9227 #: builtin/update-index.c:779
9228 msgid "add the specified entry to the index"
9231 #: builtin/update-index.c:783
9235 #: builtin/update-index.c:784
9236 msgid "override the executable bit of the listed files"
9239 #: builtin/update-index.c:788
9240 msgid "mark files as \"not changing\""
9243 #: builtin/update-index.c:791
9244 msgid "clear assumed-unchanged bit"
9247 #: builtin/update-index.c:794
9248 msgid "mark files as \"index-only\""
9251 #: builtin/update-index.c:797
9252 msgid "clear skip-worktree bit"
9255 #: builtin/update-index.c:800
9256 msgid "add to index only; do not add content to object database"
9259 #: builtin/update-index.c:802
9260 msgid "remove named paths even if present in worktree"
9263 #: builtin/update-index.c:804
9264 msgid "with --stdin: input lines are terminated by null bytes"
9267 #: builtin/update-index.c:806
9268 msgid "read list of paths to be updated from standard input"
9271 #: builtin/update-index.c:810
9272 msgid "add entries from standard input to the index"
9275 #: builtin/update-index.c:814
9276 msgid "repopulate stages #2 and #3 for the listed paths"
9279 #: builtin/update-index.c:818
9280 msgid "only update entries that differ from HEAD"
9283 #: builtin/update-index.c:822
9284 msgid "ignore files missing from worktree"
9287 #: builtin/update-index.c:825
9288 msgid "report actions to standard output"
9291 #: builtin/update-index.c:827
9292 msgid "(for porcelains) forget saved unresolved conflicts"
9295 #: builtin/update-index.c:831
9296 msgid "write index in this format"
9299 #: builtin/update-index.c:833
9300 msgid "enable or disable split index"
9303 #: builtin/update-ref.c:9
9304 msgid "git update-ref [options] -d <refname> [<oldval>]"
9307 #: builtin/update-ref.c:10
9308 msgid "git update-ref [options] <refname> <newval> [<oldval>]"
9311 #: builtin/update-ref.c:11
9312 msgid "git update-ref [options] --stdin [-z]"
9315 #: builtin/update-ref.c:350
9316 msgid "delete the reference"
9319 #: builtin/update-ref.c:352
9320 msgid "update <refname> not the one it points to"
9323 #: builtin/update-ref.c:353
9324 msgid "stdin has NUL-terminated arguments"
9327 #: builtin/update-ref.c:354
9328 msgid "read updates from stdin"
9331 #: builtin/update-server-info.c:6
9332 msgid "git update-server-info [--force]"
9335 #: builtin/update-server-info.c:14
9336 msgid "update the info files from scratch"
9339 #: builtin/verify-commit.c:17
9340 msgid "git verify-commit [-v|--verbose] <commit>..."
9343 #: builtin/verify-commit.c:75
9344 msgid "print commit contents"
9347 #: builtin/verify-pack.c:55
9348 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9351 #: builtin/verify-pack.c:65
9355 #: builtin/verify-pack.c:67
9356 msgid "show statistics only"
9359 #: builtin/verify-tag.c:17
9360 msgid "git verify-tag [-v|--verbose] <tag>..."
9363 #: builtin/verify-tag.c:73
9364 msgid "print tag contents"
9367 #: builtin/write-tree.c:13
9368 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
9371 #: builtin/write-tree.c:26
9375 #: builtin/write-tree.c:27
9376 msgid "write tree object for a subdirectory <prefix>"
9379 #: builtin/write-tree.c:30
9380 msgid "only useful for debugging"
9385 "'git help -a' and 'git help -g' lists available subcommands and some\n"
9386 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
9387 "to read about a specific subcommand or concept."
9390 #: parse-options.h:143
9394 #: parse-options.h:158
9395 msgid "no-op (backward compatibility)"
9398 #: parse-options.h:232
9399 msgid "be more verbose"
9402 #: parse-options.h:234
9403 msgid "be more quiet"
9406 #: parse-options.h:240
9407 msgid "use <n> digits to display SHA-1s"
9411 msgid "Add file contents to the index"
9415 msgid "Find by binary search the change that introduced a bug"
9419 msgid "List, create, or delete branches"
9423 msgid "Checkout a branch or paths to the working tree"
9427 msgid "Clone a repository into a new directory"
9431 msgid "Record changes to the repository"
9435 msgid "Show changes between commits, commit and working tree, etc"
9439 msgid "Download objects and refs from another repository"
9443 msgid "Print lines matching a pattern"
9447 msgid "Create an empty Git repository or reinitialize an existing one"
9451 msgid "Show commit logs"
9455 msgid "Join two or more development histories together"
9459 msgid "Move or rename a file, a directory, or a symlink"
9463 msgid "Fetch from and integrate with another repository or a local branch"
9467 msgid "Update remote refs along with associated objects"
9471 msgid "Forward-port local commits to the updated upstream head"
9475 msgid "Reset current HEAD to the specified state"
9479 msgid "Remove files from the working tree and from the index"
9483 msgid "Show various types of objects"
9487 msgid "Show the working tree status"
9491 msgid "Create, list, delete or verify a tag object signed with GPG"
9495 msgid "You need to set your committer info first"
9500 "You seem to have moved HEAD since the last 'am' failure.\n"
9501 "Not rewinding to ORIG_HEAD"
9507 "When you have resolved this problem, run \"$cmdline --continue\".\n"
9508 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
9509 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
9513 msgid "Cannot fall back to three-way merge."
9517 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
9521 msgid "Using index info to reconstruct a base tree..."
9526 "Did you hand edit your patch?\n"
9527 "It does not apply to blobs recorded in its index."
9531 msgid "Falling back to patching base and 3-way merge..."
9535 msgid "Failed to merge in the changes."
9539 msgid "Only one StGIT patch series can be applied at once"
9544 msgid "Patch format $patch_format is not supported."
9548 msgid "Patch format detection failed."
9553 "The -b/--binary option has been a no-op for long time, and\n"
9554 "it will be removed. Please do not use it anymore."
9559 msgid "previous rebase directory $dotest still exists but mbox given."
9563 msgid "Please make up your mind. --skip or --abort?"
9569 "Stray $dotest directory found.\n"
9570 "Use \"git am --abort\" to remove it."
9574 msgid "Resolve operation not in progress, we are not resuming."
9579 msgid "Dirty index: cannot apply patches (dirty: $files)"
9585 "Patch is empty. Was it split wrong?\n"
9586 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
9587 "To restore the original branch and stop patching run \"$cmdline --abort\"."
9591 msgid "Patch does not have a valid e-mail address."
9595 msgid "cannot be interactive without stdin connected to a terminal."
9599 msgid "Commit Body is:"
9602 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9603 #. in your translation. The program will only accept English
9604 #. input at this point.
9606 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9611 msgid "Applying: $FIRSTLINE"
9616 "No changes - did you forget to use 'git add'?\n"
9617 "If there is nothing left to stage, chances are that something else\n"
9618 "already introduced the same changes; you might want to skip this patch."
9623 "You still have unmerged paths in your index\n"
9624 "did you forget to use 'git add'?"
9628 msgid "No changes -- Patch already applied."
9633 msgid "Patch failed at $msgnum $FIRSTLINE"
9639 "The copy of the patch that failed is found in:\n"
9644 msgid "applying to an empty history"
9648 msgid "You need to start by \"git bisect start\""
9651 #. TRANSLATORS: Make sure to include [Y] and [n] in your
9652 #. translation. The program will only accept English input
9655 msgid "Do you want me to do it for you [Y/n]? "
9660 msgid "unrecognised option: '$arg'"
9665 msgid "'$arg' does not appear to be a valid revision"
9668 #: git-bisect.sh:117
9669 msgid "Bad HEAD - I need a HEAD"
9672 #: git-bisect.sh:130
9675 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
9678 #: git-bisect.sh:140
9679 msgid "won't bisect on cg-seek'ed tree"
9682 #: git-bisect.sh:144
9683 msgid "Bad HEAD - strange symbolic ref"
9686 #: git-bisect.sh:189
9688 msgid "Bad bisect_write argument: $state"
9691 #: git-bisect.sh:218
9693 msgid "Bad rev input: $arg"
9696 #: git-bisect.sh:232
9697 msgid "Please call 'bisect_state' with at least one argument."
9700 #: git-bisect.sh:244
9702 msgid "Bad rev input: $rev"
9705 #: git-bisect.sh:250
9706 msgid "'git bisect bad' can take only one argument."
9709 #: git-bisect.sh:273
9710 msgid "Warning: bisecting only with a bad commit."
9713 #. TRANSLATORS: Make sure to include [Y] and [n] in your
9714 #. translation. The program will only accept English input
9716 #: git-bisect.sh:279
9717 msgid "Are you sure [Y/n]? "
9720 #: git-bisect.sh:289
9722 "You need to give me at least one good and one bad revisions.\n"
9723 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9726 #: git-bisect.sh:292
9728 "You need to start by \"git bisect start\".\n"
9729 "You then need to give me at least one good and one bad revisions.\n"
9730 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9733 #: git-bisect.sh:363 git-bisect.sh:490
9734 msgid "We are not bisecting."
9737 #: git-bisect.sh:370
9739 msgid "'$invalid' is not a valid commit"
9742 #: git-bisect.sh:379
9745 "Could not check out original HEAD '$branch'.\n"
9746 "Try 'git bisect reset <commit>'."
9749 #: git-bisect.sh:406
9750 msgid "No logfile given"
9753 #: git-bisect.sh:407
9755 msgid "cannot read $file for replaying"
9758 #: git-bisect.sh:424
9759 msgid "?? what are you talking about?"
9762 #: git-bisect.sh:436
9764 msgid "running $command"
9767 #: git-bisect.sh:443
9770 "bisect run failed:\n"
9771 "exit code $res from '$command' is < 0 or >= 128"
9774 #: git-bisect.sh:469
9775 msgid "bisect run cannot continue any more"
9778 #: git-bisect.sh:475
9781 "bisect run failed:\n"
9782 "'bisect_state $state' exited with error code $res"
9785 #: git-bisect.sh:482
9786 msgid "bisect run success"
9791 "Pull is not possible because you have unmerged files.\n"
9792 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
9793 "as appropriate to mark resolution, or use 'git commit -a'."
9797 msgid "Pull is not possible because you have unmerged files."
9801 msgid "updating an unborn branch with changes added to the index"
9807 "Warning: fetch updated the current branch head.\n"
9808 "Warning: fast-forwarding your working tree from\n"
9809 "Warning: commit $orig_head."
9813 msgid "Cannot merge multiple branches into empty head"
9817 msgid "Cannot rebase onto multiple branches"
9822 "When you have resolved this problem, run \"git rebase --continue\".\n"
9823 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
9824 "To check out the original branch and stop rebasing, run \"git rebase --abort"
9828 #: git-rebase.sh:165
9829 msgid "Applied autostash."
9832 #: git-rebase.sh:168
9834 msgid "Cannot store $stash_sha1"
9837 #: git-rebase.sh:169
9839 "Applying autostash resulted in conflicts.\n"
9840 "Your changes are safe in the stash.\n"
9841 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
9844 #: git-rebase.sh:208
9845 msgid "The pre-rebase hook refused to rebase."
9848 #: git-rebase.sh:213
9849 msgid "It looks like git-am is in progress. Cannot rebase."
9852 #: git-rebase.sh:351
9853 msgid "The --exec option must be used with the --interactive option"
9856 #: git-rebase.sh:356
9857 msgid "No rebase in progress?"
9860 #: git-rebase.sh:367
9861 msgid "The --edit-todo action can only be used during interactive rebase."
9864 #: git-rebase.sh:374
9865 msgid "Cannot read HEAD"
9868 #: git-rebase.sh:377
9870 "You must edit all merge conflicts and then\n"
9871 "mark them as resolved using git add"
9874 #: git-rebase.sh:395
9876 msgid "Could not move back to $head_name"
9879 #: git-rebase.sh:414
9882 "It seems that there is already a $state_dir_base directory, and\n"
9883 "I wonder if you are in the middle of another rebase. If that is the\n"
9884 "case, please try\n"
9885 "\t$cmd_live_rebase\n"
9886 "If that is not the case, please\n"
9887 "\t$cmd_clear_stale_rebase\n"
9888 "and run me again. I am stopping in case you still have something\n"
9892 #: git-rebase.sh:465
9894 msgid "invalid upstream $upstream_name"
9897 #: git-rebase.sh:489
9899 msgid "$onto_name: there are more than one merge bases"
9902 #: git-rebase.sh:492 git-rebase.sh:496
9904 msgid "$onto_name: there is no merge base"
9907 #: git-rebase.sh:501
9909 msgid "Does not point to a valid commit: $onto_name"
9912 #: git-rebase.sh:524
9914 msgid "fatal: no such branch: $branch_name"
9917 #: git-rebase.sh:557
9918 msgid "Cannot autostash"
9921 #: git-rebase.sh:562
9923 msgid "Created autostash: $stash_abbrev"
9926 #: git-rebase.sh:566
9927 msgid "Please commit or stash them."
9930 #: git-rebase.sh:586
9932 msgid "Current branch $branch_name is up to date."
9935 #: git-rebase.sh:590
9937 msgid "Current branch $branch_name is up to date, rebase forced."
9940 #: git-rebase.sh:601
9942 msgid "Changes from $mb to $onto:"
9945 #: git-rebase.sh:610
9946 msgid "First, rewinding head to replay your work on top of it..."
9949 #: git-rebase.sh:620
9951 msgid "Fast-forwarded $branch_name to $onto_name."
9955 msgid "git stash clear with parameters is unimplemented"
9959 msgid "You do not have the initial commit yet"
9963 msgid "Cannot save the current index state"
9966 #: git-stash.sh:124 git-stash.sh:137
9967 msgid "Cannot save the current worktree state"
9971 msgid "No changes selected"
9975 msgid "Cannot remove temporary index (can't happen)"
9979 msgid "Cannot record working tree state"
9984 msgid "Cannot update $ref_stash with $w_commit"
9987 #. TRANSLATORS: $option is an invalid option, like
9988 #. `--blah-blah'. The 7 spaces at the beginning of the
9989 #. second line correspond to "error: ". So you should line
9990 #. up the second line with however many characters the
9991 #. translation of "error: " takes in your language. E.g. in
9994 #. $ git stash save --blah-blah 2>&1 | head -n 2
9995 #. error: unknown option for 'stash save': --blah-blah
9996 #. To provide a message, use git stash save -- '--blah-blah'
10000 "error: unknown option for 'stash save': $option\n"
10001 " To provide a message, use git stash save -- '$option'"
10004 #: git-stash.sh:259
10005 msgid "No local changes to save"
10008 #: git-stash.sh:263
10009 msgid "Cannot initialize stash"
10012 #: git-stash.sh:267
10013 msgid "Cannot save the current status"
10016 #: git-stash.sh:285
10017 msgid "Cannot remove worktree changes"
10020 #: git-stash.sh:384
10021 msgid "No stash found."
10024 #: git-stash.sh:391
10026 msgid "Too many revisions specified: $REV"
10029 #: git-stash.sh:397
10031 msgid "$reference is not valid reference"
10034 #: git-stash.sh:425
10036 msgid "'$args' is not a stash-like commit"
10039 #: git-stash.sh:436
10041 msgid "'$args' is not a stash reference"
10044 #: git-stash.sh:444
10045 msgid "unable to refresh index"
10048 #: git-stash.sh:448
10049 msgid "Cannot apply a stash in the middle of a merge"
10052 #: git-stash.sh:456
10053 msgid "Conflicts in index. Try without --index."
10056 #: git-stash.sh:458
10057 msgid "Could not save index tree"
10060 #: git-stash.sh:492
10061 msgid "Cannot unstage modified files"
10064 #: git-stash.sh:507
10065 msgid "Index was not unstashed."
10068 #: git-stash.sh:530
10070 msgid "Dropped ${REV} ($s)"
10073 #: git-stash.sh:531
10075 msgid "${REV}: Could not drop stash entry"
10078 #: git-stash.sh:538
10079 msgid "No branch name specified"
10082 #: git-stash.sh:610
10083 msgid "(To restore them type \"git stash apply\")"
10086 #: git-submodule.sh:95
10088 msgid "cannot strip one component off url '$remoteurl'"
10091 #: git-submodule.sh:237
10093 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10096 #: git-submodule.sh:287
10098 msgid "Clone of '$url' into submodule path '$sm_path' failed"
10101 #: git-submodule.sh:296
10103 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
10106 #: git-submodule.sh:406
10107 msgid "Relative path can only be used from the toplevel of the working tree"
10110 #: git-submodule.sh:416
10112 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
10115 #: git-submodule.sh:433
10117 msgid "'$sm_path' already exists in the index"
10120 #: git-submodule.sh:437
10123 "The following path is ignored by one of your .gitignore files:\n"
10125 "Use -f if you really want to add it."
10128 #: git-submodule.sh:455
10130 msgid "Adding existing repo at '$sm_path' to the index"
10133 #: git-submodule.sh:457
10135 msgid "'$sm_path' already exists and is not a valid git repo"
10138 #: git-submodule.sh:465
10140 msgid "A git directory for '$sm_name' is found locally with remote(s):"
10143 #: git-submodule.sh:467
10146 "If you want to reuse this local git directory instead of cloning again from"
10149 #: git-submodule.sh:469
10152 "use the '--force' option. If the local git directory is not the correct repo"
10155 #: git-submodule.sh:470
10158 "or you are unsure what this means choose another name with the '--name' "
10162 #: git-submodule.sh:472
10164 msgid "Reactivating local git directory for submodule '$sm_name'."
10167 #: git-submodule.sh:484
10169 msgid "Unable to checkout submodule '$sm_path'"
10172 #: git-submodule.sh:489
10174 msgid "Failed to add submodule '$sm_path'"
10177 #: git-submodule.sh:498
10179 msgid "Failed to register submodule '$sm_path'"
10182 #: git-submodule.sh:542
10184 msgid "Entering '$prefix$displaypath'"
10187 #: git-submodule.sh:562
10189 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
10192 #: git-submodule.sh:608
10194 msgid "No url found for submodule path '$displaypath' in .gitmodules"
10197 #: git-submodule.sh:617
10199 msgid "Failed to register url for submodule path '$displaypath'"
10202 #: git-submodule.sh:619
10204 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
10207 #: git-submodule.sh:636
10209 msgid "Failed to register update mode for submodule path '$displaypath'"
10212 #: git-submodule.sh:674
10214 msgid "Use '.' if you really want to deinitialize all submodules"
10217 #: git-submodule.sh:691
10219 msgid "Submodule work tree '$displaypath' contains a .git directory"
10222 #: git-submodule.sh:692
10225 "(use 'rm -rf' if you really want to remove it including all of its history)"
10228 #: git-submodule.sh:698
10231 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
10235 #: git-submodule.sh:701
10237 msgid "Cleared directory '$displaypath'"
10240 #: git-submodule.sh:702
10242 msgid "Could not remove submodule work tree '$displaypath'"
10245 #: git-submodule.sh:705
10247 msgid "Could not create empty submodule directory '$displaypath'"
10250 #: git-submodule.sh:714
10252 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
10255 #: git-submodule.sh:830
10258 "Submodule path '$displaypath' not initialized\n"
10259 "Maybe you want to use 'update --init'?"
10262 #: git-submodule.sh:843
10264 msgid "Unable to find current revision in submodule path '$displaypath'"
10267 #: git-submodule.sh:852
10269 msgid "Unable to fetch in submodule path '$sm_path'"
10272 #: git-submodule.sh:876
10274 msgid "Unable to fetch in submodule path '$displaypath'"
10277 #: git-submodule.sh:890
10279 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
10282 #: git-submodule.sh:891
10284 msgid "Submodule path '$displaypath': checked out '$sha1'"
10287 #: git-submodule.sh:895
10289 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
10292 #: git-submodule.sh:896
10294 msgid "Submodule path '$displaypath': rebased into '$sha1'"
10297 #: git-submodule.sh:901
10299 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
10302 #: git-submodule.sh:902
10304 msgid "Submodule path '$displaypath': merged in '$sha1'"
10307 #: git-submodule.sh:907
10310 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
10313 #: git-submodule.sh:908
10315 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
10318 #: git-submodule.sh:938
10320 msgid "Failed to recurse into submodule path '$displaypath'"
10323 #: git-submodule.sh:1046
10324 msgid "The --cached option cannot be used with the --files option"
10327 #: git-submodule.sh:1098
10329 msgid "unexpected mode $mod_dst"
10332 #: git-submodule.sh:1118
10334 msgid " Warn: $display_name doesn't contain commit $sha1_src"
10337 #: git-submodule.sh:1121
10339 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
10342 #: git-submodule.sh:1124
10344 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
10347 #: git-submodule.sh:1149
10351 #: git-submodule.sh:1267
10353 msgid "Failed to recurse into submodule path '$sm_path'"
10356 #: git-submodule.sh:1331
10358 msgid "Synchronizing submodule url for '$displaypath'"