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-11 23:36+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:1228
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:1456 builtin/log.c:1689 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:1366 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'"
1619 msgid "unable to look up current user in the passwd file: %s"
1623 msgid "no such user"
1627 msgid "unable to get current working directory"
1632 msgid "could not open %s for writing"
1635 #: wrapper.c:658 builtin/am.c:425
1637 msgid "could not write to %s"
1642 msgid "could not close %s"
1646 msgid "Unmerged paths:"
1649 #: wt-status.c:176 wt-status.c:203
1651 msgid " (use \"git reset %s <file>...\" to unstage)"
1654 #: wt-status.c:178 wt-status.c:205
1655 msgid " (use \"git rm --cached <file>...\" to unstage)"
1659 msgid " (use \"git add <file>...\" to mark resolution)"
1662 #: wt-status.c:184 wt-status.c:188
1663 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1667 msgid " (use \"git rm <file>...\" to mark resolution)"
1670 #: wt-status.c:197 wt-status.c:880
1671 msgid "Changes to be committed:"
1674 #: wt-status.c:215 wt-status.c:889
1675 msgid "Changes not staged for commit:"
1679 msgid " (use \"git add <file>...\" to update what will be committed)"
1683 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1688 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1692 msgid " (commit or discard the untracked or modified content in submodules)"
1697 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1701 msgid "both deleted:"
1705 msgid "added by us:"
1709 msgid "deleted by them:"
1713 msgid "added by them:"
1717 msgid "deleted by us:"
1725 msgid "both modified:"
1730 msgid "bug: unhandled unmerged status %x"
1766 msgid "new commits, "
1770 msgid "modified content, "
1774 msgid "untracked content, "
1779 msgid "bug: unhandled diff status %c"
1783 msgid "Submodules changed but not updated:"
1787 msgid "Submodule changes to be committed:"
1792 "Do not touch the line above.\n"
1793 "Everything below will be removed."
1797 msgid "You have unmerged paths."
1801 msgid " (fix conflicts and run \"git commit\")"
1805 msgid "All conflicts fixed but you are still merging."
1809 msgid " (use \"git commit\" to conclude merge)"
1813 msgid "You are in the middle of an am session."
1817 msgid "The current patch is empty."
1821 msgid " (fix conflicts and then run \"git am --continue\")"
1825 msgid " (use \"git am --skip\" to skip this patch)"
1829 msgid " (use \"git am --abort\" to restore the original branch)"
1833 msgid "No commands done."
1838 msgid "Last command done (%d command done):"
1839 msgid_plural "Last commands done (%d commands done):"
1845 msgid " (see more in file %s)"
1849 msgid "No commands remaining."
1854 msgid "Next command to do (%d remaining command):"
1855 msgid_plural "Next commands to do (%d remaining commands):"
1860 msgid " (use \"git rebase --edit-todo\" to view and edit)"
1865 msgid "You are currently rebasing branch '%s' on '%s'."
1869 msgid "You are currently rebasing."
1873 msgid " (fix conflicts and then run \"git rebase --continue\")"
1877 msgid " (use \"git rebase --skip\" to skip this patch)"
1881 msgid " (use \"git rebase --abort\" to check out the original branch)"
1885 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1891 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1895 msgid "You are currently splitting a commit during a rebase."
1899 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1904 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1908 msgid "You are currently editing a commit during a rebase."
1912 msgid " (use \"git commit --amend\" to amend the current commit)"
1917 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1922 msgid "You are currently cherry-picking commit %s."
1926 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1930 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1934 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1939 msgid "You are currently reverting commit %s."
1943 msgid " (fix conflicts and run \"git revert --continue\")"
1947 msgid " (all conflicts fixed: run \"git revert --continue\")"
1951 msgid " (use \"git revert --abort\" to cancel the revert operation)"
1956 msgid "You are currently bisecting, started from branch '%s'."
1960 msgid "You are currently bisecting."
1964 msgid " (use \"git bisect reset\" to get back to the original branch)"
1972 msgid "interactive rebase in progress; onto "
1976 msgid "rebase in progress; onto "
1980 msgid "HEAD detached at "
1984 msgid "HEAD detached from "
1988 msgid "Not currently on any branch."
1992 msgid "Initial commit"
1996 msgid "Untracked files"
2000 msgid "Ignored files"
2006 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2007 "may speed it up, but you have to be careful not to forget to add\n"
2008 "new files yourself (see 'git help status')."
2013 msgid "Untracked files not listed%s"
2017 msgid " (use -u option to show untracked files)"
2026 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
2031 msgid "no changes added to commit\n"
2037 "nothing added to commit but untracked files present (use \"git add\" to "
2043 msgid "nothing added to commit but untracked files present\n"
2048 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
2051 #: wt-status.c:1528 wt-status.c:1533
2053 msgid "nothing to commit\n"
2058 msgid "nothing to commit (use -u to show untracked files)\n"
2063 msgid "nothing to commit, working directory clean\n"
2067 msgid "Initial commit on "
2071 msgid "HEAD (no branch)"
2078 #: wt-status.c:1677 wt-status.c:1685
2082 #: compat/precompose_utf8.c:56 builtin/clone.c:408
2084 msgid "failed to unlink '%s'"
2088 msgid "git add [<options>] [--] <pathspec>..."
2093 msgid "unexpected diff status %c"
2096 #: builtin/add.c:70 builtin/commit.c:278
2097 msgid "updating files failed"
2102 msgid "remove '%s'\n"
2105 #: builtin/add.c:134
2106 msgid "Unstaged changes after refreshing the index:"
2109 #: builtin/add.c:194 builtin/rev-parse.c:796
2110 msgid "Could not read the index"
2113 #: builtin/add.c:205
2115 msgid "Could not open '%s' for writing."
2118 #: builtin/add.c:209
2119 msgid "Could not write patch"
2122 #: builtin/add.c:212
2123 msgid "editing patch failed"
2126 #: builtin/add.c:215
2128 msgid "Could not stat '%s'"
2131 #: builtin/add.c:217
2132 msgid "Empty patch. Aborted."
2135 #: builtin/add.c:222
2137 msgid "Could not apply '%s'"
2140 #: builtin/add.c:232
2141 msgid "The following paths are ignored by one of your .gitignore files:\n"
2144 #: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
2145 #: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
2146 #: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
2150 #: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
2151 #: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
2152 #: builtin/log.c:1640 builtin/mv.c:109 builtin/read-tree.c:114
2156 #: builtin/add.c:252
2157 msgid "interactive picking"
2160 #: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
2161 msgid "select hunks interactively"
2164 #: builtin/add.c:254
2165 msgid "edit current diff and apply"
2168 #: builtin/add.c:255
2169 msgid "allow adding otherwise ignored files"
2172 #: builtin/add.c:256
2173 msgid "update tracked files"
2176 #: builtin/add.c:257
2177 msgid "record only the fact that the path will be added later"
2180 #: builtin/add.c:258
2181 msgid "add changes from all tracked and untracked files"
2184 #: builtin/add.c:261
2185 msgid "ignore paths removed in the working tree (same as --no-all)"
2188 #: builtin/add.c:263
2189 msgid "don't add, only refresh the index"
2192 #: builtin/add.c:264
2193 msgid "just skip files which cannot be added because of errors"
2196 #: builtin/add.c:265
2197 msgid "check if - even missing - files are ignored in dry run"
2200 #: builtin/add.c:287
2202 msgid "Use -f if you really want to add them.\n"
2205 #: builtin/add.c:294
2206 msgid "adding files failed"
2209 #: builtin/add.c:330
2210 msgid "-A and -u are mutually incompatible"
2213 #: builtin/add.c:337
2214 msgid "Option --ignore-missing can only be used together with --dry-run"
2217 #: builtin/add.c:352
2219 msgid "Nothing specified, nothing added.\n"
2222 #: builtin/add.c:353
2224 msgid "Maybe you wanted to say 'git add .'?\n"
2227 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
2228 #: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
2229 #: builtin/submodule--helper.c:40
2230 msgid "index file corrupt"
2233 #: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
2234 msgid "Unable to write new index file"
2239 msgid "could not stat %s"
2242 #: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
2244 msgid "could not read '%s'"
2248 msgid "could not parse author script"
2253 msgid "'%s' was deleted by the applypatch-msg hook"
2256 #: builtin/am.c:563 builtin/notes.c:300
2258 msgid "Malformed input line: '%s'."
2261 #: builtin/am.c:600 builtin/notes.c:315
2263 msgid "Failed to copy notes from '%s' to '%s'"
2267 msgid "fseek failed"
2270 #: builtin/am.c:787 builtin/am.c:875
2272 msgid "could not open '%s' for reading: %s"
2277 msgid "could not open '%s' for writing: %s"
2282 msgid "could not parse patch '%s'"
2286 msgid "Only one StGIT patch series can be applied at once"
2290 msgid "invalid timestamp"
2293 #: builtin/am.c:919 builtin/am.c:927
2294 msgid "invalid Date line"
2298 msgid "invalid timezone offset"
2301 #: builtin/am.c:1011
2302 msgid "Patch format detection failed."
2305 #: builtin/am.c:1016 builtin/clone.c:373
2307 msgid "failed to create directory '%s'"
2310 #: builtin/am.c:1020
2311 msgid "Failed to split patches."
2314 #: builtin/am.c:1152 builtin/commit.c:363
2315 msgid "unable to write index file"
2318 #: builtin/am.c:1203
2320 msgid "When you have resolved this problem, run \"%s --continue\"."
2323 #: builtin/am.c:1204
2325 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2328 #: builtin/am.c:1205
2330 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
2333 #: builtin/am.c:1343
2334 msgid "Patch is empty. Was it split wrong?"
2337 #: builtin/am.c:1417 builtin/log.c:1344
2339 msgid "invalid ident line: %s"
2342 #: builtin/am.c:1444
2344 msgid "unable to parse commit %s"
2347 #: builtin/am.c:1646
2348 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
2351 #: builtin/am.c:1648
2352 msgid "Using index info to reconstruct a base tree..."
2355 #: builtin/am.c:1667
2357 "Did you hand edit your patch?\n"
2358 "It does not apply to blobs recorded in its index."
2361 #: builtin/am.c:1673
2362 msgid "Falling back to patching base and 3-way merge..."
2365 #: builtin/am.c:1688
2366 msgid "Failed to merge in the changes."
2369 #: builtin/am.c:1712 builtin/merge.c:632
2370 msgid "git write-tree failed to write a tree"
2373 #: builtin/am.c:1719
2374 msgid "applying to an empty history"
2377 #: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
2378 #: builtin/merge.c:854
2379 msgid "failed to write commit object"
2382 #: builtin/am.c:1764 builtin/am.c:1768
2384 msgid "cannot resume: %s does not exist."
2387 #: builtin/am.c:1784
2388 msgid "cannot be interactive without stdin connected to a terminal."
2391 #: builtin/am.c:1789
2392 msgid "Commit Body is:"
2395 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
2396 #. in your translation. The program will only accept English
2397 #. input at this point.
2399 #: builtin/am.c:1799
2400 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
2403 #: builtin/am.c:1849
2405 msgid "Dirty index: cannot apply patches (dirty: %s)"
2408 #: builtin/am.c:1884 builtin/am.c:1955
2410 msgid "Applying: %.*s"
2413 #: builtin/am.c:1900
2414 msgid "No changes -- Patch already applied."
2417 #: builtin/am.c:1908
2419 msgid "Patch failed at %s %.*s"
2422 #: builtin/am.c:1914
2424 msgid "The copy of the patch that failed is found in: %s"
2427 #: builtin/am.c:1958
2429 "No changes - did you forget to use 'git add'?\n"
2430 "If there is nothing left to stage, chances are that something else\n"
2431 "already introduced the same changes; you might want to skip this patch."
2434 #: builtin/am.c:1965
2436 "You still have unmerged paths in your index.\n"
2437 "Did you forget to use 'git add'?"
2440 #: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
2441 #: builtin/reset.c:316
2443 msgid "Could not parse object '%s'."
2446 #: builtin/am.c:2125
2447 msgid "failed to clean index"
2450 #: builtin/am.c:2159
2452 "You seem to have moved HEAD since the last 'am' failure.\n"
2453 "Not rewinding to ORIG_HEAD"
2456 #: builtin/am.c:2220
2458 msgid "Invalid value for --patch-format: %s"
2461 #: builtin/am.c:2253
2462 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
2465 #: builtin/am.c:2254
2466 msgid "git am [<options>] (--continue | --skip | --abort)"
2469 #: builtin/am.c:2260
2470 msgid "run interactively"
2473 #: builtin/am.c:2262
2474 msgid "historical option -- no-op"
2477 #: builtin/am.c:2264
2478 msgid "allow fall back on 3way merging if needed"
2481 #: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
2482 #: builtin/repack.c:171
2486 #: builtin/am.c:2267
2487 msgid "add a Signed-off-by line to the commit message"
2490 #: builtin/am.c:2270
2491 msgid "recode into utf8 (default)"
2494 #: builtin/am.c:2272
2495 msgid "pass -k flag to git-mailinfo"
2498 #: builtin/am.c:2274
2499 msgid "pass -b flag to git-mailinfo"
2502 #: builtin/am.c:2276
2503 msgid "pass -m flag to git-mailinfo"
2506 #: builtin/am.c:2278
2507 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
2510 #: builtin/am.c:2281
2511 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
2514 #: builtin/am.c:2284
2515 msgid "strip everything before a scissors line"
2518 #: builtin/am.c:2285 builtin/apply.c:4554
2522 #: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
2523 #: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
2524 #: builtin/am.c:2313
2525 msgid "pass it through git-apply"
2528 #: builtin/am.c:2294 builtin/apply.c:4578
2532 #: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
2533 #: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
2534 #: builtin/pull.c:167 builtin/submodule--helper.c:78
2535 #: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
2539 #: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
2540 #: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
2541 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
2542 #: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
2543 #: parse-options.h:134 parse-options.h:244
2547 #: builtin/am.c:2306 builtin/apply.c:4522
2551 #: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
2552 #: builtin/tag.c:372
2556 #: builtin/am.c:2310
2557 msgid "format the patch(es) are in"
2560 #: builtin/am.c:2316
2561 msgid "override error message when patch failure occurs"
2564 #: builtin/am.c:2318
2565 msgid "continue applying patches after resolving a conflict"
2568 #: builtin/am.c:2321
2569 msgid "synonyms for --continue"
2572 #: builtin/am.c:2324
2573 msgid "skip the current patch"
2576 #: builtin/am.c:2327
2577 msgid "restore the original branch and abort the patching operation."
2580 #: builtin/am.c:2331
2581 msgid "lie about committer date"
2584 #: builtin/am.c:2333
2585 msgid "use current timestamp for author date"
2588 #: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
2589 #: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
2593 #: builtin/am.c:2336
2594 msgid "GPG-sign commits"
2597 #: builtin/am.c:2339
2598 msgid "(internal use for git-rebase)"
2601 #: builtin/am.c:2354
2603 "The -b/--binary option has been a no-op for long time, and\n"
2604 "it will be removed. Please do not use it anymore."
2607 #: builtin/am.c:2361
2608 msgid "failed to read the index"
2611 #: builtin/am.c:2376
2613 msgid "previous rebase directory %s still exists but mbox given."
2616 #: builtin/am.c:2400
2619 "Stray %s directory found.\n"
2620 "Use \"git am --abort\" to remove it."
2623 #: builtin/am.c:2406
2624 msgid "Resolve operation not in progress, we are not resuming."
2627 #: builtin/apply.c:59
2628 msgid "git apply [<options>] [<patch>...]"
2631 #: builtin/apply.c:111
2633 msgid "unrecognized whitespace option '%s'"
2636 #: builtin/apply.c:126
2638 msgid "unrecognized whitespace ignore option '%s'"
2641 #: builtin/apply.c:818
2643 msgid "Cannot prepare timestamp regexp %s"
2646 #: builtin/apply.c:827
2648 msgid "regexec returned %d for input: %s"
2651 #: builtin/apply.c:908
2653 msgid "unable to find filename in patch at line %d"
2656 #: builtin/apply.c:940
2658 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2661 #: builtin/apply.c:944
2663 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2666 #: builtin/apply.c:945
2668 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2671 #: builtin/apply.c:952
2673 msgid "git apply: bad git-diff - expected /dev/null on line %d"
2676 #: builtin/apply.c:1415
2678 msgid "recount: unexpected line: %.*s"
2681 #: builtin/apply.c:1472
2683 msgid "patch fragment without header at line %d: %.*s"
2686 #: builtin/apply.c:1489
2689 "git diff header lacks filename information when removing %d leading pathname "
2690 "component (line %d)"
2692 "git diff header lacks filename information when removing %d leading pathname "
2693 "components (line %d)"
2697 #: builtin/apply.c:1655
2698 msgid "new file depends on old contents"
2701 #: builtin/apply.c:1657
2702 msgid "deleted file still has contents"
2705 #: builtin/apply.c:1683
2707 msgid "corrupt patch at line %d"
2710 #: builtin/apply.c:1719
2712 msgid "new file %s depends on old contents"
2715 #: builtin/apply.c:1721
2717 msgid "deleted file %s still has contents"
2720 #: builtin/apply.c:1724
2722 msgid "** warning: file %s becomes empty but is not deleted"
2725 #: builtin/apply.c:1870
2727 msgid "corrupt binary patch at line %d: %.*s"
2730 #: builtin/apply.c:1899
2732 msgid "unrecognized binary patch at line %d"
2735 #: builtin/apply.c:2050
2737 msgid "patch with only garbage at line %d"
2740 #: builtin/apply.c:2140
2742 msgid "unable to read symlink %s"
2745 #: builtin/apply.c:2144
2747 msgid "unable to open or read %s"
2750 #: builtin/apply.c:2777
2752 msgid "invalid start of line: '%c'"
2755 #: builtin/apply.c:2896
2757 msgid "Hunk #%d succeeded at %d (offset %d line)."
2758 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2762 #: builtin/apply.c:2908
2764 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2767 #: builtin/apply.c:2914
2770 "while searching for:\n"
2774 #: builtin/apply.c:2934
2776 msgid "missing binary patch data for '%s'"
2779 #: builtin/apply.c:3035
2781 msgid "binary patch does not apply to '%s'"
2784 #: builtin/apply.c:3041
2786 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2789 #: builtin/apply.c:3062
2791 msgid "patch failed: %s:%ld"
2794 #: builtin/apply.c:3186
2796 msgid "cannot checkout %s"
2799 #: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
2801 msgid "read of %s failed"
2804 #: builtin/apply.c:3239
2806 msgid "reading from '%s' beyond a symbolic link"
2809 #: builtin/apply.c:3267 builtin/apply.c:3489
2811 msgid "path %s has been renamed/deleted"
2814 #: builtin/apply.c:3348 builtin/apply.c:3503
2816 msgid "%s: does not exist in index"
2819 #: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
2824 #: builtin/apply.c:3357 builtin/apply.c:3511
2826 msgid "%s: does not match index"
2829 #: builtin/apply.c:3459
2830 msgid "removal patch leaves file contents"
2833 #: builtin/apply.c:3528
2835 msgid "%s: wrong type"
2838 #: builtin/apply.c:3530
2840 msgid "%s has type %o, expected %o"
2843 #: builtin/apply.c:3689 builtin/apply.c:3691
2845 msgid "invalid path '%s'"
2848 #: builtin/apply.c:3746
2850 msgid "%s: already exists in index"
2853 #: builtin/apply.c:3749
2855 msgid "%s: already exists in working directory"
2858 #: builtin/apply.c:3769
2860 msgid "new mode (%o) of %s does not match old mode (%o)"
2863 #: builtin/apply.c:3774
2865 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2868 #: builtin/apply.c:3794
2870 msgid "affected file '%s' is beyond a symbolic link"
2873 #: builtin/apply.c:3798
2875 msgid "%s: patch does not apply"
2878 #: builtin/apply.c:3812
2880 msgid "Checking patch %s..."
2883 #: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
2885 msgid "make_cache_entry failed for path '%s'"
2888 #: builtin/apply.c:4048
2890 msgid "unable to remove %s from index"
2893 #: builtin/apply.c:4077
2895 msgid "corrupt patch for submodule %s"
2898 #: builtin/apply.c:4081
2900 msgid "unable to stat newly created file '%s'"
2903 #: builtin/apply.c:4086
2905 msgid "unable to create backing store for newly created file %s"
2908 #: builtin/apply.c:4089 builtin/apply.c:4197
2910 msgid "unable to add cache entry for %s"
2913 #: builtin/apply.c:4122
2915 msgid "closing file '%s'"
2918 #: builtin/apply.c:4171
2920 msgid "unable to write file '%s' mode %o"
2923 #: builtin/apply.c:4258
2925 msgid "Applied patch %s cleanly."
2928 #: builtin/apply.c:4266
2929 msgid "internal error"
2932 #: builtin/apply.c:4269
2934 msgid "Applying patch %%s with %d reject..."
2935 msgid_plural "Applying patch %%s with %d rejects..."
2939 #: builtin/apply.c:4279
2941 msgid "truncating .rej filename to %.*s.rej"
2944 #: builtin/apply.c:4300
2946 msgid "Hunk #%d applied cleanly."
2949 #: builtin/apply.c:4303
2951 msgid "Rejected hunk #%d."
2954 #: builtin/apply.c:4393
2955 msgid "unrecognized input"
2958 #: builtin/apply.c:4404
2959 msgid "unable to read index file"
2962 #: builtin/apply.c:4517
2963 msgid "don't apply changes matching the given path"
2966 #: builtin/apply.c:4520
2967 msgid "apply changes matching the given path"
2970 #: builtin/apply.c:4523
2971 msgid "remove <num> leading slashes from traditional diff paths"
2974 #: builtin/apply.c:4526
2975 msgid "ignore additions made by the patch"
2978 #: builtin/apply.c:4528
2979 msgid "instead of applying the patch, output diffstat for the input"
2982 #: builtin/apply.c:4532
2983 msgid "show number of added and deleted lines in decimal notation"
2986 #: builtin/apply.c:4534
2987 msgid "instead of applying the patch, output a summary for the input"
2990 #: builtin/apply.c:4536
2991 msgid "instead of applying the patch, see if the patch is applicable"
2994 #: builtin/apply.c:4538
2995 msgid "make sure the patch is applicable to the current index"
2998 #: builtin/apply.c:4540
2999 msgid "apply a patch without touching the working tree"
3002 #: builtin/apply.c:4542
3003 msgid "accept a patch that touches outside the working area"
3006 #: builtin/apply.c:4544
3007 msgid "also apply the patch (use with --stat/--summary/--check)"
3010 #: builtin/apply.c:4546
3011 msgid "attempt three-way merge if a patch does not apply"
3014 #: builtin/apply.c:4548
3015 msgid "build a temporary index based on embedded index information"
3018 #: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
3019 msgid "paths are separated with NUL character"
3022 #: builtin/apply.c:4553
3023 msgid "ensure at least <n> lines of context match"
3026 #: builtin/apply.c:4555
3027 msgid "detect new or modified lines that have whitespace errors"
3030 #: builtin/apply.c:4558 builtin/apply.c:4561
3031 msgid "ignore changes in whitespace when finding context"
3034 #: builtin/apply.c:4564
3035 msgid "apply the patch in reverse"
3038 #: builtin/apply.c:4566
3039 msgid "don't expect at least one line of context"
3042 #: builtin/apply.c:4568
3043 msgid "leave the rejected hunks in corresponding *.rej files"
3046 #: builtin/apply.c:4570
3047 msgid "allow overlapping hunks"
3050 #: builtin/apply.c:4573
3051 msgid "tolerate incorrectly detected missing new-line at the end of file"
3054 #: builtin/apply.c:4576
3055 msgid "do not trust the line counts in the hunk headers"
3058 #: builtin/apply.c:4579
3059 msgid "prepend <root> to all filenames"
3062 #: builtin/apply.c:4601
3063 msgid "--3way outside a repository"
3066 #: builtin/apply.c:4609
3067 msgid "--index outside a repository"
3070 #: builtin/apply.c:4612
3071 msgid "--cached outside a repository"
3074 #: builtin/apply.c:4631
3076 msgid "can't open patch '%s'"
3079 #: builtin/apply.c:4645
3081 msgid "squelched %d whitespace error"
3082 msgid_plural "squelched %d whitespace errors"
3086 #: builtin/apply.c:4651 builtin/apply.c:4661
3088 msgid "%d line adds whitespace errors."
3089 msgid_plural "%d lines add whitespace errors."
3093 #: builtin/archive.c:17
3095 msgid "could not create archive file '%s'"
3098 #: builtin/archive.c:20
3099 msgid "could not redirect output"
3102 #: builtin/archive.c:37
3103 msgid "git archive: Remote with no URL"
3106 #: builtin/archive.c:58
3107 msgid "git archive: expected ACK/NAK, got EOF"
3110 #: builtin/archive.c:61
3112 msgid "git archive: NACK %s"
3115 #: builtin/archive.c:63
3117 msgid "remote error: %s"
3120 #: builtin/archive.c:64
3121 msgid "git archive: protocol error"
3124 #: builtin/archive.c:68
3125 msgid "git archive: expected a flush"
3128 #: builtin/bisect--helper.c:7
3129 msgid "git bisect--helper --next-all [--no-checkout]"
3132 #: builtin/bisect--helper.c:17
3133 msgid "perform 'git bisect next'"
3136 #: builtin/bisect--helper.c:19
3137 msgid "update BISECT_HEAD instead of checking out the current commit"
3140 #: builtin/blame.c:32
3141 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3144 #: builtin/blame.c:37
3145 msgid "<rev-opts> are documented in git-rev-list(1)"
3148 #: builtin/blame.c:2519
3149 msgid "Show blame entries as we find them, incrementally"
3152 #: builtin/blame.c:2520
3153 msgid "Show blank SHA-1 for boundary commits (Default: off)"
3156 #: builtin/blame.c:2521
3157 msgid "Do not treat root commits as boundaries (Default: off)"
3160 #: builtin/blame.c:2522
3161 msgid "Show work cost statistics"
3164 #: builtin/blame.c:2523
3165 msgid "Show output score for blame entries"
3168 #: builtin/blame.c:2524
3169 msgid "Show original filename (Default: auto)"
3172 #: builtin/blame.c:2525
3173 msgid "Show original linenumber (Default: off)"
3176 #: builtin/blame.c:2526
3177 msgid "Show in a format designed for machine consumption"
3180 #: builtin/blame.c:2527
3181 msgid "Show porcelain format with per-line commit information"
3184 #: builtin/blame.c:2528
3185 msgid "Use the same output mode as git-annotate (Default: off)"
3188 #: builtin/blame.c:2529
3189 msgid "Show raw timestamp (Default: off)"
3192 #: builtin/blame.c:2530
3193 msgid "Show long commit SHA1 (Default: off)"
3196 #: builtin/blame.c:2531
3197 msgid "Suppress author name and timestamp (Default: off)"
3200 #: builtin/blame.c:2532
3201 msgid "Show author email instead of name (Default: off)"
3204 #: builtin/blame.c:2533
3205 msgid "Ignore whitespace differences"
3208 #: builtin/blame.c:2534
3209 msgid "Spend extra cycles to find better match"
3212 #: builtin/blame.c:2535
3213 msgid "Use revisions from <file> instead of calling git-rev-list"
3216 #: builtin/blame.c:2536
3217 msgid "Use <file>'s contents as the final image"
3220 #: builtin/blame.c:2537 builtin/blame.c:2538
3224 #: builtin/blame.c:2537
3225 msgid "Find line copies within and across files"
3228 #: builtin/blame.c:2538
3229 msgid "Find line movements within and across files"
3232 #: builtin/blame.c:2539
3236 #: builtin/blame.c:2539
3237 msgid "Process only line range n,m, counting from 1"
3240 #. TRANSLATORS: This string is used to tell us the maximum
3241 #. display width for a relative timestamp in "git blame"
3242 #. output. For C locale, "4 years, 11 months ago", which
3243 #. takes 22 places, is the longest among various forms of
3244 #. relative timestamps, but your language may need more or
3245 #. fewer display columns.
3246 #: builtin/blame.c:2620
3247 msgid "4 years, 11 months ago"
3250 #: builtin/branch.c:25
3251 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
3254 #: builtin/branch.c:26
3255 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
3258 #: builtin/branch.c:27
3259 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3262 #: builtin/branch.c:28
3263 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3266 #: builtin/branch.c:29
3267 msgid "git branch [<options>] [-r | -a] [--points-at]"
3270 #: builtin/branch.c:142
3273 "deleting branch '%s' that has been merged to\n"
3274 " '%s', but not yet merged to HEAD."
3277 #: builtin/branch.c:146
3280 "not deleting branch '%s' that is not yet merged to\n"
3281 " '%s', even though it is merged to HEAD."
3284 #: builtin/branch.c:160
3286 msgid "Couldn't look up commit object for '%s'"
3289 #: builtin/branch.c:164
3292 "The branch '%s' is not fully merged.\n"
3293 "If you are sure you want to delete it, run 'git branch -D %s'."
3296 #: builtin/branch.c:177
3297 msgid "Update of config-file failed"
3300 #: builtin/branch.c:205
3301 msgid "cannot use -a with -d"
3304 #: builtin/branch.c:211
3305 msgid "Couldn't look up commit object for HEAD"
3308 #: builtin/branch.c:219
3310 msgid "Cannot delete the branch '%s' which you are currently on."
3313 #: builtin/branch.c:235
3315 msgid "remote-tracking branch '%s' not found."
3318 #: builtin/branch.c:236
3320 msgid "branch '%s' not found."
3323 #: builtin/branch.c:251
3325 msgid "Error deleting remote-tracking branch '%s'"
3328 #: builtin/branch.c:252
3330 msgid "Error deleting branch '%s'"
3333 #: builtin/branch.c:259
3335 msgid "Deleted remote-tracking branch %s (was %s).\n"
3338 #: builtin/branch.c:260
3340 msgid "Deleted branch %s (was %s).\n"
3343 #: builtin/branch.c:303
3348 #: builtin/branch.c:308
3353 #: builtin/branch.c:313
3355 msgid "[%s: behind %d]"
3358 #: builtin/branch.c:315
3363 #: builtin/branch.c:319
3365 msgid "[%s: ahead %d]"
3368 #: builtin/branch.c:321
3373 #: builtin/branch.c:324
3375 msgid "[%s: ahead %d, behind %d]"
3378 #: builtin/branch.c:327
3380 msgid "[ahead %d, behind %d]"
3383 #: builtin/branch.c:340
3384 msgid " **** invalid ref ****"
3387 #: builtin/branch.c:366
3389 msgid "(no branch, rebasing %s)"
3392 #: builtin/branch.c:369
3394 msgid "(no branch, bisect started on %s)"
3397 #: builtin/branch.c:375
3399 msgid "(HEAD detached at %s)"
3402 #: builtin/branch.c:378
3404 msgid "(HEAD detached from %s)"
3407 #: builtin/branch.c:382
3411 #: builtin/branch.c:524
3412 msgid "cannot rename the current branch while not on any."
3415 #: builtin/branch.c:534
3417 msgid "Invalid branch name: '%s'"
3420 #: builtin/branch.c:549
3421 msgid "Branch rename failed"
3424 #: builtin/branch.c:553
3426 msgid "Renamed a misnamed branch '%s' away"
3429 #: builtin/branch.c:557
3431 msgid "Branch renamed to %s, but HEAD is not updated!"
3434 #: builtin/branch.c:564
3435 msgid "Branch is renamed, but update of config-file failed"
3438 #: builtin/branch.c:587
3440 msgid "could not write branch description template: %s"
3443 #: builtin/branch.c:616
3444 msgid "Generic options"
3447 #: builtin/branch.c:618
3448 msgid "show hash and subject, give twice for upstream branch"
3451 #: builtin/branch.c:619
3452 msgid "suppress informational messages"
3455 #: builtin/branch.c:620
3456 msgid "set up tracking mode (see git-pull(1))"
3459 #: builtin/branch.c:622
3460 msgid "change upstream info"
3463 #: builtin/branch.c:626
3464 msgid "use colored output"
3467 #: builtin/branch.c:627
3468 msgid "act on remote-tracking branches"
3471 #: builtin/branch.c:629 builtin/branch.c:630
3472 msgid "print only branches that contain the commit"
3475 #: builtin/branch.c:633
3476 msgid "Specific git-branch actions:"
3479 #: builtin/branch.c:634
3480 msgid "list both remote-tracking and local branches"
3483 #: builtin/branch.c:636
3484 msgid "delete fully merged branch"
3487 #: builtin/branch.c:637
3488 msgid "delete branch (even if not merged)"
3491 #: builtin/branch.c:638
3492 msgid "move/rename a branch and its reflog"
3495 #: builtin/branch.c:639
3496 msgid "move/rename a branch, even if target exists"
3499 #: builtin/branch.c:640
3500 msgid "list branch names"
3503 #: builtin/branch.c:641
3504 msgid "create the branch's reflog"
3507 #: builtin/branch.c:643
3508 msgid "edit the description for the branch"
3511 #: builtin/branch.c:644
3512 msgid "force creation, move/rename, deletion"
3515 #: builtin/branch.c:645
3516 msgid "print only branches that are merged"
3519 #: builtin/branch.c:646
3520 msgid "print only branches that are not merged"
3523 #: builtin/branch.c:647
3524 msgid "list branches in columns"
3527 #: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
3531 #: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
3532 msgid "field name to sort on"
3535 #: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
3536 #: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
3537 #: builtin/tag.c:369
3541 #: builtin/branch.c:652
3542 msgid "print only branches of the object"
3545 #: builtin/branch.c:670
3546 msgid "Failed to resolve HEAD as a valid ref."
3549 #: builtin/branch.c:674 builtin/clone.c:697
3550 msgid "HEAD not found below refs/heads!"
3553 #: builtin/branch.c:694
3554 msgid "--column and --verbose are incompatible"
3557 #: builtin/branch.c:705 builtin/branch.c:747
3558 msgid "branch name required"
3561 #: builtin/branch.c:723
3562 msgid "Cannot give description to detached HEAD"
3565 #: builtin/branch.c:728
3566 msgid "cannot edit description of more than one branch"
3569 #: builtin/branch.c:735
3571 msgid "No commit on branch '%s' yet."
3574 #: builtin/branch.c:738
3576 msgid "No branch named '%s'."
3579 #: builtin/branch.c:753
3580 msgid "too many branches for a rename operation"
3583 #: builtin/branch.c:758
3584 msgid "too many branches to set new upstream"
3587 #: builtin/branch.c:762
3590 "could not set upstream of HEAD to %s when it does not point to any branch."
3593 #: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
3595 msgid "no such branch '%s'"
3598 #: builtin/branch.c:769
3600 msgid "branch '%s' does not exist"
3603 #: builtin/branch.c:781
3604 msgid "too many branches to unset upstream"
3607 #: builtin/branch.c:785
3608 msgid "could not unset upstream of HEAD when it does not point to any branch."
3611 #: builtin/branch.c:791
3613 msgid "Branch '%s' has no upstream information"
3616 #: builtin/branch.c:805
3617 msgid "it does not make sense to create 'HEAD' manually"
3620 #: builtin/branch.c:811
3621 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3624 #: builtin/branch.c:814
3627 "The --set-upstream flag is deprecated and will be removed. Consider using --"
3628 "track or --set-upstream-to\n"
3631 #: builtin/branch.c:831
3635 "If you wanted to make '%s' track '%s', do this:\n"
3639 #: builtin/branch.c:832
3641 msgid " git branch -d %s\n"
3644 #: builtin/branch.c:833
3646 msgid " git branch --set-upstream-to %s\n"
3649 #: builtin/bundle.c:51
3651 msgid "%s is okay\n"
3654 #: builtin/bundle.c:64
3655 msgid "Need a repository to create a bundle."
3658 #: builtin/bundle.c:68
3659 msgid "Need a repository to unbundle."
3662 #: builtin/cat-file.c:428
3664 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3665 "<type>|--textconv) <object>"
3668 #: builtin/cat-file.c:429
3669 msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
3672 #: builtin/cat-file.c:466
3673 msgid "<type> can be one of: blob, tree, commit, tag"
3676 #: builtin/cat-file.c:467
3677 msgid "show object type"
3680 #: builtin/cat-file.c:468
3681 msgid "show object size"
3684 #: builtin/cat-file.c:470
3685 msgid "exit with zero when there's no error"
3688 #: builtin/cat-file.c:471
3689 msgid "pretty-print object's content"
3692 #: builtin/cat-file.c:473
3693 msgid "for blob objects, run textconv on object's content"
3696 #: builtin/cat-file.c:475
3697 msgid "allow -s and -t to work with broken/corrupt objects"
3700 #: builtin/cat-file.c:476
3701 msgid "buffer --batch output"
3704 #: builtin/cat-file.c:478
3705 msgid "show info and content of objects fed from the standard input"
3708 #: builtin/cat-file.c:481
3709 msgid "show info about objects fed from the standard input"
3712 #: builtin/cat-file.c:484
3713 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
3716 #: builtin/cat-file.c:486
3717 msgid "show all objects with --batch or --batch-check"
3720 #: builtin/check-attr.c:11
3721 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3724 #: builtin/check-attr.c:12
3725 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
3728 #: builtin/check-attr.c:19
3729 msgid "report all attributes set on file"
3732 #: builtin/check-attr.c:20
3733 msgid "use .gitattributes only from the index"
3736 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
3737 msgid "read file names from stdin"
3740 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
3741 msgid "terminate input and output records by a NUL character"
3744 #: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
3745 msgid "suppress progress reporting"
3748 #: builtin/check-ignore.c:26
3749 msgid "show non-matching input paths"
3752 #: builtin/check-ignore.c:28
3753 msgid "ignore index when checking"
3756 #: builtin/check-ignore.c:154
3757 msgid "cannot specify pathnames with --stdin"
3760 #: builtin/check-ignore.c:157
3761 msgid "-z only makes sense with --stdin"
3764 #: builtin/check-ignore.c:159
3765 msgid "no path specified"
3768 #: builtin/check-ignore.c:163
3769 msgid "--quiet is only valid with a single pathname"
3772 #: builtin/check-ignore.c:165
3773 msgid "cannot have both --quiet and --verbose"
3776 #: builtin/check-ignore.c:168
3777 msgid "--non-matching is only valid with --verbose"
3780 #: builtin/check-mailmap.c:8
3781 msgid "git check-mailmap [<options>] <contact>..."
3784 #: builtin/check-mailmap.c:13
3785 msgid "also read contacts from stdin"
3788 #: builtin/check-mailmap.c:24
3790 msgid "unable to parse contact: %s"
3793 #: builtin/check-mailmap.c:47
3794 msgid "no contacts specified"
3797 #: builtin/checkout-index.c:126
3798 msgid "git checkout-index [<options>] [--] [<file>...]"
3801 #: builtin/checkout-index.c:188
3802 msgid "check out all files in the index"
3805 #: builtin/checkout-index.c:189
3806 msgid "force overwrite of existing files"
3809 #: builtin/checkout-index.c:191
3810 msgid "no warning for existing files and files not in index"
3813 #: builtin/checkout-index.c:193
3814 msgid "don't checkout new files"
3817 #: builtin/checkout-index.c:195
3818 msgid "update stat information in the index file"
3821 #: builtin/checkout-index.c:201
3822 msgid "read list of paths from the standard input"
3825 #: builtin/checkout-index.c:203
3826 msgid "write the content to temporary files"
3829 #: builtin/checkout-index.c:204 builtin/column.c:30
3830 #: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
3831 #: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
3835 #: builtin/checkout-index.c:205
3836 msgid "when creating files, prepend <string>"
3839 #: builtin/checkout-index.c:208
3840 msgid "copy out the files from named stage"
3843 #: builtin/checkout.c:25
3844 msgid "git checkout [<options>] <branch>"
3847 #: builtin/checkout.c:26
3848 msgid "git checkout [<options>] [<branch>] -- <file>..."
3851 #: builtin/checkout.c:134 builtin/checkout.c:167
3853 msgid "path '%s' does not have our version"
3856 #: builtin/checkout.c:136 builtin/checkout.c:169
3858 msgid "path '%s' does not have their version"
3861 #: builtin/checkout.c:152
3863 msgid "path '%s' does not have all necessary versions"
3866 #: builtin/checkout.c:196
3868 msgid "path '%s' does not have necessary versions"
3871 #: builtin/checkout.c:213
3873 msgid "path '%s': cannot merge"
3876 #: builtin/checkout.c:230
3878 msgid "Unable to add merge result for '%s'"
3881 #: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
3882 #: builtin/checkout.c:260
3884 msgid "'%s' cannot be used with updating paths"
3887 #: builtin/checkout.c:263 builtin/checkout.c:266
3889 msgid "'%s' cannot be used with %s"
3892 #: builtin/checkout.c:269
3894 msgid "Cannot update paths and switch to branch '%s' at the same time."
3897 #: builtin/checkout.c:280 builtin/checkout.c:474
3898 msgid "corrupt index file"
3901 #: builtin/checkout.c:340 builtin/checkout.c:347
3903 msgid "path '%s' is unmerged"
3906 #: builtin/checkout.c:496
3907 msgid "you need to resolve your current index first"
3910 #: builtin/checkout.c:623
3912 msgid "Can not do reflog for '%s': %s\n"
3915 #: builtin/checkout.c:661
3916 msgid "HEAD is now at"
3919 #: builtin/checkout.c:668
3921 msgid "Reset branch '%s'\n"
3924 #: builtin/checkout.c:671
3926 msgid "Already on '%s'\n"
3929 #: builtin/checkout.c:675
3931 msgid "Switched to and reset branch '%s'\n"
3934 #: builtin/checkout.c:677 builtin/checkout.c:1066
3936 msgid "Switched to a new branch '%s'\n"
3939 #: builtin/checkout.c:679
3941 msgid "Switched to branch '%s'\n"
3944 #: builtin/checkout.c:731
3946 msgid " ... and %d more.\n"
3949 #: builtin/checkout.c:737
3952 "Warning: you are leaving %d commit behind, not connected to\n"
3953 "any of your branches:\n"
3957 "Warning: you are leaving %d commits behind, not connected to\n"
3958 "any of your branches:\n"
3964 #: builtin/checkout.c:756
3967 "If you want to keep it by creating a new branch, this may be a good time\n"
3970 " git branch <new-branch-name> %s\n"
3973 "If you want to keep them by creating a new branch, this may be a good time\n"
3976 " git branch <new-branch-name> %s\n"
3981 #: builtin/checkout.c:792
3982 msgid "internal error in revision walk"
3985 #: builtin/checkout.c:796
3986 msgid "Previous HEAD position was"
3989 #: builtin/checkout.c:823 builtin/checkout.c:1061
3990 msgid "You are on a branch yet to be born"
3993 #: builtin/checkout.c:968
3995 msgid "only one reference expected, %d given."
3998 #: builtin/checkout.c:1007 builtin/worktree.c:213
4000 msgid "invalid reference: %s"
4003 #: builtin/checkout.c:1036
4005 msgid "reference is not a tree: %s"
4008 #: builtin/checkout.c:1075
4009 msgid "paths cannot be used with switching branches"
4012 #: builtin/checkout.c:1078 builtin/checkout.c:1082
4014 msgid "'%s' cannot be used with switching branches"
4017 #: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
4018 #: builtin/checkout.c:1097
4020 msgid "'%s' cannot be used with '%s'"
4023 #: builtin/checkout.c:1102
4025 msgid "Cannot switch branch to a non-commit '%s'"
4028 #: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
4029 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
4030 #: builtin/worktree.c:322
4034 #: builtin/checkout.c:1136
4035 msgid "create and checkout a new branch"
4038 #: builtin/checkout.c:1138
4039 msgid "create/reset and checkout a branch"
4042 #: builtin/checkout.c:1139
4043 msgid "create reflog for new branch"
4046 #: builtin/checkout.c:1140
4047 msgid "detach the HEAD at named commit"
4050 #: builtin/checkout.c:1141
4051 msgid "set upstream info for new branch"
4054 #: builtin/checkout.c:1143
4058 #: builtin/checkout.c:1143
4059 msgid "new unparented branch"
4062 #: builtin/checkout.c:1144
4063 msgid "checkout our version for unmerged files"
4066 #: builtin/checkout.c:1146
4067 msgid "checkout their version for unmerged files"
4070 #: builtin/checkout.c:1148
4071 msgid "force checkout (throw away local modifications)"
4074 #: builtin/checkout.c:1149
4075 msgid "perform a 3-way merge with the new branch"
4078 #: builtin/checkout.c:1150 builtin/merge.c:227
4079 msgid "update ignored files (default)"
4082 #: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250
4086 #: builtin/checkout.c:1152
4087 msgid "conflict style (merge or diff3)"
4090 #: builtin/checkout.c:1155
4091 msgid "do not limit pathspecs to sparse entries only"
4094 #: builtin/checkout.c:1157
4095 msgid "second guess 'git checkout <no-such-branch>'"
4098 #: builtin/checkout.c:1159
4099 msgid "do not check if another worktree is holding the given ref"
4102 #: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
4103 #: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560
4104 #: builtin/send-pack.c:168
4105 msgid "force progress reporting"
4108 #: builtin/checkout.c:1191
4109 msgid "-b, -B and --orphan are mutually exclusive"
4112 #: builtin/checkout.c:1208
4113 msgid "--track needs a branch name"
4116 #: builtin/checkout.c:1213
4117 msgid "Missing branch name; try -b"
4120 #: builtin/checkout.c:1249
4121 msgid "invalid path specification"
4124 #: builtin/checkout.c:1256
4127 "Cannot update paths and switch to branch '%s' at the same time.\n"
4128 "Did you intend to checkout '%s' which can not be resolved as commit?"
4131 #: builtin/checkout.c:1261
4133 msgid "git checkout: --detach does not take a path argument '%s'"
4136 #: builtin/checkout.c:1265
4138 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4139 "checking out of the index."
4142 #: builtin/clean.c:25
4144 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
4147 #: builtin/clean.c:29
4149 msgid "Removing %s\n"
4152 #: builtin/clean.c:30
4154 msgid "Would remove %s\n"
4157 #: builtin/clean.c:31
4159 msgid "Skipping repository %s\n"
4162 #: builtin/clean.c:32
4164 msgid "Would skip repository %s\n"
4167 #: builtin/clean.c:33
4169 msgid "failed to remove %s"
4172 #: builtin/clean.c:315
4175 "1 - select a numbered item\n"
4176 "foo - select item based on unique prefix\n"
4177 " - (empty) select nothing"
4180 #: builtin/clean.c:319
4183 "1 - select a single item\n"
4184 "3-5 - select a range of items\n"
4185 "2-3,6-9 - select multiple ranges\n"
4186 "foo - select item based on unique prefix\n"
4187 "-... - unselect specified items\n"
4188 "* - choose all items\n"
4189 " - (empty) finish selecting"
4192 #: builtin/clean.c:535
4197 #: builtin/clean.c:677
4199 msgid "Input ignore patterns>> "
4202 #: builtin/clean.c:714
4204 msgid "WARNING: Cannot find items matched by: %s"
4207 #: builtin/clean.c:735
4208 msgid "Select items to delete"
4211 #. TRANSLATORS: Make sure to keep [y/N] as is
4212 #: builtin/clean.c:776
4214 msgid "Remove %s [y/N]? "
4217 #: builtin/clean.c:801
4221 #: builtin/clean.c:809
4223 "clean - start cleaning\n"
4224 "filter by pattern - exclude items from deletion\n"
4225 "select by numbers - select items to be deleted by numbers\n"
4226 "ask each - confirm each deletion (like \"rm -i\")\n"
4227 "quit - stop cleaning\n"
4228 "help - this screen\n"
4229 "? - help for prompt selection"
4232 #: builtin/clean.c:836
4233 msgid "*** Commands ***"
4236 #: builtin/clean.c:837
4240 #: builtin/clean.c:845
4241 msgid "Would remove the following item:"
4242 msgid_plural "Would remove the following items:"
4246 #: builtin/clean.c:862
4247 msgid "No more files to clean, exiting."
4250 #: builtin/clean.c:893
4251 msgid "do not print names of files removed"
4254 #: builtin/clean.c:895
4258 #: builtin/clean.c:896
4259 msgid "interactive cleaning"
4262 #: builtin/clean.c:898
4263 msgid "remove whole directories"
4266 #: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
4267 #: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
4271 #: builtin/clean.c:900
4272 msgid "add <pattern> to ignore rules"
4275 #: builtin/clean.c:901
4276 msgid "remove ignored files, too"
4279 #: builtin/clean.c:903
4280 msgid "remove only ignored files"
4283 #: builtin/clean.c:921
4284 msgid "-x and -X cannot be used together"
4287 #: builtin/clean.c:925
4289 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
4293 #: builtin/clean.c:928
4295 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
4299 #: builtin/clone.c:37
4300 msgid "git clone [<options>] [--] <repo> [<dir>]"
4303 #: builtin/clone.c:59
4304 msgid "don't create a checkout"
4307 #: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
4308 msgid "create a bare repository"
4311 #: builtin/clone.c:64
4312 msgid "create a mirror repository (implies bare)"
4315 #: builtin/clone.c:66
4316 msgid "to clone from a local repository"
4319 #: builtin/clone.c:68
4320 msgid "don't use local hardlinks, always copy"
4323 #: builtin/clone.c:70
4324 msgid "setup as shared repository"
4327 #: builtin/clone.c:72 builtin/clone.c:74
4328 msgid "initialize submodules in the clone"
4331 #: builtin/clone.c:75 builtin/init-db.c:466
4332 msgid "template-directory"
4335 #: builtin/clone.c:76 builtin/init-db.c:467
4336 msgid "directory from which templates will be used"
4339 #: builtin/clone.c:78 builtin/submodule--helper.c:179
4340 msgid "reference repository"
4343 #: builtin/clone.c:80
4344 msgid "use --reference only while cloning"
4347 #: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
4351 #: builtin/clone.c:82
4352 msgid "use <name> instead of 'origin' to track upstream"
4355 #: builtin/clone.c:84
4356 msgid "checkout <branch> instead of the remote's HEAD"
4359 #: builtin/clone.c:86
4360 msgid "path to git-upload-pack on the remote"
4363 #: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654
4364 #: builtin/pull.c:186
4368 #: builtin/clone.c:88
4369 msgid "create a shallow clone of that depth"
4372 #: builtin/clone.c:90
4373 msgid "clone only one branch, HEAD or --branch"
4376 #: builtin/clone.c:91 builtin/init-db.c:475
4380 #: builtin/clone.c:92 builtin/init-db.c:476
4381 msgid "separate git dir from working tree"
4384 #: builtin/clone.c:93
4388 #: builtin/clone.c:94
4389 msgid "set config inside the new repository"
4392 #: builtin/clone.c:300
4394 msgid "reference repository '%s' as a linked checkout is not supported yet."
4397 #: builtin/clone.c:302
4399 msgid "reference repository '%s' is not a local repository."
4402 #: builtin/clone.c:307
4404 msgid "reference repository '%s' is shallow"
4407 #: builtin/clone.c:310
4409 msgid "reference repository '%s' is grafted"
4412 #: builtin/clone.c:375 builtin/diff.c:84
4414 msgid "failed to stat '%s'"
4417 #: builtin/clone.c:377
4419 msgid "%s exists and is not a directory"
4422 #: builtin/clone.c:391
4424 msgid "failed to stat %s\n"
4427 #: builtin/clone.c:413
4429 msgid "failed to create link '%s'"
4432 #: builtin/clone.c:417
4434 msgid "failed to copy file to '%s'"
4437 #: builtin/clone.c:442 builtin/clone.c:626
4442 #: builtin/clone.c:454
4444 "Clone succeeded, but checkout failed.\n"
4445 "You can inspect what was checked out with 'git status'\n"
4446 "and retry the checkout with 'git checkout -f HEAD'\n"
4449 #: builtin/clone.c:531
4451 msgid "Could not find remote branch %s to clone."
4454 #: builtin/clone.c:621
4456 msgid "Checking connectivity... "
4459 #: builtin/clone.c:624
4460 msgid "remote did not send all necessary objects"
4463 #: builtin/clone.c:688
4464 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4467 #: builtin/clone.c:719
4468 msgid "unable to checkout working tree"
4471 #: builtin/clone.c:808
4472 msgid "cannot repack to clean up"
4475 #: builtin/clone.c:810
4476 msgid "cannot unlink temporary alternates file"
4479 #: builtin/clone.c:842
4480 msgid "Too many arguments."
4483 #: builtin/clone.c:846
4484 msgid "You must specify a repository to clone."
4487 #: builtin/clone.c:857
4489 msgid "--bare and --origin %s options are incompatible."
4492 #: builtin/clone.c:860
4493 msgid "--bare and --separate-git-dir are incompatible."
4496 #: builtin/clone.c:873
4498 msgid "repository '%s' does not exist"
4501 #: builtin/clone.c:879 builtin/fetch.c:1166
4503 msgid "depth %s is not a positive number"
4506 #: builtin/clone.c:889
4508 msgid "destination path '%s' already exists and is not an empty directory."
4511 #: builtin/clone.c:899
4513 msgid "working tree '%s' already exists."
4516 #: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
4517 #: builtin/worktree.c:221 builtin/worktree.c:248
4519 msgid "could not create leading directories of '%s'"
4522 #: builtin/clone.c:917
4524 msgid "could not create work tree dir '%s'"
4527 #: builtin/clone.c:935
4529 msgid "Cloning into bare repository '%s'...\n"
4532 #: builtin/clone.c:937
4534 msgid "Cloning into '%s'...\n"
4537 #: builtin/clone.c:975
4538 msgid "--depth is ignored in local clones; use file:// instead."
4541 #: builtin/clone.c:978
4542 msgid "source repository is shallow, ignoring --local"
4545 #: builtin/clone.c:983
4546 msgid "--local is ignored"
4549 #: builtin/clone.c:987
4551 msgid "Don't know how to clone %s"
4554 #: builtin/clone.c:1036 builtin/clone.c:1044
4556 msgid "Remote branch %s not found in upstream %s"
4559 #: builtin/clone.c:1047
4560 msgid "You appear to have cloned an empty repository."
4563 #: builtin/column.c:9
4564 msgid "git column [<options>]"
4567 #: builtin/column.c:26
4568 msgid "lookup config vars"
4571 #: builtin/column.c:27 builtin/column.c:28
4572 msgid "layout to use"
4575 #: builtin/column.c:29
4576 msgid "Maximum width"
4579 #: builtin/column.c:30
4580 msgid "Padding space on left border"
4583 #: builtin/column.c:31
4584 msgid "Padding space on right border"
4587 #: builtin/column.c:32
4588 msgid "Padding space between columns"
4591 #: builtin/column.c:51
4592 msgid "--command must be the first argument"
4595 #: builtin/commit.c:38
4596 msgid "git commit [<options>] [--] <pathspec>..."
4599 #: builtin/commit.c:43
4600 msgid "git status [<options>] [--] <pathspec>..."
4603 #: builtin/commit.c:48
4605 "Your name and email address were configured automatically based\n"
4606 "on your username and hostname. Please check that they are accurate.\n"
4607 "You can suppress this message by setting them explicitly. Run the\n"
4608 "following command and follow the instructions in your editor to edit\n"
4609 "your configuration file:\n"
4611 " git config --global --edit\n"
4613 "After doing this, you may fix the identity used for this commit with:\n"
4615 " git commit --amend --reset-author\n"
4618 #: builtin/commit.c:61
4620 "Your name and email address were configured automatically based\n"
4621 "on your username and hostname. Please check that they are accurate.\n"
4622 "You can suppress this message by setting them explicitly:\n"
4624 " git config --global user.name \"Your Name\"\n"
4625 " git config --global user.email you@example.com\n"
4627 "After doing this, you may fix the identity used for this commit with:\n"
4629 " git commit --amend --reset-author\n"
4632 #: builtin/commit.c:73
4634 "You asked to amend the most recent commit, but doing so would make\n"
4635 "it empty. You can repeat your command with --allow-empty, or you can\n"
4636 "remove the commit entirely with \"git reset HEAD^\".\n"
4639 #: builtin/commit.c:78
4641 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4642 "If you wish to commit it anyway, use:\n"
4644 " git commit --allow-empty\n"
4648 #: builtin/commit.c:85
4649 msgid "Otherwise, please use 'git reset'\n"
4652 #: builtin/commit.c:88
4654 "If you wish to skip this commit, use:\n"
4658 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4659 "the remaining commits.\n"
4662 #: builtin/commit.c:305
4663 msgid "failed to unpack HEAD tree object"
4666 #: builtin/commit.c:346
4667 msgid "unable to create temporary index"
4670 #: builtin/commit.c:352
4671 msgid "interactive add failed"
4674 #: builtin/commit.c:365
4675 msgid "unable to update temporary index"
4678 #: builtin/commit.c:367
4679 msgid "Failed to update main cache tree"
4682 #: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
4683 msgid "unable to write new_index file"
4686 #: builtin/commit.c:445
4687 msgid "cannot do a partial commit during a merge."
4690 #: builtin/commit.c:447
4691 msgid "cannot do a partial commit during a cherry-pick."
4694 #: builtin/commit.c:456
4695 msgid "cannot read the index"
4698 #: builtin/commit.c:475
4699 msgid "unable to write temporary index file"
4702 #: builtin/commit.c:580
4704 msgid "commit '%s' lacks author header"
4707 #: builtin/commit.c:582
4709 msgid "commit '%s' has malformed author line"
4712 #: builtin/commit.c:601
4713 msgid "malformed --author parameter"
4716 #: builtin/commit.c:609
4718 msgid "invalid date format: %s"
4721 #: builtin/commit.c:653
4723 "unable to select a comment character that is not used\n"
4724 "in the current commit message"
4727 #: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
4729 msgid "could not lookup commit %s"
4732 #: builtin/commit.c:702 builtin/shortlog.c:273
4734 msgid "(reading log message from standard input)\n"
4737 #: builtin/commit.c:704
4738 msgid "could not read log from standard input"
4741 #: builtin/commit.c:708
4743 msgid "could not read log file '%s'"
4746 #: builtin/commit.c:730
4747 msgid "could not read MERGE_MSG"
4750 #: builtin/commit.c:734
4751 msgid "could not read SQUASH_MSG"
4754 #: builtin/commit.c:785
4755 msgid "could not write commit template"
4758 #: builtin/commit.c:803
4762 "It looks like you may be committing a merge.\n"
4763 "If this is not correct, please remove the file\n"
4768 #: builtin/commit.c:808
4772 "It looks like you may be committing a cherry-pick.\n"
4773 "If this is not correct, please remove the file\n"
4778 #: builtin/commit.c:821
4781 "Please enter the commit message for your changes. Lines starting\n"
4782 "with '%c' will be ignored, and an empty message aborts the commit.\n"
4785 #: builtin/commit.c:828
4788 "Please enter the commit message for your changes. Lines starting\n"
4789 "with '%c' will be kept; you may remove them yourself if you want to.\n"
4790 "An empty message aborts the commit.\n"
4793 #: builtin/commit.c:848
4795 msgid "%sAuthor: %.*s <%.*s>"
4798 #: builtin/commit.c:856
4803 #: builtin/commit.c:863
4805 msgid "%sCommitter: %.*s <%.*s>"
4808 #: builtin/commit.c:881
4809 msgid "Cannot read index"
4812 #: builtin/commit.c:938
4813 msgid "Error building trees"
4816 #: builtin/commit.c:953 builtin/tag.c:266
4818 msgid "Please supply the message using either -m or -F option.\n"
4821 #: builtin/commit.c:1055
4823 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4826 #: builtin/commit.c:1070 builtin/commit.c:1310
4828 msgid "Invalid untracked files mode '%s'"
4831 #: builtin/commit.c:1107
4832 msgid "--long and -z are incompatible"
4835 #: builtin/commit.c:1137
4836 msgid "Using both --reset-author and --author does not make sense"
4839 #: builtin/commit.c:1146
4840 msgid "You have nothing to amend."
4843 #: builtin/commit.c:1149
4844 msgid "You are in the middle of a merge -- cannot amend."
4847 #: builtin/commit.c:1151
4848 msgid "You are in the middle of a cherry-pick -- cannot amend."
4851 #: builtin/commit.c:1154
4852 msgid "Options --squash and --fixup cannot be used together"
4855 #: builtin/commit.c:1164
4856 msgid "Only one of -c/-C/-F/--fixup can be used."
4859 #: builtin/commit.c:1166
4860 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4863 #: builtin/commit.c:1174
4864 msgid "--reset-author can be used only with -C, -c or --amend."
4867 #: builtin/commit.c:1191
4868 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4871 #: builtin/commit.c:1193
4872 msgid "No paths with --include/--only does not make sense."
4875 #: builtin/commit.c:1195
4876 msgid "Clever... amending the last one with dirty index."
4879 #: builtin/commit.c:1197
4880 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4883 #: builtin/commit.c:1209 builtin/tag.c:475
4885 msgid "Invalid cleanup mode %s"
4888 #: builtin/commit.c:1214
4889 msgid "Paths with -a does not make sense."
4892 #: builtin/commit.c:1324 builtin/commit.c:1605
4893 msgid "show status concisely"
4896 #: builtin/commit.c:1326 builtin/commit.c:1607
4897 msgid "show branch information"
4900 #: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546
4901 #: builtin/worktree.c:423
4902 msgid "machine-readable output"
4905 #: builtin/commit.c:1331 builtin/commit.c:1611
4906 msgid "show status in long format (default)"
4909 #: builtin/commit.c:1334 builtin/commit.c:1614
4910 msgid "terminate entries with NUL"
4913 #: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
4914 #: builtin/fast-export.c:984 builtin/tag.c:353
4918 #: builtin/commit.c:1337 builtin/commit.c:1617
4919 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4922 #: builtin/commit.c:1340
4923 msgid "show ignored files"
4926 #: builtin/commit.c:1341 parse-options.h:155
4930 #: builtin/commit.c:1342
4932 "ignore changes to submodules, optional when: all, dirty, untracked. "
4936 #: builtin/commit.c:1344
4937 msgid "list untracked files in columns"
4940 #: builtin/commit.c:1430
4941 msgid "couldn't look up newly created commit"
4944 #: builtin/commit.c:1432
4945 msgid "could not parse newly created commit"
4948 #: builtin/commit.c:1477
4949 msgid "detached HEAD"
4952 #: builtin/commit.c:1480
4953 msgid " (root-commit)"
4956 #: builtin/commit.c:1575
4957 msgid "suppress summary after successful commit"
4960 #: builtin/commit.c:1576
4961 msgid "show diff in commit message template"
4964 #: builtin/commit.c:1578
4965 msgid "Commit message options"
4968 #: builtin/commit.c:1579 builtin/tag.c:351
4969 msgid "read message from file"
4972 #: builtin/commit.c:1580
4976 #: builtin/commit.c:1580
4977 msgid "override author for commit"
4980 #: builtin/commit.c:1581 builtin/gc.c:326
4984 #: builtin/commit.c:1581
4985 msgid "override date for commit"
4988 #: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
4989 #: builtin/notes.c:555 builtin/tag.c:349
4993 #: builtin/commit.c:1582
4994 msgid "commit message"
4997 #: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
4998 #: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
5002 #: builtin/commit.c:1583
5003 msgid "reuse and edit message from specified commit"
5006 #: builtin/commit.c:1584
5007 msgid "reuse message from specified commit"
5010 #: builtin/commit.c:1585
5011 msgid "use autosquash formatted message to fixup specified commit"
5014 #: builtin/commit.c:1586
5015 msgid "use autosquash formatted message to squash specified commit"
5018 #: builtin/commit.c:1587
5019 msgid "the commit is authored by me now (used with -C/-c/--amend)"
5022 #: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86
5023 msgid "add Signed-off-by:"
5026 #: builtin/commit.c:1589
5027 msgid "use specified template file"
5030 #: builtin/commit.c:1590
5031 msgid "force edit of commit"
5034 #: builtin/commit.c:1591
5038 #: builtin/commit.c:1591 builtin/tag.c:354
5039 msgid "how to strip spaces and #comments from message"
5042 #: builtin/commit.c:1592
5043 msgid "include status in commit message template"
5046 #: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
5047 #: builtin/revert.c:93
5048 msgid "GPG sign commit"
5051 #: builtin/commit.c:1597
5052 msgid "Commit contents options"
5055 #: builtin/commit.c:1598
5056 msgid "commit all changed files"
5059 #: builtin/commit.c:1599
5060 msgid "add specified files to index for commit"
5063 #: builtin/commit.c:1600
5064 msgid "interactively add files"
5067 #: builtin/commit.c:1601
5068 msgid "interactively add changes"
5071 #: builtin/commit.c:1602
5072 msgid "commit only specified files"
5075 #: builtin/commit.c:1603
5076 msgid "bypass pre-commit hook"
5079 #: builtin/commit.c:1604
5080 msgid "show what would be committed"
5083 #: builtin/commit.c:1615
5084 msgid "amend previous commit"
5087 #: builtin/commit.c:1616
5088 msgid "bypass post-rewrite hook"
5091 #: builtin/commit.c:1621
5092 msgid "ok to record an empty change"
5095 #: builtin/commit.c:1623
5096 msgid "ok to record a change with an empty message"
5099 #: builtin/commit.c:1652
5100 msgid "could not parse HEAD commit"
5103 #: builtin/commit.c:1698
5105 msgid "Corrupt MERGE_HEAD file (%s)"
5108 #: builtin/commit.c:1705
5109 msgid "could not read MERGE_MODE"
5112 #: builtin/commit.c:1724
5114 msgid "could not read commit message: %s"
5117 #: builtin/commit.c:1735
5119 msgid "Aborting commit; you did not edit the message.\n"
5122 #: builtin/commit.c:1740
5124 msgid "Aborting commit due to empty commit message.\n"
5127 #: builtin/commit.c:1788
5129 "Repository has been updated, but unable to write\n"
5130 "new_index file. Check that disk is not full and quota is\n"
5131 "not exceeded, and then \"git reset HEAD\" to recover."
5134 #: builtin/config.c:8
5135 msgid "git config [<options>]"
5138 #: builtin/config.c:54
5139 msgid "Config file location"
5142 #: builtin/config.c:55
5143 msgid "use global config file"
5146 #: builtin/config.c:56
5147 msgid "use system config file"
5150 #: builtin/config.c:57
5151 msgid "use repository config file"
5154 #: builtin/config.c:58
5155 msgid "use given config file"
5158 #: builtin/config.c:59
5162 #: builtin/config.c:59
5163 msgid "read config from given blob object"
5166 #: builtin/config.c:60
5170 #: builtin/config.c:61
5171 msgid "get value: name [value-regex]"
5174 #: builtin/config.c:62
5175 msgid "get all values: key [value-regex]"
5178 #: builtin/config.c:63
5179 msgid "get values for regexp: name-regex [value-regex]"
5182 #: builtin/config.c:64
5183 msgid "get value specific for the URL: section[.var] URL"
5186 #: builtin/config.c:65
5187 msgid "replace all matching variables: name value [value_regex]"
5190 #: builtin/config.c:66
5191 msgid "add a new variable: name value"
5194 #: builtin/config.c:67
5195 msgid "remove a variable: name [value-regex]"
5198 #: builtin/config.c:68
5199 msgid "remove all matches: name [value-regex]"
5202 #: builtin/config.c:69
5203 msgid "rename section: old-name new-name"
5206 #: builtin/config.c:70
5207 msgid "remove a section: name"
5210 #: builtin/config.c:71
5214 #: builtin/config.c:72
5215 msgid "open an editor"
5218 #: builtin/config.c:73
5219 msgid "find the color configured: slot [default]"
5222 #: builtin/config.c:74
5223 msgid "find the color setting: slot [stdout-is-tty]"
5226 #: builtin/config.c:75
5230 #: builtin/config.c:76
5231 msgid "value is \"true\" or \"false\""
5234 #: builtin/config.c:77
5235 msgid "value is decimal number"
5238 #: builtin/config.c:78
5239 msgid "value is --bool or --int"
5242 #: builtin/config.c:79
5243 msgid "value is a path (file or directory name)"
5246 #: builtin/config.c:80
5250 #: builtin/config.c:81
5251 msgid "terminate values with NUL byte"
5254 #: builtin/config.c:82
5255 msgid "show variable names only"
5258 #: builtin/config.c:83
5259 msgid "respect include directives on lookup"
5262 #: builtin/config.c:303
5263 msgid "unable to parse default color value"
5266 #: builtin/config.c:441
5269 "# This is Git's per-user configuration file.\n"
5271 "# Please adapt and uncomment the following lines:\n"
5276 #: builtin/config.c:575
5278 msgid "cannot create configuration file %s"
5281 #: builtin/count-objects.c:77
5282 msgid "git count-objects [-v] [-H | --human-readable]"
5285 #: builtin/count-objects.c:87
5286 msgid "print sizes in human readable format"
5289 #: builtin/describe.c:17
5290 msgid "git describe [<options>] [<commit-ish>...]"
5293 #: builtin/describe.c:18
5294 msgid "git describe [<options>] --dirty"
5297 #: builtin/describe.c:217
5299 msgid "annotated tag %s not available"
5302 #: builtin/describe.c:221
5304 msgid "annotated tag %s has no embedded name"
5307 #: builtin/describe.c:223
5309 msgid "tag '%s' is really '%s' here"
5312 #: builtin/describe.c:250 builtin/log.c:459
5314 msgid "Not a valid object name %s"
5317 #: builtin/describe.c:253
5319 msgid "%s is not a valid '%s' object"
5322 #: builtin/describe.c:270
5324 msgid "no tag exactly matches '%s'"
5327 #: builtin/describe.c:272
5329 msgid "searching to describe %s\n"
5332 #: builtin/describe.c:319
5334 msgid "finished search at %s\n"
5337 #: builtin/describe.c:346
5340 "No annotated tags can describe '%s'.\n"
5341 "However, there were unannotated tags: try --tags."
5344 #: builtin/describe.c:350
5347 "No tags can describe '%s'.\n"
5348 "Try --always, or create some tags."
5351 #: builtin/describe.c:371
5353 msgid "traversed %lu commits\n"
5356 #: builtin/describe.c:374
5359 "more than %i tags found; listed %i most recent\n"
5360 "gave up search at %s\n"
5363 #: builtin/describe.c:396
5364 msgid "find the tag that comes after the commit"
5367 #: builtin/describe.c:397
5368 msgid "debug search strategy on stderr"
5371 #: builtin/describe.c:398
5375 #: builtin/describe.c:399
5376 msgid "use any tag, even unannotated"
5379 #: builtin/describe.c:400
5380 msgid "always use long format"
5383 #: builtin/describe.c:401
5384 msgid "only follow first parent"
5387 #: builtin/describe.c:404
5388 msgid "only output exact matches"
5391 #: builtin/describe.c:406
5392 msgid "consider <n> most recent tags (default: 10)"
5395 #: builtin/describe.c:408
5396 msgid "only consider tags matching <pattern>"
5399 #: builtin/describe.c:410 builtin/name-rev.c:314
5400 msgid "show abbreviated commit object as fallback"
5403 #: builtin/describe.c:411
5407 #: builtin/describe.c:412
5408 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5411 #: builtin/describe.c:430
5412 msgid "--long is incompatible with --abbrev=0"
5415 #: builtin/describe.c:456
5416 msgid "No names found, cannot describe anything."
5419 #: builtin/describe.c:476
5420 msgid "--dirty is incompatible with commit-ishes"
5423 #: builtin/diff.c:86
5425 msgid "'%s': not a regular file or symlink"
5428 #: builtin/diff.c:237
5430 msgid "invalid option: %s"
5433 #: builtin/diff.c:358
5434 msgid "Not a git repository"
5437 #: builtin/diff.c:401
5439 msgid "invalid object '%s' given."
5442 #: builtin/diff.c:410
5444 msgid "more than two blobs given: '%s'"
5447 #: builtin/diff.c:417
5449 msgid "unhandled object '%s' given."
5452 #: builtin/fast-export.c:25
5453 msgid "git fast-export [rev-list-opts]"
5456 #: builtin/fast-export.c:980
5457 msgid "show progress after <n> objects"
5460 #: builtin/fast-export.c:982
5461 msgid "select handling of signed tags"
5464 #: builtin/fast-export.c:985
5465 msgid "select handling of tags that tag filtered objects"
5468 #: builtin/fast-export.c:988
5469 msgid "Dump marks to this file"
5472 #: builtin/fast-export.c:990
5473 msgid "Import marks from this file"
5476 #: builtin/fast-export.c:992
5477 msgid "Fake a tagger when tags lack one"
5480 #: builtin/fast-export.c:994
5481 msgid "Output full tree for each commit"
5484 #: builtin/fast-export.c:996
5485 msgid "Use the done feature to terminate the stream"
5488 #: builtin/fast-export.c:997
5489 msgid "Skip output of blob data"
5492 #: builtin/fast-export.c:998
5496 #: builtin/fast-export.c:999
5497 msgid "Apply refspec to exported refs"
5500 #: builtin/fast-export.c:1000
5501 msgid "anonymize output"
5504 #: builtin/fetch.c:20
5505 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5508 #: builtin/fetch.c:21
5509 msgid "git fetch [<options>] <group>"
5512 #: builtin/fetch.c:22
5513 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5516 #: builtin/fetch.c:23
5517 msgid "git fetch --all [<options>]"
5520 #: builtin/fetch.c:90 builtin/pull.c:162
5521 msgid "fetch from all remotes"
5524 #: builtin/fetch.c:92 builtin/pull.c:165
5525 msgid "append to .git/FETCH_HEAD instead of overwriting"
5528 #: builtin/fetch.c:94 builtin/pull.c:168
5529 msgid "path to upload pack on remote end"
5532 #: builtin/fetch.c:95 builtin/pull.c:170
5533 msgid "force overwrite of local branch"
5536 #: builtin/fetch.c:97
5537 msgid "fetch from multiple remotes"
5540 #: builtin/fetch.c:99 builtin/pull.c:172
5541 msgid "fetch all tags and associated objects"
5544 #: builtin/fetch.c:101
5545 msgid "do not fetch all tags (--no-tags)"
5548 #: builtin/fetch.c:103 builtin/pull.c:175
5549 msgid "prune remote-tracking branches no longer on remote"
5552 #: builtin/fetch.c:104 builtin/pull.c:178
5556 #: builtin/fetch.c:105 builtin/pull.c:179
5557 msgid "control recursive fetching of submodules"
5560 #: builtin/fetch.c:109 builtin/pull.c:184
5561 msgid "keep downloaded pack"
5564 #: builtin/fetch.c:111
5565 msgid "allow updating of HEAD ref"
5568 #: builtin/fetch.c:114 builtin/pull.c:187
5569 msgid "deepen history of shallow clone"
5572 #: builtin/fetch.c:116 builtin/pull.c:190
5573 msgid "convert to a complete repository"
5576 #: builtin/fetch.c:118 builtin/log.c:1232
5580 #: builtin/fetch.c:119
5581 msgid "prepend this to submodule path output"
5584 #: builtin/fetch.c:122
5585 msgid "default mode for recursion"
5588 #: builtin/fetch.c:124 builtin/pull.c:193
5589 msgid "accept refs that update .git/shallow"
5592 #: builtin/fetch.c:125 builtin/pull.c:195
5596 #: builtin/fetch.c:126 builtin/pull.c:196
5597 msgid "specify fetch refmap"
5600 #: builtin/fetch.c:378
5601 msgid "Couldn't find remote ref HEAD"
5604 #: builtin/fetch.c:458
5606 msgid "object %s not found"
5609 #: builtin/fetch.c:463
5610 msgid "[up to date]"
5613 #: builtin/fetch.c:477
5615 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5618 #: builtin/fetch.c:478 builtin/fetch.c:566
5622 #: builtin/fetch.c:489
5623 msgid "[tag update]"
5626 #: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544
5627 msgid " (unable to update local ref)"
5630 #: builtin/fetch.c:509
5634 #: builtin/fetch.c:512
5635 msgid "[new branch]"
5638 #: builtin/fetch.c:515
5642 #: builtin/fetch.c:561
5643 msgid "unable to update local ref"
5646 #: builtin/fetch.c:561
5647 msgid "forced update"
5650 #: builtin/fetch.c:568
5651 msgid "(non-fast-forward)"
5654 #: builtin/fetch.c:602 builtin/fetch.c:843
5656 msgid "cannot open %s: %s\n"
5659 #: builtin/fetch.c:611
5661 msgid "%s did not send all necessary objects\n"
5664 #: builtin/fetch.c:629
5666 msgid "reject %s because shallow roots are not allowed to be updated"
5669 #: builtin/fetch.c:716 builtin/fetch.c:808
5674 #: builtin/fetch.c:727
5677 "some local refs could not be updated; try running\n"
5678 " 'git remote prune %s' to remove any old, conflicting branches"
5681 #: builtin/fetch.c:779
5683 msgid " (%s will become dangling)"
5686 #: builtin/fetch.c:780
5688 msgid " (%s has become dangling)"
5691 #: builtin/fetch.c:812
5695 #: builtin/fetch.c:813 builtin/remote.c:1040
5699 #: builtin/fetch.c:833
5701 msgid "Refusing to fetch into current branch %s of non-bare repository"
5704 #: builtin/fetch.c:852
5706 msgid "Option \"%s\" value \"%s\" is not valid for %s"
5709 #: builtin/fetch.c:855
5711 msgid "Option \"%s\" is ignored for %s\n"
5714 #: builtin/fetch.c:911
5716 msgid "Don't know how to fetch from %s"
5719 #: builtin/fetch.c:1072
5721 msgid "Fetching %s\n"
5724 #: builtin/fetch.c:1074 builtin/remote.c:96
5726 msgid "Could not fetch %s"
5729 #: builtin/fetch.c:1092
5731 "No remote repository specified. Please, specify either a URL or a\n"
5732 "remote name from which new revisions should be fetched."
5735 #: builtin/fetch.c:1115
5736 msgid "You need to specify a tag name."
5739 #: builtin/fetch.c:1157
5740 msgid "--depth and --unshallow cannot be used together"
5743 #: builtin/fetch.c:1159
5744 msgid "--unshallow on a complete repository does not make sense"
5747 #: builtin/fetch.c:1179
5748 msgid "fetch --all does not take a repository argument"
5751 #: builtin/fetch.c:1181
5752 msgid "fetch --all does not make sense with refspecs"
5755 #: builtin/fetch.c:1192
5757 msgid "No such remote or remote group: %s"
5760 #: builtin/fetch.c:1200
5761 msgid "Fetching a group and specifying refspecs does not make sense"
5764 #: builtin/fmt-merge-msg.c:14
5766 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
5769 #: builtin/fmt-merge-msg.c:667
5770 msgid "populate log with at most <n> entries from shortlog"
5773 #: builtin/fmt-merge-msg.c:670
5774 msgid "alias for --log (deprecated)"
5777 #: builtin/fmt-merge-msg.c:673
5781 #: builtin/fmt-merge-msg.c:674
5782 msgid "use <text> as start of message"
5785 #: builtin/fmt-merge-msg.c:675
5786 msgid "file to read from"
5789 #: builtin/for-each-ref.c:9
5790 msgid "git for-each-ref [<options>] [<pattern>]"
5793 #: builtin/for-each-ref.c:10
5794 msgid "git for-each-ref [--points-at <object>]"
5797 #: builtin/for-each-ref.c:11
5798 msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
5801 #: builtin/for-each-ref.c:12
5802 msgid "git for-each-ref [--contains [<object>]]"
5805 #: builtin/for-each-ref.c:27
5806 msgid "quote placeholders suitably for shells"
5809 #: builtin/for-each-ref.c:29
5810 msgid "quote placeholders suitably for perl"
5813 #: builtin/for-each-ref.c:31
5814 msgid "quote placeholders suitably for python"
5817 #: builtin/for-each-ref.c:33
5818 msgid "quote placeholders suitably for Tcl"
5821 #: builtin/for-each-ref.c:36
5822 msgid "show only <n> matched refs"
5825 #: builtin/for-each-ref.c:37 builtin/tag.c:372
5826 msgid "format to use for the output"
5829 #: builtin/for-each-ref.c:41
5830 msgid "print only refs which points at the given object"
5833 #: builtin/for-each-ref.c:43
5834 msgid "print only refs that are merged"
5837 #: builtin/for-each-ref.c:44
5838 msgid "print only refs that are not merged"
5841 #: builtin/for-each-ref.c:45
5842 msgid "print only refs which contain the commit"
5845 #: builtin/fsck.c:156 builtin/prune.c:140
5846 msgid "Checking connectivity"
5849 #: builtin/fsck.c:486
5850 msgid "Checking object directories"
5853 #: builtin/fsck.c:553
5854 msgid "git fsck [<options>] [<object>...]"
5857 #: builtin/fsck.c:559
5858 msgid "show unreachable objects"
5861 #: builtin/fsck.c:560
5862 msgid "show dangling objects"
5865 #: builtin/fsck.c:561
5869 #: builtin/fsck.c:562
5870 msgid "report root nodes"
5873 #: builtin/fsck.c:563
5874 msgid "make index objects head nodes"
5877 #: builtin/fsck.c:564
5878 msgid "make reflogs head nodes (default)"
5881 #: builtin/fsck.c:565
5882 msgid "also consider packs and alternate objects"
5885 #: builtin/fsck.c:566
5886 msgid "check only connectivity"
5889 #: builtin/fsck.c:567
5890 msgid "enable more strict checking"
5893 #: builtin/fsck.c:569
5894 msgid "write dangling objects in .git/lost-found"
5897 #: builtin/fsck.c:570 builtin/prune.c:107
5898 msgid "show progress"
5901 #: builtin/fsck.c:631
5902 msgid "Checking objects"
5906 msgid "git gc [<options>]"
5911 msgid "Invalid %s: '%s'"
5916 msgid "insanely long object directory %.*s"
5922 "The last gc run reported the following. Please correct the root cause\n"
5924 "Automatic cleanup will not be performed until the file is removed.\n"
5930 msgid "prune unreferenced objects"
5934 msgid "be more thorough (increased runtime)"
5938 msgid "enable auto-gc mode"
5942 msgid "force running gc even if there may be another gc running"
5947 msgid "Auto packing the repository in background for optimum performance.\n"
5952 msgid "Auto packing the repository for optimum performance.\n"
5957 msgid "See \"git help gc\" for manual housekeeping.\n"
5963 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5968 "There are too many unreachable loose objects; run 'git prune' to remove them."
5971 #: builtin/grep.c:23
5972 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
5975 #: builtin/grep.c:218
5977 msgid "grep: failed to create thread: %s"
5980 #: builtin/grep.c:441 builtin/grep.c:476
5982 msgid "unable to read tree (%s)"
5985 #: builtin/grep.c:491
5987 msgid "unable to grep from object of type %s"
5990 #: builtin/grep.c:547
5992 msgid "switch `%c' expects a numerical value"
5995 #: builtin/grep.c:564
5997 msgid "cannot open '%s'"
6000 #: builtin/grep.c:633
6001 msgid "search in index instead of in the work tree"
6004 #: builtin/grep.c:635
6005 msgid "find in contents not managed by git"
6008 #: builtin/grep.c:637
6009 msgid "search in both tracked and untracked files"
6012 #: builtin/grep.c:639
6013 msgid "ignore files specified via '.gitignore'"
6016 #: builtin/grep.c:642
6017 msgid "show non-matching lines"
6020 #: builtin/grep.c:644
6021 msgid "case insensitive matching"
6024 #: builtin/grep.c:646
6025 msgid "match patterns only at word boundaries"
6028 #: builtin/grep.c:648
6029 msgid "process binary files as text"
6032 #: builtin/grep.c:650
6033 msgid "don't match patterns in binary files"
6036 #: builtin/grep.c:653
6037 msgid "process binary files with textconv filters"
6040 #: builtin/grep.c:655
6041 msgid "descend at most <depth> levels"
6044 #: builtin/grep.c:659
6045 msgid "use extended POSIX regular expressions"
6048 #: builtin/grep.c:662
6049 msgid "use basic POSIX regular expressions (default)"
6052 #: builtin/grep.c:665
6053 msgid "interpret patterns as fixed strings"
6056 #: builtin/grep.c:668
6057 msgid "use Perl-compatible regular expressions"
6060 #: builtin/grep.c:671
6061 msgid "show line numbers"
6064 #: builtin/grep.c:672
6065 msgid "don't show filenames"
6068 #: builtin/grep.c:673
6069 msgid "show filenames"
6072 #: builtin/grep.c:675
6073 msgid "show filenames relative to top directory"
6076 #: builtin/grep.c:677
6077 msgid "show only filenames instead of matching lines"
6080 #: builtin/grep.c:679
6081 msgid "synonym for --files-with-matches"
6084 #: builtin/grep.c:682
6085 msgid "show only the names of files without match"
6088 #: builtin/grep.c:684
6089 msgid "print NUL after filenames"
6092 #: builtin/grep.c:686
6093 msgid "show the number of matches instead of matching lines"
6096 #: builtin/grep.c:687
6097 msgid "highlight matches"
6100 #: builtin/grep.c:689
6101 msgid "print empty line between matches from different files"
6104 #: builtin/grep.c:691
6105 msgid "show filename only once above matches from same file"
6108 #: builtin/grep.c:694
6109 msgid "show <n> context lines before and after matches"
6112 #: builtin/grep.c:697
6113 msgid "show <n> context lines before matches"
6116 #: builtin/grep.c:699
6117 msgid "show <n> context lines after matches"
6120 #: builtin/grep.c:700
6121 msgid "shortcut for -C NUM"
6124 #: builtin/grep.c:703
6125 msgid "show a line with the function name before matches"
6128 #: builtin/grep.c:705
6129 msgid "show the surrounding function"
6132 #: builtin/grep.c:708
6133 msgid "read patterns from file"
6136 #: builtin/grep.c:710
6137 msgid "match <pattern>"
6140 #: builtin/grep.c:712
6141 msgid "combine patterns specified with -e"
6144 #: builtin/grep.c:724
6145 msgid "indicate hit with exit status without output"
6148 #: builtin/grep.c:726
6149 msgid "show only matches from files that match all patterns"
6152 #: builtin/grep.c:728
6153 msgid "show parse tree for grep expression"
6156 #: builtin/grep.c:732
6160 #: builtin/grep.c:732
6161 msgid "show matching files in the pager"
6164 #: builtin/grep.c:735
6165 msgid "allow calling of grep(1) (ignored by this build)"
6168 #: builtin/grep.c:793
6169 msgid "no pattern given."
6172 #: builtin/grep.c:851
6173 msgid "--open-files-in-pager only works on the worktree"
6176 #: builtin/grep.c:877
6177 msgid "--cached or --untracked cannot be used with --no-index."
6180 #: builtin/grep.c:882
6181 msgid "--no-index or --untracked cannot be used with revs."
6184 #: builtin/grep.c:885
6185 msgid "--[no-]exclude-standard cannot be used for tracked contents."
6188 #: builtin/grep.c:893
6189 msgid "both --cached and trees are given."
6192 #: builtin/hash-object.c:80
6194 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6198 #: builtin/hash-object.c:81
6199 msgid "git hash-object --stdin-paths"
6202 #: builtin/hash-object.c:92
6206 #: builtin/hash-object.c:92
6210 #: builtin/hash-object.c:93
6211 msgid "write the object into the object database"
6214 #: builtin/hash-object.c:95
6215 msgid "read the object from stdin"
6218 #: builtin/hash-object.c:97
6219 msgid "store file as is without filters"
6222 #: builtin/hash-object.c:98
6224 "just hash any random garbage to create corrupt objects for debugging Git"
6227 #: builtin/hash-object.c:99
6228 msgid "process file as it were from this path"
6231 #: builtin/help.c:41
6232 msgid "print all available commands"
6235 #: builtin/help.c:42
6236 msgid "print list of useful guides"
6239 #: builtin/help.c:43
6240 msgid "show man page"
6243 #: builtin/help.c:44
6244 msgid "show manual in web browser"
6247 #: builtin/help.c:46
6248 msgid "show info page"
6251 #: builtin/help.c:52
6252 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6255 #: builtin/help.c:64
6257 msgid "unrecognized help format '%s'"
6260 #: builtin/help.c:91
6261 msgid "Failed to start emacsclient."
6264 #: builtin/help.c:104
6265 msgid "Failed to parse emacsclient version."
6268 #: builtin/help.c:112
6270 msgid "emacsclient version '%d' too old (< 22)."
6273 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
6275 msgid "failed to exec '%s': %s"
6278 #: builtin/help.c:208
6281 "'%s': path for unsupported man viewer.\n"
6282 "Please consider using 'man.<tool>.cmd' instead."
6285 #: builtin/help.c:220
6288 "'%s': cmd for supported man viewer.\n"
6289 "Please consider using 'man.<tool>.path' instead."
6292 #: builtin/help.c:337
6294 msgid "'%s': unknown man viewer."
6297 #: builtin/help.c:354
6298 msgid "no man viewer handled the request"
6301 #: builtin/help.c:362
6302 msgid "no info viewer handled the request"
6305 #: builtin/help.c:411
6306 msgid "Defining attributes per path"
6309 #: builtin/help.c:412
6310 msgid "Everyday Git With 20 Commands Or So"
6313 #: builtin/help.c:413
6314 msgid "A Git glossary"
6317 #: builtin/help.c:414
6318 msgid "Specifies intentionally untracked files to ignore"
6321 #: builtin/help.c:415
6322 msgid "Defining submodule properties"
6325 #: builtin/help.c:416
6326 msgid "Specifying revisions and ranges for Git"
6329 #: builtin/help.c:417
6330 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6333 #: builtin/help.c:418
6334 msgid "An overview of recommended workflows with Git"
6337 #: builtin/help.c:430
6338 msgid "The common Git guides are:\n"
6341 #: builtin/help.c:451 builtin/help.c:468
6346 #: builtin/help.c:484
6348 msgid "`git %s' is aliased to `%s'"
6351 #: builtin/index-pack.c:152
6353 msgid "unable to open %s"
6356 #: builtin/index-pack.c:202
6358 msgid "object type mismatch at %s"
6361 #: builtin/index-pack.c:222
6363 msgid "did not receive expected object %s"
6366 #: builtin/index-pack.c:225
6368 msgid "object %s: expected type %s, found %s"
6371 #: builtin/index-pack.c:267
6373 msgid "cannot fill %d byte"
6374 msgid_plural "cannot fill %d bytes"
6378 #: builtin/index-pack.c:277
6382 #: builtin/index-pack.c:278
6383 msgid "read error on input"
6386 #: builtin/index-pack.c:290
6387 msgid "used more bytes than were available"
6390 #: builtin/index-pack.c:297
6391 msgid "pack too large for current definition of off_t"
6394 #: builtin/index-pack.c:313
6396 msgid "unable to create '%s'"
6399 #: builtin/index-pack.c:318
6401 msgid "cannot open packfile '%s'"
6404 #: builtin/index-pack.c:332
6405 msgid "pack signature mismatch"
6408 #: builtin/index-pack.c:334
6410 msgid "pack version %<PRIu32> unsupported"
6413 #: builtin/index-pack.c:352
6415 msgid "pack has bad object at offset %lu: %s"
6418 #: builtin/index-pack.c:473
6420 msgid "inflate returned %d"
6423 #: builtin/index-pack.c:522
6424 msgid "offset value overflow for delta base object"
6427 #: builtin/index-pack.c:530
6428 msgid "delta base offset is out of bound"
6431 #: builtin/index-pack.c:538
6433 msgid "unknown object type %d"
6436 #: builtin/index-pack.c:569
6437 msgid "cannot pread pack file"
6440 #: builtin/index-pack.c:571
6442 msgid "premature end of pack file, %lu byte missing"
6443 msgid_plural "premature end of pack file, %lu bytes missing"
6447 #: builtin/index-pack.c:597
6448 msgid "serious inflate inconsistency"
6451 #: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
6452 #: builtin/index-pack.c:806 builtin/index-pack.c:815
6454 msgid "SHA1 COLLISION FOUND WITH %s !"
6457 #: builtin/index-pack.c:746 builtin/pack-objects.c:162
6458 #: builtin/pack-objects.c:254
6460 msgid "unable to read %s"
6463 #: builtin/index-pack.c:812
6465 msgid "cannot read existing object %s"
6468 #: builtin/index-pack.c:826
6470 msgid "invalid blob object %s"
6473 #: builtin/index-pack.c:840
6478 #: builtin/index-pack.c:843
6479 msgid "Error in object"
6482 #: builtin/index-pack.c:845
6484 msgid "Not all child objects of %s are reachable"
6487 #: builtin/index-pack.c:917 builtin/index-pack.c:948
6488 msgid "failed to apply delta"
6491 #: builtin/index-pack.c:1118
6492 msgid "Receiving objects"
6495 #: builtin/index-pack.c:1118
6496 msgid "Indexing objects"
6499 #: builtin/index-pack.c:1150
6500 msgid "pack is corrupted (SHA1 mismatch)"
6503 #: builtin/index-pack.c:1155
6504 msgid "cannot fstat packfile"
6507 #: builtin/index-pack.c:1158
6508 msgid "pack has junk at the end"
6511 #: builtin/index-pack.c:1169
6512 msgid "confusion beyond insanity in parse_pack_objects()"
6515 #: builtin/index-pack.c:1194
6516 msgid "Resolving deltas"
6519 #: builtin/index-pack.c:1205
6521 msgid "unable to create thread: %s"
6524 #: builtin/index-pack.c:1247
6525 msgid "confusion beyond insanity"
6528 #: builtin/index-pack.c:1253
6530 msgid "completed with %d local objects"
6533 #: builtin/index-pack.c:1263
6535 msgid "Unexpected tail checksum for %s (disk corruption?)"
6538 #: builtin/index-pack.c:1267
6540 msgid "pack has %d unresolved delta"
6541 msgid_plural "pack has %d unresolved deltas"
6545 #: builtin/index-pack.c:1291
6547 msgid "unable to deflate appended object (%d)"
6550 #: builtin/index-pack.c:1367
6552 msgid "local object %s is corrupt"
6555 #: builtin/index-pack.c:1391
6556 msgid "error while closing pack file"
6559 #: builtin/index-pack.c:1404
6561 msgid "cannot write keep file '%s'"
6564 #: builtin/index-pack.c:1412
6566 msgid "cannot close written keep file '%s'"
6569 #: builtin/index-pack.c:1425
6570 msgid "cannot store pack file"
6573 #: builtin/index-pack.c:1436
6574 msgid "cannot store index file"
6577 #: builtin/index-pack.c:1469
6579 msgid "bad pack.indexversion=%<PRIu32>"
6582 #: builtin/index-pack.c:1475
6584 msgid "invalid number of threads specified (%d)"
6587 #: builtin/index-pack.c:1479 builtin/index-pack.c:1663
6589 msgid "no threads support, ignoring %s"
6592 #: builtin/index-pack.c:1537
6594 msgid "Cannot open existing pack file '%s'"
6597 #: builtin/index-pack.c:1539
6599 msgid "Cannot open existing pack idx file for '%s'"
6602 #: builtin/index-pack.c:1586
6604 msgid "non delta: %d object"
6605 msgid_plural "non delta: %d objects"
6609 #: builtin/index-pack.c:1593
6611 msgid "chain length = %d: %lu object"
6612 msgid_plural "chain length = %d: %lu objects"
6616 #: builtin/index-pack.c:1623
6617 msgid "Cannot come back to cwd"
6620 #: builtin/index-pack.c:1675 builtin/index-pack.c:1678
6621 #: builtin/index-pack.c:1690 builtin/index-pack.c:1694
6626 #: builtin/index-pack.c:1708
6627 msgid "--fix-thin cannot be used without --stdin"
6630 #: builtin/index-pack.c:1712 builtin/index-pack.c:1721
6632 msgid "packfile name '%s' does not end with '.pack'"
6635 #: builtin/index-pack.c:1729
6636 msgid "--verify with no packfile name given"
6639 #: builtin/init-db.c:55
6641 msgid "cannot stat '%s'"
6644 #: builtin/init-db.c:61
6646 msgid "cannot stat template '%s'"
6649 #: builtin/init-db.c:66
6651 msgid "cannot opendir '%s'"
6654 #: builtin/init-db.c:77
6656 msgid "cannot readlink '%s'"
6659 #: builtin/init-db.c:79
6661 msgid "cannot symlink '%s' '%s'"
6664 #: builtin/init-db.c:85
6666 msgid "cannot copy '%s' to '%s'"
6669 #: builtin/init-db.c:89
6671 msgid "ignoring template %s"
6674 #: builtin/init-db.c:118
6676 msgid "templates not found %s"
6679 #: builtin/init-db.c:131
6681 msgid "not copying templates of a wrong format version %d from '%s'"
6684 #: builtin/init-db.c:309 builtin/init-db.c:312
6686 msgid "%s already exists"
6689 #: builtin/init-db.c:340
6691 msgid "unable to handle file type %d"
6694 #: builtin/init-db.c:343
6696 msgid "unable to move %s to %s"
6699 #. TRANSLATORS: The first '%s' is either "Reinitialized
6700 #. existing" or "Initialized empty", the second " shared" or
6701 #. "", and the last '%s%s' is the verbatim directory name.
6702 #: builtin/init-db.c:399
6704 msgid "%s%s Git repository in %s%s\n"
6707 #: builtin/init-db.c:400
6708 msgid "Reinitialized existing"
6711 #: builtin/init-db.c:400
6712 msgid "Initialized empty"
6715 #: builtin/init-db.c:401
6719 #: builtin/init-db.c:448
6721 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6722 "shared[=<permissions>]] [<directory>]"
6725 #: builtin/init-db.c:471
6729 #: builtin/init-db.c:472
6730 msgid "specify that the git repository is to be shared amongst several users"
6733 #: builtin/init-db.c:506 builtin/init-db.c:511
6735 msgid "cannot mkdir %s"
6738 #: builtin/init-db.c:515
6740 msgid "cannot chdir to %s"
6743 #: builtin/init-db.c:536
6746 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6750 #: builtin/init-db.c:564
6752 msgid "Cannot access work tree '%s'"
6755 #: builtin/interpret-trailers.c:15
6757 "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6761 #: builtin/interpret-trailers.c:25
6762 msgid "trim empty trailers"
6765 #: builtin/interpret-trailers.c:26
6769 #: builtin/interpret-trailers.c:27
6770 msgid "trailer(s) to add"
6774 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
6778 msgid "git show [<options>] <object>..."
6783 msgid "invalid --decorate option: %s"
6786 #: builtin/log.c:131
6787 msgid "suppress diff output"
6790 #: builtin/log.c:132
6794 #: builtin/log.c:133
6795 msgid "Use mail map file"
6798 #: builtin/log.c:134
6799 msgid "decorate options"
6802 #: builtin/log.c:137
6803 msgid "Process line range n,m in file, counting from 1"
6806 #: builtin/log.c:233
6808 msgid "Final output: %d %s\n"
6811 #: builtin/log.c:465
6813 msgid "git show %s: bad file"
6816 #: builtin/log.c:479 builtin/log.c:572
6818 msgid "Could not read object %s"
6821 #: builtin/log.c:596
6823 msgid "Unknown type: %d"
6826 #: builtin/log.c:714
6827 msgid "format.headers without value"
6830 #: builtin/log.c:798
6831 msgid "name of output directory is too long"
6834 #: builtin/log.c:813
6836 msgid "Cannot open patch file %s"
6839 #: builtin/log.c:827
6840 msgid "Need exactly one range."
6843 #: builtin/log.c:837
6844 msgid "Not a range."
6847 #: builtin/log.c:943
6848 msgid "Cover letter needs email format"
6851 #: builtin/log.c:1022
6853 msgid "insane in-reply-to: %s"
6856 #: builtin/log.c:1050
6857 msgid "git format-patch [<options>] [<since> | <revision-range>]"
6860 #: builtin/log.c:1095
6861 msgid "Two output directories?"
6864 #: builtin/log.c:1210
6865 msgid "use [PATCH n/m] even with a single patch"
6868 #: builtin/log.c:1213
6869 msgid "use [PATCH] even with multiple patches"
6872 #: builtin/log.c:1217
6873 msgid "print patches to standard out"
6876 #: builtin/log.c:1219
6877 msgid "generate a cover letter"
6880 #: builtin/log.c:1221
6881 msgid "use simple number sequence for output file names"
6884 #: builtin/log.c:1222
6888 #: builtin/log.c:1223
6889 msgid "use <sfx> instead of '.patch'"
6892 #: builtin/log.c:1225
6893 msgid "start numbering patches at <n> instead of 1"
6896 #: builtin/log.c:1227
6897 msgid "mark the series as Nth re-roll"
6900 #: builtin/log.c:1229
6901 msgid "Use [<prefix>] instead of [PATCH]"
6904 #: builtin/log.c:1232
6905 msgid "store resulting files in <dir>"
6908 #: builtin/log.c:1235
6909 msgid "don't strip/add [PATCH]"
6912 #: builtin/log.c:1238
6913 msgid "don't output binary diffs"
6916 #: builtin/log.c:1240
6917 msgid "don't include a patch matching a commit upstream"
6920 #: builtin/log.c:1242
6921 msgid "show patch format instead of default (patch + stat)"
6924 #: builtin/log.c:1244
6928 #: builtin/log.c:1245
6932 #: builtin/log.c:1246
6933 msgid "add email header"
6936 #: builtin/log.c:1247 builtin/log.c:1249
6940 #: builtin/log.c:1247
6941 msgid "add To: header"
6944 #: builtin/log.c:1249
6945 msgid "add Cc: header"
6948 #: builtin/log.c:1251
6952 #: builtin/log.c:1252
6953 msgid "set From address to <ident> (or committer ident if absent)"
6956 #: builtin/log.c:1254
6960 #: builtin/log.c:1255
6961 msgid "make first mail a reply to <message-id>"
6964 #: builtin/log.c:1256 builtin/log.c:1259
6968 #: builtin/log.c:1257
6969 msgid "attach the patch"
6972 #: builtin/log.c:1260
6973 msgid "inline the patch"
6976 #: builtin/log.c:1264
6977 msgid "enable message threading, styles: shallow, deep"
6980 #: builtin/log.c:1266
6984 #: builtin/log.c:1267
6985 msgid "add a signature"
6988 #: builtin/log.c:1269
6989 msgid "add a signature from a file"
6992 #: builtin/log.c:1270
6993 msgid "don't print the patch filenames"
6996 #: builtin/log.c:1359
6997 msgid "-n and -k are mutually exclusive."
7000 #: builtin/log.c:1361
7001 msgid "--subject-prefix and -k are mutually exclusive."
7004 #: builtin/log.c:1369
7005 msgid "--name-only does not make sense"
7008 #: builtin/log.c:1371
7009 msgid "--name-status does not make sense"
7012 #: builtin/log.c:1373
7013 msgid "--check does not make sense"
7016 #: builtin/log.c:1396
7017 msgid "standard output, or directory, which one?"
7020 #: builtin/log.c:1398
7022 msgid "Could not create directory '%s'"
7025 #: builtin/log.c:1495
7027 msgid "unable to read signature file '%s'"
7030 #: builtin/log.c:1558
7031 msgid "Failed to create output files"
7034 #: builtin/log.c:1606
7035 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
7038 #: builtin/log.c:1660
7041 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
7044 #: builtin/log.c:1671 builtin/log.c:1673 builtin/log.c:1685
7046 msgid "Unknown commit %s"
7049 #: builtin/ls-files.c:358
7050 msgid "git ls-files [<options>] [<file>...]"
7053 #: builtin/ls-files.c:415
7054 msgid "identify the file status with tags"
7057 #: builtin/ls-files.c:417
7058 msgid "use lowercase letters for 'assume unchanged' files"
7061 #: builtin/ls-files.c:419
7062 msgid "show cached files in the output (default)"
7065 #: builtin/ls-files.c:421
7066 msgid "show deleted files in the output"
7069 #: builtin/ls-files.c:423
7070 msgid "show modified files in the output"
7073 #: builtin/ls-files.c:425
7074 msgid "show other files in the output"
7077 #: builtin/ls-files.c:427
7078 msgid "show ignored files in the output"
7081 #: builtin/ls-files.c:430
7082 msgid "show staged contents' object name in the output"
7085 #: builtin/ls-files.c:432
7086 msgid "show files on the filesystem that need to be removed"
7089 #: builtin/ls-files.c:434
7090 msgid "show 'other' directories' names only"
7093 #: builtin/ls-files.c:437
7094 msgid "don't show empty directories"
7097 #: builtin/ls-files.c:440
7098 msgid "show unmerged files in the output"
7101 #: builtin/ls-files.c:442
7102 msgid "show resolve-undo information"
7105 #: builtin/ls-files.c:444
7106 msgid "skip files matching pattern"
7109 #: builtin/ls-files.c:447
7110 msgid "exclude patterns are read from <file>"
7113 #: builtin/ls-files.c:450
7114 msgid "read additional per-directory exclude patterns in <file>"
7117 #: builtin/ls-files.c:452
7118 msgid "add the standard git exclusions"
7121 #: builtin/ls-files.c:455
7122 msgid "make the output relative to the project top directory"
7125 #: builtin/ls-files.c:458
7126 msgid "if any <file> is not in the index, treat this as an error"
7129 #: builtin/ls-files.c:459
7133 #: builtin/ls-files.c:460
7134 msgid "pretend that paths removed since <tree-ish> are still present"
7137 #: builtin/ls-files.c:462
7138 msgid "show debugging data"
7141 #: builtin/ls-tree.c:28
7142 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
7145 #: builtin/ls-tree.c:128
7146 msgid "only show trees"
7149 #: builtin/ls-tree.c:130
7150 msgid "recurse into subtrees"
7153 #: builtin/ls-tree.c:132
7154 msgid "show trees when recursing"
7157 #: builtin/ls-tree.c:135
7158 msgid "terminate entries with NUL byte"
7161 #: builtin/ls-tree.c:136
7162 msgid "include object size"
7165 #: builtin/ls-tree.c:138 builtin/ls-tree.c:140
7166 msgid "list only filenames"
7169 #: builtin/ls-tree.c:143
7170 msgid "use full path names"
7173 #: builtin/ls-tree.c:145
7174 msgid "list entire tree; not just current directory (implies --full-name)"
7177 #: builtin/merge.c:45
7178 msgid "git merge [<options>] [<commit>...]"
7181 #: builtin/merge.c:46
7182 msgid "git merge [<options>] <msg> HEAD <commit>"
7185 #: builtin/merge.c:47
7186 msgid "git merge --abort"
7189 #: builtin/merge.c:100
7190 msgid "switch `m' requires a value"
7193 #: builtin/merge.c:137
7195 msgid "Could not find merge strategy '%s'.\n"
7198 #: builtin/merge.c:138
7200 msgid "Available strategies are:"
7203 #: builtin/merge.c:143
7205 msgid "Available custom strategies are:"
7208 #: builtin/merge.c:193 builtin/pull.c:119
7209 msgid "do not show a diffstat at the end of the merge"
7212 #: builtin/merge.c:196 builtin/pull.c:122
7213 msgid "show a diffstat at the end of the merge"
7216 #: builtin/merge.c:197 builtin/pull.c:125
7217 msgid "(synonym to --stat)"
7220 #: builtin/merge.c:199 builtin/pull.c:128
7221 msgid "add (at most <n>) entries from shortlog to merge commit message"
7224 #: builtin/merge.c:202 builtin/pull.c:131
7225 msgid "create a single commit instead of doing a merge"
7228 #: builtin/merge.c:204 builtin/pull.c:134
7229 msgid "perform a commit if the merge succeeds (default)"
7232 #: builtin/merge.c:206 builtin/pull.c:137
7233 msgid "edit message before committing"
7236 #: builtin/merge.c:207
7237 msgid "allow fast-forward (default)"
7240 #: builtin/merge.c:209 builtin/pull.c:143
7241 msgid "abort if fast-forward is not possible"
7244 #: builtin/merge.c:213
7245 msgid "Verify that the named commit has a valid GPG signature"
7248 #: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148
7249 #: builtin/revert.c:89
7253 #: builtin/merge.c:215 builtin/pull.c:149
7254 msgid "merge strategy to use"
7257 #: builtin/merge.c:216 builtin/pull.c:152
7258 msgid "option=value"
7261 #: builtin/merge.c:217 builtin/pull.c:153
7262 msgid "option for selected merge strategy"
7265 #: builtin/merge.c:219
7266 msgid "merge commit message (for a non-fast-forward merge)"
7269 #: builtin/merge.c:223
7270 msgid "abort the current in-progress merge"
7273 #: builtin/merge.c:251
7274 msgid "could not run stash."
7277 #: builtin/merge.c:256
7278 msgid "stash failed"
7281 #: builtin/merge.c:261
7283 msgid "not a valid object: %s"
7286 #: builtin/merge.c:280 builtin/merge.c:297
7287 msgid "read-tree failed"
7290 #: builtin/merge.c:327
7291 msgid " (nothing to squash)"
7294 #: builtin/merge.c:340
7296 msgid "Squash commit -- not updating HEAD\n"
7299 #: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
7300 #: builtin/merge.c:988
7302 msgid "Could not write to '%s'"
7305 #: builtin/merge.c:372
7306 msgid "Writing SQUASH_MSG"
7309 #: builtin/merge.c:374
7310 msgid "Finishing SQUASH_MSG"
7313 #: builtin/merge.c:397
7315 msgid "No merge message -- not updating HEAD\n"
7318 #: builtin/merge.c:447
7320 msgid "'%s' does not point to a commit"
7323 #: builtin/merge.c:537
7325 msgid "Bad branch.%s.mergeoptions string: %s"
7328 #: builtin/merge.c:656
7329 msgid "Not handling anything other than two heads merge."
7332 #: builtin/merge.c:670
7334 msgid "Unknown option for merge-recursive: -X%s"
7337 #: builtin/merge.c:683
7339 msgid "unable to write %s"
7342 #: builtin/merge.c:772
7344 msgid "Could not read from '%s'"
7347 #: builtin/merge.c:781
7349 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7352 #: builtin/merge.c:787
7355 "Please enter a commit message to explain why this merge is necessary,\n"
7356 "especially if it merges an updated upstream into a topic branch.\n"
7358 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
7362 #: builtin/merge.c:811
7363 msgid "Empty commit message."
7366 #: builtin/merge.c:823
7368 msgid "Wonderful.\n"
7371 #: builtin/merge.c:878
7373 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7376 #: builtin/merge.c:894
7378 msgid "'%s' is not a commit"
7381 #: builtin/merge.c:935
7382 msgid "No current branch."
7385 #: builtin/merge.c:937
7386 msgid "No remote for the current branch."
7389 #: builtin/merge.c:939
7390 msgid "No default upstream defined for the current branch."
7393 #: builtin/merge.c:944
7395 msgid "No remote-tracking branch for %s from %s"
7398 #: builtin/merge.c:1079
7400 msgid "could not close '%s'"
7403 #: builtin/merge.c:1206
7404 msgid "There is no merge to abort (MERGE_HEAD missing)."
7407 #: builtin/merge.c:1222
7409 "You have not concluded your merge (MERGE_HEAD exists).\n"
7410 "Please, commit your changes before you merge."
7413 #: builtin/merge.c:1229
7415 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
7416 "Please, commit your changes before you merge."
7419 #: builtin/merge.c:1232
7420 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7423 #: builtin/merge.c:1241
7424 msgid "You cannot combine --squash with --no-ff."
7427 #: builtin/merge.c:1249
7428 msgid "No commit specified and merge.defaultToUpstream not set."
7431 #: builtin/merge.c:1266
7432 msgid "Squash commit into empty head not supported yet"
7435 #: builtin/merge.c:1268
7436 msgid "Non-fast-forward commit does not make sense into an empty head"
7439 #: builtin/merge.c:1274
7441 msgid "%s - not something we can merge"
7444 #: builtin/merge.c:1276
7445 msgid "Can merge only exactly one commit into empty head"
7448 #: builtin/merge.c:1331
7450 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7453 #: builtin/merge.c:1334
7455 msgid "Commit %s has a bad GPG signature allegedly by %s."
7458 #: builtin/merge.c:1337
7460 msgid "Commit %s does not have a GPG signature."
7463 #: builtin/merge.c:1340
7465 msgid "Commit %s has a good GPG signature by %s\n"
7468 #: builtin/merge.c:1423
7470 msgid "Updating %s..%s\n"
7473 #: builtin/merge.c:1460
7475 msgid "Trying really trivial in-index merge...\n"
7478 #: builtin/merge.c:1467
7483 #: builtin/merge.c:1499
7484 msgid "Not possible to fast-forward, aborting."
7487 #: builtin/merge.c:1522 builtin/merge.c:1601
7489 msgid "Rewinding the tree to pristine...\n"
7492 #: builtin/merge.c:1526
7494 msgid "Trying merge strategy %s...\n"
7497 #: builtin/merge.c:1592
7499 msgid "No merge strategy handled the merge.\n"
7502 #: builtin/merge.c:1594
7504 msgid "Merge with strategy %s failed.\n"
7507 #: builtin/merge.c:1603
7509 msgid "Using the %s to prepare resolving by hand.\n"
7512 #: builtin/merge.c:1615
7514 msgid "Automatic merge went well; stopped before committing as requested\n"
7517 #: builtin/merge-base.c:29
7518 msgid "git merge-base [-a | --all] <commit> <commit>..."
7521 #: builtin/merge-base.c:30
7522 msgid "git merge-base [-a | --all] --octopus <commit>..."
7525 #: builtin/merge-base.c:31
7526 msgid "git merge-base --independent <commit>..."
7529 #: builtin/merge-base.c:32
7530 msgid "git merge-base --is-ancestor <commit> <commit>"
7533 #: builtin/merge-base.c:33
7534 msgid "git merge-base --fork-point <ref> [<commit>]"
7537 #: builtin/merge-base.c:214
7538 msgid "output all common ancestors"
7541 #: builtin/merge-base.c:216
7542 msgid "find ancestors for a single n-way merge"
7545 #: builtin/merge-base.c:218
7546 msgid "list revs not reachable from others"
7549 #: builtin/merge-base.c:220
7550 msgid "is the first one ancestor of the other?"
7553 #: builtin/merge-base.c:222
7554 msgid "find where <commit> forked from reflog of <ref>"
7557 #: builtin/merge-file.c:8
7559 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7560 "<orig-file> <file2>"
7563 #: builtin/merge-file.c:33
7564 msgid "send results to standard output"
7567 #: builtin/merge-file.c:34
7568 msgid "use a diff3 based merge"
7571 #: builtin/merge-file.c:35
7572 msgid "for conflicts, use our version"
7575 #: builtin/merge-file.c:37
7576 msgid "for conflicts, use their version"
7579 #: builtin/merge-file.c:39
7580 msgid "for conflicts, use a union version"
7583 #: builtin/merge-file.c:42
7584 msgid "for conflicts, use this marker size"
7587 #: builtin/merge-file.c:43
7588 msgid "do not warn about conflicts"
7591 #: builtin/merge-file.c:45
7592 msgid "set labels for file1/orig-file/file2"
7595 #: builtin/mktree.c:64
7596 msgid "git mktree [-z] [--missing] [--batch]"
7599 #: builtin/mktree.c:150
7600 msgid "input is NUL terminated"
7603 #: builtin/mktree.c:151 builtin/write-tree.c:24
7604 msgid "allow missing objects"
7607 #: builtin/mktree.c:152
7608 msgid "allow creation of more than one tree"
7612 msgid "git mv [<options>] <source>... <destination>"
7617 msgid "Directory %s is in index and no submodule?"
7621 msgid "Please stage your changes to .gitmodules or stash them to proceed"
7626 msgid "%.*s is in index"
7630 msgid "force move/rename even if target exists"
7634 msgid "skip move/rename errors"
7639 msgid "destination '%s' is not a directory"
7644 msgid "Checking rename of '%s' to '%s'\n"
7652 msgid "can not move directory into itself"
7656 msgid "cannot move directory over file"
7660 msgid "source directory is empty"
7664 msgid "not under version control"
7668 msgid "destination exists"
7673 msgid "overwriting '%s'"
7677 msgid "Cannot overwrite"
7681 msgid "multiple sources for the same target"
7685 msgid "destination directory does not exist"
7690 msgid "%s, source=%s, destination=%s"
7695 msgid "Renaming %s to %s\n"
7698 #: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
7700 msgid "renaming '%s' failed"
7703 #: builtin/name-rev.c:251
7704 msgid "git name-rev [<options>] <commit>..."
7707 #: builtin/name-rev.c:252
7708 msgid "git name-rev [<options>] --all"
7711 #: builtin/name-rev.c:253
7712 msgid "git name-rev [<options>] --stdin"
7715 #: builtin/name-rev.c:305
7716 msgid "print only names (no SHA-1)"
7719 #: builtin/name-rev.c:306
7720 msgid "only use tags to name the commits"
7723 #: builtin/name-rev.c:308
7724 msgid "only use refs matching <pattern>"
7727 #: builtin/name-rev.c:310
7728 msgid "list all commits reachable from all refs"
7731 #: builtin/name-rev.c:311
7732 msgid "read from stdin"
7735 #: builtin/name-rev.c:312
7736 msgid "allow to print `undefined` names (default)"
7739 #: builtin/name-rev.c:318
7740 msgid "dereference tags in the input (internal use)"
7743 #: builtin/notes.c:25
7744 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
7747 #: builtin/notes.c:26
7749 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
7750 "| (-c | -C) <object>] [<object>]"
7753 #: builtin/notes.c:27
7754 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
7757 #: builtin/notes.c:28
7759 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
7760 "(-c | -C) <object>] [<object>]"
7763 #: builtin/notes.c:29
7764 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
7767 #: builtin/notes.c:30
7768 msgid "git notes [--ref <notes-ref>] show [<object>]"
7771 #: builtin/notes.c:31
7773 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
7776 #: builtin/notes.c:32
7777 msgid "git notes merge --commit [-v | -q]"
7780 #: builtin/notes.c:33
7781 msgid "git notes merge --abort [-v | -q]"
7784 #: builtin/notes.c:34
7785 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
7788 #: builtin/notes.c:35
7789 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
7792 #: builtin/notes.c:36
7793 msgid "git notes [--ref <notes-ref>] get-ref"
7796 #: builtin/notes.c:41
7797 msgid "git notes [list [<object>]]"
7800 #: builtin/notes.c:46
7801 msgid "git notes add [<options>] [<object>]"
7804 #: builtin/notes.c:51
7805 msgid "git notes copy [<options>] <from-object> <to-object>"
7808 #: builtin/notes.c:52
7809 msgid "git notes copy --stdin [<from-object> <to-object>]..."
7812 #: builtin/notes.c:57
7813 msgid "git notes append [<options>] [<object>]"
7816 #: builtin/notes.c:62
7817 msgid "git notes edit [<object>]"
7820 #: builtin/notes.c:67
7821 msgid "git notes show [<object>]"
7824 #: builtin/notes.c:72
7825 msgid "git notes merge [<options>] <notes-ref>"
7828 #: builtin/notes.c:73
7829 msgid "git notes merge --commit [<options>]"
7832 #: builtin/notes.c:74
7833 msgid "git notes merge --abort [<options>]"
7836 #: builtin/notes.c:79
7837 msgid "git notes remove [<object>]"
7840 #: builtin/notes.c:84
7841 msgid "git notes prune [<options>]"
7844 #: builtin/notes.c:89
7845 msgid "git notes get-ref"
7848 #: builtin/notes.c:147
7850 msgid "unable to start 'show' for object '%s'"
7853 #: builtin/notes.c:151
7854 msgid "could not read 'show' output"
7857 #: builtin/notes.c:159
7859 msgid "failed to finish 'show' for object '%s'"
7862 #: builtin/notes.c:174 builtin/tag.c:248
7864 msgid "could not create file '%s'"
7867 #: builtin/notes.c:193
7868 msgid "Please supply the note contents using either -m or -F option"
7871 #: builtin/notes.c:202
7872 msgid "unable to write note object"
7875 #: builtin/notes.c:204
7877 msgid "The note contents have been left in %s"
7880 #: builtin/notes.c:232 builtin/tag.c:440
7882 msgid "cannot read '%s'"
7885 #: builtin/notes.c:234 builtin/tag.c:443
7887 msgid "could not open or read '%s'"
7890 #: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
7891 #: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
7892 #: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
7893 #: builtin/notes.c:877 builtin/tag.c:456
7895 msgid "Failed to resolve '%s' as a valid ref."
7898 #: builtin/notes.c:256
7900 msgid "Failed to read object '%s'."
7903 #: builtin/notes.c:260
7905 msgid "Cannot read note data from non-blob object '%s'."
7908 #: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490
7909 #: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646
7910 #: builtin/notes.c:942
7911 msgid "too many parameters"
7914 #: builtin/notes.c:372 builtin/notes.c:659
7916 msgid "No note found for object %s."
7919 #: builtin/notes.c:393 builtin/notes.c:556
7920 msgid "note contents as a string"
7923 #: builtin/notes.c:396 builtin/notes.c:559
7924 msgid "note contents in a file"
7927 #: builtin/notes.c:399 builtin/notes.c:562
7928 msgid "reuse and edit specified note object"
7931 #: builtin/notes.c:402 builtin/notes.c:565
7932 msgid "reuse specified note object"
7935 #: builtin/notes.c:405 builtin/notes.c:568
7936 msgid "allow storing empty note"
7939 #: builtin/notes.c:406 builtin/notes.c:477
7940 msgid "replace existing notes"
7943 #: builtin/notes.c:431
7946 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7950 #: builtin/notes.c:446 builtin/notes.c:525
7952 msgid "Overwriting existing notes for object %s\n"
7955 #: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882
7957 msgid "Removing note for object %s\n"
7960 #: builtin/notes.c:478
7961 msgid "read objects from stdin"
7964 #: builtin/notes.c:480
7965 msgid "load rewriting config for <command> (implies --stdin)"
7968 #: builtin/notes.c:498
7969 msgid "too few parameters"
7972 #: builtin/notes.c:519
7975 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7979 #: builtin/notes.c:531
7981 msgid "Missing notes on source object %s. Cannot copy."
7984 #: builtin/notes.c:583
7987 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7988 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7991 #: builtin/notes.c:764
7992 msgid "General options"
7995 #: builtin/notes.c:766
7996 msgid "Merge options"
7999 #: builtin/notes.c:768
8001 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
8005 #: builtin/notes.c:770
8006 msgid "Committing unmerged notes"
8009 #: builtin/notes.c:772
8010 msgid "finalize notes merge by committing unmerged notes"
8013 #: builtin/notes.c:774
8014 msgid "Aborting notes merge resolution"
8017 #: builtin/notes.c:776
8018 msgid "abort notes merge"
8021 #: builtin/notes.c:853
8023 msgid "A notes merge into %s is already in-progress at %s"
8026 #: builtin/notes.c:880
8028 msgid "Object %s has no note\n"
8031 #: builtin/notes.c:892
8032 msgid "attempt to remove non-existent note is not an error"
8035 #: builtin/notes.c:895
8036 msgid "read object names from the standard input"
8039 #: builtin/notes.c:976
8043 #: builtin/notes.c:977
8044 msgid "use notes from <notes-ref>"
8047 #: builtin/notes.c:1012 builtin/remote.c:1647
8049 msgid "Unknown subcommand: %s"
8052 #: builtin/pack-objects.c:28
8054 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
8057 #: builtin/pack-objects.c:29
8059 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
8062 #: builtin/pack-objects.c:175 builtin/pack-objects.c:178
8064 msgid "deflate error (%d)"
8067 #: builtin/pack-objects.c:771
8068 msgid "Writing objects"
8071 #: builtin/pack-objects.c:1011
8072 msgid "disabling bitmap writing, as some objects are not being packed"
8075 #: builtin/pack-objects.c:2171
8076 msgid "Compressing objects"
8079 #: builtin/pack-objects.c:2568
8081 msgid "unsupported index version %s"
8084 #: builtin/pack-objects.c:2572
8086 msgid "bad index version '%s'"
8089 #: builtin/pack-objects.c:2602
8090 msgid "do not show progress meter"
8093 #: builtin/pack-objects.c:2604
8094 msgid "show progress meter"
8097 #: builtin/pack-objects.c:2606
8098 msgid "show progress meter during object writing phase"
8101 #: builtin/pack-objects.c:2609
8102 msgid "similar to --all-progress when progress meter is shown"
8105 #: builtin/pack-objects.c:2610
8106 msgid "version[,offset]"
8109 #: builtin/pack-objects.c:2611
8110 msgid "write the pack index file in the specified idx format version"
8113 #: builtin/pack-objects.c:2614
8114 msgid "maximum size of each output pack file"
8117 #: builtin/pack-objects.c:2616
8118 msgid "ignore borrowed objects from alternate object store"
8121 #: builtin/pack-objects.c:2618
8122 msgid "ignore packed objects"
8125 #: builtin/pack-objects.c:2620
8126 msgid "limit pack window by objects"
8129 #: builtin/pack-objects.c:2622
8130 msgid "limit pack window by memory in addition to object limit"
8133 #: builtin/pack-objects.c:2624
8134 msgid "maximum length of delta chain allowed in the resulting pack"
8137 #: builtin/pack-objects.c:2626
8138 msgid "reuse existing deltas"
8141 #: builtin/pack-objects.c:2628
8142 msgid "reuse existing objects"
8145 #: builtin/pack-objects.c:2630
8146 msgid "use OFS_DELTA objects"
8149 #: builtin/pack-objects.c:2632
8150 msgid "use threads when searching for best delta matches"
8153 #: builtin/pack-objects.c:2634
8154 msgid "do not create an empty pack output"
8157 #: builtin/pack-objects.c:2636
8158 msgid "read revision arguments from standard input"
8161 #: builtin/pack-objects.c:2638
8162 msgid "limit the objects to those that are not yet packed"
8165 #: builtin/pack-objects.c:2641
8166 msgid "include objects reachable from any reference"
8169 #: builtin/pack-objects.c:2644
8170 msgid "include objects referred by reflog entries"
8173 #: builtin/pack-objects.c:2647
8174 msgid "include objects referred to by the index"
8177 #: builtin/pack-objects.c:2650
8178 msgid "output pack to stdout"
8181 #: builtin/pack-objects.c:2652
8182 msgid "include tag objects that refer to objects to be packed"
8185 #: builtin/pack-objects.c:2654
8186 msgid "keep unreachable objects"
8189 #: builtin/pack-objects.c:2655 parse-options.h:142
8193 #: builtin/pack-objects.c:2656
8194 msgid "unpack unreachable objects newer than <time>"
8197 #: builtin/pack-objects.c:2659
8198 msgid "create thin packs"
8201 #: builtin/pack-objects.c:2661
8202 msgid "create packs suitable for shallow fetches"
8205 #: builtin/pack-objects.c:2663
8206 msgid "ignore packs that have companion .keep file"
8209 #: builtin/pack-objects.c:2665
8210 msgid "pack compression level"
8213 #: builtin/pack-objects.c:2667
8214 msgid "do not hide commits by grafts"
8217 #: builtin/pack-objects.c:2669
8218 msgid "use a bitmap index if available to speed up counting objects"
8221 #: builtin/pack-objects.c:2671
8222 msgid "write a bitmap index together with the pack index"
8225 #: builtin/pack-objects.c:2762
8226 msgid "Counting objects"
8229 #: builtin/pack-refs.c:6
8230 msgid "git pack-refs [<options>]"
8233 #: builtin/pack-refs.c:14
8234 msgid "pack everything"
8237 #: builtin/pack-refs.c:15
8238 msgid "prune loose refs (default)"
8241 #: builtin/prune-packed.c:7
8242 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8245 #: builtin/prune-packed.c:40
8246 msgid "Removing duplicate objects"
8249 #: builtin/prune.c:11
8250 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
8253 #: builtin/prune.c:105 builtin/worktree.c:124
8254 msgid "do not remove, show only"
8257 #: builtin/prune.c:106 builtin/worktree.c:125
8258 msgid "report pruned objects"
8261 #: builtin/prune.c:109 builtin/worktree.c:127
8262 msgid "expire objects older than <time>"
8265 #: builtin/prune.c:123
8266 msgid "cannot prune in a precious-objects repo"
8269 #: builtin/pull.c:69
8270 msgid "git pull [<options>] [<repository> [<refspec>...]]"
8273 #: builtin/pull.c:113
8274 msgid "Options related to merging"
8277 #: builtin/pull.c:116
8278 msgid "incorporate changes by rebasing rather than merging"
8281 #: builtin/pull.c:140 builtin/revert.c:105
8282 msgid "allow fast-forward"
8285 #: builtin/pull.c:146
8286 msgid "verify that the named commit has a valid GPG signature"
8289 #: builtin/pull.c:160
8290 msgid "Options related to fetching"
8293 #: builtin/pull.c:268
8295 msgid "Invalid value for pull.ff: %s"
8298 #: builtin/pull.c:352
8299 msgid "Cannot pull with rebase: You have unstaged changes."
8302 #: builtin/pull.c:358
8303 msgid "Additionally, your index contains uncommitted changes."
8306 #: builtin/pull.c:360
8307 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
8310 #: builtin/pull.c:436
8312 "There is no candidate for rebasing against among the refs that you just "
8316 #: builtin/pull.c:438
8318 "There are no candidates for merging among the refs that you just fetched."
8321 #: builtin/pull.c:439
8323 "Generally this means that you provided a wildcard refspec which had no\n"
8324 "matches on the remote end."
8327 #: builtin/pull.c:442
8330 "You asked to pull from the remote '%s', but did not specify\n"
8331 "a branch. Because this is not the default configured remote\n"
8332 "for your current branch, you must specify a branch on the command line."
8335 #: builtin/pull.c:447
8336 msgid "You are not currently on a branch."
8339 #: builtin/pull.c:449 builtin/pull.c:464
8340 msgid "Please specify which branch you want to rebase against."
8343 #: builtin/pull.c:451 builtin/pull.c:466
8344 msgid "Please specify which branch you want to merge with."
8347 #: builtin/pull.c:452 builtin/pull.c:467
8348 msgid "See git-pull(1) for details."
8351 #: builtin/pull.c:462
8352 msgid "There is no tracking information for the current branch."
8355 #: builtin/pull.c:471
8358 "If you wish to set tracking information for this branch you can do so with:\n"
8360 " git branch --set-upstream-to=%s/<branch> %s\n"
8363 #: builtin/pull.c:476
8366 "Your configuration specifies to merge with the ref '%s'\n"
8367 "from the remote, but no such ref was fetched."
8370 #: builtin/pull.c:830
8371 msgid "Updating an unborn branch with changes added to the index."
8374 #: builtin/pull.c:859
8377 "fetch updated the current branch head.\n"
8378 "fast-forwarding your working tree from\n"
8382 #: builtin/pull.c:864
8385 "Cannot fast-forward your working tree.\n"
8386 "After making sure that you saved anything precious from\n"
8389 "$ git reset --hard\n"
8393 #: builtin/pull.c:879
8394 msgid "Cannot merge multiple branches into empty head."
8397 #: builtin/pull.c:883
8398 msgid "Cannot rebase onto multiple branches."
8401 #: builtin/push.c:15
8402 msgid "git push [<options>] [<repository> [<refspec>...]]"
8405 #: builtin/push.c:86
8406 msgid "tag shorthand without <tag>"
8409 #: builtin/push.c:96
8410 msgid "--delete only accepts plain target ref names"
8413 #: builtin/push.c:140
8416 "To choose either option permanently, see push.default in 'git help config'."
8419 #: builtin/push.c:143
8422 "The upstream branch of your current branch does not match\n"
8423 "the name of your current branch. To push to the upstream branch\n"
8424 "on the remote, use\n"
8426 " git push %s HEAD:%s\n"
8428 "To push to the branch of the same name on the remote, use\n"
8434 #: builtin/push.c:158
8437 "You are not currently on a branch.\n"
8438 "To push the history leading to the current (detached HEAD)\n"
8441 " git push %s HEAD:<name-of-remote-branch>\n"
8444 #: builtin/push.c:172
8447 "The current branch %s has no upstream branch.\n"
8448 "To push the current branch and set the remote as upstream, use\n"
8450 " git push --set-upstream %s %s\n"
8453 #: builtin/push.c:180
8455 msgid "The current branch %s has multiple upstream branches, refusing to push."
8458 #: builtin/push.c:183
8461 "You are pushing to remote '%s', which is not the upstream of\n"
8462 "your current branch '%s', without telling me what to push\n"
8463 "to update which remote branch."
8466 #: builtin/push.c:206
8468 "push.default is unset; its implicit value has changed in\n"
8469 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
8470 "and maintain the traditional behavior, use:\n"
8472 " git config --global push.default matching\n"
8474 "To squelch this message and adopt the new behavior now, use:\n"
8476 " git config --global push.default simple\n"
8478 "When push.default is set to 'matching', git will push local branches\n"
8479 "to the remote branches that already exist with the same name.\n"
8481 "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
8482 "behavior, which only pushes the current branch to the corresponding\n"
8483 "remote branch that 'git pull' uses to update the current branch.\n"
8485 "See 'git help config' and search for 'push.default' for further "
8487 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8488 "'current' instead of 'simple' if you sometimes use older versions of Git)"
8491 #: builtin/push.c:273
8493 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
8496 #: builtin/push.c:280
8498 "Updates were rejected because the tip of your current branch is behind\n"
8499 "its remote counterpart. Integrate the remote changes (e.g.\n"
8500 "'git pull ...') before pushing again.\n"
8501 "See the 'Note about fast-forwards' in 'git push --help' for details."
8504 #: builtin/push.c:286
8506 "Updates were rejected because a pushed branch tip is behind its remote\n"
8507 "counterpart. Check out this branch and integrate the remote changes\n"
8508 "(e.g. 'git pull ...') before pushing again.\n"
8509 "See the 'Note about fast-forwards' in 'git push --help' for details."
8512 #: builtin/push.c:292
8514 "Updates were rejected because the remote contains work that you do\n"
8515 "not have locally. This is usually caused by another repository pushing\n"
8516 "to the same ref. You may want to first integrate the remote changes\n"
8517 "(e.g., 'git pull ...') before pushing again.\n"
8518 "See the 'Note about fast-forwards' in 'git push --help' for details."
8521 #: builtin/push.c:299
8522 msgid "Updates were rejected because the tag already exists in the remote."
8525 #: builtin/push.c:302
8527 "You cannot update a remote ref that points at a non-commit object,\n"
8528 "or update a remote ref to make it point at a non-commit object,\n"
8529 "without using the '--force' option.\n"
8532 #: builtin/push.c:361
8534 msgid "Pushing to %s\n"
8537 #: builtin/push.c:365
8539 msgid "failed to push some refs to '%s'"
8542 #: builtin/push.c:395
8544 msgid "bad repository '%s'"
8547 #: builtin/push.c:396
8549 "No configured push destination.\n"
8550 "Either specify the URL from the command-line or configure a remote "
8551 "repository using\n"
8553 " git remote add <name> <url>\n"
8555 "and then push using the remote name\n"
8557 " git push <name>\n"
8560 #: builtin/push.c:411
8561 msgid "--all and --tags are incompatible"
8564 #: builtin/push.c:412
8565 msgid "--all can't be combined with refspecs"
8568 #: builtin/push.c:417
8569 msgid "--mirror and --tags are incompatible"
8572 #: builtin/push.c:418
8573 msgid "--mirror can't be combined with refspecs"
8576 #: builtin/push.c:423
8577 msgid "--all and --mirror are incompatible"
8580 #: builtin/push.c:539
8584 #: builtin/push.c:540 builtin/send-pack.c:161
8585 msgid "push all refs"
8588 #: builtin/push.c:541 builtin/send-pack.c:163
8589 msgid "mirror all refs"
8592 #: builtin/push.c:543
8596 #: builtin/push.c:544
8597 msgid "push tags (can't be used with --all or --mirror)"
8600 #: builtin/push.c:547 builtin/send-pack.c:164
8601 msgid "force updates"
8604 #: builtin/push.c:549 builtin/send-pack.c:175
8605 msgid "refname>:<expect"
8608 #: builtin/push.c:550 builtin/send-pack.c:176
8609 msgid "require old value of ref to be at this value"
8612 #: builtin/push.c:553
8613 msgid "control recursive pushing of submodules"
8616 #: builtin/push.c:555 builtin/send-pack.c:169
8617 msgid "use thin pack"
8620 #: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158
8621 #: builtin/send-pack.c:159
8622 msgid "receive pack program"
8625 #: builtin/push.c:558
8626 msgid "set upstream for git pull/status"
8629 #: builtin/push.c:561
8630 msgid "prune locally removed refs"
8633 #: builtin/push.c:563
8634 msgid "bypass pre-push hook"
8637 #: builtin/push.c:564
8638 msgid "push missing but relevant tags"
8641 #: builtin/push.c:567 builtin/send-pack.c:166
8642 msgid "GPG sign the push"
8645 #: builtin/push.c:569 builtin/send-pack.c:170
8646 msgid "request atomic transaction on remote side"
8649 #: builtin/push.c:579
8650 msgid "--delete is incompatible with --all, --mirror and --tags"
8653 #: builtin/push.c:581
8654 msgid "--delete doesn't make sense without any refs"
8657 #: builtin/read-tree.c:37
8659 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
8660 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8661 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8664 #: builtin/read-tree.c:110
8665 msgid "write resulting index to <file>"
8668 #: builtin/read-tree.c:113
8669 msgid "only empty the index"
8672 #: builtin/read-tree.c:115
8676 #: builtin/read-tree.c:117
8677 msgid "perform a merge in addition to a read"
8680 #: builtin/read-tree.c:119
8681 msgid "3-way merge if no file level merging required"
8684 #: builtin/read-tree.c:121
8685 msgid "3-way merge in presence of adds and removes"
8688 #: builtin/read-tree.c:123
8689 msgid "same as -m, but discard unmerged entries"
8692 #: builtin/read-tree.c:124
8693 msgid "<subdirectory>/"
8696 #: builtin/read-tree.c:125
8697 msgid "read the tree into the index under <subdirectory>/"
8700 #: builtin/read-tree.c:128
8701 msgid "update working tree with merge result"
8704 #: builtin/read-tree.c:130
8708 #: builtin/read-tree.c:131
8709 msgid "allow explicitly ignored files to be overwritten"
8712 #: builtin/read-tree.c:134
8713 msgid "don't check the working tree after merging"
8716 #: builtin/read-tree.c:135
8717 msgid "don't update the index or the work tree"
8720 #: builtin/read-tree.c:137
8721 msgid "skip applying sparse checkout filter"
8724 #: builtin/read-tree.c:139
8725 msgid "debug unpack-trees"
8728 #: builtin/reflog.c:428
8730 msgid "'%s' for '%s' is not a valid timestamp"
8733 #: builtin/reflog.c:545 builtin/reflog.c:550
8735 msgid "'%s' is not a valid timestamp"
8738 #: builtin/remote.c:12
8739 msgid "git remote [-v | --verbose]"
8742 #: builtin/remote.c:13
8744 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
8745 "mirror=<fetch|push>] <name> <url>"
8748 #: builtin/remote.c:14 builtin/remote.c:34
8749 msgid "git remote rename <old> <new>"
8752 #: builtin/remote.c:15 builtin/remote.c:39
8753 msgid "git remote remove <name>"
8756 #: builtin/remote.c:16 builtin/remote.c:44
8757 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8760 #: builtin/remote.c:17
8761 msgid "git remote [-v | --verbose] show [-n] <name>"
8764 #: builtin/remote.c:18
8765 msgid "git remote prune [-n | --dry-run] <name>"
8768 #: builtin/remote.c:19
8770 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8773 #: builtin/remote.c:20
8774 msgid "git remote set-branches [--add] <name> <branch>..."
8777 #: builtin/remote.c:21 builtin/remote.c:70
8778 msgid "git remote get-url [--push] [--all] <name>"
8781 #: builtin/remote.c:22 builtin/remote.c:75
8782 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
8785 #: builtin/remote.c:23 builtin/remote.c:76
8786 msgid "git remote set-url --add <name> <newurl>"
8789 #: builtin/remote.c:24 builtin/remote.c:77
8790 msgid "git remote set-url --delete <name> <url>"
8793 #: builtin/remote.c:29
8794 msgid "git remote add [<options>] <name> <url>"
8797 #: builtin/remote.c:49
8798 msgid "git remote set-branches <name> <branch>..."
8801 #: builtin/remote.c:50
8802 msgid "git remote set-branches --add <name> <branch>..."
8805 #: builtin/remote.c:55
8806 msgid "git remote show [<options>] <name>"
8809 #: builtin/remote.c:60
8810 msgid "git remote prune [<options>] <name>"
8813 #: builtin/remote.c:65
8814 msgid "git remote update [<options>] [<group> | <remote>]..."
8817 #: builtin/remote.c:94
8822 #: builtin/remote.c:126
8824 "--mirror is dangerous and deprecated; please\n"
8825 "\t use --mirror=fetch or --mirror=push instead"
8828 #: builtin/remote.c:143
8830 msgid "unknown mirror argument: %s"
8833 #: builtin/remote.c:159
8834 msgid "fetch the remote branches"
8837 #: builtin/remote.c:161
8838 msgid "import all tags and associated objects when fetching"
8841 #: builtin/remote.c:164
8842 msgid "or do not fetch any tag at all (--no-tags)"
8845 #: builtin/remote.c:166
8846 msgid "branch(es) to track"
8849 #: builtin/remote.c:167
8850 msgid "master branch"
8853 #: builtin/remote.c:168
8857 #: builtin/remote.c:169
8858 msgid "set up remote as a mirror to push to or fetch from"
8861 #: builtin/remote.c:181
8862 msgid "specifying a master branch makes no sense with --mirror"
8865 #: builtin/remote.c:183
8866 msgid "specifying branches to track makes sense only with fetch mirrors"
8869 #: builtin/remote.c:193 builtin/remote.c:643
8871 msgid "remote %s already exists."
8874 #: builtin/remote.c:197 builtin/remote.c:647
8876 msgid "'%s' is not a valid remote name"
8879 #: builtin/remote.c:241
8881 msgid "Could not setup master '%s'"
8884 #: builtin/remote.c:341
8886 msgid "Could not get fetch map for refspec %s"
8889 #: builtin/remote.c:442 builtin/remote.c:450
8893 #: builtin/remote.c:454
8897 #: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
8899 msgid "Could not append '%s' to '%s'"
8902 #: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
8904 msgid "No such remote: %s"
8907 #: builtin/remote.c:653
8909 msgid "Could not rename config section '%s' to '%s'"
8912 #: builtin/remote.c:659 builtin/remote.c:827
8914 msgid "Could not remove config section '%s'"
8917 #: builtin/remote.c:674
8920 "Not updating non-default fetch refspec\n"
8922 "\tPlease update the configuration manually if necessary."
8925 #: builtin/remote.c:680
8927 msgid "Could not append '%s'"
8930 #: builtin/remote.c:691
8932 msgid "Could not set '%s'"
8935 #: builtin/remote.c:713
8937 msgid "deleting '%s' failed"
8940 #: builtin/remote.c:747
8942 msgid "creating '%s' failed"
8945 #: builtin/remote.c:813
8947 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8948 "to delete it, use:"
8950 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8951 "to delete them, use:"
8955 #: builtin/remote.c:928
8957 msgid " new (next fetch will store in remotes/%s)"
8960 #: builtin/remote.c:931
8964 #: builtin/remote.c:933
8965 msgid " stale (use 'git remote prune' to remove)"
8968 #: builtin/remote.c:935
8972 #: builtin/remote.c:976
8974 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8977 #: builtin/remote.c:983
8979 msgid "rebases onto remote %s"
8982 #: builtin/remote.c:986
8984 msgid " merges with remote %s"
8987 #: builtin/remote.c:987
8988 msgid " and with remote"
8991 #: builtin/remote.c:989
8993 msgid "merges with remote %s"
8996 #: builtin/remote.c:990
8997 msgid " and with remote"
9000 #: builtin/remote.c:1036
9004 #: builtin/remote.c:1039
9008 #: builtin/remote.c:1043
9012 #: builtin/remote.c:1046
9013 msgid "fast-forwardable"
9016 #: builtin/remote.c:1049
9017 msgid "local out of date"
9020 #: builtin/remote.c:1056
9022 msgid " %-*s forces to %-*s (%s)"
9025 #: builtin/remote.c:1059
9027 msgid " %-*s pushes to %-*s (%s)"
9030 #: builtin/remote.c:1063
9032 msgid " %-*s forces to %s"
9035 #: builtin/remote.c:1066
9037 msgid " %-*s pushes to %s"
9040 #: builtin/remote.c:1134
9041 msgid "do not query remotes"
9044 #: builtin/remote.c:1161
9049 #: builtin/remote.c:1162
9051 msgid " Fetch URL: %s"
9054 #: builtin/remote.c:1163 builtin/remote.c:1314
9058 #: builtin/remote.c:1172 builtin/remote.c:1174
9060 msgid " Push URL: %s"
9063 #: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
9065 msgid " HEAD branch: %s"
9068 #: builtin/remote.c:1182
9071 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
9074 #: builtin/remote.c:1194
9076 msgid " Remote branch:%s"
9077 msgid_plural " Remote branches:%s"
9081 #: builtin/remote.c:1197 builtin/remote.c:1224
9082 msgid " (status not queried)"
9085 #: builtin/remote.c:1206
9086 msgid " Local branch configured for 'git pull':"
9087 msgid_plural " Local branches configured for 'git pull':"
9091 #: builtin/remote.c:1214
9092 msgid " Local refs will be mirrored by 'git push'"
9095 #: builtin/remote.c:1221
9097 msgid " Local ref configured for 'git push'%s:"
9098 msgid_plural " Local refs configured for 'git push'%s:"
9102 #: builtin/remote.c:1242
9103 msgid "set refs/remotes/<name>/HEAD according to remote"
9106 #: builtin/remote.c:1244
9107 msgid "delete refs/remotes/<name>/HEAD"
9110 #: builtin/remote.c:1259
9111 msgid "Cannot determine remote HEAD"
9114 #: builtin/remote.c:1261
9115 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
9118 #: builtin/remote.c:1271
9120 msgid "Could not delete %s"
9123 #: builtin/remote.c:1279
9125 msgid "Not a valid ref: %s"
9128 #: builtin/remote.c:1281
9130 msgid "Could not setup %s"
9133 #: builtin/remote.c:1299
9135 msgid " %s will become dangling!"
9138 #: builtin/remote.c:1300
9140 msgid " %s has become dangling!"
9143 #: builtin/remote.c:1310
9148 #: builtin/remote.c:1311
9153 #: builtin/remote.c:1327
9155 msgid " * [would prune] %s"
9158 #: builtin/remote.c:1330
9160 msgid " * [pruned] %s"
9163 #: builtin/remote.c:1375
9164 msgid "prune remotes after fetching"
9167 #: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
9169 msgid "No such remote '%s'"
9172 #: builtin/remote.c:1461
9176 #: builtin/remote.c:1468
9177 msgid "no remote specified"
9180 #: builtin/remote.c:1485
9181 msgid "query push URLs rather than fetch URLs"
9184 #: builtin/remote.c:1487
9185 msgid "return all URLs"
9188 #: builtin/remote.c:1515
9190 msgid "no URLs configured for remote '%s'"
9193 #: builtin/remote.c:1541
9194 msgid "manipulate push URLs"
9197 #: builtin/remote.c:1543
9201 #: builtin/remote.c:1545
9205 #: builtin/remote.c:1552
9206 msgid "--add --delete doesn't make sense"
9209 #: builtin/remote.c:1592
9211 msgid "Invalid old URL pattern: %s"
9214 #: builtin/remote.c:1600
9216 msgid "No such URL found: %s"
9219 #: builtin/remote.c:1602
9220 msgid "Will not delete all non-push URLs"
9223 #: builtin/remote.c:1616
9224 msgid "be verbose; must be placed before a subcommand"
9227 #: builtin/repack.c:17
9228 msgid "git repack [<options>]"
9231 #: builtin/repack.c:159
9232 msgid "pack everything in a single pack"
9235 #: builtin/repack.c:161
9236 msgid "same as -a, and turn unreachable objects loose"
9239 #: builtin/repack.c:164
9240 msgid "remove redundant packs, and run git-prune-packed"
9243 #: builtin/repack.c:166
9244 msgid "pass --no-reuse-delta to git-pack-objects"
9247 #: builtin/repack.c:168
9248 msgid "pass --no-reuse-object to git-pack-objects"
9251 #: builtin/repack.c:170
9252 msgid "do not run git-update-server-info"
9255 #: builtin/repack.c:173
9256 msgid "pass --local to git-pack-objects"
9259 #: builtin/repack.c:175
9260 msgid "write bitmap index"
9263 #: builtin/repack.c:176
9267 #: builtin/repack.c:177
9268 msgid "with -A, do not loosen objects older than this"
9271 #: builtin/repack.c:179
9272 msgid "size of the window used for delta compression"
9275 #: builtin/repack.c:180 builtin/repack.c:184
9279 #: builtin/repack.c:181
9280 msgid "same as the above, but limit memory size instead of entries count"
9283 #: builtin/repack.c:183
9284 msgid "limits the maximum delta depth"
9287 #: builtin/repack.c:185
9288 msgid "maximum size of each packfile"
9291 #: builtin/repack.c:187
9292 msgid "repack objects in packs marked with .keep"
9295 #: builtin/repack.c:197
9296 msgid "cannot delete packs in a precious-objects repo"
9299 #: builtin/repack.c:381
9301 msgid "removing '%s' failed"
9304 #: builtin/replace.c:19
9305 msgid "git replace [-f] <object> <replacement>"
9308 #: builtin/replace.c:20
9309 msgid "git replace [-f] --edit <object>"
9312 #: builtin/replace.c:21
9313 msgid "git replace [-f] --graft <commit> [<parent>...]"
9316 #: builtin/replace.c:22
9317 msgid "git replace -d <object>..."
9320 #: builtin/replace.c:23
9321 msgid "git replace [--format=<format>] [-l [<pattern>]]"
9324 #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
9326 msgid "Not a valid object name: '%s'"
9329 #: builtin/replace.c:355
9331 msgid "bad mergetag in commit '%s'"
9334 #: builtin/replace.c:357
9336 msgid "malformed mergetag in commit '%s'"
9339 #: builtin/replace.c:368
9342 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9343 "instead of --graft"
9346 #: builtin/replace.c:401
9348 msgid "the original commit '%s' has a gpg signature."
9351 #: builtin/replace.c:402
9352 msgid "the signature will be removed in the replacement commit!"
9355 #: builtin/replace.c:408
9357 msgid "could not write replacement commit for: '%s'"
9360 #: builtin/replace.c:432
9361 msgid "list replace refs"
9364 #: builtin/replace.c:433
9365 msgid "delete replace refs"
9368 #: builtin/replace.c:434
9369 msgid "edit existing object"
9372 #: builtin/replace.c:435
9373 msgid "change a commit's parents"
9376 #: builtin/replace.c:436
9377 msgid "replace the ref if it exists"
9380 #: builtin/replace.c:437
9381 msgid "do not pretty-print contents for --edit"
9384 #: builtin/replace.c:438
9385 msgid "use this format"
9388 #: builtin/rerere.c:12
9389 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9392 #: builtin/rerere.c:58
9393 msgid "register clean resolutions in index"
9396 #: builtin/reset.c:26
9398 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
9401 #: builtin/reset.c:27
9402 msgid "git reset [-q] <tree-ish> [--] <paths>..."
9405 #: builtin/reset.c:28
9406 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9409 #: builtin/reset.c:34
9413 #: builtin/reset.c:34
9417 #: builtin/reset.c:34
9421 #: builtin/reset.c:34
9425 #: builtin/reset.c:34
9429 #: builtin/reset.c:74
9430 msgid "You do not have a valid HEAD."
9433 #: builtin/reset.c:76
9434 msgid "Failed to find tree of HEAD."
9437 #: builtin/reset.c:82
9439 msgid "Failed to find tree of %s."
9442 #: builtin/reset.c:100
9444 msgid "HEAD is now at %s"
9447 #: builtin/reset.c:183
9449 msgid "Cannot do a %s reset in the middle of a merge."
9452 #: builtin/reset.c:276
9453 msgid "be quiet, only report errors"
9456 #: builtin/reset.c:278
9457 msgid "reset HEAD and index"
9460 #: builtin/reset.c:279
9461 msgid "reset only HEAD"
9464 #: builtin/reset.c:281 builtin/reset.c:283
9465 msgid "reset HEAD, index and working tree"
9468 #: builtin/reset.c:285
9469 msgid "reset HEAD but keep local changes"
9472 #: builtin/reset.c:288
9473 msgid "record only the fact that removed paths will be added later"
9476 #: builtin/reset.c:305
9478 msgid "Failed to resolve '%s' as a valid revision."
9481 #: builtin/reset.c:313
9483 msgid "Failed to resolve '%s' as a valid tree."
9486 #: builtin/reset.c:322
9487 msgid "--patch is incompatible with --{hard,mixed,soft}"
9490 #: builtin/reset.c:331
9491 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
9494 #: builtin/reset.c:333
9496 msgid "Cannot do %s reset with paths."
9499 #: builtin/reset.c:343
9501 msgid "%s reset is not allowed in a bare repository"
9504 #: builtin/reset.c:347
9505 msgid "-N can only be used with --mixed"
9508 #: builtin/reset.c:364
9509 msgid "Unstaged changes after reset:"
9512 #: builtin/reset.c:370
9514 msgid "Could not reset index file to revision '%s'."
9517 #: builtin/reset.c:374
9518 msgid "Could not write new index file."
9521 #: builtin/rev-list.c:354
9522 msgid "rev-list does not support display of notes"
9525 #: builtin/rev-parse.c:358
9526 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
9529 #: builtin/rev-parse.c:363
9530 msgid "keep the `--` passed as an arg"
9533 #: builtin/rev-parse.c:365
9534 msgid "stop parsing after the first non-option argument"
9537 #: builtin/rev-parse.c:368
9538 msgid "output in stuck long form"
9541 #: builtin/rev-parse.c:499
9543 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
9544 " or: git rev-parse --sq-quote [<arg>...]\n"
9545 " or: git rev-parse [<options>] [<arg>...]\n"
9547 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9550 #: builtin/revert.c:22
9551 msgid "git revert [<options>] <commit-ish>..."
9554 #: builtin/revert.c:23
9555 msgid "git revert <subcommand>"
9558 #: builtin/revert.c:28
9559 msgid "git cherry-pick [<options>] <commit-ish>..."
9562 #: builtin/revert.c:29
9563 msgid "git cherry-pick <subcommand>"
9566 #: builtin/revert.c:71
9568 msgid "%s: %s cannot be used with %s"
9571 #: builtin/revert.c:80
9572 msgid "end revert or cherry-pick sequence"
9575 #: builtin/revert.c:81
9576 msgid "resume revert or cherry-pick sequence"
9579 #: builtin/revert.c:82
9580 msgid "cancel revert or cherry-pick sequence"
9583 #: builtin/revert.c:83
9584 msgid "don't automatically commit"
9587 #: builtin/revert.c:84
9588 msgid "edit the commit message"
9591 #: builtin/revert.c:87
9592 msgid "parent number"
9595 #: builtin/revert.c:89
9596 msgid "merge strategy"
9599 #: builtin/revert.c:90
9603 #: builtin/revert.c:91
9604 msgid "option for merge strategy"
9607 #: builtin/revert.c:104
9608 msgid "append commit name"
9611 #: builtin/revert.c:106
9612 msgid "preserve initially empty commits"
9615 #: builtin/revert.c:107
9616 msgid "allow commits with empty messages"
9619 #: builtin/revert.c:108
9620 msgid "keep redundant, empty commits"
9623 #: builtin/revert.c:112
9624 msgid "program error"
9627 #: builtin/revert.c:197
9628 msgid "revert failed"
9631 #: builtin/revert.c:212
9632 msgid "cherry-pick failed"
9636 msgid "git rm [<options>] [--] <file>..."
9641 "the following submodule (or one of its nested submodules)\n"
9642 "uses a .git directory:"
9644 "the following submodules (or one of their nested submodules)\n"
9645 "use a .git directory:"
9652 "(use 'rm -rf' if you really want to remove it including all of its history)"
9657 "the following file has staged content different from both the\n"
9658 "file and the HEAD:"
9660 "the following files have staged content different from both the\n"
9661 "file and the HEAD:"
9668 "(use -f to force removal)"
9672 msgid "the following file has changes staged in the index:"
9673 msgid_plural "the following files have changes staged in the index:"
9677 #: builtin/rm.c:243 builtin/rm.c:254
9680 "(use --cached to keep the file, or -f to force removal)"
9684 msgid "the following file has local modifications:"
9685 msgid_plural "the following files have local modifications:"
9690 msgid "do not list removed files"
9694 msgid "only remove from the index"
9698 msgid "override the up-to-date check"
9702 msgid "allow recursive removal"
9706 msgid "exit with a zero status even if nothing matched"
9710 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9715 msgid "not removing '%s' recursively without -r"
9720 msgid "git rm: unable to remove %s"
9723 #: builtin/send-pack.c:18
9725 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
9726 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
9728 " --all and explicit <ref> specification are mutually exclusive."
9731 #: builtin/send-pack.c:160
9735 #: builtin/send-pack.c:171
9736 msgid "use stateless RPC protocol"
9739 #: builtin/send-pack.c:172
9740 msgid "read refs from stdin"
9743 #: builtin/send-pack.c:173
9744 msgid "print status from remote helper"
9747 #: builtin/shortlog.c:13
9748 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
9751 #: builtin/shortlog.c:131
9753 msgid "Missing author: %s"
9756 #: builtin/shortlog.c:230
9757 msgid "sort output according to the number of commits per author"
9760 #: builtin/shortlog.c:232
9761 msgid "Suppress commit descriptions, only provides commit count"
9764 #: builtin/shortlog.c:234
9765 msgid "Show the email address of each author"
9768 #: builtin/shortlog.c:235
9772 #: builtin/shortlog.c:236
9773 msgid "Linewrap output"
9776 #: builtin/show-branch.c:10
9778 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9779 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9780 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9781 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9784 #: builtin/show-branch.c:14
9785 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
9788 #: builtin/show-branch.c:640
9789 msgid "show remote-tracking and local branches"
9792 #: builtin/show-branch.c:642
9793 msgid "show remote-tracking branches"
9796 #: builtin/show-branch.c:644
9797 msgid "color '*!+-' corresponding to the branch"
9800 #: builtin/show-branch.c:646
9801 msgid "show <n> more commits after the common ancestor"
9804 #: builtin/show-branch.c:648
9805 msgid "synonym to more=-1"
9808 #: builtin/show-branch.c:649
9809 msgid "suppress naming strings"
9812 #: builtin/show-branch.c:651
9813 msgid "include the current branch"
9816 #: builtin/show-branch.c:653
9817 msgid "name commits with their object names"
9820 #: builtin/show-branch.c:655
9821 msgid "show possible merge bases"
9824 #: builtin/show-branch.c:657
9825 msgid "show refs unreachable from any other ref"
9828 #: builtin/show-branch.c:659
9829 msgid "show commits in topological order"
9832 #: builtin/show-branch.c:662
9833 msgid "show only commits not on the first branch"
9836 #: builtin/show-branch.c:664
9837 msgid "show merges reachable from only one tip"
9840 #: builtin/show-branch.c:666
9841 msgid "topologically sort, maintaining date order where possible"
9844 #: builtin/show-branch.c:669
9845 msgid "<n>[,<base>]"
9848 #: builtin/show-branch.c:670
9849 msgid "show <n> most recent ref-log entries starting at base"
9852 #: builtin/show-ref.c:10
9854 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9855 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
9858 #: builtin/show-ref.c:11
9859 msgid "git show-ref --exclude-existing[=<pattern>]"
9862 #: builtin/show-ref.c:165
9863 msgid "only show tags (can be combined with heads)"
9866 #: builtin/show-ref.c:166
9867 msgid "only show heads (can be combined with tags)"
9870 #: builtin/show-ref.c:167
9871 msgid "stricter reference checking, requires exact ref path"
9874 #: builtin/show-ref.c:170 builtin/show-ref.c:172
9875 msgid "show the HEAD reference, even if it would be filtered out"
9878 #: builtin/show-ref.c:174
9879 msgid "dereference tags into object IDs"
9882 #: builtin/show-ref.c:176
9883 msgid "only show SHA1 hash using <n> digits"
9886 #: builtin/show-ref.c:180
9887 msgid "do not print results to stdout (useful with --verify)"
9890 #: builtin/show-ref.c:182
9891 msgid "show refs from stdin that aren't in local repository"
9894 #: builtin/stripspace.c:17
9895 msgid "git stripspace [-s | --strip-comments]"
9898 #: builtin/stripspace.c:18
9899 msgid "git stripspace [-c | --comment-lines]"
9902 #: builtin/stripspace.c:35
9903 msgid "skip and remove all lines starting with comment character"
9906 #: builtin/stripspace.c:38
9907 msgid "prepend comment character and blank to each line"
9910 #: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
9911 msgid "alternative anchor for relative paths"
9914 #: builtin/submodule--helper.c:84
9915 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
9918 #: builtin/submodule--helper.c:114
9919 msgid "git submodule--helper name <path>"
9922 #: builtin/submodule--helper.c:120
9924 msgid "no submodule mapping found in .gitmodules for path '%s'"
9927 #: builtin/submodule--helper.c:170
9928 msgid "where the new submodule will be cloned to"
9931 #: builtin/submodule--helper.c:173
9932 msgid "name of the new submodule"
9935 #: builtin/submodule--helper.c:176
9936 msgid "url where to clone the submodule from"
9939 #: builtin/submodule--helper.c:182
9940 msgid "depth for shallow clones"
9943 #: builtin/submodule--helper.c:188
9945 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
9946 "<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
9949 #: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
9950 #: builtin/submodule--helper.c:216
9952 msgid "could not create directory '%s'"
9955 #: builtin/submodule--helper.c:204
9957 msgid "clone of '%s' into submodule path '%s' failed"
9960 #: builtin/submodule--helper.c:227
9962 msgid "cannot open file '%s'"
9965 #: builtin/submodule--helper.c:232
9967 msgid "could not close file %s"
9970 #: builtin/submodule--helper.c:247
9972 msgid "could not get submodule directory for '%s'"
9975 #: builtin/submodule--helper.c:273
9976 msgid "fatal: submodule--helper subcommand must be called with a subcommand"
9979 #: builtin/submodule--helper.c:280
9981 msgid "fatal: '%s' is not a valid submodule--helper subcommand"
9984 #: builtin/symbolic-ref.c:7
9985 msgid "git symbolic-ref [<options>] <name> [<ref>]"
9988 #: builtin/symbolic-ref.c:8
9989 msgid "git symbolic-ref -d [-q] <name>"
9992 #: builtin/symbolic-ref.c:40
9993 msgid "suppress error message for non-symbolic (detached) refs"
9996 #: builtin/symbolic-ref.c:41
9997 msgid "delete symbolic ref"
10000 #: builtin/symbolic-ref.c:42
10001 msgid "shorten ref output"
10004 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10008 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10009 msgid "reason of the update"
10012 #: builtin/tag.c:23
10014 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
10018 #: builtin/tag.c:24
10019 msgid "git tag -d <tagname>..."
10022 #: builtin/tag.c:25
10024 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
10025 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
10028 #: builtin/tag.c:27
10029 msgid "git tag -v <tagname>..."
10032 #: builtin/tag.c:80
10034 msgid "tag name too long: %.*s..."
10037 #: builtin/tag.c:85
10039 msgid "tag '%s' not found."
10042 #: builtin/tag.c:100
10044 msgid "Deleted tag '%s' (was %s)\n"
10047 #: builtin/tag.c:112
10049 msgid "could not verify the tag '%s'"
10052 #: builtin/tag.c:122
10056 "Write a message for tag:\n"
10058 "Lines starting with '%c' will be ignored.\n"
10061 #: builtin/tag.c:126
10065 "Write a message for tag:\n"
10067 "Lines starting with '%c' will be kept; you may remove them yourself if you "
10071 #: builtin/tag.c:199
10072 msgid "unable to sign the tag"
10075 #: builtin/tag.c:201
10076 msgid "unable to write tag file"
10079 #: builtin/tag.c:226
10080 msgid "bad object type."
10083 #: builtin/tag.c:239
10084 msgid "tag header too big."
10087 #: builtin/tag.c:275
10088 msgid "no tag message?"
10091 #: builtin/tag.c:281
10093 msgid "The tag message has been left in %s\n"
10096 #: builtin/tag.c:339
10097 msgid "list tag names"
10100 #: builtin/tag.c:341
10101 msgid "print <n> lines of each tag message"
10104 #: builtin/tag.c:343
10105 msgid "delete tags"
10108 #: builtin/tag.c:344
10109 msgid "verify tags"
10112 #: builtin/tag.c:346
10113 msgid "Tag creation options"
10116 #: builtin/tag.c:348
10117 msgid "annotated tag, needs a message"
10120 #: builtin/tag.c:350
10121 msgid "tag message"
10124 #: builtin/tag.c:352
10125 msgid "annotated and GPG-signed tag"
10128 #: builtin/tag.c:356
10129 msgid "use another key to sign the tag"
10132 #: builtin/tag.c:357
10133 msgid "replace the tag if exists"
10136 #: builtin/tag.c:358 builtin/update-ref.c:368
10137 msgid "create a reflog"
10140 #: builtin/tag.c:360
10141 msgid "Tag listing options"
10144 #: builtin/tag.c:361
10145 msgid "show tag list in columns"
10148 #: builtin/tag.c:362 builtin/tag.c:363
10149 msgid "print only tags that contain the commit"
10152 #: builtin/tag.c:364
10153 msgid "print only tags that are merged"
10156 #: builtin/tag.c:365
10157 msgid "print only tags that are not merged"
10160 #: builtin/tag.c:370
10161 msgid "print only tags of the object"
10164 #: builtin/tag.c:399
10165 msgid "--column and -n are incompatible"
10168 #: builtin/tag.c:419
10169 msgid "-n option is only allowed with -l."
10172 #: builtin/tag.c:421
10173 msgid "--contains option is only allowed with -l."
10176 #: builtin/tag.c:423
10177 msgid "--points-at option is only allowed with -l."
10180 #: builtin/tag.c:425
10181 msgid "--merged and --no-merged option are only allowed with -l"
10184 #: builtin/tag.c:433
10185 msgid "only one -F or -m option is allowed."
10188 #: builtin/tag.c:453
10189 msgid "too many params"
10192 #: builtin/tag.c:459
10194 msgid "'%s' is not a valid tag name."
10197 #: builtin/tag.c:464
10199 msgid "tag '%s' already exists"
10202 #: builtin/tag.c:489
10204 msgid "Updated tag '%s' (was %s)\n"
10207 #: builtin/unpack-objects.c:490
10208 msgid "Unpacking objects"
10211 #: builtin/update-index.c:70
10213 msgid "failed to create directory %s"
10216 #: builtin/update-index.c:76
10218 msgid "failed to stat %s"
10221 #: builtin/update-index.c:86
10223 msgid "failed to create file %s"
10226 #: builtin/update-index.c:94
10228 msgid "failed to delete file %s"
10231 #: builtin/update-index.c:101 builtin/update-index.c:203
10233 msgid "failed to delete directory %s"
10236 #: builtin/update-index.c:124
10241 #: builtin/update-index.c:136
10242 msgid "directory stat info does not change after adding a new file"
10245 #: builtin/update-index.c:149
10246 msgid "directory stat info does not change after adding a new directory"
10249 #: builtin/update-index.c:162
10250 msgid "directory stat info changes after updating a file"
10253 #: builtin/update-index.c:173
10254 msgid "directory stat info changes after adding a file inside subdirectory"
10257 #: builtin/update-index.c:184
10258 msgid "directory stat info does not change after deleting a file"
10261 #: builtin/update-index.c:197
10262 msgid "directory stat info does not change after deleting a directory"
10265 #: builtin/update-index.c:204
10269 #: builtin/update-index.c:564
10270 msgid "git update-index [<options>] [--] [<file>...]"
10273 #: builtin/update-index.c:918
10274 msgid "continue refresh even when index needs update"
10277 #: builtin/update-index.c:921
10278 msgid "refresh: ignore submodules"
10281 #: builtin/update-index.c:924
10282 msgid "do not ignore new files"
10285 #: builtin/update-index.c:926
10286 msgid "let files replace directories and vice-versa"
10289 #: builtin/update-index.c:928
10290 msgid "notice files missing from worktree"
10293 #: builtin/update-index.c:930
10294 msgid "refresh even if index contains unmerged entries"
10297 #: builtin/update-index.c:933
10298 msgid "refresh stat information"
10301 #: builtin/update-index.c:937
10302 msgid "like --refresh, but ignore assume-unchanged setting"
10305 #: builtin/update-index.c:941
10306 msgid "<mode>,<object>,<path>"
10309 #: builtin/update-index.c:942
10310 msgid "add the specified entry to the index"
10313 #: builtin/update-index.c:946
10317 #: builtin/update-index.c:947
10318 msgid "override the executable bit of the listed files"
10321 #: builtin/update-index.c:951
10322 msgid "mark files as \"not changing\""
10325 #: builtin/update-index.c:954
10326 msgid "clear assumed-unchanged bit"
10329 #: builtin/update-index.c:957
10330 msgid "mark files as \"index-only\""
10333 #: builtin/update-index.c:960
10334 msgid "clear skip-worktree bit"
10337 #: builtin/update-index.c:963
10338 msgid "add to index only; do not add content to object database"
10341 #: builtin/update-index.c:965
10342 msgid "remove named paths even if present in worktree"
10345 #: builtin/update-index.c:967
10346 msgid "with --stdin: input lines are terminated by null bytes"
10349 #: builtin/update-index.c:969
10350 msgid "read list of paths to be updated from standard input"
10353 #: builtin/update-index.c:973
10354 msgid "add entries from standard input to the index"
10357 #: builtin/update-index.c:977
10358 msgid "repopulate stages #2 and #3 for the listed paths"
10361 #: builtin/update-index.c:981
10362 msgid "only update entries that differ from HEAD"
10365 #: builtin/update-index.c:985
10366 msgid "ignore files missing from worktree"
10369 #: builtin/update-index.c:988
10370 msgid "report actions to standard output"
10373 #: builtin/update-index.c:990
10374 msgid "(for porcelains) forget saved unresolved conflicts"
10377 #: builtin/update-index.c:994
10378 msgid "write index in this format"
10381 #: builtin/update-index.c:996
10382 msgid "enable or disable split index"
10385 #: builtin/update-index.c:998
10386 msgid "enable/disable untracked cache"
10389 #: builtin/update-index.c:1000
10390 msgid "enable untracked cache without testing the filesystem"
10393 #: builtin/update-ref.c:9
10394 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
10397 #: builtin/update-ref.c:10
10398 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
10401 #: builtin/update-ref.c:11
10402 msgid "git update-ref [<options>] --stdin [-z]"
10405 #: builtin/update-ref.c:363
10406 msgid "delete the reference"
10409 #: builtin/update-ref.c:365
10410 msgid "update <refname> not the one it points to"
10413 #: builtin/update-ref.c:366
10414 msgid "stdin has NUL-terminated arguments"
10417 #: builtin/update-ref.c:367
10418 msgid "read updates from stdin"
10421 #: builtin/update-server-info.c:6
10422 msgid "git update-server-info [--force]"
10425 #: builtin/update-server-info.c:14
10426 msgid "update the info files from scratch"
10429 #: builtin/verify-commit.c:17
10430 msgid "git verify-commit [-v | --verbose] <commit>..."
10433 #: builtin/verify-commit.c:72
10434 msgid "print commit contents"
10437 #: builtin/verify-commit.c:73 builtin/verify-tag.c:84
10438 msgid "print raw gpg status output"
10441 #: builtin/verify-pack.c:54
10442 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
10445 #: builtin/verify-pack.c:64
10449 #: builtin/verify-pack.c:66
10450 msgid "show statistics only"
10453 #: builtin/verify-tag.c:17
10454 msgid "git verify-tag [-v | --verbose] <tag>..."
10457 #: builtin/verify-tag.c:83
10458 msgid "print tag contents"
10461 #: builtin/worktree.c:15
10462 msgid "git worktree add [<options>] <path> [<branch>]"
10465 #: builtin/worktree.c:16
10466 msgid "git worktree prune [<options>]"
10469 #: builtin/worktree.c:17
10470 msgid "git worktree list [<options>]"
10473 #: builtin/worktree.c:39
10475 msgid "Removing worktrees/%s: not a valid directory"
10478 #: builtin/worktree.c:45
10480 msgid "Removing worktrees/%s: gitdir file does not exist"
10483 #: builtin/worktree.c:50
10485 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
10488 #: builtin/worktree.c:61
10490 msgid "Removing worktrees/%s: invalid gitdir file"
10493 #: builtin/worktree.c:77
10495 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
10498 #: builtin/worktree.c:112
10500 msgid "failed to remove: %s"
10503 #: builtin/worktree.c:201
10505 msgid "'%s' already exists"
10508 #: builtin/worktree.c:235
10510 msgid "could not create directory of '%s'"
10513 #: builtin/worktree.c:271
10515 msgid "Preparing %s (identifier %s)"
10518 #: builtin/worktree.c:319
10519 msgid "checkout <branch> even if already checked out in other worktree"
10522 #: builtin/worktree.c:321
10523 msgid "create a new branch"
10526 #: builtin/worktree.c:323
10527 msgid "create or reset a branch"
10530 #: builtin/worktree.c:324
10531 msgid "detach HEAD at named commit"
10534 #: builtin/worktree.c:331
10535 msgid "-b, -B, and --detach are mutually exclusive"
10538 #: builtin/write-tree.c:13
10539 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
10542 #: builtin/write-tree.c:26
10546 #: builtin/write-tree.c:27
10547 msgid "write tree object for a subdirectory <prefix>"
10550 #: builtin/write-tree.c:30
10551 msgid "only useful for debugging"
10554 #: credential-cache--daemon.c:255
10555 msgid "print debugging messages to stderr"
10560 "'git help -a' and 'git help -g' list available subcommands and some\n"
10561 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
10562 "to read about a specific subcommand or concept."
10566 msgid "start a working area (see also: git help tutorial)"
10569 #: common-cmds.h:10
10570 msgid "work on the current change (see also: git help everyday)"
10573 #: common-cmds.h:11
10574 msgid "examine the history and state (see also: git help revisions)"
10577 #: common-cmds.h:12
10578 msgid "grow, mark and tweak your common history"
10581 #: common-cmds.h:13
10582 msgid "collaborate (see also: git help workflows)"
10585 #: common-cmds.h:17
10586 msgid "Add file contents to the index"
10589 #: common-cmds.h:18
10590 msgid "Use binary search to find the commit that introduced a bug"
10593 #: common-cmds.h:19
10594 msgid "List, create, or delete branches"
10597 #: common-cmds.h:20
10598 msgid "Switch branches or restore working tree files"
10601 #: common-cmds.h:21
10602 msgid "Clone a repository into a new directory"
10605 #: common-cmds.h:22
10606 msgid "Record changes to the repository"
10609 #: common-cmds.h:23
10610 msgid "Show changes between commits, commit and working tree, etc"
10613 #: common-cmds.h:24
10614 msgid "Download objects and refs from another repository"
10617 #: common-cmds.h:25
10618 msgid "Print lines matching a pattern"
10621 #: common-cmds.h:26
10622 msgid "Create an empty Git repository or reinitialize an existing one"
10625 #: common-cmds.h:27
10626 msgid "Show commit logs"
10629 #: common-cmds.h:28
10630 msgid "Join two or more development histories together"
10633 #: common-cmds.h:29
10634 msgid "Move or rename a file, a directory, or a symlink"
10637 #: common-cmds.h:30
10638 msgid "Fetch from and integrate with another repository or a local branch"
10641 #: common-cmds.h:31
10642 msgid "Update remote refs along with associated objects"
10645 #: common-cmds.h:32
10646 msgid "Forward-port local commits to the updated upstream head"
10649 #: common-cmds.h:33
10650 msgid "Reset current HEAD to the specified state"
10653 #: common-cmds.h:34
10654 msgid "Remove files from the working tree and from the index"
10657 #: common-cmds.h:35
10658 msgid "Show various types of objects"
10661 #: common-cmds.h:36
10662 msgid "Show the working tree status"
10665 #: common-cmds.h:37
10666 msgid "Create, list, delete or verify a tag object signed with GPG"
10669 #: parse-options.h:145
10670 msgid "expiry-date"
10673 #: parse-options.h:160
10674 msgid "no-op (backward compatibility)"
10677 #: parse-options.h:237
10678 msgid "be more verbose"
10681 #: parse-options.h:239
10682 msgid "be more quiet"
10685 #: parse-options.h:245
10686 msgid "use <n> digits to display SHA-1s"
10690 msgid "update the index with reused conflict resolution if possible"
10693 #: git-bisect.sh:55
10694 msgid "You need to start by \"git bisect start\""
10697 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10698 #. translation. The program will only accept English input
10700 #: git-bisect.sh:61
10701 msgid "Do you want me to do it for you [Y/n]? "
10704 #: git-bisect.sh:122
10706 msgid "unrecognised option: '$arg'"
10709 #: git-bisect.sh:126
10711 msgid "'$arg' does not appear to be a valid revision"
10714 #: git-bisect.sh:155
10715 msgid "Bad HEAD - I need a HEAD"
10718 #: git-bisect.sh:168
10721 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
10724 #: git-bisect.sh:178
10725 msgid "won't bisect on cg-seek'ed tree"
10728 #: git-bisect.sh:182
10729 msgid "Bad HEAD - strange symbolic ref"
10732 #: git-bisect.sh:234
10734 msgid "Bad bisect_write argument: $state"
10737 #: git-bisect.sh:263
10739 msgid "Bad rev input: $arg"
10742 #: git-bisect.sh:278
10743 msgid "Please call 'bisect_state' with at least one argument."
10746 #: git-bisect.sh:290
10748 msgid "Bad rev input: $rev"
10751 #: git-bisect.sh:299
10753 msgid "'git bisect $TERM_BAD' can take only one argument."
10756 #: git-bisect.sh:322
10758 msgid "Warning: bisecting only with a $TERM_BAD commit."
10761 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10762 #. translation. The program will only accept English input
10764 #: git-bisect.sh:328
10765 msgid "Are you sure [Y/n]? "
10768 #: git-bisect.sh:340
10771 "You need to give me at least one $bad_syn and one $good_syn revision.\n"
10772 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
10775 #: git-bisect.sh:343
10778 "You need to start by \"git bisect start\".\n"
10779 "You then need to give me at least one $good_syn and one $bad_syn revision.\n"
10780 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
10783 #: git-bisect.sh:414 git-bisect.sh:546
10784 msgid "We are not bisecting."
10787 #: git-bisect.sh:421
10789 msgid "'$invalid' is not a valid commit"
10792 #: git-bisect.sh:430
10795 "Could not check out original HEAD '$branch'.\n"
10796 "Try 'git bisect reset <commit>'."
10799 #: git-bisect.sh:458
10800 msgid "No logfile given"
10803 #: git-bisect.sh:459
10805 msgid "cannot read $file for replaying"
10808 #: git-bisect.sh:480
10809 msgid "?? what are you talking about?"
10812 #: git-bisect.sh:492
10814 msgid "running $command"
10817 #: git-bisect.sh:499
10820 "bisect run failed:\n"
10821 "exit code $res from '$command' is < 0 or >= 128"
10824 #: git-bisect.sh:525
10825 msgid "bisect run cannot continue any more"
10828 #: git-bisect.sh:531
10831 "bisect run failed:\n"
10832 "'bisect_state $state' exited with error code $res"
10835 #: git-bisect.sh:538
10836 msgid "bisect run success"
10839 #: git-bisect.sh:565
10840 msgid "please use two different terms"
10843 #: git-bisect.sh:575
10845 msgid "'$term' is not a valid term"
10848 #: git-bisect.sh:578
10850 msgid "can't use the builtin command '$term' as a term"
10853 #: git-bisect.sh:587 git-bisect.sh:593
10855 msgid "can't change the meaning of term '$term'"
10858 #: git-bisect.sh:606
10860 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
10863 #: git-bisect.sh:636
10864 msgid "no terms defined"
10867 #: git-bisect.sh:653
10870 "invalid argument $arg for 'git bisect terms'.\n"
10871 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
10874 #: git-rebase.sh:57
10876 "When you have resolved this problem, run \"git rebase --continue\".\n"
10877 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10878 "To check out the original branch and stop rebasing, run \"git rebase --abort"
10882 #: git-rebase.sh:165
10883 msgid "Applied autostash."
10886 #: git-rebase.sh:168
10888 msgid "Cannot store $stash_sha1"
10891 #: git-rebase.sh:169
10893 "Applying autostash resulted in conflicts.\n"
10894 "Your changes are safe in the stash.\n"
10895 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
10898 #: git-rebase.sh:208
10899 msgid "The pre-rebase hook refused to rebase."
10902 #: git-rebase.sh:213
10903 msgid "It looks like git-am is in progress. Cannot rebase."
10906 #: git-rebase.sh:354
10907 msgid "The --exec option must be used with the --interactive option"
10910 #: git-rebase.sh:359
10911 msgid "No rebase in progress?"
10914 #: git-rebase.sh:370
10915 msgid "The --edit-todo action can only be used during interactive rebase."
10918 #: git-rebase.sh:377
10919 msgid "Cannot read HEAD"
10922 #: git-rebase.sh:380
10924 "You must edit all merge conflicts and then\n"
10925 "mark them as resolved using git add"
10928 #: git-rebase.sh:398
10930 msgid "Could not move back to $head_name"
10933 #: git-rebase.sh:417
10936 "It seems that there is already a $state_dir_base directory, and\n"
10937 "I wonder if you are in the middle of another rebase. If that is the\n"
10938 "case, please try\n"
10939 "\t$cmd_live_rebase\n"
10940 "If that is not the case, please\n"
10941 "\t$cmd_clear_stale_rebase\n"
10942 "and run me again. I am stopping in case you still have something\n"
10946 #: git-rebase.sh:468
10948 msgid "invalid upstream $upstream_name"
10951 #: git-rebase.sh:492
10953 msgid "$onto_name: there are more than one merge bases"
10956 #: git-rebase.sh:495 git-rebase.sh:499
10958 msgid "$onto_name: there is no merge base"
10961 #: git-rebase.sh:504
10963 msgid "Does not point to a valid commit: $onto_name"
10966 #: git-rebase.sh:527
10968 msgid "fatal: no such branch: $branch_name"
10971 #: git-rebase.sh:560
10972 msgid "Cannot autostash"
10975 #: git-rebase.sh:565
10977 msgid "Created autostash: $stash_abbrev"
10980 #: git-rebase.sh:569
10981 msgid "Please commit or stash them."
10984 #: git-rebase.sh:589
10986 msgid "Current branch $branch_name is up to date."
10989 #: git-rebase.sh:593
10991 msgid "Current branch $branch_name is up to date, rebase forced."
10994 #: git-rebase.sh:604
10996 msgid "Changes from $mb to $onto:"
10999 #: git-rebase.sh:613
11000 msgid "First, rewinding head to replay your work on top of it..."
11003 #: git-rebase.sh:623
11005 msgid "Fast-forwarded $branch_name to $onto_name."
11009 msgid "git stash clear with parameters is unimplemented"
11013 msgid "You do not have the initial commit yet"
11017 msgid "Cannot save the current index state"
11020 #: git-stash.sh:124 git-stash.sh:137
11021 msgid "Cannot save the current worktree state"
11024 #: git-stash.sh:141
11025 msgid "No changes selected"
11028 #: git-stash.sh:144
11029 msgid "Cannot remove temporary index (can't happen)"
11032 #: git-stash.sh:157
11033 msgid "Cannot record working tree state"
11036 #: git-stash.sh:189
11038 msgid "Cannot update $ref_stash with $w_commit"
11041 #. TRANSLATORS: $option is an invalid option, like
11042 #. `--blah-blah'. The 7 spaces at the beginning of the
11043 #. second line correspond to "error: ". So you should line
11044 #. up the second line with however many characters the
11045 #. translation of "error: " takes in your language. E.g. in
11046 #. English this is:
11048 #. $ git stash save --blah-blah 2>&1 | head -n 2
11049 #. error: unknown option for 'stash save': --blah-blah
11050 #. To provide a message, use git stash save -- '--blah-blah'
11051 #: git-stash.sh:239
11054 "error: unknown option for 'stash save': $option\n"
11055 " To provide a message, use git stash save -- '$option'"
11058 #: git-stash.sh:260
11059 msgid "No local changes to save"
11062 #: git-stash.sh:264
11063 msgid "Cannot initialize stash"
11066 #: git-stash.sh:268
11067 msgid "Cannot save the current status"
11070 #: git-stash.sh:286
11071 msgid "Cannot remove worktree changes"
11074 #: git-stash.sh:405
11076 msgid "unknown option: $opt"
11079 #: git-stash.sh:415
11080 msgid "No stash found."
11083 #: git-stash.sh:422
11085 msgid "Too many revisions specified: $REV"
11088 #: git-stash.sh:428
11090 msgid "$reference is not a valid reference"
11093 #: git-stash.sh:456
11095 msgid "'$args' is not a stash-like commit"
11098 #: git-stash.sh:467
11100 msgid "'$args' is not a stash reference"
11103 #: git-stash.sh:475
11104 msgid "unable to refresh index"
11107 #: git-stash.sh:479
11108 msgid "Cannot apply a stash in the middle of a merge"
11111 #: git-stash.sh:487
11112 msgid "Conflicts in index. Try without --index."
11115 #: git-stash.sh:489
11116 msgid "Could not save index tree"
11119 #: git-stash.sh:523
11120 msgid "Cannot unstage modified files"
11123 #: git-stash.sh:538
11124 msgid "Index was not unstashed."
11127 #: git-stash.sh:561
11129 msgid "Dropped ${REV} ($s)"
11132 #: git-stash.sh:562
11134 msgid "${REV}: Could not drop stash entry"
11137 #: git-stash.sh:570
11138 msgid "No branch name specified"
11141 #: git-stash.sh:642
11142 msgid "(To restore them type \"git stash apply\")"
11145 #: git-submodule.sh:104
11147 msgid "cannot strip one component off url '$remoteurl'"
11150 #: git-submodule.sh:281
11151 msgid "Relative path can only be used from the toplevel of the working tree"
11154 #: git-submodule.sh:291
11156 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
11159 #: git-submodule.sh:308
11161 msgid "'$sm_path' already exists in the index"
11164 #: git-submodule.sh:312
11167 "The following path is ignored by one of your .gitignore files:\n"
11169 "Use -f if you really want to add it."
11172 #: git-submodule.sh:330
11174 msgid "Adding existing repo at '$sm_path' to the index"
11177 #: git-submodule.sh:332
11179 msgid "'$sm_path' already exists and is not a valid git repo"
11182 #: git-submodule.sh:340
11184 msgid "A git directory for '$sm_name' is found locally with remote(s):"
11187 #: git-submodule.sh:342
11190 "If you want to reuse this local git directory instead of cloning again from"
11193 #: git-submodule.sh:344
11196 "use the '--force' option. If the local git directory is not the correct repo"
11199 #: git-submodule.sh:345
11202 "or you are unsure what this means choose another name with the '--name' "
11206 #: git-submodule.sh:347
11208 msgid "Reactivating local git directory for submodule '$sm_name'."
11211 #: git-submodule.sh:359
11213 msgid "Unable to checkout submodule '$sm_path'"
11216 #: git-submodule.sh:364
11218 msgid "Failed to add submodule '$sm_path'"
11221 #: git-submodule.sh:373
11223 msgid "Failed to register submodule '$sm_path'"
11226 #: git-submodule.sh:417
11228 msgid "Entering '$prefix$displaypath'"
11231 #: git-submodule.sh:437
11233 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11236 #: git-submodule.sh:483
11238 msgid "No url found for submodule path '$displaypath' in .gitmodules"
11241 #: git-submodule.sh:492
11243 msgid "Failed to register url for submodule path '$displaypath'"
11246 #: git-submodule.sh:494
11248 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11251 #: git-submodule.sh:511
11253 msgid "Failed to register update mode for submodule path '$displaypath'"
11256 #: git-submodule.sh:549
11258 msgid "Use '.' if you really want to deinitialize all submodules"
11261 #: git-submodule.sh:566
11263 msgid "Submodule work tree '$displaypath' contains a .git directory"
11266 #: git-submodule.sh:567
11269 "(use 'rm -rf' if you really want to remove it including all of its history)"
11272 #: git-submodule.sh:573
11275 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
11279 #: git-submodule.sh:576
11281 msgid "Cleared directory '$displaypath'"
11284 #: git-submodule.sh:577
11286 msgid "Could not remove submodule work tree '$displaypath'"
11289 #: git-submodule.sh:580
11291 msgid "Could not create empty submodule directory '$displaypath'"
11294 #: git-submodule.sh:589
11296 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11299 #: git-submodule.sh:705
11302 "Submodule path '$displaypath' not initialized\n"
11303 "Maybe you want to use 'update --init'?"
11306 #: git-submodule.sh:718
11308 msgid "Unable to find current revision in submodule path '$displaypath'"
11311 #: git-submodule.sh:727
11313 msgid "Unable to fetch in submodule path '$sm_path'"
11316 #: git-submodule.sh:751
11318 msgid "Unable to fetch in submodule path '$displaypath'"
11321 #: git-submodule.sh:765
11323 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11326 #: git-submodule.sh:766
11328 msgid "Submodule path '$displaypath': checked out '$sha1'"
11331 #: git-submodule.sh:770
11333 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
11336 #: git-submodule.sh:771
11338 msgid "Submodule path '$displaypath': rebased into '$sha1'"
11341 #: git-submodule.sh:776
11343 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
11346 #: git-submodule.sh:777
11348 msgid "Submodule path '$displaypath': merged in '$sha1'"
11351 #: git-submodule.sh:782
11354 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
11357 #: git-submodule.sh:783
11359 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
11362 #: git-submodule.sh:813
11364 msgid "Failed to recurse into submodule path '$displaypath'"
11367 #: git-submodule.sh:921
11368 msgid "The --cached option cannot be used with the --files option"
11371 #: git-submodule.sh:973
11373 msgid "unexpected mode $mod_dst"
11376 #: git-submodule.sh:993
11378 msgid " Warn: $display_name doesn't contain commit $sha1_src"
11381 #: git-submodule.sh:996
11383 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
11386 #: git-submodule.sh:999
11388 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11391 #: git-submodule.sh:1024
11395 #: git-submodule.sh:1142
11397 msgid "Failed to recurse into submodule path '$sm_path'"
11400 #: git-submodule.sh:1206
11402 msgid "Synchronizing submodule url for '$displaypath'"