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: 2013-07-26 14:19+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"
27 #. * Message used both when 'git commit' fails and when
28 #. * other commands doing a merge do.
32 "Fix them up in the work tree,\n"
33 "and then use 'git add/rm <file>' as\n"
34 "appropriate to mark resolution and make a commit,\n"
35 "or use 'git commit -a'."
39 msgid "git archive [options] <tree-ish> [<path>...]"
43 msgid "git archive --list"
48 "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
52 msgid "git archive --remote <repo> [--exec <cmd>] --list"
60 msgid "archive format"
63 #: archive.c:324 builtin/log.c:1173
68 msgid "prepend prefix to each pathname in the archive"
71 #: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292
72 #: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673
73 #: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77
74 #: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408
75 #: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152
79 #: archive.c:327 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:345 builtin/archive.c:90 builtin/clone.c:85
111 #: archive.c:346 builtin/archive.c:91
112 msgid "retrieve the archive from remote repository <repo>"
115 #: archive.c:347 builtin/archive.c:92 builtin/notes.c:487
119 #: archive.c:348 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 "Tracking not set up: name too long: %s"
181 msgid "Not tracking: ambiguous information for ref %s"
186 msgid "'%s' is not a valid branch name."
191 msgid "A branch named '%s' already exists."
195 msgid "Cannot force update the current branch."
200 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
205 msgid "the requested upstream branch '%s' does not exist"
211 "If you are planning on basing your work on an upstream\n"
212 "branch that already exists at the remote, you may need to\n"
213 "run \"git fetch\" to retrieve it.\n"
215 "If you are planning to push out a new local branch that\n"
216 "will track its remote counterpart, you may want to use\n"
217 "\"git push -u\" to set the upstream config as you push."
222 msgid "Not a valid object name: '%s'."
227 msgid "Ambiguous object name: '%s'."
232 msgid "Not a valid branch point: '%s'."
236 msgid "Failed to lock ref for update"
240 msgid "Failed to write ref"
245 msgid "'%s' does not look like a v2 bundle file"
250 msgid "unrecognized header: %s%s (%d)"
253 #: bundle.c:89 builtin/commit.c:683
255 msgid "could not open '%s'"
259 msgid "Repository lacks these prerequisite commits:"
262 #: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331
263 #: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364
264 #: builtin/shortlog.c:156
265 msgid "revision walk setup failed"
270 msgid "The bundle contains this ref:"
271 msgid_plural "The bundle contains these %d refs:"
276 msgid "The bundle records a complete history."
281 msgid "The bundle requires this ref:"
282 msgid_plural "The bundle requires these %d refs:"
287 msgid "rev-list died"
290 #: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259
292 msgid "unrecognized argument: %s"
297 msgid "ref '%s' is excluded by the rev-list options"
301 msgid "Refusing to create empty bundle."
305 msgid "Could not spawn pack-objects"
309 msgid "pack-objects died"
314 msgid "cannot create '%s'"
318 msgid "index-pack died"
323 msgid "could not parse %s"
328 msgid "%s %s is not a commit!"
331 #: compat/obstack.c:406 compat/obstack.c:408
332 msgid "memory exhausted"
336 msgid "Could not run 'git rev-list'"
341 msgid "failed write to rev-list: %s"
346 msgid "failed to close rev-list's stdin: %s"
350 msgid "in the future"
355 msgid "%lu second ago"
356 msgid_plural "%lu seconds ago"
362 msgid "%lu minute ago"
363 msgid_plural "%lu minutes ago"
370 msgid_plural "%lu hours ago"
377 msgid_plural "%lu days ago"
384 msgid_plural "%lu weeks ago"
390 msgid "%lu month ago"
391 msgid_plural "%lu months ago"
398 msgid_plural "%lu years"
404 msgid "%s, %lu month ago"
405 msgid_plural "%s, %lu months ago"
409 #: date.c:154 date.c:159
412 msgid_plural "%lu years ago"
418 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
423 msgid " Unknown dirstat parameter '%s'\n"
428 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
434 "Found errors in 'diff.dirstat' config variable:\n"
441 "Failed to parse --dirstat/-X option parameter:\n"
447 msgid "Failed to parse --submodule option parameter: '%s'"
450 #: gpg-interface.c:59 gpg-interface.c:131
451 msgid "could not run gpg."
454 #: gpg-interface.c:71
455 msgid "gpg did not accept the data"
458 #: gpg-interface.c:82
459 msgid "gpg failed to sign the data"
462 #: gpg-interface.c:115
464 msgid "could not create temporary file '%s': %s"
467 #: gpg-interface.c:118
469 msgid "failed writing detached signature to '%s': %s"
474 msgid "'%s': unable to read %s"
484 msgid "'%s': short read %s"
489 msgid "available git commands in '%s'"
493 msgid "git commands available from elsewhere on your $PATH"
497 msgid "The most commonly used git commands are:"
503 "'%s' appears to be a git command, but we were not\n"
504 "able to execute it. Maybe git-%s is broken?"
508 msgid "Uh oh. Your system reports no Git commands at all."
514 "WARNING: You called a Git command named '%s', which does not exist.\n"
515 "Continuing under the assumption that you meant '%s'"
520 msgid "in %0.1f seconds automatically..."
525 msgid "git: '%s' is not a git command. See 'git --help'."
528 #: help.c:388 help.c:447
534 "Did you mean one of these?"
544 msgid "failed to read the cache"
547 #: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566
548 #: builtin/clone.c:656
549 msgid "unable to write new index file"
552 #: merge-recursive.c:190
554 msgid "(bad commit)\n"
557 #: merge-recursive.c:206
559 msgid "addinfo_cache failed for path '%s'"
562 #: merge-recursive.c:269
563 msgid "error building trees"
566 #: merge-recursive.c:673
568 msgid "failed to create path '%s'%s"
571 #: merge-recursive.c:684
573 msgid "Removing %s to make room for subdirectory\n"
576 #. something else exists
577 #. .. but not some other error (who really cares what?)
578 #: merge-recursive.c:698 merge-recursive.c:719
579 msgid ": perhaps a D/F conflict?"
582 #: merge-recursive.c:709
584 msgid "refusing to lose untracked file at '%s'"
587 #: merge-recursive.c:749
589 msgid "cannot read object %s '%s'"
592 #: merge-recursive.c:751
594 msgid "blob expected for %s '%s'"
597 #: merge-recursive.c:774 builtin/clone.c:312
599 msgid "failed to open '%s'"
602 #: merge-recursive.c:782
604 msgid "failed to symlink '%s'"
607 #: merge-recursive.c:785
609 msgid "do not know what to do with %06o %s '%s'"
612 #: merge-recursive.c:923
613 msgid "Failed to execute internal merge"
616 #: merge-recursive.c:927
618 msgid "Unable to add %s to database"
621 #: merge-recursive.c:943
622 msgid "unsupported object type in the tree"
625 #: merge-recursive.c:1022 merge-recursive.c:1036
628 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
632 #: merge-recursive.c:1028 merge-recursive.c:1041
635 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
639 #: merge-recursive.c:1082
643 #: merge-recursive.c:1082
647 #: merge-recursive.c:1138
649 msgid "%s is a directory in %s adding as %s instead"
652 #: merge-recursive.c:1160
655 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
656 "\"->\"%s\" in \"%s\"%s"
659 #: merge-recursive.c:1165
660 msgid " (left unresolved)"
663 #: merge-recursive.c:1219
665 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
668 #: merge-recursive.c:1249
670 msgid "Renaming %s to %s and %s to %s instead"
673 #: merge-recursive.c:1448
675 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
678 #: merge-recursive.c:1458
680 msgid "Adding merged %s"
683 #: merge-recursive.c:1463 merge-recursive.c:1661
685 msgid "Adding as %s instead"
688 #: merge-recursive.c:1514
690 msgid "cannot read object %s"
693 #: merge-recursive.c:1517
695 msgid "object %s is not a blob"
698 #: merge-recursive.c:1565
702 #: merge-recursive.c:1565
706 #: merge-recursive.c:1575
710 #: merge-recursive.c:1582
714 #: merge-recursive.c:1616
716 msgid "Skipped %s (merged same as existing)"
719 #: merge-recursive.c:1630
721 msgid "Auto-merging %s"
724 #: merge-recursive.c:1634 git-submodule.sh:1118
728 #: merge-recursive.c:1635
730 msgid "CONFLICT (%s): Merge conflict in %s"
733 #: merge-recursive.c:1725
738 #: merge-recursive.c:1750
739 msgid "file/directory"
742 #: merge-recursive.c:1756
743 msgid "directory/file"
746 #: merge-recursive.c:1761
748 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
751 #: merge-recursive.c:1771
756 #: merge-recursive.c:1788
757 msgid "Fatal merge failure, shouldn't happen."
760 #: merge-recursive.c:1807
761 msgid "Already up-to-date!"
764 #: merge-recursive.c:1816
766 msgid "merging of trees %s and %s failed"
769 #: merge-recursive.c:1846
771 msgid "Unprocessed path??? %s"
774 #: merge-recursive.c:1891
778 #: merge-recursive.c:1904
780 msgid "found %u common ancestor:"
781 msgid_plural "found %u common ancestors:"
785 #: merge-recursive.c:1941
786 msgid "merge returned no commit"
789 #: merge-recursive.c:1998
791 msgid "Could not parse object '%s'"
794 #: merge-recursive.c:2010 builtin/merge.c:672
795 msgid "Unable to write index."
799 msgid "Cannot commit uninitialized/unreferenced notes tree"
804 msgid "Bad notes.rewriteMode value: '%s'"
809 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
812 #. TRANSLATORS: The first %s is the name of the
813 #. environment variable, the second %s is its value
816 msgid "Bad %s value: '%s'"
821 msgid "unable to parse object: %s"
824 #: parse-options.c:489
828 #: parse-options.c:507
833 #. TRANSLATORS: the colon here should align with the
834 #. one in "usage: %s" translation
835 #: parse-options.c:511
840 #: parse-options.c:514
845 #: parse-options.c:548
851 msgid "Path '%s' is in submodule '%.*s'"
856 msgid "'%s' is beyond a symbolic link"
861 msgid "Your branch is ahead of '%s' by %d commit.\n"
862 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
867 msgid " (use \"git push\" to publish your local commits)\n"
872 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
874 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
879 msgid " (use \"git pull\" to update your local branch)\n"
885 "Your branch and '%s' have diverged,\n"
886 "and have %d and %d different commit each, respectively.\n"
888 "Your branch and '%s' have diverged,\n"
889 "and have %d and %d different commits each, respectively.\n"
894 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
898 msgid "open /dev/null failed"
903 msgid "dup2(%d,%d) failed"
906 #: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903
907 #: builtin/merge.c:1013 builtin/merge.c:1023
909 msgid "Could not open '%s' for writing"
912 #: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793
913 #: builtin/merge.c:1015 builtin/merge.c:1028
915 msgid "Could not write to '%s'"
920 "after resolving the conflicts, mark the corrected paths\n"
921 "with 'git add <paths>' or 'git rm <paths>'"
926 "after resolving the conflicts, mark the corrected paths\n"
927 "with 'git add <paths>' or 'git rm <paths>'\n"
928 "and commit the result with 'git commit'"
931 #: sequencer.c:245 sequencer.c:869 sequencer.c:952
933 msgid "Could not write to %s"
938 msgid "Error wrapping up %s"
942 msgid "Your local changes would be overwritten by cherry-pick."
946 msgid "Your local changes would be overwritten by revert."
950 msgid "Commit your changes or stash them to proceed."
953 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
956 msgid "%s: Unable to write new index file"
960 msgid "Could not resolve HEAD commit\n"
964 msgid "Unable to update cache tree\n"
969 msgid "Could not parse commit %s\n"
974 msgid "Could not parse parent commit %s\n"
978 msgid "Your index file is unmerged."
983 msgid "Commit %s is a merge but no -m option was given."
988 msgid "Commit %s does not have parent %d"
993 msgid "Mainline was specified but commit %s is not a merge."
996 #. TRANSLATORS: The first %s will be "revert" or
997 #. "cherry-pick", the second %s a SHA1
1000 msgid "%s: cannot parse parent commit %s"
1005 msgid "Cannot get commit message for %s"
1010 msgid "could not revert %s... %s"
1015 msgid "could not apply %s... %s"
1019 msgid "empty commit set passed"
1024 msgid "git %s: failed to read the index"
1029 msgid "git %s: failed to refresh the index"
1034 msgid "Cannot %s during a %s"
1039 msgid "Could not parse line %d."
1043 msgid "No commits parsed."
1048 msgid "Could not open %s"
1053 msgid "Could not read %s."
1058 msgid "Unusable instruction sheet: %s"
1063 msgid "Invalid key: %s"
1068 msgid "Invalid value for %s: %s"
1073 msgid "Malformed options sheet: %s"
1077 msgid "a cherry-pick or revert is already in progress"
1081 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1086 msgid "Could not create sequencer directory %s"
1089 #: sequencer.c:871 sequencer.c:956
1091 msgid "Error wrapping up %s."
1094 #: sequencer.c:890 sequencer.c:1024
1095 msgid "no cherry-pick or revert in progress"
1099 msgid "cannot resolve HEAD"
1103 msgid "cannot abort from a branch yet to be born"
1106 #: sequencer.c:916 builtin/apply.c:4061
1108 msgid "cannot open %s: %s"
1113 msgid "cannot read %s: %s"
1117 msgid "unexpected end of file"
1122 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1127 msgid "Could not format %s."
1132 msgid "%s: can't cherry-pick a %s"
1137 msgid "%s: bad revision"
1141 msgid "Can't revert as initial commit"
1145 msgid "Can't cherry-pick into empty head"
1150 "Git normally never creates a ref that ends with 40 hex characters\n"
1151 "because it will be ignored when you just specify 40-hex. These refs\n"
1152 "may be created by mistake. For example,\n"
1154 " git checkout -b $br $(git rev-parse ...)\n"
1156 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1157 "examine these refs and maybe delete them. Turn this message off by\n"
1158 "running \"git config advice.object_name_warning false\""
1162 msgid "HEAD does not point to a branch"
1167 msgid "No such branch: '%s'"
1172 msgid "No upstream configured for branch '%s'"
1177 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1182 msgid "unable to access '%s': %s"
1187 msgid "unable to access '%s'"
1192 msgid "unable to look up current user in the passwd file: %s"
1196 msgid "no such user"
1200 msgid "Unmerged paths:"
1203 #: wt-status.c:168 wt-status.c:195
1205 msgid " (use \"git reset %s <file>...\" to unstage)"
1208 #: wt-status.c:170 wt-status.c:197
1209 msgid " (use \"git rm --cached <file>...\" to unstage)"
1213 msgid " (use \"git add <file>...\" to mark resolution)"
1216 #: wt-status.c:176 wt-status.c:180
1217 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1221 msgid " (use \"git rm <file>...\" to mark resolution)"
1225 msgid "Changes to be committed:"
1229 msgid "Changes not staged for commit:"
1233 msgid " (use \"git add <file>...\" to update what will be committed)"
1237 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1242 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1246 msgid " (commit or discard the untracked or modified content in submodules)"
1251 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1259 msgid "both deleted:"
1263 msgid "added by us:"
1267 msgid "deleted by them:"
1271 msgid "added by them:"
1275 msgid "deleted by us:"
1283 msgid "both modified:"
1287 msgid "new commits, "
1291 msgid "modified content, "
1295 msgid "untracked content, "
1300 msgid "new file: %s"
1305 msgid "copied: %s -> %s"
1315 msgid "modified: %s"
1320 msgid "renamed: %s -> %s"
1325 msgid "typechange: %s"
1335 msgid "unmerged: %s"
1340 msgid "bug: unhandled diff status %c"
1344 msgid "You have unmerged paths."
1348 msgid " (fix conflicts and run \"git commit\")"
1352 msgid "All conflicts fixed but you are still merging."
1356 msgid " (use \"git commit\" to conclude merge)"
1360 msgid "You are in the middle of an am session."
1364 msgid "The current patch is empty."
1368 msgid " (fix conflicts and then run \"git am --continue\")"
1372 msgid " (use \"git am --skip\" to skip this patch)"
1376 msgid " (use \"git am --abort\" to restore the original branch)"
1379 #: wt-status.c:893 wt-status.c:910
1381 msgid "You are currently rebasing branch '%s' on '%s'."
1384 #: wt-status.c:898 wt-status.c:915
1385 msgid "You are currently rebasing."
1389 msgid " (fix conflicts and then run \"git rebase --continue\")"
1393 msgid " (use \"git rebase --skip\" to skip this patch)"
1397 msgid " (use \"git rebase --abort\" to check out the original branch)"
1401 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1407 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1411 msgid "You are currently splitting a commit during a rebase."
1415 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1420 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1424 msgid "You are currently editing a commit during a rebase."
1428 msgid " (use \"git commit --amend\" to amend the current commit)"
1433 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1437 msgid "You are currently cherry-picking."
1441 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1445 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1449 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1454 msgid "You are currently reverting commit %s."
1458 msgid " (fix conflicts and run \"git revert --continue\")"
1462 msgid " (all conflicts fixed: run \"git revert --continue\")"
1466 msgid " (use \"git revert --abort\" to cancel the revert operation)"
1471 msgid "You are currently bisecting, started from branch '%s'."
1475 msgid "You are currently bisecting."
1479 msgid " (use \"git bisect reset\" to get back to the original branch)"
1487 msgid "rebase in progress; onto "
1491 msgid "HEAD detached at "
1495 msgid "HEAD detached from "
1499 msgid "Not currently on any branch."
1503 msgid "Initial commit"
1507 msgid "Untracked files"
1511 msgid "Ignored files"
1517 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1518 "may speed it up, but you have to be careful not to forget to add\n"
1519 "new files yourself (see 'git help status')."
1524 msgid "Untracked files not listed%s"
1528 msgid " (use -u option to show untracked files)"
1537 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1542 msgid "no changes added to commit\n"
1548 "nothing added to commit but untracked files present (use \"git add\" to "
1554 msgid "nothing added to commit but untracked files present\n"
1559 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1562 #: wt-status.c:1263 wt-status.c:1268
1564 msgid "nothing to commit\n"
1569 msgid "nothing to commit (use -u to show untracked files)\n"
1574 msgid "nothing to commit, working directory clean\n"
1578 msgid "HEAD (no branch)"
1582 msgid "Initial commit on "
1589 #: wt-status.c:1402 wt-status.c:1405
1597 #: compat/precompose_utf8.c:58 builtin/clone.c:351
1599 msgid "failed to unlink '%s'"
1603 msgid "git add [options] [--] <pathspec>..."
1607 #. * To be consistent with "git add -p" and most Git
1608 #. * commands, we should default to being tree-wide, but
1609 #. * this is not the original behavior and can't be
1610 #. * changed until users trained themselves not to type
1611 #. * "git add -u" or "git add -A". For now, we warn and
1612 #. * keep the old behavior. Later, the behavior can be changed
1613 #. * to tree-wide, keeping the warning for a while, and
1614 #. * eventually we can drop the warning.
1619 "The behavior of 'git add %s (or %s)' with no path argument from a\n"
1620 "subdirectory of the tree will change in Git 2.0 and should not be used "
1622 "To add content for the whole tree, run:\n"
1625 " (or git add %s :/)\n"
1627 "To restrict the command to the current directory, run:\n"
1630 " (or git add %s .)\n"
1632 "With the current Git version, the command is restricted to the current "
1636 #: builtin/add.c:100
1639 "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
1640 "whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
1641 "Paths like '%s' that are\n"
1642 "removed from your working tree are ignored with this version of Git.\n"
1644 "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
1645 " ignores paths you removed from your working tree.\n"
1647 "* 'git add --all <pathspec>' will let you also record the removals.\n"
1649 "Run 'git status' to check the paths you removed from your working tree.\n"
1652 #: builtin/add.c:144
1654 msgid "unexpected diff status %c"
1657 #: builtin/add.c:149 builtin/commit.c:238
1658 msgid "updating files failed"
1661 #: builtin/add.c:163
1663 msgid "remove '%s'\n"
1666 #: builtin/add.c:253
1667 msgid "Unstaged changes after refreshing the index:"
1670 #: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337
1672 msgid "pathspec '%s' did not match any files"
1675 #: builtin/add.c:339
1676 msgid "Could not read the index"
1679 #: builtin/add.c:350
1681 msgid "Could not open '%s' for writing."
1684 #: builtin/add.c:354
1685 msgid "Could not write patch"
1688 #: builtin/add.c:359
1690 msgid "Could not stat '%s'"
1693 #: builtin/add.c:361
1694 msgid "Empty patch. Aborted."
1697 #: builtin/add.c:367
1699 msgid "Could not apply '%s'"
1702 #: builtin/add.c:377
1703 msgid "The following paths are ignored by one of your .gitignore files:\n"
1706 #: builtin/add.c:394 builtin/clean.c:851 builtin/fetch.c:78 builtin/mv.c:63
1707 #: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253
1712 #: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19
1713 #: builtin/commit.c:1201 builtin/count-objects.c:95 builtin/fsck.c:613
1714 #: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113
1718 #: builtin/add.c:397
1719 msgid "interactive picking"
1722 #: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261
1723 msgid "select hunks interactively"
1726 #: builtin/add.c:399
1727 msgid "edit current diff and apply"
1730 #: builtin/add.c:400
1731 msgid "allow adding otherwise ignored files"
1734 #: builtin/add.c:401
1735 msgid "update tracked files"
1738 #: builtin/add.c:402
1739 msgid "record only the fact that the path will be added later"
1742 #: builtin/add.c:403
1743 msgid "add changes from all tracked and untracked files"
1746 #. takes no arguments
1747 #: builtin/add.c:406
1748 msgid "ignore paths removed in the working tree (same as --no-all)"
1751 #: builtin/add.c:408
1752 msgid "don't add, only refresh the index"
1755 #: builtin/add.c:409
1756 msgid "just skip files which cannot be added because of errors"
1759 #: builtin/add.c:410
1760 msgid "check if - even missing - files are ignored in dry run"
1763 #: builtin/add.c:432
1765 msgid "Use -f if you really want to add them.\n"
1768 #: builtin/add.c:433
1769 msgid "no files added"
1772 #: builtin/add.c:439
1773 msgid "adding files failed"
1776 #: builtin/add.c:478
1777 msgid "-A and -u are mutually incompatible"
1780 #: builtin/add.c:496
1781 msgid "Option --ignore-missing can only be used together with --dry-run"
1784 #: builtin/add.c:526
1786 msgid "Nothing specified, nothing added.\n"
1789 #: builtin/add.c:527
1791 msgid "Maybe you wanted to say 'git add .'?\n"
1794 #: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:895
1795 #: builtin/commit.c:298 builtin/mv.c:82 builtin/rm.c:297
1796 msgid "index file corrupt"
1799 #: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432
1800 msgid "Unable to write new index file"
1803 #: builtin/apply.c:57
1804 msgid "git apply [options] [<patch>...]"
1807 #: builtin/apply.c:110
1809 msgid "unrecognized whitespace option '%s'"
1812 #: builtin/apply.c:125
1814 msgid "unrecognized whitespace ignore option '%s'"
1817 #: builtin/apply.c:823
1819 msgid "Cannot prepare timestamp regexp %s"
1822 #: builtin/apply.c:832
1824 msgid "regexec returned %d for input: %s"
1827 #: builtin/apply.c:913
1829 msgid "unable to find filename in patch at line %d"
1832 #: builtin/apply.c:945
1834 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1837 #: builtin/apply.c:949
1839 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1842 #: builtin/apply.c:950
1844 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1847 #: builtin/apply.c:957
1849 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1852 #: builtin/apply.c:1422
1854 msgid "recount: unexpected line: %.*s"
1857 #: builtin/apply.c:1479
1859 msgid "patch fragment without header at line %d: %.*s"
1862 #: builtin/apply.c:1496
1865 "git diff header lacks filename information when removing %d leading pathname "
1866 "component (line %d)"
1868 "git diff header lacks filename information when removing %d leading pathname "
1869 "components (line %d)"
1873 #: builtin/apply.c:1656
1874 msgid "new file depends on old contents"
1877 #: builtin/apply.c:1658
1878 msgid "deleted file still has contents"
1881 #: builtin/apply.c:1684
1883 msgid "corrupt patch at line %d"
1886 #: builtin/apply.c:1720
1888 msgid "new file %s depends on old contents"
1891 #: builtin/apply.c:1722
1893 msgid "deleted file %s still has contents"
1896 #: builtin/apply.c:1725
1898 msgid "** warning: file %s becomes empty but is not deleted"
1901 #: builtin/apply.c:1871
1903 msgid "corrupt binary patch at line %d: %.*s"
1906 #. there has to be one hunk (forward hunk)
1907 #: builtin/apply.c:1900
1909 msgid "unrecognized binary patch at line %d"
1912 #: builtin/apply.c:1986
1914 msgid "patch with only garbage at line %d"
1917 #: builtin/apply.c:2076
1919 msgid "unable to read symlink %s"
1922 #: builtin/apply.c:2080
1924 msgid "unable to open or read %s"
1927 #: builtin/apply.c:2688
1929 msgid "invalid start of line: '%c'"
1932 #: builtin/apply.c:2806
1934 msgid "Hunk #%d succeeded at %d (offset %d line)."
1935 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1939 #: builtin/apply.c:2818
1941 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1944 #: builtin/apply.c:2824
1947 "while searching for:\n"
1951 #: builtin/apply.c:2843
1953 msgid "missing binary patch data for '%s'"
1956 #: builtin/apply.c:2946
1958 msgid "binary patch does not apply to '%s'"
1961 #: builtin/apply.c:2952
1963 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1966 #: builtin/apply.c:2973
1968 msgid "patch failed: %s:%ld"
1971 #: builtin/apply.c:3095
1973 msgid "cannot checkout %s"
1976 #: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194
1978 msgid "read of %s failed"
1981 #: builtin/apply.c:3174 builtin/apply.c:3396
1983 msgid "path %s has been renamed/deleted"
1986 #: builtin/apply.c:3255 builtin/apply.c:3410
1988 msgid "%s: does not exist in index"
1991 #: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424
1996 #: builtin/apply.c:3264 builtin/apply.c:3418
1998 msgid "%s: does not match index"
2001 #: builtin/apply.c:3366
2002 msgid "removal patch leaves file contents"
2005 #: builtin/apply.c:3435
2007 msgid "%s: wrong type"
2010 #: builtin/apply.c:3437
2012 msgid "%s has type %o, expected %o"
2015 #: builtin/apply.c:3538
2017 msgid "%s: already exists in index"
2020 #: builtin/apply.c:3541
2022 msgid "%s: already exists in working directory"
2025 #: builtin/apply.c:3561
2027 msgid "new mode (%o) of %s does not match old mode (%o)"
2030 #: builtin/apply.c:3566
2032 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2035 #: builtin/apply.c:3574
2037 msgid "%s: patch does not apply"
2040 #: builtin/apply.c:3587
2042 msgid "Checking patch %s..."
2045 #: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127
2047 msgid "make_cache_entry failed for path '%s'"
2050 #: builtin/apply.c:3823
2052 msgid "unable to remove %s from index"
2055 #: builtin/apply.c:3851
2057 msgid "corrupt patch for submodule %s"
2060 #: builtin/apply.c:3855
2062 msgid "unable to stat newly created file '%s'"
2065 #: builtin/apply.c:3860
2067 msgid "unable to create backing store for newly created file %s"
2070 #: builtin/apply.c:3863 builtin/apply.c:3971
2072 msgid "unable to add cache entry for %s"
2075 #: builtin/apply.c:3896
2077 msgid "closing file '%s'"
2080 #: builtin/apply.c:3945
2082 msgid "unable to write file '%s' mode %o"
2085 #: builtin/apply.c:4032
2087 msgid "Applied patch %s cleanly."
2090 #: builtin/apply.c:4040
2091 msgid "internal error"
2094 #. Say this even without --verbose
2095 #: builtin/apply.c:4043
2097 msgid "Applying patch %%s with %d reject..."
2098 msgid_plural "Applying patch %%s with %d rejects..."
2102 #: builtin/apply.c:4053
2104 msgid "truncating .rej filename to %.*s.rej"
2107 #: builtin/apply.c:4074
2109 msgid "Hunk #%d applied cleanly."
2112 #: builtin/apply.c:4077
2114 msgid "Rejected hunk #%d."
2117 #: builtin/apply.c:4227
2118 msgid "unrecognized input"
2121 #: builtin/apply.c:4238
2122 msgid "unable to read index file"
2125 #: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91
2126 #: builtin/fetch.c:63
2130 #: builtin/apply.c:4358
2131 msgid "don't apply changes matching the given path"
2134 #: builtin/apply.c:4361
2135 msgid "apply changes matching the given path"
2138 #: builtin/apply.c:4363
2142 #: builtin/apply.c:4364
2143 msgid "remove <num> leading slashes from traditional diff paths"
2146 #: builtin/apply.c:4367
2147 msgid "ignore additions made by the patch"
2150 #: builtin/apply.c:4369
2151 msgid "instead of applying the patch, output diffstat for the input"
2154 #: builtin/apply.c:4373
2155 msgid "show number of added and deleted lines in decimal notation"
2158 #: builtin/apply.c:4375
2159 msgid "instead of applying the patch, output a summary for the input"
2162 #: builtin/apply.c:4377
2163 msgid "instead of applying the patch, see if the patch is applicable"
2166 #: builtin/apply.c:4379
2167 msgid "make sure the patch is applicable to the current index"
2170 #: builtin/apply.c:4381
2171 msgid "apply a patch without touching the working tree"
2174 #: builtin/apply.c:4383
2175 msgid "also apply the patch (use with --stat/--summary/--check)"
2178 #: builtin/apply.c:4385
2179 msgid "attempt three-way merge if a patch does not apply"
2182 #: builtin/apply.c:4387
2183 msgid "build a temporary index based on embedded index information"
2186 #: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462
2187 msgid "paths are separated with NUL character"
2190 #: builtin/apply.c:4392
2191 msgid "ensure at least <n> lines of context match"
2194 #: builtin/apply.c:4393
2198 #: builtin/apply.c:4394
2199 msgid "detect new or modified lines that have whitespace errors"
2202 #: builtin/apply.c:4397 builtin/apply.c:4400
2203 msgid "ignore changes in whitespace when finding context"
2206 #: builtin/apply.c:4403
2207 msgid "apply the patch in reverse"
2210 #: builtin/apply.c:4405
2211 msgid "don't expect at least one line of context"
2214 #: builtin/apply.c:4407
2215 msgid "leave the rejected hunks in corresponding *.rej files"
2218 #: builtin/apply.c:4409
2219 msgid "allow overlapping hunks"
2222 #: builtin/apply.c:4412
2223 msgid "tolerate incorrectly detected missing new-line at the end of file"
2226 #: builtin/apply.c:4415
2227 msgid "do not trust the line counts in the hunk headers"
2230 #: builtin/apply.c:4417
2234 #: builtin/apply.c:4418
2235 msgid "prepend <root> to all filenames"
2238 #: builtin/apply.c:4440
2239 msgid "--3way outside a repository"
2242 #: builtin/apply.c:4448
2243 msgid "--index outside a repository"
2246 #: builtin/apply.c:4451
2247 msgid "--cached outside a repository"
2250 #: builtin/apply.c:4467
2252 msgid "can't open patch '%s'"
2255 #: builtin/apply.c:4481
2257 msgid "squelched %d whitespace error"
2258 msgid_plural "squelched %d whitespace errors"
2262 #: builtin/apply.c:4487 builtin/apply.c:4497
2264 msgid "%d line adds whitespace errors."
2265 msgid_plural "%d lines add whitespace errors."
2269 #: builtin/archive.c:17
2271 msgid "could not create archive file '%s'"
2274 #: builtin/archive.c:20
2275 msgid "could not redirect output"
2278 #: builtin/archive.c:37
2279 msgid "git archive: Remote with no URL"
2282 #: builtin/archive.c:58
2283 msgid "git archive: expected ACK/NAK, got EOF"
2286 #: builtin/archive.c:61
2288 msgid "git archive: NACK %s"
2291 #: builtin/archive.c:63
2293 msgid "remote error: %s"
2296 #: builtin/archive.c:64
2297 msgid "git archive: protocol error"
2300 #: builtin/archive.c:68
2301 msgid "git archive: expected a flush"
2304 #: builtin/bisect--helper.c:7
2305 msgid "git bisect--helper --next-all [--no-checkout]"
2308 #: builtin/bisect--helper.c:17
2309 msgid "perform 'git bisect next'"
2312 #: builtin/bisect--helper.c:19
2313 msgid "update BISECT_HEAD instead of checking out the current commit"
2316 #: builtin/blame.c:26
2317 msgid "git blame [options] [rev-opts] [rev] [--] file"
2320 #: builtin/blame.c:31
2321 msgid "[rev-opts] are documented in git-rev-list(1)"
2324 #: builtin/blame.c:2276
2325 msgid "Show blame entries as we find them, incrementally"
2328 #: builtin/blame.c:2277
2329 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2332 #: builtin/blame.c:2278
2333 msgid "Do not treat root commits as boundaries (Default: off)"
2336 #: builtin/blame.c:2279
2337 msgid "Show work cost statistics"
2340 #: builtin/blame.c:2280
2341 msgid "Show output score for blame entries"
2344 #: builtin/blame.c:2281
2345 msgid "Show original filename (Default: auto)"
2348 #: builtin/blame.c:2282
2349 msgid "Show original linenumber (Default: off)"
2352 #: builtin/blame.c:2283
2353 msgid "Show in a format designed for machine consumption"
2356 #: builtin/blame.c:2284
2357 msgid "Show porcelain format with per-line commit information"
2360 #: builtin/blame.c:2285
2361 msgid "Use the same output mode as git-annotate (Default: off)"
2364 #: builtin/blame.c:2286
2365 msgid "Show raw timestamp (Default: off)"
2368 #: builtin/blame.c:2287
2369 msgid "Show long commit SHA1 (Default: off)"
2372 #: builtin/blame.c:2288
2373 msgid "Suppress author name and timestamp (Default: off)"
2376 #: builtin/blame.c:2289
2377 msgid "Show author email instead of name (Default: off)"
2380 #: builtin/blame.c:2290
2381 msgid "Ignore whitespace differences"
2384 #: builtin/blame.c:2291
2385 msgid "Spend extra cycles to find better match"
2388 #: builtin/blame.c:2292
2389 msgid "Use revisions from <file> instead of calling git-rev-list"
2392 #: builtin/blame.c:2293
2393 msgid "Use <file>'s contents as the final image"
2396 #: builtin/blame.c:2294 builtin/blame.c:2295
2400 #: builtin/blame.c:2294
2401 msgid "Find line copies within and across files"
2404 #: builtin/blame.c:2295
2405 msgid "Find line movements within and across files"
2408 #: builtin/blame.c:2296
2412 #: builtin/blame.c:2296
2413 msgid "Process only line range n,m, counting from 1"
2416 #: builtin/branch.c:24
2417 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2420 #: builtin/branch.c:25
2421 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2424 #: builtin/branch.c:26
2425 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2428 #: builtin/branch.c:27
2429 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2432 #: builtin/branch.c:150
2435 "deleting branch '%s' that has been merged to\n"
2436 " '%s', but not yet merged to HEAD."
2439 #: builtin/branch.c:154
2442 "not deleting branch '%s' that is not yet merged to\n"
2443 " '%s', even though it is merged to HEAD."
2446 #: builtin/branch.c:168
2448 msgid "Couldn't look up commit object for '%s'"
2451 #: builtin/branch.c:172
2454 "The branch '%s' is not fully merged.\n"
2455 "If you are sure you want to delete it, run 'git branch -D %s'."
2458 #: builtin/branch.c:185
2459 msgid "Update of config-file failed"
2462 #: builtin/branch.c:213
2463 msgid "cannot use -a with -d"
2466 #: builtin/branch.c:219
2467 msgid "Couldn't look up commit object for HEAD"
2470 #: builtin/branch.c:227
2472 msgid "Cannot delete the branch '%s' which you are currently on."
2475 #: builtin/branch.c:240
2477 msgid "remote branch '%s' not found."
2480 #: builtin/branch.c:241
2482 msgid "branch '%s' not found."
2485 #: builtin/branch.c:255
2487 msgid "Error deleting remote branch '%s'"
2490 #: builtin/branch.c:256
2492 msgid "Error deleting branch '%s'"
2495 #: builtin/branch.c:263
2497 msgid "Deleted remote branch %s (was %s).\n"
2500 #: builtin/branch.c:264
2502 msgid "Deleted branch %s (was %s).\n"
2505 #: builtin/branch.c:366
2507 msgid "branch '%s' does not point at a commit"
2510 #: builtin/branch.c:453
2512 msgid "[%s: behind %d]"
2515 #: builtin/branch.c:455
2520 #: builtin/branch.c:459
2522 msgid "[%s: ahead %d]"
2525 #: builtin/branch.c:461
2530 #: builtin/branch.c:464
2532 msgid "[%s: ahead %d, behind %d]"
2535 #: builtin/branch.c:467
2537 msgid "[ahead %d, behind %d]"
2540 #: builtin/branch.c:490
2541 msgid " **** invalid ref ****"
2544 #: builtin/branch.c:582
2546 msgid "(no branch, rebasing %s)"
2549 #: builtin/branch.c:585
2551 msgid "(no branch, bisect started on %s)"
2554 #: builtin/branch.c:588
2556 msgid "(detached from %s)"
2559 #: builtin/branch.c:591
2563 #: builtin/branch.c:637
2565 msgid "object '%s' does not point to a commit"
2568 #: builtin/branch.c:669
2569 msgid "some refs could not be read"
2572 #: builtin/branch.c:682
2573 msgid "cannot rename the current branch while not on any."
2576 #: builtin/branch.c:692
2578 msgid "Invalid branch name: '%s'"
2581 #: builtin/branch.c:707
2582 msgid "Branch rename failed"
2585 #: builtin/branch.c:711
2587 msgid "Renamed a misnamed branch '%s' away"
2590 #: builtin/branch.c:715
2592 msgid "Branch renamed to %s, but HEAD is not updated!"
2595 #: builtin/branch.c:722
2596 msgid "Branch is renamed, but update of config-file failed"
2599 #: builtin/branch.c:737
2601 msgid "malformed object name %s"
2604 #: builtin/branch.c:761
2606 msgid "could not write branch description template: %s"
2609 #: builtin/branch.c:791
2610 msgid "Generic options"
2613 #: builtin/branch.c:793
2614 msgid "show hash and subject, give twice for upstream branch"
2617 #: builtin/branch.c:794
2618 msgid "suppress informational messages"
2621 #: builtin/branch.c:795
2622 msgid "set up tracking mode (see git-pull(1))"
2625 #: builtin/branch.c:797
2626 msgid "change upstream info"
2629 #: builtin/branch.c:801
2630 msgid "use colored output"
2633 #: builtin/branch.c:802
2634 msgid "act on remote-tracking branches"
2637 #: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
2638 #: builtin/branch.c:838 builtin/commit.c:1414 builtin/commit.c:1415
2639 #: builtin/commit.c:1416 builtin/commit.c:1417 builtin/tag.c:468
2643 #: builtin/branch.c:806 builtin/branch.c:812
2644 msgid "print only branches that contain the commit"
2647 #: builtin/branch.c:818
2648 msgid "Specific git-branch actions:"
2651 #: builtin/branch.c:819
2652 msgid "list both remote-tracking and local branches"
2655 #: builtin/branch.c:821
2656 msgid "delete fully merged branch"
2659 #: builtin/branch.c:822
2660 msgid "delete branch (even if not merged)"
2663 #: builtin/branch.c:823
2664 msgid "move/rename a branch and its reflog"
2667 #: builtin/branch.c:824
2668 msgid "move/rename a branch, even if target exists"
2671 #: builtin/branch.c:825
2672 msgid "list branch names"
2675 #: builtin/branch.c:826
2676 msgid "create the branch's reflog"
2679 #: builtin/branch.c:828
2680 msgid "edit the description for the branch"
2683 #: builtin/branch.c:829
2684 msgid "force creation (when already exists)"
2687 #: builtin/branch.c:832
2688 msgid "print only not merged branches"
2691 #: builtin/branch.c:838
2692 msgid "print only merged branches"
2695 #: builtin/branch.c:842
2696 msgid "list branches in columns"
2699 #: builtin/branch.c:855
2700 msgid "Failed to resolve HEAD as a valid ref."
2703 #: builtin/branch.c:860 builtin/clone.c:630
2704 msgid "HEAD not found below refs/heads!"
2707 #: builtin/branch.c:883
2708 msgid "--column and --verbose are incompatible"
2711 #: builtin/branch.c:889 builtin/branch.c:928
2712 msgid "branch name required"
2715 #: builtin/branch.c:904
2716 msgid "Cannot give description to detached HEAD"
2719 #: builtin/branch.c:909
2720 msgid "cannot edit description of more than one branch"
2723 #: builtin/branch.c:916
2725 msgid "No commit on branch '%s' yet."
2728 #: builtin/branch.c:919
2730 msgid "No branch named '%s'."
2733 #: builtin/branch.c:934
2734 msgid "too many branches for a rename operation"
2737 #: builtin/branch.c:939
2738 msgid "too many branches to set new upstream"
2741 #: builtin/branch.c:943
2744 "could not set upstream of HEAD to %s when it does not point to any branch."
2747 #: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990
2749 msgid "no such branch '%s'"
2752 #: builtin/branch.c:950
2754 msgid "branch '%s' does not exist"
2757 #: builtin/branch.c:962
2758 msgid "too many branches to unset upstream"
2761 #: builtin/branch.c:966
2762 msgid "could not unset upstream of HEAD when it does not point to any branch."
2765 #: builtin/branch.c:972
2767 msgid "Branch '%s' has no upstream information"
2770 #: builtin/branch.c:987
2771 msgid "it does not make sense to create 'HEAD' manually"
2774 #: builtin/branch.c:993
2775 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2778 #: builtin/branch.c:996
2781 "The --set-upstream flag is deprecated and will be removed. Consider using --"
2782 "track or --set-upstream-to\n"
2785 #: builtin/branch.c:1013
2789 "If you wanted to make '%s' track '%s', do this:\n"
2793 #: builtin/branch.c:1014
2795 msgid " git branch -d %s\n"
2798 #: builtin/branch.c:1015
2800 msgid " git branch --set-upstream-to %s\n"
2803 #: builtin/bundle.c:47
2805 msgid "%s is okay\n"
2808 #: builtin/bundle.c:56
2809 msgid "Need a repository to create a bundle."
2812 #: builtin/bundle.c:60
2813 msgid "Need a repository to unbundle."
2816 #: builtin/cat-file.c:303
2817 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2820 #: builtin/cat-file.c:304
2821 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2824 #: builtin/cat-file.c:341
2825 msgid "<type> can be one of: blob, tree, commit, tag"
2828 #: builtin/cat-file.c:342
2829 msgid "show object type"
2832 #: builtin/cat-file.c:343
2833 msgid "show object size"
2836 #: builtin/cat-file.c:345
2837 msgid "exit with zero when there's no error"
2840 #: builtin/cat-file.c:346
2841 msgid "pretty-print object's content"
2844 #: builtin/cat-file.c:348
2845 msgid "for blob objects, run textconv on object's content"
2848 #: builtin/cat-file.c:350
2849 msgid "show info and content of objects fed from the standard input"
2852 #: builtin/cat-file.c:353
2853 msgid "show info about objects fed from the standard input"
2856 #: builtin/check-attr.c:11
2857 msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2860 #: builtin/check-attr.c:12
2861 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2864 #: builtin/check-attr.c:19
2865 msgid "report all attributes set on file"
2868 #: builtin/check-attr.c:20
2869 msgid "use .gitattributes only from the index"
2872 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
2873 msgid "read file names from stdin"
2876 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
2877 msgid "input paths are terminated by a null character"
2880 #: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177
2881 msgid "suppress progress reporting"
2884 #: builtin/check-ignore.c:26
2885 msgid "show non-matching input paths"
2888 #: builtin/check-ignore.c:143
2889 msgid "cannot specify pathnames with --stdin"
2892 #: builtin/check-ignore.c:146
2893 msgid "-z only makes sense with --stdin"
2896 #: builtin/check-ignore.c:148
2897 msgid "no path specified"
2900 #: builtin/check-ignore.c:152
2901 msgid "--quiet is only valid with a single pathname"
2904 #: builtin/check-ignore.c:154
2905 msgid "cannot have both --quiet and --verbose"
2908 #: builtin/check-ignore.c:157
2909 msgid "--non-matching is only valid with --verbose"
2912 #: builtin/check-mailmap.c:8
2913 msgid "git check-mailmap [options] <contact>..."
2916 #: builtin/check-mailmap.c:13
2917 msgid "also read contacts from stdin"
2920 #: builtin/check-mailmap.c:24
2922 msgid "unable to parse contact: %s"
2925 #: builtin/check-mailmap.c:47
2926 msgid "no contacts specified"
2929 #: builtin/checkout-index.c:126
2930 msgid "git checkout-index [options] [--] [<file>...]"
2933 #: builtin/checkout-index.c:187
2934 msgid "check out all files in the index"
2937 #: builtin/checkout-index.c:188
2938 msgid "force overwrite of existing files"
2941 #: builtin/checkout-index.c:190
2942 msgid "no warning for existing files and files not in index"
2945 #: builtin/checkout-index.c:192
2946 msgid "don't checkout new files"
2949 #: builtin/checkout-index.c:194
2950 msgid "update stat information in the index file"
2953 #: builtin/checkout-index.c:200
2954 msgid "read list of paths from the standard input"
2957 #: builtin/checkout-index.c:202
2958 msgid "write the content to temporary files"
2961 #: builtin/checkout-index.c:203 builtin/column.c:30
2965 #: builtin/checkout-index.c:204
2966 msgid "when creating files, prepend <string>"
2969 #: builtin/checkout-index.c:207
2970 msgid "copy out the files from named stage"
2973 #: builtin/checkout.c:25
2974 msgid "git checkout [options] <branch>"
2977 #: builtin/checkout.c:26
2978 msgid "git checkout [options] [<branch>] -- <file>..."
2981 #: builtin/checkout.c:117 builtin/checkout.c:150
2983 msgid "path '%s' does not have our version"
2986 #: builtin/checkout.c:119 builtin/checkout.c:152
2988 msgid "path '%s' does not have their version"
2991 #: builtin/checkout.c:135
2993 msgid "path '%s' does not have all necessary versions"
2996 #: builtin/checkout.c:179
2998 msgid "path '%s' does not have necessary versions"
3001 #: builtin/checkout.c:196
3003 msgid "path '%s': cannot merge"
3006 #: builtin/checkout.c:213
3008 msgid "Unable to add merge result for '%s'"
3011 #: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243
3012 #: builtin/checkout.c:246
3014 msgid "'%s' cannot be used with updating paths"
3017 #: builtin/checkout.c:249 builtin/checkout.c:252
3019 msgid "'%s' cannot be used with %s"
3022 #: builtin/checkout.c:255
3024 msgid "Cannot update paths and switch to branch '%s' at the same time."
3027 #: builtin/checkout.c:266 builtin/checkout.c:458
3028 msgid "corrupt index file"
3031 #: builtin/checkout.c:329 builtin/checkout.c:336
3033 msgid "path '%s' is unmerged"
3036 #: builtin/checkout.c:480
3037 msgid "you need to resolve your current index first"
3040 #: builtin/checkout.c:601
3042 msgid "Can not do reflog for '%s'\n"
3045 #: builtin/checkout.c:639
3046 msgid "HEAD is now at"
3049 #: builtin/checkout.c:646
3051 msgid "Reset branch '%s'\n"
3054 #: builtin/checkout.c:649
3056 msgid "Already on '%s'\n"
3059 #: builtin/checkout.c:653
3061 msgid "Switched to and reset branch '%s'\n"
3064 #: builtin/checkout.c:655 builtin/checkout.c:997
3066 msgid "Switched to a new branch '%s'\n"
3069 #: builtin/checkout.c:657
3071 msgid "Switched to branch '%s'\n"
3074 #: builtin/checkout.c:713
3076 msgid " ... and %d more.\n"
3079 #. The singular version
3080 #: builtin/checkout.c:719
3083 "Warning: you are leaving %d commit behind, not connected to\n"
3084 "any of your branches:\n"
3088 "Warning: you are leaving %d commits behind, not connected to\n"
3089 "any of your branches:\n"
3095 #: builtin/checkout.c:737
3098 "If you want to keep them by creating a new branch, this may be a good time\n"
3101 " git branch new_branch_name %s\n"
3105 #: builtin/checkout.c:767
3106 msgid "internal error in revision walk"
3109 #: builtin/checkout.c:771
3110 msgid "Previous HEAD position was"
3113 #: builtin/checkout.c:798 builtin/checkout.c:992
3114 msgid "You are on a branch yet to be born"
3118 #: builtin/checkout.c:928
3120 msgid "invalid reference: %s"
3123 #. case (1): want a tree
3124 #: builtin/checkout.c:967
3126 msgid "reference is not a tree: %s"
3129 #: builtin/checkout.c:1006
3130 msgid "paths cannot be used with switching branches"
3133 #: builtin/checkout.c:1009 builtin/checkout.c:1013
3135 msgid "'%s' cannot be used with switching branches"
3138 #: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025
3139 #: builtin/checkout.c:1028
3141 msgid "'%s' cannot be used with '%s'"
3144 #: builtin/checkout.c:1033
3146 msgid "Cannot switch branch to a non-commit '%s'"
3149 #: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89
3150 #: builtin/remote.c:169 builtin/remote.c:171
3154 #: builtin/checkout.c:1056
3155 msgid "create and checkout a new branch"
3158 #: builtin/checkout.c:1058
3159 msgid "create/reset and checkout a branch"
3162 #: builtin/checkout.c:1059
3163 msgid "create reflog for new branch"
3166 #: builtin/checkout.c:1060
3167 msgid "detach the HEAD at named commit"
3170 #: builtin/checkout.c:1061
3171 msgid "set upstream info for new branch"
3174 #: builtin/checkout.c:1063
3178 #: builtin/checkout.c:1063
3179 msgid "new unparented branch"
3182 #: builtin/checkout.c:1064
3183 msgid "checkout our version for unmerged files"
3186 #: builtin/checkout.c:1066
3187 msgid "checkout their version for unmerged files"
3190 #: builtin/checkout.c:1068
3191 msgid "force checkout (throw away local modifications)"
3194 #: builtin/checkout.c:1069
3195 msgid "perform a 3-way merge with the new branch"
3198 #: builtin/checkout.c:1070 builtin/merge.c:232
3199 msgid "update ignored files (default)"
3202 #: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249
3206 #: builtin/checkout.c:1072
3207 msgid "conflict style (merge or diff3)"
3210 #: builtin/checkout.c:1075
3211 msgid "do not limit pathspecs to sparse entries only"
3214 #: builtin/checkout.c:1077
3215 msgid "second guess 'git checkout no-such-branch'"
3218 #: builtin/checkout.c:1101
3219 msgid "-b, -B and --orphan are mutually exclusive"
3222 #: builtin/checkout.c:1118
3223 msgid "--track needs a branch name"
3226 #: builtin/checkout.c:1125
3227 msgid "Missing branch name; try -b"
3230 #: builtin/checkout.c:1160
3231 msgid "invalid path specification"
3234 #: builtin/checkout.c:1167
3237 "Cannot update paths and switch to branch '%s' at the same time.\n"
3238 "Did you intend to checkout '%s' which can not be resolved as commit?"
3241 #: builtin/checkout.c:1172
3243 msgid "git checkout: --detach does not take a path argument '%s'"
3246 #: builtin/checkout.c:1176
3248 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3249 "checking out of the index."
3252 #: builtin/clean.c:25
3254 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3257 #: builtin/clean.c:29
3259 msgid "Removing %s\n"
3262 #: builtin/clean.c:30
3264 msgid "Would remove %s\n"
3267 #: builtin/clean.c:31
3269 msgid "Skipping repository %s\n"
3272 #: builtin/clean.c:32
3274 msgid "Would skip repository %s\n"
3277 #: builtin/clean.c:33
3279 msgid "failed to remove %s"
3282 #: builtin/clean.c:293
3285 "1 - select a numbered item\n"
3286 "foo - select item based on unique prefix\n"
3287 " - (empty) select nothing"
3290 #: builtin/clean.c:297
3293 "1 - select a single item\n"
3294 "3-5 - select a range of items\n"
3295 "2-3,6-9 - select multiple ranges\n"
3296 "foo - select item based on unique prefix\n"
3297 "-... - unselect specified items\n"
3298 "* - choose all items\n"
3299 " - (empty) finish selecting"
3302 #: builtin/clean.c:491
3307 #: builtin/clean.c:634
3309 msgid "Input ignore patterns>> "
3312 #: builtin/clean.c:671
3314 msgid "WARNING: Cannot find items matched by: %s"
3317 #: builtin/clean.c:692
3318 msgid "Select items to delete"
3321 #: builtin/clean.c:732
3326 #: builtin/clean.c:757
3330 #: builtin/clean.c:765
3332 "clean - start cleaning\n"
3333 "filter by pattern - exclude items from deletion\n"
3334 "select by numbers - select items to be deleted by numbers\n"
3335 "ask each - confirm each deletion (like \"rm -i\")\n"
3336 "quit - stop cleaning\n"
3337 "help - this screen\n"
3338 "? - help for prompt selection"
3341 #: builtin/clean.c:792
3342 msgid "*** Commands ***"
3345 #: builtin/clean.c:793
3349 #: builtin/clean.c:801
3350 msgid "Would remove the following item:"
3351 msgid_plural "Would remove the following items:"
3355 #: builtin/clean.c:818
3356 msgid "No more files to clean, exiting."
3359 #: builtin/clean.c:850
3360 msgid "do not print names of files removed"
3363 #: builtin/clean.c:852
3367 #: builtin/clean.c:853
3368 msgid "interactive cleaning"
3371 #: builtin/clean.c:855
3372 msgid "remove whole directories"
3375 #: builtin/clean.c:856 builtin/describe.c:420 builtin/grep.c:716
3376 #: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186
3380 #: builtin/clean.c:857
3381 msgid "add <pattern> to ignore rules"
3384 #: builtin/clean.c:858
3385 msgid "remove ignored files, too"
3388 #: builtin/clean.c:860
3389 msgid "remove only ignored files"
3392 #: builtin/clean.c:878
3393 msgid "-x and -X cannot be used together"
3396 #: builtin/clean.c:882
3398 "clean.requireForce set to true and neither -i, -n nor -f given; refusing to "
3402 #: builtin/clean.c:885
3404 "clean.requireForce defaults to true and neither -i, -n nor -f given; "
3408 #: builtin/clone.c:36
3409 msgid "git clone [options] [--] <repo> [<dir>]"
3412 #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229
3413 #: builtin/push.c:462
3414 msgid "force progress reporting"
3417 #: builtin/clone.c:66
3418 msgid "don't create a checkout"
3421 #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
3422 msgid "create a bare repository"
3425 #: builtin/clone.c:72
3426 msgid "create a mirror repository (implies bare)"
3429 #: builtin/clone.c:74
3430 msgid "to clone from a local repository"
3433 #: builtin/clone.c:76
3434 msgid "don't use local hardlinks, always copy"
3437 #: builtin/clone.c:78
3438 msgid "setup as shared repository"
3441 #: builtin/clone.c:80 builtin/clone.c:82
3442 msgid "initialize submodules in the clone"
3445 #: builtin/clone.c:83 builtin/init-db.c:485
3446 msgid "template-directory"
3449 #: builtin/clone.c:84 builtin/init-db.c:486
3450 msgid "directory from which templates will be used"
3453 #: builtin/clone.c:86
3454 msgid "reference repository"
3457 #: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
3461 #: builtin/clone.c:88
3462 msgid "use <name> instead of 'origin' to track upstream"
3465 #: builtin/clone.c:90
3466 msgid "checkout <branch> instead of the remote's HEAD"
3469 #: builtin/clone.c:92
3470 msgid "path to git-upload-pack on the remote"
3473 #: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661
3477 #: builtin/clone.c:94
3478 msgid "create a shallow clone of that depth"
3481 #: builtin/clone.c:96
3482 msgid "clone only one branch, HEAD or --branch"
3485 #: builtin/clone.c:97 builtin/init-db.c:494
3489 #: builtin/clone.c:98 builtin/init-db.c:495
3490 msgid "separate git dir from working tree"
3493 #: builtin/clone.c:99
3497 #: builtin/clone.c:100
3498 msgid "set config inside the new repository"
3501 #: builtin/clone.c:253
3503 msgid "reference repository '%s' is not a local repository."
3506 #: builtin/clone.c:316
3508 msgid "failed to create directory '%s'"
3511 #: builtin/clone.c:318 builtin/diff.c:77
3513 msgid "failed to stat '%s'"
3516 #: builtin/clone.c:320
3518 msgid "%s exists and is not a directory"
3521 #: builtin/clone.c:334
3523 msgid "failed to stat %s\n"
3526 #: builtin/clone.c:356
3528 msgid "failed to create link '%s'"
3531 #: builtin/clone.c:360
3533 msgid "failed to copy file to '%s'"
3536 #: builtin/clone.c:383
3541 #: builtin/clone.c:396
3543 "Clone succeeded, but checkout failed.\n"
3544 "You can inspect what was checked out with 'git status'\n"
3545 "and retry the checkout with 'git checkout -f HEAD'\n"
3548 #: builtin/clone.c:475
3550 msgid "Could not find remote branch %s to clone."
3553 #: builtin/clone.c:555
3555 msgid "Checking connectivity... "
3558 #: builtin/clone.c:558
3559 msgid "remote did not send all necessary objects"
3562 #: builtin/clone.c:560
3567 #: builtin/clone.c:621
3568 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3571 #: builtin/clone.c:652
3572 msgid "unable to checkout working tree"
3575 #: builtin/clone.c:760
3576 msgid "Too many arguments."
3579 #: builtin/clone.c:764
3580 msgid "You must specify a repository to clone."
3583 #: builtin/clone.c:775
3585 msgid "--bare and --origin %s options are incompatible."
3588 #: builtin/clone.c:778
3589 msgid "--bare and --separate-git-dir are incompatible."
3592 #: builtin/clone.c:791
3594 msgid "repository '%s' does not exist"
3597 #: builtin/clone.c:796
3598 msgid "--depth is ignored in local clones; use file:// instead."
3601 #: builtin/clone.c:798
3602 msgid "--local is ignored"
3605 #: builtin/clone.c:808
3607 msgid "destination path '%s' already exists and is not an empty directory."
3610 #: builtin/clone.c:818
3612 msgid "working tree '%s' already exists."
3615 #: builtin/clone.c:831 builtin/clone.c:843
3617 msgid "could not create leading directories of '%s'"
3620 #: builtin/clone.c:834
3622 msgid "could not create work tree dir '%s'."
3625 #: builtin/clone.c:853
3627 msgid "Cloning into bare repository '%s'...\n"
3630 #: builtin/clone.c:855
3632 msgid "Cloning into '%s'...\n"
3635 #: builtin/clone.c:890
3637 msgid "Don't know how to clone %s"
3640 #: builtin/clone.c:942
3642 msgid "Remote branch %s not found in upstream %s"
3645 #: builtin/clone.c:949
3646 msgid "You appear to have cloned an empty repository."
3649 #: builtin/column.c:9
3650 msgid "git column [options]"
3653 #: builtin/column.c:26
3654 msgid "lookup config vars"
3657 #: builtin/column.c:27 builtin/column.c:28
3658 msgid "layout to use"
3661 #: builtin/column.c:29
3662 msgid "Maximum width"
3665 #: builtin/column.c:30
3666 msgid "Padding space on left border"
3669 #: builtin/column.c:31
3670 msgid "Padding space on right border"
3673 #: builtin/column.c:32
3674 msgid "Padding space between columns"
3677 #: builtin/column.c:51
3678 msgid "--command must be the first argument"
3681 #: builtin/commit.c:35
3682 msgid "git commit [options] [--] <pathspec>..."
3685 #: builtin/commit.c:40
3686 msgid "git status [options] [--] <pathspec>..."
3689 #: builtin/commit.c:45
3691 "Your name and email address were configured automatically based\n"
3692 "on your username and hostname. Please check that they are accurate.\n"
3693 "You can suppress this message by setting them explicitly:\n"
3695 " git config --global user.name \"Your Name\"\n"
3696 " git config --global user.email you@example.com\n"
3698 "After doing this, you may fix the identity used for this commit with:\n"
3700 " git commit --amend --reset-author\n"
3703 #: builtin/commit.c:57
3705 "You asked to amend the most recent commit, but doing so would make\n"
3706 "it empty. You can repeat your command with --allow-empty, or you can\n"
3707 "remove the commit entirely with \"git reset HEAD^\".\n"
3710 #: builtin/commit.c:62
3712 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3713 "If you wish to commit it anyway, use:\n"
3715 " git commit --allow-empty\n"
3717 "Otherwise, please use 'git reset'\n"
3720 #: builtin/commit.c:265
3721 msgid "failed to unpack HEAD tree object"
3724 #: builtin/commit.c:307
3725 msgid "unable to create temporary index"
3728 #: builtin/commit.c:313
3729 msgid "interactive add failed"
3732 #: builtin/commit.c:346 builtin/commit.c:367 builtin/commit.c:417
3733 msgid "unable to write new_index file"
3736 #: builtin/commit.c:398
3737 msgid "cannot do a partial commit during a merge."
3740 #: builtin/commit.c:400
3741 msgid "cannot do a partial commit during a cherry-pick."
3744 #: builtin/commit.c:410
3745 msgid "cannot read the index"
3748 #: builtin/commit.c:430
3749 msgid "unable to write temporary index file"
3752 #: builtin/commit.c:521 builtin/commit.c:527
3754 msgid "invalid commit: %s"
3757 #: builtin/commit.c:549
3758 msgid "malformed --author parameter"
3761 #: builtin/commit.c:569
3763 msgid "Malformed ident string: '%s'"
3766 #: builtin/commit.c:607 builtin/commit.c:640 builtin/commit.c:963
3768 msgid "could not lookup commit %s"
3771 #: builtin/commit.c:619 builtin/shortlog.c:271
3773 msgid "(reading log message from standard input)\n"
3776 #: builtin/commit.c:621
3777 msgid "could not read log from standard input"
3780 #: builtin/commit.c:625
3782 msgid "could not read log file '%s'"
3785 #: builtin/commit.c:631
3786 msgid "commit has empty message"
3789 #: builtin/commit.c:647
3790 msgid "could not read MERGE_MSG"
3793 #: builtin/commit.c:651
3794 msgid "could not read SQUASH_MSG"
3797 #: builtin/commit.c:655
3799 msgid "could not read '%s'"
3802 #: builtin/commit.c:716
3803 msgid "could not write commit template"
3806 #: builtin/commit.c:727
3810 "It looks like you may be committing a merge.\n"
3811 "If this is not correct, please remove the file\n"
3816 #: builtin/commit.c:732
3820 "It looks like you may be committing a cherry-pick.\n"
3821 "If this is not correct, please remove the file\n"
3826 #: builtin/commit.c:744
3829 "Please enter the commit message for your changes. Lines starting\n"
3830 "with '%c' will be ignored, and an empty message aborts the commit.\n"
3833 #: builtin/commit.c:749
3836 "Please enter the commit message for your changes. Lines starting\n"
3837 "with '%c' will be kept; you may remove them yourself if you want to.\n"
3838 "An empty message aborts the commit.\n"
3841 #: builtin/commit.c:762
3843 msgid "%sAuthor: %s"
3846 #: builtin/commit.c:769
3848 msgid "%sCommitter: %s"
3851 #: builtin/commit.c:789
3852 msgid "Cannot read index"
3855 #: builtin/commit.c:826
3856 msgid "Error building trees"
3859 #: builtin/commit.c:841 builtin/tag.c:359
3861 msgid "Please supply the message using either -m or -F option.\n"
3864 #: builtin/commit.c:938
3866 msgid "No existing author found with '%s'"
3869 #: builtin/commit.c:953 builtin/commit.c:1189
3871 msgid "Invalid untracked files mode '%s'"
3874 #: builtin/commit.c:990
3875 msgid "--long and -z are incompatible"
3878 #: builtin/commit.c:1020
3879 msgid "Using both --reset-author and --author does not make sense"
3882 #: builtin/commit.c:1031
3883 msgid "You have nothing to amend."
3886 #: builtin/commit.c:1034
3887 msgid "You are in the middle of a merge -- cannot amend."
3890 #: builtin/commit.c:1036
3891 msgid "You are in the middle of a cherry-pick -- cannot amend."
3894 #: builtin/commit.c:1039
3895 msgid "Options --squash and --fixup cannot be used together"
3898 #: builtin/commit.c:1049
3899 msgid "Only one of -c/-C/-F/--fixup can be used."
3902 #: builtin/commit.c:1051
3903 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3906 #: builtin/commit.c:1059
3907 msgid "--reset-author can be used only with -C, -c or --amend."
3910 #: builtin/commit.c:1076
3911 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3914 #: builtin/commit.c:1078
3915 msgid "No paths with --include/--only does not make sense."
3918 #: builtin/commit.c:1080
3919 msgid "Clever... amending the last one with dirty index."
3922 #: builtin/commit.c:1082
3923 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3926 #: builtin/commit.c:1092 builtin/tag.c:575
3928 msgid "Invalid cleanup mode %s"
3931 #: builtin/commit.c:1097
3932 msgid "Paths with -a does not make sense."
3935 #: builtin/commit.c:1203 builtin/commit.c:1436
3936 msgid "show status concisely"
3939 #: builtin/commit.c:1205 builtin/commit.c:1438
3940 msgid "show branch information"
3943 #: builtin/commit.c:1207 builtin/commit.c:1440 builtin/push.c:452
3944 msgid "machine-readable output"
3947 #: builtin/commit.c:1210 builtin/commit.c:1442
3948 msgid "show status in long format (default)"
3951 #: builtin/commit.c:1213 builtin/commit.c:1445
3952 msgid "terminate entries with NUL"
3955 #: builtin/commit.c:1215 builtin/commit.c:1448 builtin/fast-export.c:667
3956 #: builtin/fast-export.c:670 builtin/tag.c:459
3960 #: builtin/commit.c:1216 builtin/commit.c:1448
3961 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3964 #: builtin/commit.c:1219
3965 msgid "show ignored files"
3968 #: builtin/commit.c:1220 parse-options.h:154
3972 #: builtin/commit.c:1221
3974 "ignore changes to submodules, optional when: all, dirty, untracked. "
3978 #: builtin/commit.c:1223
3979 msgid "list untracked files in columns"
3982 #: builtin/commit.c:1294
3983 msgid "couldn't look up newly created commit"
3986 #: builtin/commit.c:1296
3987 msgid "could not parse newly created commit"
3990 #: builtin/commit.c:1337
3991 msgid "detached HEAD"
3994 #: builtin/commit.c:1339
3995 msgid " (root-commit)"
3998 #: builtin/commit.c:1406
3999 msgid "suppress summary after successful commit"
4002 #: builtin/commit.c:1407
4003 msgid "show diff in commit message template"
4006 #: builtin/commit.c:1409
4007 msgid "Commit message options"
4010 #: builtin/commit.c:1410 builtin/tag.c:457
4011 msgid "read message from file"
4014 #: builtin/commit.c:1411
4018 #: builtin/commit.c:1411
4019 msgid "override author for commit"
4022 #: builtin/commit.c:1412 builtin/gc.c:178
4026 #: builtin/commit.c:1412
4027 msgid "override date for commit"
4030 #: builtin/commit.c:1413 builtin/merge.c:223 builtin/notes.c:405
4031 #: builtin/notes.c:562 builtin/tag.c:455
4035 #: builtin/commit.c:1413
4036 msgid "commit message"
4039 #: builtin/commit.c:1414
4040 msgid "reuse and edit message from specified commit"
4043 #: builtin/commit.c:1415
4044 msgid "reuse message from specified commit"
4047 #: builtin/commit.c:1416
4048 msgid "use autosquash formatted message to fixup specified commit"
4051 #: builtin/commit.c:1417
4052 msgid "use autosquash formatted message to squash specified commit"
4055 #: builtin/commit.c:1418
4056 msgid "the commit is authored by me now (used with -C/-c/--amend)"
4059 #: builtin/commit.c:1419 builtin/log.c:1160 builtin/revert.c:111
4060 msgid "add Signed-off-by:"
4063 #: builtin/commit.c:1420
4064 msgid "use specified template file"
4067 #: builtin/commit.c:1421
4068 msgid "force edit of commit"
4071 #: builtin/commit.c:1422
4075 #: builtin/commit.c:1422 builtin/tag.c:460
4076 msgid "how to strip spaces and #comments from message"
4079 #: builtin/commit.c:1423
4080 msgid "include status in commit message template"
4083 #: builtin/commit.c:1424 builtin/merge.c:230 builtin/tag.c:461
4087 #: builtin/commit.c:1425 builtin/merge.c:231
4088 msgid "GPG sign commit"
4091 #. end commit message options
4092 #: builtin/commit.c:1428
4093 msgid "Commit contents options"
4096 #: builtin/commit.c:1429
4097 msgid "commit all changed files"
4100 #: builtin/commit.c:1430
4101 msgid "add specified files to index for commit"
4104 #: builtin/commit.c:1431
4105 msgid "interactively add files"
4108 #: builtin/commit.c:1432
4109 msgid "interactively add changes"
4112 #: builtin/commit.c:1433
4113 msgid "commit only specified files"
4116 #: builtin/commit.c:1434
4117 msgid "bypass pre-commit hook"
4120 #: builtin/commit.c:1435
4121 msgid "show what would be committed"
4124 #: builtin/commit.c:1446
4125 msgid "amend previous commit"
4128 #: builtin/commit.c:1447
4129 msgid "bypass post-rewrite hook"
4132 #: builtin/commit.c:1452
4133 msgid "ok to record an empty change"
4136 #: builtin/commit.c:1455
4137 msgid "ok to record a change with an empty message"
4140 #: builtin/commit.c:1488
4141 msgid "could not parse HEAD commit"
4144 #: builtin/commit.c:1526 builtin/merge.c:525
4146 msgid "could not open '%s' for reading"
4149 #: builtin/commit.c:1533
4151 msgid "Corrupt MERGE_HEAD file (%s)"
4154 #: builtin/commit.c:1540
4155 msgid "could not read MERGE_MODE"
4158 #: builtin/commit.c:1559
4160 msgid "could not read commit message: %s"
4163 #: builtin/commit.c:1573
4165 msgid "Aborting commit; you did not edit the message.\n"
4168 #: builtin/commit.c:1578
4170 msgid "Aborting commit due to empty commit message.\n"
4173 #: builtin/commit.c:1593 builtin/merge.c:861 builtin/merge.c:886
4174 msgid "failed to write commit object"
4177 #: builtin/commit.c:1614
4178 msgid "cannot lock HEAD ref"
4181 #: builtin/commit.c:1618
4182 msgid "cannot update HEAD ref"
4185 #: builtin/commit.c:1629
4187 "Repository has been updated, but unable to write\n"
4188 "new_index file. Check that disk is not full or quota is\n"
4189 "not exceeded, and then \"git reset HEAD\" to recover."
4192 #: builtin/config.c:7
4193 msgid "git config [options]"
4196 #: builtin/config.c:52
4197 msgid "Config file location"
4200 #: builtin/config.c:53
4201 msgid "use global config file"
4204 #: builtin/config.c:54
4205 msgid "use system config file"
4208 #: builtin/config.c:55
4209 msgid "use repository config file"
4212 #: builtin/config.c:56
4213 msgid "use given config file"
4216 #: builtin/config.c:57
4220 #: builtin/config.c:57
4221 msgid "read config from given blob object"
4224 #: builtin/config.c:58
4228 #: builtin/config.c:59
4229 msgid "get value: name [value-regex]"
4232 #: builtin/config.c:60
4233 msgid "get all values: key [value-regex]"
4236 #: builtin/config.c:61
4237 msgid "get values for regexp: name-regex [value-regex]"
4240 #: builtin/config.c:62
4241 msgid "replace all matching variables: name value [value_regex]"
4244 #: builtin/config.c:63
4245 msgid "add a new variable: name value"
4248 #: builtin/config.c:64
4249 msgid "remove a variable: name [value-regex]"
4252 #: builtin/config.c:65
4253 msgid "remove all matches: name [value-regex]"
4256 #: builtin/config.c:66
4257 msgid "rename section: old-name new-name"
4260 #: builtin/config.c:67
4261 msgid "remove a section: name"
4264 #: builtin/config.c:68
4268 #: builtin/config.c:69
4269 msgid "open an editor"
4272 #: builtin/config.c:70 builtin/config.c:71
4276 #: builtin/config.c:70
4277 msgid "find the color configured: [default]"
4280 #: builtin/config.c:71
4281 msgid "find the color setting: [stdout-is-tty]"
4284 #: builtin/config.c:72
4288 #: builtin/config.c:73
4289 msgid "value is \"true\" or \"false\""
4292 #: builtin/config.c:74
4293 msgid "value is decimal number"
4296 #: builtin/config.c:75
4297 msgid "value is --bool or --int"
4300 #: builtin/config.c:76
4301 msgid "value is a path (file or directory name)"
4304 #: builtin/config.c:77
4308 #: builtin/config.c:78
4309 msgid "terminate values with NUL byte"
4312 #: builtin/config.c:79
4313 msgid "respect include directives on lookup"
4316 #: builtin/count-objects.c:82
4317 msgid "git count-objects [-v] [-H | --human-readable]"
4320 #: builtin/count-objects.c:97
4321 msgid "print sizes in human readable format"
4324 #: builtin/describe.c:16
4325 msgid "git describe [options] <committish>*"
4328 #: builtin/describe.c:17
4329 msgid "git describe [options] --dirty"
4332 #: builtin/describe.c:237
4334 msgid "annotated tag %s not available"
4337 #: builtin/describe.c:241
4339 msgid "annotated tag %s has no embedded name"
4342 #: builtin/describe.c:243
4344 msgid "tag '%s' is really '%s' here"
4347 #: builtin/describe.c:270
4349 msgid "Not a valid object name %s"
4352 #: builtin/describe.c:273
4354 msgid "%s is not a valid '%s' object"
4357 #: builtin/describe.c:290
4359 msgid "no tag exactly matches '%s'"
4362 #: builtin/describe.c:292
4364 msgid "searching to describe %s\n"
4367 #: builtin/describe.c:332
4369 msgid "finished search at %s\n"
4372 #: builtin/describe.c:359
4375 "No annotated tags can describe '%s'.\n"
4376 "However, there were unannotated tags: try --tags."
4379 #: builtin/describe.c:363
4382 "No tags can describe '%s'.\n"
4383 "Try --always, or create some tags."
4386 #: builtin/describe.c:384
4388 msgid "traversed %lu commits\n"
4391 #: builtin/describe.c:387
4394 "more than %i tags found; listed %i most recent\n"
4395 "gave up search at %s\n"
4398 #: builtin/describe.c:409
4399 msgid "find the tag that comes after the commit"
4402 #: builtin/describe.c:410
4403 msgid "debug search strategy on stderr"
4406 #: builtin/describe.c:411
4410 #: builtin/describe.c:412
4411 msgid "use any tag, even unannotated"
4414 #: builtin/describe.c:413
4415 msgid "always use long format"
4418 #: builtin/describe.c:414
4419 msgid "only follow first parent"
4422 #: builtin/describe.c:417
4423 msgid "only output exact matches"
4426 #: builtin/describe.c:419
4427 msgid "consider <n> most recent tags (default: 10)"
4430 #: builtin/describe.c:421
4431 msgid "only consider tags matching <pattern>"
4434 #: builtin/describe.c:423 builtin/name-rev.c:322
4435 msgid "show abbreviated commit object as fallback"
4438 #: builtin/describe.c:424
4442 #: builtin/describe.c:425
4443 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4446 #: builtin/describe.c:443
4447 msgid "--long is incompatible with --abbrev=0"
4450 #: builtin/describe.c:469
4451 msgid "No names found, cannot describe anything."
4454 #: builtin/describe.c:489
4455 msgid "--dirty is incompatible with committishes"
4458 #: builtin/diff.c:79
4460 msgid "'%s': not a regular file or symlink"
4463 #: builtin/diff.c:230
4465 msgid "invalid option: %s"
4468 #: builtin/diff.c:307
4469 msgid "Not a git repository"
4472 #: builtin/diff.c:350
4474 msgid "invalid object '%s' given."
4477 #: builtin/diff.c:359
4479 msgid "more than two blobs given: '%s'"
4482 #: builtin/diff.c:366
4484 msgid "unhandled object '%s' given."
4487 #: builtin/fast-export.c:22
4488 msgid "git fast-export [rev-list-opts]"
4491 #: builtin/fast-export.c:666
4492 msgid "show progress after <n> objects"
4495 #: builtin/fast-export.c:668
4496 msgid "select handling of signed tags"
4499 #: builtin/fast-export.c:671
4500 msgid "select handling of tags that tag filtered objects"
4503 #: builtin/fast-export.c:674
4504 msgid "Dump marks to this file"
4507 #: builtin/fast-export.c:676
4508 msgid "Import marks from this file"
4511 #: builtin/fast-export.c:678
4512 msgid "Fake a tagger when tags lack one"
4515 #: builtin/fast-export.c:680
4516 msgid "Output full tree for each commit"
4519 #: builtin/fast-export.c:682
4520 msgid "Use the done feature to terminate the stream"
4523 #: builtin/fast-export.c:683
4524 msgid "Skip output of blob data"
4527 #: builtin/fetch.c:20
4528 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4531 #: builtin/fetch.c:21
4532 msgid "git fetch [<options>] <group>"
4535 #: builtin/fetch.c:22
4536 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4539 #: builtin/fetch.c:23
4540 msgid "git fetch --all [<options>]"
4543 #: builtin/fetch.c:60
4544 msgid "fetch from all remotes"
4547 #: builtin/fetch.c:62
4548 msgid "append to .git/FETCH_HEAD instead of overwriting"
4551 #: builtin/fetch.c:64
4552 msgid "path to upload pack on remote end"
4555 #: builtin/fetch.c:65
4556 msgid "force overwrite of local branch"
4559 #: builtin/fetch.c:67
4560 msgid "fetch from multiple remotes"
4563 #: builtin/fetch.c:69
4564 msgid "fetch all tags and associated objects"
4567 #: builtin/fetch.c:71
4568 msgid "do not fetch all tags (--no-tags)"
4571 #: builtin/fetch.c:73
4572 msgid "prune remote-tracking branches no longer on remote"
4575 #: builtin/fetch.c:74
4579 #: builtin/fetch.c:75
4580 msgid "control recursive fetching of submodules"
4583 #: builtin/fetch.c:79
4584 msgid "keep downloaded pack"
4587 #: builtin/fetch.c:81
4588 msgid "allow updating of HEAD ref"
4591 #: builtin/fetch.c:84
4592 msgid "deepen history of shallow clone"
4595 #: builtin/fetch.c:86
4596 msgid "convert to a complete repository"
4599 #: builtin/fetch.c:88 builtin/log.c:1177
4603 #: builtin/fetch.c:89
4604 msgid "prepend this to submodule path output"
4607 #: builtin/fetch.c:92
4608 msgid "default mode for recursion"
4611 #: builtin/fetch.c:220
4612 msgid "Couldn't find remote ref HEAD"
4615 #: builtin/fetch.c:273
4617 msgid "object %s not found"
4620 #: builtin/fetch.c:278
4621 msgid "[up to date]"
4624 #: builtin/fetch.c:292
4626 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4629 #: builtin/fetch.c:293 builtin/fetch.c:379
4633 #: builtin/fetch.c:304
4634 msgid "[tag update]"
4637 #: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359
4638 msgid " (unable to update local ref)"
4641 #: builtin/fetch.c:324
4645 #: builtin/fetch.c:327
4646 msgid "[new branch]"
4649 #: builtin/fetch.c:330
4653 #: builtin/fetch.c:375
4654 msgid "unable to update local ref"
4657 #: builtin/fetch.c:375
4658 msgid "forced update"
4661 #: builtin/fetch.c:381
4662 msgid "(non-fast-forward)"
4665 #: builtin/fetch.c:412 builtin/fetch.c:718
4667 msgid "cannot open %s: %s\n"
4670 #: builtin/fetch.c:421
4672 msgid "%s did not send all necessary objects\n"
4675 #: builtin/fetch.c:520
4680 #: builtin/fetch.c:531
4683 "some local refs could not be updated; try running\n"
4684 " 'git remote prune %s' to remove any old, conflicting branches"
4687 #: builtin/fetch.c:581
4689 msgid " (%s will become dangling)"
4692 #: builtin/fetch.c:582
4694 msgid " (%s has become dangling)"
4697 #: builtin/fetch.c:589
4701 #: builtin/fetch.c:590 builtin/remote.c:1055
4705 #: builtin/fetch.c:708
4707 msgid "Refusing to fetch into current branch %s of non-bare repository"
4710 #: builtin/fetch.c:742
4712 msgid "Don't know how to fetch from %s"
4715 #: builtin/fetch.c:823
4717 msgid "Option \"%s\" value \"%s\" is not valid for %s"
4720 #: builtin/fetch.c:826
4722 msgid "Option \"%s\" is ignored for %s\n"
4725 #: builtin/fetch.c:928
4727 msgid "Fetching %s\n"
4730 #: builtin/fetch.c:930 builtin/remote.c:100
4732 msgid "Could not fetch %s"
4735 #: builtin/fetch.c:949
4737 "No remote repository specified. Please, specify either a URL or a\n"
4738 "remote name from which new revisions should be fetched."
4741 #: builtin/fetch.c:969
4742 msgid "You need to specify a tag name."
4745 #: builtin/fetch.c:1015
4746 msgid "--depth and --unshallow cannot be used together"
4749 #: builtin/fetch.c:1017
4750 msgid "--unshallow on a complete repository does not make sense"
4753 #: builtin/fetch.c:1036
4754 msgid "fetch --all does not take a repository argument"
4757 #: builtin/fetch.c:1038
4758 msgid "fetch --all does not make sense with refspecs"
4761 #: builtin/fetch.c:1049
4763 msgid "No such remote or remote group: %s"
4766 #: builtin/fetch.c:1057
4767 msgid "Fetching a group and specifying refspecs does not make sense"
4770 #: builtin/fmt-merge-msg.c:13
4771 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4774 #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700
4775 #: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179
4776 #: builtin/tag.c:446 parse-options.h:133 parse-options.h:243
4780 #: builtin/fmt-merge-msg.c:664
4781 msgid "populate log with at most <n> entries from shortlog"
4784 #: builtin/fmt-merge-msg.c:667
4785 msgid "alias for --log (deprecated)"
4788 #: builtin/fmt-merge-msg.c:670
4792 #: builtin/fmt-merge-msg.c:671
4793 msgid "use <text> as start of message"
4796 #: builtin/fmt-merge-msg.c:672
4797 msgid "file to read from"
4800 #: builtin/for-each-ref.c:979
4801 msgid "git for-each-ref [options] [<pattern>]"
4804 #: builtin/for-each-ref.c:994
4805 msgid "quote placeholders suitably for shells"
4808 #: builtin/for-each-ref.c:996
4809 msgid "quote placeholders suitably for perl"
4812 #: builtin/for-each-ref.c:998
4813 msgid "quote placeholders suitably for python"
4816 #: builtin/for-each-ref.c:1000
4817 msgid "quote placeholders suitably for tcl"
4820 #: builtin/for-each-ref.c:1003
4821 msgid "show only <n> matched refs"
4824 #: builtin/for-each-ref.c:1004
4828 #: builtin/for-each-ref.c:1004
4829 msgid "format to use for the output"
4832 #: builtin/for-each-ref.c:1005
4836 #: builtin/for-each-ref.c:1006
4837 msgid "field name to sort on"
4840 #: builtin/fsck.c:608
4841 msgid "git fsck [options] [<object>...]"
4844 #: builtin/fsck.c:614
4845 msgid "show unreachable objects"
4848 #: builtin/fsck.c:615
4849 msgid "show dangling objects"
4852 #: builtin/fsck.c:616
4856 #: builtin/fsck.c:617
4857 msgid "report root nodes"
4860 #: builtin/fsck.c:618
4861 msgid "make index objects head nodes"
4864 #: builtin/fsck.c:619
4865 msgid "make reflogs head nodes (default)"
4868 #: builtin/fsck.c:620
4869 msgid "also consider packs and alternate objects"
4872 #: builtin/fsck.c:621
4873 msgid "enable more strict checking"
4876 #: builtin/fsck.c:623
4877 msgid "write dangling objects in .git/lost-found"
4880 #: builtin/fsck.c:624 builtin/prune.c:134
4881 msgid "show progress"
4885 msgid "git gc [options]"
4890 msgid "Invalid %s: '%s'"
4895 msgid "insanely long object directory %.*s"
4899 msgid "prune unreferenced objects"
4903 msgid "be more thorough (increased runtime)"
4907 msgid "enable auto-gc mode"
4913 "Auto packing the repository for optimum performance. You may also\n"
4914 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
4919 "There are too many unreachable loose objects; run 'git prune' to remove them."
4922 #: builtin/grep.c:22
4923 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4926 #: builtin/grep.c:217
4928 msgid "grep: failed to create thread: %s"
4931 #: builtin/grep.c:364
4933 msgid "Failed to chdir: %s"
4936 #: builtin/grep.c:442 builtin/grep.c:477
4938 msgid "unable to read tree (%s)"
4941 #: builtin/grep.c:492
4943 msgid "unable to grep from object of type %s"
4946 #: builtin/grep.c:550
4948 msgid "switch `%c' expects a numerical value"
4951 #: builtin/grep.c:567
4953 msgid "cannot open '%s'"
4956 #: builtin/grep.c:642
4957 msgid "search in index instead of in the work tree"
4960 #: builtin/grep.c:644
4961 msgid "find in contents not managed by git"
4964 #: builtin/grep.c:646
4965 msgid "search in both tracked and untracked files"
4968 #: builtin/grep.c:648
4969 msgid "search also in ignored files"
4972 #: builtin/grep.c:651
4973 msgid "show non-matching lines"
4976 #: builtin/grep.c:653
4977 msgid "case insensitive matching"
4980 #: builtin/grep.c:655
4981 msgid "match patterns only at word boundaries"
4984 #: builtin/grep.c:657
4985 msgid "process binary files as text"
4988 #: builtin/grep.c:659
4989 msgid "don't match patterns in binary files"
4992 #: builtin/grep.c:662
4993 msgid "descend at most <depth> levels"
4996 #: builtin/grep.c:666
4997 msgid "use extended POSIX regular expressions"
5000 #: builtin/grep.c:669
5001 msgid "use basic POSIX regular expressions (default)"
5004 #: builtin/grep.c:672
5005 msgid "interpret patterns as fixed strings"
5008 #: builtin/grep.c:675
5009 msgid "use Perl-compatible regular expressions"
5012 #: builtin/grep.c:678
5013 msgid "show line numbers"
5016 #: builtin/grep.c:679
5017 msgid "don't show filenames"
5020 #: builtin/grep.c:680
5021 msgid "show filenames"
5024 #: builtin/grep.c:682
5025 msgid "show filenames relative to top directory"
5028 #: builtin/grep.c:684
5029 msgid "show only filenames instead of matching lines"
5032 #: builtin/grep.c:686
5033 msgid "synonym for --files-with-matches"
5036 #: builtin/grep.c:689
5037 msgid "show only the names of files without match"
5040 #: builtin/grep.c:691
5041 msgid "print NUL after filenames"
5044 #: builtin/grep.c:693
5045 msgid "show the number of matches instead of matching lines"
5048 #: builtin/grep.c:694
5049 msgid "highlight matches"
5052 #: builtin/grep.c:696
5053 msgid "print empty line between matches from different files"
5056 #: builtin/grep.c:698
5057 msgid "show filename only once above matches from same file"
5060 #: builtin/grep.c:701
5061 msgid "show <n> context lines before and after matches"
5064 #: builtin/grep.c:704
5065 msgid "show <n> context lines before matches"
5068 #: builtin/grep.c:706
5069 msgid "show <n> context lines after matches"
5072 #: builtin/grep.c:707
5073 msgid "shortcut for -C NUM"
5076 #: builtin/grep.c:710
5077 msgid "show a line with the function name before matches"
5080 #: builtin/grep.c:712
5081 msgid "show the surrounding function"
5084 #: builtin/grep.c:715
5085 msgid "read patterns from file"
5088 #: builtin/grep.c:717
5089 msgid "match <pattern>"
5092 #: builtin/grep.c:719
5093 msgid "combine patterns specified with -e"
5096 #: builtin/grep.c:731
5097 msgid "indicate hit with exit status without output"
5100 #: builtin/grep.c:733
5101 msgid "show only matches from files that match all patterns"
5104 #: builtin/grep.c:735
5105 msgid "show parse tree for grep expression"
5108 #: builtin/grep.c:739
5112 #: builtin/grep.c:739
5113 msgid "show matching files in the pager"
5116 #: builtin/grep.c:742
5117 msgid "allow calling of grep(1) (ignored by this build)"
5120 #: builtin/grep.c:743 builtin/show-ref.c:188
5124 #: builtin/grep.c:810
5125 msgid "no pattern given."
5128 #: builtin/grep.c:865
5129 msgid "--open-files-in-pager only works on the worktree"
5132 #: builtin/grep.c:888
5133 msgid "--cached or --untracked cannot be used with --no-index."
5136 #: builtin/grep.c:893
5137 msgid "--no-index or --untracked cannot be used with revs."
5140 #: builtin/grep.c:896
5141 msgid "--[no-]exclude-standard cannot be used for tracked contents."
5144 #: builtin/grep.c:904
5145 msgid "both --cached and trees are given."
5148 #: builtin/hash-object.c:60
5150 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5154 #: builtin/hash-object.c:61
5155 msgid "git hash-object --stdin-paths < <list-of-paths>"
5158 #: builtin/hash-object.c:72
5162 #: builtin/hash-object.c:72
5166 #: builtin/hash-object.c:73
5167 msgid "write the object into the object database"
5170 #: builtin/hash-object.c:74
5171 msgid "read the object from stdin"
5174 #: builtin/hash-object.c:76
5175 msgid "store file as is without filters"
5178 #: builtin/hash-object.c:77
5179 msgid "process file as it were from this path"
5182 #: builtin/help.c:41
5183 msgid "print all available commands"
5186 #: builtin/help.c:42
5187 msgid "print list of useful guides"
5190 #: builtin/help.c:43
5191 msgid "show man page"
5194 #: builtin/help.c:44
5195 msgid "show manual in web browser"
5198 #: builtin/help.c:46
5199 msgid "show info page"
5202 #: builtin/help.c:52
5203 msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5206 #: builtin/help.c:64
5208 msgid "unrecognized help format '%s'"
5211 #: builtin/help.c:92
5212 msgid "Failed to start emacsclient."
5215 #: builtin/help.c:105
5216 msgid "Failed to parse emacsclient version."
5219 #: builtin/help.c:113
5221 msgid "emacsclient version '%d' too old (< 22)."
5224 #: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
5226 msgid "failed to exec '%s': %s"
5229 #: builtin/help.c:216
5232 "'%s': path for unsupported man viewer.\n"
5233 "Please consider using 'man.<tool>.cmd' instead."
5236 #: builtin/help.c:228
5239 "'%s': cmd for supported man viewer.\n"
5240 "Please consider using 'man.<tool>.path' instead."
5243 #: builtin/help.c:349
5245 msgid "'%s': unknown man viewer."
5248 #: builtin/help.c:366
5249 msgid "no man viewer handled the request"
5252 #: builtin/help.c:374
5253 msgid "no info viewer handled the request"
5256 #: builtin/help.c:420
5257 msgid "Defining attributes per path"
5260 #: builtin/help.c:421
5261 msgid "A Git glossary"
5264 #: builtin/help.c:422
5265 msgid "Specifies intentionally untracked files to ignore"
5268 #: builtin/help.c:423
5269 msgid "Defining submodule properties"
5272 #: builtin/help.c:424
5273 msgid "Specifying revisions and ranges for Git"
5276 #: builtin/help.c:425
5277 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5280 #: builtin/help.c:426
5281 msgid "An overview of recommended workflows with Git"
5284 #: builtin/help.c:438
5285 msgid "The common Git guides are:\n"
5288 #: builtin/help.c:460 builtin/help.c:476
5293 #: builtin/help.c:492
5295 msgid "`git %s' is aliased to `%s'"
5298 #: builtin/index-pack.c:184
5300 msgid "object type mismatch at %s"
5303 #: builtin/index-pack.c:204
5304 msgid "object of unexpected type"
5307 #: builtin/index-pack.c:244
5309 msgid "cannot fill %d byte"
5310 msgid_plural "cannot fill %d bytes"
5314 #: builtin/index-pack.c:254
5318 #: builtin/index-pack.c:255
5319 msgid "read error on input"
5322 #: builtin/index-pack.c:267
5323 msgid "used more bytes than were available"
5326 #: builtin/index-pack.c:274
5327 msgid "pack too large for current definition of off_t"
5330 #: builtin/index-pack.c:290
5332 msgid "unable to create '%s'"
5335 #: builtin/index-pack.c:295
5337 msgid "cannot open packfile '%s'"
5340 #: builtin/index-pack.c:309
5341 msgid "pack signature mismatch"
5344 #: builtin/index-pack.c:311
5346 msgid "pack version %<PRIu32> unsupported"
5349 #: builtin/index-pack.c:329
5351 msgid "pack has bad object at offset %lu: %s"
5354 #: builtin/index-pack.c:451
5356 msgid "inflate returned %d"
5359 #: builtin/index-pack.c:500
5360 msgid "offset value overflow for delta base object"
5363 #: builtin/index-pack.c:508
5364 msgid "delta base offset is out of bound"
5367 #: builtin/index-pack.c:516
5369 msgid "unknown object type %d"
5372 #: builtin/index-pack.c:547
5373 msgid "cannot pread pack file"
5376 #: builtin/index-pack.c:549
5378 msgid "premature end of pack file, %lu byte missing"
5379 msgid_plural "premature end of pack file, %lu bytes missing"
5383 #: builtin/index-pack.c:575
5384 msgid "serious inflate inconsistency"
5387 #: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695
5388 #: builtin/index-pack.c:729 builtin/index-pack.c:738
5390 msgid "SHA1 COLLISION FOUND WITH %s !"
5393 #: builtin/index-pack.c:669 builtin/pack-objects.c:170
5394 #: builtin/pack-objects.c:262
5396 msgid "unable to read %s"
5399 #: builtin/index-pack.c:735
5401 msgid "cannot read existing object %s"
5404 #: builtin/index-pack.c:749
5406 msgid "invalid blob object %s"
5409 #: builtin/index-pack.c:763
5414 #: builtin/index-pack.c:766
5415 msgid "Error in object"
5418 #: builtin/index-pack.c:768
5420 msgid "Not all child objects of %s are reachable"
5423 #: builtin/index-pack.c:838 builtin/index-pack.c:868
5424 msgid "failed to apply delta"
5427 #: builtin/index-pack.c:1009
5428 msgid "Receiving objects"
5431 #: builtin/index-pack.c:1009
5432 msgid "Indexing objects"
5435 #: builtin/index-pack.c:1035
5436 msgid "pack is corrupted (SHA1 mismatch)"
5439 #: builtin/index-pack.c:1040
5440 msgid "cannot fstat packfile"
5443 #: builtin/index-pack.c:1043
5444 msgid "pack has junk at the end"
5447 #: builtin/index-pack.c:1054
5448 msgid "confusion beyond insanity in parse_pack_objects()"
5451 #: builtin/index-pack.c:1077
5452 msgid "Resolving deltas"
5455 #: builtin/index-pack.c:1087
5457 msgid "unable to create thread: %s"
5460 #: builtin/index-pack.c:1129
5461 msgid "confusion beyond insanity"
5464 #: builtin/index-pack.c:1137
5466 msgid "completed with %d local objects"
5469 #: builtin/index-pack.c:1147
5471 msgid "Unexpected tail checksum for %s (disk corruption?)"
5474 #: builtin/index-pack.c:1151
5476 msgid "pack has %d unresolved delta"
5477 msgid_plural "pack has %d unresolved deltas"
5481 #: builtin/index-pack.c:1176
5483 msgid "unable to deflate appended object (%d)"
5486 #: builtin/index-pack.c:1255
5488 msgid "local object %s is corrupt"
5491 #: builtin/index-pack.c:1279
5492 msgid "error while closing pack file"
5495 #: builtin/index-pack.c:1292
5497 msgid "cannot write keep file '%s'"
5500 #: builtin/index-pack.c:1300
5502 msgid "cannot close written keep file '%s'"
5505 #: builtin/index-pack.c:1313
5506 msgid "cannot store pack file"
5509 #: builtin/index-pack.c:1324
5510 msgid "cannot store index file"
5513 #: builtin/index-pack.c:1357
5515 msgid "bad pack.indexversion=%<PRIu32>"
5518 #: builtin/index-pack.c:1363
5520 msgid "invalid number of threads specified (%d)"
5523 #: builtin/index-pack.c:1367 builtin/index-pack.c:1545
5525 msgid "no threads support, ignoring %s"
5528 #: builtin/index-pack.c:1425
5530 msgid "Cannot open existing pack file '%s'"
5533 #: builtin/index-pack.c:1427
5535 msgid "Cannot open existing pack idx file for '%s'"
5538 #: builtin/index-pack.c:1474
5540 msgid "non delta: %d object"
5541 msgid_plural "non delta: %d objects"
5545 #: builtin/index-pack.c:1481
5547 msgid "chain length = %d: %lu object"
5548 msgid_plural "chain length = %d: %lu objects"
5552 #: builtin/index-pack.c:1509
5553 msgid "Cannot come back to cwd"
5556 #: builtin/index-pack.c:1557 builtin/index-pack.c:1560
5557 #: builtin/index-pack.c:1572 builtin/index-pack.c:1576
5562 #: builtin/index-pack.c:1590
5563 msgid "--fix-thin cannot be used without --stdin"
5566 #: builtin/index-pack.c:1594 builtin/index-pack.c:1604
5568 msgid "packfile name '%s' does not end with '.pack'"
5571 #: builtin/index-pack.c:1613
5572 msgid "--verify with no packfile name given"
5575 #: builtin/init-db.c:35
5577 msgid "Could not make %s writable by group"
5580 #: builtin/init-db.c:62
5582 msgid "insanely long template name %s"
5585 #: builtin/init-db.c:67
5587 msgid "cannot stat '%s'"
5590 #: builtin/init-db.c:73
5592 msgid "cannot stat template '%s'"
5595 #: builtin/init-db.c:80
5597 msgid "cannot opendir '%s'"
5600 #: builtin/init-db.c:97
5602 msgid "cannot readlink '%s'"
5605 #: builtin/init-db.c:99
5607 msgid "insanely long symlink %s"
5610 #: builtin/init-db.c:102
5612 msgid "cannot symlink '%s' '%s'"
5615 #: builtin/init-db.c:106
5617 msgid "cannot copy '%s' to '%s'"
5620 #: builtin/init-db.c:110
5622 msgid "ignoring template %s"
5625 #: builtin/init-db.c:133
5627 msgid "insanely long template path %s"
5630 #: builtin/init-db.c:141
5632 msgid "templates not found %s"
5635 #: builtin/init-db.c:154
5637 msgid "not copying templates of a wrong format version %d from '%s'"
5640 #: builtin/init-db.c:192
5642 msgid "insane git directory %s"
5645 #: builtin/init-db.c:323 builtin/init-db.c:326
5647 msgid "%s already exists"
5650 #: builtin/init-db.c:355
5652 msgid "unable to handle file type %d"
5655 #: builtin/init-db.c:358
5657 msgid "unable to move %s to %s"
5660 #: builtin/init-db.c:363
5662 msgid "Could not create git link %s"
5666 #. * TRANSLATORS: The first '%s' is either "Reinitialized
5667 #. * existing" or "Initialized empty", the second " shared" or
5668 #. * "", and the last '%s%s' is the verbatim directory name.
5670 #: builtin/init-db.c:420
5672 msgid "%s%s Git repository in %s%s\n"
5675 #: builtin/init-db.c:421
5676 msgid "Reinitialized existing"
5679 #: builtin/init-db.c:421
5680 msgid "Initialized empty"
5683 #: builtin/init-db.c:422
5687 #: builtin/init-db.c:441
5688 msgid "cannot tell cwd"
5691 #: builtin/init-db.c:467
5693 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5694 "shared[=<permissions>]] [directory]"
5697 #: builtin/init-db.c:490
5701 #: builtin/init-db.c:491
5702 msgid "specify that the git repository is to be shared amongst several users"
5705 #: builtin/init-db.c:493 builtin/prune-packed.c:75
5709 #: builtin/init-db.c:522 builtin/init-db.c:529
5711 msgid "cannot mkdir %s"
5714 #: builtin/init-db.c:533
5716 msgid "cannot chdir to %s"
5719 #: builtin/init-db.c:555
5722 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5726 #: builtin/init-db.c:579
5727 msgid "Cannot access current working directory"
5730 #: builtin/init-db.c:586
5732 msgid "Cannot access work tree '%s'"
5736 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
5740 msgid " or: git show [options] <object>..."
5743 #: builtin/log.c:124
5744 msgid "suppress diff output"
5747 #: builtin/log.c:125
5751 #: builtin/log.c:126
5752 msgid "Use mail map file"
5755 #: builtin/log.c:127
5756 msgid "decorate options"
5759 #: builtin/log.c:230
5761 msgid "Final output: %d %s\n"
5764 #: builtin/log.c:453 builtin/log.c:545
5766 msgid "Could not read object %s"
5769 #: builtin/log.c:569
5771 msgid "Unknown type: %d"
5774 #: builtin/log.c:669
5775 msgid "format.headers without value"
5778 #: builtin/log.c:751
5779 msgid "name of output directory is too long"
5782 #: builtin/log.c:767
5784 msgid "Cannot open patch file %s"
5787 #: builtin/log.c:781
5788 msgid "Need exactly one range."
5791 #: builtin/log.c:789
5792 msgid "Not a range."
5795 #: builtin/log.c:891
5796 msgid "Cover letter needs email format"
5799 #: builtin/log.c:967
5801 msgid "insane in-reply-to: %s"
5804 #: builtin/log.c:995
5805 msgid "git format-patch [options] [<since> | <revision range>]"
5808 #: builtin/log.c:1040
5809 msgid "Two output directories?"
5812 #: builtin/log.c:1155
5813 msgid "use [PATCH n/m] even with a single patch"
5816 #: builtin/log.c:1158
5817 msgid "use [PATCH] even with multiple patches"
5820 #: builtin/log.c:1162
5821 msgid "print patches to standard out"
5824 #: builtin/log.c:1164
5825 msgid "generate a cover letter"
5828 #: builtin/log.c:1166
5829 msgid "use simple number sequence for output file names"
5832 #: builtin/log.c:1167
5836 #: builtin/log.c:1168
5837 msgid "use <sfx> instead of '.patch'"
5840 #: builtin/log.c:1170
5841 msgid "start numbering patches at <n> instead of 1"
5844 #: builtin/log.c:1172
5845 msgid "mark the series as Nth re-roll"
5848 #: builtin/log.c:1174
5849 msgid "Use [<prefix>] instead of [PATCH]"
5852 #: builtin/log.c:1177
5853 msgid "store resulting files in <dir>"
5856 #: builtin/log.c:1180
5857 msgid "don't strip/add [PATCH]"
5860 #: builtin/log.c:1183
5861 msgid "don't output binary diffs"
5864 #: builtin/log.c:1185
5865 msgid "don't include a patch matching a commit upstream"
5868 #: builtin/log.c:1187
5869 msgid "show patch format instead of default (patch + stat)"
5872 #: builtin/log.c:1189
5876 #: builtin/log.c:1190
5880 #: builtin/log.c:1191
5881 msgid "add email header"
5884 #: builtin/log.c:1192 builtin/log.c:1194
5888 #: builtin/log.c:1192
5889 msgid "add To: header"
5892 #: builtin/log.c:1194
5893 msgid "add Cc: header"
5896 #: builtin/log.c:1196
5900 #: builtin/log.c:1197
5901 msgid "set From address to <ident> (or committer ident if absent)"
5904 #: builtin/log.c:1199
5908 #: builtin/log.c:1200
5909 msgid "make first mail a reply to <message-id>"
5912 #: builtin/log.c:1201 builtin/log.c:1204
5916 #: builtin/log.c:1202
5917 msgid "attach the patch"
5920 #: builtin/log.c:1205
5921 msgid "inline the patch"
5924 #: builtin/log.c:1209
5925 msgid "enable message threading, styles: shallow, deep"
5928 #: builtin/log.c:1211
5932 #: builtin/log.c:1212
5933 msgid "add a signature"
5936 #: builtin/log.c:1214
5937 msgid "don't print the patch filenames"
5940 #: builtin/log.c:1288
5942 msgid "invalid ident line: %s"
5945 #: builtin/log.c:1303
5946 msgid "-n and -k are mutually exclusive."
5949 #: builtin/log.c:1305
5950 msgid "--subject-prefix and -k are mutually exclusive."
5953 #: builtin/log.c:1313
5954 msgid "--name-only does not make sense"
5957 #: builtin/log.c:1315
5958 msgid "--name-status does not make sense"
5961 #: builtin/log.c:1317
5962 msgid "--check does not make sense"
5965 #: builtin/log.c:1340
5966 msgid "standard output, or directory, which one?"
5969 #: builtin/log.c:1342
5971 msgid "Could not create directory '%s'"
5974 #: builtin/log.c:1490
5975 msgid "Failed to create output files"
5978 #: builtin/log.c:1539
5979 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5982 #: builtin/log.c:1594
5985 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
5988 #: builtin/log.c:1607 builtin/log.c:1609 builtin/log.c:1621
5990 msgid "Unknown commit %s"
5993 #: builtin/ls-files.c:408
5994 msgid "git ls-files [options] [<file>...]"
5997 #: builtin/ls-files.c:465
5998 msgid "identify the file status with tags"
6001 #: builtin/ls-files.c:467
6002 msgid "use lowercase letters for 'assume unchanged' files"
6005 #: builtin/ls-files.c:469
6006 msgid "show cached files in the output (default)"
6009 #: builtin/ls-files.c:471
6010 msgid "show deleted files in the output"
6013 #: builtin/ls-files.c:473
6014 msgid "show modified files in the output"
6017 #: builtin/ls-files.c:475
6018 msgid "show other files in the output"
6021 #: builtin/ls-files.c:477
6022 msgid "show ignored files in the output"
6025 #: builtin/ls-files.c:480
6026 msgid "show staged contents' object name in the output"
6029 #: builtin/ls-files.c:482
6030 msgid "show files on the filesystem that need to be removed"
6033 #: builtin/ls-files.c:484
6034 msgid "show 'other' directories' name only"
6037 #: builtin/ls-files.c:487
6038 msgid "don't show empty directories"
6041 #: builtin/ls-files.c:490
6042 msgid "show unmerged files in the output"
6045 #: builtin/ls-files.c:492
6046 msgid "show resolve-undo information"
6049 #: builtin/ls-files.c:494
6050 msgid "skip files matching pattern"
6053 #: builtin/ls-files.c:497
6054 msgid "exclude patterns are read from <file>"
6057 #: builtin/ls-files.c:500
6058 msgid "read additional per-directory exclude patterns in <file>"
6061 #: builtin/ls-files.c:502
6062 msgid "add the standard git exclusions"
6065 #: builtin/ls-files.c:505
6066 msgid "make the output relative to the project top directory"
6069 #: builtin/ls-files.c:508
6070 msgid "if any <file> is not in the index, treat this as an error"
6073 #: builtin/ls-files.c:509
6077 #: builtin/ls-files.c:510
6078 msgid "pretend that paths removed since <tree-ish> are still present"
6081 #: builtin/ls-files.c:512
6082 msgid "show debugging data"
6085 #: builtin/ls-tree.c:27
6086 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
6089 #: builtin/ls-tree.c:125
6090 msgid "only show trees"
6093 #: builtin/ls-tree.c:127
6094 msgid "recurse into subtrees"
6097 #: builtin/ls-tree.c:129
6098 msgid "show trees when recursing"
6101 #: builtin/ls-tree.c:132
6102 msgid "terminate entries with NUL byte"
6105 #: builtin/ls-tree.c:133
6106 msgid "include object size"
6109 #: builtin/ls-tree.c:135 builtin/ls-tree.c:137
6110 msgid "list only filenames"
6113 #: builtin/ls-tree.c:140
6114 msgid "use full path names"
6117 #: builtin/ls-tree.c:142
6118 msgid "list entire tree; not just current directory (implies --full-name)"
6121 #: builtin/merge.c:43
6122 msgid "git merge [options] [<commit>...]"
6125 #: builtin/merge.c:44
6126 msgid "git merge [options] <msg> HEAD <commit>"
6129 #: builtin/merge.c:45
6130 msgid "git merge --abort"
6133 #: builtin/merge.c:98
6134 msgid "switch `m' requires a value"
6137 #: builtin/merge.c:135
6139 msgid "Could not find merge strategy '%s'.\n"
6142 #: builtin/merge.c:136
6144 msgid "Available strategies are:"
6147 #: builtin/merge.c:141
6149 msgid "Available custom strategies are:"
6152 #: builtin/merge.c:198
6153 msgid "do not show a diffstat at the end of the merge"
6156 #: builtin/merge.c:201
6157 msgid "show a diffstat at the end of the merge"
6160 #: builtin/merge.c:202
6161 msgid "(synonym to --stat)"
6164 #: builtin/merge.c:204
6165 msgid "add (at most <n>) entries from shortlog to merge commit message"
6168 #: builtin/merge.c:207
6169 msgid "create a single commit instead of doing a merge"
6172 #: builtin/merge.c:209
6173 msgid "perform a commit if the merge succeeds (default)"
6176 #: builtin/merge.c:211
6177 msgid "edit message before committing"
6180 #: builtin/merge.c:212
6181 msgid "allow fast-forward (default)"
6184 #: builtin/merge.c:214
6185 msgid "abort if fast-forward is not possible"
6188 #: builtin/merge.c:218
6189 msgid "Verify that the named commit has a valid GPG signature"
6192 #: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:114
6196 #: builtin/merge.c:220
6197 msgid "merge strategy to use"
6200 #: builtin/merge.c:221
6201 msgid "option=value"
6204 #: builtin/merge.c:222
6205 msgid "option for selected merge strategy"
6208 #: builtin/merge.c:224
6209 msgid "merge commit message (for a non-fast-forward merge)"
6212 #: builtin/merge.c:228
6213 msgid "abort the current in-progress merge"
6216 #: builtin/merge.c:257
6217 msgid "could not run stash."
6220 #: builtin/merge.c:262
6221 msgid "stash failed"
6224 #: builtin/merge.c:267
6226 msgid "not a valid object: %s"
6229 #: builtin/merge.c:286 builtin/merge.c:303
6230 msgid "read-tree failed"
6233 #: builtin/merge.c:333
6234 msgid " (nothing to squash)"
6237 #: builtin/merge.c:346
6239 msgid "Squash commit -- not updating HEAD\n"
6242 #: builtin/merge.c:378
6243 msgid "Writing SQUASH_MSG"
6246 #: builtin/merge.c:380
6247 msgid "Finishing SQUASH_MSG"
6250 #: builtin/merge.c:403
6252 msgid "No merge message -- not updating HEAD\n"
6255 #: builtin/merge.c:453
6257 msgid "'%s' does not point to a commit"
6260 #: builtin/merge.c:565
6262 msgid "Bad branch.%s.mergeoptions string: %s"
6265 #: builtin/merge.c:657
6266 msgid "git write-tree failed to write a tree"
6269 #: builtin/merge.c:685
6270 msgid "Not handling anything other than two heads merge."
6273 #: builtin/merge.c:699
6275 msgid "Unknown option for merge-recursive: -X%s"
6278 #: builtin/merge.c:713
6280 msgid "unable to write %s"
6283 #: builtin/merge.c:802
6285 msgid "Could not read from '%s'"
6288 #: builtin/merge.c:811
6290 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6293 #: builtin/merge.c:817
6296 "Please enter a commit message to explain why this merge is necessary,\n"
6297 "especially if it merges an updated upstream into a topic branch.\n"
6299 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
6303 #: builtin/merge.c:841
6304 msgid "Empty commit message."
6307 #: builtin/merge.c:853
6309 msgid "Wonderful.\n"
6312 #: builtin/merge.c:918
6314 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6317 #: builtin/merge.c:934
6319 msgid "'%s' is not a commit"
6322 #: builtin/merge.c:975
6323 msgid "No current branch."
6326 #: builtin/merge.c:977
6327 msgid "No remote for the current branch."
6330 #: builtin/merge.c:979
6331 msgid "No default upstream defined for the current branch."
6334 #: builtin/merge.c:984
6336 msgid "No remote-tracking branch for %s from %s"
6339 #: builtin/merge.c:1140
6340 msgid "There is no merge to abort (MERGE_HEAD missing)."
6343 #: builtin/merge.c:1156 git-pull.sh:31
6345 "You have not concluded your merge (MERGE_HEAD exists).\n"
6346 "Please, commit your changes before you can merge."
6349 #: builtin/merge.c:1159 git-pull.sh:34
6350 msgid "You have not concluded your merge (MERGE_HEAD exists)."
6353 #: builtin/merge.c:1163
6355 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6356 "Please, commit your changes before you can merge."
6359 #: builtin/merge.c:1166
6360 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6363 #: builtin/merge.c:1175
6364 msgid "You cannot combine --squash with --no-ff."
6367 #: builtin/merge.c:1184
6368 msgid "No commit specified and merge.defaultToUpstream not set."
6371 #: builtin/merge.c:1216
6372 msgid "Can merge only exactly one commit into empty head"
6375 #: builtin/merge.c:1219
6376 msgid "Squash commit into empty head not supported yet"
6379 #: builtin/merge.c:1221
6380 msgid "Non-fast-forward commit does not make sense into an empty head"
6383 #: builtin/merge.c:1226
6385 msgid "%s - not something we can merge"
6388 #: builtin/merge.c:1277
6390 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6393 #: builtin/merge.c:1280
6395 msgid "Commit %s has a bad GPG signature allegedly by %s."
6399 #: builtin/merge.c:1283
6401 msgid "Commit %s does not have a GPG signature."
6404 #: builtin/merge.c:1286
6406 msgid "Commit %s has a good GPG signature by %s\n"
6409 #: builtin/merge.c:1370
6411 msgid "Updating %s..%s\n"
6414 #: builtin/merge.c:1409
6416 msgid "Trying really trivial in-index merge...\n"
6419 #: builtin/merge.c:1416
6424 #: builtin/merge.c:1448
6425 msgid "Not possible to fast-forward, aborting."
6428 #: builtin/merge.c:1471 builtin/merge.c:1550
6430 msgid "Rewinding the tree to pristine...\n"
6433 #: builtin/merge.c:1475
6435 msgid "Trying merge strategy %s...\n"
6438 #: builtin/merge.c:1541
6440 msgid "No merge strategy handled the merge.\n"
6443 #: builtin/merge.c:1543
6445 msgid "Merge with strategy %s failed.\n"
6448 #: builtin/merge.c:1552
6450 msgid "Using the %s to prepare resolving by hand.\n"
6453 #: builtin/merge.c:1564
6455 msgid "Automatic merge went well; stopped before committing as requested\n"
6458 #: builtin/merge-base.c:26
6459 msgid "git merge-base [-a|--all] <commit> <commit>..."
6462 #: builtin/merge-base.c:27
6463 msgid "git merge-base [-a|--all] --octopus <commit>..."
6466 #: builtin/merge-base.c:28
6467 msgid "git merge-base --independent <commit>..."
6470 #: builtin/merge-base.c:29
6471 msgid "git merge-base --is-ancestor <commit> <commit>"
6474 #: builtin/merge-base.c:98
6475 msgid "output all common ancestors"
6478 #: builtin/merge-base.c:99
6479 msgid "find ancestors for a single n-way merge"
6482 #: builtin/merge-base.c:100
6483 msgid "list revs not reachable from others"
6486 #: builtin/merge-base.c:102
6487 msgid "is the first one ancestor of the other?"
6490 #: builtin/merge-file.c:8
6492 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6496 #: builtin/merge-file.c:33
6497 msgid "send results to standard output"
6500 #: builtin/merge-file.c:34
6501 msgid "use a diff3 based merge"
6504 #: builtin/merge-file.c:35
6505 msgid "for conflicts, use our version"
6508 #: builtin/merge-file.c:37
6509 msgid "for conflicts, use their version"
6512 #: builtin/merge-file.c:39
6513 msgid "for conflicts, use a union version"
6516 #: builtin/merge-file.c:42
6517 msgid "for conflicts, use this marker size"
6520 #: builtin/merge-file.c:43
6521 msgid "do not warn about conflicts"
6524 #: builtin/merge-file.c:45
6525 msgid "set labels for file1/orig_file/file2"
6528 #: builtin/mktree.c:67
6529 msgid "git mktree [-z] [--missing] [--batch]"
6532 #: builtin/mktree.c:153
6533 msgid "input is NUL terminated"
6536 #: builtin/mktree.c:154 builtin/write-tree.c:24
6537 msgid "allow missing objects"
6540 #: builtin/mktree.c:155
6541 msgid "allow creation of more than one tree"
6545 msgid "git mv [options] <source>... <destination>"
6549 msgid "force move/rename even if target exists"
6553 msgid "skip move/rename errors"
6558 msgid "Checking rename of '%s' to '%s'\n"
6566 msgid "can not move directory into itself"
6570 msgid "cannot move directory over file"
6575 msgid "Huh? %.*s is in index?"
6579 msgid "source directory is empty"
6583 msgid "not under version control"
6587 msgid "destination exists"
6592 msgid "overwriting '%s'"
6596 msgid "Cannot overwrite"
6600 msgid "multiple sources for the same target"
6605 msgid "%s, source=%s, destination=%s"
6610 msgid "Renaming %s to %s\n"
6613 #: builtin/mv.c:215 builtin/remote.c:731
6615 msgid "renaming '%s' failed"
6618 #: builtin/name-rev.c:259
6619 msgid "git name-rev [options] <commit>..."
6622 #: builtin/name-rev.c:260
6623 msgid "git name-rev [options] --all"
6626 #: builtin/name-rev.c:261
6627 msgid "git name-rev [options] --stdin"
6630 #: builtin/name-rev.c:313
6631 msgid "print only names (no SHA-1)"
6634 #: builtin/name-rev.c:314
6635 msgid "only use tags to name the commits"
6638 #: builtin/name-rev.c:316
6639 msgid "only use refs matching <pattern>"
6642 #: builtin/name-rev.c:318
6643 msgid "list all commits reachable from all refs"
6646 #: builtin/name-rev.c:319
6647 msgid "read from stdin"
6650 #: builtin/name-rev.c:320
6651 msgid "allow to print `undefined` names"
6654 #: builtin/name-rev.c:326
6655 msgid "dereference tags in the input (internal use)"
6658 #: builtin/notes.c:24
6659 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
6662 #: builtin/notes.c:25
6664 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6665 "<object>] [<object>]"
6668 #: builtin/notes.c:26
6669 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6672 #: builtin/notes.c:27
6674 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6675 "<object>] [<object>]"
6678 #: builtin/notes.c:28
6679 msgid "git notes [--ref <notes_ref>] edit [<object>]"
6682 #: builtin/notes.c:29
6683 msgid "git notes [--ref <notes_ref>] show [<object>]"
6686 #: builtin/notes.c:30
6688 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6691 #: builtin/notes.c:31
6692 msgid "git notes merge --commit [-v | -q]"
6695 #: builtin/notes.c:32
6696 msgid "git notes merge --abort [-v | -q]"
6699 #: builtin/notes.c:33
6700 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6703 #: builtin/notes.c:34
6704 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6707 #: builtin/notes.c:35
6708 msgid "git notes [--ref <notes_ref>] get-ref"
6711 #: builtin/notes.c:40
6712 msgid "git notes [list [<object>]]"
6715 #: builtin/notes.c:45
6716 msgid "git notes add [<options>] [<object>]"
6719 #: builtin/notes.c:50
6720 msgid "git notes copy [<options>] <from-object> <to-object>"
6723 #: builtin/notes.c:51
6724 msgid "git notes copy --stdin [<from-object> <to-object>]..."
6727 #: builtin/notes.c:56
6728 msgid "git notes append [<options>] [<object>]"
6731 #: builtin/notes.c:61
6732 msgid "git notes edit [<object>]"
6735 #: builtin/notes.c:66
6736 msgid "git notes show [<object>]"
6739 #: builtin/notes.c:71
6740 msgid "git notes merge [<options>] <notes_ref>"
6743 #: builtin/notes.c:72
6744 msgid "git notes merge --commit [<options>]"
6747 #: builtin/notes.c:73
6748 msgid "git notes merge --abort [<options>]"
6751 #: builtin/notes.c:78
6752 msgid "git notes remove [<object>]"
6755 #: builtin/notes.c:83
6756 msgid "git notes prune [<options>]"
6759 #: builtin/notes.c:88
6760 msgid "git notes get-ref"
6763 #: builtin/notes.c:137
6765 msgid "unable to start 'show' for object '%s'"
6768 #: builtin/notes.c:141
6769 msgid "could not read 'show' output"
6772 #: builtin/notes.c:149
6774 msgid "failed to finish 'show' for object '%s'"
6777 #: builtin/notes.c:167 builtin/tag.c:341
6779 msgid "could not create file '%s'"
6782 #: builtin/notes.c:186
6783 msgid "Please supply the note contents using either -m or -F option"
6786 #: builtin/notes.c:207 builtin/notes.c:844
6788 msgid "Removing note for object %s\n"
6791 #: builtin/notes.c:212
6792 msgid "unable to write note object"
6795 #: builtin/notes.c:214
6797 msgid "The note contents has been left in %s"
6800 #: builtin/notes.c:248 builtin/tag.c:540
6802 msgid "cannot read '%s'"
6805 #: builtin/notes.c:250 builtin/tag.c:543
6807 msgid "could not open or read '%s'"
6810 #: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318
6811 #: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515
6812 #: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637
6813 #: builtin/notes.c:839 builtin/tag.c:556
6815 msgid "Failed to resolve '%s' as a valid ref."
6818 #: builtin/notes.c:272
6820 msgid "Failed to read object '%s'."
6823 #: builtin/notes.c:312
6825 msgid "Malformed input line: '%s'."
6828 #: builtin/notes.c:327
6830 msgid "Failed to copy notes from '%s' to '%s'"
6833 #: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498
6834 #: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630
6835 #: builtin/notes.c:904
6836 msgid "too many parameters"
6839 #: builtin/notes.c:384 builtin/notes.c:643
6841 msgid "No note found for object %s."
6844 #: builtin/notes.c:406 builtin/notes.c:563
6845 msgid "note contents as a string"
6848 #: builtin/notes.c:409 builtin/notes.c:566
6849 msgid "note contents in a file"
6852 #: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568
6853 #: builtin/notes.c:571 builtin/tag.c:474
6857 #: builtin/notes.c:412 builtin/notes.c:569
6858 msgid "reuse and edit specified note object"
6861 #: builtin/notes.c:415 builtin/notes.c:572
6862 msgid "reuse specified note object"
6865 #: builtin/notes.c:417 builtin/notes.c:485
6866 msgid "replace existing notes"
6869 #: builtin/notes.c:451
6872 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6876 #: builtin/notes.c:456 builtin/notes.c:533
6878 msgid "Overwriting existing notes for object %s\n"
6881 #: builtin/notes.c:486
6882 msgid "read objects from stdin"
6885 #: builtin/notes.c:488
6886 msgid "load rewriting config for <command> (implies --stdin)"
6889 #: builtin/notes.c:506
6890 msgid "too few parameters"
6893 #: builtin/notes.c:527
6896 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6900 #: builtin/notes.c:539
6902 msgid "Missing notes on source object %s. Cannot copy."
6905 #: builtin/notes.c:588
6908 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6909 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6912 #: builtin/notes.c:735
6913 msgid "General options"
6916 #: builtin/notes.c:737
6917 msgid "Merge options"
6920 #: builtin/notes.c:739
6922 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6926 #: builtin/notes.c:741
6927 msgid "Committing unmerged notes"
6930 #: builtin/notes.c:743
6931 msgid "finalize notes merge by committing unmerged notes"
6934 #: builtin/notes.c:745
6935 msgid "Aborting notes merge resolution"
6938 #: builtin/notes.c:747
6939 msgid "abort notes merge"
6942 #: builtin/notes.c:842
6944 msgid "Object %s has no note\n"
6947 #: builtin/notes.c:854
6948 msgid "attempt to remove non-existent note is not an error"
6951 #: builtin/notes.c:857
6952 msgid "read object names from the standard input"
6955 #: builtin/notes.c:938
6959 #: builtin/notes.c:939
6960 msgid "use notes from <notes_ref>"
6963 #: builtin/notes.c:974 builtin/remote.c:1598
6965 msgid "Unknown subcommand: %s"
6968 #: builtin/pack-objects.c:23
6969 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
6972 #: builtin/pack-objects.c:24
6973 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
6976 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6978 msgid "deflate error (%d)"
6981 #: builtin/pack-objects.c:2397
6983 msgid "unsupported index version %s"
6986 #: builtin/pack-objects.c:2401
6988 msgid "bad index version '%s'"
6991 #: builtin/pack-objects.c:2424
6993 msgid "option %s does not accept negative form"
6996 #: builtin/pack-objects.c:2428
6998 msgid "unable to parse value '%s' for option %s"
7001 #: builtin/pack-objects.c:2447
7002 msgid "do not show progress meter"
7005 #: builtin/pack-objects.c:2449
7006 msgid "show progress meter"
7009 #: builtin/pack-objects.c:2451
7010 msgid "show progress meter during object writing phase"
7013 #: builtin/pack-objects.c:2454
7014 msgid "similar to --all-progress when progress meter is shown"
7017 #: builtin/pack-objects.c:2455
7018 msgid "version[,offset]"
7021 #: builtin/pack-objects.c:2456
7022 msgid "write the pack index file in the specified idx format version"
7025 #: builtin/pack-objects.c:2459
7026 msgid "maximum size of each output pack file"
7029 #: builtin/pack-objects.c:2461
7030 msgid "ignore borrowed objects from alternate object store"
7033 #: builtin/pack-objects.c:2463
7034 msgid "ignore packed objects"
7037 #: builtin/pack-objects.c:2465
7038 msgid "limit pack window by objects"
7041 #: builtin/pack-objects.c:2467
7042 msgid "limit pack window by memory in addition to object limit"
7045 #: builtin/pack-objects.c:2469
7046 msgid "maximum length of delta chain allowed in the resulting pack"
7049 #: builtin/pack-objects.c:2471
7050 msgid "reuse existing deltas"
7053 #: builtin/pack-objects.c:2473
7054 msgid "reuse existing objects"
7057 #: builtin/pack-objects.c:2475
7058 msgid "use OFS_DELTA objects"
7061 #: builtin/pack-objects.c:2477
7062 msgid "use threads when searching for best delta matches"
7065 #: builtin/pack-objects.c:2479
7066 msgid "do not create an empty pack output"
7069 #: builtin/pack-objects.c:2481
7070 msgid "read revision arguments from standard input"
7073 #: builtin/pack-objects.c:2483
7074 msgid "limit the objects to those that are not yet packed"
7077 #: builtin/pack-objects.c:2486
7078 msgid "include objects reachable from any reference"
7081 #: builtin/pack-objects.c:2489
7082 msgid "include objects referred by reflog entries"
7085 #: builtin/pack-objects.c:2492
7086 msgid "output pack to stdout"
7089 #: builtin/pack-objects.c:2494
7090 msgid "include tag objects that refer to objects to be packed"
7093 #: builtin/pack-objects.c:2496
7094 msgid "keep unreachable objects"
7097 #: builtin/pack-objects.c:2497 parse-options.h:141
7101 #: builtin/pack-objects.c:2498
7102 msgid "unpack unreachable objects newer than <time>"
7105 #: builtin/pack-objects.c:2501
7106 msgid "create thin packs"
7109 #: builtin/pack-objects.c:2503
7110 msgid "ignore packs that have companion .keep file"
7113 #: builtin/pack-objects.c:2505
7114 msgid "pack compression level"
7117 #: builtin/pack-objects.c:2507
7118 msgid "do not hide commits by grafts"
7121 #: builtin/pack-refs.c:6
7122 msgid "git pack-refs [options]"
7125 #: builtin/pack-refs.c:14
7126 msgid "pack everything"
7129 #: builtin/pack-refs.c:15
7130 msgid "prune loose refs (default)"
7133 #: builtin/prune-packed.c:7
7134 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
7137 #: builtin/prune.c:12
7138 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7141 #: builtin/prune.c:132
7142 msgid "do not remove, show only"
7145 #: builtin/prune.c:133
7146 msgid "report pruned objects"
7149 #: builtin/prune.c:136
7150 msgid "expire objects older than <time>"
7153 #: builtin/push.c:14
7154 msgid "git push [<options>] [<repository> [<refspec>...]]"
7157 #: builtin/push.c:45
7158 msgid "tag shorthand without <tag>"
7161 #: builtin/push.c:64
7162 msgid "--delete only accepts plain target ref names"
7165 #: builtin/push.c:99
7168 "To choose either option permanently, see push.default in 'git help config'."
7171 #: builtin/push.c:102
7174 "The upstream branch of your current branch does not match\n"
7175 "the name of your current branch. To push to the upstream branch\n"
7176 "on the remote, use\n"
7178 " git push %s HEAD:%s\n"
7180 "To push to the branch of the same name on the remote, use\n"
7186 #: builtin/push.c:117
7189 "You are not currently on a branch.\n"
7190 "To push the history leading to the current (detached HEAD)\n"
7193 " git push %s HEAD:<name-of-remote-branch>\n"
7196 #: builtin/push.c:131
7199 "The current branch %s has no upstream branch.\n"
7200 "To push the current branch and set the remote as upstream, use\n"
7202 " git push --set-upstream %s %s\n"
7205 #: builtin/push.c:139
7207 msgid "The current branch %s has multiple upstream branches, refusing to push."
7210 #: builtin/push.c:142
7213 "You are pushing to remote '%s', which is not the upstream of\n"
7214 "your current branch '%s', without telling me what to push\n"
7215 "to update which remote branch."
7218 #: builtin/push.c:165
7220 "push.default is unset; its implicit value is changing in\n"
7221 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7222 "and maintain the current behavior after the default changes, use:\n"
7224 " git config --global push.default matching\n"
7226 "To squelch this message and adopt the new behavior now, use:\n"
7228 " git config --global push.default simple\n"
7230 "See 'git help config' and search for 'push.default' for further "
7232 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7233 "'current' instead of 'simple' if you sometimes use older versions of Git)"
7236 #: builtin/push.c:225
7238 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
7241 #: builtin/push.c:232
7243 "Updates were rejected because the tip of your current branch is behind\n"
7244 "its remote counterpart. Integrate the remote changes (e.g.\n"
7245 "'git pull ...') before pushing again.\n"
7246 "See the 'Note about fast-forwards' in 'git push --help' for details."
7249 #: builtin/push.c:238
7251 "Updates were rejected because a pushed branch tip is behind its remote\n"
7252 "counterpart. If you did not intend to push that branch, you may want to\n"
7253 "specify branches to push or set the 'push.default' configuration variable\n"
7254 "to 'simple', 'current' or 'upstream' to push only the current branch."
7257 #: builtin/push.c:244
7259 "Updates were rejected because a pushed branch tip is behind its remote\n"
7260 "counterpart. Check out this branch and integrate the remote changes\n"
7261 "(e.g. 'git pull ...') before pushing again.\n"
7262 "See the 'Note about fast-forwards' in 'git push --help' for details."
7265 #: builtin/push.c:250
7267 "Updates were rejected because the remote contains work that you do\n"
7268 "not have locally. This is usually caused by another repository pushing\n"
7269 "to the same ref. You may want to first integrate the remote changes\n"
7270 "(e.g., 'git pull ...') before pushing again.\n"
7271 "See the 'Note about fast-forwards' in 'git push --help' for details."
7274 #: builtin/push.c:257
7275 msgid "Updates were rejected because the tag already exists in the remote."
7278 #: builtin/push.c:260
7280 "You cannot update a remote ref that points at a non-commit object,\n"
7281 "or update a remote ref to make it point at a non-commit object,\n"
7282 "without using the '--force' option.\n"
7285 #: builtin/push.c:320
7287 msgid "Pushing to %s\n"
7290 #: builtin/push.c:324
7292 msgid "failed to push some refs to '%s'"
7295 #: builtin/push.c:357
7297 msgid "bad repository '%s'"
7300 #: builtin/push.c:358
7302 "No configured push destination.\n"
7303 "Either specify the URL from the command-line or configure a remote "
7304 "repository using\n"
7306 " git remote add <name> <url>\n"
7308 "and then push using the remote name\n"
7310 " git push <name>\n"
7313 #: builtin/push.c:373
7314 msgid "--all and --tags are incompatible"
7317 #: builtin/push.c:374
7318 msgid "--all can't be combined with refspecs"
7321 #: builtin/push.c:379
7322 msgid "--mirror and --tags are incompatible"
7325 #: builtin/push.c:380
7326 msgid "--mirror can't be combined with refspecs"
7329 #: builtin/push.c:385
7330 msgid "--all and --mirror are incompatible"
7333 #: builtin/push.c:445
7337 #: builtin/push.c:446
7338 msgid "push all refs"
7341 #: builtin/push.c:447
7342 msgid "mirror all refs"
7345 #: builtin/push.c:449
7349 #: builtin/push.c:450
7350 msgid "push tags (can't be used with --all or --mirror)"
7353 #: builtin/push.c:453
7354 msgid "force updates"
7357 #: builtin/push.c:454
7361 #: builtin/push.c:455
7362 msgid "control recursive pushing of submodules"
7365 #: builtin/push.c:457
7366 msgid "use thin pack"
7369 #: builtin/push.c:458 builtin/push.c:459
7370 msgid "receive pack program"
7373 #: builtin/push.c:460
7374 msgid "set upstream for git pull/status"
7377 #: builtin/push.c:463
7378 msgid "prune locally removed refs"
7381 #: builtin/push.c:465
7382 msgid "bypass pre-push hook"
7385 #: builtin/push.c:466
7386 msgid "push missing but relevant tags"
7389 #: builtin/push.c:476
7390 msgid "--delete is incompatible with --all, --mirror and --tags"
7393 #: builtin/push.c:478
7394 msgid "--delete doesn't make sense without any refs"
7397 #: builtin/read-tree.c:36
7399 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7400 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7401 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7404 #: builtin/read-tree.c:109
7405 msgid "write resulting index to <file>"
7408 #: builtin/read-tree.c:112
7409 msgid "only empty the index"
7412 #: builtin/read-tree.c:114
7416 #: builtin/read-tree.c:116
7417 msgid "perform a merge in addition to a read"
7420 #: builtin/read-tree.c:118
7421 msgid "3-way merge if no file level merging required"
7424 #: builtin/read-tree.c:120
7425 msgid "3-way merge in presence of adds and removes"
7428 #: builtin/read-tree.c:122
7429 msgid "same as -m, but discard unmerged entries"
7432 #: builtin/read-tree.c:123
7433 msgid "<subdirectory>/"
7436 #: builtin/read-tree.c:124
7437 msgid "read the tree into the index under <subdirectory>/"
7440 #: builtin/read-tree.c:127
7441 msgid "update working tree with merge result"
7444 #: builtin/read-tree.c:129
7448 #: builtin/read-tree.c:130
7449 msgid "allow explicitly ignored files to be overwritten"
7452 #: builtin/read-tree.c:133
7453 msgid "don't check the working tree after merging"
7456 #: builtin/read-tree.c:134
7457 msgid "don't update the index or the work tree"
7460 #: builtin/read-tree.c:136
7461 msgid "skip applying sparse checkout filter"
7464 #: builtin/read-tree.c:138
7465 msgid "debug unpack-trees"
7468 #: builtin/reflog.c:500
7470 msgid "%s' for '%s' is not a valid timestamp"
7473 #: builtin/reflog.c:616 builtin/reflog.c:621
7475 msgid "'%s' is not a valid timestamp"
7478 #: builtin/remote.c:11
7479 msgid "git remote [-v | --verbose]"
7482 #: builtin/remote.c:12
7484 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7485 "mirror=<fetch|push>] <name> <url>"
7488 #: builtin/remote.c:13 builtin/remote.c:32
7489 msgid "git remote rename <old> <new>"
7492 #: builtin/remote.c:14 builtin/remote.c:37
7493 msgid "git remote remove <name>"
7496 #: builtin/remote.c:15 builtin/remote.c:42
7497 msgid "git remote set-head <name> (-a | -d | <branch>)"
7500 #: builtin/remote.c:16
7501 msgid "git remote [-v | --verbose] show [-n] <name>"
7504 #: builtin/remote.c:17
7505 msgid "git remote prune [-n | --dry-run] <name>"
7508 #: builtin/remote.c:18
7510 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
7513 #: builtin/remote.c:19
7514 msgid "git remote set-branches [--add] <name> <branch>..."
7517 #: builtin/remote.c:20 builtin/remote.c:68
7518 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
7521 #: builtin/remote.c:21 builtin/remote.c:69
7522 msgid "git remote set-url --add <name> <newurl>"
7525 #: builtin/remote.c:22 builtin/remote.c:70
7526 msgid "git remote set-url --delete <name> <url>"
7529 #: builtin/remote.c:27
7530 msgid "git remote add [<options>] <name> <url>"
7533 #: builtin/remote.c:47
7534 msgid "git remote set-branches <name> <branch>..."
7537 #: builtin/remote.c:48
7538 msgid "git remote set-branches --add <name> <branch>..."
7541 #: builtin/remote.c:53
7542 msgid "git remote show [<options>] <name>"
7545 #: builtin/remote.c:58
7546 msgid "git remote prune [<options>] <name>"
7549 #: builtin/remote.c:63
7550 msgid "git remote update [<options>] [<group> | <remote>]..."
7553 #: builtin/remote.c:98
7558 #: builtin/remote.c:130
7560 "--mirror is dangerous and deprecated; please\n"
7561 "\t use --mirror=fetch or --mirror=push instead"
7564 #: builtin/remote.c:147
7566 msgid "unknown mirror argument: %s"
7569 #: builtin/remote.c:163
7570 msgid "fetch the remote branches"
7573 #: builtin/remote.c:165
7574 msgid "import all tags and associated objects when fetching"
7577 #: builtin/remote.c:168
7578 msgid "or do not fetch any tag at all (--no-tags)"
7581 #: builtin/remote.c:170
7582 msgid "branch(es) to track"
7585 #: builtin/remote.c:171
7586 msgid "master branch"
7589 #: builtin/remote.c:172
7593 #: builtin/remote.c:173
7594 msgid "set up remote as a mirror to push to or fetch from"
7597 #: builtin/remote.c:185
7598 msgid "specifying a master branch makes no sense with --mirror"
7601 #: builtin/remote.c:187
7602 msgid "specifying branches to track makes sense only with fetch mirrors"
7605 #: builtin/remote.c:195 builtin/remote.c:646
7607 msgid "remote %s already exists."
7610 #: builtin/remote.c:199 builtin/remote.c:650
7612 msgid "'%s' is not a valid remote name"
7615 #: builtin/remote.c:243
7617 msgid "Could not setup master '%s'"
7620 #: builtin/remote.c:299
7622 msgid "more than one %s"
7625 #: builtin/remote.c:339
7627 msgid "Could not get fetch map for refspec %s"
7630 #: builtin/remote.c:440 builtin/remote.c:448
7634 #: builtin/remote.c:452
7638 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
7640 msgid "Could not append '%s' to '%s'"
7643 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
7645 msgid "No such remote: %s"
7648 #: builtin/remote.c:656
7650 msgid "Could not rename config section '%s' to '%s'"
7653 #: builtin/remote.c:662 builtin/remote.c:799
7655 msgid "Could not remove config section '%s'"
7658 #: builtin/remote.c:677
7661 "Not updating non-default fetch refspec\n"
7663 "\tPlease update the configuration manually if necessary."
7666 #: builtin/remote.c:683
7668 msgid "Could not append '%s'"
7671 #: builtin/remote.c:694
7673 msgid "Could not set '%s'"
7676 #: builtin/remote.c:716
7678 msgid "deleting '%s' failed"
7681 #: builtin/remote.c:750
7683 msgid "creating '%s' failed"
7686 #: builtin/remote.c:764
7688 msgid "Could not remove branch %s"
7691 #: builtin/remote.c:834
7693 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7694 "to delete it, use:"
7696 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7697 "to delete them, use:"
7701 #: builtin/remote.c:943
7703 msgid " new (next fetch will store in remotes/%s)"
7706 #: builtin/remote.c:946
7710 #: builtin/remote.c:948
7711 msgid " stale (use 'git remote prune' to remove)"
7714 #: builtin/remote.c:950
7718 #: builtin/remote.c:991
7720 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7723 #: builtin/remote.c:998
7725 msgid "rebases onto remote %s"
7728 #: builtin/remote.c:1001
7730 msgid " merges with remote %s"
7733 #: builtin/remote.c:1002
7734 msgid " and with remote"
7737 #: builtin/remote.c:1004
7739 msgid "merges with remote %s"
7742 #: builtin/remote.c:1005
7743 msgid " and with remote"
7746 #: builtin/remote.c:1051
7750 #: builtin/remote.c:1054
7754 #: builtin/remote.c:1058
7758 #: builtin/remote.c:1061
7759 msgid "fast-forwardable"
7762 #: builtin/remote.c:1064
7763 msgid "local out of date"
7766 #: builtin/remote.c:1071
7768 msgid " %-*s forces to %-*s (%s)"
7771 #: builtin/remote.c:1074
7773 msgid " %-*s pushes to %-*s (%s)"
7776 #: builtin/remote.c:1078
7778 msgid " %-*s forces to %s"
7781 #: builtin/remote.c:1081
7783 msgid " %-*s pushes to %s"
7786 #: builtin/remote.c:1091
7787 msgid "do not query remotes"
7790 #: builtin/remote.c:1118
7795 #: builtin/remote.c:1119
7797 msgid " Fetch URL: %s"
7800 #: builtin/remote.c:1120 builtin/remote.c:1285
7804 #: builtin/remote.c:1129 builtin/remote.c:1131
7806 msgid " Push URL: %s"
7809 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
7811 msgid " HEAD branch: %s"
7814 #: builtin/remote.c:1139
7817 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
7820 #: builtin/remote.c:1151
7822 msgid " Remote branch:%s"
7823 msgid_plural " Remote branches:%s"
7827 #: builtin/remote.c:1154 builtin/remote.c:1181
7828 msgid " (status not queried)"
7831 #: builtin/remote.c:1163
7832 msgid " Local branch configured for 'git pull':"
7833 msgid_plural " Local branches configured for 'git pull':"
7837 #: builtin/remote.c:1171
7838 msgid " Local refs will be mirrored by 'git push'"
7841 #: builtin/remote.c:1178
7843 msgid " Local ref configured for 'git push'%s:"
7844 msgid_plural " Local refs configured for 'git push'%s:"
7848 #: builtin/remote.c:1199
7849 msgid "set refs/remotes/<name>/HEAD according to remote"
7852 #: builtin/remote.c:1201
7853 msgid "delete refs/remotes/<name>/HEAD"
7856 #: builtin/remote.c:1216
7857 msgid "Cannot determine remote HEAD"
7860 #: builtin/remote.c:1218
7861 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
7864 #: builtin/remote.c:1228
7866 msgid "Could not delete %s"
7869 #: builtin/remote.c:1236
7871 msgid "Not a valid ref: %s"
7874 #: builtin/remote.c:1238
7876 msgid "Could not setup %s"
7879 #: builtin/remote.c:1274
7881 msgid " %s will become dangling!"
7884 #: builtin/remote.c:1275
7886 msgid " %s has become dangling!"
7889 #: builtin/remote.c:1281
7894 #: builtin/remote.c:1282
7899 #: builtin/remote.c:1295
7901 msgid " * [would prune] %s"
7904 #: builtin/remote.c:1298
7906 msgid " * [pruned] %s"
7909 #: builtin/remote.c:1321
7910 msgid "prune remotes after fetching"
7913 #: builtin/remote.c:1387 builtin/remote.c:1461
7915 msgid "No such remote '%s'"
7918 #: builtin/remote.c:1407
7922 #: builtin/remote.c:1414
7923 msgid "no remote specified"
7926 #: builtin/remote.c:1436
7927 msgid "manipulate push URLs"
7930 #: builtin/remote.c:1438
7934 #: builtin/remote.c:1440
7938 #: builtin/remote.c:1447
7939 msgid "--add --delete doesn't make sense"
7942 #: builtin/remote.c:1487
7944 msgid "Invalid old URL pattern: %s"
7947 #: builtin/remote.c:1495
7949 msgid "No such URL found: %s"
7952 #: builtin/remote.c:1497
7953 msgid "Will not delete all non-push URLs"
7956 #: builtin/remote.c:1569
7957 msgid "be verbose; must be placed before a subcommand"
7960 #: builtin/replace.c:17
7961 msgid "git replace [-f] <object> <replacement>"
7964 #: builtin/replace.c:18
7965 msgid "git replace -d <object>..."
7968 #: builtin/replace.c:19
7969 msgid "git replace -l [<pattern>]"
7972 #: builtin/replace.c:121
7973 msgid "list replace refs"
7976 #: builtin/replace.c:122
7977 msgid "delete replace refs"
7980 #: builtin/replace.c:123
7981 msgid "replace the ref if it exists"
7984 #: builtin/rerere.c:11
7985 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
7988 #: builtin/rerere.c:56
7989 msgid "register clean resolutions in index"
7992 #: builtin/reset.c:25
7994 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
7997 #: builtin/reset.c:26
7998 msgid "git reset [-q] <tree-ish> [--] <paths>..."
8001 #: builtin/reset.c:27
8002 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
8005 #: builtin/reset.c:33
8009 #: builtin/reset.c:33
8013 #: builtin/reset.c:33
8017 #: builtin/reset.c:33
8021 #: builtin/reset.c:33
8025 #: builtin/reset.c:73
8026 msgid "You do not have a valid HEAD."
8029 #: builtin/reset.c:75
8030 msgid "Failed to find tree of HEAD."
8033 #: builtin/reset.c:81
8035 msgid "Failed to find tree of %s."
8038 #: builtin/reset.c:99
8040 msgid "HEAD is now at %s"
8043 #: builtin/reset.c:172
8045 msgid "Cannot do a %s reset in the middle of a merge."
8048 #: builtin/reset.c:251
8049 msgid "be quiet, only report errors"
8052 #: builtin/reset.c:253
8053 msgid "reset HEAD and index"
8056 #: builtin/reset.c:254
8057 msgid "reset only HEAD"
8060 #: builtin/reset.c:256 builtin/reset.c:258
8061 msgid "reset HEAD, index and working tree"
8064 #: builtin/reset.c:260
8065 msgid "reset HEAD but keep local changes"
8068 #: builtin/reset.c:278
8070 msgid "Failed to resolve '%s' as a valid revision."
8073 #: builtin/reset.c:281 builtin/reset.c:289
8075 msgid "Could not parse object '%s'."
8078 #: builtin/reset.c:286
8080 msgid "Failed to resolve '%s' as a valid tree."
8083 #: builtin/reset.c:295
8084 msgid "--patch is incompatible with --{hard,mixed,soft}"
8087 #: builtin/reset.c:304
8088 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
8091 #: builtin/reset.c:306
8093 msgid "Cannot do %s reset with paths."
8096 #: builtin/reset.c:316
8098 msgid "%s reset is not allowed in a bare repository"
8101 #: builtin/reset.c:336
8103 msgid "Could not reset index file to revision '%s'."
8106 #: builtin/reset.c:342
8107 msgid "Unstaged changes after reset:"
8110 #: builtin/reset.c:347
8111 msgid "Could not write new index file."
8114 #: builtin/rev-parse.c:345
8115 msgid "git rev-parse --parseopt [options] -- [<args>...]"
8118 #: builtin/rev-parse.c:350
8119 msgid "keep the `--` passed as an arg"
8122 #: builtin/rev-parse.c:352
8123 msgid "stop parsing after the first non-option argument"
8126 #: builtin/rev-parse.c:470
8128 "git rev-parse --parseopt [options] -- [<args>...]\n"
8129 " or: git rev-parse --sq-quote [<arg>...]\n"
8130 " or: git rev-parse [options] [<arg>...]\n"
8132 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
8135 #: builtin/revert.c:22
8136 msgid "git revert [options] <commit-ish>..."
8139 #: builtin/revert.c:23
8140 msgid "git revert <subcommand>"
8143 #: builtin/revert.c:28
8144 msgid "git cherry-pick [options] <commit-ish>..."
8147 #: builtin/revert.c:29
8148 msgid "git cherry-pick <subcommand>"
8151 #: builtin/revert.c:71 builtin/revert.c:94
8153 msgid "%s: %s cannot be used with %s"
8156 #: builtin/revert.c:105
8157 msgid "end revert or cherry-pick sequence"
8160 #: builtin/revert.c:106
8161 msgid "resume revert or cherry-pick sequence"
8164 #: builtin/revert.c:107
8165 msgid "cancel revert or cherry-pick sequence"
8168 #: builtin/revert.c:108
8169 msgid "don't automatically commit"
8172 #: builtin/revert.c:109
8173 msgid "edit the commit message"
8176 #: builtin/revert.c:112
8177 msgid "parent number"
8180 #: builtin/revert.c:114
8181 msgid "merge strategy"
8184 #: builtin/revert.c:115
8188 #: builtin/revert.c:116
8189 msgid "option for merge strategy"
8192 #: builtin/revert.c:127
8193 msgid "append commit name"
8196 #: builtin/revert.c:128
8197 msgid "allow fast-forward"
8200 #: builtin/revert.c:129
8201 msgid "preserve initially empty commits"
8204 #: builtin/revert.c:130
8205 msgid "allow commits with empty messages"
8208 #: builtin/revert.c:131
8209 msgid "keep redundant, empty commits"
8212 #: builtin/revert.c:135
8213 msgid "program error"
8216 #: builtin/revert.c:225
8217 msgid "revert failed"
8220 #: builtin/revert.c:240
8221 msgid "cherry-pick failed"
8225 msgid "git rm [options] [--] <file>..."
8230 "the following submodule (or one of its nested submodules)\n"
8231 "uses a .git directory:"
8233 "the following submodules (or one of its nested submodules)\n"
8234 "use a .git directory:"
8241 "(use 'rm -rf' if you really want to remove it including all of its history)"
8246 "the following file has staged content different from both the\n"
8247 "file and the HEAD:"
8249 "the following files have staged content different from both the\n"
8250 "file and the HEAD:"
8257 "(use -f to force removal)"
8261 msgid "the following file has changes staged in the index:"
8262 msgid_plural "the following files have changes staged in the index:"
8266 #: builtin/rm.c:243 builtin/rm.c:254
8269 "(use --cached to keep the file, or -f to force removal)"
8273 msgid "the following file has local modifications:"
8274 msgid_plural "the following files have local modifications:"
8279 msgid "do not list removed files"
8283 msgid "only remove from the index"
8287 msgid "override the up-to-date check"
8291 msgid "allow recursive removal"
8295 msgid "exit with a zero status even if nothing matched"
8300 msgid "not removing '%s' recursively without -r"
8305 msgid "git rm: unable to remove %s"
8308 #: builtin/shortlog.c:13
8309 msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
8312 #: builtin/shortlog.c:131
8314 msgid "Missing author: %s"
8317 #: builtin/shortlog.c:228
8318 msgid "sort output according to the number of commits per author"
8321 #: builtin/shortlog.c:230
8322 msgid "Suppress commit descriptions, only provides commit count"
8325 #: builtin/shortlog.c:232
8326 msgid "Show the email address of each author"
8329 #: builtin/shortlog.c:233
8333 #: builtin/shortlog.c:234
8334 msgid "Linewrap output"
8337 #: builtin/show-branch.c:9
8339 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8340 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8341 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8345 #: builtin/show-branch.c:10
8346 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8349 #: builtin/show-branch.c:650
8350 msgid "show remote-tracking and local branches"
8353 #: builtin/show-branch.c:652
8354 msgid "show remote-tracking branches"
8357 #: builtin/show-branch.c:654
8358 msgid "color '*!+-' corresponding to the branch"
8361 #: builtin/show-branch.c:656
8362 msgid "show <n> more commits after the common ancestor"
8365 #: builtin/show-branch.c:658
8366 msgid "synonym to more=-1"
8369 #: builtin/show-branch.c:659
8370 msgid "suppress naming strings"
8373 #: builtin/show-branch.c:661
8374 msgid "include the current branch"
8377 #: builtin/show-branch.c:663
8378 msgid "name commits with their object names"
8381 #: builtin/show-branch.c:665
8382 msgid "show possible merge bases"
8385 #: builtin/show-branch.c:667
8386 msgid "show refs unreachable from any other ref"
8389 #: builtin/show-branch.c:669
8390 msgid "show commits in topological order"
8393 #: builtin/show-branch.c:672
8394 msgid "show only commits not on the first branch"
8397 #: builtin/show-branch.c:674
8398 msgid "show merges reachable from only one tip"
8401 #: builtin/show-branch.c:676
8402 msgid "topologically sort, maintaining date order where possible"
8405 #: builtin/show-branch.c:679
8406 msgid "<n>[,<base>]"
8409 #: builtin/show-branch.c:680
8410 msgid "show <n> most recent ref-log entries starting at base"
8413 #: builtin/show-ref.c:10
8415 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8416 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8419 #: builtin/show-ref.c:11
8420 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
8423 #: builtin/show-ref.c:168
8424 msgid "only show tags (can be combined with heads)"
8427 #: builtin/show-ref.c:169
8428 msgid "only show heads (can be combined with tags)"
8431 #: builtin/show-ref.c:170
8432 msgid "stricter reference checking, requires exact ref path"
8435 #: builtin/show-ref.c:173 builtin/show-ref.c:176
8436 msgid "show the HEAD reference, even if it would be filtered out"
8439 #: builtin/show-ref.c:178
8440 msgid "dereference tags into object IDs"
8443 #: builtin/show-ref.c:180
8444 msgid "only show SHA1 hash using <n> digits"
8447 #: builtin/show-ref.c:184
8448 msgid "do not print results to stdout (useful with --verify)"
8451 #: builtin/show-ref.c:186
8452 msgid "show refs from stdin that aren't in local repository"
8455 #: builtin/symbolic-ref.c:7
8456 msgid "git symbolic-ref [options] name [ref]"
8459 #: builtin/symbolic-ref.c:8
8460 msgid "git symbolic-ref -d [-q] name"
8463 #: builtin/symbolic-ref.c:40
8464 msgid "suppress error message for non-symbolic (detached) refs"
8467 #: builtin/symbolic-ref.c:41
8468 msgid "delete symbolic ref"
8471 #: builtin/symbolic-ref.c:42
8472 msgid "shorten ref output"
8475 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8479 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8480 msgid "reason of the update"
8485 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
8489 msgid "git tag -d <tagname>..."
8494 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8495 "\t\t[<pattern>...]"
8499 msgid "git tag -v <tagname>..."
8504 msgid "malformed object at '%s'"
8507 #: builtin/tag.c:207
8509 msgid "tag name too long: %.*s..."
8512 #: builtin/tag.c:212
8514 msgid "tag '%s' not found."
8517 #: builtin/tag.c:227
8519 msgid "Deleted tag '%s' (was %s)\n"
8522 #: builtin/tag.c:239
8524 msgid "could not verify the tag '%s'"
8527 #: builtin/tag.c:249
8531 "Write a tag message\n"
8532 "Lines starting with '%c' will be ignored.\n"
8535 #: builtin/tag.c:253
8539 "Write a tag message\n"
8540 "Lines starting with '%c' will be kept; you may remove them yourself if you "
8544 #: builtin/tag.c:292
8545 msgid "unable to sign the tag"
8548 #: builtin/tag.c:294
8549 msgid "unable to write tag file"
8552 #: builtin/tag.c:319
8553 msgid "bad object type."
8556 #: builtin/tag.c:332
8557 msgid "tag header too big."
8560 #: builtin/tag.c:368
8561 msgid "no tag message?"
8564 #: builtin/tag.c:374
8566 msgid "The tag message has been left in %s\n"
8569 #: builtin/tag.c:423
8570 msgid "switch 'points-at' requires an object"
8573 #: builtin/tag.c:425
8575 msgid "malformed object name '%s'"
8578 #: builtin/tag.c:445
8579 msgid "list tag names"
8582 #: builtin/tag.c:447
8583 msgid "print <n> lines of each tag message"
8586 #: builtin/tag.c:449
8590 #: builtin/tag.c:450
8594 #: builtin/tag.c:452
8595 msgid "Tag creation options"
8598 #: builtin/tag.c:454
8599 msgid "annotated tag, needs a message"
8602 #: builtin/tag.c:456
8606 #: builtin/tag.c:458
8607 msgid "annotated and GPG-signed tag"
8610 #: builtin/tag.c:462
8611 msgid "use another key to sign the tag"
8614 #: builtin/tag.c:463
8615 msgid "replace the tag if exists"
8618 #: builtin/tag.c:464
8619 msgid "show tag list in columns"
8622 #: builtin/tag.c:466
8623 msgid "Tag listing options"
8626 #: builtin/tag.c:469
8627 msgid "print only tags that contain the commit"
8630 #: builtin/tag.c:475
8631 msgid "print only tags of the object"
8634 #: builtin/tag.c:504
8635 msgid "--column and -n are incompatible"
8638 #: builtin/tag.c:521
8639 msgid "-n option is only allowed with -l."
8642 #: builtin/tag.c:523
8643 msgid "--contains option is only allowed with -l."
8646 #: builtin/tag.c:525
8647 msgid "--points-at option is only allowed with -l."
8650 #: builtin/tag.c:533
8651 msgid "only one -F or -m option is allowed."
8654 #: builtin/tag.c:553
8655 msgid "too many params"
8658 #: builtin/tag.c:559
8660 msgid "'%s' is not a valid tag name."
8663 #: builtin/tag.c:564
8665 msgid "tag '%s' already exists"
8668 #: builtin/tag.c:582
8670 msgid "%s: cannot lock the ref"
8673 #: builtin/tag.c:584
8675 msgid "%s: cannot update the ref"
8678 #: builtin/tag.c:586
8680 msgid "Updated tag '%s' (was %s)\n"
8683 #: builtin/update-index.c:401
8684 msgid "git update-index [options] [--] [<file>...]"
8687 #: builtin/update-index.c:718
8688 msgid "continue refresh even when index needs update"
8691 #: builtin/update-index.c:721
8692 msgid "refresh: ignore submodules"
8695 #: builtin/update-index.c:724
8696 msgid "do not ignore new files"
8699 #: builtin/update-index.c:726
8700 msgid "let files replace directories and vice-versa"
8703 #: builtin/update-index.c:728
8704 msgid "notice files missing from worktree"
8707 #: builtin/update-index.c:730
8708 msgid "refresh even if index contains unmerged entries"
8711 #: builtin/update-index.c:733
8712 msgid "refresh stat information"
8715 #: builtin/update-index.c:737
8716 msgid "like --refresh, but ignore assume-unchanged setting"
8719 #: builtin/update-index.c:741
8720 msgid "<mode> <object> <path>"
8723 #: builtin/update-index.c:742
8724 msgid "add the specified entry to the index"
8727 #: builtin/update-index.c:746
8731 #: builtin/update-index.c:747
8732 msgid "override the executable bit of the listed files"
8735 #: builtin/update-index.c:751
8736 msgid "mark files as \"not changing\""
8739 #: builtin/update-index.c:754
8740 msgid "clear assumed-unchanged bit"
8743 #: builtin/update-index.c:757
8744 msgid "mark files as \"index-only\""
8747 #: builtin/update-index.c:760
8748 msgid "clear skip-worktree bit"
8751 #: builtin/update-index.c:763
8752 msgid "add to index only; do not add content to object database"
8755 #: builtin/update-index.c:765
8756 msgid "remove named paths even if present in worktree"
8759 #: builtin/update-index.c:767
8760 msgid "with --stdin: input lines are terminated by null bytes"
8763 #: builtin/update-index.c:769
8764 msgid "read list of paths to be updated from standard input"
8767 #: builtin/update-index.c:773
8768 msgid "add entries from standard input to the index"
8771 #: builtin/update-index.c:777
8772 msgid "repopulate stages #2 and #3 for the listed paths"
8775 #: builtin/update-index.c:781
8776 msgid "only update entries that differ from HEAD"
8779 #: builtin/update-index.c:785
8780 msgid "ignore files missing from worktree"
8783 #: builtin/update-index.c:788
8784 msgid "report actions to standard output"
8787 #: builtin/update-index.c:790
8788 msgid "(for porcelains) forget saved unresolved conflicts"
8791 #: builtin/update-index.c:794
8792 msgid "write index in this format"
8795 #: builtin/update-ref.c:7
8796 msgid "git update-ref [options] -d <refname> [<oldval>]"
8799 #: builtin/update-ref.c:8
8800 msgid "git update-ref [options] <refname> <newval> [<oldval>]"
8803 #: builtin/update-ref.c:19
8804 msgid "delete the reference"
8807 #: builtin/update-ref.c:21
8808 msgid "update <refname> not the one it points to"
8811 #: builtin/update-server-info.c:6
8812 msgid "git update-server-info [--force]"
8815 #: builtin/update-server-info.c:14
8816 msgid "update the info files from scratch"
8819 #: builtin/verify-pack.c:56
8820 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8823 #: builtin/verify-pack.c:66
8827 #: builtin/verify-pack.c:68
8828 msgid "show statistics only"
8831 #: builtin/verify-tag.c:17
8832 msgid "git verify-tag [-v|--verbose] <tag>..."
8835 #: builtin/verify-tag.c:73
8836 msgid "print tag contents"
8839 #: builtin/write-tree.c:13
8840 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
8843 #: builtin/write-tree.c:26
8847 #: builtin/write-tree.c:27
8848 msgid "write tree object for a subdirectory <prefix>"
8851 #: builtin/write-tree.c:30
8852 msgid "only useful for debugging"
8857 "'git help -a' and 'git help -g' lists available subcommands and some\n"
8858 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
8859 "to read about a specific subcommand or concept."
8862 #: parse-options.h:144
8866 #: parse-options.h:159
8867 msgid "no-op (backward compatibility)"
8870 #: parse-options.h:236
8871 msgid "be more verbose"
8874 #: parse-options.h:238
8875 msgid "be more quiet"
8878 #: parse-options.h:244
8879 msgid "use <n> digits to display SHA-1s"
8883 msgid "Add file contents to the index"
8887 msgid "Find by binary search the change that introduced a bug"
8891 msgid "List, create, or delete branches"
8895 msgid "Checkout a branch or paths to the working tree"
8899 msgid "Clone a repository into a new directory"
8903 msgid "Record changes to the repository"
8907 msgid "Show changes between commits, commit and working tree, etc"
8911 msgid "Download objects and refs from another repository"
8915 msgid "Print lines matching a pattern"
8919 msgid "Create an empty Git repository or reinitialize an existing one"
8923 msgid "Show commit logs"
8927 msgid "Join two or more development histories together"
8931 msgid "Move or rename a file, a directory, or a symlink"
8935 msgid "Fetch from and integrate with another repository or a local branch"
8939 msgid "Update remote refs along with associated objects"
8943 msgid "Forward-port local commits to the updated upstream head"
8947 msgid "Reset current HEAD to the specified state"
8951 msgid "Remove files from the working tree and from the index"
8955 msgid "Show various types of objects"
8959 msgid "Show the working tree status"
8963 msgid "Create, list, delete or verify a tag object signed with GPG"
8967 msgid "You need to set your committer info first"
8972 "You seem to have moved HEAD since the last 'am' failure.\n"
8973 "Not rewinding to ORIG_HEAD"
8979 "When you have resolved this problem, run \"$cmdline --continue\".\n"
8980 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8981 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
8985 msgid "Cannot fall back to three-way merge."
8989 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
8993 msgid "Using index info to reconstruct a base tree..."
8998 "Did you hand edit your patch?\n"
8999 "It does not apply to blobs recorded in its index."
9003 msgid "Falling back to patching base and 3-way merge..."
9007 msgid "Failed to merge in the changes."
9011 msgid "Only one StGIT patch series can be applied at once"
9016 msgid "Patch format $patch_format is not supported."
9020 msgid "Patch format detection failed."
9025 "The -b/--binary option has been a no-op for long time, and\n"
9026 "it will be removed. Please do not use it anymore."
9031 msgid "previous rebase directory $dotest still exists but mbox given."
9035 msgid "Please make up your mind. --skip or --abort?"
9041 "Stray $dotest directory found.\n"
9042 "Use \"git am --abort\" to remove it."
9046 msgid "Resolve operation not in progress, we are not resuming."
9051 msgid "Dirty index: cannot apply patches (dirty: $files)"
9057 "Patch is empty. Was it split wrong?\n"
9058 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
9059 "To restore the original branch and stop patching run \"$cmdline --abort\"."
9063 msgid "Patch does not have a valid e-mail address."
9067 msgid "cannot be interactive without stdin connected to a terminal."
9071 msgid "Commit Body is:"
9074 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9075 #. in your translation. The program will only accept English
9076 #. input at this point.
9078 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9083 msgid "Applying: $FIRSTLINE"
9088 "No changes - did you forget to use 'git add'?\n"
9089 "If there is nothing left to stage, chances are that something else\n"
9090 "already introduced the same changes; you might want to skip this patch."
9095 "You still have unmerged paths in your index\n"
9096 "did you forget to use 'git add'?"
9100 msgid "No changes -- Patch already applied."
9105 msgid "Patch failed at $msgnum $FIRSTLINE"
9111 "The copy of the patch that failed is found in:\n"
9116 msgid "applying to an empty history"
9120 msgid "You need to start by \"git bisect start\""
9123 #. TRANSLATORS: Make sure to include [Y] and [n] in your
9124 #. translation. The program will only accept English input
9127 msgid "Do you want me to do it for you [Y/n]? "
9132 msgid "unrecognised option: '$arg'"
9137 msgid "'$arg' does not appear to be a valid revision"
9140 #: git-bisect.sh:117
9141 msgid "Bad HEAD - I need a HEAD"
9144 #: git-bisect.sh:130
9147 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
9150 #: git-bisect.sh:140
9151 msgid "won't bisect on seeked tree"
9154 #: git-bisect.sh:144
9155 msgid "Bad HEAD - strange symbolic ref"
9158 #: git-bisect.sh:189
9160 msgid "Bad bisect_write argument: $state"
9163 #: git-bisect.sh:218
9165 msgid "Bad rev input: $arg"
9168 #: git-bisect.sh:232
9169 msgid "Please call 'bisect_state' with at least one argument."
9172 #: git-bisect.sh:244
9174 msgid "Bad rev input: $rev"
9177 #: git-bisect.sh:250
9178 msgid "'git bisect bad' can take only one argument."
9181 #. have bad but not good. we could bisect although
9182 #. this is less optimum.
9183 #: git-bisect.sh:273
9184 msgid "Warning: bisecting only with a bad commit."
9187 #. TRANSLATORS: Make sure to include [Y] and [n] in your
9188 #. translation. The program will only accept English input
9190 #: git-bisect.sh:279
9191 msgid "Are you sure [Y/n]? "
9194 #: git-bisect.sh:289
9196 "You need to give me at least one good and one bad revisions.\n"
9197 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9200 #: git-bisect.sh:292
9202 "You need to start by \"git bisect start\".\n"
9203 "You then need to give me at least one good and one bad revisions.\n"
9204 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9207 #: git-bisect.sh:363 git-bisect.sh:490
9208 msgid "We are not bisecting."
9211 #: git-bisect.sh:370
9213 msgid "'$invalid' is not a valid commit"
9216 #: git-bisect.sh:379
9219 "Could not check out original HEAD '$branch'.\n"
9220 "Try 'git bisect reset <commit>'."
9223 #: git-bisect.sh:406
9224 msgid "No logfile given"
9227 #: git-bisect.sh:407
9229 msgid "cannot read $file for replaying"
9232 #: git-bisect.sh:424
9233 msgid "?? what are you talking about?"
9236 #: git-bisect.sh:436
9238 msgid "running $command"
9241 #: git-bisect.sh:443
9244 "bisect run failed:\n"
9245 "exit code $res from '$command' is < 0 or >= 128"
9248 #: git-bisect.sh:469
9249 msgid "bisect run cannot continue any more"
9252 #: git-bisect.sh:475
9255 "bisect run failed:\n"
9256 "'bisect_state $state' exited with error code $res"
9259 #: git-bisect.sh:482
9260 msgid "bisect run success"
9265 "Pull is not possible because you have unmerged files.\n"
9266 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
9267 "as appropriate to mark resolution, or use 'git commit -a'."
9271 msgid "Pull is not possible because you have unmerged files."
9275 msgid "updating an unborn branch with changes added to the index"
9278 #. The fetch involved updating the current branch.
9279 #. The working tree and the index file is still based on the
9280 #. $orig_head commit, but we are merging into $curr_head.
9281 #. First update the working tree to match $curr_head.
9285 "Warning: fetch updated the current branch head.\n"
9286 "Warning: fast-forwarding your working tree from\n"
9287 "Warning: commit $orig_head."
9291 msgid "Cannot merge multiple branches into empty head"
9295 msgid "Cannot rebase onto multiple branches"
9300 "When you have resolved this problem, run \"git rebase --continue\".\n"
9301 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
9302 "To check out the original branch and stop rebasing, run \"git rebase --abort"
9306 #: git-rebase.sh:156
9307 msgid "Applied autostash."
9310 #: git-rebase.sh:159
9312 msgid "Cannot store $stash_sha1"
9315 #: git-rebase.sh:160
9317 "Applying autostash resulted in conflicts.\n"
9318 "Your changes are safe in the stash.\n"
9319 "You can run \"git stash pop\" or \"git stash drop\" it at any time.\n"
9322 #: git-rebase.sh:190
9323 msgid "The pre-rebase hook refused to rebase."
9326 #: git-rebase.sh:195
9327 msgid "It looks like git-am is in progress. Cannot rebase."
9330 #: git-rebase.sh:329
9331 msgid "The --exec option must be used with the --interactive option"
9334 #: git-rebase.sh:334
9335 msgid "No rebase in progress?"
9338 #: git-rebase.sh:345
9339 msgid "The --edit-todo action can only be used during interactive rebase."
9342 #: git-rebase.sh:352
9343 msgid "Cannot read HEAD"
9346 #: git-rebase.sh:355
9348 "You must edit all merge conflicts and then\n"
9349 "mark them as resolved using git add"
9352 #: git-rebase.sh:373
9354 msgid "Could not move back to $head_name"
9357 #: git-rebase.sh:392
9360 "It seems that there is already a $state_dir_base directory, and\n"
9361 "I wonder if you are in the middle of another rebase. If that is the\n"
9362 "case, please try\n"
9363 "\t$cmd_live_rebase\n"
9364 "If that is not the case, please\n"
9365 "\t$cmd_clear_stale_rebase\n"
9366 "and run me again. I am stopping in case you still have something\n"
9370 #: git-rebase.sh:437
9372 msgid "invalid upstream $upstream_name"
9375 #: git-rebase.sh:461
9377 msgid "$onto_name: there are more than one merge bases"
9380 #: git-rebase.sh:464 git-rebase.sh:468
9382 msgid "$onto_name: there is no merge base"
9385 #: git-rebase.sh:473
9387 msgid "Does not point to a valid commit: $onto_name"
9390 #: git-rebase.sh:496
9392 msgid "fatal: no such branch: $branch_name"
9395 #: git-rebase.sh:519
9396 msgid "Cannot autostash"
9399 #: git-rebase.sh:524
9401 msgid "Created autostash: $stash_abbrev"
9404 #: git-rebase.sh:528
9405 msgid "Please commit or stash them."
9408 #: git-rebase.sh:548
9410 msgid "Current branch $branch_name is up to date."
9413 #: git-rebase.sh:552
9415 msgid "Current branch $branch_name is up to date, rebase forced."
9418 #: git-rebase.sh:563
9420 msgid "Changes from $mb to $onto:"
9423 #. Detach HEAD and reset the tree
9424 #: git-rebase.sh:572
9425 msgid "First, rewinding head to replay your work on top of it..."
9428 #: git-rebase.sh:582
9430 msgid "Fast-forwarded $branch_name to $onto_name."
9434 msgid "git stash clear with parameters is unimplemented"
9438 msgid "You do not have the initial commit yet"
9442 msgid "Cannot save the current index state"
9445 #: git-stash.sh:123 git-stash.sh:136
9446 msgid "Cannot save the current worktree state"
9450 msgid "No changes selected"
9454 msgid "Cannot remove temporary index (can't happen)"
9458 msgid "Cannot record working tree state"
9463 msgid "Cannot update $ref_stash with $w_commit"
9466 #. TRANSLATORS: $option is an invalid option, like
9467 #. `--blah-blah'. The 7 spaces at the beginning of the
9468 #. second line correspond to "error: ". So you should line
9469 #. up the second line with however many characters the
9470 #. translation of "error: " takes in your language. E.g. in
9473 #. $ git stash save --blah-blah 2>&1 | head -n 2
9474 #. error: unknown option for 'stash save': --blah-blah
9475 #. To provide a message, use git stash save -- '--blah-blah'
9479 "error: unknown option for 'stash save': $option\n"
9480 " To provide a message, use git stash save -- '$option'"
9484 msgid "No local changes to save"
9489 "The following untracked files would NOT be saved but need to be removed by "
9495 "Aborting. Consider using either the --force or --include-untracked option."
9499 msgid "Cannot initialize stash"
9503 msgid "Cannot save the current status"
9507 msgid "Cannot remove worktree changes"
9511 msgid "No stash found."
9516 msgid "Too many revisions specified: $REV"
9521 msgid "$reference is not valid reference"
9526 msgid "'$args' is not a stash-like commit"
9531 msgid "'$args' is not a stash reference"
9535 msgid "unable to refresh index"
9539 msgid "Cannot apply a stash in the middle of a merge"
9543 msgid "Conflicts in index. Try without --index."
9547 msgid "Could not save index tree"
9551 msgid "Cannot unstage modified files"
9555 msgid "Index was not unstashed."
9560 msgid "Dropped ${REV} ($s)"
9565 msgid "${REV}: Could not drop stash entry"
9569 msgid "No branch name specified"
9573 msgid "(To restore them type \"git stash apply\")"
9576 #: git-submodule.sh:95
9578 msgid "cannot strip one component off url '$remoteurl'"
9581 #: git-submodule.sh:237
9583 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
9586 #: git-submodule.sh:281
9588 msgid "Clone of '$url' into submodule path '$sm_path' failed"
9591 #: git-submodule.sh:293
9593 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
9596 #: git-submodule.sh:403
9597 msgid "Relative path can only be used from the toplevel of the working tree"
9600 #: git-submodule.sh:413
9602 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
9605 #: git-submodule.sh:430
9607 msgid "'$sm_path' already exists in the index"
9610 #: git-submodule.sh:434
9613 "The following path is ignored by one of your .gitignore files:\n"
9615 "Use -f if you really want to add it."
9618 #: git-submodule.sh:452
9620 msgid "Adding existing repo at '$sm_path' to the index"
9623 #: git-submodule.sh:454
9625 msgid "'$sm_path' already exists and is not a valid git repo"
9628 #: git-submodule.sh:462
9630 msgid "A git directory for '$sm_name' is found locally with remote(s):"
9633 #: git-submodule.sh:464
9636 "If you want to reuse this local git directory instead of cloning again from"
9639 #: git-submodule.sh:466
9642 "use the '--force' option. If the local git directory is not the correct repo"
9645 #: git-submodule.sh:467
9648 "or you are unsure what this means choose another name with the '--name' "
9652 #: git-submodule.sh:469
9654 msgid "Reactivating local git directory for submodule '$sm_name'."
9657 #: git-submodule.sh:481
9659 msgid "Unable to checkout submodule '$sm_path'"
9662 #: git-submodule.sh:486
9664 msgid "Failed to add submodule '$sm_path'"
9667 #: git-submodule.sh:495
9669 msgid "Failed to register submodule '$sm_path'"
9672 #: git-submodule.sh:539
9674 msgid "Entering '$prefix$displaypath'"
9677 #: git-submodule.sh:554
9679 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
9682 #: git-submodule.sh:600
9684 msgid "No url found for submodule path '$displaypath' in .gitmodules"
9687 #: git-submodule.sh:609
9689 msgid "Failed to register url for submodule path '$displaypath'"
9692 #: git-submodule.sh:611
9694 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
9697 #: git-submodule.sh:619
9699 msgid "Failed to register update mode for submodule path '$displaypath'"
9702 #: git-submodule.sh:656
9704 msgid "Use '.' if you really want to deinitialize all submodules"
9707 #: git-submodule.sh:673
9709 msgid "Submodule work tree '$displaypath' contains a .git directory"
9712 #: git-submodule.sh:674
9715 "(use 'rm -rf' if you really want to remove it including all of its history)"
9718 #: git-submodule.sh:680
9721 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
9725 #: git-submodule.sh:683
9727 msgid "Cleared directory '$displaypath'"
9730 #: git-submodule.sh:684
9732 msgid "Could not remove submodule work tree '$displaypath'"
9735 #: git-submodule.sh:687
9737 msgid "Could not create empty submodule directory '$displaypath'"
9740 #: git-submodule.sh:696
9742 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
9745 #: git-submodule.sh:811
9748 "Submodule path '$displaypath' not initialized\n"
9749 "Maybe you want to use 'update --init'?"
9752 #: git-submodule.sh:824
9754 msgid "Unable to find current revision in submodule path '$displaypath'"
9757 #: git-submodule.sh:833
9759 msgid "Unable to fetch in submodule path '$sm_path'"
9762 #: git-submodule.sh:857
9764 msgid "Unable to fetch in submodule path '$displaypath'"
9767 #: git-submodule.sh:871
9769 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
9772 #: git-submodule.sh:872
9774 msgid "Submodule path '$displaypath': rebased into '$sha1'"
9777 #: git-submodule.sh:877
9779 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
9782 #: git-submodule.sh:878
9784 msgid "Submodule path '$displaypath': merged in '$sha1'"
9787 #: git-submodule.sh:883
9790 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
9793 #: git-submodule.sh:884
9795 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
9798 #: git-submodule.sh:889
9800 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
9803 #: git-submodule.sh:890
9805 msgid "Submodule path '$displaypath': checked out '$sha1'"
9808 #: git-submodule.sh:917
9810 msgid "Failed to recurse into submodule path '$displaypath'"
9813 #: git-submodule.sh:1025
9814 msgid "The --cached option cannot be used with the --files option"
9818 #: git-submodule.sh:1066
9820 msgid "unexpected mode $mod_dst"
9823 #: git-submodule.sh:1086
9825 msgid " Warn: $display_name doesn't contain commit $sha1_src"
9828 #: git-submodule.sh:1089
9830 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
9833 #: git-submodule.sh:1092
9835 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
9838 #: git-submodule.sh:1117
9842 #: git-submodule.sh:1155
9843 msgid "Submodules changed but not updated:"
9846 #: git-submodule.sh:1157
9847 msgid "Submodule changes to be committed:"
9850 #: git-submodule.sh:1242
9852 msgid "Failed to recurse into submodule path '$sm_path'"
9855 #: git-submodule.sh:1306
9857 msgid "Synchronizing submodule url for '$displaypath'"