1 # SOME DESCRIPTIVE TITLE.
2 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3 # This file is distributed under the same license as the PACKAGE package.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11 "POT-Creation-Date: 2015-12-22 22:50+0800\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
17 "Content-Type: text/plain; charset=CHARSET\n"
18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
28 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
29 "as appropriate to mark resolution and make a commit."
32 #: advice.c:101 builtin/merge.c:1225
33 msgid "You have not concluded your merge (MERGE_HEAD exists)."
37 msgid "Please, commit your changes before merging."
41 msgid "Exiting because of unfinished merge."
45 msgid "git archive [<options>] <tree-ish> [<path>...]"
49 msgid "git archive --list"
54 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
58 msgid "git archive --remote <repo> [--exec <cmd>] --list"
61 #: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
63 msgid "pathspec '%s' did not match any files"
71 msgid "archive format"
74 #: archive.c:430 builtin/log.c:1229
79 msgid "prepend prefix to each pathname in the archive"
82 #: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535
83 #: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987
84 #: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99
85 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395
86 #: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153
90 #: archive.c:433 builtin/archive.c:89
91 msgid "write the archive to this file"
95 msgid "read .gitattributes in working directory"
99 msgid "report archived files on stderr"
107 msgid "compress faster"
111 msgid "compress better"
115 msgid "list supported archive formats"
118 #: archive.c:451 builtin/archive.c:90 builtin/clone.c:77
122 #: archive.c:452 builtin/archive.c:91
123 msgid "retrieve the archive from remote repository <repo>"
126 #: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
130 #: archive.c:454 builtin/archive.c:93
131 msgid "path to the remote git-upload-archive command"
136 "Negative patterns are ignored in git attributes\n"
137 "Use '\\!' for literal leading exclamation."
142 msgid "Not setting branch %s as its own upstream."
147 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
152 msgid "Branch %s set up to track remote branch %s from %s."
157 msgid "Branch %s set up to track local branch %s by rebasing."
162 msgid "Branch %s set up to track local branch %s."
167 msgid "Branch %s set up to track remote ref %s by rebasing."
172 msgid "Branch %s set up to track remote ref %s."
177 msgid "Branch %s set up to track local ref %s by rebasing."
182 msgid "Branch %s set up to track local ref %s."
187 msgid "Not tracking: ambiguous information for ref %s"
192 msgid "'%s' is not a valid branch name."
197 msgid "A branch named '%s' already exists."
201 msgid "Cannot force update the current branch."
206 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
211 msgid "the requested upstream branch '%s' does not exist"
217 "If you are planning on basing your work on an upstream\n"
218 "branch that already exists at the remote, you may need to\n"
219 "run \"git fetch\" to retrieve it.\n"
221 "If you are planning to push out a new local branch that\n"
222 "will track its remote counterpart, you may want to use\n"
223 "\"git push -u\" to set the upstream config as you push."
228 msgid "Not a valid object name: '%s'."
233 msgid "Ambiguous object name: '%s'."
238 msgid "Not a valid branch point: '%s'."
243 msgid "'%s' is already checked out at '%s'"
248 msgid "'%s' does not look like a v2 bundle file"
253 msgid "unrecognized header: %s%s (%d)"
256 #: bundle.c:87 builtin/commit.c:766
258 msgid "could not open '%s'"
262 msgid "Repository lacks these prerequisite commits:"
265 #: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
266 #: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
267 #: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358
268 #: builtin/shortlog.c:158
269 msgid "revision walk setup failed"
274 msgid "The bundle contains this ref:"
275 msgid_plural "The bundle contains these %d refs:"
280 msgid "The bundle records a complete history."
285 msgid "The bundle requires this ref:"
286 msgid_plural "The bundle requires these %d refs:"
291 msgid "Could not spawn pack-objects"
295 msgid "pack-objects died"
299 msgid "rev-list died"
304 msgid "ref '%s' is excluded by the rev-list options"
307 #: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261
309 msgid "unrecognized argument: %s"
313 msgid "Refusing to create empty bundle."
318 msgid "cannot create '%s'"
322 msgid "index-pack died"
327 msgid "invalid color value: %.*s"
330 #: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
333 msgid "could not parse %s"
338 msgid "%s %s is not a commit!"
341 #: compat/obstack.c:406 compat/obstack.c:408
342 msgid "memory exhausted"
345 #: config.c:474 config.c:476
347 msgid "bad config file line %d in %s"
352 msgid "bad numeric config value '%s' for '%s' in %s: %s"
357 msgid "bad numeric config value '%s' for '%s': %s"
362 msgid "failed to expand user dir in: '%s'"
365 #: config.c:757 config.c:768
367 msgid "bad zlib compression level %d"
372 msgid "invalid mode for object creation: %s"
376 msgid "unable to parse command-line config"
380 msgid "unknown error occured while reading the configuration files"
385 msgid "unable to parse '%s' from command-line config"
390 msgid "bad config variable '%s' in file '%s' at line %d"
395 msgid "%s has multiple values"
399 msgid "Could not run 'git rev-list'"
404 msgid "failed write to rev-list: %s"
409 msgid "failed to close rev-list's stdin: %s"
413 msgid "in the future"
418 msgid "%lu second ago"
419 msgid_plural "%lu seconds ago"
425 msgid "%lu minute ago"
426 msgid_plural "%lu minutes ago"
433 msgid_plural "%lu hours ago"
440 msgid_plural "%lu days ago"
447 msgid_plural "%lu weeks ago"
453 msgid "%lu month ago"
454 msgid_plural "%lu months ago"
461 msgid_plural "%lu years"
465 #. TRANSLATORS: "%s" is "<n> years"
468 msgid "%s, %lu month ago"
469 msgid_plural "%s, %lu months ago"
473 #: date.c:154 date.c:159
476 msgid_plural "%lu years ago"
480 #: diffcore-order.c:24
482 msgid "failed to read orderfile '%s'"
485 #: diffcore-rename.c:536
486 msgid "Performing inexact rename detection"
491 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
496 msgid " Unknown dirstat parameter '%s'\n"
501 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
507 "Found errors in 'diff.dirstat' config variable:\n"
513 msgid "external diff died, stopping at %s"
517 msgid "--follow requires exactly one pathspec"
523 "Failed to parse --dirstat/-X option parameter:\n"
529 msgid "Failed to parse --submodule option parameter: '%s'"
533 msgid "failed to get kernel name and information"
537 msgid "Untracked cache is disabled on this system."
540 #: gpg-interface.c:166 gpg-interface.c:237
541 msgid "could not run gpg."
544 #: gpg-interface.c:178
545 msgid "gpg did not accept the data"
548 #: gpg-interface.c:189
549 msgid "gpg failed to sign the data"
552 #: gpg-interface.c:222
554 msgid "could not create temporary file '%s': %s"
557 #: gpg-interface.c:225
559 msgid "failed writing detached signature to '%s': %s"
564 msgid "'%s': unable to read %s"
574 msgid "'%s': short read %s"
579 msgid "available git commands in '%s'"
583 msgid "git commands available from elsewhere on your $PATH"
587 msgid "These are common Git commands used in various situations:"
593 "'%s' appears to be a git command, but we were not\n"
594 "able to execute it. Maybe git-%s is broken?"
598 msgid "Uh oh. Your system reports no Git commands at all."
604 "WARNING: You called a Git command named '%s', which does not exist.\n"
605 "Continuing under the assumption that you meant '%s'"
610 msgid "in %0.1f seconds automatically..."
615 msgid "git: '%s' is not a git command. See 'git --help'."
618 #: help.c:406 help.c:466
624 "Did you mean one of these?"
634 msgid "failed to read the cache"
637 #: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
638 #: builtin/checkout.c:587 builtin/clone.c:722
639 msgid "unable to write new index file"
642 #: merge-recursive.c:189
644 msgid "(bad commit)\n"
647 #: merge-recursive.c:209
649 msgid "addinfo_cache failed for path '%s'"
652 #: merge-recursive.c:270
653 msgid "error building trees"
656 #: merge-recursive.c:686
658 msgid "failed to create path '%s'%s"
661 #: merge-recursive.c:697
663 msgid "Removing %s to make room for subdirectory\n"
666 #: merge-recursive.c:711 merge-recursive.c:732
667 msgid ": perhaps a D/F conflict?"
670 #: merge-recursive.c:722
672 msgid "refusing to lose untracked file at '%s'"
675 #: merge-recursive.c:762
677 msgid "cannot read object %s '%s'"
680 #: merge-recursive.c:764
682 msgid "blob expected for %s '%s'"
685 #: merge-recursive.c:787 builtin/clone.c:369
687 msgid "failed to open '%s'"
690 #: merge-recursive.c:795
692 msgid "failed to symlink '%s'"
695 #: merge-recursive.c:798
697 msgid "do not know what to do with %06o %s '%s'"
700 #: merge-recursive.c:936
701 msgid "Failed to execute internal merge"
704 #: merge-recursive.c:940
706 msgid "Unable to add %s to database"
709 #: merge-recursive.c:956
710 msgid "unsupported object type in the tree"
713 #: merge-recursive.c:1031 merge-recursive.c:1045
716 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
720 #: merge-recursive.c:1037 merge-recursive.c:1050
723 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
727 #: merge-recursive.c:1091
731 #: merge-recursive.c:1091
735 #: merge-recursive.c:1147
737 msgid "%s is a directory in %s adding as %s instead"
740 #: merge-recursive.c:1169
743 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
744 "\"->\"%s\" in \"%s\"%s"
747 #: merge-recursive.c:1174
748 msgid " (left unresolved)"
751 #: merge-recursive.c:1228
753 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
756 #: merge-recursive.c:1258
758 msgid "Renaming %s to %s and %s to %s instead"
761 #: merge-recursive.c:1457
763 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
766 #: merge-recursive.c:1467
768 msgid "Adding merged %s"
771 #: merge-recursive.c:1472 merge-recursive.c:1674
773 msgid "Adding as %s instead"
776 #: merge-recursive.c:1523
778 msgid "cannot read object %s"
781 #: merge-recursive.c:1526
783 msgid "object %s is not a blob"
786 #: merge-recursive.c:1578
790 #: merge-recursive.c:1578
794 #: merge-recursive.c:1588
798 #: merge-recursive.c:1595
802 #: merge-recursive.c:1629
804 msgid "Skipped %s (merged same as existing)"
807 #: merge-recursive.c:1643
809 msgid "Auto-merging %s"
812 #: merge-recursive.c:1647 git-submodule.sh:1025
816 #: merge-recursive.c:1648
818 msgid "CONFLICT (%s): Merge conflict in %s"
821 #: merge-recursive.c:1734
826 #: merge-recursive.c:1759
827 msgid "file/directory"
830 #: merge-recursive.c:1765
831 msgid "directory/file"
834 #: merge-recursive.c:1770
836 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
839 #: merge-recursive.c:1780
844 #: merge-recursive.c:1797
845 msgid "Fatal merge failure, shouldn't happen."
848 #: merge-recursive.c:1816
849 msgid "Already up-to-date!"
852 #: merge-recursive.c:1825
854 msgid "merging of trees %s and %s failed"
857 #: merge-recursive.c:1855
859 msgid "Unprocessed path??? %s"
862 #: merge-recursive.c:1903
866 #: merge-recursive.c:1916
868 msgid "found %u common ancestor:"
869 msgid_plural "found %u common ancestors:"
873 #: merge-recursive.c:1953
874 msgid "merge returned no commit"
877 #: merge-recursive.c:2010
879 msgid "Could not parse object '%s'"
882 #: merge-recursive.c:2021 builtin/merge.c:645
883 msgid "Unable to write index."
887 msgid "Cannot commit uninitialized/unreferenced notes tree"
892 msgid "Bad notes.rewriteMode value: '%s'"
897 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
900 #. TRANSLATORS: The first %s is the name of the
901 #. environment variable, the second %s is its value
904 msgid "Bad %s value: '%s'"
909 msgid "unable to parse object: %s"
912 #: parse-options.c:570
916 #: parse-options.c:588
921 #. TRANSLATORS: the colon here should align with the
922 #. one in "usage: %s" translation
923 #: parse-options.c:592
928 #: parse-options.c:595
933 #: parse-options.c:629
937 #: parse-options-cb.c:108
939 msgid "malformed object name '%s'"
944 msgid "Could not make %s writable by group"
948 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
953 "global 'literal' pathspec setting is incompatible with all other global "
958 msgid "invalid parameter for pathspec magic 'prefix'"
963 msgid "Invalid pathspec magic '%.*s' in '%s'"
968 msgid "Missing ')' at the end of pathspec magic in '%s'"
973 msgid "Unimplemented pathspec magic '%c' in '%s'"
978 msgid "%s: 'literal' and 'glob' are incompatible"
983 msgid "%s: '%s' is outside repository"
988 msgid "Pathspec '%s' is in submodule '%.*s'"
993 msgid "%s: pathspec magic not supported by this command: %s"
998 msgid "pathspec '%s' is beyond a symbolic link"
1003 "There is nothing to exclude from by :(exclude) patterns.\n"
1004 "Perhaps you forgot to add either ':/' or '.' ?"
1008 msgid "unable to parse --pretty format"
1015 #: read-cache.c:1281
1018 "index.version set, but the value is invalid.\n"
1022 #: read-cache.c:1291
1025 "GIT_INDEX_VERSION set, but the value is invalid.\n"
1029 #: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
1030 #: builtin/merge.c:983
1032 msgid "Could not open '%s' for writing"
1035 #: refs/files-backend.c:2359
1037 msgid "could not delete reference %s: %s"
1040 #: refs/files-backend.c:2362
1042 msgid "could not delete references: %s"
1045 #: refs/files-backend.c:2371
1047 msgid "could not remove reference %s"
1052 msgid "format: %%(end) atom used without corresponding atom"
1057 msgid "positive value expected contents:lines=%s"
1062 msgid "expected format: %%(color:<color>)"
1066 msgid "unable to parse format"
1071 msgid "expected format: %%(align:<width>,<position>)"
1076 msgid "improper format entered align:%s"
1081 msgid "positive width expected with the %%(align) atom"
1084 #: ref-filter.c:1219
1086 msgid "malformed object at '%s'"
1089 #: ref-filter.c:1561
1091 msgid "format: %%(end) atom missing"
1094 #: ref-filter.c:1615
1096 msgid "malformed object name %s"
1101 msgid "Cannot fetch both %s and %s to %s"
1106 msgid "%s usually tracks %s, not %s"
1111 msgid "%s tracks both %s and %s"
1115 msgid "Internal error"
1118 #: remote.c:1687 remote.c:1730
1119 msgid "HEAD does not point to a branch"
1124 msgid "no such branch: '%s'"
1129 msgid "no upstream configured for branch '%s'"
1134 msgid "upstream branch '%s' not stored as a remote-tracking branch"
1139 msgid "push destination '%s' on remote '%s' has no local tracking branch"
1144 msgid "branch '%s' has no remote for pushing"
1149 msgid "push refspecs for '%s' do not include '%s'"
1153 msgid "push has no destination (push.default is 'nothing')"
1157 msgid "cannot resolve 'simple' push to a single destination"
1162 msgid "Your branch is based on '%s', but the upstream is gone.\n"
1166 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1171 msgid "Your branch is up-to-date with '%s'.\n"
1176 msgid "Your branch is ahead of '%s' by %d commit.\n"
1177 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1182 msgid " (use \"git push\" to publish your local commits)\n"
1187 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1189 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1194 msgid " (use \"git pull\" to update your local branch)\n"
1200 "Your branch and '%s' have diverged,\n"
1201 "and have %d and %d different commit each, respectively.\n"
1203 "Your branch and '%s' have diverged,\n"
1204 "and have %d and %d different commits each, respectively.\n"
1209 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1213 msgid "your current branch appears to be broken"
1218 msgid "your current branch '%s' does not have any commits yet"
1222 msgid "--first-parent is incompatible with --bisect"
1226 msgid "open /dev/null failed"
1231 msgid "dup2(%d,%d) failed"
1235 msgid "failed to sign the push certificate"
1239 msgid "the receiving end does not support --signed push"
1244 "not sending a push certificate since the receiving end does not support --"
1249 msgid "the receiving end does not support --atomic push"
1254 "after resolving the conflicts, mark the corrected paths\n"
1255 "with 'git add <paths>' or 'git rm <paths>'"
1260 "after resolving the conflicts, mark the corrected paths\n"
1261 "with 'git add <paths>' or 'git rm <paths>'\n"
1262 "and commit the result with 'git commit'"
1265 #: sequencer.c:199 sequencer.c:842 sequencer.c:922
1267 msgid "Could not write to %s"
1272 msgid "Error wrapping up %s"
1276 msgid "Your local changes would be overwritten by cherry-pick."
1280 msgid "Your local changes would be overwritten by revert."
1284 msgid "Commit your changes or stash them to proceed."
1287 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1290 msgid "%s: Unable to write new index file"
1294 msgid "Could not resolve HEAD commit\n"
1298 msgid "Unable to update cache tree\n"
1303 msgid "Could not parse commit %s\n"
1308 msgid "Could not parse parent commit %s\n"
1312 msgid "Your index file is unmerged."
1317 msgid "Commit %s is a merge but no -m option was given."
1322 msgid "Commit %s does not have parent %d"
1327 msgid "Mainline was specified but commit %s is not a merge."
1330 #. TRANSLATORS: The first %s will be "revert" or
1331 #. "cherry-pick", the second %s a SHA1
1334 msgid "%s: cannot parse parent commit %s"
1339 msgid "Cannot get commit message for %s"
1344 msgid "could not revert %s... %s"
1349 msgid "could not apply %s... %s"
1353 msgid "empty commit set passed"
1358 msgid "git %s: failed to read the index"
1363 msgid "git %s: failed to refresh the index"
1368 msgid "Cannot %s during a %s"
1373 msgid "Could not parse line %d."
1377 msgid "No commits parsed."
1382 msgid "Could not open %s"
1387 msgid "Could not read %s."
1392 msgid "Unusable instruction sheet: %s"
1397 msgid "Invalid key: %s"
1400 #: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49
1402 msgid "Invalid value for %s: %s"
1407 msgid "Malformed options sheet: %s"
1411 msgid "a cherry-pick or revert is already in progress"
1415 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1420 msgid "Could not create sequencer directory %s"
1423 #: sequencer.c:844 sequencer.c:926
1425 msgid "Error wrapping up %s."
1428 #: sequencer.c:863 sequencer.c:996
1429 msgid "no cherry-pick or revert in progress"
1433 msgid "cannot resolve HEAD"
1437 msgid "cannot abort from a branch yet to be born"
1440 #: sequencer.c:887 builtin/apply.c:4287
1442 msgid "cannot open %s: %s"
1447 msgid "cannot read %s: %s"
1451 msgid "unexpected end of file"
1456 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1461 msgid "Could not format %s."
1466 msgid "%s: can't cherry-pick a %s"
1471 msgid "%s: bad revision"
1475 msgid "Can't revert as initial commit"
1479 msgid "Can't cherry-pick into empty head"
1484 msgid "failed to read %s"
1489 "Git normally never creates a ref that ends with 40 hex characters\n"
1490 "because it will be ignored when you just specify 40-hex. These refs\n"
1491 "may be created by mistake. For example,\n"
1493 " git checkout -b $br $(git rev-parse ...)\n"
1495 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1496 "examine these refs and maybe delete them. Turn this message off by\n"
1497 "running \"git config advice.objectNameWarning false\""
1500 #: submodule.c:61 submodule.c:95
1501 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1504 #: submodule.c:65 submodule.c:99
1506 msgid "Could not find section in .gitmodules where path=%s"
1511 msgid "Could not update .gitmodules entry %s"
1516 msgid "Could not remove .gitmodules entry for %s"
1520 msgid "staging updated .gitmodules failed"
1525 msgid "Could not set core.worktree in %s"
1528 #: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1531 msgid "unknown value '%s' for key '%s'"
1534 #: trailer.c:543 trailer.c:548 builtin/remote.c:296
1536 msgid "more than one %s"
1541 msgid "empty trailer token in trailer '%.*s'"
1546 msgid "could not read input file '%s'"
1550 msgid "could not read from stdin"
1553 #: transport-helper.c:1025
1555 msgid "Could not read ref %s"
1558 #: unpack-trees.c:203
1559 msgid "Checking out files"
1563 msgid "invalid URL scheme name or missing '://' suffix"
1566 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1568 msgid "invalid %XX escape sequence"
1572 msgid "missing host and scheme is not 'file:'"
1576 msgid "a 'file:' URL may not have a port number"
1580 msgid "invalid characters in host name"
1583 #: urlmatch.c:244 urlmatch.c:255
1584 msgid "invalid port number"
1588 msgid "invalid '..' path segment"
1591 #: wrapper.c:219 wrapper.c:362
1593 msgid "could not open '%s' for reading and writing"
1596 #: wrapper.c:221 wrapper.c:364
1598 msgid "could not open '%s' for writing"
1601 #: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
1602 #: builtin/merge.c:1074 builtin/pull.c:380
1604 msgid "could not open '%s' for reading"
1609 msgid "unable to access '%s': %s"
1614 msgid "unable to access '%s'"
1618 msgid "unable to get current working directory"
1623 msgid "could not open %s for writing"
1626 #: wrapper.c:646 builtin/am.c:425
1628 msgid "could not write to %s"
1633 msgid "could not close %s"
1637 msgid "Unmerged paths:"
1640 #: wt-status.c:176 wt-status.c:203
1642 msgid " (use \"git reset %s <file>...\" to unstage)"
1645 #: wt-status.c:178 wt-status.c:205
1646 msgid " (use \"git rm --cached <file>...\" to unstage)"
1650 msgid " (use \"git add <file>...\" to mark resolution)"
1653 #: wt-status.c:184 wt-status.c:188
1654 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1658 msgid " (use \"git rm <file>...\" to mark resolution)"
1661 #: wt-status.c:197 wt-status.c:880
1662 msgid "Changes to be committed:"
1665 #: wt-status.c:215 wt-status.c:889
1666 msgid "Changes not staged for commit:"
1670 msgid " (use \"git add <file>...\" to update what will be committed)"
1674 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1679 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1683 msgid " (commit or discard the untracked or modified content in submodules)"
1688 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1692 msgid "both deleted:"
1696 msgid "added by us:"
1700 msgid "deleted by them:"
1704 msgid "added by them:"
1708 msgid "deleted by us:"
1716 msgid "both modified:"
1721 msgid "bug: unhandled unmerged status %x"
1757 msgid "new commits, "
1761 msgid "modified content, "
1765 msgid "untracked content, "
1770 msgid "bug: unhandled diff status %c"
1774 msgid "Submodules changed but not updated:"
1778 msgid "Submodule changes to be committed:"
1783 "Do not touch the line above.\n"
1784 "Everything below will be removed."
1788 msgid "You have unmerged paths."
1792 msgid " (fix conflicts and run \"git commit\")"
1796 msgid "All conflicts fixed but you are still merging."
1800 msgid " (use \"git commit\" to conclude merge)"
1804 msgid "You are in the middle of an am session."
1808 msgid "The current patch is empty."
1812 msgid " (fix conflicts and then run \"git am --continue\")"
1816 msgid " (use \"git am --skip\" to skip this patch)"
1820 msgid " (use \"git am --abort\" to restore the original branch)"
1824 msgid "No commands done."
1829 msgid "Last command done (%d command done):"
1830 msgid_plural "Last commands done (%d commands done):"
1836 msgid " (see more in file %s)"
1840 msgid "No commands remaining."
1845 msgid "Next command to do (%d remaining command):"
1846 msgid_plural "Next commands to do (%d remaining commands):"
1851 msgid " (use \"git rebase --edit-todo\" to view and edit)"
1856 msgid "You are currently rebasing branch '%s' on '%s'."
1860 msgid "You are currently rebasing."
1864 msgid " (fix conflicts and then run \"git rebase --continue\")"
1868 msgid " (use \"git rebase --skip\" to skip this patch)"
1872 msgid " (use \"git rebase --abort\" to check out the original branch)"
1876 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1882 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1886 msgid "You are currently splitting a commit during a rebase."
1890 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1895 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1899 msgid "You are currently editing a commit during a rebase."
1903 msgid " (use \"git commit --amend\" to amend the current commit)"
1908 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1913 msgid "You are currently cherry-picking commit %s."
1917 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1921 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1925 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1930 msgid "You are currently reverting commit %s."
1934 msgid " (fix conflicts and run \"git revert --continue\")"
1938 msgid " (all conflicts fixed: run \"git revert --continue\")"
1942 msgid " (use \"git revert --abort\" to cancel the revert operation)"
1947 msgid "You are currently bisecting, started from branch '%s'."
1951 msgid "You are currently bisecting."
1955 msgid " (use \"git bisect reset\" to get back to the original branch)"
1963 msgid "interactive rebase in progress; onto "
1967 msgid "rebase in progress; onto "
1971 msgid "HEAD detached at "
1975 msgid "HEAD detached from "
1979 msgid "Not currently on any branch."
1983 msgid "Initial commit"
1987 msgid "Untracked files"
1991 msgid "Ignored files"
1997 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1998 "may speed it up, but you have to be careful not to forget to add\n"
1999 "new files yourself (see 'git help status')."
2004 msgid "Untracked files not listed%s"
2008 msgid " (use -u option to show untracked files)"
2017 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
2022 msgid "no changes added to commit\n"
2028 "nothing added to commit but untracked files present (use \"git add\" to "
2034 msgid "nothing added to commit but untracked files present\n"
2039 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
2042 #: wt-status.c:1528 wt-status.c:1533
2044 msgid "nothing to commit\n"
2049 msgid "nothing to commit (use -u to show untracked files)\n"
2054 msgid "nothing to commit, working directory clean\n"
2058 msgid "Initial commit on "
2062 msgid "HEAD (no branch)"
2069 #: wt-status.c:1677 wt-status.c:1685
2073 #: compat/precompose_utf8.c:56 builtin/clone.c:408
2075 msgid "failed to unlink '%s'"
2079 msgid "git add [<options>] [--] <pathspec>..."
2084 msgid "unexpected diff status %c"
2087 #: builtin/add.c:70 builtin/commit.c:278
2088 msgid "updating files failed"
2093 msgid "remove '%s'\n"
2096 #: builtin/add.c:134
2097 msgid "Unstaged changes after refreshing the index:"
2100 #: builtin/add.c:194 builtin/rev-parse.c:796
2101 msgid "Could not read the index"
2104 #: builtin/add.c:205
2106 msgid "Could not open '%s' for writing."
2109 #: builtin/add.c:209
2110 msgid "Could not write patch"
2113 #: builtin/add.c:212
2114 msgid "editing patch failed"
2117 #: builtin/add.c:215
2119 msgid "Could not stat '%s'"
2122 #: builtin/add.c:217
2123 msgid "Empty patch. Aborted."
2126 #: builtin/add.c:222
2128 msgid "Could not apply '%s'"
2131 #: builtin/add.c:232
2132 msgid "The following paths are ignored by one of your .gitignore files:\n"
2135 #: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
2136 #: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543
2137 #: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
2141 #: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
2142 #: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
2143 #: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114
2147 #: builtin/add.c:252
2148 msgid "interactive picking"
2151 #: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
2152 msgid "select hunks interactively"
2155 #: builtin/add.c:254
2156 msgid "edit current diff and apply"
2159 #: builtin/add.c:255
2160 msgid "allow adding otherwise ignored files"
2163 #: builtin/add.c:256
2164 msgid "update tracked files"
2167 #: builtin/add.c:257
2168 msgid "record only the fact that the path will be added later"
2171 #: builtin/add.c:258
2172 msgid "add changes from all tracked and untracked files"
2175 #: builtin/add.c:261
2176 msgid "ignore paths removed in the working tree (same as --no-all)"
2179 #: builtin/add.c:263
2180 msgid "don't add, only refresh the index"
2183 #: builtin/add.c:264
2184 msgid "just skip files which cannot be added because of errors"
2187 #: builtin/add.c:265
2188 msgid "check if - even missing - files are ignored in dry run"
2191 #: builtin/add.c:287
2193 msgid "Use -f if you really want to add them.\n"
2196 #: builtin/add.c:294
2197 msgid "adding files failed"
2200 #: builtin/add.c:330
2201 msgid "-A and -u are mutually incompatible"
2204 #: builtin/add.c:337
2205 msgid "Option --ignore-missing can only be used together with --dry-run"
2208 #: builtin/add.c:352
2210 msgid "Nothing specified, nothing added.\n"
2213 #: builtin/add.c:353
2215 msgid "Maybe you wanted to say 'git add .'?\n"
2218 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
2219 #: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
2220 #: builtin/submodule--helper.c:40
2221 msgid "index file corrupt"
2224 #: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
2225 msgid "Unable to write new index file"
2230 msgid "could not stat %s"
2233 #: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
2235 msgid "could not read '%s'"
2239 msgid "could not parse author script"
2244 msgid "'%s' was deleted by the applypatch-msg hook"
2247 #: builtin/am.c:563 builtin/notes.c:300
2249 msgid "Malformed input line: '%s'."
2252 #: builtin/am.c:600 builtin/notes.c:315
2254 msgid "Failed to copy notes from '%s' to '%s'"
2258 msgid "fseek failed"
2261 #: builtin/am.c:787 builtin/am.c:875
2263 msgid "could not open '%s' for reading: %s"
2268 msgid "could not open '%s' for writing: %s"
2273 msgid "could not parse patch '%s'"
2277 msgid "Only one StGIT patch series can be applied at once"
2281 msgid "invalid timestamp"
2284 #: builtin/am.c:919 builtin/am.c:927
2285 msgid "invalid Date line"
2289 msgid "invalid timezone offset"
2292 #: builtin/am.c:1011
2293 msgid "Patch format detection failed."
2296 #: builtin/am.c:1016 builtin/clone.c:373
2298 msgid "failed to create directory '%s'"
2301 #: builtin/am.c:1020
2302 msgid "Failed to split patches."
2305 #: builtin/am.c:1152 builtin/commit.c:363
2306 msgid "unable to write index file"
2309 #: builtin/am.c:1203
2311 msgid "When you have resolved this problem, run \"%s --continue\"."
2314 #: builtin/am.c:1204
2316 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2319 #: builtin/am.c:1205
2321 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
2324 #: builtin/am.c:1343
2325 msgid "Patch is empty. Was it split wrong?"
2328 #: builtin/am.c:1417 builtin/log.c:1347
2330 msgid "invalid ident line: %s"
2333 #: builtin/am.c:1444
2335 msgid "unable to parse commit %s"
2338 #: builtin/am.c:1646
2339 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
2342 #: builtin/am.c:1648
2343 msgid "Using index info to reconstruct a base tree..."
2346 #: builtin/am.c:1667
2348 "Did you hand edit your patch?\n"
2349 "It does not apply to blobs recorded in its index."
2352 #: builtin/am.c:1673
2353 msgid "Falling back to patching base and 3-way merge..."
2356 #: builtin/am.c:1688
2357 msgid "Failed to merge in the changes."
2360 #: builtin/am.c:1712 builtin/merge.c:632
2361 msgid "git write-tree failed to write a tree"
2364 #: builtin/am.c:1719
2365 msgid "applying to an empty history"
2368 #: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
2369 #: builtin/merge.c:854
2370 msgid "failed to write commit object"
2373 #: builtin/am.c:1764 builtin/am.c:1768
2375 msgid "cannot resume: %s does not exist."
2378 #: builtin/am.c:1784
2379 msgid "cannot be interactive without stdin connected to a terminal."
2382 #: builtin/am.c:1789
2383 msgid "Commit Body is:"
2386 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
2387 #. in your translation. The program will only accept English
2388 #. input at this point.
2390 #: builtin/am.c:1799
2391 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
2394 #: builtin/am.c:1849
2396 msgid "Dirty index: cannot apply patches (dirty: %s)"
2399 #: builtin/am.c:1884 builtin/am.c:1955
2401 msgid "Applying: %.*s"
2404 #: builtin/am.c:1900
2405 msgid "No changes -- Patch already applied."
2408 #: builtin/am.c:1908
2410 msgid "Patch failed at %s %.*s"
2413 #: builtin/am.c:1914
2415 msgid "The copy of the patch that failed is found in: %s"
2418 #: builtin/am.c:1958
2420 "No changes - did you forget to use 'git add'?\n"
2421 "If there is nothing left to stage, chances are that something else\n"
2422 "already introduced the same changes; you might want to skip this patch."
2425 #: builtin/am.c:1965
2427 "You still have unmerged paths in your index.\n"
2428 "Did you forget to use 'git add'?"
2431 #: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
2432 #: builtin/reset.c:316
2434 msgid "Could not parse object '%s'."
2437 #: builtin/am.c:2125
2438 msgid "failed to clean index"
2441 #: builtin/am.c:2159
2443 "You seem to have moved HEAD since the last 'am' failure.\n"
2444 "Not rewinding to ORIG_HEAD"
2447 #: builtin/am.c:2220
2449 msgid "Invalid value for --patch-format: %s"
2452 #: builtin/am.c:2253
2453 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
2456 #: builtin/am.c:2254
2457 msgid "git am [<options>] (--continue | --skip | --abort)"
2460 #: builtin/am.c:2260
2461 msgid "run interactively"
2464 #: builtin/am.c:2262
2465 msgid "historical option -- no-op"
2468 #: builtin/am.c:2264
2469 msgid "allow fall back on 3way merging if needed"
2472 #: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
2473 #: builtin/repack.c:171
2477 #: builtin/am.c:2267
2478 msgid "add a Signed-off-by line to the commit message"
2481 #: builtin/am.c:2270
2482 msgid "recode into utf8 (default)"
2485 #: builtin/am.c:2272
2486 msgid "pass -k flag to git-mailinfo"
2489 #: builtin/am.c:2274
2490 msgid "pass -b flag to git-mailinfo"
2493 #: builtin/am.c:2276
2494 msgid "pass -m flag to git-mailinfo"
2497 #: builtin/am.c:2278
2498 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
2501 #: builtin/am.c:2281
2502 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
2505 #: builtin/am.c:2284
2506 msgid "strip everything before a scissors line"
2509 #: builtin/am.c:2285 builtin/apply.c:4554
2513 #: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
2514 #: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
2515 #: builtin/am.c:2313
2516 msgid "pass it through git-apply"
2519 #: builtin/am.c:2294 builtin/apply.c:4578
2523 #: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
2524 #: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
2525 #: builtin/pull.c:167 builtin/submodule--helper.c:78
2526 #: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
2530 #: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
2531 #: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
2532 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
2533 #: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
2534 #: parse-options.h:134 parse-options.h:244
2538 #: builtin/am.c:2306 builtin/apply.c:4522
2542 #: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
2543 #: builtin/tag.c:372
2547 #: builtin/am.c:2310
2548 msgid "format the patch(es) are in"
2551 #: builtin/am.c:2316
2552 msgid "override error message when patch failure occurs"
2555 #: builtin/am.c:2318
2556 msgid "continue applying patches after resolving a conflict"
2559 #: builtin/am.c:2321
2560 msgid "synonyms for --continue"
2563 #: builtin/am.c:2324
2564 msgid "skip the current patch"
2567 #: builtin/am.c:2327
2568 msgid "restore the original branch and abort the patching operation."
2571 #: builtin/am.c:2331
2572 msgid "lie about committer date"
2575 #: builtin/am.c:2333
2576 msgid "use current timestamp for author date"
2579 #: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
2580 #: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
2584 #: builtin/am.c:2336
2585 msgid "GPG-sign commits"
2588 #: builtin/am.c:2339
2589 msgid "(internal use for git-rebase)"
2592 #: builtin/am.c:2354
2594 "The -b/--binary option has been a no-op for long time, and\n"
2595 "it will be removed. Please do not use it anymore."
2598 #: builtin/am.c:2361
2599 msgid "failed to read the index"
2602 #: builtin/am.c:2376
2604 msgid "previous rebase directory %s still exists but mbox given."
2607 #: builtin/am.c:2400
2610 "Stray %s directory found.\n"
2611 "Use \"git am --abort\" to remove it."
2614 #: builtin/am.c:2406
2615 msgid "Resolve operation not in progress, we are not resuming."
2618 #: builtin/apply.c:59
2619 msgid "git apply [<options>] [<patch>...]"
2622 #: builtin/apply.c:111
2624 msgid "unrecognized whitespace option '%s'"
2627 #: builtin/apply.c:126
2629 msgid "unrecognized whitespace ignore option '%s'"
2632 #: builtin/apply.c:818
2634 msgid "Cannot prepare timestamp regexp %s"
2637 #: builtin/apply.c:827
2639 msgid "regexec returned %d for input: %s"
2642 #: builtin/apply.c:908
2644 msgid "unable to find filename in patch at line %d"
2647 #: builtin/apply.c:940
2649 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2652 #: builtin/apply.c:944
2654 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2657 #: builtin/apply.c:945
2659 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2662 #: builtin/apply.c:952
2664 msgid "git apply: bad git-diff - expected /dev/null on line %d"
2667 #: builtin/apply.c:1415
2669 msgid "recount: unexpected line: %.*s"
2672 #: builtin/apply.c:1472
2674 msgid "patch fragment without header at line %d: %.*s"
2677 #: builtin/apply.c:1489
2680 "git diff header lacks filename information when removing %d leading pathname "
2681 "component (line %d)"
2683 "git diff header lacks filename information when removing %d leading pathname "
2684 "components (line %d)"
2688 #: builtin/apply.c:1655
2689 msgid "new file depends on old contents"
2692 #: builtin/apply.c:1657
2693 msgid "deleted file still has contents"
2696 #: builtin/apply.c:1683
2698 msgid "corrupt patch at line %d"
2701 #: builtin/apply.c:1719
2703 msgid "new file %s depends on old contents"
2706 #: builtin/apply.c:1721
2708 msgid "deleted file %s still has contents"
2711 #: builtin/apply.c:1724
2713 msgid "** warning: file %s becomes empty but is not deleted"
2716 #: builtin/apply.c:1870
2718 msgid "corrupt binary patch at line %d: %.*s"
2721 #: builtin/apply.c:1899
2723 msgid "unrecognized binary patch at line %d"
2726 #: builtin/apply.c:2050
2728 msgid "patch with only garbage at line %d"
2731 #: builtin/apply.c:2140
2733 msgid "unable to read symlink %s"
2736 #: builtin/apply.c:2144
2738 msgid "unable to open or read %s"
2741 #: builtin/apply.c:2777
2743 msgid "invalid start of line: '%c'"
2746 #: builtin/apply.c:2896
2748 msgid "Hunk #%d succeeded at %d (offset %d line)."
2749 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2753 #: builtin/apply.c:2908
2755 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2758 #: builtin/apply.c:2914
2761 "while searching for:\n"
2765 #: builtin/apply.c:2934
2767 msgid "missing binary patch data for '%s'"
2770 #: builtin/apply.c:3035
2772 msgid "binary patch does not apply to '%s'"
2775 #: builtin/apply.c:3041
2777 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2780 #: builtin/apply.c:3062
2782 msgid "patch failed: %s:%ld"
2785 #: builtin/apply.c:3186
2787 msgid "cannot checkout %s"
2790 #: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
2792 msgid "read of %s failed"
2795 #: builtin/apply.c:3239
2797 msgid "reading from '%s' beyond a symbolic link"
2800 #: builtin/apply.c:3267 builtin/apply.c:3489
2802 msgid "path %s has been renamed/deleted"
2805 #: builtin/apply.c:3348 builtin/apply.c:3503
2807 msgid "%s: does not exist in index"
2810 #: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
2815 #: builtin/apply.c:3357 builtin/apply.c:3511
2817 msgid "%s: does not match index"
2820 #: builtin/apply.c:3459
2821 msgid "removal patch leaves file contents"
2824 #: builtin/apply.c:3528
2826 msgid "%s: wrong type"
2829 #: builtin/apply.c:3530
2831 msgid "%s has type %o, expected %o"
2834 #: builtin/apply.c:3689 builtin/apply.c:3691
2836 msgid "invalid path '%s'"
2839 #: builtin/apply.c:3746
2841 msgid "%s: already exists in index"
2844 #: builtin/apply.c:3749
2846 msgid "%s: already exists in working directory"
2849 #: builtin/apply.c:3769
2851 msgid "new mode (%o) of %s does not match old mode (%o)"
2854 #: builtin/apply.c:3774
2856 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2859 #: builtin/apply.c:3794
2861 msgid "affected file '%s' is beyond a symbolic link"
2864 #: builtin/apply.c:3798
2866 msgid "%s: patch does not apply"
2869 #: builtin/apply.c:3812
2871 msgid "Checking patch %s..."
2874 #: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
2876 msgid "make_cache_entry failed for path '%s'"
2879 #: builtin/apply.c:4048
2881 msgid "unable to remove %s from index"
2884 #: builtin/apply.c:4077
2886 msgid "corrupt patch for submodule %s"
2889 #: builtin/apply.c:4081
2891 msgid "unable to stat newly created file '%s'"
2894 #: builtin/apply.c:4086
2896 msgid "unable to create backing store for newly created file %s"
2899 #: builtin/apply.c:4089 builtin/apply.c:4197
2901 msgid "unable to add cache entry for %s"
2904 #: builtin/apply.c:4122
2906 msgid "closing file '%s'"
2909 #: builtin/apply.c:4171
2911 msgid "unable to write file '%s' mode %o"
2914 #: builtin/apply.c:4258
2916 msgid "Applied patch %s cleanly."
2919 #: builtin/apply.c:4266
2920 msgid "internal error"
2923 #: builtin/apply.c:4269
2925 msgid "Applying patch %%s with %d reject..."
2926 msgid_plural "Applying patch %%s with %d rejects..."
2930 #: builtin/apply.c:4279
2932 msgid "truncating .rej filename to %.*s.rej"
2935 #: builtin/apply.c:4300
2937 msgid "Hunk #%d applied cleanly."
2940 #: builtin/apply.c:4303
2942 msgid "Rejected hunk #%d."
2945 #: builtin/apply.c:4393
2946 msgid "unrecognized input"
2949 #: builtin/apply.c:4404
2950 msgid "unable to read index file"
2953 #: builtin/apply.c:4517
2954 msgid "don't apply changes matching the given path"
2957 #: builtin/apply.c:4520
2958 msgid "apply changes matching the given path"
2961 #: builtin/apply.c:4523
2962 msgid "remove <num> leading slashes from traditional diff paths"
2965 #: builtin/apply.c:4526
2966 msgid "ignore additions made by the patch"
2969 #: builtin/apply.c:4528
2970 msgid "instead of applying the patch, output diffstat for the input"
2973 #: builtin/apply.c:4532
2974 msgid "show number of added and deleted lines in decimal notation"
2977 #: builtin/apply.c:4534
2978 msgid "instead of applying the patch, output a summary for the input"
2981 #: builtin/apply.c:4536
2982 msgid "instead of applying the patch, see if the patch is applicable"
2985 #: builtin/apply.c:4538
2986 msgid "make sure the patch is applicable to the current index"
2989 #: builtin/apply.c:4540
2990 msgid "apply a patch without touching the working tree"
2993 #: builtin/apply.c:4542
2994 msgid "accept a patch that touches outside the working area"
2997 #: builtin/apply.c:4544
2998 msgid "also apply the patch (use with --stat/--summary/--check)"
3001 #: builtin/apply.c:4546
3002 msgid "attempt three-way merge if a patch does not apply"
3005 #: builtin/apply.c:4548
3006 msgid "build a temporary index based on embedded index information"
3009 #: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
3010 msgid "paths are separated with NUL character"
3013 #: builtin/apply.c:4553
3014 msgid "ensure at least <n> lines of context match"
3017 #: builtin/apply.c:4555
3018 msgid "detect new or modified lines that have whitespace errors"
3021 #: builtin/apply.c:4558 builtin/apply.c:4561
3022 msgid "ignore changes in whitespace when finding context"
3025 #: builtin/apply.c:4564
3026 msgid "apply the patch in reverse"
3029 #: builtin/apply.c:4566
3030 msgid "don't expect at least one line of context"
3033 #: builtin/apply.c:4568
3034 msgid "leave the rejected hunks in corresponding *.rej files"
3037 #: builtin/apply.c:4570
3038 msgid "allow overlapping hunks"
3041 #: builtin/apply.c:4573
3042 msgid "tolerate incorrectly detected missing new-line at the end of file"
3045 #: builtin/apply.c:4576
3046 msgid "do not trust the line counts in the hunk headers"
3049 #: builtin/apply.c:4579
3050 msgid "prepend <root> to all filenames"
3053 #: builtin/apply.c:4601
3054 msgid "--3way outside a repository"
3057 #: builtin/apply.c:4609
3058 msgid "--index outside a repository"
3061 #: builtin/apply.c:4612
3062 msgid "--cached outside a repository"
3065 #: builtin/apply.c:4631
3067 msgid "can't open patch '%s'"
3070 #: builtin/apply.c:4645
3072 msgid "squelched %d whitespace error"
3073 msgid_plural "squelched %d whitespace errors"
3077 #: builtin/apply.c:4651 builtin/apply.c:4661
3079 msgid "%d line adds whitespace errors."
3080 msgid_plural "%d lines add whitespace errors."
3084 #: builtin/archive.c:17
3086 msgid "could not create archive file '%s'"
3089 #: builtin/archive.c:20
3090 msgid "could not redirect output"
3093 #: builtin/archive.c:37
3094 msgid "git archive: Remote with no URL"
3097 #: builtin/archive.c:58
3098 msgid "git archive: expected ACK/NAK, got EOF"
3101 #: builtin/archive.c:61
3103 msgid "git archive: NACK %s"
3106 #: builtin/archive.c:63
3108 msgid "remote error: %s"
3111 #: builtin/archive.c:64
3112 msgid "git archive: protocol error"
3115 #: builtin/archive.c:68
3116 msgid "git archive: expected a flush"
3119 #: builtin/bisect--helper.c:7
3120 msgid "git bisect--helper --next-all [--no-checkout]"
3123 #: builtin/bisect--helper.c:17
3124 msgid "perform 'git bisect next'"
3127 #: builtin/bisect--helper.c:19
3128 msgid "update BISECT_HEAD instead of checking out the current commit"
3131 #: builtin/blame.c:32
3132 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3135 #: builtin/blame.c:37
3136 msgid "<rev-opts> are documented in git-rev-list(1)"
3139 #: builtin/blame.c:2519
3140 msgid "Show blame entries as we find them, incrementally"
3143 #: builtin/blame.c:2520
3144 msgid "Show blank SHA-1 for boundary commits (Default: off)"
3147 #: builtin/blame.c:2521
3148 msgid "Do not treat root commits as boundaries (Default: off)"
3151 #: builtin/blame.c:2522
3152 msgid "Show work cost statistics"
3155 #: builtin/blame.c:2523
3156 msgid "Show output score for blame entries"
3159 #: builtin/blame.c:2524
3160 msgid "Show original filename (Default: auto)"
3163 #: builtin/blame.c:2525
3164 msgid "Show original linenumber (Default: off)"
3167 #: builtin/blame.c:2526
3168 msgid "Show in a format designed for machine consumption"
3171 #: builtin/blame.c:2527
3172 msgid "Show porcelain format with per-line commit information"
3175 #: builtin/blame.c:2528
3176 msgid "Use the same output mode as git-annotate (Default: off)"
3179 #: builtin/blame.c:2529
3180 msgid "Show raw timestamp (Default: off)"
3183 #: builtin/blame.c:2530
3184 msgid "Show long commit SHA1 (Default: off)"
3187 #: builtin/blame.c:2531
3188 msgid "Suppress author name and timestamp (Default: off)"
3191 #: builtin/blame.c:2532
3192 msgid "Show author email instead of name (Default: off)"
3195 #: builtin/blame.c:2533
3196 msgid "Ignore whitespace differences"
3199 #: builtin/blame.c:2534
3200 msgid "Spend extra cycles to find better match"
3203 #: builtin/blame.c:2535
3204 msgid "Use revisions from <file> instead of calling git-rev-list"
3207 #: builtin/blame.c:2536
3208 msgid "Use <file>'s contents as the final image"
3211 #: builtin/blame.c:2537 builtin/blame.c:2538
3215 #: builtin/blame.c:2537
3216 msgid "Find line copies within and across files"
3219 #: builtin/blame.c:2538
3220 msgid "Find line movements within and across files"
3223 #: builtin/blame.c:2539
3227 #: builtin/blame.c:2539
3228 msgid "Process only line range n,m, counting from 1"
3231 #. TRANSLATORS: This string is used to tell us the maximum
3232 #. display width for a relative timestamp in "git blame"
3233 #. output. For C locale, "4 years, 11 months ago", which
3234 #. takes 22 places, is the longest among various forms of
3235 #. relative timestamps, but your language may need more or
3236 #. fewer display columns.
3237 #: builtin/blame.c:2620
3238 msgid "4 years, 11 months ago"
3241 #: builtin/branch.c:25
3242 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
3245 #: builtin/branch.c:26
3246 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
3249 #: builtin/branch.c:27
3250 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3253 #: builtin/branch.c:28
3254 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3257 #: builtin/branch.c:29
3258 msgid "git branch [<options>] [-r | -a] [--points-at]"
3261 #: builtin/branch.c:142
3264 "deleting branch '%s' that has been merged to\n"
3265 " '%s', but not yet merged to HEAD."
3268 #: builtin/branch.c:146
3271 "not deleting branch '%s' that is not yet merged to\n"
3272 " '%s', even though it is merged to HEAD."
3275 #: builtin/branch.c:160
3277 msgid "Couldn't look up commit object for '%s'"
3280 #: builtin/branch.c:164
3283 "The branch '%s' is not fully merged.\n"
3284 "If you are sure you want to delete it, run 'git branch -D %s'."
3287 #: builtin/branch.c:177
3288 msgid "Update of config-file failed"
3291 #: builtin/branch.c:205
3292 msgid "cannot use -a with -d"
3295 #: builtin/branch.c:211
3296 msgid "Couldn't look up commit object for HEAD"
3299 #: builtin/branch.c:219
3301 msgid "Cannot delete the branch '%s' which you are currently on."
3304 #: builtin/branch.c:235
3306 msgid "remote-tracking branch '%s' not found."
3309 #: builtin/branch.c:236
3311 msgid "branch '%s' not found."
3314 #: builtin/branch.c:251
3316 msgid "Error deleting remote-tracking branch '%s'"
3319 #: builtin/branch.c:252
3321 msgid "Error deleting branch '%s'"
3324 #: builtin/branch.c:259
3326 msgid "Deleted remote-tracking branch %s (was %s).\n"
3329 #: builtin/branch.c:260
3331 msgid "Deleted branch %s (was %s).\n"
3334 #: builtin/branch.c:303
3339 #: builtin/branch.c:308
3344 #: builtin/branch.c:313
3346 msgid "[%s: behind %d]"
3349 #: builtin/branch.c:315
3354 #: builtin/branch.c:319
3356 msgid "[%s: ahead %d]"
3359 #: builtin/branch.c:321
3364 #: builtin/branch.c:324
3366 msgid "[%s: ahead %d, behind %d]"
3369 #: builtin/branch.c:327
3371 msgid "[ahead %d, behind %d]"
3374 #: builtin/branch.c:340
3375 msgid " **** invalid ref ****"
3378 #: builtin/branch.c:366
3380 msgid "(no branch, rebasing %s)"
3383 #: builtin/branch.c:369
3385 msgid "(no branch, bisect started on %s)"
3388 #: builtin/branch.c:375
3390 msgid "(HEAD detached at %s)"
3393 #: builtin/branch.c:378
3395 msgid "(HEAD detached from %s)"
3398 #: builtin/branch.c:382
3402 #: builtin/branch.c:524
3403 msgid "cannot rename the current branch while not on any."
3406 #: builtin/branch.c:534
3408 msgid "Invalid branch name: '%s'"
3411 #: builtin/branch.c:549
3412 msgid "Branch rename failed"
3415 #: builtin/branch.c:553
3417 msgid "Renamed a misnamed branch '%s' away"
3420 #: builtin/branch.c:557
3422 msgid "Branch renamed to %s, but HEAD is not updated!"
3425 #: builtin/branch.c:564
3426 msgid "Branch is renamed, but update of config-file failed"
3429 #: builtin/branch.c:587
3431 msgid "could not write branch description template: %s"
3434 #: builtin/branch.c:616
3435 msgid "Generic options"
3438 #: builtin/branch.c:618
3439 msgid "show hash and subject, give twice for upstream branch"
3442 #: builtin/branch.c:619
3443 msgid "suppress informational messages"
3446 #: builtin/branch.c:620
3447 msgid "set up tracking mode (see git-pull(1))"
3450 #: builtin/branch.c:622
3451 msgid "change upstream info"
3454 #: builtin/branch.c:626
3455 msgid "use colored output"
3458 #: builtin/branch.c:627
3459 msgid "act on remote-tracking branches"
3462 #: builtin/branch.c:629 builtin/branch.c:630
3463 msgid "print only branches that contain the commit"
3466 #: builtin/branch.c:633
3467 msgid "Specific git-branch actions:"
3470 #: builtin/branch.c:634
3471 msgid "list both remote-tracking and local branches"
3474 #: builtin/branch.c:636
3475 msgid "delete fully merged branch"
3478 #: builtin/branch.c:637
3479 msgid "delete branch (even if not merged)"
3482 #: builtin/branch.c:638
3483 msgid "move/rename a branch and its reflog"
3486 #: builtin/branch.c:639
3487 msgid "move/rename a branch, even if target exists"
3490 #: builtin/branch.c:640
3491 msgid "list branch names"
3494 #: builtin/branch.c:641
3495 msgid "create the branch's reflog"
3498 #: builtin/branch.c:643
3499 msgid "edit the description for the branch"
3502 #: builtin/branch.c:644
3503 msgid "force creation, move/rename, deletion"
3506 #: builtin/branch.c:645
3507 msgid "print only branches that are merged"
3510 #: builtin/branch.c:646
3511 msgid "print only branches that are not merged"
3514 #: builtin/branch.c:647
3515 msgid "list branches in columns"
3518 #: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
3522 #: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
3523 msgid "field name to sort on"
3526 #: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
3527 #: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
3528 #: builtin/tag.c:369
3532 #: builtin/branch.c:652
3533 msgid "print only branches of the object"
3536 #: builtin/branch.c:670
3537 msgid "Failed to resolve HEAD as a valid ref."
3540 #: builtin/branch.c:674 builtin/clone.c:697
3541 msgid "HEAD not found below refs/heads!"
3544 #: builtin/branch.c:694
3545 msgid "--column and --verbose are incompatible"
3548 #: builtin/branch.c:705 builtin/branch.c:747
3549 msgid "branch name required"
3552 #: builtin/branch.c:723
3553 msgid "Cannot give description to detached HEAD"
3556 #: builtin/branch.c:728
3557 msgid "cannot edit description of more than one branch"
3560 #: builtin/branch.c:735
3562 msgid "No commit on branch '%s' yet."
3565 #: builtin/branch.c:738
3567 msgid "No branch named '%s'."
3570 #: builtin/branch.c:753
3571 msgid "too many branches for a rename operation"
3574 #: builtin/branch.c:758
3575 msgid "too many branches to set new upstream"
3578 #: builtin/branch.c:762
3581 "could not set upstream of HEAD to %s when it does not point to any branch."
3584 #: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
3586 msgid "no such branch '%s'"
3589 #: builtin/branch.c:769
3591 msgid "branch '%s' does not exist"
3594 #: builtin/branch.c:781
3595 msgid "too many branches to unset upstream"
3598 #: builtin/branch.c:785
3599 msgid "could not unset upstream of HEAD when it does not point to any branch."
3602 #: builtin/branch.c:791
3604 msgid "Branch '%s' has no upstream information"
3607 #: builtin/branch.c:805
3608 msgid "it does not make sense to create 'HEAD' manually"
3611 #: builtin/branch.c:811
3612 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3615 #: builtin/branch.c:814
3618 "The --set-upstream flag is deprecated and will be removed. Consider using --"
3619 "track or --set-upstream-to\n"
3622 #: builtin/branch.c:831
3626 "If you wanted to make '%s' track '%s', do this:\n"
3630 #: builtin/branch.c:832
3632 msgid " git branch -d %s\n"
3635 #: builtin/branch.c:833
3637 msgid " git branch --set-upstream-to %s\n"
3640 #: builtin/bundle.c:51
3642 msgid "%s is okay\n"
3645 #: builtin/bundle.c:64
3646 msgid "Need a repository to create a bundle."
3649 #: builtin/bundle.c:68
3650 msgid "Need a repository to unbundle."
3653 #: builtin/cat-file.c:428
3655 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3656 "<type>|--textconv) <object>"
3659 #: builtin/cat-file.c:429
3660 msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
3663 #: builtin/cat-file.c:466
3664 msgid "<type> can be one of: blob, tree, commit, tag"
3667 #: builtin/cat-file.c:467
3668 msgid "show object type"
3671 #: builtin/cat-file.c:468
3672 msgid "show object size"
3675 #: builtin/cat-file.c:470
3676 msgid "exit with zero when there's no error"
3679 #: builtin/cat-file.c:471
3680 msgid "pretty-print object's content"
3683 #: builtin/cat-file.c:473
3684 msgid "for blob objects, run textconv on object's content"
3687 #: builtin/cat-file.c:475
3688 msgid "allow -s and -t to work with broken/corrupt objects"
3691 #: builtin/cat-file.c:476
3692 msgid "buffer --batch output"
3695 #: builtin/cat-file.c:478
3696 msgid "show info and content of objects fed from the standard input"
3699 #: builtin/cat-file.c:481
3700 msgid "show info about objects fed from the standard input"
3703 #: builtin/cat-file.c:484
3704 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
3707 #: builtin/cat-file.c:486
3708 msgid "show all objects with --batch or --batch-check"
3711 #: builtin/check-attr.c:11
3712 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3715 #: builtin/check-attr.c:12
3716 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
3719 #: builtin/check-attr.c:19
3720 msgid "report all attributes set on file"
3723 #: builtin/check-attr.c:20
3724 msgid "use .gitattributes only from the index"
3727 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
3728 msgid "read file names from stdin"
3731 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
3732 msgid "terminate input and output records by a NUL character"
3735 #: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
3736 msgid "suppress progress reporting"
3739 #: builtin/check-ignore.c:26
3740 msgid "show non-matching input paths"
3743 #: builtin/check-ignore.c:28
3744 msgid "ignore index when checking"
3747 #: builtin/check-ignore.c:154
3748 msgid "cannot specify pathnames with --stdin"
3751 #: builtin/check-ignore.c:157
3752 msgid "-z only makes sense with --stdin"
3755 #: builtin/check-ignore.c:159
3756 msgid "no path specified"
3759 #: builtin/check-ignore.c:163
3760 msgid "--quiet is only valid with a single pathname"
3763 #: builtin/check-ignore.c:165
3764 msgid "cannot have both --quiet and --verbose"
3767 #: builtin/check-ignore.c:168
3768 msgid "--non-matching is only valid with --verbose"
3771 #: builtin/check-mailmap.c:8
3772 msgid "git check-mailmap [<options>] <contact>..."
3775 #: builtin/check-mailmap.c:13
3776 msgid "also read contacts from stdin"
3779 #: builtin/check-mailmap.c:24
3781 msgid "unable to parse contact: %s"
3784 #: builtin/check-mailmap.c:47
3785 msgid "no contacts specified"
3788 #: builtin/checkout-index.c:126
3789 msgid "git checkout-index [<options>] [--] [<file>...]"
3792 #: builtin/checkout-index.c:188
3793 msgid "check out all files in the index"
3796 #: builtin/checkout-index.c:189
3797 msgid "force overwrite of existing files"
3800 #: builtin/checkout-index.c:191
3801 msgid "no warning for existing files and files not in index"
3804 #: builtin/checkout-index.c:193
3805 msgid "don't checkout new files"
3808 #: builtin/checkout-index.c:195
3809 msgid "update stat information in the index file"
3812 #: builtin/checkout-index.c:201
3813 msgid "read list of paths from the standard input"
3816 #: builtin/checkout-index.c:203
3817 msgid "write the content to temporary files"
3820 #: builtin/checkout-index.c:204 builtin/column.c:30
3821 #: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
3822 #: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
3826 #: builtin/checkout-index.c:205
3827 msgid "when creating files, prepend <string>"
3830 #: builtin/checkout-index.c:208
3831 msgid "copy out the files from named stage"
3834 #: builtin/checkout.c:25
3835 msgid "git checkout [<options>] <branch>"
3838 #: builtin/checkout.c:26
3839 msgid "git checkout [<options>] [<branch>] -- <file>..."
3842 #: builtin/checkout.c:134 builtin/checkout.c:167
3844 msgid "path '%s' does not have our version"
3847 #: builtin/checkout.c:136 builtin/checkout.c:169
3849 msgid "path '%s' does not have their version"
3852 #: builtin/checkout.c:152
3854 msgid "path '%s' does not have all necessary versions"
3857 #: builtin/checkout.c:196
3859 msgid "path '%s' does not have necessary versions"
3862 #: builtin/checkout.c:213
3864 msgid "path '%s': cannot merge"
3867 #: builtin/checkout.c:230
3869 msgid "Unable to add merge result for '%s'"
3872 #: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
3873 #: builtin/checkout.c:260
3875 msgid "'%s' cannot be used with updating paths"
3878 #: builtin/checkout.c:263 builtin/checkout.c:266
3880 msgid "'%s' cannot be used with %s"
3883 #: builtin/checkout.c:269
3885 msgid "Cannot update paths and switch to branch '%s' at the same time."
3888 #: builtin/checkout.c:280 builtin/checkout.c:474
3889 msgid "corrupt index file"
3892 #: builtin/checkout.c:340 builtin/checkout.c:347
3894 msgid "path '%s' is unmerged"
3897 #: builtin/checkout.c:496
3898 msgid "you need to resolve your current index first"
3901 #: builtin/checkout.c:623
3903 msgid "Can not do reflog for '%s': %s\n"
3906 #: builtin/checkout.c:661
3907 msgid "HEAD is now at"
3910 #: builtin/checkout.c:668
3912 msgid "Reset branch '%s'\n"
3915 #: builtin/checkout.c:671
3917 msgid "Already on '%s'\n"
3920 #: builtin/checkout.c:675
3922 msgid "Switched to and reset branch '%s'\n"
3925 #: builtin/checkout.c:677 builtin/checkout.c:1066
3927 msgid "Switched to a new branch '%s'\n"
3930 #: builtin/checkout.c:679
3932 msgid "Switched to branch '%s'\n"
3935 #: builtin/checkout.c:731
3937 msgid " ... and %d more.\n"
3940 #: builtin/checkout.c:737
3943 "Warning: you are leaving %d commit behind, not connected to\n"
3944 "any of your branches:\n"
3948 "Warning: you are leaving %d commits behind, not connected to\n"
3949 "any of your branches:\n"
3955 #: builtin/checkout.c:756
3958 "If you want to keep it by creating a new branch, this may be a good time\n"
3961 " git branch <new-branch-name> %s\n"
3964 "If you want to keep them by creating a new branch, this may be a good time\n"
3967 " git branch <new-branch-name> %s\n"
3972 #: builtin/checkout.c:792
3973 msgid "internal error in revision walk"
3976 #: builtin/checkout.c:796
3977 msgid "Previous HEAD position was"
3980 #: builtin/checkout.c:823 builtin/checkout.c:1061
3981 msgid "You are on a branch yet to be born"
3984 #: builtin/checkout.c:968
3986 msgid "only one reference expected, %d given."
3989 #: builtin/checkout.c:1007 builtin/worktree.c:213
3991 msgid "invalid reference: %s"
3994 #: builtin/checkout.c:1036
3996 msgid "reference is not a tree: %s"
3999 #: builtin/checkout.c:1075
4000 msgid "paths cannot be used with switching branches"
4003 #: builtin/checkout.c:1078 builtin/checkout.c:1082
4005 msgid "'%s' cannot be used with switching branches"
4008 #: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
4009 #: builtin/checkout.c:1097
4011 msgid "'%s' cannot be used with '%s'"
4014 #: builtin/checkout.c:1102
4016 msgid "Cannot switch branch to a non-commit '%s'"
4019 #: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
4020 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
4021 #: builtin/worktree.c:322
4025 #: builtin/checkout.c:1136
4026 msgid "create and checkout a new branch"
4029 #: builtin/checkout.c:1138
4030 msgid "create/reset and checkout a branch"
4033 #: builtin/checkout.c:1139
4034 msgid "create reflog for new branch"
4037 #: builtin/checkout.c:1140
4038 msgid "detach the HEAD at named commit"
4041 #: builtin/checkout.c:1141
4042 msgid "set upstream info for new branch"
4045 #: builtin/checkout.c:1143
4049 #: builtin/checkout.c:1143
4050 msgid "new unparented branch"
4053 #: builtin/checkout.c:1144
4054 msgid "checkout our version for unmerged files"
4057 #: builtin/checkout.c:1146
4058 msgid "checkout their version for unmerged files"
4061 #: builtin/checkout.c:1148
4062 msgid "force checkout (throw away local modifications)"
4065 #: builtin/checkout.c:1149
4066 msgid "perform a 3-way merge with the new branch"
4069 #: builtin/checkout.c:1150 builtin/merge.c:227
4070 msgid "update ignored files (default)"
4073 #: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250
4077 #: builtin/checkout.c:1152
4078 msgid "conflict style (merge or diff3)"
4081 #: builtin/checkout.c:1155
4082 msgid "do not limit pathspecs to sparse entries only"
4085 #: builtin/checkout.c:1157
4086 msgid "second guess 'git checkout <no-such-branch>'"
4089 #: builtin/checkout.c:1159
4090 msgid "do not check if another worktree is holding the given ref"
4093 #: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
4094 #: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558
4095 #: builtin/send-pack.c:168
4096 msgid "force progress reporting"
4099 #: builtin/checkout.c:1191
4100 msgid "-b, -B and --orphan are mutually exclusive"
4103 #: builtin/checkout.c:1208
4104 msgid "--track needs a branch name"
4107 #: builtin/checkout.c:1213
4108 msgid "Missing branch name; try -b"
4111 #: builtin/checkout.c:1249
4112 msgid "invalid path specification"
4115 #: builtin/checkout.c:1256
4118 "Cannot update paths and switch to branch '%s' at the same time.\n"
4119 "Did you intend to checkout '%s' which can not be resolved as commit?"
4122 #: builtin/checkout.c:1261
4124 msgid "git checkout: --detach does not take a path argument '%s'"
4127 #: builtin/checkout.c:1265
4129 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4130 "checking out of the index."
4133 #: builtin/clean.c:25
4135 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
4138 #: builtin/clean.c:29
4140 msgid "Removing %s\n"
4143 #: builtin/clean.c:30
4145 msgid "Would remove %s\n"
4148 #: builtin/clean.c:31
4150 msgid "Skipping repository %s\n"
4153 #: builtin/clean.c:32
4155 msgid "Would skip repository %s\n"
4158 #: builtin/clean.c:33
4160 msgid "failed to remove %s"
4163 #: builtin/clean.c:315
4166 "1 - select a numbered item\n"
4167 "foo - select item based on unique prefix\n"
4168 " - (empty) select nothing"
4171 #: builtin/clean.c:319
4174 "1 - select a single item\n"
4175 "3-5 - select a range of items\n"
4176 "2-3,6-9 - select multiple ranges\n"
4177 "foo - select item based on unique prefix\n"
4178 "-... - unselect specified items\n"
4179 "* - choose all items\n"
4180 " - (empty) finish selecting"
4183 #: builtin/clean.c:535
4188 #: builtin/clean.c:677
4190 msgid "Input ignore patterns>> "
4193 #: builtin/clean.c:714
4195 msgid "WARNING: Cannot find items matched by: %s"
4198 #: builtin/clean.c:735
4199 msgid "Select items to delete"
4202 #. TRANSLATORS: Make sure to keep [y/N] as is
4203 #: builtin/clean.c:776
4205 msgid "Remove %s [y/N]? "
4208 #: builtin/clean.c:801
4212 #: builtin/clean.c:809
4214 "clean - start cleaning\n"
4215 "filter by pattern - exclude items from deletion\n"
4216 "select by numbers - select items to be deleted by numbers\n"
4217 "ask each - confirm each deletion (like \"rm -i\")\n"
4218 "quit - stop cleaning\n"
4219 "help - this screen\n"
4220 "? - help for prompt selection"
4223 #: builtin/clean.c:836
4224 msgid "*** Commands ***"
4227 #: builtin/clean.c:837
4231 #: builtin/clean.c:845
4232 msgid "Would remove the following item:"
4233 msgid_plural "Would remove the following items:"
4237 #: builtin/clean.c:862
4238 msgid "No more files to clean, exiting."
4241 #: builtin/clean.c:893
4242 msgid "do not print names of files removed"
4245 #: builtin/clean.c:895
4249 #: builtin/clean.c:896
4250 msgid "interactive cleaning"
4253 #: builtin/clean.c:898
4254 msgid "remove whole directories"
4257 #: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
4258 #: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
4262 #: builtin/clean.c:900
4263 msgid "add <pattern> to ignore rules"
4266 #: builtin/clean.c:901
4267 msgid "remove ignored files, too"
4270 #: builtin/clean.c:903
4271 msgid "remove only ignored files"
4274 #: builtin/clean.c:921
4275 msgid "-x and -X cannot be used together"
4278 #: builtin/clean.c:925
4280 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
4284 #: builtin/clean.c:928
4286 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
4290 #: builtin/clone.c:37
4291 msgid "git clone [<options>] [--] <repo> [<dir>]"
4294 #: builtin/clone.c:59
4295 msgid "don't create a checkout"
4298 #: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
4299 msgid "create a bare repository"
4302 #: builtin/clone.c:64
4303 msgid "create a mirror repository (implies bare)"
4306 #: builtin/clone.c:66
4307 msgid "to clone from a local repository"
4310 #: builtin/clone.c:68
4311 msgid "don't use local hardlinks, always copy"
4314 #: builtin/clone.c:70
4315 msgid "setup as shared repository"
4318 #: builtin/clone.c:72 builtin/clone.c:74
4319 msgid "initialize submodules in the clone"
4322 #: builtin/clone.c:75 builtin/init-db.c:466
4323 msgid "template-directory"
4326 #: builtin/clone.c:76 builtin/init-db.c:467
4327 msgid "directory from which templates will be used"
4330 #: builtin/clone.c:78 builtin/submodule--helper.c:179
4331 msgid "reference repository"
4334 #: builtin/clone.c:80
4335 msgid "use --reference only while cloning"
4338 #: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
4342 #: builtin/clone.c:82
4343 msgid "use <name> instead of 'origin' to track upstream"
4346 #: builtin/clone.c:84
4347 msgid "checkout <branch> instead of the remote's HEAD"
4350 #: builtin/clone.c:86
4351 msgid "path to git-upload-pack on the remote"
4354 #: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654
4355 #: builtin/pull.c:186
4359 #: builtin/clone.c:88
4360 msgid "create a shallow clone of that depth"
4363 #: builtin/clone.c:90
4364 msgid "clone only one branch, HEAD or --branch"
4367 #: builtin/clone.c:91 builtin/init-db.c:475
4371 #: builtin/clone.c:92 builtin/init-db.c:476
4372 msgid "separate git dir from working tree"
4375 #: builtin/clone.c:93
4379 #: builtin/clone.c:94
4380 msgid "set config inside the new repository"
4383 #: builtin/clone.c:300
4385 msgid "reference repository '%s' as a linked checkout is not supported yet."
4388 #: builtin/clone.c:302
4390 msgid "reference repository '%s' is not a local repository."
4393 #: builtin/clone.c:307
4395 msgid "reference repository '%s' is shallow"
4398 #: builtin/clone.c:310
4400 msgid "reference repository '%s' is grafted"
4403 #: builtin/clone.c:375 builtin/diff.c:84
4405 msgid "failed to stat '%s'"
4408 #: builtin/clone.c:377
4410 msgid "%s exists and is not a directory"
4413 #: builtin/clone.c:391
4415 msgid "failed to stat %s\n"
4418 #: builtin/clone.c:413
4420 msgid "failed to create link '%s'"
4423 #: builtin/clone.c:417
4425 msgid "failed to copy file to '%s'"
4428 #: builtin/clone.c:442 builtin/clone.c:626
4433 #: builtin/clone.c:454
4435 "Clone succeeded, but checkout failed.\n"
4436 "You can inspect what was checked out with 'git status'\n"
4437 "and retry the checkout with 'git checkout -f HEAD'\n"
4440 #: builtin/clone.c:531
4442 msgid "Could not find remote branch %s to clone."
4445 #: builtin/clone.c:621
4447 msgid "Checking connectivity... "
4450 #: builtin/clone.c:624
4451 msgid "remote did not send all necessary objects"
4454 #: builtin/clone.c:688
4455 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4458 #: builtin/clone.c:719
4459 msgid "unable to checkout working tree"
4462 #: builtin/clone.c:808
4463 msgid "cannot repack to clean up"
4466 #: builtin/clone.c:810
4467 msgid "cannot unlink temporary alternates file"
4470 #: builtin/clone.c:842
4471 msgid "Too many arguments."
4474 #: builtin/clone.c:846
4475 msgid "You must specify a repository to clone."
4478 #: builtin/clone.c:857
4480 msgid "--bare and --origin %s options are incompatible."
4483 #: builtin/clone.c:860
4484 msgid "--bare and --separate-git-dir are incompatible."
4487 #: builtin/clone.c:873
4489 msgid "repository '%s' does not exist"
4492 #: builtin/clone.c:879 builtin/fetch.c:1166
4494 msgid "depth %s is not a positive number"
4497 #: builtin/clone.c:889
4499 msgid "destination path '%s' already exists and is not an empty directory."
4502 #: builtin/clone.c:899
4504 msgid "working tree '%s' already exists."
4507 #: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
4508 #: builtin/worktree.c:221 builtin/worktree.c:248
4510 msgid "could not create leading directories of '%s'"
4513 #: builtin/clone.c:917
4515 msgid "could not create work tree dir '%s'"
4518 #: builtin/clone.c:935
4520 msgid "Cloning into bare repository '%s'...\n"
4523 #: builtin/clone.c:937
4525 msgid "Cloning into '%s'...\n"
4528 #: builtin/clone.c:975
4529 msgid "--depth is ignored in local clones; use file:// instead."
4532 #: builtin/clone.c:978
4533 msgid "source repository is shallow, ignoring --local"
4536 #: builtin/clone.c:983
4537 msgid "--local is ignored"
4540 #: builtin/clone.c:987
4542 msgid "Don't know how to clone %s"
4545 #: builtin/clone.c:1036 builtin/clone.c:1044
4547 msgid "Remote branch %s not found in upstream %s"
4550 #: builtin/clone.c:1047
4551 msgid "You appear to have cloned an empty repository."
4554 #: builtin/column.c:9
4555 msgid "git column [<options>]"
4558 #: builtin/column.c:26
4559 msgid "lookup config vars"
4562 #: builtin/column.c:27 builtin/column.c:28
4563 msgid "layout to use"
4566 #: builtin/column.c:29
4567 msgid "Maximum width"
4570 #: builtin/column.c:30
4571 msgid "Padding space on left border"
4574 #: builtin/column.c:31
4575 msgid "Padding space on right border"
4578 #: builtin/column.c:32
4579 msgid "Padding space between columns"
4582 #: builtin/column.c:51
4583 msgid "--command must be the first argument"
4586 #: builtin/commit.c:38
4587 msgid "git commit [<options>] [--] <pathspec>..."
4590 #: builtin/commit.c:43
4591 msgid "git status [<options>] [--] <pathspec>..."
4594 #: builtin/commit.c:48
4596 "Your name and email address were configured automatically based\n"
4597 "on your username and hostname. Please check that they are accurate.\n"
4598 "You can suppress this message by setting them explicitly. Run the\n"
4599 "following command and follow the instructions in your editor to edit\n"
4600 "your configuration file:\n"
4602 " git config --global --edit\n"
4604 "After doing this, you may fix the identity used for this commit with:\n"
4606 " git commit --amend --reset-author\n"
4609 #: builtin/commit.c:61
4611 "Your name and email address were configured automatically based\n"
4612 "on your username and hostname. Please check that they are accurate.\n"
4613 "You can suppress this message by setting them explicitly:\n"
4615 " git config --global user.name \"Your Name\"\n"
4616 " git config --global user.email you@example.com\n"
4618 "After doing this, you may fix the identity used for this commit with:\n"
4620 " git commit --amend --reset-author\n"
4623 #: builtin/commit.c:73
4625 "You asked to amend the most recent commit, but doing so would make\n"
4626 "it empty. You can repeat your command with --allow-empty, or you can\n"
4627 "remove the commit entirely with \"git reset HEAD^\".\n"
4630 #: builtin/commit.c:78
4632 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4633 "If you wish to commit it anyway, use:\n"
4635 " git commit --allow-empty\n"
4639 #: builtin/commit.c:85
4640 msgid "Otherwise, please use 'git reset'\n"
4643 #: builtin/commit.c:88
4645 "If you wish to skip this commit, use:\n"
4649 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4650 "the remaining commits.\n"
4653 #: builtin/commit.c:305
4654 msgid "failed to unpack HEAD tree object"
4657 #: builtin/commit.c:346
4658 msgid "unable to create temporary index"
4661 #: builtin/commit.c:352
4662 msgid "interactive add failed"
4665 #: builtin/commit.c:365
4666 msgid "unable to update temporary index"
4669 #: builtin/commit.c:367
4670 msgid "Failed to update main cache tree"
4673 #: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
4674 msgid "unable to write new_index file"
4677 #: builtin/commit.c:445
4678 msgid "cannot do a partial commit during a merge."
4681 #: builtin/commit.c:447
4682 msgid "cannot do a partial commit during a cherry-pick."
4685 #: builtin/commit.c:456
4686 msgid "cannot read the index"
4689 #: builtin/commit.c:475
4690 msgid "unable to write temporary index file"
4693 #: builtin/commit.c:580
4695 msgid "commit '%s' lacks author header"
4698 #: builtin/commit.c:582
4700 msgid "commit '%s' has malformed author line"
4703 #: builtin/commit.c:601
4704 msgid "malformed --author parameter"
4707 #: builtin/commit.c:609
4709 msgid "invalid date format: %s"
4712 #: builtin/commit.c:653
4714 "unable to select a comment character that is not used\n"
4715 "in the current commit message"
4718 #: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
4720 msgid "could not lookup commit %s"
4723 #: builtin/commit.c:702 builtin/shortlog.c:273
4725 msgid "(reading log message from standard input)\n"
4728 #: builtin/commit.c:704
4729 msgid "could not read log from standard input"
4732 #: builtin/commit.c:708
4734 msgid "could not read log file '%s'"
4737 #: builtin/commit.c:730
4738 msgid "could not read MERGE_MSG"
4741 #: builtin/commit.c:734
4742 msgid "could not read SQUASH_MSG"
4745 #: builtin/commit.c:785
4746 msgid "could not write commit template"
4749 #: builtin/commit.c:803
4753 "It looks like you may be committing a merge.\n"
4754 "If this is not correct, please remove the file\n"
4759 #: builtin/commit.c:808
4763 "It looks like you may be committing a cherry-pick.\n"
4764 "If this is not correct, please remove the file\n"
4769 #: builtin/commit.c:821
4772 "Please enter the commit message for your changes. Lines starting\n"
4773 "with '%c' will be ignored, and an empty message aborts the commit.\n"
4776 #: builtin/commit.c:828
4779 "Please enter the commit message for your changes. Lines starting\n"
4780 "with '%c' will be kept; you may remove them yourself if you want to.\n"
4781 "An empty message aborts the commit.\n"
4784 #: builtin/commit.c:848
4786 msgid "%sAuthor: %.*s <%.*s>"
4789 #: builtin/commit.c:856
4794 #: builtin/commit.c:863
4796 msgid "%sCommitter: %.*s <%.*s>"
4799 #: builtin/commit.c:881
4800 msgid "Cannot read index"
4803 #: builtin/commit.c:938
4804 msgid "Error building trees"
4807 #: builtin/commit.c:953 builtin/tag.c:266
4809 msgid "Please supply the message using either -m or -F option.\n"
4812 #: builtin/commit.c:1055
4814 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4817 #: builtin/commit.c:1070 builtin/commit.c:1310
4819 msgid "Invalid untracked files mode '%s'"
4822 #: builtin/commit.c:1107
4823 msgid "--long and -z are incompatible"
4826 #: builtin/commit.c:1137
4827 msgid "Using both --reset-author and --author does not make sense"
4830 #: builtin/commit.c:1146
4831 msgid "You have nothing to amend."
4834 #: builtin/commit.c:1149
4835 msgid "You are in the middle of a merge -- cannot amend."
4838 #: builtin/commit.c:1151
4839 msgid "You are in the middle of a cherry-pick -- cannot amend."
4842 #: builtin/commit.c:1154
4843 msgid "Options --squash and --fixup cannot be used together"
4846 #: builtin/commit.c:1164
4847 msgid "Only one of -c/-C/-F/--fixup can be used."
4850 #: builtin/commit.c:1166
4851 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4854 #: builtin/commit.c:1174
4855 msgid "--reset-author can be used only with -C, -c or --amend."
4858 #: builtin/commit.c:1191
4859 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4862 #: builtin/commit.c:1193
4863 msgid "No paths with --include/--only does not make sense."
4866 #: builtin/commit.c:1195
4867 msgid "Clever... amending the last one with dirty index."
4870 #: builtin/commit.c:1197
4871 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4874 #: builtin/commit.c:1209 builtin/tag.c:475
4876 msgid "Invalid cleanup mode %s"
4879 #: builtin/commit.c:1214
4880 msgid "Paths with -a does not make sense."
4883 #: builtin/commit.c:1324 builtin/commit.c:1605
4884 msgid "show status concisely"
4887 #: builtin/commit.c:1326 builtin/commit.c:1607
4888 msgid "show branch information"
4891 #: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544
4892 #: builtin/worktree.c:423
4893 msgid "machine-readable output"
4896 #: builtin/commit.c:1331 builtin/commit.c:1611
4897 msgid "show status in long format (default)"
4900 #: builtin/commit.c:1334 builtin/commit.c:1614
4901 msgid "terminate entries with NUL"
4904 #: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
4905 #: builtin/fast-export.c:984 builtin/tag.c:353
4909 #: builtin/commit.c:1337 builtin/commit.c:1617
4910 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4913 #: builtin/commit.c:1340
4914 msgid "show ignored files"
4917 #: builtin/commit.c:1341 parse-options.h:155
4921 #: builtin/commit.c:1342
4923 "ignore changes to submodules, optional when: all, dirty, untracked. "
4927 #: builtin/commit.c:1344
4928 msgid "list untracked files in columns"
4931 #: builtin/commit.c:1430
4932 msgid "couldn't look up newly created commit"
4935 #: builtin/commit.c:1432
4936 msgid "could not parse newly created commit"
4939 #: builtin/commit.c:1477
4940 msgid "detached HEAD"
4943 #: builtin/commit.c:1480
4944 msgid " (root-commit)"
4947 #: builtin/commit.c:1575
4948 msgid "suppress summary after successful commit"
4951 #: builtin/commit.c:1576
4952 msgid "show diff in commit message template"
4955 #: builtin/commit.c:1578
4956 msgid "Commit message options"
4959 #: builtin/commit.c:1579 builtin/tag.c:351
4960 msgid "read message from file"
4963 #: builtin/commit.c:1580
4967 #: builtin/commit.c:1580
4968 msgid "override author for commit"
4971 #: builtin/commit.c:1581 builtin/gc.c:326
4975 #: builtin/commit.c:1581
4976 msgid "override date for commit"
4979 #: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
4980 #: builtin/notes.c:555 builtin/tag.c:349
4984 #: builtin/commit.c:1582
4985 msgid "commit message"
4988 #: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
4989 #: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
4993 #: builtin/commit.c:1583
4994 msgid "reuse and edit message from specified commit"
4997 #: builtin/commit.c:1584
4998 msgid "reuse message from specified commit"
5001 #: builtin/commit.c:1585
5002 msgid "use autosquash formatted message to fixup specified commit"
5005 #: builtin/commit.c:1586
5006 msgid "use autosquash formatted message to squash specified commit"
5009 #: builtin/commit.c:1587
5010 msgid "the commit is authored by me now (used with -C/-c/--amend)"
5013 #: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86
5014 msgid "add Signed-off-by:"
5017 #: builtin/commit.c:1589
5018 msgid "use specified template file"
5021 #: builtin/commit.c:1590
5022 msgid "force edit of commit"
5025 #: builtin/commit.c:1591
5029 #: builtin/commit.c:1591 builtin/tag.c:354
5030 msgid "how to strip spaces and #comments from message"
5033 #: builtin/commit.c:1592
5034 msgid "include status in commit message template"
5037 #: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
5038 #: builtin/revert.c:93
5039 msgid "GPG sign commit"
5042 #: builtin/commit.c:1597
5043 msgid "Commit contents options"
5046 #: builtin/commit.c:1598
5047 msgid "commit all changed files"
5050 #: builtin/commit.c:1599
5051 msgid "add specified files to index for commit"
5054 #: builtin/commit.c:1600
5055 msgid "interactively add files"
5058 #: builtin/commit.c:1601
5059 msgid "interactively add changes"
5062 #: builtin/commit.c:1602
5063 msgid "commit only specified files"
5066 #: builtin/commit.c:1603
5067 msgid "bypass pre-commit hook"
5070 #: builtin/commit.c:1604
5071 msgid "show what would be committed"
5074 #: builtin/commit.c:1615
5075 msgid "amend previous commit"
5078 #: builtin/commit.c:1616
5079 msgid "bypass post-rewrite hook"
5082 #: builtin/commit.c:1621
5083 msgid "ok to record an empty change"
5086 #: builtin/commit.c:1623
5087 msgid "ok to record a change with an empty message"
5090 #: builtin/commit.c:1652
5091 msgid "could not parse HEAD commit"
5094 #: builtin/commit.c:1698
5096 msgid "Corrupt MERGE_HEAD file (%s)"
5099 #: builtin/commit.c:1705
5100 msgid "could not read MERGE_MODE"
5103 #: builtin/commit.c:1724
5105 msgid "could not read commit message: %s"
5108 #: builtin/commit.c:1735
5110 msgid "Aborting commit; you did not edit the message.\n"
5113 #: builtin/commit.c:1740
5115 msgid "Aborting commit due to empty commit message.\n"
5118 #: builtin/commit.c:1788
5120 "Repository has been updated, but unable to write\n"
5121 "new_index file. Check that disk is not full and quota is\n"
5122 "not exceeded, and then \"git reset HEAD\" to recover."
5125 #: builtin/config.c:8
5126 msgid "git config [<options>]"
5129 #: builtin/config.c:54
5130 msgid "Config file location"
5133 #: builtin/config.c:55
5134 msgid "use global config file"
5137 #: builtin/config.c:56
5138 msgid "use system config file"
5141 #: builtin/config.c:57
5142 msgid "use repository config file"
5145 #: builtin/config.c:58
5146 msgid "use given config file"
5149 #: builtin/config.c:59
5153 #: builtin/config.c:59
5154 msgid "read config from given blob object"
5157 #: builtin/config.c:60
5161 #: builtin/config.c:61
5162 msgid "get value: name [value-regex]"
5165 #: builtin/config.c:62
5166 msgid "get all values: key [value-regex]"
5169 #: builtin/config.c:63
5170 msgid "get values for regexp: name-regex [value-regex]"
5173 #: builtin/config.c:64
5174 msgid "get value specific for the URL: section[.var] URL"
5177 #: builtin/config.c:65
5178 msgid "replace all matching variables: name value [value_regex]"
5181 #: builtin/config.c:66
5182 msgid "add a new variable: name value"
5185 #: builtin/config.c:67
5186 msgid "remove a variable: name [value-regex]"
5189 #: builtin/config.c:68
5190 msgid "remove all matches: name [value-regex]"
5193 #: builtin/config.c:69
5194 msgid "rename section: old-name new-name"
5197 #: builtin/config.c:70
5198 msgid "remove a section: name"
5201 #: builtin/config.c:71
5205 #: builtin/config.c:72
5206 msgid "open an editor"
5209 #: builtin/config.c:73
5210 msgid "find the color configured: slot [default]"
5213 #: builtin/config.c:74
5214 msgid "find the color setting: slot [stdout-is-tty]"
5217 #: builtin/config.c:75
5221 #: builtin/config.c:76
5222 msgid "value is \"true\" or \"false\""
5225 #: builtin/config.c:77
5226 msgid "value is decimal number"
5229 #: builtin/config.c:78
5230 msgid "value is --bool or --int"
5233 #: builtin/config.c:79
5234 msgid "value is a path (file or directory name)"
5237 #: builtin/config.c:80
5241 #: builtin/config.c:81
5242 msgid "terminate values with NUL byte"
5245 #: builtin/config.c:82
5246 msgid "show variable names only"
5249 #: builtin/config.c:83
5250 msgid "respect include directives on lookup"
5253 #: builtin/config.c:303
5254 msgid "unable to parse default color value"
5257 #: builtin/config.c:441
5260 "# This is Git's per-user configuration file.\n"
5262 "# Please adapt and uncomment the following lines:\n"
5267 #: builtin/config.c:575
5269 msgid "cannot create configuration file %s"
5272 #: builtin/count-objects.c:77
5273 msgid "git count-objects [-v] [-H | --human-readable]"
5276 #: builtin/count-objects.c:87
5277 msgid "print sizes in human readable format"
5280 #: builtin/describe.c:17
5281 msgid "git describe [<options>] [<commit-ish>...]"
5284 #: builtin/describe.c:18
5285 msgid "git describe [<options>] --dirty"
5288 #: builtin/describe.c:217
5290 msgid "annotated tag %s not available"
5293 #: builtin/describe.c:221
5295 msgid "annotated tag %s has no embedded name"
5298 #: builtin/describe.c:223
5300 msgid "tag '%s' is really '%s' here"
5303 #: builtin/describe.c:250 builtin/log.c:459
5305 msgid "Not a valid object name %s"
5308 #: builtin/describe.c:253
5310 msgid "%s is not a valid '%s' object"
5313 #: builtin/describe.c:270
5315 msgid "no tag exactly matches '%s'"
5318 #: builtin/describe.c:272
5320 msgid "searching to describe %s\n"
5323 #: builtin/describe.c:319
5325 msgid "finished search at %s\n"
5328 #: builtin/describe.c:346
5331 "No annotated tags can describe '%s'.\n"
5332 "However, there were unannotated tags: try --tags."
5335 #: builtin/describe.c:350
5338 "No tags can describe '%s'.\n"
5339 "Try --always, or create some tags."
5342 #: builtin/describe.c:371
5344 msgid "traversed %lu commits\n"
5347 #: builtin/describe.c:374
5350 "more than %i tags found; listed %i most recent\n"
5351 "gave up search at %s\n"
5354 #: builtin/describe.c:396
5355 msgid "find the tag that comes after the commit"
5358 #: builtin/describe.c:397
5359 msgid "debug search strategy on stderr"
5362 #: builtin/describe.c:398
5366 #: builtin/describe.c:399
5367 msgid "use any tag, even unannotated"
5370 #: builtin/describe.c:400
5371 msgid "always use long format"
5374 #: builtin/describe.c:401
5375 msgid "only follow first parent"
5378 #: builtin/describe.c:404
5379 msgid "only output exact matches"
5382 #: builtin/describe.c:406
5383 msgid "consider <n> most recent tags (default: 10)"
5386 #: builtin/describe.c:408
5387 msgid "only consider tags matching <pattern>"
5390 #: builtin/describe.c:410 builtin/name-rev.c:314
5391 msgid "show abbreviated commit object as fallback"
5394 #: builtin/describe.c:411
5398 #: builtin/describe.c:412
5399 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5402 #: builtin/describe.c:430
5403 msgid "--long is incompatible with --abbrev=0"
5406 #: builtin/describe.c:456
5407 msgid "No names found, cannot describe anything."
5410 #: builtin/describe.c:476
5411 msgid "--dirty is incompatible with commit-ishes"
5414 #: builtin/diff.c:86
5416 msgid "'%s': not a regular file or symlink"
5419 #: builtin/diff.c:237
5421 msgid "invalid option: %s"
5424 #: builtin/diff.c:358
5425 msgid "Not a git repository"
5428 #: builtin/diff.c:401
5430 msgid "invalid object '%s' given."
5433 #: builtin/diff.c:410
5435 msgid "more than two blobs given: '%s'"
5438 #: builtin/diff.c:417
5440 msgid "unhandled object '%s' given."
5443 #: builtin/fast-export.c:25
5444 msgid "git fast-export [rev-list-opts]"
5447 #: builtin/fast-export.c:980
5448 msgid "show progress after <n> objects"
5451 #: builtin/fast-export.c:982
5452 msgid "select handling of signed tags"
5455 #: builtin/fast-export.c:985
5456 msgid "select handling of tags that tag filtered objects"
5459 #: builtin/fast-export.c:988
5460 msgid "Dump marks to this file"
5463 #: builtin/fast-export.c:990
5464 msgid "Import marks from this file"
5467 #: builtin/fast-export.c:992
5468 msgid "Fake a tagger when tags lack one"
5471 #: builtin/fast-export.c:994
5472 msgid "Output full tree for each commit"
5475 #: builtin/fast-export.c:996
5476 msgid "Use the done feature to terminate the stream"
5479 #: builtin/fast-export.c:997
5480 msgid "Skip output of blob data"
5483 #: builtin/fast-export.c:998
5487 #: builtin/fast-export.c:999
5488 msgid "Apply refspec to exported refs"
5491 #: builtin/fast-export.c:1000
5492 msgid "anonymize output"
5495 #: builtin/fetch.c:20
5496 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5499 #: builtin/fetch.c:21
5500 msgid "git fetch [<options>] <group>"
5503 #: builtin/fetch.c:22
5504 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5507 #: builtin/fetch.c:23
5508 msgid "git fetch --all [<options>]"
5511 #: builtin/fetch.c:90 builtin/pull.c:162
5512 msgid "fetch from all remotes"
5515 #: builtin/fetch.c:92 builtin/pull.c:165
5516 msgid "append to .git/FETCH_HEAD instead of overwriting"
5519 #: builtin/fetch.c:94 builtin/pull.c:168
5520 msgid "path to upload pack on remote end"
5523 #: builtin/fetch.c:95 builtin/pull.c:170
5524 msgid "force overwrite of local branch"
5527 #: builtin/fetch.c:97
5528 msgid "fetch from multiple remotes"
5531 #: builtin/fetch.c:99 builtin/pull.c:172
5532 msgid "fetch all tags and associated objects"
5535 #: builtin/fetch.c:101
5536 msgid "do not fetch all tags (--no-tags)"
5539 #: builtin/fetch.c:103 builtin/pull.c:175
5540 msgid "prune remote-tracking branches no longer on remote"
5543 #: builtin/fetch.c:104 builtin/pull.c:178
5547 #: builtin/fetch.c:105 builtin/pull.c:179
5548 msgid "control recursive fetching of submodules"
5551 #: builtin/fetch.c:109 builtin/pull.c:184
5552 msgid "keep downloaded pack"
5555 #: builtin/fetch.c:111
5556 msgid "allow updating of HEAD ref"
5559 #: builtin/fetch.c:114 builtin/pull.c:187
5560 msgid "deepen history of shallow clone"
5563 #: builtin/fetch.c:116 builtin/pull.c:190
5564 msgid "convert to a complete repository"
5567 #: builtin/fetch.c:118 builtin/log.c:1233
5571 #: builtin/fetch.c:119
5572 msgid "prepend this to submodule path output"
5575 #: builtin/fetch.c:122
5576 msgid "default mode for recursion"
5579 #: builtin/fetch.c:124 builtin/pull.c:193
5580 msgid "accept refs that update .git/shallow"
5583 #: builtin/fetch.c:125 builtin/pull.c:195
5587 #: builtin/fetch.c:126 builtin/pull.c:196
5588 msgid "specify fetch refmap"
5591 #: builtin/fetch.c:378
5592 msgid "Couldn't find remote ref HEAD"
5595 #: builtin/fetch.c:458
5597 msgid "object %s not found"
5600 #: builtin/fetch.c:463
5601 msgid "[up to date]"
5604 #: builtin/fetch.c:477
5606 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5609 #: builtin/fetch.c:478 builtin/fetch.c:566
5613 #: builtin/fetch.c:489
5614 msgid "[tag update]"
5617 #: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544
5618 msgid " (unable to update local ref)"
5621 #: builtin/fetch.c:509
5625 #: builtin/fetch.c:512
5626 msgid "[new branch]"
5629 #: builtin/fetch.c:515
5633 #: builtin/fetch.c:561
5634 msgid "unable to update local ref"
5637 #: builtin/fetch.c:561
5638 msgid "forced update"
5641 #: builtin/fetch.c:568
5642 msgid "(non-fast-forward)"
5645 #: builtin/fetch.c:602 builtin/fetch.c:843
5647 msgid "cannot open %s: %s\n"
5650 #: builtin/fetch.c:611
5652 msgid "%s did not send all necessary objects\n"
5655 #: builtin/fetch.c:629
5657 msgid "reject %s because shallow roots are not allowed to be updated"
5660 #: builtin/fetch.c:716 builtin/fetch.c:808
5665 #: builtin/fetch.c:727
5668 "some local refs could not be updated; try running\n"
5669 " 'git remote prune %s' to remove any old, conflicting branches"
5672 #: builtin/fetch.c:779
5674 msgid " (%s will become dangling)"
5677 #: builtin/fetch.c:780
5679 msgid " (%s has become dangling)"
5682 #: builtin/fetch.c:812
5686 #: builtin/fetch.c:813 builtin/remote.c:1040
5690 #: builtin/fetch.c:833
5692 msgid "Refusing to fetch into current branch %s of non-bare repository"
5695 #: builtin/fetch.c:852
5697 msgid "Option \"%s\" value \"%s\" is not valid for %s"
5700 #: builtin/fetch.c:855
5702 msgid "Option \"%s\" is ignored for %s\n"
5705 #: builtin/fetch.c:911
5707 msgid "Don't know how to fetch from %s"
5710 #: builtin/fetch.c:1072
5712 msgid "Fetching %s\n"
5715 #: builtin/fetch.c:1074 builtin/remote.c:96
5717 msgid "Could not fetch %s"
5720 #: builtin/fetch.c:1092
5722 "No remote repository specified. Please, specify either a URL or a\n"
5723 "remote name from which new revisions should be fetched."
5726 #: builtin/fetch.c:1115
5727 msgid "You need to specify a tag name."
5730 #: builtin/fetch.c:1157
5731 msgid "--depth and --unshallow cannot be used together"
5734 #: builtin/fetch.c:1159
5735 msgid "--unshallow on a complete repository does not make sense"
5738 #: builtin/fetch.c:1179
5739 msgid "fetch --all does not take a repository argument"
5742 #: builtin/fetch.c:1181
5743 msgid "fetch --all does not make sense with refspecs"
5746 #: builtin/fetch.c:1192
5748 msgid "No such remote or remote group: %s"
5751 #: builtin/fetch.c:1200
5752 msgid "Fetching a group and specifying refspecs does not make sense"
5755 #: builtin/fmt-merge-msg.c:14
5757 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
5760 #: builtin/fmt-merge-msg.c:667
5761 msgid "populate log with at most <n> entries from shortlog"
5764 #: builtin/fmt-merge-msg.c:670
5765 msgid "alias for --log (deprecated)"
5768 #: builtin/fmt-merge-msg.c:673
5772 #: builtin/fmt-merge-msg.c:674
5773 msgid "use <text> as start of message"
5776 #: builtin/fmt-merge-msg.c:675
5777 msgid "file to read from"
5780 #: builtin/for-each-ref.c:9
5781 msgid "git for-each-ref [<options>] [<pattern>]"
5784 #: builtin/for-each-ref.c:10
5785 msgid "git for-each-ref [--points-at <object>]"
5788 #: builtin/for-each-ref.c:11
5789 msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
5792 #: builtin/for-each-ref.c:12
5793 msgid "git for-each-ref [--contains [<object>]]"
5796 #: builtin/for-each-ref.c:27
5797 msgid "quote placeholders suitably for shells"
5800 #: builtin/for-each-ref.c:29
5801 msgid "quote placeholders suitably for perl"
5804 #: builtin/for-each-ref.c:31
5805 msgid "quote placeholders suitably for python"
5808 #: builtin/for-each-ref.c:33
5809 msgid "quote placeholders suitably for Tcl"
5812 #: builtin/for-each-ref.c:36
5813 msgid "show only <n> matched refs"
5816 #: builtin/for-each-ref.c:37 builtin/tag.c:372
5817 msgid "format to use for the output"
5820 #: builtin/for-each-ref.c:41
5821 msgid "print only refs which points at the given object"
5824 #: builtin/for-each-ref.c:43
5825 msgid "print only refs that are merged"
5828 #: builtin/for-each-ref.c:44
5829 msgid "print only refs that are not merged"
5832 #: builtin/for-each-ref.c:45
5833 msgid "print only refs which contain the commit"
5836 #: builtin/fsck.c:156 builtin/prune.c:140
5837 msgid "Checking connectivity"
5840 #: builtin/fsck.c:486
5841 msgid "Checking object directories"
5844 #: builtin/fsck.c:553
5845 msgid "git fsck [<options>] [<object>...]"
5848 #: builtin/fsck.c:559
5849 msgid "show unreachable objects"
5852 #: builtin/fsck.c:560
5853 msgid "show dangling objects"
5856 #: builtin/fsck.c:561
5860 #: builtin/fsck.c:562
5861 msgid "report root nodes"
5864 #: builtin/fsck.c:563
5865 msgid "make index objects head nodes"
5868 #: builtin/fsck.c:564
5869 msgid "make reflogs head nodes (default)"
5872 #: builtin/fsck.c:565
5873 msgid "also consider packs and alternate objects"
5876 #: builtin/fsck.c:566
5877 msgid "check only connectivity"
5880 #: builtin/fsck.c:567
5881 msgid "enable more strict checking"
5884 #: builtin/fsck.c:569
5885 msgid "write dangling objects in .git/lost-found"
5888 #: builtin/fsck.c:570 builtin/prune.c:107
5889 msgid "show progress"
5892 #: builtin/fsck.c:631
5893 msgid "Checking objects"
5897 msgid "git gc [<options>]"
5902 msgid "Invalid %s: '%s'"
5907 msgid "insanely long object directory %.*s"
5913 "The last gc run reported the following. Please correct the root cause\n"
5915 "Automatic cleanup will not be performed until the file is removed.\n"
5921 msgid "prune unreferenced objects"
5925 msgid "be more thorough (increased runtime)"
5929 msgid "enable auto-gc mode"
5933 msgid "force running gc even if there may be another gc running"
5938 msgid "Auto packing the repository in background for optimum performance.\n"
5943 msgid "Auto packing the repository for optimum performance.\n"
5948 msgid "See \"git help gc\" for manual housekeeping.\n"
5954 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5959 "There are too many unreachable loose objects; run 'git prune' to remove them."
5962 #: builtin/grep.c:23
5963 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
5966 #: builtin/grep.c:218
5968 msgid "grep: failed to create thread: %s"
5971 #: builtin/grep.c:441 builtin/grep.c:476
5973 msgid "unable to read tree (%s)"
5976 #: builtin/grep.c:491
5978 msgid "unable to grep from object of type %s"
5981 #: builtin/grep.c:547
5983 msgid "switch `%c' expects a numerical value"
5986 #: builtin/grep.c:564
5988 msgid "cannot open '%s'"
5991 #: builtin/grep.c:633
5992 msgid "search in index instead of in the work tree"
5995 #: builtin/grep.c:635
5996 msgid "find in contents not managed by git"
5999 #: builtin/grep.c:637
6000 msgid "search in both tracked and untracked files"
6003 #: builtin/grep.c:639
6004 msgid "ignore files specified via '.gitignore'"
6007 #: builtin/grep.c:642
6008 msgid "show non-matching lines"
6011 #: builtin/grep.c:644
6012 msgid "case insensitive matching"
6015 #: builtin/grep.c:646
6016 msgid "match patterns only at word boundaries"
6019 #: builtin/grep.c:648
6020 msgid "process binary files as text"
6023 #: builtin/grep.c:650
6024 msgid "don't match patterns in binary files"
6027 #: builtin/grep.c:653
6028 msgid "process binary files with textconv filters"
6031 #: builtin/grep.c:655
6032 msgid "descend at most <depth> levels"
6035 #: builtin/grep.c:659
6036 msgid "use extended POSIX regular expressions"
6039 #: builtin/grep.c:662
6040 msgid "use basic POSIX regular expressions (default)"
6043 #: builtin/grep.c:665
6044 msgid "interpret patterns as fixed strings"
6047 #: builtin/grep.c:668
6048 msgid "use Perl-compatible regular expressions"
6051 #: builtin/grep.c:671
6052 msgid "show line numbers"
6055 #: builtin/grep.c:672
6056 msgid "don't show filenames"
6059 #: builtin/grep.c:673
6060 msgid "show filenames"
6063 #: builtin/grep.c:675
6064 msgid "show filenames relative to top directory"
6067 #: builtin/grep.c:677
6068 msgid "show only filenames instead of matching lines"
6071 #: builtin/grep.c:679
6072 msgid "synonym for --files-with-matches"
6075 #: builtin/grep.c:682
6076 msgid "show only the names of files without match"
6079 #: builtin/grep.c:684
6080 msgid "print NUL after filenames"
6083 #: builtin/grep.c:686
6084 msgid "show the number of matches instead of matching lines"
6087 #: builtin/grep.c:687
6088 msgid "highlight matches"
6091 #: builtin/grep.c:689
6092 msgid "print empty line between matches from different files"
6095 #: builtin/grep.c:691
6096 msgid "show filename only once above matches from same file"
6099 #: builtin/grep.c:694
6100 msgid "show <n> context lines before and after matches"
6103 #: builtin/grep.c:697
6104 msgid "show <n> context lines before matches"
6107 #: builtin/grep.c:699
6108 msgid "show <n> context lines after matches"
6111 #: builtin/grep.c:700
6112 msgid "shortcut for -C NUM"
6115 #: builtin/grep.c:703
6116 msgid "show a line with the function name before matches"
6119 #: builtin/grep.c:705
6120 msgid "show the surrounding function"
6123 #: builtin/grep.c:708
6124 msgid "read patterns from file"
6127 #: builtin/grep.c:710
6128 msgid "match <pattern>"
6131 #: builtin/grep.c:712
6132 msgid "combine patterns specified with -e"
6135 #: builtin/grep.c:724
6136 msgid "indicate hit with exit status without output"
6139 #: builtin/grep.c:726
6140 msgid "show only matches from files that match all patterns"
6143 #: builtin/grep.c:728
6144 msgid "show parse tree for grep expression"
6147 #: builtin/grep.c:732
6151 #: builtin/grep.c:732
6152 msgid "show matching files in the pager"
6155 #: builtin/grep.c:735
6156 msgid "allow calling of grep(1) (ignored by this build)"
6159 #: builtin/grep.c:793
6160 msgid "no pattern given."
6163 #: builtin/grep.c:851
6164 msgid "--open-files-in-pager only works on the worktree"
6167 #: builtin/grep.c:877
6168 msgid "--cached or --untracked cannot be used with --no-index."
6171 #: builtin/grep.c:882
6172 msgid "--no-index or --untracked cannot be used with revs."
6175 #: builtin/grep.c:885
6176 msgid "--[no-]exclude-standard cannot be used for tracked contents."
6179 #: builtin/grep.c:893
6180 msgid "both --cached and trees are given."
6183 #: builtin/hash-object.c:80
6185 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6189 #: builtin/hash-object.c:81
6190 msgid "git hash-object --stdin-paths"
6193 #: builtin/hash-object.c:92
6197 #: builtin/hash-object.c:92
6201 #: builtin/hash-object.c:93
6202 msgid "write the object into the object database"
6205 #: builtin/hash-object.c:95
6206 msgid "read the object from stdin"
6209 #: builtin/hash-object.c:97
6210 msgid "store file as is without filters"
6213 #: builtin/hash-object.c:98
6215 "just hash any random garbage to create corrupt objects for debugging Git"
6218 #: builtin/hash-object.c:99
6219 msgid "process file as it were from this path"
6222 #: builtin/help.c:41
6223 msgid "print all available commands"
6226 #: builtin/help.c:42
6227 msgid "print list of useful guides"
6230 #: builtin/help.c:43
6231 msgid "show man page"
6234 #: builtin/help.c:44
6235 msgid "show manual in web browser"
6238 #: builtin/help.c:46
6239 msgid "show info page"
6242 #: builtin/help.c:52
6243 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6246 #: builtin/help.c:64
6248 msgid "unrecognized help format '%s'"
6251 #: builtin/help.c:91
6252 msgid "Failed to start emacsclient."
6255 #: builtin/help.c:104
6256 msgid "Failed to parse emacsclient version."
6259 #: builtin/help.c:112
6261 msgid "emacsclient version '%d' too old (< 22)."
6264 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
6266 msgid "failed to exec '%s': %s"
6269 #: builtin/help.c:208
6272 "'%s': path for unsupported man viewer.\n"
6273 "Please consider using 'man.<tool>.cmd' instead."
6276 #: builtin/help.c:220
6279 "'%s': cmd for supported man viewer.\n"
6280 "Please consider using 'man.<tool>.path' instead."
6283 #: builtin/help.c:337
6285 msgid "'%s': unknown man viewer."
6288 #: builtin/help.c:354
6289 msgid "no man viewer handled the request"
6292 #: builtin/help.c:362
6293 msgid "no info viewer handled the request"
6296 #: builtin/help.c:411
6297 msgid "Defining attributes per path"
6300 #: builtin/help.c:412
6301 msgid "Everyday Git With 20 Commands Or So"
6304 #: builtin/help.c:413
6305 msgid "A Git glossary"
6308 #: builtin/help.c:414
6309 msgid "Specifies intentionally untracked files to ignore"
6312 #: builtin/help.c:415
6313 msgid "Defining submodule properties"
6316 #: builtin/help.c:416
6317 msgid "Specifying revisions and ranges for Git"
6320 #: builtin/help.c:417
6321 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6324 #: builtin/help.c:418
6325 msgid "An overview of recommended workflows with Git"
6328 #: builtin/help.c:430
6329 msgid "The common Git guides are:\n"
6332 #: builtin/help.c:451 builtin/help.c:468
6337 #: builtin/help.c:484
6339 msgid "`git %s' is aliased to `%s'"
6342 #: builtin/index-pack.c:152
6344 msgid "unable to open %s"
6347 #: builtin/index-pack.c:202
6349 msgid "object type mismatch at %s"
6352 #: builtin/index-pack.c:222
6354 msgid "did not receive expected object %s"
6357 #: builtin/index-pack.c:225
6359 msgid "object %s: expected type %s, found %s"
6362 #: builtin/index-pack.c:267
6364 msgid "cannot fill %d byte"
6365 msgid_plural "cannot fill %d bytes"
6369 #: builtin/index-pack.c:277
6373 #: builtin/index-pack.c:278
6374 msgid "read error on input"
6377 #: builtin/index-pack.c:290
6378 msgid "used more bytes than were available"
6381 #: builtin/index-pack.c:297
6382 msgid "pack too large for current definition of off_t"
6385 #: builtin/index-pack.c:313
6387 msgid "unable to create '%s'"
6390 #: builtin/index-pack.c:318
6392 msgid "cannot open packfile '%s'"
6395 #: builtin/index-pack.c:332
6396 msgid "pack signature mismatch"
6399 #: builtin/index-pack.c:334
6401 msgid "pack version %<PRIu32> unsupported"
6404 #: builtin/index-pack.c:352
6406 msgid "pack has bad object at offset %lu: %s"
6409 #: builtin/index-pack.c:473
6411 msgid "inflate returned %d"
6414 #: builtin/index-pack.c:522
6415 msgid "offset value overflow for delta base object"
6418 #: builtin/index-pack.c:530
6419 msgid "delta base offset is out of bound"
6422 #: builtin/index-pack.c:538
6424 msgid "unknown object type %d"
6427 #: builtin/index-pack.c:569
6428 msgid "cannot pread pack file"
6431 #: builtin/index-pack.c:571
6433 msgid "premature end of pack file, %lu byte missing"
6434 msgid_plural "premature end of pack file, %lu bytes missing"
6438 #: builtin/index-pack.c:597
6439 msgid "serious inflate inconsistency"
6442 #: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
6443 #: builtin/index-pack.c:806 builtin/index-pack.c:815
6445 msgid "SHA1 COLLISION FOUND WITH %s !"
6448 #: builtin/index-pack.c:746 builtin/pack-objects.c:162
6449 #: builtin/pack-objects.c:254
6451 msgid "unable to read %s"
6454 #: builtin/index-pack.c:812
6456 msgid "cannot read existing object %s"
6459 #: builtin/index-pack.c:826
6461 msgid "invalid blob object %s"
6464 #: builtin/index-pack.c:840
6469 #: builtin/index-pack.c:843
6470 msgid "Error in object"
6473 #: builtin/index-pack.c:845
6475 msgid "Not all child objects of %s are reachable"
6478 #: builtin/index-pack.c:917 builtin/index-pack.c:948
6479 msgid "failed to apply delta"
6482 #: builtin/index-pack.c:1118
6483 msgid "Receiving objects"
6486 #: builtin/index-pack.c:1118
6487 msgid "Indexing objects"
6490 #: builtin/index-pack.c:1150
6491 msgid "pack is corrupted (SHA1 mismatch)"
6494 #: builtin/index-pack.c:1155
6495 msgid "cannot fstat packfile"
6498 #: builtin/index-pack.c:1158
6499 msgid "pack has junk at the end"
6502 #: builtin/index-pack.c:1169
6503 msgid "confusion beyond insanity in parse_pack_objects()"
6506 #: builtin/index-pack.c:1194
6507 msgid "Resolving deltas"
6510 #: builtin/index-pack.c:1205
6512 msgid "unable to create thread: %s"
6515 #: builtin/index-pack.c:1247
6516 msgid "confusion beyond insanity"
6519 #: builtin/index-pack.c:1253
6521 msgid "completed with %d local objects"
6524 #: builtin/index-pack.c:1263
6526 msgid "Unexpected tail checksum for %s (disk corruption?)"
6529 #: builtin/index-pack.c:1267
6531 msgid "pack has %d unresolved delta"
6532 msgid_plural "pack has %d unresolved deltas"
6536 #: builtin/index-pack.c:1291
6538 msgid "unable to deflate appended object (%d)"
6541 #: builtin/index-pack.c:1367
6543 msgid "local object %s is corrupt"
6546 #: builtin/index-pack.c:1391
6547 msgid "error while closing pack file"
6550 #: builtin/index-pack.c:1404
6552 msgid "cannot write keep file '%s'"
6555 #: builtin/index-pack.c:1412
6557 msgid "cannot close written keep file '%s'"
6560 #: builtin/index-pack.c:1425
6561 msgid "cannot store pack file"
6564 #: builtin/index-pack.c:1436
6565 msgid "cannot store index file"
6568 #: builtin/index-pack.c:1469
6570 msgid "bad pack.indexversion=%<PRIu32>"
6573 #: builtin/index-pack.c:1475
6575 msgid "invalid number of threads specified (%d)"
6578 #: builtin/index-pack.c:1479 builtin/index-pack.c:1663
6580 msgid "no threads support, ignoring %s"
6583 #: builtin/index-pack.c:1537
6585 msgid "Cannot open existing pack file '%s'"
6588 #: builtin/index-pack.c:1539
6590 msgid "Cannot open existing pack idx file for '%s'"
6593 #: builtin/index-pack.c:1586
6595 msgid "non delta: %d object"
6596 msgid_plural "non delta: %d objects"
6600 #: builtin/index-pack.c:1593
6602 msgid "chain length = %d: %lu object"
6603 msgid_plural "chain length = %d: %lu objects"
6607 #: builtin/index-pack.c:1623
6608 msgid "Cannot come back to cwd"
6611 #: builtin/index-pack.c:1675 builtin/index-pack.c:1678
6612 #: builtin/index-pack.c:1690 builtin/index-pack.c:1694
6617 #: builtin/index-pack.c:1708
6618 msgid "--fix-thin cannot be used without --stdin"
6621 #: builtin/index-pack.c:1712 builtin/index-pack.c:1721
6623 msgid "packfile name '%s' does not end with '.pack'"
6626 #: builtin/index-pack.c:1729
6627 msgid "--verify with no packfile name given"
6630 #: builtin/init-db.c:55
6632 msgid "cannot stat '%s'"
6635 #: builtin/init-db.c:61
6637 msgid "cannot stat template '%s'"
6640 #: builtin/init-db.c:66
6642 msgid "cannot opendir '%s'"
6645 #: builtin/init-db.c:77
6647 msgid "cannot readlink '%s'"
6650 #: builtin/init-db.c:79
6652 msgid "cannot symlink '%s' '%s'"
6655 #: builtin/init-db.c:85
6657 msgid "cannot copy '%s' to '%s'"
6660 #: builtin/init-db.c:89
6662 msgid "ignoring template %s"
6665 #: builtin/init-db.c:118
6667 msgid "templates not found %s"
6670 #: builtin/init-db.c:131
6672 msgid "not copying templates of a wrong format version %d from '%s'"
6675 #: builtin/init-db.c:309 builtin/init-db.c:312
6677 msgid "%s already exists"
6680 #: builtin/init-db.c:340
6682 msgid "unable to handle file type %d"
6685 #: builtin/init-db.c:343
6687 msgid "unable to move %s to %s"
6690 #. TRANSLATORS: The first '%s' is either "Reinitialized
6691 #. existing" or "Initialized empty", the second " shared" or
6692 #. "", and the last '%s%s' is the verbatim directory name.
6693 #: builtin/init-db.c:399
6695 msgid "%s%s Git repository in %s%s\n"
6698 #: builtin/init-db.c:400
6699 msgid "Reinitialized existing"
6702 #: builtin/init-db.c:400
6703 msgid "Initialized empty"
6706 #: builtin/init-db.c:401
6710 #: builtin/init-db.c:448
6712 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6713 "shared[=<permissions>]] [<directory>]"
6716 #: builtin/init-db.c:471
6720 #: builtin/init-db.c:472
6721 msgid "specify that the git repository is to be shared amongst several users"
6724 #: builtin/init-db.c:506 builtin/init-db.c:511
6726 msgid "cannot mkdir %s"
6729 #: builtin/init-db.c:515
6731 msgid "cannot chdir to %s"
6734 #: builtin/init-db.c:536
6737 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6741 #: builtin/init-db.c:564
6743 msgid "Cannot access work tree '%s'"
6746 #: builtin/interpret-trailers.c:15
6748 "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6752 #: builtin/interpret-trailers.c:25
6753 msgid "trim empty trailers"
6756 #: builtin/interpret-trailers.c:26
6760 #: builtin/interpret-trailers.c:27
6761 msgid "trailer(s) to add"
6765 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
6769 msgid "git show [<options>] <object>..."
6774 msgid "invalid --decorate option: %s"
6777 #: builtin/log.c:131
6778 msgid "suppress diff output"
6781 #: builtin/log.c:132
6785 #: builtin/log.c:133
6786 msgid "Use mail map file"
6789 #: builtin/log.c:134
6790 msgid "decorate options"
6793 #: builtin/log.c:137
6794 msgid "Process line range n,m in file, counting from 1"
6797 #: builtin/log.c:233
6799 msgid "Final output: %d %s\n"
6802 #: builtin/log.c:465
6804 msgid "git show %s: bad file"
6807 #: builtin/log.c:479 builtin/log.c:572
6809 msgid "Could not read object %s"
6812 #: builtin/log.c:596
6814 msgid "Unknown type: %d"
6817 #: builtin/log.c:714
6818 msgid "format.headers without value"
6821 #: builtin/log.c:798
6822 msgid "name of output directory is too long"
6825 #: builtin/log.c:813
6827 msgid "Cannot open patch file %s"
6830 #: builtin/log.c:827
6831 msgid "Need exactly one range."
6834 #: builtin/log.c:837
6835 msgid "Not a range."
6838 #: builtin/log.c:943
6839 msgid "Cover letter needs email format"
6842 #: builtin/log.c:1022
6844 msgid "insane in-reply-to: %s"
6847 #: builtin/log.c:1050
6848 msgid "git format-patch [<options>] [<since> | <revision-range>]"
6851 #: builtin/log.c:1095
6852 msgid "Two output directories?"
6855 #: builtin/log.c:1211
6856 msgid "use [PATCH n/m] even with a single patch"
6859 #: builtin/log.c:1214
6860 msgid "use [PATCH] even with multiple patches"
6863 #: builtin/log.c:1218
6864 msgid "print patches to standard out"
6867 #: builtin/log.c:1220
6868 msgid "generate a cover letter"
6871 #: builtin/log.c:1222
6872 msgid "use simple number sequence for output file names"
6875 #: builtin/log.c:1223
6879 #: builtin/log.c:1224
6880 msgid "use <sfx> instead of '.patch'"
6883 #: builtin/log.c:1226
6884 msgid "start numbering patches at <n> instead of 1"
6887 #: builtin/log.c:1228
6888 msgid "mark the series as Nth re-roll"
6891 #: builtin/log.c:1230
6892 msgid "Use [<prefix>] instead of [PATCH]"
6895 #: builtin/log.c:1233
6896 msgid "store resulting files in <dir>"
6899 #: builtin/log.c:1236
6900 msgid "don't strip/add [PATCH]"
6903 #: builtin/log.c:1239
6904 msgid "don't output binary diffs"
6907 #: builtin/log.c:1241
6908 msgid "output all-zero hash in From header"
6911 #: builtin/log.c:1243
6912 msgid "don't include a patch matching a commit upstream"
6915 #: builtin/log.c:1245
6916 msgid "show patch format instead of default (patch + stat)"
6919 #: builtin/log.c:1247
6923 #: builtin/log.c:1248
6927 #: builtin/log.c:1249
6928 msgid "add email header"
6931 #: builtin/log.c:1250 builtin/log.c:1252
6935 #: builtin/log.c:1250
6936 msgid "add To: header"
6939 #: builtin/log.c:1252
6940 msgid "add Cc: header"
6943 #: builtin/log.c:1254
6947 #: builtin/log.c:1255
6948 msgid "set From address to <ident> (or committer ident if absent)"
6951 #: builtin/log.c:1257
6955 #: builtin/log.c:1258
6956 msgid "make first mail a reply to <message-id>"
6959 #: builtin/log.c:1259 builtin/log.c:1262
6963 #: builtin/log.c:1260
6964 msgid "attach the patch"
6967 #: builtin/log.c:1263
6968 msgid "inline the patch"
6971 #: builtin/log.c:1267
6972 msgid "enable message threading, styles: shallow, deep"
6975 #: builtin/log.c:1269
6979 #: builtin/log.c:1270
6980 msgid "add a signature"
6983 #: builtin/log.c:1272
6984 msgid "add a signature from a file"
6987 #: builtin/log.c:1273
6988 msgid "don't print the patch filenames"
6991 #: builtin/log.c:1362
6992 msgid "-n and -k are mutually exclusive."
6995 #: builtin/log.c:1364
6996 msgid "--subject-prefix and -k are mutually exclusive."
6999 #: builtin/log.c:1372
7000 msgid "--name-only does not make sense"
7003 #: builtin/log.c:1374
7004 msgid "--name-status does not make sense"
7007 #: builtin/log.c:1376
7008 msgid "--check does not make sense"
7011 #: builtin/log.c:1401
7012 msgid "standard output, or directory, which one?"
7015 #: builtin/log.c:1403
7017 msgid "Could not create directory '%s'"
7020 #: builtin/log.c:1500
7022 msgid "unable to read signature file '%s'"
7025 #: builtin/log.c:1563
7026 msgid "Failed to create output files"
7029 #: builtin/log.c:1611
7030 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
7033 #: builtin/log.c:1665
7036 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
7039 #: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690
7041 msgid "Unknown commit %s"
7044 #: builtin/ls-files.c:358
7045 msgid "git ls-files [<options>] [<file>...]"
7048 #: builtin/ls-files.c:415
7049 msgid "identify the file status with tags"
7052 #: builtin/ls-files.c:417
7053 msgid "use lowercase letters for 'assume unchanged' files"
7056 #: builtin/ls-files.c:419
7057 msgid "show cached files in the output (default)"
7060 #: builtin/ls-files.c:421
7061 msgid "show deleted files in the output"
7064 #: builtin/ls-files.c:423
7065 msgid "show modified files in the output"
7068 #: builtin/ls-files.c:425
7069 msgid "show other files in the output"
7072 #: builtin/ls-files.c:427
7073 msgid "show ignored files in the output"
7076 #: builtin/ls-files.c:430
7077 msgid "show staged contents' object name in the output"
7080 #: builtin/ls-files.c:432
7081 msgid "show files on the filesystem that need to be removed"
7084 #: builtin/ls-files.c:434
7085 msgid "show 'other' directories' names only"
7088 #: builtin/ls-files.c:437
7089 msgid "don't show empty directories"
7092 #: builtin/ls-files.c:440
7093 msgid "show unmerged files in the output"
7096 #: builtin/ls-files.c:442
7097 msgid "show resolve-undo information"
7100 #: builtin/ls-files.c:444
7101 msgid "skip files matching pattern"
7104 #: builtin/ls-files.c:447
7105 msgid "exclude patterns are read from <file>"
7108 #: builtin/ls-files.c:450
7109 msgid "read additional per-directory exclude patterns in <file>"
7112 #: builtin/ls-files.c:452
7113 msgid "add the standard git exclusions"
7116 #: builtin/ls-files.c:455
7117 msgid "make the output relative to the project top directory"
7120 #: builtin/ls-files.c:458
7121 msgid "if any <file> is not in the index, treat this as an error"
7124 #: builtin/ls-files.c:459
7128 #: builtin/ls-files.c:460
7129 msgid "pretend that paths removed since <tree-ish> are still present"
7132 #: builtin/ls-files.c:462
7133 msgid "show debugging data"
7136 #: builtin/ls-tree.c:28
7137 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
7140 #: builtin/ls-tree.c:128
7141 msgid "only show trees"
7144 #: builtin/ls-tree.c:130
7145 msgid "recurse into subtrees"
7148 #: builtin/ls-tree.c:132
7149 msgid "show trees when recursing"
7152 #: builtin/ls-tree.c:135
7153 msgid "terminate entries with NUL byte"
7156 #: builtin/ls-tree.c:136
7157 msgid "include object size"
7160 #: builtin/ls-tree.c:138 builtin/ls-tree.c:140
7161 msgid "list only filenames"
7164 #: builtin/ls-tree.c:143
7165 msgid "use full path names"
7168 #: builtin/ls-tree.c:145
7169 msgid "list entire tree; not just current directory (implies --full-name)"
7172 #: builtin/merge.c:45
7173 msgid "git merge [<options>] [<commit>...]"
7176 #: builtin/merge.c:46
7177 msgid "git merge [<options>] <msg> HEAD <commit>"
7180 #: builtin/merge.c:47
7181 msgid "git merge --abort"
7184 #: builtin/merge.c:100
7185 msgid "switch `m' requires a value"
7188 #: builtin/merge.c:137
7190 msgid "Could not find merge strategy '%s'.\n"
7193 #: builtin/merge.c:138
7195 msgid "Available strategies are:"
7198 #: builtin/merge.c:143
7200 msgid "Available custom strategies are:"
7203 #: builtin/merge.c:193 builtin/pull.c:119
7204 msgid "do not show a diffstat at the end of the merge"
7207 #: builtin/merge.c:196 builtin/pull.c:122
7208 msgid "show a diffstat at the end of the merge"
7211 #: builtin/merge.c:197 builtin/pull.c:125
7212 msgid "(synonym to --stat)"
7215 #: builtin/merge.c:199 builtin/pull.c:128
7216 msgid "add (at most <n>) entries from shortlog to merge commit message"
7219 #: builtin/merge.c:202 builtin/pull.c:131
7220 msgid "create a single commit instead of doing a merge"
7223 #: builtin/merge.c:204 builtin/pull.c:134
7224 msgid "perform a commit if the merge succeeds (default)"
7227 #: builtin/merge.c:206 builtin/pull.c:137
7228 msgid "edit message before committing"
7231 #: builtin/merge.c:207
7232 msgid "allow fast-forward (default)"
7235 #: builtin/merge.c:209 builtin/pull.c:143
7236 msgid "abort if fast-forward is not possible"
7239 #: builtin/merge.c:213
7240 msgid "Verify that the named commit has a valid GPG signature"
7243 #: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148
7244 #: builtin/revert.c:89
7248 #: builtin/merge.c:215 builtin/pull.c:149
7249 msgid "merge strategy to use"
7252 #: builtin/merge.c:216 builtin/pull.c:152
7253 msgid "option=value"
7256 #: builtin/merge.c:217 builtin/pull.c:153
7257 msgid "option for selected merge strategy"
7260 #: builtin/merge.c:219
7261 msgid "merge commit message (for a non-fast-forward merge)"
7264 #: builtin/merge.c:223
7265 msgid "abort the current in-progress merge"
7268 #: builtin/merge.c:251
7269 msgid "could not run stash."
7272 #: builtin/merge.c:256
7273 msgid "stash failed"
7276 #: builtin/merge.c:261
7278 msgid "not a valid object: %s"
7281 #: builtin/merge.c:280 builtin/merge.c:297
7282 msgid "read-tree failed"
7285 #: builtin/merge.c:327
7286 msgid " (nothing to squash)"
7289 #: builtin/merge.c:340
7291 msgid "Squash commit -- not updating HEAD\n"
7294 #: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
7295 #: builtin/merge.c:988
7297 msgid "Could not write to '%s'"
7300 #: builtin/merge.c:372
7301 msgid "Writing SQUASH_MSG"
7304 #: builtin/merge.c:374
7305 msgid "Finishing SQUASH_MSG"
7308 #: builtin/merge.c:397
7310 msgid "No merge message -- not updating HEAD\n"
7313 #: builtin/merge.c:447
7315 msgid "'%s' does not point to a commit"
7318 #: builtin/merge.c:537
7320 msgid "Bad branch.%s.mergeoptions string: %s"
7323 #: builtin/merge.c:656
7324 msgid "Not handling anything other than two heads merge."
7327 #: builtin/merge.c:670
7329 msgid "Unknown option for merge-recursive: -X%s"
7332 #: builtin/merge.c:683
7334 msgid "unable to write %s"
7337 #: builtin/merge.c:772
7339 msgid "Could not read from '%s'"
7342 #: builtin/merge.c:781
7344 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7347 #: builtin/merge.c:787
7350 "Please enter a commit message to explain why this merge is necessary,\n"
7351 "especially if it merges an updated upstream into a topic branch.\n"
7353 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
7357 #: builtin/merge.c:811
7358 msgid "Empty commit message."
7361 #: builtin/merge.c:823
7363 msgid "Wonderful.\n"
7366 #: builtin/merge.c:878
7368 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7371 #: builtin/merge.c:894
7373 msgid "'%s' is not a commit"
7376 #: builtin/merge.c:935
7377 msgid "No current branch."
7380 #: builtin/merge.c:937
7381 msgid "No remote for the current branch."
7384 #: builtin/merge.c:939
7385 msgid "No default upstream defined for the current branch."
7388 #: builtin/merge.c:944
7390 msgid "No remote-tracking branch for %s from %s"
7393 #: builtin/merge.c:1079
7395 msgid "could not close '%s'"
7398 #: builtin/merge.c:1206
7399 msgid "There is no merge to abort (MERGE_HEAD missing)."
7402 #: builtin/merge.c:1222
7404 "You have not concluded your merge (MERGE_HEAD exists).\n"
7405 "Please, commit your changes before you merge."
7408 #: builtin/merge.c:1229
7410 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
7411 "Please, commit your changes before you merge."
7414 #: builtin/merge.c:1232
7415 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7418 #: builtin/merge.c:1241
7419 msgid "You cannot combine --squash with --no-ff."
7422 #: builtin/merge.c:1249
7423 msgid "No commit specified and merge.defaultToUpstream not set."
7426 #: builtin/merge.c:1266
7427 msgid "Squash commit into empty head not supported yet"
7430 #: builtin/merge.c:1268
7431 msgid "Non-fast-forward commit does not make sense into an empty head"
7434 #: builtin/merge.c:1274
7436 msgid "%s - not something we can merge"
7439 #: builtin/merge.c:1276
7440 msgid "Can merge only exactly one commit into empty head"
7443 #: builtin/merge.c:1331
7445 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7448 #: builtin/merge.c:1334
7450 msgid "Commit %s has a bad GPG signature allegedly by %s."
7453 #: builtin/merge.c:1337
7455 msgid "Commit %s does not have a GPG signature."
7458 #: builtin/merge.c:1340
7460 msgid "Commit %s has a good GPG signature by %s\n"
7463 #: builtin/merge.c:1423
7465 msgid "Updating %s..%s\n"
7468 #: builtin/merge.c:1460
7470 msgid "Trying really trivial in-index merge...\n"
7473 #: builtin/merge.c:1467
7478 #: builtin/merge.c:1499
7479 msgid "Not possible to fast-forward, aborting."
7482 #: builtin/merge.c:1522 builtin/merge.c:1601
7484 msgid "Rewinding the tree to pristine...\n"
7487 #: builtin/merge.c:1526
7489 msgid "Trying merge strategy %s...\n"
7492 #: builtin/merge.c:1592
7494 msgid "No merge strategy handled the merge.\n"
7497 #: builtin/merge.c:1594
7499 msgid "Merge with strategy %s failed.\n"
7502 #: builtin/merge.c:1603
7504 msgid "Using the %s to prepare resolving by hand.\n"
7507 #: builtin/merge.c:1615
7509 msgid "Automatic merge went well; stopped before committing as requested\n"
7512 #: builtin/merge-base.c:29
7513 msgid "git merge-base [-a | --all] <commit> <commit>..."
7516 #: builtin/merge-base.c:30
7517 msgid "git merge-base [-a | --all] --octopus <commit>..."
7520 #: builtin/merge-base.c:31
7521 msgid "git merge-base --independent <commit>..."
7524 #: builtin/merge-base.c:32
7525 msgid "git merge-base --is-ancestor <commit> <commit>"
7528 #: builtin/merge-base.c:33
7529 msgid "git merge-base --fork-point <ref> [<commit>]"
7532 #: builtin/merge-base.c:214
7533 msgid "output all common ancestors"
7536 #: builtin/merge-base.c:216
7537 msgid "find ancestors for a single n-way merge"
7540 #: builtin/merge-base.c:218
7541 msgid "list revs not reachable from others"
7544 #: builtin/merge-base.c:220
7545 msgid "is the first one ancestor of the other?"
7548 #: builtin/merge-base.c:222
7549 msgid "find where <commit> forked from reflog of <ref>"
7552 #: builtin/merge-file.c:8
7554 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7555 "<orig-file> <file2>"
7558 #: builtin/merge-file.c:33
7559 msgid "send results to standard output"
7562 #: builtin/merge-file.c:34
7563 msgid "use a diff3 based merge"
7566 #: builtin/merge-file.c:35
7567 msgid "for conflicts, use our version"
7570 #: builtin/merge-file.c:37
7571 msgid "for conflicts, use their version"
7574 #: builtin/merge-file.c:39
7575 msgid "for conflicts, use a union version"
7578 #: builtin/merge-file.c:42
7579 msgid "for conflicts, use this marker size"
7582 #: builtin/merge-file.c:43
7583 msgid "do not warn about conflicts"
7586 #: builtin/merge-file.c:45
7587 msgid "set labels for file1/orig-file/file2"
7590 #: builtin/mktree.c:64
7591 msgid "git mktree [-z] [--missing] [--batch]"
7594 #: builtin/mktree.c:150
7595 msgid "input is NUL terminated"
7598 #: builtin/mktree.c:151 builtin/write-tree.c:24
7599 msgid "allow missing objects"
7602 #: builtin/mktree.c:152
7603 msgid "allow creation of more than one tree"
7607 msgid "git mv [<options>] <source>... <destination>"
7612 msgid "Directory %s is in index and no submodule?"
7616 msgid "Please stage your changes to .gitmodules or stash them to proceed"
7621 msgid "%.*s is in index"
7625 msgid "force move/rename even if target exists"
7629 msgid "skip move/rename errors"
7634 msgid "destination '%s' is not a directory"
7639 msgid "Checking rename of '%s' to '%s'\n"
7647 msgid "can not move directory into itself"
7651 msgid "cannot move directory over file"
7655 msgid "source directory is empty"
7659 msgid "not under version control"
7663 msgid "destination exists"
7668 msgid "overwriting '%s'"
7672 msgid "Cannot overwrite"
7676 msgid "multiple sources for the same target"
7680 msgid "destination directory does not exist"
7685 msgid "%s, source=%s, destination=%s"
7690 msgid "Renaming %s to %s\n"
7693 #: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
7695 msgid "renaming '%s' failed"
7698 #: builtin/name-rev.c:251
7699 msgid "git name-rev [<options>] <commit>..."
7702 #: builtin/name-rev.c:252
7703 msgid "git name-rev [<options>] --all"
7706 #: builtin/name-rev.c:253
7707 msgid "git name-rev [<options>] --stdin"
7710 #: builtin/name-rev.c:305
7711 msgid "print only names (no SHA-1)"
7714 #: builtin/name-rev.c:306
7715 msgid "only use tags to name the commits"
7718 #: builtin/name-rev.c:308
7719 msgid "only use refs matching <pattern>"
7722 #: builtin/name-rev.c:310
7723 msgid "list all commits reachable from all refs"
7726 #: builtin/name-rev.c:311
7727 msgid "read from stdin"
7730 #: builtin/name-rev.c:312
7731 msgid "allow to print `undefined` names (default)"
7734 #: builtin/name-rev.c:318
7735 msgid "dereference tags in the input (internal use)"
7738 #: builtin/notes.c:25
7739 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
7742 #: builtin/notes.c:26
7744 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
7745 "| (-c | -C) <object>] [<object>]"
7748 #: builtin/notes.c:27
7749 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
7752 #: builtin/notes.c:28
7754 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
7755 "(-c | -C) <object>] [<object>]"
7758 #: builtin/notes.c:29
7759 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
7762 #: builtin/notes.c:30
7763 msgid "git notes [--ref <notes-ref>] show [<object>]"
7766 #: builtin/notes.c:31
7768 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
7771 #: builtin/notes.c:32
7772 msgid "git notes merge --commit [-v | -q]"
7775 #: builtin/notes.c:33
7776 msgid "git notes merge --abort [-v | -q]"
7779 #: builtin/notes.c:34
7780 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
7783 #: builtin/notes.c:35
7784 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
7787 #: builtin/notes.c:36
7788 msgid "git notes [--ref <notes-ref>] get-ref"
7791 #: builtin/notes.c:41
7792 msgid "git notes [list [<object>]]"
7795 #: builtin/notes.c:46
7796 msgid "git notes add [<options>] [<object>]"
7799 #: builtin/notes.c:51
7800 msgid "git notes copy [<options>] <from-object> <to-object>"
7803 #: builtin/notes.c:52
7804 msgid "git notes copy --stdin [<from-object> <to-object>]..."
7807 #: builtin/notes.c:57
7808 msgid "git notes append [<options>] [<object>]"
7811 #: builtin/notes.c:62
7812 msgid "git notes edit [<object>]"
7815 #: builtin/notes.c:67
7816 msgid "git notes show [<object>]"
7819 #: builtin/notes.c:72
7820 msgid "git notes merge [<options>] <notes-ref>"
7823 #: builtin/notes.c:73
7824 msgid "git notes merge --commit [<options>]"
7827 #: builtin/notes.c:74
7828 msgid "git notes merge --abort [<options>]"
7831 #: builtin/notes.c:79
7832 msgid "git notes remove [<object>]"
7835 #: builtin/notes.c:84
7836 msgid "git notes prune [<options>]"
7839 #: builtin/notes.c:89
7840 msgid "git notes get-ref"
7843 #: builtin/notes.c:147
7845 msgid "unable to start 'show' for object '%s'"
7848 #: builtin/notes.c:151
7849 msgid "could not read 'show' output"
7852 #: builtin/notes.c:159
7854 msgid "failed to finish 'show' for object '%s'"
7857 #: builtin/notes.c:174 builtin/tag.c:248
7859 msgid "could not create file '%s'"
7862 #: builtin/notes.c:193
7863 msgid "Please supply the note contents using either -m or -F option"
7866 #: builtin/notes.c:202
7867 msgid "unable to write note object"
7870 #: builtin/notes.c:204
7872 msgid "The note contents have been left in %s"
7875 #: builtin/notes.c:232 builtin/tag.c:440
7877 msgid "cannot read '%s'"
7880 #: builtin/notes.c:234 builtin/tag.c:443
7882 msgid "could not open or read '%s'"
7885 #: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
7886 #: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
7887 #: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
7888 #: builtin/notes.c:877 builtin/tag.c:456
7890 msgid "Failed to resolve '%s' as a valid ref."
7893 #: builtin/notes.c:256
7895 msgid "Failed to read object '%s'."
7898 #: builtin/notes.c:260
7900 msgid "Cannot read note data from non-blob object '%s'."
7903 #: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490
7904 #: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646
7905 #: builtin/notes.c:942
7906 msgid "too many parameters"
7909 #: builtin/notes.c:372 builtin/notes.c:659
7911 msgid "No note found for object %s."
7914 #: builtin/notes.c:393 builtin/notes.c:556
7915 msgid "note contents as a string"
7918 #: builtin/notes.c:396 builtin/notes.c:559
7919 msgid "note contents in a file"
7922 #: builtin/notes.c:399 builtin/notes.c:562
7923 msgid "reuse and edit specified note object"
7926 #: builtin/notes.c:402 builtin/notes.c:565
7927 msgid "reuse specified note object"
7930 #: builtin/notes.c:405 builtin/notes.c:568
7931 msgid "allow storing empty note"
7934 #: builtin/notes.c:406 builtin/notes.c:477
7935 msgid "replace existing notes"
7938 #: builtin/notes.c:431
7941 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7945 #: builtin/notes.c:446 builtin/notes.c:525
7947 msgid "Overwriting existing notes for object %s\n"
7950 #: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882
7952 msgid "Removing note for object %s\n"
7955 #: builtin/notes.c:478
7956 msgid "read objects from stdin"
7959 #: builtin/notes.c:480
7960 msgid "load rewriting config for <command> (implies --stdin)"
7963 #: builtin/notes.c:498
7964 msgid "too few parameters"
7967 #: builtin/notes.c:519
7970 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7974 #: builtin/notes.c:531
7976 msgid "Missing notes on source object %s. Cannot copy."
7979 #: builtin/notes.c:583
7982 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7983 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7986 #: builtin/notes.c:764
7987 msgid "General options"
7990 #: builtin/notes.c:766
7991 msgid "Merge options"
7994 #: builtin/notes.c:768
7996 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
8000 #: builtin/notes.c:770
8001 msgid "Committing unmerged notes"
8004 #: builtin/notes.c:772
8005 msgid "finalize notes merge by committing unmerged notes"
8008 #: builtin/notes.c:774
8009 msgid "Aborting notes merge resolution"
8012 #: builtin/notes.c:776
8013 msgid "abort notes merge"
8016 #: builtin/notes.c:853
8018 msgid "A notes merge into %s is already in-progress at %s"
8021 #: builtin/notes.c:880
8023 msgid "Object %s has no note\n"
8026 #: builtin/notes.c:892
8027 msgid "attempt to remove non-existent note is not an error"
8030 #: builtin/notes.c:895
8031 msgid "read object names from the standard input"
8034 #: builtin/notes.c:976
8038 #: builtin/notes.c:977
8039 msgid "use notes from <notes-ref>"
8042 #: builtin/notes.c:1012 builtin/remote.c:1647
8044 msgid "Unknown subcommand: %s"
8047 #: builtin/pack-objects.c:28
8049 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
8052 #: builtin/pack-objects.c:29
8054 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
8057 #: builtin/pack-objects.c:175 builtin/pack-objects.c:178
8059 msgid "deflate error (%d)"
8062 #: builtin/pack-objects.c:771
8063 msgid "Writing objects"
8066 #: builtin/pack-objects.c:1011
8067 msgid "disabling bitmap writing, as some objects are not being packed"
8070 #: builtin/pack-objects.c:2171
8071 msgid "Compressing objects"
8074 #: builtin/pack-objects.c:2568
8076 msgid "unsupported index version %s"
8079 #: builtin/pack-objects.c:2572
8081 msgid "bad index version '%s'"
8084 #: builtin/pack-objects.c:2602
8085 msgid "do not show progress meter"
8088 #: builtin/pack-objects.c:2604
8089 msgid "show progress meter"
8092 #: builtin/pack-objects.c:2606
8093 msgid "show progress meter during object writing phase"
8096 #: builtin/pack-objects.c:2609
8097 msgid "similar to --all-progress when progress meter is shown"
8100 #: builtin/pack-objects.c:2610
8101 msgid "version[,offset]"
8104 #: builtin/pack-objects.c:2611
8105 msgid "write the pack index file in the specified idx format version"
8108 #: builtin/pack-objects.c:2614
8109 msgid "maximum size of each output pack file"
8112 #: builtin/pack-objects.c:2616
8113 msgid "ignore borrowed objects from alternate object store"
8116 #: builtin/pack-objects.c:2618
8117 msgid "ignore packed objects"
8120 #: builtin/pack-objects.c:2620
8121 msgid "limit pack window by objects"
8124 #: builtin/pack-objects.c:2622
8125 msgid "limit pack window by memory in addition to object limit"
8128 #: builtin/pack-objects.c:2624
8129 msgid "maximum length of delta chain allowed in the resulting pack"
8132 #: builtin/pack-objects.c:2626
8133 msgid "reuse existing deltas"
8136 #: builtin/pack-objects.c:2628
8137 msgid "reuse existing objects"
8140 #: builtin/pack-objects.c:2630
8141 msgid "use OFS_DELTA objects"
8144 #: builtin/pack-objects.c:2632
8145 msgid "use threads when searching for best delta matches"
8148 #: builtin/pack-objects.c:2634
8149 msgid "do not create an empty pack output"
8152 #: builtin/pack-objects.c:2636
8153 msgid "read revision arguments from standard input"
8156 #: builtin/pack-objects.c:2638
8157 msgid "limit the objects to those that are not yet packed"
8160 #: builtin/pack-objects.c:2641
8161 msgid "include objects reachable from any reference"
8164 #: builtin/pack-objects.c:2644
8165 msgid "include objects referred by reflog entries"
8168 #: builtin/pack-objects.c:2647
8169 msgid "include objects referred to by the index"
8172 #: builtin/pack-objects.c:2650
8173 msgid "output pack to stdout"
8176 #: builtin/pack-objects.c:2652
8177 msgid "include tag objects that refer to objects to be packed"
8180 #: builtin/pack-objects.c:2654
8181 msgid "keep unreachable objects"
8184 #: builtin/pack-objects.c:2655 parse-options.h:142
8188 #: builtin/pack-objects.c:2656
8189 msgid "unpack unreachable objects newer than <time>"
8192 #: builtin/pack-objects.c:2659
8193 msgid "create thin packs"
8196 #: builtin/pack-objects.c:2661
8197 msgid "create packs suitable for shallow fetches"
8200 #: builtin/pack-objects.c:2663
8201 msgid "ignore packs that have companion .keep file"
8204 #: builtin/pack-objects.c:2665
8205 msgid "pack compression level"
8208 #: builtin/pack-objects.c:2667
8209 msgid "do not hide commits by grafts"
8212 #: builtin/pack-objects.c:2669
8213 msgid "use a bitmap index if available to speed up counting objects"
8216 #: builtin/pack-objects.c:2671
8217 msgid "write a bitmap index together with the pack index"
8220 #: builtin/pack-objects.c:2762
8221 msgid "Counting objects"
8224 #: builtin/pack-refs.c:6
8225 msgid "git pack-refs [<options>]"
8228 #: builtin/pack-refs.c:14
8229 msgid "pack everything"
8232 #: builtin/pack-refs.c:15
8233 msgid "prune loose refs (default)"
8236 #: builtin/prune-packed.c:7
8237 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8240 #: builtin/prune-packed.c:40
8241 msgid "Removing duplicate objects"
8244 #: builtin/prune.c:11
8245 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
8248 #: builtin/prune.c:105 builtin/worktree.c:124
8249 msgid "do not remove, show only"
8252 #: builtin/prune.c:106 builtin/worktree.c:125
8253 msgid "report pruned objects"
8256 #: builtin/prune.c:109 builtin/worktree.c:127
8257 msgid "expire objects older than <time>"
8260 #: builtin/prune.c:123
8261 msgid "cannot prune in a precious-objects repo"
8264 #: builtin/pull.c:69
8265 msgid "git pull [<options>] [<repository> [<refspec>...]]"
8268 #: builtin/pull.c:113
8269 msgid "Options related to merging"
8272 #: builtin/pull.c:116
8273 msgid "incorporate changes by rebasing rather than merging"
8276 #: builtin/pull.c:140 builtin/revert.c:105
8277 msgid "allow fast-forward"
8280 #: builtin/pull.c:146
8281 msgid "verify that the named commit has a valid GPG signature"
8284 #: builtin/pull.c:160
8285 msgid "Options related to fetching"
8288 #: builtin/pull.c:268
8290 msgid "Invalid value for pull.ff: %s"
8293 #: builtin/pull.c:352
8294 msgid "Cannot pull with rebase: You have unstaged changes."
8297 #: builtin/pull.c:358
8298 msgid "Additionally, your index contains uncommitted changes."
8301 #: builtin/pull.c:360
8302 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
8305 #: builtin/pull.c:436
8307 "There is no candidate for rebasing against among the refs that you just "
8311 #: builtin/pull.c:438
8313 "There are no candidates for merging among the refs that you just fetched."
8316 #: builtin/pull.c:439
8318 "Generally this means that you provided a wildcard refspec which had no\n"
8319 "matches on the remote end."
8322 #: builtin/pull.c:442
8325 "You asked to pull from the remote '%s', but did not specify\n"
8326 "a branch. Because this is not the default configured remote\n"
8327 "for your current branch, you must specify a branch on the command line."
8330 #: builtin/pull.c:447
8331 msgid "You are not currently on a branch."
8334 #: builtin/pull.c:449 builtin/pull.c:464
8335 msgid "Please specify which branch you want to rebase against."
8338 #: builtin/pull.c:451 builtin/pull.c:466
8339 msgid "Please specify which branch you want to merge with."
8342 #: builtin/pull.c:452 builtin/pull.c:467
8343 msgid "See git-pull(1) for details."
8346 #: builtin/pull.c:462
8347 msgid "There is no tracking information for the current branch."
8350 #: builtin/pull.c:471
8353 "If you wish to set tracking information for this branch you can do so with:\n"
8355 " git branch --set-upstream-to=%s/<branch> %s\n"
8358 #: builtin/pull.c:476
8361 "Your configuration specifies to merge with the ref '%s'\n"
8362 "from the remote, but no such ref was fetched."
8365 #: builtin/pull.c:830
8366 msgid "Updating an unborn branch with changes added to the index."
8369 #: builtin/pull.c:859
8372 "fetch updated the current branch head.\n"
8373 "fast-forwarding your working tree from\n"
8377 #: builtin/pull.c:864
8380 "Cannot fast-forward your working tree.\n"
8381 "After making sure that you saved anything precious from\n"
8384 "$ git reset --hard\n"
8388 #: builtin/pull.c:879
8389 msgid "Cannot merge multiple branches into empty head."
8392 #: builtin/pull.c:883
8393 msgid "Cannot rebase onto multiple branches."
8396 #: builtin/push.c:16
8397 msgid "git push [<options>] [<repository> [<refspec>...]]"
8400 #: builtin/push.c:88
8401 msgid "tag shorthand without <tag>"
8404 #: builtin/push.c:98
8405 msgid "--delete only accepts plain target ref names"
8408 #: builtin/push.c:142
8411 "To choose either option permanently, see push.default in 'git help config'."
8414 #: builtin/push.c:145
8417 "The upstream branch of your current branch does not match\n"
8418 "the name of your current branch. To push to the upstream branch\n"
8419 "on the remote, use\n"
8421 " git push %s HEAD:%s\n"
8423 "To push to the branch of the same name on the remote, use\n"
8429 #: builtin/push.c:160
8432 "You are not currently on a branch.\n"
8433 "To push the history leading to the current (detached HEAD)\n"
8436 " git push %s HEAD:<name-of-remote-branch>\n"
8439 #: builtin/push.c:174
8442 "The current branch %s has no upstream branch.\n"
8443 "To push the current branch and set the remote as upstream, use\n"
8445 " git push --set-upstream %s %s\n"
8448 #: builtin/push.c:182
8450 msgid "The current branch %s has multiple upstream branches, refusing to push."
8453 #: builtin/push.c:185
8456 "You are pushing to remote '%s', which is not the upstream of\n"
8457 "your current branch '%s', without telling me what to push\n"
8458 "to update which remote branch."
8461 #: builtin/push.c:208
8463 "push.default is unset; its implicit value has changed in\n"
8464 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
8465 "and maintain the traditional behavior, use:\n"
8467 " git config --global push.default matching\n"
8469 "To squelch this message and adopt the new behavior now, use:\n"
8471 " git config --global push.default simple\n"
8473 "When push.default is set to 'matching', git will push local branches\n"
8474 "to the remote branches that already exist with the same name.\n"
8476 "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
8477 "behavior, which only pushes the current branch to the corresponding\n"
8478 "remote branch that 'git pull' uses to update the current branch.\n"
8480 "See 'git help config' and search for 'push.default' for further "
8482 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8483 "'current' instead of 'simple' if you sometimes use older versions of Git)"
8486 #: builtin/push.c:275
8488 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
8491 #: builtin/push.c:282
8493 "Updates were rejected because the tip of your current branch is behind\n"
8494 "its remote counterpart. Integrate the remote changes (e.g.\n"
8495 "'git pull ...') before pushing again.\n"
8496 "See the 'Note about fast-forwards' in 'git push --help' for details."
8499 #: builtin/push.c:288
8501 "Updates were rejected because a pushed branch tip is behind its remote\n"
8502 "counterpart. Check out this branch and integrate the remote changes\n"
8503 "(e.g. 'git pull ...') before pushing again.\n"
8504 "See the 'Note about fast-forwards' in 'git push --help' for details."
8507 #: builtin/push.c:294
8509 "Updates were rejected because the remote contains work that you do\n"
8510 "not have locally. This is usually caused by another repository pushing\n"
8511 "to the same ref. You may want to first integrate the remote changes\n"
8512 "(e.g., 'git pull ...') before pushing again.\n"
8513 "See the 'Note about fast-forwards' in 'git push --help' for details."
8516 #: builtin/push.c:301
8517 msgid "Updates were rejected because the tag already exists in the remote."
8520 #: builtin/push.c:304
8522 "You cannot update a remote ref that points at a non-commit object,\n"
8523 "or update a remote ref to make it point at a non-commit object,\n"
8524 "without using the '--force' option.\n"
8527 #: builtin/push.c:363
8529 msgid "Pushing to %s\n"
8532 #: builtin/push.c:367
8534 msgid "failed to push some refs to '%s'"
8537 #: builtin/push.c:397
8539 msgid "bad repository '%s'"
8542 #: builtin/push.c:398
8544 "No configured push destination.\n"
8545 "Either specify the URL from the command-line or configure a remote "
8546 "repository using\n"
8548 " git remote add <name> <url>\n"
8550 "and then push using the remote name\n"
8552 " git push <name>\n"
8555 #: builtin/push.c:413
8556 msgid "--all and --tags are incompatible"
8559 #: builtin/push.c:414
8560 msgid "--all can't be combined with refspecs"
8563 #: builtin/push.c:419
8564 msgid "--mirror and --tags are incompatible"
8567 #: builtin/push.c:420
8568 msgid "--mirror can't be combined with refspecs"
8571 #: builtin/push.c:425
8572 msgid "--all and --mirror are incompatible"
8575 #: builtin/push.c:537
8579 #: builtin/push.c:538 builtin/send-pack.c:161
8580 msgid "push all refs"
8583 #: builtin/push.c:539 builtin/send-pack.c:163
8584 msgid "mirror all refs"
8587 #: builtin/push.c:541
8591 #: builtin/push.c:542
8592 msgid "push tags (can't be used with --all or --mirror)"
8595 #: builtin/push.c:545 builtin/send-pack.c:164
8596 msgid "force updates"
8599 #: builtin/push.c:547 builtin/send-pack.c:175
8600 msgid "refname>:<expect"
8603 #: builtin/push.c:548 builtin/send-pack.c:176
8604 msgid "require old value of ref to be at this value"
8607 #: builtin/push.c:550
8608 msgid "check|on-demand|no"
8611 #: builtin/push.c:551
8612 msgid "control recursive pushing of submodules"
8615 #: builtin/push.c:553 builtin/send-pack.c:169
8616 msgid "use thin pack"
8619 #: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158
8620 #: builtin/send-pack.c:159
8621 msgid "receive pack program"
8624 #: builtin/push.c:556
8625 msgid "set upstream for git pull/status"
8628 #: builtin/push.c:559
8629 msgid "prune locally removed refs"
8632 #: builtin/push.c:561
8633 msgid "bypass pre-push hook"
8636 #: builtin/push.c:562
8637 msgid "push missing but relevant tags"
8640 #: builtin/push.c:565 builtin/send-pack.c:166
8641 msgid "GPG sign the push"
8644 #: builtin/push.c:567 builtin/send-pack.c:170
8645 msgid "request atomic transaction on remote side"
8648 #: builtin/push.c:577
8649 msgid "--delete is incompatible with --all, --mirror and --tags"
8652 #: builtin/push.c:579
8653 msgid "--delete doesn't make sense without any refs"
8656 #: builtin/read-tree.c:37
8658 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
8659 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8660 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8663 #: builtin/read-tree.c:110
8664 msgid "write resulting index to <file>"
8667 #: builtin/read-tree.c:113
8668 msgid "only empty the index"
8671 #: builtin/read-tree.c:115
8675 #: builtin/read-tree.c:117
8676 msgid "perform a merge in addition to a read"
8679 #: builtin/read-tree.c:119
8680 msgid "3-way merge if no file level merging required"
8683 #: builtin/read-tree.c:121
8684 msgid "3-way merge in presence of adds and removes"
8687 #: builtin/read-tree.c:123
8688 msgid "same as -m, but discard unmerged entries"
8691 #: builtin/read-tree.c:124
8692 msgid "<subdirectory>/"
8695 #: builtin/read-tree.c:125
8696 msgid "read the tree into the index under <subdirectory>/"
8699 #: builtin/read-tree.c:128
8700 msgid "update working tree with merge result"
8703 #: builtin/read-tree.c:130
8707 #: builtin/read-tree.c:131
8708 msgid "allow explicitly ignored files to be overwritten"
8711 #: builtin/read-tree.c:134
8712 msgid "don't check the working tree after merging"
8715 #: builtin/read-tree.c:135
8716 msgid "don't update the index or the work tree"
8719 #: builtin/read-tree.c:137
8720 msgid "skip applying sparse checkout filter"
8723 #: builtin/read-tree.c:139
8724 msgid "debug unpack-trees"
8727 #: builtin/reflog.c:428
8729 msgid "'%s' for '%s' is not a valid timestamp"
8732 #: builtin/reflog.c:545 builtin/reflog.c:550
8734 msgid "'%s' is not a valid timestamp"
8737 #: builtin/remote.c:12
8738 msgid "git remote [-v | --verbose]"
8741 #: builtin/remote.c:13
8743 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
8744 "mirror=<fetch|push>] <name> <url>"
8747 #: builtin/remote.c:14 builtin/remote.c:34
8748 msgid "git remote rename <old> <new>"
8751 #: builtin/remote.c:15 builtin/remote.c:39
8752 msgid "git remote remove <name>"
8755 #: builtin/remote.c:16 builtin/remote.c:44
8756 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8759 #: builtin/remote.c:17
8760 msgid "git remote [-v | --verbose] show [-n] <name>"
8763 #: builtin/remote.c:18
8764 msgid "git remote prune [-n | --dry-run] <name>"
8767 #: builtin/remote.c:19
8769 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8772 #: builtin/remote.c:20
8773 msgid "git remote set-branches [--add] <name> <branch>..."
8776 #: builtin/remote.c:21 builtin/remote.c:70
8777 msgid "git remote get-url [--push] [--all] <name>"
8780 #: builtin/remote.c:22 builtin/remote.c:75
8781 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
8784 #: builtin/remote.c:23 builtin/remote.c:76
8785 msgid "git remote set-url --add <name> <newurl>"
8788 #: builtin/remote.c:24 builtin/remote.c:77
8789 msgid "git remote set-url --delete <name> <url>"
8792 #: builtin/remote.c:29
8793 msgid "git remote add [<options>] <name> <url>"
8796 #: builtin/remote.c:49
8797 msgid "git remote set-branches <name> <branch>..."
8800 #: builtin/remote.c:50
8801 msgid "git remote set-branches --add <name> <branch>..."
8804 #: builtin/remote.c:55
8805 msgid "git remote show [<options>] <name>"
8808 #: builtin/remote.c:60
8809 msgid "git remote prune [<options>] <name>"
8812 #: builtin/remote.c:65
8813 msgid "git remote update [<options>] [<group> | <remote>]..."
8816 #: builtin/remote.c:94
8821 #: builtin/remote.c:126
8823 "--mirror is dangerous and deprecated; please\n"
8824 "\t use --mirror=fetch or --mirror=push instead"
8827 #: builtin/remote.c:143
8829 msgid "unknown mirror argument: %s"
8832 #: builtin/remote.c:159
8833 msgid "fetch the remote branches"
8836 #: builtin/remote.c:161
8837 msgid "import all tags and associated objects when fetching"
8840 #: builtin/remote.c:164
8841 msgid "or do not fetch any tag at all (--no-tags)"
8844 #: builtin/remote.c:166
8845 msgid "branch(es) to track"
8848 #: builtin/remote.c:167
8849 msgid "master branch"
8852 #: builtin/remote.c:168
8856 #: builtin/remote.c:169
8857 msgid "set up remote as a mirror to push to or fetch from"
8860 #: builtin/remote.c:181
8861 msgid "specifying a master branch makes no sense with --mirror"
8864 #: builtin/remote.c:183
8865 msgid "specifying branches to track makes sense only with fetch mirrors"
8868 #: builtin/remote.c:193 builtin/remote.c:643
8870 msgid "remote %s already exists."
8873 #: builtin/remote.c:197 builtin/remote.c:647
8875 msgid "'%s' is not a valid remote name"
8878 #: builtin/remote.c:241
8880 msgid "Could not setup master '%s'"
8883 #: builtin/remote.c:341
8885 msgid "Could not get fetch map for refspec %s"
8888 #: builtin/remote.c:442 builtin/remote.c:450
8892 #: builtin/remote.c:454
8896 #: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
8898 msgid "Could not append '%s' to '%s'"
8901 #: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
8903 msgid "No such remote: %s"
8906 #: builtin/remote.c:653
8908 msgid "Could not rename config section '%s' to '%s'"
8911 #: builtin/remote.c:659 builtin/remote.c:827
8913 msgid "Could not remove config section '%s'"
8916 #: builtin/remote.c:674
8919 "Not updating non-default fetch refspec\n"
8921 "\tPlease update the configuration manually if necessary."
8924 #: builtin/remote.c:680
8926 msgid "Could not append '%s'"
8929 #: builtin/remote.c:691
8931 msgid "Could not set '%s'"
8934 #: builtin/remote.c:713
8936 msgid "deleting '%s' failed"
8939 #: builtin/remote.c:747
8941 msgid "creating '%s' failed"
8944 #: builtin/remote.c:813
8946 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8947 "to delete it, use:"
8949 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8950 "to delete them, use:"
8954 #: builtin/remote.c:928
8956 msgid " new (next fetch will store in remotes/%s)"
8959 #: builtin/remote.c:931
8963 #: builtin/remote.c:933
8964 msgid " stale (use 'git remote prune' to remove)"
8967 #: builtin/remote.c:935
8971 #: builtin/remote.c:976
8973 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8976 #: builtin/remote.c:983
8978 msgid "rebases onto remote %s"
8981 #: builtin/remote.c:986
8983 msgid " merges with remote %s"
8986 #: builtin/remote.c:987
8987 msgid " and with remote"
8990 #: builtin/remote.c:989
8992 msgid "merges with remote %s"
8995 #: builtin/remote.c:990
8996 msgid " and with remote"
8999 #: builtin/remote.c:1036
9003 #: builtin/remote.c:1039
9007 #: builtin/remote.c:1043
9011 #: builtin/remote.c:1046
9012 msgid "fast-forwardable"
9015 #: builtin/remote.c:1049
9016 msgid "local out of date"
9019 #: builtin/remote.c:1056
9021 msgid " %-*s forces to %-*s (%s)"
9024 #: builtin/remote.c:1059
9026 msgid " %-*s pushes to %-*s (%s)"
9029 #: builtin/remote.c:1063
9031 msgid " %-*s forces to %s"
9034 #: builtin/remote.c:1066
9036 msgid " %-*s pushes to %s"
9039 #: builtin/remote.c:1134
9040 msgid "do not query remotes"
9043 #: builtin/remote.c:1161
9048 #: builtin/remote.c:1162
9050 msgid " Fetch URL: %s"
9053 #: builtin/remote.c:1163 builtin/remote.c:1314
9057 #: builtin/remote.c:1172 builtin/remote.c:1174
9059 msgid " Push URL: %s"
9062 #: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
9064 msgid " HEAD branch: %s"
9067 #: builtin/remote.c:1182
9070 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
9073 #: builtin/remote.c:1194
9075 msgid " Remote branch:%s"
9076 msgid_plural " Remote branches:%s"
9080 #: builtin/remote.c:1197 builtin/remote.c:1224
9081 msgid " (status not queried)"
9084 #: builtin/remote.c:1206
9085 msgid " Local branch configured for 'git pull':"
9086 msgid_plural " Local branches configured for 'git pull':"
9090 #: builtin/remote.c:1214
9091 msgid " Local refs will be mirrored by 'git push'"
9094 #: builtin/remote.c:1221
9096 msgid " Local ref configured for 'git push'%s:"
9097 msgid_plural " Local refs configured for 'git push'%s:"
9101 #: builtin/remote.c:1242
9102 msgid "set refs/remotes/<name>/HEAD according to remote"
9105 #: builtin/remote.c:1244
9106 msgid "delete refs/remotes/<name>/HEAD"
9109 #: builtin/remote.c:1259
9110 msgid "Cannot determine remote HEAD"
9113 #: builtin/remote.c:1261
9114 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
9117 #: builtin/remote.c:1271
9119 msgid "Could not delete %s"
9122 #: builtin/remote.c:1279
9124 msgid "Not a valid ref: %s"
9127 #: builtin/remote.c:1281
9129 msgid "Could not setup %s"
9132 #: builtin/remote.c:1299
9134 msgid " %s will become dangling!"
9137 #: builtin/remote.c:1300
9139 msgid " %s has become dangling!"
9142 #: builtin/remote.c:1310
9147 #: builtin/remote.c:1311
9152 #: builtin/remote.c:1327
9154 msgid " * [would prune] %s"
9157 #: builtin/remote.c:1330
9159 msgid " * [pruned] %s"
9162 #: builtin/remote.c:1375
9163 msgid "prune remotes after fetching"
9166 #: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
9168 msgid "No such remote '%s'"
9171 #: builtin/remote.c:1461
9175 #: builtin/remote.c:1468
9176 msgid "no remote specified"
9179 #: builtin/remote.c:1485
9180 msgid "query push URLs rather than fetch URLs"
9183 #: builtin/remote.c:1487
9184 msgid "return all URLs"
9187 #: builtin/remote.c:1515
9189 msgid "no URLs configured for remote '%s'"
9192 #: builtin/remote.c:1541
9193 msgid "manipulate push URLs"
9196 #: builtin/remote.c:1543
9200 #: builtin/remote.c:1545
9204 #: builtin/remote.c:1552
9205 msgid "--add --delete doesn't make sense"
9208 #: builtin/remote.c:1592
9210 msgid "Invalid old URL pattern: %s"
9213 #: builtin/remote.c:1600
9215 msgid "No such URL found: %s"
9218 #: builtin/remote.c:1602
9219 msgid "Will not delete all non-push URLs"
9222 #: builtin/remote.c:1616
9223 msgid "be verbose; must be placed before a subcommand"
9226 #: builtin/repack.c:17
9227 msgid "git repack [<options>]"
9230 #: builtin/repack.c:159
9231 msgid "pack everything in a single pack"
9234 #: builtin/repack.c:161
9235 msgid "same as -a, and turn unreachable objects loose"
9238 #: builtin/repack.c:164
9239 msgid "remove redundant packs, and run git-prune-packed"
9242 #: builtin/repack.c:166
9243 msgid "pass --no-reuse-delta to git-pack-objects"
9246 #: builtin/repack.c:168
9247 msgid "pass --no-reuse-object to git-pack-objects"
9250 #: builtin/repack.c:170
9251 msgid "do not run git-update-server-info"
9254 #: builtin/repack.c:173
9255 msgid "pass --local to git-pack-objects"
9258 #: builtin/repack.c:175
9259 msgid "write bitmap index"
9262 #: builtin/repack.c:176
9266 #: builtin/repack.c:177
9267 msgid "with -A, do not loosen objects older than this"
9270 #: builtin/repack.c:179
9271 msgid "size of the window used for delta compression"
9274 #: builtin/repack.c:180 builtin/repack.c:184
9278 #: builtin/repack.c:181
9279 msgid "same as the above, but limit memory size instead of entries count"
9282 #: builtin/repack.c:183
9283 msgid "limits the maximum delta depth"
9286 #: builtin/repack.c:185
9287 msgid "maximum size of each packfile"
9290 #: builtin/repack.c:187
9291 msgid "repack objects in packs marked with .keep"
9294 #: builtin/repack.c:197
9295 msgid "cannot delete packs in a precious-objects repo"
9298 #: builtin/repack.c:381
9300 msgid "removing '%s' failed"
9303 #: builtin/replace.c:19
9304 msgid "git replace [-f] <object> <replacement>"
9307 #: builtin/replace.c:20
9308 msgid "git replace [-f] --edit <object>"
9311 #: builtin/replace.c:21
9312 msgid "git replace [-f] --graft <commit> [<parent>...]"
9315 #: builtin/replace.c:22
9316 msgid "git replace -d <object>..."
9319 #: builtin/replace.c:23
9320 msgid "git replace [--format=<format>] [-l [<pattern>]]"
9323 #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
9325 msgid "Not a valid object name: '%s'"
9328 #: builtin/replace.c:355
9330 msgid "bad mergetag in commit '%s'"
9333 #: builtin/replace.c:357
9335 msgid "malformed mergetag in commit '%s'"
9338 #: builtin/replace.c:368
9341 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9342 "instead of --graft"
9345 #: builtin/replace.c:401
9347 msgid "the original commit '%s' has a gpg signature."
9350 #: builtin/replace.c:402
9351 msgid "the signature will be removed in the replacement commit!"
9354 #: builtin/replace.c:408
9356 msgid "could not write replacement commit for: '%s'"
9359 #: builtin/replace.c:432
9360 msgid "list replace refs"
9363 #: builtin/replace.c:433
9364 msgid "delete replace refs"
9367 #: builtin/replace.c:434
9368 msgid "edit existing object"
9371 #: builtin/replace.c:435
9372 msgid "change a commit's parents"
9375 #: builtin/replace.c:436
9376 msgid "replace the ref if it exists"
9379 #: builtin/replace.c:437
9380 msgid "do not pretty-print contents for --edit"
9383 #: builtin/replace.c:438
9384 msgid "use this format"
9387 #: builtin/rerere.c:12
9388 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9391 #: builtin/rerere.c:58
9392 msgid "register clean resolutions in index"
9395 #: builtin/reset.c:26
9397 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
9400 #: builtin/reset.c:27
9401 msgid "git reset [-q] <tree-ish> [--] <paths>..."
9404 #: builtin/reset.c:28
9405 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9408 #: builtin/reset.c:34
9412 #: builtin/reset.c:34
9416 #: builtin/reset.c:34
9420 #: builtin/reset.c:34
9424 #: builtin/reset.c:34
9428 #: builtin/reset.c:74
9429 msgid "You do not have a valid HEAD."
9432 #: builtin/reset.c:76
9433 msgid "Failed to find tree of HEAD."
9436 #: builtin/reset.c:82
9438 msgid "Failed to find tree of %s."
9441 #: builtin/reset.c:100
9443 msgid "HEAD is now at %s"
9446 #: builtin/reset.c:183
9448 msgid "Cannot do a %s reset in the middle of a merge."
9451 #: builtin/reset.c:276
9452 msgid "be quiet, only report errors"
9455 #: builtin/reset.c:278
9456 msgid "reset HEAD and index"
9459 #: builtin/reset.c:279
9460 msgid "reset only HEAD"
9463 #: builtin/reset.c:281 builtin/reset.c:283
9464 msgid "reset HEAD, index and working tree"
9467 #: builtin/reset.c:285
9468 msgid "reset HEAD but keep local changes"
9471 #: builtin/reset.c:288
9472 msgid "record only the fact that removed paths will be added later"
9475 #: builtin/reset.c:305
9477 msgid "Failed to resolve '%s' as a valid revision."
9480 #: builtin/reset.c:313
9482 msgid "Failed to resolve '%s' as a valid tree."
9485 #: builtin/reset.c:322
9486 msgid "--patch is incompatible with --{hard,mixed,soft}"
9489 #: builtin/reset.c:331
9490 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
9493 #: builtin/reset.c:333
9495 msgid "Cannot do %s reset with paths."
9498 #: builtin/reset.c:343
9500 msgid "%s reset is not allowed in a bare repository"
9503 #: builtin/reset.c:347
9504 msgid "-N can only be used with --mixed"
9507 #: builtin/reset.c:364
9508 msgid "Unstaged changes after reset:"
9511 #: builtin/reset.c:370
9513 msgid "Could not reset index file to revision '%s'."
9516 #: builtin/reset.c:374
9517 msgid "Could not write new index file."
9520 #: builtin/rev-list.c:354
9521 msgid "rev-list does not support display of notes"
9524 #: builtin/rev-parse.c:358
9525 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
9528 #: builtin/rev-parse.c:363
9529 msgid "keep the `--` passed as an arg"
9532 #: builtin/rev-parse.c:365
9533 msgid "stop parsing after the first non-option argument"
9536 #: builtin/rev-parse.c:368
9537 msgid "output in stuck long form"
9540 #: builtin/rev-parse.c:499
9542 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
9543 " or: git rev-parse --sq-quote [<arg>...]\n"
9544 " or: git rev-parse [<options>] [<arg>...]\n"
9546 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9549 #: builtin/revert.c:22
9550 msgid "git revert [<options>] <commit-ish>..."
9553 #: builtin/revert.c:23
9554 msgid "git revert <subcommand>"
9557 #: builtin/revert.c:28
9558 msgid "git cherry-pick [<options>] <commit-ish>..."
9561 #: builtin/revert.c:29
9562 msgid "git cherry-pick <subcommand>"
9565 #: builtin/revert.c:71
9567 msgid "%s: %s cannot be used with %s"
9570 #: builtin/revert.c:80
9571 msgid "end revert or cherry-pick sequence"
9574 #: builtin/revert.c:81
9575 msgid "resume revert or cherry-pick sequence"
9578 #: builtin/revert.c:82
9579 msgid "cancel revert or cherry-pick sequence"
9582 #: builtin/revert.c:83
9583 msgid "don't automatically commit"
9586 #: builtin/revert.c:84
9587 msgid "edit the commit message"
9590 #: builtin/revert.c:87
9591 msgid "parent number"
9594 #: builtin/revert.c:89
9595 msgid "merge strategy"
9598 #: builtin/revert.c:90
9602 #: builtin/revert.c:91
9603 msgid "option for merge strategy"
9606 #: builtin/revert.c:104
9607 msgid "append commit name"
9610 #: builtin/revert.c:106
9611 msgid "preserve initially empty commits"
9614 #: builtin/revert.c:107
9615 msgid "allow commits with empty messages"
9618 #: builtin/revert.c:108
9619 msgid "keep redundant, empty commits"
9622 #: builtin/revert.c:112
9623 msgid "program error"
9626 #: builtin/revert.c:197
9627 msgid "revert failed"
9630 #: builtin/revert.c:212
9631 msgid "cherry-pick failed"
9635 msgid "git rm [<options>] [--] <file>..."
9640 "the following submodule (or one of its nested submodules)\n"
9641 "uses a .git directory:"
9643 "the following submodules (or one of their nested submodules)\n"
9644 "use a .git directory:"
9651 "(use 'rm -rf' if you really want to remove it including all of its history)"
9656 "the following file has staged content different from both the\n"
9657 "file and the HEAD:"
9659 "the following files have staged content different from both the\n"
9660 "file and the HEAD:"
9667 "(use -f to force removal)"
9671 msgid "the following file has changes staged in the index:"
9672 msgid_plural "the following files have changes staged in the index:"
9676 #: builtin/rm.c:243 builtin/rm.c:254
9679 "(use --cached to keep the file, or -f to force removal)"
9683 msgid "the following file has local modifications:"
9684 msgid_plural "the following files have local modifications:"
9689 msgid "do not list removed files"
9693 msgid "only remove from the index"
9697 msgid "override the up-to-date check"
9701 msgid "allow recursive removal"
9705 msgid "exit with a zero status even if nothing matched"
9709 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9714 msgid "not removing '%s' recursively without -r"
9719 msgid "git rm: unable to remove %s"
9722 #: builtin/send-pack.c:18
9724 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
9725 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
9727 " --all and explicit <ref> specification are mutually exclusive."
9730 #: builtin/send-pack.c:160
9734 #: builtin/send-pack.c:171
9735 msgid "use stateless RPC protocol"
9738 #: builtin/send-pack.c:172
9739 msgid "read refs from stdin"
9742 #: builtin/send-pack.c:173
9743 msgid "print status from remote helper"
9746 #: builtin/shortlog.c:13
9747 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
9750 #: builtin/shortlog.c:131
9752 msgid "Missing author: %s"
9755 #: builtin/shortlog.c:230
9756 msgid "sort output according to the number of commits per author"
9759 #: builtin/shortlog.c:232
9760 msgid "Suppress commit descriptions, only provides commit count"
9763 #: builtin/shortlog.c:234
9764 msgid "Show the email address of each author"
9767 #: builtin/shortlog.c:235
9771 #: builtin/shortlog.c:236
9772 msgid "Linewrap output"
9775 #: builtin/show-branch.c:10
9777 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9778 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9779 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9780 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9783 #: builtin/show-branch.c:14
9784 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
9787 #: builtin/show-branch.c:640
9788 msgid "show remote-tracking and local branches"
9791 #: builtin/show-branch.c:642
9792 msgid "show remote-tracking branches"
9795 #: builtin/show-branch.c:644
9796 msgid "color '*!+-' corresponding to the branch"
9799 #: builtin/show-branch.c:646
9800 msgid "show <n> more commits after the common ancestor"
9803 #: builtin/show-branch.c:648
9804 msgid "synonym to more=-1"
9807 #: builtin/show-branch.c:649
9808 msgid "suppress naming strings"
9811 #: builtin/show-branch.c:651
9812 msgid "include the current branch"
9815 #: builtin/show-branch.c:653
9816 msgid "name commits with their object names"
9819 #: builtin/show-branch.c:655
9820 msgid "show possible merge bases"
9823 #: builtin/show-branch.c:657
9824 msgid "show refs unreachable from any other ref"
9827 #: builtin/show-branch.c:659
9828 msgid "show commits in topological order"
9831 #: builtin/show-branch.c:662
9832 msgid "show only commits not on the first branch"
9835 #: builtin/show-branch.c:664
9836 msgid "show merges reachable from only one tip"
9839 #: builtin/show-branch.c:666
9840 msgid "topologically sort, maintaining date order where possible"
9843 #: builtin/show-branch.c:669
9844 msgid "<n>[,<base>]"
9847 #: builtin/show-branch.c:670
9848 msgid "show <n> most recent ref-log entries starting at base"
9851 #: builtin/show-ref.c:10
9853 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9854 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
9857 #: builtin/show-ref.c:11
9858 msgid "git show-ref --exclude-existing[=<pattern>]"
9861 #: builtin/show-ref.c:165
9862 msgid "only show tags (can be combined with heads)"
9865 #: builtin/show-ref.c:166
9866 msgid "only show heads (can be combined with tags)"
9869 #: builtin/show-ref.c:167
9870 msgid "stricter reference checking, requires exact ref path"
9873 #: builtin/show-ref.c:170 builtin/show-ref.c:172
9874 msgid "show the HEAD reference, even if it would be filtered out"
9877 #: builtin/show-ref.c:174
9878 msgid "dereference tags into object IDs"
9881 #: builtin/show-ref.c:176
9882 msgid "only show SHA1 hash using <n> digits"
9885 #: builtin/show-ref.c:180
9886 msgid "do not print results to stdout (useful with --verify)"
9889 #: builtin/show-ref.c:182
9890 msgid "show refs from stdin that aren't in local repository"
9893 #: builtin/stripspace.c:17
9894 msgid "git stripspace [-s | --strip-comments]"
9897 #: builtin/stripspace.c:18
9898 msgid "git stripspace [-c | --comment-lines]"
9901 #: builtin/stripspace.c:35
9902 msgid "skip and remove all lines starting with comment character"
9905 #: builtin/stripspace.c:38
9906 msgid "prepend comment character and blank to each line"
9909 #: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
9910 msgid "alternative anchor for relative paths"
9913 #: builtin/submodule--helper.c:84
9914 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
9917 #: builtin/submodule--helper.c:114
9918 msgid "git submodule--helper name <path>"
9921 #: builtin/submodule--helper.c:120
9923 msgid "no submodule mapping found in .gitmodules for path '%s'"
9926 #: builtin/submodule--helper.c:170
9927 msgid "where the new submodule will be cloned to"
9930 #: builtin/submodule--helper.c:173
9931 msgid "name of the new submodule"
9934 #: builtin/submodule--helper.c:176
9935 msgid "url where to clone the submodule from"
9938 #: builtin/submodule--helper.c:182
9939 msgid "depth for shallow clones"
9942 #: builtin/submodule--helper.c:188
9944 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
9945 "<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
9948 #: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
9949 #: builtin/submodule--helper.c:216
9951 msgid "could not create directory '%s'"
9954 #: builtin/submodule--helper.c:204
9956 msgid "clone of '%s' into submodule path '%s' failed"
9959 #: builtin/submodule--helper.c:227
9961 msgid "cannot open file '%s'"
9964 #: builtin/submodule--helper.c:232
9966 msgid "could not close file %s"
9969 #: builtin/submodule--helper.c:247
9971 msgid "could not get submodule directory for '%s'"
9974 #: builtin/submodule--helper.c:273
9975 msgid "fatal: submodule--helper subcommand must be called with a subcommand"
9978 #: builtin/submodule--helper.c:280
9980 msgid "fatal: '%s' is not a valid submodule--helper subcommand"
9983 #: builtin/symbolic-ref.c:7
9984 msgid "git symbolic-ref [<options>] <name> [<ref>]"
9987 #: builtin/symbolic-ref.c:8
9988 msgid "git symbolic-ref -d [-q] <name>"
9991 #: builtin/symbolic-ref.c:40
9992 msgid "suppress error message for non-symbolic (detached) refs"
9995 #: builtin/symbolic-ref.c:41
9996 msgid "delete symbolic ref"
9999 #: builtin/symbolic-ref.c:42
10000 msgid "shorten ref output"
10003 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10007 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10008 msgid "reason of the update"
10011 #: builtin/tag.c:23
10013 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
10017 #: builtin/tag.c:24
10018 msgid "git tag -d <tagname>..."
10021 #: builtin/tag.c:25
10023 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
10024 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
10027 #: builtin/tag.c:27
10028 msgid "git tag -v <tagname>..."
10031 #: builtin/tag.c:80
10033 msgid "tag name too long: %.*s..."
10036 #: builtin/tag.c:85
10038 msgid "tag '%s' not found."
10041 #: builtin/tag.c:100
10043 msgid "Deleted tag '%s' (was %s)\n"
10046 #: builtin/tag.c:112
10048 msgid "could not verify the tag '%s'"
10051 #: builtin/tag.c:122
10055 "Write a message for tag:\n"
10057 "Lines starting with '%c' will be ignored.\n"
10060 #: builtin/tag.c:126
10064 "Write a message for tag:\n"
10066 "Lines starting with '%c' will be kept; you may remove them yourself if you "
10070 #: builtin/tag.c:199
10071 msgid "unable to sign the tag"
10074 #: builtin/tag.c:201
10075 msgid "unable to write tag file"
10078 #: builtin/tag.c:226
10079 msgid "bad object type."
10082 #: builtin/tag.c:239
10083 msgid "tag header too big."
10086 #: builtin/tag.c:275
10087 msgid "no tag message?"
10090 #: builtin/tag.c:281
10092 msgid "The tag message has been left in %s\n"
10095 #: builtin/tag.c:339
10096 msgid "list tag names"
10099 #: builtin/tag.c:341
10100 msgid "print <n> lines of each tag message"
10103 #: builtin/tag.c:343
10104 msgid "delete tags"
10107 #: builtin/tag.c:344
10108 msgid "verify tags"
10111 #: builtin/tag.c:346
10112 msgid "Tag creation options"
10115 #: builtin/tag.c:348
10116 msgid "annotated tag, needs a message"
10119 #: builtin/tag.c:350
10120 msgid "tag message"
10123 #: builtin/tag.c:352
10124 msgid "annotated and GPG-signed tag"
10127 #: builtin/tag.c:356
10128 msgid "use another key to sign the tag"
10131 #: builtin/tag.c:357
10132 msgid "replace the tag if exists"
10135 #: builtin/tag.c:358 builtin/update-ref.c:368
10136 msgid "create a reflog"
10139 #: builtin/tag.c:360
10140 msgid "Tag listing options"
10143 #: builtin/tag.c:361
10144 msgid "show tag list in columns"
10147 #: builtin/tag.c:362 builtin/tag.c:363
10148 msgid "print only tags that contain the commit"
10151 #: builtin/tag.c:364
10152 msgid "print only tags that are merged"
10155 #: builtin/tag.c:365
10156 msgid "print only tags that are not merged"
10159 #: builtin/tag.c:370
10160 msgid "print only tags of the object"
10163 #: builtin/tag.c:399
10164 msgid "--column and -n are incompatible"
10167 #: builtin/tag.c:419
10168 msgid "-n option is only allowed with -l."
10171 #: builtin/tag.c:421
10172 msgid "--contains option is only allowed with -l."
10175 #: builtin/tag.c:423
10176 msgid "--points-at option is only allowed with -l."
10179 #: builtin/tag.c:425
10180 msgid "--merged and --no-merged option are only allowed with -l"
10183 #: builtin/tag.c:433
10184 msgid "only one -F or -m option is allowed."
10187 #: builtin/tag.c:453
10188 msgid "too many params"
10191 #: builtin/tag.c:459
10193 msgid "'%s' is not a valid tag name."
10196 #: builtin/tag.c:464
10198 msgid "tag '%s' already exists"
10201 #: builtin/tag.c:489
10203 msgid "Updated tag '%s' (was %s)\n"
10206 #: builtin/unpack-objects.c:490
10207 msgid "Unpacking objects"
10210 #: builtin/update-index.c:70
10212 msgid "failed to create directory %s"
10215 #: builtin/update-index.c:76
10217 msgid "failed to stat %s"
10220 #: builtin/update-index.c:86
10222 msgid "failed to create file %s"
10225 #: builtin/update-index.c:94
10227 msgid "failed to delete file %s"
10230 #: builtin/update-index.c:101 builtin/update-index.c:203
10232 msgid "failed to delete directory %s"
10235 #: builtin/update-index.c:124
10240 #: builtin/update-index.c:136
10241 msgid "directory stat info does not change after adding a new file"
10244 #: builtin/update-index.c:149
10245 msgid "directory stat info does not change after adding a new directory"
10248 #: builtin/update-index.c:162
10249 msgid "directory stat info changes after updating a file"
10252 #: builtin/update-index.c:173
10253 msgid "directory stat info changes after adding a file inside subdirectory"
10256 #: builtin/update-index.c:184
10257 msgid "directory stat info does not change after deleting a file"
10260 #: builtin/update-index.c:197
10261 msgid "directory stat info does not change after deleting a directory"
10264 #: builtin/update-index.c:204
10268 #: builtin/update-index.c:564
10269 msgid "git update-index [<options>] [--] [<file>...]"
10272 #: builtin/update-index.c:918
10273 msgid "continue refresh even when index needs update"
10276 #: builtin/update-index.c:921
10277 msgid "refresh: ignore submodules"
10280 #: builtin/update-index.c:924
10281 msgid "do not ignore new files"
10284 #: builtin/update-index.c:926
10285 msgid "let files replace directories and vice-versa"
10288 #: builtin/update-index.c:928
10289 msgid "notice files missing from worktree"
10292 #: builtin/update-index.c:930
10293 msgid "refresh even if index contains unmerged entries"
10296 #: builtin/update-index.c:933
10297 msgid "refresh stat information"
10300 #: builtin/update-index.c:937
10301 msgid "like --refresh, but ignore assume-unchanged setting"
10304 #: builtin/update-index.c:941
10305 msgid "<mode>,<object>,<path>"
10308 #: builtin/update-index.c:942
10309 msgid "add the specified entry to the index"
10312 #: builtin/update-index.c:946
10316 #: builtin/update-index.c:947
10317 msgid "override the executable bit of the listed files"
10320 #: builtin/update-index.c:951
10321 msgid "mark files as \"not changing\""
10324 #: builtin/update-index.c:954
10325 msgid "clear assumed-unchanged bit"
10328 #: builtin/update-index.c:957
10329 msgid "mark files as \"index-only\""
10332 #: builtin/update-index.c:960
10333 msgid "clear skip-worktree bit"
10336 #: builtin/update-index.c:963
10337 msgid "add to index only; do not add content to object database"
10340 #: builtin/update-index.c:965
10341 msgid "remove named paths even if present in worktree"
10344 #: builtin/update-index.c:967
10345 msgid "with --stdin: input lines are terminated by null bytes"
10348 #: builtin/update-index.c:969
10349 msgid "read list of paths to be updated from standard input"
10352 #: builtin/update-index.c:973
10353 msgid "add entries from standard input to the index"
10356 #: builtin/update-index.c:977
10357 msgid "repopulate stages #2 and #3 for the listed paths"
10360 #: builtin/update-index.c:981
10361 msgid "only update entries that differ from HEAD"
10364 #: builtin/update-index.c:985
10365 msgid "ignore files missing from worktree"
10368 #: builtin/update-index.c:988
10369 msgid "report actions to standard output"
10372 #: builtin/update-index.c:990
10373 msgid "(for porcelains) forget saved unresolved conflicts"
10376 #: builtin/update-index.c:994
10377 msgid "write index in this format"
10380 #: builtin/update-index.c:996
10381 msgid "enable or disable split index"
10384 #: builtin/update-index.c:998
10385 msgid "enable/disable untracked cache"
10388 #: builtin/update-index.c:1000
10389 msgid "enable untracked cache without testing the filesystem"
10392 #: builtin/update-ref.c:9
10393 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
10396 #: builtin/update-ref.c:10
10397 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
10400 #: builtin/update-ref.c:11
10401 msgid "git update-ref [<options>] --stdin [-z]"
10404 #: builtin/update-ref.c:363
10405 msgid "delete the reference"
10408 #: builtin/update-ref.c:365
10409 msgid "update <refname> not the one it points to"
10412 #: builtin/update-ref.c:366
10413 msgid "stdin has NUL-terminated arguments"
10416 #: builtin/update-ref.c:367
10417 msgid "read updates from stdin"
10420 #: builtin/update-server-info.c:6
10421 msgid "git update-server-info [--force]"
10424 #: builtin/update-server-info.c:14
10425 msgid "update the info files from scratch"
10428 #: builtin/verify-commit.c:17
10429 msgid "git verify-commit [-v | --verbose] <commit>..."
10432 #: builtin/verify-commit.c:72
10433 msgid "print commit contents"
10436 #: builtin/verify-commit.c:73 builtin/verify-tag.c:84
10437 msgid "print raw gpg status output"
10440 #: builtin/verify-pack.c:54
10441 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
10444 #: builtin/verify-pack.c:64
10448 #: builtin/verify-pack.c:66
10449 msgid "show statistics only"
10452 #: builtin/verify-tag.c:17
10453 msgid "git verify-tag [-v | --verbose] <tag>..."
10456 #: builtin/verify-tag.c:83
10457 msgid "print tag contents"
10460 #: builtin/worktree.c:15
10461 msgid "git worktree add [<options>] <path> [<branch>]"
10464 #: builtin/worktree.c:16
10465 msgid "git worktree prune [<options>]"
10468 #: builtin/worktree.c:17
10469 msgid "git worktree list [<options>]"
10472 #: builtin/worktree.c:39
10474 msgid "Removing worktrees/%s: not a valid directory"
10477 #: builtin/worktree.c:45
10479 msgid "Removing worktrees/%s: gitdir file does not exist"
10482 #: builtin/worktree.c:50
10484 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
10487 #: builtin/worktree.c:61
10489 msgid "Removing worktrees/%s: invalid gitdir file"
10492 #: builtin/worktree.c:77
10494 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
10497 #: builtin/worktree.c:112
10499 msgid "failed to remove: %s"
10502 #: builtin/worktree.c:201
10504 msgid "'%s' already exists"
10507 #: builtin/worktree.c:235
10509 msgid "could not create directory of '%s'"
10512 #: builtin/worktree.c:271
10514 msgid "Preparing %s (identifier %s)"
10517 #: builtin/worktree.c:319
10518 msgid "checkout <branch> even if already checked out in other worktree"
10521 #: builtin/worktree.c:321
10522 msgid "create a new branch"
10525 #: builtin/worktree.c:323
10526 msgid "create or reset a branch"
10529 #: builtin/worktree.c:324
10530 msgid "detach HEAD at named commit"
10533 #: builtin/worktree.c:331
10534 msgid "-b, -B, and --detach are mutually exclusive"
10537 #: builtin/write-tree.c:13
10538 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
10541 #: builtin/write-tree.c:26
10545 #: builtin/write-tree.c:27
10546 msgid "write tree object for a subdirectory <prefix>"
10549 #: builtin/write-tree.c:30
10550 msgid "only useful for debugging"
10553 #: credential-cache--daemon.c:255
10554 msgid "print debugging messages to stderr"
10559 "'git help -a' and 'git help -g' list available subcommands and some\n"
10560 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
10561 "to read about a specific subcommand or concept."
10565 msgid "start a working area (see also: git help tutorial)"
10568 #: common-cmds.h:10
10569 msgid "work on the current change (see also: git help everyday)"
10572 #: common-cmds.h:11
10573 msgid "examine the history and state (see also: git help revisions)"
10576 #: common-cmds.h:12
10577 msgid "grow, mark and tweak your common history"
10580 #: common-cmds.h:13
10581 msgid "collaborate (see also: git help workflows)"
10584 #: common-cmds.h:17
10585 msgid "Add file contents to the index"
10588 #: common-cmds.h:18
10589 msgid "Use binary search to find the commit that introduced a bug"
10592 #: common-cmds.h:19
10593 msgid "List, create, or delete branches"
10596 #: common-cmds.h:20
10597 msgid "Switch branches or restore working tree files"
10600 #: common-cmds.h:21
10601 msgid "Clone a repository into a new directory"
10604 #: common-cmds.h:22
10605 msgid "Record changes to the repository"
10608 #: common-cmds.h:23
10609 msgid "Show changes between commits, commit and working tree, etc"
10612 #: common-cmds.h:24
10613 msgid "Download objects and refs from another repository"
10616 #: common-cmds.h:25
10617 msgid "Print lines matching a pattern"
10620 #: common-cmds.h:26
10621 msgid "Create an empty Git repository or reinitialize an existing one"
10624 #: common-cmds.h:27
10625 msgid "Show commit logs"
10628 #: common-cmds.h:28
10629 msgid "Join two or more development histories together"
10632 #: common-cmds.h:29
10633 msgid "Move or rename a file, a directory, or a symlink"
10636 #: common-cmds.h:30
10637 msgid "Fetch from and integrate with another repository or a local branch"
10640 #: common-cmds.h:31
10641 msgid "Update remote refs along with associated objects"
10644 #: common-cmds.h:32
10645 msgid "Forward-port local commits to the updated upstream head"
10648 #: common-cmds.h:33
10649 msgid "Reset current HEAD to the specified state"
10652 #: common-cmds.h:34
10653 msgid "Remove files from the working tree and from the index"
10656 #: common-cmds.h:35
10657 msgid "Show various types of objects"
10660 #: common-cmds.h:36
10661 msgid "Show the working tree status"
10664 #: common-cmds.h:37
10665 msgid "Create, list, delete or verify a tag object signed with GPG"
10668 #: parse-options.h:145
10669 msgid "expiry-date"
10672 #: parse-options.h:160
10673 msgid "no-op (backward compatibility)"
10676 #: parse-options.h:237
10677 msgid "be more verbose"
10680 #: parse-options.h:239
10681 msgid "be more quiet"
10684 #: parse-options.h:245
10685 msgid "use <n> digits to display SHA-1s"
10689 msgid "update the index with reused conflict resolution if possible"
10692 #: git-bisect.sh:55
10693 msgid "You need to start by \"git bisect start\""
10696 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10697 #. translation. The program will only accept English input
10699 #: git-bisect.sh:61
10700 msgid "Do you want me to do it for you [Y/n]? "
10703 #: git-bisect.sh:122
10705 msgid "unrecognised option: '$arg'"
10708 #: git-bisect.sh:126
10710 msgid "'$arg' does not appear to be a valid revision"
10713 #: git-bisect.sh:155
10714 msgid "Bad HEAD - I need a HEAD"
10717 #: git-bisect.sh:168
10720 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
10723 #: git-bisect.sh:178
10724 msgid "won't bisect on cg-seek'ed tree"
10727 #: git-bisect.sh:182
10728 msgid "Bad HEAD - strange symbolic ref"
10731 #: git-bisect.sh:234
10733 msgid "Bad bisect_write argument: $state"
10736 #: git-bisect.sh:263
10738 msgid "Bad rev input: $arg"
10741 #: git-bisect.sh:278
10742 msgid "Please call 'bisect_state' with at least one argument."
10745 #: git-bisect.sh:290
10747 msgid "Bad rev input: $rev"
10750 #: git-bisect.sh:299
10752 msgid "'git bisect $TERM_BAD' can take only one argument."
10755 #: git-bisect.sh:322
10757 msgid "Warning: bisecting only with a $TERM_BAD commit."
10760 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10761 #. translation. The program will only accept English input
10763 #: git-bisect.sh:328
10764 msgid "Are you sure [Y/n]? "
10767 #: git-bisect.sh:340
10770 "You need to give me at least one $bad_syn and one $good_syn revision.\n"
10771 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
10774 #: git-bisect.sh:343
10777 "You need to start by \"git bisect start\".\n"
10778 "You then need to give me at least one $good_syn and one $bad_syn revision.\n"
10779 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
10782 #: git-bisect.sh:414 git-bisect.sh:546
10783 msgid "We are not bisecting."
10786 #: git-bisect.sh:421
10788 msgid "'$invalid' is not a valid commit"
10791 #: git-bisect.sh:430
10794 "Could not check out original HEAD '$branch'.\n"
10795 "Try 'git bisect reset <commit>'."
10798 #: git-bisect.sh:458
10799 msgid "No logfile given"
10802 #: git-bisect.sh:459
10804 msgid "cannot read $file for replaying"
10807 #: git-bisect.sh:480
10808 msgid "?? what are you talking about?"
10811 #: git-bisect.sh:492
10813 msgid "running $command"
10816 #: git-bisect.sh:499
10819 "bisect run failed:\n"
10820 "exit code $res from '$command' is < 0 or >= 128"
10823 #: git-bisect.sh:525
10824 msgid "bisect run cannot continue any more"
10827 #: git-bisect.sh:531
10830 "bisect run failed:\n"
10831 "'bisect_state $state' exited with error code $res"
10834 #: git-bisect.sh:538
10835 msgid "bisect run success"
10838 #: git-bisect.sh:565
10839 msgid "please use two different terms"
10842 #: git-bisect.sh:575
10844 msgid "'$term' is not a valid term"
10847 #: git-bisect.sh:578
10849 msgid "can't use the builtin command '$term' as a term"
10852 #: git-bisect.sh:587 git-bisect.sh:593
10854 msgid "can't change the meaning of term '$term'"
10857 #: git-bisect.sh:606
10859 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
10862 #: git-bisect.sh:636
10863 msgid "no terms defined"
10866 #: git-bisect.sh:653
10869 "invalid argument $arg for 'git bisect terms'.\n"
10870 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
10873 #: git-rebase.sh:57
10875 "When you have resolved this problem, run \"git rebase --continue\".\n"
10876 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10877 "To check out the original branch and stop rebasing, run \"git rebase --abort"
10881 #: git-rebase.sh:165
10882 msgid "Applied autostash."
10885 #: git-rebase.sh:168
10887 msgid "Cannot store $stash_sha1"
10890 #: git-rebase.sh:169
10892 "Applying autostash resulted in conflicts.\n"
10893 "Your changes are safe in the stash.\n"
10894 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
10897 #: git-rebase.sh:208
10898 msgid "The pre-rebase hook refused to rebase."
10901 #: git-rebase.sh:213
10902 msgid "It looks like git-am is in progress. Cannot rebase."
10905 #: git-rebase.sh:354
10906 msgid "The --exec option must be used with the --interactive option"
10909 #: git-rebase.sh:359
10910 msgid "No rebase in progress?"
10913 #: git-rebase.sh:370
10914 msgid "The --edit-todo action can only be used during interactive rebase."
10917 #: git-rebase.sh:377
10918 msgid "Cannot read HEAD"
10921 #: git-rebase.sh:380
10923 "You must edit all merge conflicts and then\n"
10924 "mark them as resolved using git add"
10927 #: git-rebase.sh:398
10929 msgid "Could not move back to $head_name"
10932 #: git-rebase.sh:417
10935 "It seems that there is already a $state_dir_base directory, and\n"
10936 "I wonder if you are in the middle of another rebase. If that is the\n"
10937 "case, please try\n"
10938 "\t$cmd_live_rebase\n"
10939 "If that is not the case, please\n"
10940 "\t$cmd_clear_stale_rebase\n"
10941 "and run me again. I am stopping in case you still have something\n"
10945 #: git-rebase.sh:468
10947 msgid "invalid upstream $upstream_name"
10950 #: git-rebase.sh:492
10952 msgid "$onto_name: there are more than one merge bases"
10955 #: git-rebase.sh:495 git-rebase.sh:499
10957 msgid "$onto_name: there is no merge base"
10960 #: git-rebase.sh:504
10962 msgid "Does not point to a valid commit: $onto_name"
10965 #: git-rebase.sh:527
10967 msgid "fatal: no such branch: $branch_name"
10970 #: git-rebase.sh:560
10971 msgid "Cannot autostash"
10974 #: git-rebase.sh:565
10976 msgid "Created autostash: $stash_abbrev"
10979 #: git-rebase.sh:569
10980 msgid "Please commit or stash them."
10983 #: git-rebase.sh:589
10985 msgid "Current branch $branch_name is up to date."
10988 #: git-rebase.sh:593
10990 msgid "Current branch $branch_name is up to date, rebase forced."
10993 #: git-rebase.sh:604
10995 msgid "Changes from $mb to $onto:"
10998 #: git-rebase.sh:613
10999 msgid "First, rewinding head to replay your work on top of it..."
11002 #: git-rebase.sh:623
11004 msgid "Fast-forwarded $branch_name to $onto_name."
11008 msgid "git stash clear with parameters is unimplemented"
11012 msgid "You do not have the initial commit yet"
11016 msgid "Cannot save the current index state"
11019 #: git-stash.sh:124 git-stash.sh:137
11020 msgid "Cannot save the current worktree state"
11023 #: git-stash.sh:141
11024 msgid "No changes selected"
11027 #: git-stash.sh:144
11028 msgid "Cannot remove temporary index (can't happen)"
11031 #: git-stash.sh:157
11032 msgid "Cannot record working tree state"
11035 #: git-stash.sh:189
11037 msgid "Cannot update $ref_stash with $w_commit"
11040 #. TRANSLATORS: $option is an invalid option, like
11041 #. `--blah-blah'. The 7 spaces at the beginning of the
11042 #. second line correspond to "error: ". So you should line
11043 #. up the second line with however many characters the
11044 #. translation of "error: " takes in your language. E.g. in
11045 #. English this is:
11047 #. $ git stash save --blah-blah 2>&1 | head -n 2
11048 #. error: unknown option for 'stash save': --blah-blah
11049 #. To provide a message, use git stash save -- '--blah-blah'
11050 #: git-stash.sh:239
11053 "error: unknown option for 'stash save': $option\n"
11054 " To provide a message, use git stash save -- '$option'"
11057 #: git-stash.sh:260
11058 msgid "No local changes to save"
11061 #: git-stash.sh:264
11062 msgid "Cannot initialize stash"
11065 #: git-stash.sh:268
11066 msgid "Cannot save the current status"
11069 #: git-stash.sh:286
11070 msgid "Cannot remove worktree changes"
11073 #: git-stash.sh:405
11075 msgid "unknown option: $opt"
11078 #: git-stash.sh:415
11079 msgid "No stash found."
11082 #: git-stash.sh:422
11084 msgid "Too many revisions specified: $REV"
11087 #: git-stash.sh:428
11089 msgid "$reference is not a valid reference"
11092 #: git-stash.sh:456
11094 msgid "'$args' is not a stash-like commit"
11097 #: git-stash.sh:467
11099 msgid "'$args' is not a stash reference"
11102 #: git-stash.sh:475
11103 msgid "unable to refresh index"
11106 #: git-stash.sh:479
11107 msgid "Cannot apply a stash in the middle of a merge"
11110 #: git-stash.sh:487
11111 msgid "Conflicts in index. Try without --index."
11114 #: git-stash.sh:489
11115 msgid "Could not save index tree"
11118 #: git-stash.sh:523
11119 msgid "Cannot unstage modified files"
11122 #: git-stash.sh:538
11123 msgid "Index was not unstashed."
11126 #: git-stash.sh:561
11128 msgid "Dropped ${REV} ($s)"
11131 #: git-stash.sh:562
11133 msgid "${REV}: Could not drop stash entry"
11136 #: git-stash.sh:570
11137 msgid "No branch name specified"
11140 #: git-stash.sh:642
11141 msgid "(To restore them type \"git stash apply\")"
11144 #: git-submodule.sh:104
11146 msgid "cannot strip one component off url '$remoteurl'"
11149 #: git-submodule.sh:281
11150 msgid "Relative path can only be used from the toplevel of the working tree"
11153 #: git-submodule.sh:291
11155 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
11158 #: git-submodule.sh:308
11160 msgid "'$sm_path' already exists in the index"
11163 #: git-submodule.sh:312
11166 "The following path is ignored by one of your .gitignore files:\n"
11168 "Use -f if you really want to add it."
11171 #: git-submodule.sh:330
11173 msgid "Adding existing repo at '$sm_path' to the index"
11176 #: git-submodule.sh:332
11178 msgid "'$sm_path' already exists and is not a valid git repo"
11181 #: git-submodule.sh:340
11183 msgid "A git directory for '$sm_name' is found locally with remote(s):"
11186 #: git-submodule.sh:342
11189 "If you want to reuse this local git directory instead of cloning again from"
11192 #: git-submodule.sh:344
11195 "use the '--force' option. If the local git directory is not the correct repo"
11198 #: git-submodule.sh:345
11201 "or you are unsure what this means choose another name with the '--name' "
11205 #: git-submodule.sh:347
11207 msgid "Reactivating local git directory for submodule '$sm_name'."
11210 #: git-submodule.sh:359
11212 msgid "Unable to checkout submodule '$sm_path'"
11215 #: git-submodule.sh:364
11217 msgid "Failed to add submodule '$sm_path'"
11220 #: git-submodule.sh:373
11222 msgid "Failed to register submodule '$sm_path'"
11225 #: git-submodule.sh:417
11227 msgid "Entering '$prefix$displaypath'"
11230 #: git-submodule.sh:437
11232 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11235 #: git-submodule.sh:483
11237 msgid "No url found for submodule path '$displaypath' in .gitmodules"
11240 #: git-submodule.sh:492
11242 msgid "Failed to register url for submodule path '$displaypath'"
11245 #: git-submodule.sh:494
11247 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11250 #: git-submodule.sh:511
11252 msgid "Failed to register update mode for submodule path '$displaypath'"
11255 #: git-submodule.sh:549
11257 msgid "Use '.' if you really want to deinitialize all submodules"
11260 #: git-submodule.sh:566
11262 msgid "Submodule work tree '$displaypath' contains a .git directory"
11265 #: git-submodule.sh:567
11268 "(use 'rm -rf' if you really want to remove it including all of its history)"
11271 #: git-submodule.sh:573
11274 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
11278 #: git-submodule.sh:576
11280 msgid "Cleared directory '$displaypath'"
11283 #: git-submodule.sh:577
11285 msgid "Could not remove submodule work tree '$displaypath'"
11288 #: git-submodule.sh:580
11290 msgid "Could not create empty submodule directory '$displaypath'"
11293 #: git-submodule.sh:589
11295 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11298 #: git-submodule.sh:705
11301 "Submodule path '$displaypath' not initialized\n"
11302 "Maybe you want to use 'update --init'?"
11305 #: git-submodule.sh:718
11307 msgid "Unable to find current revision in submodule path '$displaypath'"
11310 #: git-submodule.sh:727
11312 msgid "Unable to fetch in submodule path '$sm_path'"
11315 #: git-submodule.sh:751
11317 msgid "Unable to fetch in submodule path '$displaypath'"
11320 #: git-submodule.sh:765
11322 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11325 #: git-submodule.sh:766
11327 msgid "Submodule path '$displaypath': checked out '$sha1'"
11330 #: git-submodule.sh:770
11332 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
11335 #: git-submodule.sh:771
11337 msgid "Submodule path '$displaypath': rebased into '$sha1'"
11340 #: git-submodule.sh:776
11342 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
11345 #: git-submodule.sh:777
11347 msgid "Submodule path '$displaypath': merged in '$sha1'"
11350 #: git-submodule.sh:782
11353 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
11356 #: git-submodule.sh:783
11358 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
11361 #: git-submodule.sh:813
11363 msgid "Failed to recurse into submodule path '$displaypath'"
11366 #: git-submodule.sh:921
11367 msgid "The --cached option cannot be used with the --files option"
11370 #: git-submodule.sh:973
11372 msgid "unexpected mode $mod_dst"
11375 #: git-submodule.sh:993
11377 msgid " Warn: $display_name doesn't contain commit $sha1_src"
11380 #: git-submodule.sh:996
11382 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
11385 #: git-submodule.sh:999
11387 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11390 #: git-submodule.sh:1024
11394 #: git-submodule.sh:1142
11396 msgid "Failed to recurse into submodule path '$sm_path'"
11399 #: git-submodule.sh:1206
11401 msgid "Synchronizing submodule url for '$displaypath'"