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: 2016-03-16 00:16+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:1226
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:1232
79 msgid "prepend prefix to each pathname in the archive"
82 #: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547
83 #: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987
84 #: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100
85 #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
86 #: builtin/notes.c:561 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:78
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:482
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."
144 "After fixing the error cause you may try to fix up\n"
145 "the remote tracking information by invoking\n"
146 "\"git branch --set-upstream-to=%s%s%s\"."
151 msgid "Not setting branch %s as its own upstream."
156 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
161 msgid "Branch %s set up to track remote branch %s from %s."
166 msgid "Branch %s set up to track local branch %s by rebasing."
171 msgid "Branch %s set up to track local branch %s."
176 msgid "Branch %s set up to track remote ref %s by rebasing."
181 msgid "Branch %s set up to track remote ref %s."
186 msgid "Branch %s set up to track local ref %s by rebasing."
191 msgid "Branch %s set up to track local ref %s."
195 msgid "Unable to write upstream branch configuration"
200 msgid "Not tracking: ambiguous information for ref %s"
205 msgid "'%s' is not a valid branch name."
210 msgid "A branch named '%s' already exists."
214 msgid "Cannot force update the current branch."
219 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
224 msgid "the requested upstream branch '%s' does not exist"
230 "If you are planning on basing your work on an upstream\n"
231 "branch that already exists at the remote, you may need to\n"
232 "run \"git fetch\" to retrieve it.\n"
234 "If you are planning to push out a new local branch that\n"
235 "will track its remote counterpart, you may want to use\n"
236 "\"git push -u\" to set the upstream config as you push."
241 msgid "Not a valid object name: '%s'."
246 msgid "Ambiguous object name: '%s'."
251 msgid "Not a valid branch point: '%s'."
256 msgid "'%s' is already checked out at '%s'"
261 msgid "'%s' does not look like a v2 bundle file"
266 msgid "unrecognized header: %s%s (%d)"
269 #: bundle.c:87 builtin/commit.c:766
271 msgid "could not open '%s'"
275 msgid "Repository lacks these prerequisite commits:"
278 #: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
279 #: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
280 #: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
281 #: builtin/shortlog.c:170
282 msgid "revision walk setup failed"
287 msgid "The bundle contains this ref:"
288 msgid_plural "The bundle contains these %d refs:"
293 msgid "The bundle records a complete history."
298 msgid "The bundle requires this ref:"
299 msgid_plural "The bundle requires these %d refs:"
304 msgid "Could not spawn pack-objects"
308 msgid "pack-objects died"
312 msgid "rev-list died"
317 msgid "ref '%s' is excluded by the rev-list options"
320 #: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
322 msgid "unrecognized argument: %s"
326 msgid "Refusing to create empty bundle."
331 msgid "cannot create '%s'"
335 msgid "index-pack died"
340 msgid "invalid color value: %.*s"
343 #: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
346 msgid "could not parse %s"
351 msgid "%s %s is not a commit!"
354 #: compat/obstack.c:406 compat/obstack.c:408
355 msgid "memory exhausted"
358 #: config.c:475 config.c:477
360 msgid "bad config line %d in %s %s"
365 msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
370 msgid "bad numeric config value '%s' for '%s': %s"
375 msgid "failed to expand user dir in: '%s'"
378 #: config.c:758 config.c:769
380 msgid "bad zlib compression level %d"
385 msgid "invalid mode for object creation: %s"
389 msgid "unable to parse command-line config"
393 msgid "unknown error occured while reading the configuration files"
398 msgid "unable to parse '%s' from command-line config"
403 msgid "bad config variable '%s' in file '%s' at line %d"
408 msgid "%s has multiple values"
413 msgid "Could not set '%s' to '%s'"
417 msgid "Could not run 'git rev-list'"
422 msgid "failed write to rev-list: %s"
427 msgid "failed to close rev-list's stdin: %s"
431 msgid "in the future"
436 msgid "%lu second ago"
437 msgid_plural "%lu seconds ago"
443 msgid "%lu minute ago"
444 msgid_plural "%lu minutes ago"
451 msgid_plural "%lu hours ago"
458 msgid_plural "%lu days ago"
465 msgid_plural "%lu weeks ago"
471 msgid "%lu month ago"
472 msgid_plural "%lu months ago"
479 msgid_plural "%lu years"
483 #. TRANSLATORS: "%s" is "<n> years"
486 msgid "%s, %lu month ago"
487 msgid_plural "%s, %lu months ago"
491 #: date.c:154 date.c:159
494 msgid_plural "%lu years ago"
498 #: diffcore-order.c:24
500 msgid "failed to read orderfile '%s'"
503 #: diffcore-rename.c:536
504 msgid "Performing inexact rename detection"
509 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
514 msgid " Unknown dirstat parameter '%s'\n"
519 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
525 "Found errors in 'diff.dirstat' config variable:\n"
531 msgid "external diff died, stopping at %s"
535 msgid "--follow requires exactly one pathspec"
541 "Failed to parse --dirstat/-X option parameter:\n"
547 msgid "Failed to parse --submodule option parameter: '%s'"
551 msgid "failed to get kernel name and information"
555 msgid "Untracked cache is disabled on this system or location."
558 #: gpg-interface.c:166 gpg-interface.c:237
559 msgid "could not run gpg."
562 #: gpg-interface.c:178
563 msgid "gpg did not accept the data"
566 #: gpg-interface.c:189
567 msgid "gpg failed to sign the data"
570 #: gpg-interface.c:222
572 msgid "could not create temporary file '%s': %s"
575 #: gpg-interface.c:225
577 msgid "failed writing detached signature to '%s': %s"
582 msgid "'%s': unable to read %s"
592 msgid "'%s': short read %s"
597 msgid "available git commands in '%s'"
601 msgid "git commands available from elsewhere on your $PATH"
605 msgid "These are common Git commands used in various situations:"
611 "'%s' appears to be a git command, but we were not\n"
612 "able to execute it. Maybe git-%s is broken?"
616 msgid "Uh oh. Your system reports no Git commands at all."
622 "WARNING: You called a Git command named '%s', which does not exist.\n"
623 "Continuing under the assumption that you meant '%s'"
628 msgid "in %0.1f seconds automatically..."
633 msgid "git: '%s' is not a git command. See 'git --help'."
636 #: help.c:404 help.c:464
642 "Did you mean one of these?"
652 msgid "failed to read the cache"
655 #: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
656 #: builtin/checkout.c:587 builtin/clone.c:730
657 msgid "unable to write new index file"
660 #: merge-recursive.c:189
662 msgid "(bad commit)\n"
665 #: merge-recursive.c:209
667 msgid "addinfo_cache failed for path '%s'"
670 #: merge-recursive.c:270
671 msgid "error building trees"
674 #: merge-recursive.c:689
676 msgid "failed to create path '%s'%s"
679 #: merge-recursive.c:700
681 msgid "Removing %s to make room for subdirectory\n"
684 #: merge-recursive.c:714 merge-recursive.c:735
685 msgid ": perhaps a D/F conflict?"
688 #: merge-recursive.c:725
690 msgid "refusing to lose untracked file at '%s'"
693 #: merge-recursive.c:765
695 msgid "cannot read object %s '%s'"
698 #: merge-recursive.c:767
700 msgid "blob expected for %s '%s'"
703 #: merge-recursive.c:790 builtin/clone.c:374
705 msgid "failed to open '%s'"
708 #: merge-recursive.c:798
710 msgid "failed to symlink '%s'"
713 #: merge-recursive.c:801
715 msgid "do not know what to do with %06o %s '%s'"
718 #: merge-recursive.c:939
719 msgid "Failed to execute internal merge"
722 #: merge-recursive.c:943
724 msgid "Unable to add %s to database"
727 #: merge-recursive.c:959
728 msgid "unsupported object type in the tree"
731 #: merge-recursive.c:1034 merge-recursive.c:1048
734 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
738 #: merge-recursive.c:1040 merge-recursive.c:1053
741 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
745 #: merge-recursive.c:1094
749 #: merge-recursive.c:1094
753 #: merge-recursive.c:1150
755 msgid "%s is a directory in %s adding as %s instead"
758 #: merge-recursive.c:1172
761 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
762 "\"->\"%s\" in \"%s\"%s"
765 #: merge-recursive.c:1177
766 msgid " (left unresolved)"
769 #: merge-recursive.c:1231
771 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
774 #: merge-recursive.c:1261
776 msgid "Renaming %s to %s and %s to %s instead"
779 #: merge-recursive.c:1460
781 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
784 #: merge-recursive.c:1470
786 msgid "Adding merged %s"
789 #: merge-recursive.c:1475 merge-recursive.c:1677
791 msgid "Adding as %s instead"
794 #: merge-recursive.c:1526
796 msgid "cannot read object %s"
799 #: merge-recursive.c:1529
801 msgid "object %s is not a blob"
804 #: merge-recursive.c:1581
808 #: merge-recursive.c:1581
812 #: merge-recursive.c:1591
816 #: merge-recursive.c:1598
820 #: merge-recursive.c:1632
822 msgid "Skipped %s (merged same as existing)"
825 #: merge-recursive.c:1646
827 msgid "Auto-merging %s"
830 #: merge-recursive.c:1650 git-submodule.sh:1048
834 #: merge-recursive.c:1651
836 msgid "CONFLICT (%s): Merge conflict in %s"
839 #: merge-recursive.c:1737
844 #: merge-recursive.c:1762
845 msgid "file/directory"
848 #: merge-recursive.c:1768
849 msgid "directory/file"
852 #: merge-recursive.c:1773
854 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
857 #: merge-recursive.c:1783
862 #: merge-recursive.c:1800
863 msgid "Fatal merge failure, shouldn't happen."
866 #: merge-recursive.c:1819
867 msgid "Already up-to-date!"
870 #: merge-recursive.c:1828
872 msgid "merging of trees %s and %s failed"
875 #: merge-recursive.c:1858
877 msgid "Unprocessed path??? %s"
880 #: merge-recursive.c:1906
884 #: merge-recursive.c:1919
886 msgid "found %u common ancestor:"
887 msgid_plural "found %u common ancestors:"
891 #: merge-recursive.c:1956
892 msgid "merge returned no commit"
895 #: merge-recursive.c:2013
897 msgid "Could not parse object '%s'"
900 #: merge-recursive.c:2024 builtin/merge.c:646
901 msgid "Unable to write index."
905 msgid "Cannot commit uninitialized/unreferenced notes tree"
910 msgid "Bad notes.rewriteMode value: '%s'"
915 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
918 #. TRANSLATORS: The first %s is the name of the
919 #. environment variable, the second %s is its value
922 msgid "Bad %s value: '%s'"
927 msgid "unable to parse object: %s"
930 #: parse-options.c:570
934 #: parse-options.c:588
939 #. TRANSLATORS: the colon here should align with the
940 #. one in "usage: %s" translation
941 #: parse-options.c:592
946 #: parse-options.c:595
951 #: parse-options.c:629
955 #: parse-options-cb.c:108
957 msgid "malformed object name '%s'"
962 msgid "Could not make %s writable by group"
966 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
971 "global 'literal' pathspec setting is incompatible with all other global "
976 msgid "invalid parameter for pathspec magic 'prefix'"
981 msgid "Invalid pathspec magic '%.*s' in '%s'"
986 msgid "Missing ')' at the end of pathspec magic in '%s'"
991 msgid "Unimplemented pathspec magic '%c' in '%s'"
996 msgid "%s: 'literal' and 'glob' are incompatible"
1001 msgid "%s: '%s' is outside repository"
1006 msgid "Pathspec '%s' is in submodule '%.*s'"
1011 msgid "%s: pathspec magic not supported by this command: %s"
1016 msgid "pathspec '%s' is beyond a symbolic link"
1021 "There is nothing to exclude from by :(exclude) patterns.\n"
1022 "Perhaps you forgot to add either ':/' or '.' ?"
1026 msgid "unable to parse --pretty format"
1033 #: read-cache.c:1281
1036 "index.version set, but the value is invalid.\n"
1040 #: read-cache.c:1291
1043 "GIT_INDEX_VERSION set, but the value is invalid.\n"
1047 #: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
1048 #: builtin/merge.c:984
1050 msgid "Could not open '%s' for writing"
1053 #: refs/files-backend.c:2374
1055 msgid "could not delete reference %s: %s"
1058 #: refs/files-backend.c:2377
1060 msgid "could not delete references: %s"
1063 #: refs/files-backend.c:2386
1065 msgid "could not remove reference %s"
1070 msgid "expected format: %%(color:<color>)"
1075 msgid "unrecognized color: %%(color:%s)"
1080 msgid "unrecognized format: %%(%s)"
1085 msgid "%%(body) does not take arguments"
1090 msgid "%%(subject) does not take arguments"
1095 msgid "positive value expected contents:lines=%s"
1100 msgid "unrecognized %%(contents) argument: %s"
1105 msgid "unrecognized %%(objectname) argument: %s"
1110 msgid "expected format: %%(align:<width>,<position>)"
1115 msgid "unrecognized position:%s"
1120 msgid "unrecognized width:%s"
1125 msgid "unrecognized %%(align) argument: %s"
1130 msgid "positive width expected with the %%(align) atom"
1135 msgid "malformed field name: %.*s"
1140 msgid "unknown field name: %.*s"
1145 msgid "format: %%(end) atom used without corresponding atom"
1150 msgid "malformed format string %s"
1154 msgid ":strip= requires a positive integer argument"
1159 msgid "ref '%s' does not have %ld components to :strip"
1162 #: ref-filter.c:1046
1164 msgid "unknown %.*s format %s"
1167 #: ref-filter.c:1066 ref-filter.c:1097
1169 msgid "missing object %s for %s"
1172 #: ref-filter.c:1069 ref-filter.c:1100
1174 msgid "parse_object_buffer failed on %s for %s"
1177 #: ref-filter.c:1311
1179 msgid "malformed object at '%s'"
1182 #: ref-filter.c:1373
1184 msgid "ignoring ref with broken name %s"
1187 #: ref-filter.c:1378
1189 msgid "ignoring broken ref %s"
1192 #: ref-filter.c:1651
1194 msgid "format: %%(end) atom missing"
1197 #: ref-filter.c:1705
1199 msgid "malformed object name %s"
1204 msgid "Cannot fetch both %s and %s to %s"
1209 msgid "%s usually tracks %s, not %s"
1214 msgid "%s tracks both %s and %s"
1218 msgid "Internal error"
1221 #: remote.c:1677 remote.c:1720
1222 msgid "HEAD does not point to a branch"
1227 msgid "no such branch: '%s'"
1232 msgid "no upstream configured for branch '%s'"
1237 msgid "upstream branch '%s' not stored as a remote-tracking branch"
1242 msgid "push destination '%s' on remote '%s' has no local tracking branch"
1247 msgid "branch '%s' has no remote for pushing"
1252 msgid "push refspecs for '%s' do not include '%s'"
1256 msgid "push has no destination (push.default is 'nothing')"
1260 msgid "cannot resolve 'simple' push to a single destination"
1265 msgid "Your branch is based on '%s', but the upstream is gone.\n"
1269 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1274 msgid "Your branch is up-to-date with '%s'.\n"
1279 msgid "Your branch is ahead of '%s' by %d commit.\n"
1280 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1285 msgid " (use \"git push\" to publish your local commits)\n"
1290 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1292 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1297 msgid " (use \"git pull\" to update your local branch)\n"
1303 "Your branch and '%s' have diverged,\n"
1304 "and have %d and %d different commit each, respectively.\n"
1306 "Your branch and '%s' have diverged,\n"
1307 "and have %d and %d different commits each, respectively.\n"
1312 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1316 msgid "your current branch appears to be broken"
1321 msgid "your current branch '%s' does not have any commits yet"
1325 msgid "--first-parent is incompatible with --bisect"
1329 msgid "open /dev/null failed"
1334 msgid "dup2(%d,%d) failed"
1338 msgid "failed to sign the push certificate"
1342 msgid "the receiving end does not support --signed push"
1347 "not sending a push certificate since the receiving end does not support --"
1352 msgid "the receiving end does not support --atomic push"
1357 "after resolving the conflicts, mark the corrected paths\n"
1358 "with 'git add <paths>' or 'git rm <paths>'"
1363 "after resolving the conflicts, mark the corrected paths\n"
1364 "with 'git add <paths>' or 'git rm <paths>'\n"
1365 "and commit the result with 'git commit'"
1368 #: sequencer.c:190 sequencer.c:833 sequencer.c:913
1370 msgid "Could not write to %s"
1375 msgid "Error wrapping up %s"
1379 msgid "Your local changes would be overwritten by cherry-pick."
1383 msgid "Your local changes would be overwritten by revert."
1387 msgid "Commit your changes or stash them to proceed."
1390 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1393 msgid "%s: Unable to write new index file"
1397 msgid "Could not resolve HEAD commit\n"
1401 msgid "Unable to update cache tree\n"
1406 msgid "Could not parse commit %s\n"
1411 msgid "Could not parse parent commit %s\n"
1415 msgid "Your index file is unmerged."
1420 msgid "Commit %s is a merge but no -m option was given."
1425 msgid "Commit %s does not have parent %d"
1430 msgid "Mainline was specified but commit %s is not a merge."
1433 #. TRANSLATORS: The first %s will be "revert" or
1434 #. "cherry-pick", the second %s a SHA1
1437 msgid "%s: cannot parse parent commit %s"
1442 msgid "Cannot get commit message for %s"
1447 msgid "could not revert %s... %s"
1452 msgid "could not apply %s... %s"
1456 msgid "empty commit set passed"
1461 msgid "git %s: failed to read the index"
1466 msgid "git %s: failed to refresh the index"
1471 msgid "Cannot %s during a %s"
1476 msgid "Could not parse line %d."
1480 msgid "No commits parsed."
1485 msgid "Could not open %s"
1490 msgid "Could not read %s."
1495 msgid "Unusable instruction sheet: %s"
1500 msgid "Invalid key: %s"
1503 #: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
1505 msgid "Invalid value for %s: %s"
1510 msgid "Malformed options sheet: %s"
1514 msgid "a cherry-pick or revert is already in progress"
1518 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1523 msgid "Could not create sequencer directory %s"
1526 #: sequencer.c:835 sequencer.c:917
1528 msgid "Error wrapping up %s."
1531 #: sequencer.c:854 sequencer.c:987
1532 msgid "no cherry-pick or revert in progress"
1536 msgid "cannot resolve HEAD"
1540 msgid "cannot abort from a branch yet to be born"
1543 #: sequencer.c:878 builtin/apply.c:4287
1545 msgid "cannot open %s: %s"
1550 msgid "cannot read %s: %s"
1554 msgid "unexpected end of file"
1559 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1564 msgid "Could not format %s."
1569 msgid "%s: can't cherry-pick a %s"
1574 msgid "%s: bad revision"
1578 msgid "Can't revert as initial commit"
1582 msgid "Can't cherry-pick into empty head"
1587 msgid "failed to read %s"
1591 msgid "offset before end of packfile (broken .idx?)"
1596 msgid "offset before start of pack index for %s (corrupt index?)"
1601 msgid "offset beyond end of pack index for %s (truncated index?)"
1606 "Git normally never creates a ref that ends with 40 hex characters\n"
1607 "because it will be ignored when you just specify 40-hex. These refs\n"
1608 "may be created by mistake. For example,\n"
1610 " git checkout -b $br $(git rev-parse ...)\n"
1612 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1613 "examine these refs and maybe delete them. Turn this message off by\n"
1614 "running \"git config advice.objectNameWarning false\""
1617 #: submodule.c:62 submodule.c:96
1618 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1621 #: submodule.c:66 submodule.c:100
1623 msgid "Could not find section in .gitmodules where path=%s"
1628 msgid "Could not update .gitmodules entry %s"
1633 msgid "Could not remove .gitmodules entry for %s"
1637 msgid "staging updated .gitmodules failed"
1642 msgid "running trailer command '%s' failed"
1645 #: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
1648 msgid "unknown value '%s' for key '%s'"
1651 #: trailer.c:544 trailer.c:549 builtin/remote.c:289
1653 msgid "more than one %s"
1658 msgid "empty trailer token in trailer '%.*s'"
1663 msgid "could not read input file '%s'"
1667 msgid "could not read from stdin"
1670 #: trailer.c:857 builtin/am.c:42
1672 msgid "could not stat %s"
1677 msgid "file %s is not a regular file"
1682 msgid "file %s is not writable by user"
1686 msgid "could not open temporary file"
1691 msgid "could not rename temporary file to %s"
1694 #: transport-helper.c:1041
1696 msgid "Could not read ref %s"
1699 #: unpack-trees.c:203
1700 msgid "Checking out files"
1704 msgid "invalid URL scheme name or missing '://' suffix"
1707 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1709 msgid "invalid %XX escape sequence"
1713 msgid "missing host and scheme is not 'file:'"
1717 msgid "a 'file:' URL may not have a port number"
1721 msgid "invalid characters in host name"
1724 #: urlmatch.c:244 urlmatch.c:255
1725 msgid "invalid port number"
1729 msgid "invalid '..' path segment"
1732 #: wrapper.c:222 wrapper.c:381
1734 msgid "could not open '%s' for reading and writing"
1737 #: wrapper.c:224 wrapper.c:383
1739 msgid "could not open '%s' for writing"
1742 #: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
1743 #: builtin/merge.c:1075 builtin/pull.c:387
1745 msgid "could not open '%s' for reading"
1750 msgid "unable to access '%s': %s"
1755 msgid "unable to access '%s'"
1759 msgid "unable to get current working directory"
1764 msgid "could not open %s for writing"
1767 #: wrapper.c:678 builtin/am.c:410
1769 msgid "could not write to %s"
1774 msgid "could not close %s"
1778 msgid "Unmerged paths:"
1781 #: wt-status.c:176 wt-status.c:203
1783 msgid " (use \"git reset %s <file>...\" to unstage)"
1786 #: wt-status.c:178 wt-status.c:205
1787 msgid " (use \"git rm --cached <file>...\" to unstage)"
1791 msgid " (use \"git add <file>...\" to mark resolution)"
1794 #: wt-status.c:184 wt-status.c:188
1795 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1799 msgid " (use \"git rm <file>...\" to mark resolution)"
1802 #: wt-status.c:197 wt-status.c:880
1803 msgid "Changes to be committed:"
1806 #: wt-status.c:215 wt-status.c:889
1807 msgid "Changes not staged for commit:"
1811 msgid " (use \"git add <file>...\" to update what will be committed)"
1815 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1820 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1824 msgid " (commit or discard the untracked or modified content in submodules)"
1829 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1833 msgid "both deleted:"
1837 msgid "added by us:"
1841 msgid "deleted by them:"
1845 msgid "added by them:"
1849 msgid "deleted by us:"
1857 msgid "both modified:"
1862 msgid "bug: unhandled unmerged status %x"
1898 msgid "new commits, "
1902 msgid "modified content, "
1906 msgid "untracked content, "
1911 msgid "bug: unhandled diff status %c"
1915 msgid "Submodules changed but not updated:"
1919 msgid "Submodule changes to be committed:"
1924 "Do not touch the line above.\n"
1925 "Everything below will be removed."
1929 msgid "You have unmerged paths."
1933 msgid " (fix conflicts and run \"git commit\")"
1937 msgid "All conflicts fixed but you are still merging."
1941 msgid " (use \"git commit\" to conclude merge)"
1945 msgid "You are in the middle of an am session."
1949 msgid "The current patch is empty."
1953 msgid " (fix conflicts and then run \"git am --continue\")"
1957 msgid " (use \"git am --skip\" to skip this patch)"
1961 msgid " (use \"git am --abort\" to restore the original branch)"
1965 msgid "No commands done."
1970 msgid "Last command done (%d command done):"
1971 msgid_plural "Last commands done (%d commands done):"
1977 msgid " (see more in file %s)"
1981 msgid "No commands remaining."
1986 msgid "Next command to do (%d remaining command):"
1987 msgid_plural "Next commands to do (%d remaining commands):"
1992 msgid " (use \"git rebase --edit-todo\" to view and edit)"
1997 msgid "You are currently rebasing branch '%s' on '%s'."
2001 msgid "You are currently rebasing."
2005 msgid " (fix conflicts and then run \"git rebase --continue\")"
2009 msgid " (use \"git rebase --skip\" to skip this patch)"
2013 msgid " (use \"git rebase --abort\" to check out the original branch)"
2017 msgid " (all conflicts fixed: run \"git rebase --continue\")"
2023 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
2027 msgid "You are currently splitting a commit during a rebase."
2031 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
2036 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
2040 msgid "You are currently editing a commit during a rebase."
2044 msgid " (use \"git commit --amend\" to amend the current commit)"
2049 " (use \"git rebase --continue\" once you are satisfied with your changes)"
2054 msgid "You are currently cherry-picking commit %s."
2058 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
2062 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
2066 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2071 msgid "You are currently reverting commit %s."
2075 msgid " (fix conflicts and run \"git revert --continue\")"
2079 msgid " (all conflicts fixed: run \"git revert --continue\")"
2083 msgid " (use \"git revert --abort\" to cancel the revert operation)"
2088 msgid "You are currently bisecting, started from branch '%s'."
2092 msgid "You are currently bisecting."
2096 msgid " (use \"git bisect reset\" to get back to the original branch)"
2104 msgid "interactive rebase in progress; onto "
2108 msgid "rebase in progress; onto "
2112 msgid "HEAD detached at "
2116 msgid "HEAD detached from "
2120 msgid "Not currently on any branch."
2124 msgid "Initial commit"
2128 msgid "Untracked files"
2132 msgid "Ignored files"
2138 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2139 "may speed it up, but you have to be careful not to forget to add\n"
2140 "new files yourself (see 'git help status')."
2145 msgid "Untracked files not listed%s"
2149 msgid " (use -u option to show untracked files)"
2158 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
2163 msgid "no changes added to commit\n"
2169 "nothing added to commit but untracked files present (use \"git add\" to "
2175 msgid "nothing added to commit but untracked files present\n"
2180 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
2183 #: wt-status.c:1528 wt-status.c:1533
2185 msgid "nothing to commit\n"
2190 msgid "nothing to commit (use -u to show untracked files)\n"
2195 msgid "nothing to commit, working directory clean\n"
2199 msgid "Initial commit on "
2203 msgid "HEAD (no branch)"
2210 #: wt-status.c:1677 wt-status.c:1685
2214 #: wt-status.c:1680 wt-status.c:1683
2218 #: compat/precompose_utf8.c:57 builtin/clone.c:413
2220 msgid "failed to unlink '%s'"
2224 msgid "git add [<options>] [--] <pathspec>..."
2229 msgid "unexpected diff status %c"
2232 #: builtin/add.c:70 builtin/commit.c:278
2233 msgid "updating files failed"
2238 msgid "remove '%s'\n"
2241 #: builtin/add.c:134
2242 msgid "Unstaged changes after refreshing the index:"
2245 #: builtin/add.c:194 builtin/rev-parse.c:797
2246 msgid "Could not read the index"
2249 #: builtin/add.c:205
2251 msgid "Could not open '%s' for writing."
2254 #: builtin/add.c:209
2255 msgid "Could not write patch"
2258 #: builtin/add.c:212
2259 msgid "editing patch failed"
2262 #: builtin/add.c:215
2264 msgid "Could not stat '%s'"
2267 #: builtin/add.c:217
2268 msgid "Empty patch. Aborted."
2271 #: builtin/add.c:222
2273 msgid "Could not apply '%s'"
2276 #: builtin/add.c:232
2277 msgid "The following paths are ignored by one of your .gitignore files:\n"
2280 #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
2281 #: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
2282 #: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
2286 #: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
2287 #: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
2288 #: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
2292 #: builtin/add.c:252
2293 msgid "interactive picking"
2296 #: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
2297 msgid "select hunks interactively"
2300 #: builtin/add.c:254
2301 msgid "edit current diff and apply"
2304 #: builtin/add.c:255
2305 msgid "allow adding otherwise ignored files"
2308 #: builtin/add.c:256
2309 msgid "update tracked files"
2312 #: builtin/add.c:257
2313 msgid "record only the fact that the path will be added later"
2316 #: builtin/add.c:258
2317 msgid "add changes from all tracked and untracked files"
2320 #: builtin/add.c:261
2321 msgid "ignore paths removed in the working tree (same as --no-all)"
2324 #: builtin/add.c:263
2325 msgid "don't add, only refresh the index"
2328 #: builtin/add.c:264
2329 msgid "just skip files which cannot be added because of errors"
2332 #: builtin/add.c:265
2333 msgid "check if - even missing - files are ignored in dry run"
2336 #: builtin/add.c:287
2338 msgid "Use -f if you really want to add them.\n"
2341 #: builtin/add.c:294
2342 msgid "adding files failed"
2345 #: builtin/add.c:330
2346 msgid "-A and -u are mutually incompatible"
2349 #: builtin/add.c:337
2350 msgid "Option --ignore-missing can only be used together with --dry-run"
2353 #: builtin/add.c:352
2355 msgid "Nothing specified, nothing added.\n"
2358 #: builtin/add.c:353
2360 msgid "Maybe you wanted to say 'git add .'?\n"
2363 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
2364 #: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
2365 #: builtin/submodule--helper.c:35
2366 msgid "index file corrupt"
2369 #: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
2370 msgid "Unable to write new index file"
2373 #: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
2375 msgid "could not read '%s'"
2379 msgid "could not parse author script"
2384 msgid "'%s' was deleted by the applypatch-msg hook"
2387 #: builtin/am.c:548 builtin/notes.c:300
2389 msgid "Malformed input line: '%s'."
2392 #: builtin/am.c:585 builtin/notes.c:315
2394 msgid "Failed to copy notes from '%s' to '%s'"
2398 msgid "fseek failed"
2401 #: builtin/am.c:772 builtin/am.c:860
2403 msgid "could not open '%s' for reading: %s"
2408 msgid "could not open '%s' for writing: %s"
2413 msgid "could not parse patch '%s'"
2417 msgid "Only one StGIT patch series can be applied at once"
2421 msgid "invalid timestamp"
2424 #: builtin/am.c:904 builtin/am.c:912
2425 msgid "invalid Date line"
2429 msgid "invalid timezone offset"
2433 msgid "Patch format detection failed."
2436 #: builtin/am.c:1001 builtin/clone.c:378
2438 msgid "failed to create directory '%s'"
2441 #: builtin/am.c:1005
2442 msgid "Failed to split patches."
2445 #: builtin/am.c:1137 builtin/commit.c:363
2446 msgid "unable to write index file"
2449 #: builtin/am.c:1188
2451 msgid "When you have resolved this problem, run \"%s --continue\"."
2454 #: builtin/am.c:1189
2456 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2459 #: builtin/am.c:1190
2461 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
2464 #: builtin/am.c:1328
2465 msgid "Patch is empty. Was it split wrong?"
2468 #: builtin/am.c:1402 builtin/log.c:1350
2470 msgid "invalid ident line: %s"
2473 #: builtin/am.c:1429
2475 msgid "unable to parse commit %s"
2478 #: builtin/am.c:1631
2479 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
2482 #: builtin/am.c:1633
2483 msgid "Using index info to reconstruct a base tree..."
2486 #: builtin/am.c:1652
2488 "Did you hand edit your patch?\n"
2489 "It does not apply to blobs recorded in its index."
2492 #: builtin/am.c:1658
2493 msgid "Falling back to patching base and 3-way merge..."
2496 #: builtin/am.c:1673
2497 msgid "Failed to merge in the changes."
2500 #: builtin/am.c:1697 builtin/merge.c:633
2501 msgid "git write-tree failed to write a tree"
2504 #: builtin/am.c:1704
2505 msgid "applying to an empty history"
2508 #: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
2509 #: builtin/merge.c:855
2510 msgid "failed to write commit object"
2513 #: builtin/am.c:1749 builtin/am.c:1753
2515 msgid "cannot resume: %s does not exist."
2518 #: builtin/am.c:1769
2519 msgid "cannot be interactive without stdin connected to a terminal."
2522 #: builtin/am.c:1774
2523 msgid "Commit Body is:"
2526 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
2527 #. in your translation. The program will only accept English
2528 #. input at this point.
2530 #: builtin/am.c:1784
2531 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
2534 #: builtin/am.c:1834
2536 msgid "Dirty index: cannot apply patches (dirty: %s)"
2539 #: builtin/am.c:1869 builtin/am.c:1941
2541 msgid "Applying: %.*s"
2544 #: builtin/am.c:1885
2545 msgid "No changes -- Patch already applied."
2548 #: builtin/am.c:1893
2550 msgid "Patch failed at %s %.*s"
2553 #: builtin/am.c:1899
2555 msgid "The copy of the patch that failed is found in: %s"
2558 #: builtin/am.c:1944
2560 "No changes - did you forget to use 'git add'?\n"
2561 "If there is nothing left to stage, chances are that something else\n"
2562 "already introduced the same changes; you might want to skip this patch."
2565 #: builtin/am.c:1951
2567 "You still have unmerged paths in your index.\n"
2568 "Did you forget to use 'git add'?"
2571 #: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
2572 #: builtin/reset.c:316
2574 msgid "Could not parse object '%s'."
2577 #: builtin/am.c:2111
2578 msgid "failed to clean index"
2581 #: builtin/am.c:2145
2583 "You seem to have moved HEAD since the last 'am' failure.\n"
2584 "Not rewinding to ORIG_HEAD"
2587 #: builtin/am.c:2206
2589 msgid "Invalid value for --patch-format: %s"
2592 #: builtin/am.c:2239
2593 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
2596 #: builtin/am.c:2240
2597 msgid "git am [<options>] (--continue | --skip | --abort)"
2600 #: builtin/am.c:2246
2601 msgid "run interactively"
2604 #: builtin/am.c:2248
2605 msgid "historical option -- no-op"
2608 #: builtin/am.c:2250
2609 msgid "allow fall back on 3way merging if needed"
2612 #: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
2613 #: builtin/repack.c:171
2617 #: builtin/am.c:2253
2618 msgid "add a Signed-off-by line to the commit message"
2621 #: builtin/am.c:2256
2622 msgid "recode into utf8 (default)"
2625 #: builtin/am.c:2258
2626 msgid "pass -k flag to git-mailinfo"
2629 #: builtin/am.c:2260
2630 msgid "pass -b flag to git-mailinfo"
2633 #: builtin/am.c:2262
2634 msgid "pass -m flag to git-mailinfo"
2637 #: builtin/am.c:2264
2638 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
2641 #: builtin/am.c:2267
2642 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
2645 #: builtin/am.c:2270
2646 msgid "strip everything before a scissors line"
2649 #: builtin/am.c:2271 builtin/apply.c:4544
2653 #: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
2654 #: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
2655 #: builtin/am.c:2299
2656 msgid "pass it through git-apply"
2659 #: builtin/am.c:2280 builtin/apply.c:4568
2663 #: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
2664 #: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
2665 #: builtin/pull.c:171 builtin/submodule--helper.c:72
2666 #: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
2670 #: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
2671 #: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131
2672 #: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182
2673 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
2674 #: parse-options.h:132 parse-options.h:134 parse-options.h:244
2678 #: builtin/am.c:2292 builtin/apply.c:4512
2682 #: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
2683 #: builtin/tag.c:372
2687 #: builtin/am.c:2296
2688 msgid "format the patch(es) are in"
2691 #: builtin/am.c:2302
2692 msgid "override error message when patch failure occurs"
2695 #: builtin/am.c:2304
2696 msgid "continue applying patches after resolving a conflict"
2699 #: builtin/am.c:2307
2700 msgid "synonyms for --continue"
2703 #: builtin/am.c:2310
2704 msgid "skip the current patch"
2707 #: builtin/am.c:2313
2708 msgid "restore the original branch and abort the patching operation."
2711 #: builtin/am.c:2317
2712 msgid "lie about committer date"
2715 #: builtin/am.c:2319
2716 msgid "use current timestamp for author date"
2719 #: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
2720 #: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
2724 #: builtin/am.c:2322
2725 msgid "GPG-sign commits"
2728 #: builtin/am.c:2325
2729 msgid "(internal use for git-rebase)"
2732 #: builtin/am.c:2340
2734 "The -b/--binary option has been a no-op for long time, and\n"
2735 "it will be removed. Please do not use it anymore."
2738 #: builtin/am.c:2347
2739 msgid "failed to read the index"
2742 #: builtin/am.c:2362
2744 msgid "previous rebase directory %s still exists but mbox given."
2747 #: builtin/am.c:2386
2750 "Stray %s directory found.\n"
2751 "Use \"git am --abort\" to remove it."
2754 #: builtin/am.c:2392
2755 msgid "Resolve operation not in progress, we are not resuming."
2758 #: builtin/apply.c:59
2759 msgid "git apply [<options>] [<patch>...]"
2762 #: builtin/apply.c:111
2764 msgid "unrecognized whitespace option '%s'"
2767 #: builtin/apply.c:126
2769 msgid "unrecognized whitespace ignore option '%s'"
2772 #: builtin/apply.c:818
2774 msgid "Cannot prepare timestamp regexp %s"
2777 #: builtin/apply.c:827
2779 msgid "regexec returned %d for input: %s"
2782 #: builtin/apply.c:908
2784 msgid "unable to find filename in patch at line %d"
2787 #: builtin/apply.c:940
2789 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2792 #: builtin/apply.c:944
2794 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2797 #: builtin/apply.c:945
2799 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2802 #: builtin/apply.c:952
2804 msgid "git apply: bad git-diff - expected /dev/null on line %d"
2807 #: builtin/apply.c:1415
2809 msgid "recount: unexpected line: %.*s"
2812 #: builtin/apply.c:1472
2814 msgid "patch fragment without header at line %d: %.*s"
2817 #: builtin/apply.c:1489
2820 "git diff header lacks filename information when removing %d leading pathname "
2821 "component (line %d)"
2823 "git diff header lacks filename information when removing %d leading pathname "
2824 "components (line %d)"
2828 #: builtin/apply.c:1655
2829 msgid "new file depends on old contents"
2832 #: builtin/apply.c:1657
2833 msgid "deleted file still has contents"
2836 #: builtin/apply.c:1683
2838 msgid "corrupt patch at line %d"
2841 #: builtin/apply.c:1719
2843 msgid "new file %s depends on old contents"
2846 #: builtin/apply.c:1721
2848 msgid "deleted file %s still has contents"
2851 #: builtin/apply.c:1724
2853 msgid "** warning: file %s becomes empty but is not deleted"
2856 #: builtin/apply.c:1870
2858 msgid "corrupt binary patch at line %d: %.*s"
2861 #: builtin/apply.c:1899
2863 msgid "unrecognized binary patch at line %d"
2866 #: builtin/apply.c:2050
2868 msgid "patch with only garbage at line %d"
2871 #: builtin/apply.c:2140
2873 msgid "unable to read symlink %s"
2876 #: builtin/apply.c:2144
2878 msgid "unable to open or read %s"
2881 #: builtin/apply.c:2777
2883 msgid "invalid start of line: '%c'"
2886 #: builtin/apply.c:2896
2888 msgid "Hunk #%d succeeded at %d (offset %d line)."
2889 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2893 #: builtin/apply.c:2908
2895 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2898 #: builtin/apply.c:2914
2901 "while searching for:\n"
2905 #: builtin/apply.c:2934
2907 msgid "missing binary patch data for '%s'"
2910 #: builtin/apply.c:3035
2912 msgid "binary patch does not apply to '%s'"
2915 #: builtin/apply.c:3041
2917 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2920 #: builtin/apply.c:3062
2922 msgid "patch failed: %s:%ld"
2925 #: builtin/apply.c:3186
2927 msgid "cannot checkout %s"
2930 #: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
2932 msgid "read of %s failed"
2935 #: builtin/apply.c:3239
2937 msgid "reading from '%s' beyond a symbolic link"
2940 #: builtin/apply.c:3267 builtin/apply.c:3489
2942 msgid "path %s has been renamed/deleted"
2945 #: builtin/apply.c:3348 builtin/apply.c:3503
2947 msgid "%s: does not exist in index"
2950 #: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
2955 #: builtin/apply.c:3357 builtin/apply.c:3511
2957 msgid "%s: does not match index"
2960 #: builtin/apply.c:3459
2961 msgid "removal patch leaves file contents"
2964 #: builtin/apply.c:3528
2966 msgid "%s: wrong type"
2969 #: builtin/apply.c:3530
2971 msgid "%s has type %o, expected %o"
2974 #: builtin/apply.c:3689 builtin/apply.c:3691
2976 msgid "invalid path '%s'"
2979 #: builtin/apply.c:3746
2981 msgid "%s: already exists in index"
2984 #: builtin/apply.c:3749
2986 msgid "%s: already exists in working directory"
2989 #: builtin/apply.c:3769
2991 msgid "new mode (%o) of %s does not match old mode (%o)"
2994 #: builtin/apply.c:3774
2996 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2999 #: builtin/apply.c:3794
3001 msgid "affected file '%s' is beyond a symbolic link"
3004 #: builtin/apply.c:3798
3006 msgid "%s: patch does not apply"
3009 #: builtin/apply.c:3812
3011 msgid "Checking patch %s..."
3014 #: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
3016 msgid "make_cache_entry failed for path '%s'"
3019 #: builtin/apply.c:4048
3021 msgid "unable to remove %s from index"
3024 #: builtin/apply.c:4077
3026 msgid "corrupt patch for submodule %s"
3029 #: builtin/apply.c:4081
3031 msgid "unable to stat newly created file '%s'"
3034 #: builtin/apply.c:4086
3036 msgid "unable to create backing store for newly created file %s"
3039 #: builtin/apply.c:4089 builtin/apply.c:4197
3041 msgid "unable to add cache entry for %s"
3044 #: builtin/apply.c:4122
3046 msgid "closing file '%s'"
3049 #: builtin/apply.c:4171
3051 msgid "unable to write file '%s' mode %o"
3054 #: builtin/apply.c:4258
3056 msgid "Applied patch %s cleanly."
3059 #: builtin/apply.c:4266
3060 msgid "internal error"
3063 #: builtin/apply.c:4269
3065 msgid "Applying patch %%s with %d reject..."
3066 msgid_plural "Applying patch %%s with %d rejects..."
3070 #: builtin/apply.c:4279
3072 msgid "truncating .rej filename to %.*s.rej"
3075 #: builtin/apply.c:4300
3077 msgid "Hunk #%d applied cleanly."
3080 #: builtin/apply.c:4303
3082 msgid "Rejected hunk #%d."
3085 #: builtin/apply.c:4393
3086 msgid "unrecognized input"
3089 #: builtin/apply.c:4404
3090 msgid "unable to read index file"
3093 #: builtin/apply.c:4507
3094 msgid "don't apply changes matching the given path"
3097 #: builtin/apply.c:4510
3098 msgid "apply changes matching the given path"
3101 #: builtin/apply.c:4513
3102 msgid "remove <num> leading slashes from traditional diff paths"
3105 #: builtin/apply.c:4516
3106 msgid "ignore additions made by the patch"
3109 #: builtin/apply.c:4518
3110 msgid "instead of applying the patch, output diffstat for the input"
3113 #: builtin/apply.c:4522
3114 msgid "show number of added and deleted lines in decimal notation"
3117 #: builtin/apply.c:4524
3118 msgid "instead of applying the patch, output a summary for the input"
3121 #: builtin/apply.c:4526
3122 msgid "instead of applying the patch, see if the patch is applicable"
3125 #: builtin/apply.c:4528
3126 msgid "make sure the patch is applicable to the current index"
3129 #: builtin/apply.c:4530
3130 msgid "apply a patch without touching the working tree"
3133 #: builtin/apply.c:4532
3134 msgid "accept a patch that touches outside the working area"
3137 #: builtin/apply.c:4534
3138 msgid "also apply the patch (use with --stat/--summary/--check)"
3141 #: builtin/apply.c:4536
3142 msgid "attempt three-way merge if a patch does not apply"
3145 #: builtin/apply.c:4538
3146 msgid "build a temporary index based on embedded index information"
3149 #: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
3150 msgid "paths are separated with NUL character"
3153 #: builtin/apply.c:4543
3154 msgid "ensure at least <n> lines of context match"
3157 #: builtin/apply.c:4545
3158 msgid "detect new or modified lines that have whitespace errors"
3161 #: builtin/apply.c:4548 builtin/apply.c:4551
3162 msgid "ignore changes in whitespace when finding context"
3165 #: builtin/apply.c:4554
3166 msgid "apply the patch in reverse"
3169 #: builtin/apply.c:4556
3170 msgid "don't expect at least one line of context"
3173 #: builtin/apply.c:4558
3174 msgid "leave the rejected hunks in corresponding *.rej files"
3177 #: builtin/apply.c:4560
3178 msgid "allow overlapping hunks"
3181 #: builtin/apply.c:4563
3182 msgid "tolerate incorrectly detected missing new-line at the end of file"
3185 #: builtin/apply.c:4566
3186 msgid "do not trust the line counts in the hunk headers"
3189 #: builtin/apply.c:4569
3190 msgid "prepend <root> to all filenames"
3193 #: builtin/apply.c:4591
3194 msgid "--3way outside a repository"
3197 #: builtin/apply.c:4599
3198 msgid "--index outside a repository"
3201 #: builtin/apply.c:4602
3202 msgid "--cached outside a repository"
3205 #: builtin/apply.c:4621
3207 msgid "can't open patch '%s'"
3210 #: builtin/apply.c:4635
3212 msgid "squelched %d whitespace error"
3213 msgid_plural "squelched %d whitespace errors"
3217 #: builtin/apply.c:4641 builtin/apply.c:4651
3219 msgid "%d line adds whitespace errors."
3220 msgid_plural "%d lines add whitespace errors."
3224 #: builtin/archive.c:17
3226 msgid "could not create archive file '%s'"
3229 #: builtin/archive.c:20
3230 msgid "could not redirect output"
3233 #: builtin/archive.c:37
3234 msgid "git archive: Remote with no URL"
3237 #: builtin/archive.c:58
3238 msgid "git archive: expected ACK/NAK, got EOF"
3241 #: builtin/archive.c:61
3243 msgid "git archive: NACK %s"
3246 #: builtin/archive.c:63
3248 msgid "remote error: %s"
3251 #: builtin/archive.c:64
3252 msgid "git archive: protocol error"
3255 #: builtin/archive.c:68
3256 msgid "git archive: expected a flush"
3259 #: builtin/bisect--helper.c:7
3260 msgid "git bisect--helper --next-all [--no-checkout]"
3263 #: builtin/bisect--helper.c:17
3264 msgid "perform 'git bisect next'"
3267 #: builtin/bisect--helper.c:19
3268 msgid "update BISECT_HEAD instead of checking out the current commit"
3271 #: builtin/blame.c:33
3272 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3275 #: builtin/blame.c:38
3276 msgid "<rev-opts> are documented in git-rev-list(1)"
3279 #: builtin/blame.c:1782
3280 msgid "Blaming lines"
3283 #: builtin/blame.c:2530
3284 msgid "Show blame entries as we find them, incrementally"
3287 #: builtin/blame.c:2531
3288 msgid "Show blank SHA-1 for boundary commits (Default: off)"
3291 #: builtin/blame.c:2532
3292 msgid "Do not treat root commits as boundaries (Default: off)"
3295 #: builtin/blame.c:2533
3296 msgid "Show work cost statistics"
3299 #: builtin/blame.c:2534
3300 msgid "Force progress reporting"
3303 #: builtin/blame.c:2535
3304 msgid "Show output score for blame entries"
3307 #: builtin/blame.c:2536
3308 msgid "Show original filename (Default: auto)"
3311 #: builtin/blame.c:2537
3312 msgid "Show original linenumber (Default: off)"
3315 #: builtin/blame.c:2538
3316 msgid "Show in a format designed for machine consumption"
3319 #: builtin/blame.c:2539
3320 msgid "Show porcelain format with per-line commit information"
3323 #: builtin/blame.c:2540
3324 msgid "Use the same output mode as git-annotate (Default: off)"
3327 #: builtin/blame.c:2541
3328 msgid "Show raw timestamp (Default: off)"
3331 #: builtin/blame.c:2542
3332 msgid "Show long commit SHA1 (Default: off)"
3335 #: builtin/blame.c:2543
3336 msgid "Suppress author name and timestamp (Default: off)"
3339 #: builtin/blame.c:2544
3340 msgid "Show author email instead of name (Default: off)"
3343 #: builtin/blame.c:2545
3344 msgid "Ignore whitespace differences"
3347 #: builtin/blame.c:2546
3348 msgid "Spend extra cycles to find better match"
3351 #: builtin/blame.c:2547
3352 msgid "Use revisions from <file> instead of calling git-rev-list"
3355 #: builtin/blame.c:2548
3356 msgid "Use <file>'s contents as the final image"
3359 #: builtin/blame.c:2549 builtin/blame.c:2550
3363 #: builtin/blame.c:2549
3364 msgid "Find line copies within and across files"
3367 #: builtin/blame.c:2550
3368 msgid "Find line movements within and across files"
3371 #: builtin/blame.c:2551
3375 #: builtin/blame.c:2551
3376 msgid "Process only line range n,m, counting from 1"
3379 #. TRANSLATORS: This string is used to tell us the maximum
3380 #. display width for a relative timestamp in "git blame"
3381 #. output. For C locale, "4 years, 11 months ago", which
3382 #. takes 22 places, is the longest among various forms of
3383 #. relative timestamps, but your language may need more or
3384 #. fewer display columns.
3385 #: builtin/blame.c:2640
3386 msgid "4 years, 11 months ago"
3389 #: builtin/branch.c:25
3390 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
3393 #: builtin/branch.c:26
3394 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
3397 #: builtin/branch.c:27
3398 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3401 #: builtin/branch.c:28
3402 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3405 #: builtin/branch.c:29
3406 msgid "git branch [<options>] [-r | -a] [--points-at]"
3409 #: builtin/branch.c:142
3412 "deleting branch '%s' that has been merged to\n"
3413 " '%s', but not yet merged to HEAD."
3416 #: builtin/branch.c:146
3419 "not deleting branch '%s' that is not yet merged to\n"
3420 " '%s', even though it is merged to HEAD."
3423 #: builtin/branch.c:160
3425 msgid "Couldn't look up commit object for '%s'"
3428 #: builtin/branch.c:164
3431 "The branch '%s' is not fully merged.\n"
3432 "If you are sure you want to delete it, run 'git branch -D %s'."
3435 #: builtin/branch.c:177
3436 msgid "Update of config-file failed"
3439 #: builtin/branch.c:205
3440 msgid "cannot use -a with -d"
3443 #: builtin/branch.c:211
3444 msgid "Couldn't look up commit object for HEAD"
3447 #: builtin/branch.c:219
3449 msgid "Cannot delete the branch '%s' which you are currently on."
3452 #: builtin/branch.c:235
3454 msgid "remote-tracking branch '%s' not found."
3457 #: builtin/branch.c:236
3459 msgid "branch '%s' not found."
3462 #: builtin/branch.c:251
3464 msgid "Error deleting remote-tracking branch '%s'"
3467 #: builtin/branch.c:252
3469 msgid "Error deleting branch '%s'"
3472 #: builtin/branch.c:259
3474 msgid "Deleted remote-tracking branch %s (was %s).\n"
3477 #: builtin/branch.c:260
3479 msgid "Deleted branch %s (was %s).\n"
3482 #: builtin/branch.c:303
3487 #: builtin/branch.c:308
3492 #: builtin/branch.c:313
3494 msgid "[%s: behind %d]"
3497 #: builtin/branch.c:315
3502 #: builtin/branch.c:319
3504 msgid "[%s: ahead %d]"
3507 #: builtin/branch.c:321
3512 #: builtin/branch.c:324
3514 msgid "[%s: ahead %d, behind %d]"
3517 #: builtin/branch.c:327
3519 msgid "[ahead %d, behind %d]"
3522 #: builtin/branch.c:340
3523 msgid " **** invalid ref ****"
3526 #: builtin/branch.c:366
3528 msgid "(no branch, rebasing %s)"
3531 #: builtin/branch.c:369
3533 msgid "(no branch, bisect started on %s)"
3536 #: builtin/branch.c:375
3538 msgid "(HEAD detached at %s)"
3541 #: builtin/branch.c:378
3543 msgid "(HEAD detached from %s)"
3546 #: builtin/branch.c:382
3550 #: builtin/branch.c:524
3551 msgid "cannot rename the current branch while not on any."
3554 #: builtin/branch.c:534
3556 msgid "Invalid branch name: '%s'"
3559 #: builtin/branch.c:549
3560 msgid "Branch rename failed"
3563 #: builtin/branch.c:553
3565 msgid "Renamed a misnamed branch '%s' away"
3568 #: builtin/branch.c:557
3570 msgid "Branch renamed to %s, but HEAD is not updated!"
3573 #: builtin/branch.c:564
3574 msgid "Branch is renamed, but update of config-file failed"
3577 #: builtin/branch.c:586
3579 msgid "could not write branch description template: %s"
3582 #: builtin/branch.c:615
3583 msgid "Generic options"
3586 #: builtin/branch.c:617
3587 msgid "show hash and subject, give twice for upstream branch"
3590 #: builtin/branch.c:618
3591 msgid "suppress informational messages"
3594 #: builtin/branch.c:619
3595 msgid "set up tracking mode (see git-pull(1))"
3598 #: builtin/branch.c:621
3599 msgid "change upstream info"
3602 #: builtin/branch.c:625
3603 msgid "use colored output"
3606 #: builtin/branch.c:626
3607 msgid "act on remote-tracking branches"
3610 #: builtin/branch.c:628 builtin/branch.c:629
3611 msgid "print only branches that contain the commit"
3614 #: builtin/branch.c:632
3615 msgid "Specific git-branch actions:"
3618 #: builtin/branch.c:633
3619 msgid "list both remote-tracking and local branches"
3622 #: builtin/branch.c:635
3623 msgid "delete fully merged branch"
3626 #: builtin/branch.c:636
3627 msgid "delete branch (even if not merged)"
3630 #: builtin/branch.c:637
3631 msgid "move/rename a branch and its reflog"
3634 #: builtin/branch.c:638
3635 msgid "move/rename a branch, even if target exists"
3638 #: builtin/branch.c:639
3639 msgid "list branch names"
3642 #: builtin/branch.c:640
3643 msgid "create the branch's reflog"
3646 #: builtin/branch.c:642
3647 msgid "edit the description for the branch"
3650 #: builtin/branch.c:643
3651 msgid "force creation, move/rename, deletion"
3654 #: builtin/branch.c:644
3655 msgid "print only branches that are merged"
3658 #: builtin/branch.c:645
3659 msgid "print only branches that are not merged"
3662 #: builtin/branch.c:646
3663 msgid "list branches in columns"
3666 #: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
3670 #: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
3671 msgid "field name to sort on"
3674 #: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
3675 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
3676 #: builtin/tag.c:369
3680 #: builtin/branch.c:651
3681 msgid "print only branches of the object"
3684 #: builtin/branch.c:669
3685 msgid "Failed to resolve HEAD as a valid ref."
3688 #: builtin/branch.c:673 builtin/clone.c:705
3689 msgid "HEAD not found below refs/heads!"
3692 #: builtin/branch.c:693
3693 msgid "--column and --verbose are incompatible"
3696 #: builtin/branch.c:704 builtin/branch.c:746
3697 msgid "branch name required"
3700 #: builtin/branch.c:722
3701 msgid "Cannot give description to detached HEAD"
3704 #: builtin/branch.c:727
3705 msgid "cannot edit description of more than one branch"
3708 #: builtin/branch.c:734
3710 msgid "No commit on branch '%s' yet."
3713 #: builtin/branch.c:737
3715 msgid "No branch named '%s'."
3718 #: builtin/branch.c:752
3719 msgid "too many branches for a rename operation"
3722 #: builtin/branch.c:757
3723 msgid "too many branches to set new upstream"
3726 #: builtin/branch.c:761
3729 "could not set upstream of HEAD to %s when it does not point to any branch."
3732 #: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
3734 msgid "no such branch '%s'"
3737 #: builtin/branch.c:768
3739 msgid "branch '%s' does not exist"
3742 #: builtin/branch.c:780
3743 msgid "too many branches to unset upstream"
3746 #: builtin/branch.c:784
3747 msgid "could not unset upstream of HEAD when it does not point to any branch."
3750 #: builtin/branch.c:790
3752 msgid "Branch '%s' has no upstream information"
3755 #: builtin/branch.c:804
3756 msgid "it does not make sense to create 'HEAD' manually"
3759 #: builtin/branch.c:810
3760 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3763 #: builtin/branch.c:813
3766 "The --set-upstream flag is deprecated and will be removed. Consider using --"
3767 "track or --set-upstream-to\n"
3770 #: builtin/branch.c:830
3774 "If you wanted to make '%s' track '%s', do this:\n"
3778 #: builtin/branch.c:831
3780 msgid " git branch -d %s\n"
3783 #: builtin/branch.c:832
3785 msgid " git branch --set-upstream-to %s\n"
3788 #: builtin/bundle.c:51
3790 msgid "%s is okay\n"
3793 #: builtin/bundle.c:64
3794 msgid "Need a repository to create a bundle."
3797 #: builtin/bundle.c:68
3798 msgid "Need a repository to unbundle."
3801 #: builtin/cat-file.c:428
3803 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3804 "<type>|--textconv) <object>"
3807 #: builtin/cat-file.c:429
3808 msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
3811 #: builtin/cat-file.c:466
3812 msgid "<type> can be one of: blob, tree, commit, tag"
3815 #: builtin/cat-file.c:467
3816 msgid "show object type"
3819 #: builtin/cat-file.c:468
3820 msgid "show object size"
3823 #: builtin/cat-file.c:470
3824 msgid "exit with zero when there's no error"
3827 #: builtin/cat-file.c:471
3828 msgid "pretty-print object's content"
3831 #: builtin/cat-file.c:473
3832 msgid "for blob objects, run textconv on object's content"
3835 #: builtin/cat-file.c:475
3836 msgid "allow -s and -t to work with broken/corrupt objects"
3839 #: builtin/cat-file.c:476
3840 msgid "buffer --batch output"
3843 #: builtin/cat-file.c:478
3844 msgid "show info and content of objects fed from the standard input"
3847 #: builtin/cat-file.c:481
3848 msgid "show info about objects fed from the standard input"
3851 #: builtin/cat-file.c:484
3852 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
3855 #: builtin/cat-file.c:486
3856 msgid "show all objects with --batch or --batch-check"
3859 #: builtin/check-attr.c:11
3860 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3863 #: builtin/check-attr.c:12
3864 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
3867 #: builtin/check-attr.c:19
3868 msgid "report all attributes set on file"
3871 #: builtin/check-attr.c:20
3872 msgid "use .gitattributes only from the index"
3875 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
3876 msgid "read file names from stdin"
3879 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
3880 msgid "terminate input and output records by a NUL character"
3883 #: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
3884 msgid "suppress progress reporting"
3887 #: builtin/check-ignore.c:26
3888 msgid "show non-matching input paths"
3891 #: builtin/check-ignore.c:28
3892 msgid "ignore index when checking"
3895 #: builtin/check-ignore.c:154
3896 msgid "cannot specify pathnames with --stdin"
3899 #: builtin/check-ignore.c:157
3900 msgid "-z only makes sense with --stdin"
3903 #: builtin/check-ignore.c:159
3904 msgid "no path specified"
3907 #: builtin/check-ignore.c:163
3908 msgid "--quiet is only valid with a single pathname"
3911 #: builtin/check-ignore.c:165
3912 msgid "cannot have both --quiet and --verbose"
3915 #: builtin/check-ignore.c:168
3916 msgid "--non-matching is only valid with --verbose"
3919 #: builtin/check-mailmap.c:8
3920 msgid "git check-mailmap [<options>] <contact>..."
3923 #: builtin/check-mailmap.c:13
3924 msgid "also read contacts from stdin"
3927 #: builtin/check-mailmap.c:24
3929 msgid "unable to parse contact: %s"
3932 #: builtin/check-mailmap.c:47
3933 msgid "no contacts specified"
3936 #: builtin/checkout-index.c:127
3937 msgid "git checkout-index [<options>] [--] [<file>...]"
3940 #: builtin/checkout-index.c:144
3941 msgid "stage should be between 1 and 3 or all"
3944 #: builtin/checkout-index.c:160
3945 msgid "check out all files in the index"
3948 #: builtin/checkout-index.c:161
3949 msgid "force overwrite of existing files"
3952 #: builtin/checkout-index.c:163
3953 msgid "no warning for existing files and files not in index"
3956 #: builtin/checkout-index.c:165
3957 msgid "don't checkout new files"
3960 #: builtin/checkout-index.c:167
3961 msgid "update stat information in the index file"
3964 #: builtin/checkout-index.c:171
3965 msgid "read list of paths from the standard input"
3968 #: builtin/checkout-index.c:173
3969 msgid "write the content to temporary files"
3972 #: builtin/checkout-index.c:174 builtin/column.c:30
3973 #: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
3974 #: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
3978 #: builtin/checkout-index.c:175
3979 msgid "when creating files, prepend <string>"
3982 #: builtin/checkout-index.c:177
3983 msgid "copy out the files from named stage"
3986 #: builtin/checkout.c:25
3987 msgid "git checkout [<options>] <branch>"
3990 #: builtin/checkout.c:26
3991 msgid "git checkout [<options>] [<branch>] -- <file>..."
3994 #: builtin/checkout.c:134 builtin/checkout.c:167
3996 msgid "path '%s' does not have our version"
3999 #: builtin/checkout.c:136 builtin/checkout.c:169
4001 msgid "path '%s' does not have their version"
4004 #: builtin/checkout.c:152
4006 msgid "path '%s' does not have all necessary versions"
4009 #: builtin/checkout.c:196
4011 msgid "path '%s' does not have necessary versions"
4014 #: builtin/checkout.c:213
4016 msgid "path '%s': cannot merge"
4019 #: builtin/checkout.c:230
4021 msgid "Unable to add merge result for '%s'"
4024 #: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
4025 #: builtin/checkout.c:260
4027 msgid "'%s' cannot be used with updating paths"
4030 #: builtin/checkout.c:263 builtin/checkout.c:266
4032 msgid "'%s' cannot be used with %s"
4035 #: builtin/checkout.c:269
4037 msgid "Cannot update paths and switch to branch '%s' at the same time."
4040 #: builtin/checkout.c:280 builtin/checkout.c:474
4041 msgid "corrupt index file"
4044 #: builtin/checkout.c:340 builtin/checkout.c:347
4046 msgid "path '%s' is unmerged"
4049 #: builtin/checkout.c:496
4050 msgid "you need to resolve your current index first"
4053 #: builtin/checkout.c:623
4055 msgid "Can not do reflog for '%s': %s\n"
4058 #: builtin/checkout.c:661
4059 msgid "HEAD is now at"
4062 #: builtin/checkout.c:665 builtin/clone.c:659
4063 msgid "unable to update HEAD"
4066 #: builtin/checkout.c:669
4068 msgid "Reset branch '%s'\n"
4071 #: builtin/checkout.c:672
4073 msgid "Already on '%s'\n"
4076 #: builtin/checkout.c:676
4078 msgid "Switched to and reset branch '%s'\n"
4081 #: builtin/checkout.c:678 builtin/checkout.c:1068
4083 msgid "Switched to a new branch '%s'\n"
4086 #: builtin/checkout.c:680
4088 msgid "Switched to branch '%s'\n"
4091 #: builtin/checkout.c:732
4093 msgid " ... and %d more.\n"
4096 #: builtin/checkout.c:738
4099 "Warning: you are leaving %d commit behind, not connected to\n"
4100 "any of your branches:\n"
4104 "Warning: you are leaving %d commits behind, not connected to\n"
4105 "any of your branches:\n"
4111 #: builtin/checkout.c:757
4114 "If you want to keep it by creating a new branch, this may be a good time\n"
4117 " git branch <new-branch-name> %s\n"
4120 "If you want to keep them by creating a new branch, this may be a good time\n"
4123 " git branch <new-branch-name> %s\n"
4128 #: builtin/checkout.c:793
4129 msgid "internal error in revision walk"
4132 #: builtin/checkout.c:797
4133 msgid "Previous HEAD position was"
4136 #: builtin/checkout.c:824 builtin/checkout.c:1063
4137 msgid "You are on a branch yet to be born"
4140 #: builtin/checkout.c:969
4142 msgid "only one reference expected, %d given."
4145 #: builtin/checkout.c:1009 builtin/worktree.c:211
4147 msgid "invalid reference: %s"
4150 #: builtin/checkout.c:1038
4152 msgid "reference is not a tree: %s"
4155 #: builtin/checkout.c:1077
4156 msgid "paths cannot be used with switching branches"
4159 #: builtin/checkout.c:1080 builtin/checkout.c:1084
4161 msgid "'%s' cannot be used with switching branches"
4164 #: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
4165 #: builtin/checkout.c:1099
4167 msgid "'%s' cannot be used with '%s'"
4170 #: builtin/checkout.c:1104
4172 msgid "Cannot switch branch to a non-commit '%s'"
4175 #: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
4176 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
4177 #: builtin/worktree.c:320
4181 #: builtin/checkout.c:1138
4182 msgid "create and checkout a new branch"
4185 #: builtin/checkout.c:1140
4186 msgid "create/reset and checkout a branch"
4189 #: builtin/checkout.c:1141
4190 msgid "create reflog for new branch"
4193 #: builtin/checkout.c:1142
4194 msgid "detach the HEAD at named commit"
4197 #: builtin/checkout.c:1143
4198 msgid "set upstream info for new branch"
4201 #: builtin/checkout.c:1145
4205 #: builtin/checkout.c:1145
4206 msgid "new unparented branch"
4209 #: builtin/checkout.c:1146
4210 msgid "checkout our version for unmerged files"
4213 #: builtin/checkout.c:1148
4214 msgid "checkout their version for unmerged files"
4217 #: builtin/checkout.c:1150
4218 msgid "force checkout (throw away local modifications)"
4221 #: builtin/checkout.c:1151
4222 msgid "perform a 3-way merge with the new branch"
4225 #: builtin/checkout.c:1152 builtin/merge.c:227
4226 msgid "update ignored files (default)"
4229 #: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
4233 #: builtin/checkout.c:1154
4234 msgid "conflict style (merge or diff3)"
4237 #: builtin/checkout.c:1157
4238 msgid "do not limit pathspecs to sparse entries only"
4241 #: builtin/checkout.c:1159
4242 msgid "second guess 'git checkout <no-such-branch>'"
4245 #: builtin/checkout.c:1161
4246 msgid "do not check if another worktree is holding the given ref"
4249 #: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
4250 #: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
4251 #: builtin/send-pack.c:168
4252 msgid "force progress reporting"
4255 #: builtin/checkout.c:1193
4256 msgid "-b, -B and --orphan are mutually exclusive"
4259 #: builtin/checkout.c:1210
4260 msgid "--track needs a branch name"
4263 #: builtin/checkout.c:1215
4264 msgid "Missing branch name; try -b"
4267 #: builtin/checkout.c:1251
4268 msgid "invalid path specification"
4271 #: builtin/checkout.c:1258
4274 "Cannot update paths and switch to branch '%s' at the same time.\n"
4275 "Did you intend to checkout '%s' which can not be resolved as commit?"
4278 #: builtin/checkout.c:1263
4280 msgid "git checkout: --detach does not take a path argument '%s'"
4283 #: builtin/checkout.c:1267
4285 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4286 "checking out of the index."
4289 #: builtin/clean.c:25
4291 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
4294 #: builtin/clean.c:29
4296 msgid "Removing %s\n"
4299 #: builtin/clean.c:30
4301 msgid "Would remove %s\n"
4304 #: builtin/clean.c:31
4306 msgid "Skipping repository %s\n"
4309 #: builtin/clean.c:32
4311 msgid "Would skip repository %s\n"
4314 #: builtin/clean.c:33
4316 msgid "failed to remove %s"
4319 #: builtin/clean.c:291
4322 "1 - select a numbered item\n"
4323 "foo - select item based on unique prefix\n"
4324 " - (empty) select nothing"
4327 #: builtin/clean.c:295
4330 "1 - select a single item\n"
4331 "3-5 - select a range of items\n"
4332 "2-3,6-9 - select multiple ranges\n"
4333 "foo - select item based on unique prefix\n"
4334 "-... - unselect specified items\n"
4335 "* - choose all items\n"
4336 " - (empty) finish selecting"
4339 #: builtin/clean.c:511
4344 #: builtin/clean.c:653
4346 msgid "Input ignore patterns>> "
4349 #: builtin/clean.c:690
4351 msgid "WARNING: Cannot find items matched by: %s"
4354 #: builtin/clean.c:711
4355 msgid "Select items to delete"
4358 #. TRANSLATORS: Make sure to keep [y/N] as is
4359 #: builtin/clean.c:752
4361 msgid "Remove %s [y/N]? "
4364 #: builtin/clean.c:777
4368 #: builtin/clean.c:785
4370 "clean - start cleaning\n"
4371 "filter by pattern - exclude items from deletion\n"
4372 "select by numbers - select items to be deleted by numbers\n"
4373 "ask each - confirm each deletion (like \"rm -i\")\n"
4374 "quit - stop cleaning\n"
4375 "help - this screen\n"
4376 "? - help for prompt selection"
4379 #: builtin/clean.c:812
4380 msgid "*** Commands ***"
4383 #: builtin/clean.c:813
4387 #: builtin/clean.c:821
4388 msgid "Would remove the following item:"
4389 msgid_plural "Would remove the following items:"
4393 #: builtin/clean.c:838
4394 msgid "No more files to clean, exiting."
4397 #: builtin/clean.c:869
4398 msgid "do not print names of files removed"
4401 #: builtin/clean.c:871
4405 #: builtin/clean.c:872
4406 msgid "interactive cleaning"
4409 #: builtin/clean.c:874
4410 msgid "remove whole directories"
4413 #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
4414 #: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
4418 #: builtin/clean.c:876
4419 msgid "add <pattern> to ignore rules"
4422 #: builtin/clean.c:877
4423 msgid "remove ignored files, too"
4426 #: builtin/clean.c:879
4427 msgid "remove only ignored files"
4430 #: builtin/clean.c:897
4431 msgid "-x and -X cannot be used together"
4434 #: builtin/clean.c:901
4436 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
4440 #: builtin/clean.c:904
4442 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
4446 #: builtin/clone.c:37
4447 msgid "git clone [<options>] [--] <repo> [<dir>]"
4450 #: builtin/clone.c:60
4451 msgid "don't create a checkout"
4454 #: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
4455 msgid "create a bare repository"
4458 #: builtin/clone.c:65
4459 msgid "create a mirror repository (implies bare)"
4462 #: builtin/clone.c:67
4463 msgid "to clone from a local repository"
4466 #: builtin/clone.c:69
4467 msgid "don't use local hardlinks, always copy"
4470 #: builtin/clone.c:71
4471 msgid "setup as shared repository"
4474 #: builtin/clone.c:73 builtin/clone.c:75
4475 msgid "initialize submodules in the clone"
4478 #: builtin/clone.c:76 builtin/init-db.c:466
4479 msgid "template-directory"
4482 #: builtin/clone.c:77 builtin/init-db.c:467
4483 msgid "directory from which templates will be used"
4486 #: builtin/clone.c:79 builtin/submodule--helper.c:173
4487 msgid "reference repository"
4490 #: builtin/clone.c:81
4491 msgid "use --reference only while cloning"
4494 #: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
4498 #: builtin/clone.c:83
4499 msgid "use <name> instead of 'origin' to track upstream"
4502 #: builtin/clone.c:85
4503 msgid "checkout <branch> instead of the remote's HEAD"
4506 #: builtin/clone.c:87
4507 msgid "path to git-upload-pack on the remote"
4510 #: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665
4511 #: builtin/pull.c:193
4515 #: builtin/clone.c:89
4516 msgid "create a shallow clone of that depth"
4519 #: builtin/clone.c:91
4520 msgid "clone only one branch, HEAD or --branch"
4523 #: builtin/clone.c:92 builtin/init-db.c:475
4527 #: builtin/clone.c:93 builtin/init-db.c:476
4528 msgid "separate git dir from working tree"
4531 #: builtin/clone.c:94
4535 #: builtin/clone.c:95
4536 msgid "set config inside the new repository"
4539 #: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
4540 msgid "use IPv4 addresses only"
4543 #: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
4544 msgid "use IPv6 addresses only"
4547 #: builtin/clone.c:239
4549 "No directory name could be guessed.\n"
4550 "Please specify a directory on the command line"
4553 #: builtin/clone.c:305
4555 msgid "reference repository '%s' as a linked checkout is not supported yet."
4558 #: builtin/clone.c:307
4560 msgid "reference repository '%s' is not a local repository."
4563 #: builtin/clone.c:312
4565 msgid "reference repository '%s' is shallow"
4568 #: builtin/clone.c:315
4570 msgid "reference repository '%s' is grafted"
4573 #: builtin/clone.c:380 builtin/diff.c:84
4575 msgid "failed to stat '%s'"
4578 #: builtin/clone.c:382
4580 msgid "%s exists and is not a directory"
4583 #: builtin/clone.c:396
4585 msgid "failed to stat %s\n"
4588 #: builtin/clone.c:418
4590 msgid "failed to create link '%s'"
4593 #: builtin/clone.c:422
4595 msgid "failed to copy file to '%s'"
4598 #: builtin/clone.c:447 builtin/clone.c:631
4603 #: builtin/clone.c:459
4605 "Clone succeeded, but checkout failed.\n"
4606 "You can inspect what was checked out with 'git status'\n"
4607 "and retry the checkout with 'git checkout -f HEAD'\n"
4610 #: builtin/clone.c:536
4612 msgid "Could not find remote branch %s to clone."
4615 #: builtin/clone.c:626
4617 msgid "Checking connectivity... "
4620 #: builtin/clone.c:629
4621 msgid "remote did not send all necessary objects"
4624 #: builtin/clone.c:647
4626 msgid "unable to update %s"
4629 #: builtin/clone.c:696
4630 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4633 #: builtin/clone.c:727
4634 msgid "unable to checkout working tree"
4637 #: builtin/clone.c:753
4638 msgid "unable to write parameters to config file"
4641 #: builtin/clone.c:816
4642 msgid "cannot repack to clean up"
4645 #: builtin/clone.c:818
4646 msgid "cannot unlink temporary alternates file"
4649 #: builtin/clone.c:850
4650 msgid "Too many arguments."
4653 #: builtin/clone.c:854
4654 msgid "You must specify a repository to clone."
4657 #: builtin/clone.c:865
4659 msgid "--bare and --origin %s options are incompatible."
4662 #: builtin/clone.c:868
4663 msgid "--bare and --separate-git-dir are incompatible."
4666 #: builtin/clone.c:881
4668 msgid "repository '%s' does not exist"
4671 #: builtin/clone.c:887 builtin/fetch.c:1174
4673 msgid "depth %s is not a positive number"
4676 #: builtin/clone.c:897
4678 msgid "destination path '%s' already exists and is not an empty directory."
4681 #: builtin/clone.c:907
4683 msgid "working tree '%s' already exists."
4686 #: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
4687 #: builtin/worktree.c:219 builtin/worktree.c:246
4689 msgid "could not create leading directories of '%s'"
4692 #: builtin/clone.c:925
4694 msgid "could not create work tree dir '%s'"
4697 #: builtin/clone.c:943
4699 msgid "Cloning into bare repository '%s'...\n"
4702 #: builtin/clone.c:945
4704 msgid "Cloning into '%s'...\n"
4707 #: builtin/clone.c:984
4708 msgid "--depth is ignored in local clones; use file:// instead."
4711 #: builtin/clone.c:987
4712 msgid "source repository is shallow, ignoring --local"
4715 #: builtin/clone.c:992
4716 msgid "--local is ignored"
4719 #: builtin/clone.c:996
4721 msgid "Don't know how to clone %s"
4724 #: builtin/clone.c:1045 builtin/clone.c:1053
4726 msgid "Remote branch %s not found in upstream %s"
4729 #: builtin/clone.c:1056
4730 msgid "You appear to have cloned an empty repository."
4733 #: builtin/column.c:9
4734 msgid "git column [<options>]"
4737 #: builtin/column.c:26
4738 msgid "lookup config vars"
4741 #: builtin/column.c:27 builtin/column.c:28
4742 msgid "layout to use"
4745 #: builtin/column.c:29
4746 msgid "Maximum width"
4749 #: builtin/column.c:30
4750 msgid "Padding space on left border"
4753 #: builtin/column.c:31
4754 msgid "Padding space on right border"
4757 #: builtin/column.c:32
4758 msgid "Padding space between columns"
4761 #: builtin/column.c:51
4762 msgid "--command must be the first argument"
4765 #: builtin/commit.c:38
4766 msgid "git commit [<options>] [--] <pathspec>..."
4769 #: builtin/commit.c:43
4770 msgid "git status [<options>] [--] <pathspec>..."
4773 #: builtin/commit.c:48
4775 "Your name and email address were configured automatically based\n"
4776 "on your username and hostname. Please check that they are accurate.\n"
4777 "You can suppress this message by setting them explicitly. Run the\n"
4778 "following command and follow the instructions in your editor to edit\n"
4779 "your configuration file:\n"
4781 " git config --global --edit\n"
4783 "After doing this, you may fix the identity used for this commit with:\n"
4785 " git commit --amend --reset-author\n"
4788 #: builtin/commit.c:61
4790 "Your name and email address were configured automatically based\n"
4791 "on your username and hostname. Please check that they are accurate.\n"
4792 "You can suppress this message by setting them explicitly:\n"
4794 " git config --global user.name \"Your Name\"\n"
4795 " git config --global user.email you@example.com\n"
4797 "After doing this, you may fix the identity used for this commit with:\n"
4799 " git commit --amend --reset-author\n"
4802 #: builtin/commit.c:73
4804 "You asked to amend the most recent commit, but doing so would make\n"
4805 "it empty. You can repeat your command with --allow-empty, or you can\n"
4806 "remove the commit entirely with \"git reset HEAD^\".\n"
4809 #: builtin/commit.c:78
4811 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4812 "If you wish to commit it anyway, use:\n"
4814 " git commit --allow-empty\n"
4818 #: builtin/commit.c:85
4819 msgid "Otherwise, please use 'git reset'\n"
4822 #: builtin/commit.c:88
4824 "If you wish to skip this commit, use:\n"
4828 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4829 "the remaining commits.\n"
4832 #: builtin/commit.c:305
4833 msgid "failed to unpack HEAD tree object"
4836 #: builtin/commit.c:346
4837 msgid "unable to create temporary index"
4840 #: builtin/commit.c:352
4841 msgid "interactive add failed"
4844 #: builtin/commit.c:365
4845 msgid "unable to update temporary index"
4848 #: builtin/commit.c:367
4849 msgid "Failed to update main cache tree"
4852 #: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
4853 msgid "unable to write new_index file"
4856 #: builtin/commit.c:445
4857 msgid "cannot do a partial commit during a merge."
4860 #: builtin/commit.c:447
4861 msgid "cannot do a partial commit during a cherry-pick."
4864 #: builtin/commit.c:456
4865 msgid "cannot read the index"
4868 #: builtin/commit.c:475
4869 msgid "unable to write temporary index file"
4872 #: builtin/commit.c:580
4874 msgid "commit '%s' lacks author header"
4877 #: builtin/commit.c:582
4879 msgid "commit '%s' has malformed author line"
4882 #: builtin/commit.c:601
4883 msgid "malformed --author parameter"
4886 #: builtin/commit.c:609
4888 msgid "invalid date format: %s"
4891 #: builtin/commit.c:653
4893 "unable to select a comment character that is not used\n"
4894 "in the current commit message"
4897 #: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
4899 msgid "could not lookup commit %s"
4902 #: builtin/commit.c:702 builtin/shortlog.c:285
4904 msgid "(reading log message from standard input)\n"
4907 #: builtin/commit.c:704
4908 msgid "could not read log from standard input"
4911 #: builtin/commit.c:708
4913 msgid "could not read log file '%s'"
4916 #: builtin/commit.c:730
4917 msgid "could not read MERGE_MSG"
4920 #: builtin/commit.c:734
4921 msgid "could not read SQUASH_MSG"
4924 #: builtin/commit.c:785
4925 msgid "could not write commit template"
4928 #: builtin/commit.c:803
4932 "It looks like you may be committing a merge.\n"
4933 "If this is not correct, please remove the file\n"
4938 #: builtin/commit.c:808
4942 "It looks like you may be committing a cherry-pick.\n"
4943 "If this is not correct, please remove the file\n"
4948 #: builtin/commit.c:821
4951 "Please enter the commit message for your changes. Lines starting\n"
4952 "with '%c' will be ignored, and an empty message aborts the commit.\n"
4955 #: builtin/commit.c:828
4958 "Please enter the commit message for your changes. Lines starting\n"
4959 "with '%c' will be kept; you may remove them yourself if you want to.\n"
4960 "An empty message aborts the commit.\n"
4963 #: builtin/commit.c:848
4965 msgid "%sAuthor: %.*s <%.*s>"
4968 #: builtin/commit.c:856
4973 #: builtin/commit.c:863
4975 msgid "%sCommitter: %.*s <%.*s>"
4978 #: builtin/commit.c:881
4979 msgid "Cannot read index"
4982 #: builtin/commit.c:938
4983 msgid "Error building trees"
4986 #: builtin/commit.c:953 builtin/tag.c:266
4988 msgid "Please supply the message using either -m or -F option.\n"
4991 #: builtin/commit.c:1055
4993 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4996 #: builtin/commit.c:1070 builtin/commit.c:1310
4998 msgid "Invalid untracked files mode '%s'"
5001 #: builtin/commit.c:1107
5002 msgid "--long and -z are incompatible"
5005 #: builtin/commit.c:1137
5006 msgid "Using both --reset-author and --author does not make sense"
5009 #: builtin/commit.c:1146
5010 msgid "You have nothing to amend."
5013 #: builtin/commit.c:1149
5014 msgid "You are in the middle of a merge -- cannot amend."
5017 #: builtin/commit.c:1151
5018 msgid "You are in the middle of a cherry-pick -- cannot amend."
5021 #: builtin/commit.c:1154
5022 msgid "Options --squash and --fixup cannot be used together"
5025 #: builtin/commit.c:1164
5026 msgid "Only one of -c/-C/-F/--fixup can be used."
5029 #: builtin/commit.c:1166
5030 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
5033 #: builtin/commit.c:1174
5034 msgid "--reset-author can be used only with -C, -c or --amend."
5037 #: builtin/commit.c:1191
5038 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
5041 #: builtin/commit.c:1193
5042 msgid "No paths with --include/--only does not make sense."
5045 #: builtin/commit.c:1195
5046 msgid "Clever... amending the last one with dirty index."
5049 #: builtin/commit.c:1197
5050 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
5053 #: builtin/commit.c:1209 builtin/tag.c:475
5055 msgid "Invalid cleanup mode %s"
5058 #: builtin/commit.c:1214
5059 msgid "Paths with -a does not make sense."
5062 #: builtin/commit.c:1324 builtin/commit.c:1605
5063 msgid "show status concisely"
5066 #: builtin/commit.c:1326 builtin/commit.c:1607
5067 msgid "show branch information"
5070 #: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
5071 #: builtin/worktree.c:430
5072 msgid "machine-readable output"
5075 #: builtin/commit.c:1331 builtin/commit.c:1611
5076 msgid "show status in long format (default)"
5079 #: builtin/commit.c:1334 builtin/commit.c:1614
5080 msgid "terminate entries with NUL"
5083 #: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
5084 #: builtin/fast-export.c:984 builtin/tag.c:353
5088 #: builtin/commit.c:1337 builtin/commit.c:1617
5089 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
5092 #: builtin/commit.c:1340
5093 msgid "show ignored files"
5096 #: builtin/commit.c:1341 parse-options.h:155
5100 #: builtin/commit.c:1342
5102 "ignore changes to submodules, optional when: all, dirty, untracked. "
5106 #: builtin/commit.c:1344
5107 msgid "list untracked files in columns"
5110 #: builtin/commit.c:1430
5111 msgid "couldn't look up newly created commit"
5114 #: builtin/commit.c:1432
5115 msgid "could not parse newly created commit"
5118 #: builtin/commit.c:1477
5119 msgid "detached HEAD"
5122 #: builtin/commit.c:1480
5123 msgid " (root-commit)"
5126 #: builtin/commit.c:1575
5127 msgid "suppress summary after successful commit"
5130 #: builtin/commit.c:1576
5131 msgid "show diff in commit message template"
5134 #: builtin/commit.c:1578
5135 msgid "Commit message options"
5138 #: builtin/commit.c:1579 builtin/tag.c:351
5139 msgid "read message from file"
5142 #: builtin/commit.c:1580
5146 #: builtin/commit.c:1580
5147 msgid "override author for commit"
5150 #: builtin/commit.c:1581 builtin/gc.c:326
5154 #: builtin/commit.c:1581
5155 msgid "override date for commit"
5158 #: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
5159 #: builtin/notes.c:558 builtin/tag.c:349
5163 #: builtin/commit.c:1582
5164 msgid "commit message"
5167 #: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
5168 #: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
5172 #: builtin/commit.c:1583
5173 msgid "reuse and edit message from specified commit"
5176 #: builtin/commit.c:1584
5177 msgid "reuse message from specified commit"
5180 #: builtin/commit.c:1585
5181 msgid "use autosquash formatted message to fixup specified commit"
5184 #: builtin/commit.c:1586
5185 msgid "use autosquash formatted message to squash specified commit"
5188 #: builtin/commit.c:1587
5189 msgid "the commit is authored by me now (used with -C/-c/--amend)"
5192 #: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
5193 msgid "add Signed-off-by:"
5196 #: builtin/commit.c:1589
5197 msgid "use specified template file"
5200 #: builtin/commit.c:1590
5201 msgid "force edit of commit"
5204 #: builtin/commit.c:1591
5208 #: builtin/commit.c:1591 builtin/tag.c:354
5209 msgid "how to strip spaces and #comments from message"
5212 #: builtin/commit.c:1592
5213 msgid "include status in commit message template"
5216 #: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
5217 #: builtin/revert.c:93
5218 msgid "GPG sign commit"
5221 #: builtin/commit.c:1597
5222 msgid "Commit contents options"
5225 #: builtin/commit.c:1598
5226 msgid "commit all changed files"
5229 #: builtin/commit.c:1599
5230 msgid "add specified files to index for commit"
5233 #: builtin/commit.c:1600
5234 msgid "interactively add files"
5237 #: builtin/commit.c:1601
5238 msgid "interactively add changes"
5241 #: builtin/commit.c:1602
5242 msgid "commit only specified files"
5245 #: builtin/commit.c:1603
5246 msgid "bypass pre-commit hook"
5249 #: builtin/commit.c:1604
5250 msgid "show what would be committed"
5253 #: builtin/commit.c:1615
5254 msgid "amend previous commit"
5257 #: builtin/commit.c:1616
5258 msgid "bypass post-rewrite hook"
5261 #: builtin/commit.c:1621
5262 msgid "ok to record an empty change"
5265 #: builtin/commit.c:1623
5266 msgid "ok to record a change with an empty message"
5269 #: builtin/commit.c:1652
5270 msgid "could not parse HEAD commit"
5273 #: builtin/commit.c:1698
5275 msgid "Corrupt MERGE_HEAD file (%s)"
5278 #: builtin/commit.c:1705
5279 msgid "could not read MERGE_MODE"
5282 #: builtin/commit.c:1724
5284 msgid "could not read commit message: %s"
5287 #: builtin/commit.c:1735
5289 msgid "Aborting commit; you did not edit the message.\n"
5292 #: builtin/commit.c:1740
5294 msgid "Aborting commit due to empty commit message.\n"
5297 #: builtin/commit.c:1788
5299 "Repository has been updated, but unable to write\n"
5300 "new_index file. Check that disk is not full and quota is\n"
5301 "not exceeded, and then \"git reset HEAD\" to recover."
5304 #: builtin/config.c:9
5305 msgid "git config [<options>]"
5308 #: builtin/config.c:56
5309 msgid "Config file location"
5312 #: builtin/config.c:57
5313 msgid "use global config file"
5316 #: builtin/config.c:58
5317 msgid "use system config file"
5320 #: builtin/config.c:59
5321 msgid "use repository config file"
5324 #: builtin/config.c:60
5325 msgid "use given config file"
5328 #: builtin/config.c:61
5332 #: builtin/config.c:61
5333 msgid "read config from given blob object"
5336 #: builtin/config.c:62
5340 #: builtin/config.c:63
5341 msgid "get value: name [value-regex]"
5344 #: builtin/config.c:64
5345 msgid "get all values: key [value-regex]"
5348 #: builtin/config.c:65
5349 msgid "get values for regexp: name-regex [value-regex]"
5352 #: builtin/config.c:66
5353 msgid "get value specific for the URL: section[.var] URL"
5356 #: builtin/config.c:67
5357 msgid "replace all matching variables: name value [value_regex]"
5360 #: builtin/config.c:68
5361 msgid "add a new variable: name value"
5364 #: builtin/config.c:69
5365 msgid "remove a variable: name [value-regex]"
5368 #: builtin/config.c:70
5369 msgid "remove all matches: name [value-regex]"
5372 #: builtin/config.c:71
5373 msgid "rename section: old-name new-name"
5376 #: builtin/config.c:72
5377 msgid "remove a section: name"
5380 #: builtin/config.c:73
5384 #: builtin/config.c:74
5385 msgid "open an editor"
5388 #: builtin/config.c:75
5389 msgid "find the color configured: slot [default]"
5392 #: builtin/config.c:76
5393 msgid "find the color setting: slot [stdout-is-tty]"
5396 #: builtin/config.c:77
5400 #: builtin/config.c:78
5401 msgid "value is \"true\" or \"false\""
5404 #: builtin/config.c:79
5405 msgid "value is decimal number"
5408 #: builtin/config.c:80
5409 msgid "value is --bool or --int"
5412 #: builtin/config.c:81
5413 msgid "value is a path (file or directory name)"
5416 #: builtin/config.c:82
5420 #: builtin/config.c:83
5421 msgid "terminate values with NUL byte"
5424 #: builtin/config.c:84
5425 msgid "show variable names only"
5428 #: builtin/config.c:85
5429 msgid "respect include directives on lookup"
5432 #: builtin/config.c:86
5433 msgid "show origin of config (file, standard input, blob, command line)"
5436 #: builtin/config.c:328
5437 msgid "unable to parse default color value"
5440 #: builtin/config.c:469
5443 "# This is Git's per-user configuration file.\n"
5445 "# Please adapt and uncomment the following lines:\n"
5450 #: builtin/config.c:611
5452 msgid "cannot create configuration file %s"
5455 #: builtin/count-objects.c:77
5456 msgid "git count-objects [-v] [-H | --human-readable]"
5459 #: builtin/count-objects.c:87
5460 msgid "print sizes in human readable format"
5463 #: builtin/describe.c:17
5464 msgid "git describe [<options>] [<commit-ish>...]"
5467 #: builtin/describe.c:18
5468 msgid "git describe [<options>] --dirty"
5471 #: builtin/describe.c:217
5473 msgid "annotated tag %s not available"
5476 #: builtin/describe.c:221
5478 msgid "annotated tag %s has no embedded name"
5481 #: builtin/describe.c:223
5483 msgid "tag '%s' is really '%s' here"
5486 #: builtin/describe.c:250 builtin/log.c:459
5488 msgid "Not a valid object name %s"
5491 #: builtin/describe.c:253
5493 msgid "%s is not a valid '%s' object"
5496 #: builtin/describe.c:270
5498 msgid "no tag exactly matches '%s'"
5501 #: builtin/describe.c:272
5503 msgid "searching to describe %s\n"
5506 #: builtin/describe.c:319
5508 msgid "finished search at %s\n"
5511 #: builtin/describe.c:346
5514 "No annotated tags can describe '%s'.\n"
5515 "However, there were unannotated tags: try --tags."
5518 #: builtin/describe.c:350
5521 "No tags can describe '%s'.\n"
5522 "Try --always, or create some tags."
5525 #: builtin/describe.c:371
5527 msgid "traversed %lu commits\n"
5530 #: builtin/describe.c:374
5533 "more than %i tags found; listed %i most recent\n"
5534 "gave up search at %s\n"
5537 #: builtin/describe.c:396
5538 msgid "find the tag that comes after the commit"
5541 #: builtin/describe.c:397
5542 msgid "debug search strategy on stderr"
5545 #: builtin/describe.c:398
5549 #: builtin/describe.c:399
5550 msgid "use any tag, even unannotated"
5553 #: builtin/describe.c:400
5554 msgid "always use long format"
5557 #: builtin/describe.c:401
5558 msgid "only follow first parent"
5561 #: builtin/describe.c:404
5562 msgid "only output exact matches"
5565 #: builtin/describe.c:406
5566 msgid "consider <n> most recent tags (default: 10)"
5569 #: builtin/describe.c:408
5570 msgid "only consider tags matching <pattern>"
5573 #: builtin/describe.c:410 builtin/name-rev.c:314
5574 msgid "show abbreviated commit object as fallback"
5577 #: builtin/describe.c:411
5581 #: builtin/describe.c:412
5582 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5585 #: builtin/describe.c:430
5586 msgid "--long is incompatible with --abbrev=0"
5589 #: builtin/describe.c:456
5590 msgid "No names found, cannot describe anything."
5593 #: builtin/describe.c:476
5594 msgid "--dirty is incompatible with commit-ishes"
5597 #: builtin/diff.c:86
5599 msgid "'%s': not a regular file or symlink"
5602 #: builtin/diff.c:237
5604 msgid "invalid option: %s"
5607 #: builtin/diff.c:358
5608 msgid "Not a git repository"
5611 #: builtin/diff.c:401
5613 msgid "invalid object '%s' given."
5616 #: builtin/diff.c:410
5618 msgid "more than two blobs given: '%s'"
5621 #: builtin/diff.c:417
5623 msgid "unhandled object '%s' given."
5626 #: builtin/fast-export.c:25
5627 msgid "git fast-export [rev-list-opts]"
5630 #: builtin/fast-export.c:980
5631 msgid "show progress after <n> objects"
5634 #: builtin/fast-export.c:982
5635 msgid "select handling of signed tags"
5638 #: builtin/fast-export.c:985
5639 msgid "select handling of tags that tag filtered objects"
5642 #: builtin/fast-export.c:988
5643 msgid "Dump marks to this file"
5646 #: builtin/fast-export.c:990
5647 msgid "Import marks from this file"
5650 #: builtin/fast-export.c:992
5651 msgid "Fake a tagger when tags lack one"
5654 #: builtin/fast-export.c:994
5655 msgid "Output full tree for each commit"
5658 #: builtin/fast-export.c:996
5659 msgid "Use the done feature to terminate the stream"
5662 #: builtin/fast-export.c:997
5663 msgid "Skip output of blob data"
5666 #: builtin/fast-export.c:998
5670 #: builtin/fast-export.c:999
5671 msgid "Apply refspec to exported refs"
5674 #: builtin/fast-export.c:1000
5675 msgid "anonymize output"
5678 #: builtin/fetch.c:20
5679 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5682 #: builtin/fetch.c:21
5683 msgid "git fetch [<options>] <group>"
5686 #: builtin/fetch.c:22
5687 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5690 #: builtin/fetch.c:23
5691 msgid "git fetch --all [<options>]"
5694 #: builtin/fetch.c:92 builtin/pull.c:166
5695 msgid "fetch from all remotes"
5698 #: builtin/fetch.c:94 builtin/pull.c:169
5699 msgid "append to .git/FETCH_HEAD instead of overwriting"
5702 #: builtin/fetch.c:96 builtin/pull.c:172
5703 msgid "path to upload pack on remote end"
5706 #: builtin/fetch.c:97 builtin/pull.c:174
5707 msgid "force overwrite of local branch"
5710 #: builtin/fetch.c:99
5711 msgid "fetch from multiple remotes"
5714 #: builtin/fetch.c:101 builtin/pull.c:176
5715 msgid "fetch all tags and associated objects"
5718 #: builtin/fetch.c:103
5719 msgid "do not fetch all tags (--no-tags)"
5722 #: builtin/fetch.c:105
5723 msgid "number of submodules fetched in parallel"
5726 #: builtin/fetch.c:107 builtin/pull.c:179
5727 msgid "prune remote-tracking branches no longer on remote"
5730 #: builtin/fetch.c:108 builtin/pull.c:182
5734 #: builtin/fetch.c:109 builtin/pull.c:183
5735 msgid "control recursive fetching of submodules"
5738 #: builtin/fetch.c:113 builtin/pull.c:191
5739 msgid "keep downloaded pack"
5742 #: builtin/fetch.c:115
5743 msgid "allow updating of HEAD ref"
5746 #: builtin/fetch.c:118 builtin/pull.c:194
5747 msgid "deepen history of shallow clone"
5750 #: builtin/fetch.c:120 builtin/pull.c:197
5751 msgid "convert to a complete repository"
5754 #: builtin/fetch.c:122 builtin/log.c:1236
5758 #: builtin/fetch.c:123
5759 msgid "prepend this to submodule path output"
5762 #: builtin/fetch.c:126
5763 msgid "default mode for recursion"
5766 #: builtin/fetch.c:128 builtin/pull.c:200
5767 msgid "accept refs that update .git/shallow"
5770 #: builtin/fetch.c:129 builtin/pull.c:202
5774 #: builtin/fetch.c:130 builtin/pull.c:203
5775 msgid "specify fetch refmap"
5778 #: builtin/fetch.c:386
5779 msgid "Couldn't find remote ref HEAD"
5782 #: builtin/fetch.c:466
5784 msgid "object %s not found"
5787 #: builtin/fetch.c:471
5788 msgid "[up to date]"
5791 #: builtin/fetch.c:485
5793 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5796 #: builtin/fetch.c:486 builtin/fetch.c:574
5800 #: builtin/fetch.c:497
5801 msgid "[tag update]"
5804 #: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
5805 msgid " (unable to update local ref)"
5808 #: builtin/fetch.c:517
5812 #: builtin/fetch.c:520
5813 msgid "[new branch]"
5816 #: builtin/fetch.c:523
5820 #: builtin/fetch.c:569
5821 msgid "unable to update local ref"
5824 #: builtin/fetch.c:569
5825 msgid "forced update"
5828 #: builtin/fetch.c:576
5829 msgid "(non-fast-forward)"
5832 #: builtin/fetch.c:610 builtin/fetch.c:851
5834 msgid "cannot open %s: %s\n"
5837 #: builtin/fetch.c:619
5839 msgid "%s did not send all necessary objects\n"
5842 #: builtin/fetch.c:637
5844 msgid "reject %s because shallow roots are not allowed to be updated"
5847 #: builtin/fetch.c:724 builtin/fetch.c:816
5852 #: builtin/fetch.c:735
5855 "some local refs could not be updated; try running\n"
5856 " 'git remote prune %s' to remove any old, conflicting branches"
5859 #: builtin/fetch.c:787
5861 msgid " (%s will become dangling)"
5864 #: builtin/fetch.c:788
5866 msgid " (%s has become dangling)"
5869 #: builtin/fetch.c:820
5873 #: builtin/fetch.c:821 builtin/remote.c:1025
5877 #: builtin/fetch.c:841
5879 msgid "Refusing to fetch into current branch %s of non-bare repository"
5882 #: builtin/fetch.c:860
5884 msgid "Option \"%s\" value \"%s\" is not valid for %s"
5887 #: builtin/fetch.c:863
5889 msgid "Option \"%s\" is ignored for %s\n"
5892 #: builtin/fetch.c:920
5894 msgid "Don't know how to fetch from %s"
5897 #: builtin/fetch.c:1080
5899 msgid "Fetching %s\n"
5902 #: builtin/fetch.c:1082 builtin/remote.c:96
5904 msgid "Could not fetch %s"
5907 #: builtin/fetch.c:1100
5909 "No remote repository specified. Please, specify either a URL or a\n"
5910 "remote name from which new revisions should be fetched."
5913 #: builtin/fetch.c:1123
5914 msgid "You need to specify a tag name."
5917 #: builtin/fetch.c:1165
5918 msgid "--depth and --unshallow cannot be used together"
5921 #: builtin/fetch.c:1167
5922 msgid "--unshallow on a complete repository does not make sense"
5925 #: builtin/fetch.c:1187
5926 msgid "fetch --all does not take a repository argument"
5929 #: builtin/fetch.c:1189
5930 msgid "fetch --all does not make sense with refspecs"
5933 #: builtin/fetch.c:1200
5935 msgid "No such remote or remote group: %s"
5938 #: builtin/fetch.c:1208
5939 msgid "Fetching a group and specifying refspecs does not make sense"
5942 #: builtin/fmt-merge-msg.c:14
5944 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
5947 #: builtin/fmt-merge-msg.c:667
5948 msgid "populate log with at most <n> entries from shortlog"
5951 #: builtin/fmt-merge-msg.c:670
5952 msgid "alias for --log (deprecated)"
5955 #: builtin/fmt-merge-msg.c:673
5959 #: builtin/fmt-merge-msg.c:674
5960 msgid "use <text> as start of message"
5963 #: builtin/fmt-merge-msg.c:675
5964 msgid "file to read from"
5967 #: builtin/for-each-ref.c:9
5968 msgid "git for-each-ref [<options>] [<pattern>]"
5971 #: builtin/for-each-ref.c:10
5972 msgid "git for-each-ref [--points-at <object>]"
5975 #: builtin/for-each-ref.c:11
5976 msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
5979 #: builtin/for-each-ref.c:12
5980 msgid "git for-each-ref [--contains [<object>]]"
5983 #: builtin/for-each-ref.c:27
5984 msgid "quote placeholders suitably for shells"
5987 #: builtin/for-each-ref.c:29
5988 msgid "quote placeholders suitably for perl"
5991 #: builtin/for-each-ref.c:31
5992 msgid "quote placeholders suitably for python"
5995 #: builtin/for-each-ref.c:33
5996 msgid "quote placeholders suitably for Tcl"
5999 #: builtin/for-each-ref.c:36
6000 msgid "show only <n> matched refs"
6003 #: builtin/for-each-ref.c:37 builtin/tag.c:372
6004 msgid "format to use for the output"
6007 #: builtin/for-each-ref.c:41
6008 msgid "print only refs which points at the given object"
6011 #: builtin/for-each-ref.c:43
6012 msgid "print only refs that are merged"
6015 #: builtin/for-each-ref.c:44
6016 msgid "print only refs that are not merged"
6019 #: builtin/for-each-ref.c:45
6020 msgid "print only refs which contain the commit"
6023 #: builtin/fsck.c:156 builtin/prune.c:140
6024 msgid "Checking connectivity"
6027 #: builtin/fsck.c:486
6028 msgid "Checking object directories"
6031 #: builtin/fsck.c:553
6032 msgid "git fsck [<options>] [<object>...]"
6035 #: builtin/fsck.c:559
6036 msgid "show unreachable objects"
6039 #: builtin/fsck.c:560
6040 msgid "show dangling objects"
6043 #: builtin/fsck.c:561
6047 #: builtin/fsck.c:562
6048 msgid "report root nodes"
6051 #: builtin/fsck.c:563
6052 msgid "make index objects head nodes"
6055 #: builtin/fsck.c:564
6056 msgid "make reflogs head nodes (default)"
6059 #: builtin/fsck.c:565
6060 msgid "also consider packs and alternate objects"
6063 #: builtin/fsck.c:566
6064 msgid "check only connectivity"
6067 #: builtin/fsck.c:567
6068 msgid "enable more strict checking"
6071 #: builtin/fsck.c:569
6072 msgid "write dangling objects in .git/lost-found"
6075 #: builtin/fsck.c:570 builtin/prune.c:107
6076 msgid "show progress"
6079 #: builtin/fsck.c:631
6080 msgid "Checking objects"
6084 msgid "git gc [<options>]"
6089 msgid "Invalid %s: '%s'"
6094 msgid "insanely long object directory %.*s"
6100 "The last gc run reported the following. Please correct the root cause\n"
6102 "Automatic cleanup will not be performed until the file is removed.\n"
6108 msgid "prune unreferenced objects"
6112 msgid "be more thorough (increased runtime)"
6116 msgid "enable auto-gc mode"
6120 msgid "force running gc even if there may be another gc running"
6125 msgid "Auto packing the repository in background for optimum performance.\n"
6130 msgid "Auto packing the repository for optimum performance.\n"
6135 msgid "See \"git help gc\" for manual housekeeping.\n"
6141 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
6146 "There are too many unreachable loose objects; run 'git prune' to remove them."
6149 #: builtin/grep.c:23
6150 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
6153 #: builtin/grep.c:219
6155 msgid "grep: failed to create thread: %s"
6158 #: builtin/grep.c:277
6160 msgid "invalid number of threads specified (%d) for %s"
6163 #: builtin/grep.c:452 builtin/grep.c:487
6165 msgid "unable to read tree (%s)"
6168 #: builtin/grep.c:502
6170 msgid "unable to grep from object of type %s"
6173 #: builtin/grep.c:558
6175 msgid "switch `%c' expects a numerical value"
6178 #: builtin/grep.c:575
6180 msgid "cannot open '%s'"
6183 #: builtin/grep.c:644
6184 msgid "search in index instead of in the work tree"
6187 #: builtin/grep.c:646
6188 msgid "find in contents not managed by git"
6191 #: builtin/grep.c:648
6192 msgid "search in both tracked and untracked files"
6195 #: builtin/grep.c:650
6196 msgid "ignore files specified via '.gitignore'"
6199 #: builtin/grep.c:653
6200 msgid "show non-matching lines"
6203 #: builtin/grep.c:655
6204 msgid "case insensitive matching"
6207 #: builtin/grep.c:657
6208 msgid "match patterns only at word boundaries"
6211 #: builtin/grep.c:659
6212 msgid "process binary files as text"
6215 #: builtin/grep.c:661
6216 msgid "don't match patterns in binary files"
6219 #: builtin/grep.c:664
6220 msgid "process binary files with textconv filters"
6223 #: builtin/grep.c:666
6224 msgid "descend at most <depth> levels"
6227 #: builtin/grep.c:670
6228 msgid "use extended POSIX regular expressions"
6231 #: builtin/grep.c:673
6232 msgid "use basic POSIX regular expressions (default)"
6235 #: builtin/grep.c:676
6236 msgid "interpret patterns as fixed strings"
6239 #: builtin/grep.c:679
6240 msgid "use Perl-compatible regular expressions"
6243 #: builtin/grep.c:682
6244 msgid "show line numbers"
6247 #: builtin/grep.c:683
6248 msgid "don't show filenames"
6251 #: builtin/grep.c:684
6252 msgid "show filenames"
6255 #: builtin/grep.c:686
6256 msgid "show filenames relative to top directory"
6259 #: builtin/grep.c:688
6260 msgid "show only filenames instead of matching lines"
6263 #: builtin/grep.c:690
6264 msgid "synonym for --files-with-matches"
6267 #: builtin/grep.c:693
6268 msgid "show only the names of files without match"
6271 #: builtin/grep.c:695
6272 msgid "print NUL after filenames"
6275 #: builtin/grep.c:697
6276 msgid "show the number of matches instead of matching lines"
6279 #: builtin/grep.c:698
6280 msgid "highlight matches"
6283 #: builtin/grep.c:700
6284 msgid "print empty line between matches from different files"
6287 #: builtin/grep.c:702
6288 msgid "show filename only once above matches from same file"
6291 #: builtin/grep.c:705
6292 msgid "show <n> context lines before and after matches"
6295 #: builtin/grep.c:708
6296 msgid "show <n> context lines before matches"
6299 #: builtin/grep.c:710
6300 msgid "show <n> context lines after matches"
6303 #: builtin/grep.c:712
6304 msgid "use <n> worker threads"
6307 #: builtin/grep.c:713
6308 msgid "shortcut for -C NUM"
6311 #: builtin/grep.c:716
6312 msgid "show a line with the function name before matches"
6315 #: builtin/grep.c:718
6316 msgid "show the surrounding function"
6319 #: builtin/grep.c:721
6320 msgid "read patterns from file"
6323 #: builtin/grep.c:723
6324 msgid "match <pattern>"
6327 #: builtin/grep.c:725
6328 msgid "combine patterns specified with -e"
6331 #: builtin/grep.c:737
6332 msgid "indicate hit with exit status without output"
6335 #: builtin/grep.c:739
6336 msgid "show only matches from files that match all patterns"
6339 #: builtin/grep.c:741
6340 msgid "show parse tree for grep expression"
6343 #: builtin/grep.c:745
6347 #: builtin/grep.c:745
6348 msgid "show matching files in the pager"
6351 #: builtin/grep.c:748
6352 msgid "allow calling of grep(1) (ignored by this build)"
6355 #: builtin/grep.c:811
6356 msgid "no pattern given."
6359 #: builtin/grep.c:843 builtin/index-pack.c:1475
6361 msgid "invalid number of threads specified (%d)"
6364 #: builtin/grep.c:873
6365 msgid "--open-files-in-pager only works on the worktree"
6368 #: builtin/grep.c:899
6369 msgid "--cached or --untracked cannot be used with --no-index."
6372 #: builtin/grep.c:904
6373 msgid "--no-index or --untracked cannot be used with revs."
6376 #: builtin/grep.c:907
6377 msgid "--[no-]exclude-standard cannot be used for tracked contents."
6380 #: builtin/grep.c:915
6381 msgid "both --cached and trees are given."
6384 #: builtin/hash-object.c:81
6386 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6390 #: builtin/hash-object.c:82
6391 msgid "git hash-object --stdin-paths"
6394 #: builtin/hash-object.c:93
6398 #: builtin/hash-object.c:93
6402 #: builtin/hash-object.c:94
6403 msgid "write the object into the object database"
6406 #: builtin/hash-object.c:96
6407 msgid "read the object from stdin"
6410 #: builtin/hash-object.c:98
6411 msgid "store file as is without filters"
6414 #: builtin/hash-object.c:99
6416 "just hash any random garbage to create corrupt objects for debugging Git"
6419 #: builtin/hash-object.c:100
6420 msgid "process file as it were from this path"
6423 #: builtin/help.c:41
6424 msgid "print all available commands"
6427 #: builtin/help.c:42
6428 msgid "print list of useful guides"
6431 #: builtin/help.c:43
6432 msgid "show man page"
6435 #: builtin/help.c:44
6436 msgid "show manual in web browser"
6439 #: builtin/help.c:46
6440 msgid "show info page"
6443 #: builtin/help.c:52
6444 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6447 #: builtin/help.c:64
6449 msgid "unrecognized help format '%s'"
6452 #: builtin/help.c:91
6453 msgid "Failed to start emacsclient."
6456 #: builtin/help.c:104
6457 msgid "Failed to parse emacsclient version."
6460 #: builtin/help.c:112
6462 msgid "emacsclient version '%d' too old (< 22)."
6465 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
6467 msgid "failed to exec '%s': %s"
6470 #: builtin/help.c:205
6473 "'%s': path for unsupported man viewer.\n"
6474 "Please consider using 'man.<tool>.cmd' instead."
6477 #: builtin/help.c:217
6480 "'%s': cmd for supported man viewer.\n"
6481 "Please consider using 'man.<tool>.path' instead."
6484 #: builtin/help.c:334
6486 msgid "'%s': unknown man viewer."
6489 #: builtin/help.c:351
6490 msgid "no man viewer handled the request"
6493 #: builtin/help.c:359
6494 msgid "no info viewer handled the request"
6497 #: builtin/help.c:408
6498 msgid "Defining attributes per path"
6501 #: builtin/help.c:409
6502 msgid "Everyday Git With 20 Commands Or So"
6505 #: builtin/help.c:410
6506 msgid "A Git glossary"
6509 #: builtin/help.c:411
6510 msgid "Specifies intentionally untracked files to ignore"
6513 #: builtin/help.c:412
6514 msgid "Defining submodule properties"
6517 #: builtin/help.c:413
6518 msgid "Specifying revisions and ranges for Git"
6521 #: builtin/help.c:414
6522 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6525 #: builtin/help.c:415
6526 msgid "An overview of recommended workflows with Git"
6529 #: builtin/help.c:427
6530 msgid "The common Git guides are:\n"
6533 #: builtin/help.c:448 builtin/help.c:465
6538 #: builtin/help.c:481
6540 msgid "`git %s' is aliased to `%s'"
6543 #: builtin/index-pack.c:152
6545 msgid "unable to open %s"
6548 #: builtin/index-pack.c:202
6550 msgid "object type mismatch at %s"
6553 #: builtin/index-pack.c:222
6555 msgid "did not receive expected object %s"
6558 #: builtin/index-pack.c:225
6560 msgid "object %s: expected type %s, found %s"
6563 #: builtin/index-pack.c:267
6565 msgid "cannot fill %d byte"
6566 msgid_plural "cannot fill %d bytes"
6570 #: builtin/index-pack.c:277
6574 #: builtin/index-pack.c:278
6575 msgid "read error on input"
6578 #: builtin/index-pack.c:290
6579 msgid "used more bytes than were available"
6582 #: builtin/index-pack.c:297
6583 msgid "pack too large for current definition of off_t"
6586 #: builtin/index-pack.c:313
6588 msgid "unable to create '%s'"
6591 #: builtin/index-pack.c:318
6593 msgid "cannot open packfile '%s'"
6596 #: builtin/index-pack.c:332
6597 msgid "pack signature mismatch"
6600 #: builtin/index-pack.c:334
6602 msgid "pack version %<PRIu32> unsupported"
6605 #: builtin/index-pack.c:352
6607 msgid "pack has bad object at offset %lu: %s"
6610 #: builtin/index-pack.c:473
6612 msgid "inflate returned %d"
6615 #: builtin/index-pack.c:522
6616 msgid "offset value overflow for delta base object"
6619 #: builtin/index-pack.c:530
6620 msgid "delta base offset is out of bound"
6623 #: builtin/index-pack.c:538
6625 msgid "unknown object type %d"
6628 #: builtin/index-pack.c:569
6629 msgid "cannot pread pack file"
6632 #: builtin/index-pack.c:571
6634 msgid "premature end of pack file, %lu byte missing"
6635 msgid_plural "premature end of pack file, %lu bytes missing"
6639 #: builtin/index-pack.c:597
6640 msgid "serious inflate inconsistency"
6643 #: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
6644 #: builtin/index-pack.c:806 builtin/index-pack.c:815
6646 msgid "SHA1 COLLISION FOUND WITH %s !"
6649 #: builtin/index-pack.c:746 builtin/pack-objects.c:162
6650 #: builtin/pack-objects.c:254
6652 msgid "unable to read %s"
6655 #: builtin/index-pack.c:812
6657 msgid "cannot read existing object %s"
6660 #: builtin/index-pack.c:826
6662 msgid "invalid blob object %s"
6665 #: builtin/index-pack.c:840
6670 #: builtin/index-pack.c:843
6671 msgid "Error in object"
6674 #: builtin/index-pack.c:845
6676 msgid "Not all child objects of %s are reachable"
6679 #: builtin/index-pack.c:917 builtin/index-pack.c:948
6680 msgid "failed to apply delta"
6683 #: builtin/index-pack.c:1118
6684 msgid "Receiving objects"
6687 #: builtin/index-pack.c:1118
6688 msgid "Indexing objects"
6691 #: builtin/index-pack.c:1150
6692 msgid "pack is corrupted (SHA1 mismatch)"
6695 #: builtin/index-pack.c:1155
6696 msgid "cannot fstat packfile"
6699 #: builtin/index-pack.c:1158
6700 msgid "pack has junk at the end"
6703 #: builtin/index-pack.c:1169
6704 msgid "confusion beyond insanity in parse_pack_objects()"
6707 #: builtin/index-pack.c:1194
6708 msgid "Resolving deltas"
6711 #: builtin/index-pack.c:1205
6713 msgid "unable to create thread: %s"
6716 #: builtin/index-pack.c:1247
6717 msgid "confusion beyond insanity"
6720 #: builtin/index-pack.c:1253
6722 msgid "completed with %d local objects"
6725 #: builtin/index-pack.c:1263
6727 msgid "Unexpected tail checksum for %s (disk corruption?)"
6730 #: builtin/index-pack.c:1267
6732 msgid "pack has %d unresolved delta"
6733 msgid_plural "pack has %d unresolved deltas"
6737 #: builtin/index-pack.c:1291
6739 msgid "unable to deflate appended object (%d)"
6742 #: builtin/index-pack.c:1367
6744 msgid "local object %s is corrupt"
6747 #: builtin/index-pack.c:1391
6748 msgid "error while closing pack file"
6751 #: builtin/index-pack.c:1404
6753 msgid "cannot write keep file '%s'"
6756 #: builtin/index-pack.c:1412
6758 msgid "cannot close written keep file '%s'"
6761 #: builtin/index-pack.c:1425
6762 msgid "cannot store pack file"
6765 #: builtin/index-pack.c:1436
6766 msgid "cannot store index file"
6769 #: builtin/index-pack.c:1469
6771 msgid "bad pack.indexversion=%<PRIu32>"
6774 #: builtin/index-pack.c:1479 builtin/index-pack.c:1664
6776 msgid "no threads support, ignoring %s"
6779 #: builtin/index-pack.c:1538
6781 msgid "Cannot open existing pack file '%s'"
6784 #: builtin/index-pack.c:1540
6786 msgid "Cannot open existing pack idx file for '%s'"
6789 #: builtin/index-pack.c:1587
6791 msgid "non delta: %d object"
6792 msgid_plural "non delta: %d objects"
6796 #: builtin/index-pack.c:1594
6798 msgid "chain length = %d: %lu object"
6799 msgid_plural "chain length = %d: %lu objects"
6803 #: builtin/index-pack.c:1624
6804 msgid "Cannot come back to cwd"
6807 #: builtin/index-pack.c:1676 builtin/index-pack.c:1679
6808 #: builtin/index-pack.c:1691 builtin/index-pack.c:1695
6813 #: builtin/index-pack.c:1709
6814 msgid "--fix-thin cannot be used without --stdin"
6817 #: builtin/index-pack.c:1713 builtin/index-pack.c:1722
6819 msgid "packfile name '%s' does not end with '.pack'"
6822 #: builtin/index-pack.c:1730
6823 msgid "--verify with no packfile name given"
6826 #: builtin/init-db.c:55
6828 msgid "cannot stat '%s'"
6831 #: builtin/init-db.c:61
6833 msgid "cannot stat template '%s'"
6836 #: builtin/init-db.c:66
6838 msgid "cannot opendir '%s'"
6841 #: builtin/init-db.c:77
6843 msgid "cannot readlink '%s'"
6846 #: builtin/init-db.c:79
6848 msgid "cannot symlink '%s' '%s'"
6851 #: builtin/init-db.c:85
6853 msgid "cannot copy '%s' to '%s'"
6856 #: builtin/init-db.c:89
6858 msgid "ignoring template %s"
6861 #: builtin/init-db.c:118
6863 msgid "templates not found %s"
6866 #: builtin/init-db.c:131
6868 msgid "not copying templates of a wrong format version %d from '%s'"
6871 #: builtin/init-db.c:309 builtin/init-db.c:312
6873 msgid "%s already exists"
6876 #: builtin/init-db.c:340
6878 msgid "unable to handle file type %d"
6881 #: builtin/init-db.c:343
6883 msgid "unable to move %s to %s"
6886 #. TRANSLATORS: The first '%s' is either "Reinitialized
6887 #. existing" or "Initialized empty", the second " shared" or
6888 #. "", and the last '%s%s' is the verbatim directory name.
6889 #: builtin/init-db.c:399
6891 msgid "%s%s Git repository in %s%s\n"
6894 #: builtin/init-db.c:400
6895 msgid "Reinitialized existing"
6898 #: builtin/init-db.c:400
6899 msgid "Initialized empty"
6902 #: builtin/init-db.c:401
6906 #: builtin/init-db.c:448
6908 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6909 "shared[=<permissions>]] [<directory>]"
6912 #: builtin/init-db.c:471
6916 #: builtin/init-db.c:472
6917 msgid "specify that the git repository is to be shared amongst several users"
6920 #: builtin/init-db.c:506 builtin/init-db.c:511
6922 msgid "cannot mkdir %s"
6925 #: builtin/init-db.c:515
6927 msgid "cannot chdir to %s"
6930 #: builtin/init-db.c:536
6933 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6937 #: builtin/init-db.c:564
6939 msgid "Cannot access work tree '%s'"
6942 #: builtin/interpret-trailers.c:15
6944 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
6945 "<token>[(=|:)<value>])...] [<file>...]"
6948 #: builtin/interpret-trailers.c:26
6949 msgid "edit files in place"
6952 #: builtin/interpret-trailers.c:27
6953 msgid "trim empty trailers"
6956 #: builtin/interpret-trailers.c:28
6960 #: builtin/interpret-trailers.c:29
6961 msgid "trailer(s) to add"
6964 #: builtin/interpret-trailers.c:42
6965 msgid "no input file given for in-place editing"
6969 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
6973 msgid "git show [<options>] <object>..."
6978 msgid "invalid --decorate option: %s"
6981 #: builtin/log.c:131
6982 msgid "suppress diff output"
6985 #: builtin/log.c:132
6989 #: builtin/log.c:133
6990 msgid "Use mail map file"
6993 #: builtin/log.c:134
6994 msgid "decorate options"
6997 #: builtin/log.c:137
6998 msgid "Process line range n,m in file, counting from 1"
7001 #: builtin/log.c:233
7003 msgid "Final output: %d %s\n"
7006 #: builtin/log.c:465
7008 msgid "git show %s: bad file"
7011 #: builtin/log.c:479 builtin/log.c:572
7013 msgid "Could not read object %s"
7016 #: builtin/log.c:596
7018 msgid "Unknown type: %d"
7021 #: builtin/log.c:715
7022 msgid "format.headers without value"
7025 #: builtin/log.c:801
7026 msgid "name of output directory is too long"
7029 #: builtin/log.c:816
7031 msgid "Cannot open patch file %s"
7034 #: builtin/log.c:830
7035 msgid "Need exactly one range."
7038 #: builtin/log.c:840
7039 msgid "Not a range."
7042 #: builtin/log.c:946
7043 msgid "Cover letter needs email format"
7046 #: builtin/log.c:1025
7048 msgid "insane in-reply-to: %s"
7051 #: builtin/log.c:1053
7052 msgid "git format-patch [<options>] [<since> | <revision-range>]"
7055 #: builtin/log.c:1098
7056 msgid "Two output directories?"
7059 #: builtin/log.c:1214
7060 msgid "use [PATCH n/m] even with a single patch"
7063 #: builtin/log.c:1217
7064 msgid "use [PATCH] even with multiple patches"
7067 #: builtin/log.c:1221
7068 msgid "print patches to standard out"
7071 #: builtin/log.c:1223
7072 msgid "generate a cover letter"
7075 #: builtin/log.c:1225
7076 msgid "use simple number sequence for output file names"
7079 #: builtin/log.c:1226
7083 #: builtin/log.c:1227
7084 msgid "use <sfx> instead of '.patch'"
7087 #: builtin/log.c:1229
7088 msgid "start numbering patches at <n> instead of 1"
7091 #: builtin/log.c:1231
7092 msgid "mark the series as Nth re-roll"
7095 #: builtin/log.c:1233
7096 msgid "Use [<prefix>] instead of [PATCH]"
7099 #: builtin/log.c:1236
7100 msgid "store resulting files in <dir>"
7103 #: builtin/log.c:1239
7104 msgid "don't strip/add [PATCH]"
7107 #: builtin/log.c:1242
7108 msgid "don't output binary diffs"
7111 #: builtin/log.c:1244
7112 msgid "output all-zero hash in From header"
7115 #: builtin/log.c:1246
7116 msgid "don't include a patch matching a commit upstream"
7119 #: builtin/log.c:1248
7120 msgid "show patch format instead of default (patch + stat)"
7123 #: builtin/log.c:1250
7127 #: builtin/log.c:1251
7131 #: builtin/log.c:1252
7132 msgid "add email header"
7135 #: builtin/log.c:1253 builtin/log.c:1255
7139 #: builtin/log.c:1253
7140 msgid "add To: header"
7143 #: builtin/log.c:1255
7144 msgid "add Cc: header"
7147 #: builtin/log.c:1257
7151 #: builtin/log.c:1258
7152 msgid "set From address to <ident> (or committer ident if absent)"
7155 #: builtin/log.c:1260
7159 #: builtin/log.c:1261
7160 msgid "make first mail a reply to <message-id>"
7163 #: builtin/log.c:1262 builtin/log.c:1265
7167 #: builtin/log.c:1263
7168 msgid "attach the patch"
7171 #: builtin/log.c:1266
7172 msgid "inline the patch"
7175 #: builtin/log.c:1270
7176 msgid "enable message threading, styles: shallow, deep"
7179 #: builtin/log.c:1272
7183 #: builtin/log.c:1273
7184 msgid "add a signature"
7187 #: builtin/log.c:1275
7188 msgid "add a signature from a file"
7191 #: builtin/log.c:1276
7192 msgid "don't print the patch filenames"
7195 #: builtin/log.c:1365
7196 msgid "-n and -k are mutually exclusive."
7199 #: builtin/log.c:1367
7200 msgid "--subject-prefix and -k are mutually exclusive."
7203 #: builtin/log.c:1375
7204 msgid "--name-only does not make sense"
7207 #: builtin/log.c:1377
7208 msgid "--name-status does not make sense"
7211 #: builtin/log.c:1379
7212 msgid "--check does not make sense"
7215 #: builtin/log.c:1407
7216 msgid "standard output, or directory, which one?"
7219 #: builtin/log.c:1409
7221 msgid "Could not create directory '%s'"
7224 #: builtin/log.c:1506
7226 msgid "unable to read signature file '%s'"
7229 #: builtin/log.c:1569
7230 msgid "Failed to create output files"
7233 #: builtin/log.c:1617
7234 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
7237 #: builtin/log.c:1671
7240 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
7243 #: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
7245 msgid "Unknown commit %s"
7248 #: builtin/ls-files.c:378
7249 msgid "git ls-files [<options>] [<file>...]"
7252 #: builtin/ls-files.c:427
7253 msgid "identify the file status with tags"
7256 #: builtin/ls-files.c:429
7257 msgid "use lowercase letters for 'assume unchanged' files"
7260 #: builtin/ls-files.c:431
7261 msgid "show cached files in the output (default)"
7264 #: builtin/ls-files.c:433
7265 msgid "show deleted files in the output"
7268 #: builtin/ls-files.c:435
7269 msgid "show modified files in the output"
7272 #: builtin/ls-files.c:437
7273 msgid "show other files in the output"
7276 #: builtin/ls-files.c:439
7277 msgid "show ignored files in the output"
7280 #: builtin/ls-files.c:442
7281 msgid "show staged contents' object name in the output"
7284 #: builtin/ls-files.c:444
7285 msgid "show files on the filesystem that need to be removed"
7288 #: builtin/ls-files.c:446
7289 msgid "show 'other' directories' names only"
7292 #: builtin/ls-files.c:448
7293 msgid "show line endings of files"
7296 #: builtin/ls-files.c:450
7297 msgid "don't show empty directories"
7300 #: builtin/ls-files.c:453
7301 msgid "show unmerged files in the output"
7304 #: builtin/ls-files.c:455
7305 msgid "show resolve-undo information"
7308 #: builtin/ls-files.c:457
7309 msgid "skip files matching pattern"
7312 #: builtin/ls-files.c:460
7313 msgid "exclude patterns are read from <file>"
7316 #: builtin/ls-files.c:463
7317 msgid "read additional per-directory exclude patterns in <file>"
7320 #: builtin/ls-files.c:465
7321 msgid "add the standard git exclusions"
7324 #: builtin/ls-files.c:468
7325 msgid "make the output relative to the project top directory"
7328 #: builtin/ls-files.c:471
7329 msgid "if any <file> is not in the index, treat this as an error"
7332 #: builtin/ls-files.c:472
7336 #: builtin/ls-files.c:473
7337 msgid "pretend that paths removed since <tree-ish> are still present"
7340 #: builtin/ls-files.c:475
7341 msgid "show debugging data"
7344 #: builtin/ls-remote.c:7
7346 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
7347 " [-q | --quiet] [--exit-code] [--get-url]\n"
7348 " [--symref] [<repository> [<refs>...]]"
7351 #: builtin/ls-remote.c:50
7352 msgid "do not print remote URL"
7355 #: builtin/ls-remote.c:51 builtin/ls-remote.c:53
7359 #: builtin/ls-remote.c:52 builtin/ls-remote.c:54
7360 msgid "path of git-upload-pack on the remote host"
7363 #: builtin/ls-remote.c:56
7364 msgid "limit to tags"
7367 #: builtin/ls-remote.c:57
7368 msgid "limit to heads"
7371 #: builtin/ls-remote.c:58
7372 msgid "do not show peeled tags"
7375 #: builtin/ls-remote.c:60
7376 msgid "take url.<base>.insteadOf into account"
7379 #: builtin/ls-remote.c:62
7380 msgid "exit with exit code 2 if no matching refs are found"
7383 #: builtin/ls-remote.c:64
7384 msgid "show underlying ref in addition to the object pointed by it"
7387 #: builtin/ls-tree.c:28
7388 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
7391 #: builtin/ls-tree.c:128
7392 msgid "only show trees"
7395 #: builtin/ls-tree.c:130
7396 msgid "recurse into subtrees"
7399 #: builtin/ls-tree.c:132
7400 msgid "show trees when recursing"
7403 #: builtin/ls-tree.c:135
7404 msgid "terminate entries with NUL byte"
7407 #: builtin/ls-tree.c:136
7408 msgid "include object size"
7411 #: builtin/ls-tree.c:138 builtin/ls-tree.c:140
7412 msgid "list only filenames"
7415 #: builtin/ls-tree.c:143
7416 msgid "use full path names"
7419 #: builtin/ls-tree.c:145
7420 msgid "list entire tree; not just current directory (implies --full-name)"
7423 #: builtin/merge.c:45
7424 msgid "git merge [<options>] [<commit>...]"
7427 #: builtin/merge.c:46
7428 msgid "git merge [<options>] <msg> HEAD <commit>"
7431 #: builtin/merge.c:47
7432 msgid "git merge --abort"
7435 #: builtin/merge.c:100
7436 msgid "switch `m' requires a value"
7439 #: builtin/merge.c:137
7441 msgid "Could not find merge strategy '%s'.\n"
7444 #: builtin/merge.c:138
7446 msgid "Available strategies are:"
7449 #: builtin/merge.c:143
7451 msgid "Available custom strategies are:"
7454 #: builtin/merge.c:193 builtin/pull.c:123
7455 msgid "do not show a diffstat at the end of the merge"
7458 #: builtin/merge.c:196 builtin/pull.c:126
7459 msgid "show a diffstat at the end of the merge"
7462 #: builtin/merge.c:197 builtin/pull.c:129
7463 msgid "(synonym to --stat)"
7466 #: builtin/merge.c:199 builtin/pull.c:132
7467 msgid "add (at most <n>) entries from shortlog to merge commit message"
7470 #: builtin/merge.c:202 builtin/pull.c:135
7471 msgid "create a single commit instead of doing a merge"
7474 #: builtin/merge.c:204 builtin/pull.c:138
7475 msgid "perform a commit if the merge succeeds (default)"
7478 #: builtin/merge.c:206 builtin/pull.c:141
7479 msgid "edit message before committing"
7482 #: builtin/merge.c:207
7483 msgid "allow fast-forward (default)"
7486 #: builtin/merge.c:209 builtin/pull.c:147
7487 msgid "abort if fast-forward is not possible"
7490 #: builtin/merge.c:213
7491 msgid "Verify that the named commit has a valid GPG signature"
7494 #: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
7495 #: builtin/revert.c:89
7499 #: builtin/merge.c:215 builtin/pull.c:153
7500 msgid "merge strategy to use"
7503 #: builtin/merge.c:216 builtin/pull.c:156
7504 msgid "option=value"
7507 #: builtin/merge.c:217 builtin/pull.c:157
7508 msgid "option for selected merge strategy"
7511 #: builtin/merge.c:219
7512 msgid "merge commit message (for a non-fast-forward merge)"
7515 #: builtin/merge.c:223
7516 msgid "abort the current in-progress merge"
7519 #: builtin/merge.c:251
7520 msgid "could not run stash."
7523 #: builtin/merge.c:256
7524 msgid "stash failed"
7527 #: builtin/merge.c:261
7529 msgid "not a valid object: %s"
7532 #: builtin/merge.c:280 builtin/merge.c:297
7533 msgid "read-tree failed"
7536 #: builtin/merge.c:327
7537 msgid " (nothing to squash)"
7540 #: builtin/merge.c:340
7542 msgid "Squash commit -- not updating HEAD\n"
7545 #: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
7546 #: builtin/merge.c:989
7548 msgid "Could not write to '%s'"
7551 #: builtin/merge.c:372
7552 msgid "Writing SQUASH_MSG"
7555 #: builtin/merge.c:374
7556 msgid "Finishing SQUASH_MSG"
7559 #: builtin/merge.c:397
7561 msgid "No merge message -- not updating HEAD\n"
7564 #: builtin/merge.c:448
7566 msgid "'%s' does not point to a commit"
7569 #: builtin/merge.c:538
7571 msgid "Bad branch.%s.mergeoptions string: %s"
7574 #: builtin/merge.c:657
7575 msgid "Not handling anything other than two heads merge."
7578 #: builtin/merge.c:671
7580 msgid "Unknown option for merge-recursive: -X%s"
7583 #: builtin/merge.c:684
7585 msgid "unable to write %s"
7588 #: builtin/merge.c:773
7590 msgid "Could not read from '%s'"
7593 #: builtin/merge.c:782
7595 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7598 #: builtin/merge.c:788
7601 "Please enter a commit message to explain why this merge is necessary,\n"
7602 "especially if it merges an updated upstream into a topic branch.\n"
7604 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
7608 #: builtin/merge.c:812
7609 msgid "Empty commit message."
7612 #: builtin/merge.c:824
7614 msgid "Wonderful.\n"
7617 #: builtin/merge.c:879
7619 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7622 #: builtin/merge.c:895
7624 msgid "'%s' is not a commit"
7627 #: builtin/merge.c:936
7628 msgid "No current branch."
7631 #: builtin/merge.c:938
7632 msgid "No remote for the current branch."
7635 #: builtin/merge.c:940
7636 msgid "No default upstream defined for the current branch."
7639 #: builtin/merge.c:945
7641 msgid "No remote-tracking branch for %s from %s"
7644 #: builtin/merge.c:1080
7646 msgid "could not close '%s'"
7649 #: builtin/merge.c:1207
7650 msgid "There is no merge to abort (MERGE_HEAD missing)."
7653 #: builtin/merge.c:1223
7655 "You have not concluded your merge (MERGE_HEAD exists).\n"
7656 "Please, commit your changes before you merge."
7659 #: builtin/merge.c:1230
7661 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
7662 "Please, commit your changes before you merge."
7665 #: builtin/merge.c:1233
7666 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7669 #: builtin/merge.c:1242
7670 msgid "You cannot combine --squash with --no-ff."
7673 #: builtin/merge.c:1250
7674 msgid "No commit specified and merge.defaultToUpstream not set."
7677 #: builtin/merge.c:1267
7678 msgid "Squash commit into empty head not supported yet"
7681 #: builtin/merge.c:1269
7682 msgid "Non-fast-forward commit does not make sense into an empty head"
7685 #: builtin/merge.c:1275
7687 msgid "%s - not something we can merge"
7690 #: builtin/merge.c:1277
7691 msgid "Can merge only exactly one commit into empty head"
7694 #: builtin/merge.c:1332
7696 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7699 #: builtin/merge.c:1335
7701 msgid "Commit %s has a bad GPG signature allegedly by %s."
7704 #: builtin/merge.c:1338
7706 msgid "Commit %s does not have a GPG signature."
7709 #: builtin/merge.c:1341
7711 msgid "Commit %s has a good GPG signature by %s\n"
7714 #: builtin/merge.c:1424
7716 msgid "Updating %s..%s\n"
7719 #: builtin/merge.c:1461
7721 msgid "Trying really trivial in-index merge...\n"
7724 #: builtin/merge.c:1468
7729 #: builtin/merge.c:1500
7730 msgid "Not possible to fast-forward, aborting."
7733 #: builtin/merge.c:1523 builtin/merge.c:1602
7735 msgid "Rewinding the tree to pristine...\n"
7738 #: builtin/merge.c:1527
7740 msgid "Trying merge strategy %s...\n"
7743 #: builtin/merge.c:1593
7745 msgid "No merge strategy handled the merge.\n"
7748 #: builtin/merge.c:1595
7750 msgid "Merge with strategy %s failed.\n"
7753 #: builtin/merge.c:1604
7755 msgid "Using the %s to prepare resolving by hand.\n"
7758 #: builtin/merge.c:1616
7760 msgid "Automatic merge went well; stopped before committing as requested\n"
7763 #: builtin/merge-base.c:29
7764 msgid "git merge-base [-a | --all] <commit> <commit>..."
7767 #: builtin/merge-base.c:30
7768 msgid "git merge-base [-a | --all] --octopus <commit>..."
7771 #: builtin/merge-base.c:31
7772 msgid "git merge-base --independent <commit>..."
7775 #: builtin/merge-base.c:32
7776 msgid "git merge-base --is-ancestor <commit> <commit>"
7779 #: builtin/merge-base.c:33
7780 msgid "git merge-base --fork-point <ref> [<commit>]"
7783 #: builtin/merge-base.c:214
7784 msgid "output all common ancestors"
7787 #: builtin/merge-base.c:216
7788 msgid "find ancestors for a single n-way merge"
7791 #: builtin/merge-base.c:218
7792 msgid "list revs not reachable from others"
7795 #: builtin/merge-base.c:220
7796 msgid "is the first one ancestor of the other?"
7799 #: builtin/merge-base.c:222
7800 msgid "find where <commit> forked from reflog of <ref>"
7803 #: builtin/merge-file.c:8
7805 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7806 "<orig-file> <file2>"
7809 #: builtin/merge-file.c:33
7810 msgid "send results to standard output"
7813 #: builtin/merge-file.c:34
7814 msgid "use a diff3 based merge"
7817 #: builtin/merge-file.c:35
7818 msgid "for conflicts, use our version"
7821 #: builtin/merge-file.c:37
7822 msgid "for conflicts, use their version"
7825 #: builtin/merge-file.c:39
7826 msgid "for conflicts, use a union version"
7829 #: builtin/merge-file.c:42
7830 msgid "for conflicts, use this marker size"
7833 #: builtin/merge-file.c:43
7834 msgid "do not warn about conflicts"
7837 #: builtin/merge-file.c:45
7838 msgid "set labels for file1/orig-file/file2"
7841 #: builtin/mktree.c:65
7842 msgid "git mktree [-z] [--missing] [--batch]"
7845 #: builtin/mktree.c:152
7846 msgid "input is NUL terminated"
7849 #: builtin/mktree.c:153 builtin/write-tree.c:24
7850 msgid "allow missing objects"
7853 #: builtin/mktree.c:154
7854 msgid "allow creation of more than one tree"
7858 msgid "git mv [<options>] <source>... <destination>"
7863 msgid "Directory %s is in index and no submodule?"
7867 msgid "Please stage your changes to .gitmodules or stash them to proceed"
7872 msgid "%.*s is in index"
7876 msgid "force move/rename even if target exists"
7880 msgid "skip move/rename errors"
7885 msgid "destination '%s' is not a directory"
7890 msgid "Checking rename of '%s' to '%s'\n"
7898 msgid "can not move directory into itself"
7902 msgid "cannot move directory over file"
7906 msgid "source directory is empty"
7910 msgid "not under version control"
7914 msgid "destination exists"
7919 msgid "overwriting '%s'"
7923 msgid "Cannot overwrite"
7927 msgid "multiple sources for the same target"
7931 msgid "destination directory does not exist"
7936 msgid "%s, source=%s, destination=%s"
7941 msgid "Renaming %s to %s\n"
7944 #: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
7946 msgid "renaming '%s' failed"
7949 #: builtin/name-rev.c:251
7950 msgid "git name-rev [<options>] <commit>..."
7953 #: builtin/name-rev.c:252
7954 msgid "git name-rev [<options>] --all"
7957 #: builtin/name-rev.c:253
7958 msgid "git name-rev [<options>] --stdin"
7961 #: builtin/name-rev.c:305
7962 msgid "print only names (no SHA-1)"
7965 #: builtin/name-rev.c:306
7966 msgid "only use tags to name the commits"
7969 #: builtin/name-rev.c:308
7970 msgid "only use refs matching <pattern>"
7973 #: builtin/name-rev.c:310
7974 msgid "list all commits reachable from all refs"
7977 #: builtin/name-rev.c:311
7978 msgid "read from stdin"
7981 #: builtin/name-rev.c:312
7982 msgid "allow to print `undefined` names (default)"
7985 #: builtin/name-rev.c:318
7986 msgid "dereference tags in the input (internal use)"
7989 #: builtin/notes.c:25
7990 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
7993 #: builtin/notes.c:26
7995 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
7996 "| (-c | -C) <object>] [<object>]"
7999 #: builtin/notes.c:27
8000 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
8003 #: builtin/notes.c:28
8005 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
8006 "(-c | -C) <object>] [<object>]"
8009 #: builtin/notes.c:29
8010 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
8013 #: builtin/notes.c:30
8014 msgid "git notes [--ref <notes-ref>] show [<object>]"
8017 #: builtin/notes.c:31
8019 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
8022 #: builtin/notes.c:32
8023 msgid "git notes merge --commit [-v | -q]"
8026 #: builtin/notes.c:33
8027 msgid "git notes merge --abort [-v | -q]"
8030 #: builtin/notes.c:34
8031 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
8034 #: builtin/notes.c:35
8035 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
8038 #: builtin/notes.c:36
8039 msgid "git notes [--ref <notes-ref>] get-ref"
8042 #: builtin/notes.c:41
8043 msgid "git notes [list [<object>]]"
8046 #: builtin/notes.c:46
8047 msgid "git notes add [<options>] [<object>]"
8050 #: builtin/notes.c:51
8051 msgid "git notes copy [<options>] <from-object> <to-object>"
8054 #: builtin/notes.c:52
8055 msgid "git notes copy --stdin [<from-object> <to-object>]..."
8058 #: builtin/notes.c:57
8059 msgid "git notes append [<options>] [<object>]"
8062 #: builtin/notes.c:62
8063 msgid "git notes edit [<object>]"
8066 #: builtin/notes.c:67
8067 msgid "git notes show [<object>]"
8070 #: builtin/notes.c:72
8071 msgid "git notes merge [<options>] <notes-ref>"
8074 #: builtin/notes.c:73
8075 msgid "git notes merge --commit [<options>]"
8078 #: builtin/notes.c:74
8079 msgid "git notes merge --abort [<options>]"
8082 #: builtin/notes.c:79
8083 msgid "git notes remove [<object>]"
8086 #: builtin/notes.c:84
8087 msgid "git notes prune [<options>]"
8090 #: builtin/notes.c:89
8091 msgid "git notes get-ref"
8094 #: builtin/notes.c:147
8096 msgid "unable to start 'show' for object '%s'"
8099 #: builtin/notes.c:151
8100 msgid "could not read 'show' output"
8103 #: builtin/notes.c:159
8105 msgid "failed to finish 'show' for object '%s'"
8108 #: builtin/notes.c:174 builtin/tag.c:248
8110 msgid "could not create file '%s'"
8113 #: builtin/notes.c:193
8114 msgid "Please supply the note contents using either -m or -F option"
8117 #: builtin/notes.c:202
8118 msgid "unable to write note object"
8121 #: builtin/notes.c:204
8123 msgid "The note contents have been left in %s"
8126 #: builtin/notes.c:232 builtin/tag.c:440
8128 msgid "cannot read '%s'"
8131 #: builtin/notes.c:234 builtin/tag.c:443
8133 msgid "could not open or read '%s'"
8136 #: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
8137 #: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
8138 #: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
8139 #: builtin/notes.c:880 builtin/tag.c:456
8141 msgid "Failed to resolve '%s' as a valid ref."
8144 #: builtin/notes.c:256
8146 msgid "Failed to read object '%s'."
8149 #: builtin/notes.c:260
8151 msgid "Cannot read note data from non-blob object '%s'."
8154 #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
8155 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
8156 #: builtin/notes.c:945
8157 msgid "too many parameters"
8160 #: builtin/notes.c:375 builtin/notes.c:662
8162 msgid "No note found for object %s."
8165 #: builtin/notes.c:396 builtin/notes.c:559
8166 msgid "note contents as a string"
8169 #: builtin/notes.c:399 builtin/notes.c:562
8170 msgid "note contents in a file"
8173 #: builtin/notes.c:402 builtin/notes.c:565
8174 msgid "reuse and edit specified note object"
8177 #: builtin/notes.c:405 builtin/notes.c:568
8178 msgid "reuse specified note object"
8181 #: builtin/notes.c:408 builtin/notes.c:571
8182 msgid "allow storing empty note"
8185 #: builtin/notes.c:409 builtin/notes.c:480
8186 msgid "replace existing notes"
8189 #: builtin/notes.c:434
8192 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
8196 #: builtin/notes.c:449 builtin/notes.c:528
8198 msgid "Overwriting existing notes for object %s\n"
8201 #: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
8203 msgid "Removing note for object %s\n"
8206 #: builtin/notes.c:481
8207 msgid "read objects from stdin"
8210 #: builtin/notes.c:483
8211 msgid "load rewriting config for <command> (implies --stdin)"
8214 #: builtin/notes.c:501
8215 msgid "too few parameters"
8218 #: builtin/notes.c:522
8221 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
8225 #: builtin/notes.c:534
8227 msgid "Missing notes on source object %s. Cannot copy."
8230 #: builtin/notes.c:586
8233 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
8234 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
8237 #: builtin/notes.c:767
8238 msgid "General options"
8241 #: builtin/notes.c:769
8242 msgid "Merge options"
8245 #: builtin/notes.c:771
8247 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
8251 #: builtin/notes.c:773
8252 msgid "Committing unmerged notes"
8255 #: builtin/notes.c:775
8256 msgid "finalize notes merge by committing unmerged notes"
8259 #: builtin/notes.c:777
8260 msgid "Aborting notes merge resolution"
8263 #: builtin/notes.c:779
8264 msgid "abort notes merge"
8267 #: builtin/notes.c:856
8269 msgid "A notes merge into %s is already in-progress at %s"
8272 #: builtin/notes.c:883
8274 msgid "Object %s has no note\n"
8277 #: builtin/notes.c:895
8278 msgid "attempt to remove non-existent note is not an error"
8281 #: builtin/notes.c:898
8282 msgid "read object names from the standard input"
8285 #: builtin/notes.c:979
8289 #: builtin/notes.c:980
8290 msgid "use notes from <notes-ref>"
8293 #: builtin/notes.c:1015 builtin/remote.c:1626
8295 msgid "Unknown subcommand: %s"
8298 #: builtin/pack-objects.c:28
8300 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
8303 #: builtin/pack-objects.c:29
8305 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
8308 #: builtin/pack-objects.c:175 builtin/pack-objects.c:178
8310 msgid "deflate error (%d)"
8313 #: builtin/pack-objects.c:772
8314 msgid "Writing objects"
8317 #: builtin/pack-objects.c:1012
8318 msgid "disabling bitmap writing, as some objects are not being packed"
8321 #: builtin/pack-objects.c:2172
8322 msgid "Compressing objects"
8325 #: builtin/pack-objects.c:2558
8327 msgid "unsupported index version %s"
8330 #: builtin/pack-objects.c:2562
8332 msgid "bad index version '%s'"
8335 #: builtin/pack-objects.c:2592
8336 msgid "do not show progress meter"
8339 #: builtin/pack-objects.c:2594
8340 msgid "show progress meter"
8343 #: builtin/pack-objects.c:2596
8344 msgid "show progress meter during object writing phase"
8347 #: builtin/pack-objects.c:2599
8348 msgid "similar to --all-progress when progress meter is shown"
8351 #: builtin/pack-objects.c:2600
8352 msgid "version[,offset]"
8355 #: builtin/pack-objects.c:2601
8356 msgid "write the pack index file in the specified idx format version"
8359 #: builtin/pack-objects.c:2604
8360 msgid "maximum size of each output pack file"
8363 #: builtin/pack-objects.c:2606
8364 msgid "ignore borrowed objects from alternate object store"
8367 #: builtin/pack-objects.c:2608
8368 msgid "ignore packed objects"
8371 #: builtin/pack-objects.c:2610
8372 msgid "limit pack window by objects"
8375 #: builtin/pack-objects.c:2612
8376 msgid "limit pack window by memory in addition to object limit"
8379 #: builtin/pack-objects.c:2614
8380 msgid "maximum length of delta chain allowed in the resulting pack"
8383 #: builtin/pack-objects.c:2616
8384 msgid "reuse existing deltas"
8387 #: builtin/pack-objects.c:2618
8388 msgid "reuse existing objects"
8391 #: builtin/pack-objects.c:2620
8392 msgid "use OFS_DELTA objects"
8395 #: builtin/pack-objects.c:2622
8396 msgid "use threads when searching for best delta matches"
8399 #: builtin/pack-objects.c:2624
8400 msgid "do not create an empty pack output"
8403 #: builtin/pack-objects.c:2626
8404 msgid "read revision arguments from standard input"
8407 #: builtin/pack-objects.c:2628
8408 msgid "limit the objects to those that are not yet packed"
8411 #: builtin/pack-objects.c:2631
8412 msgid "include objects reachable from any reference"
8415 #: builtin/pack-objects.c:2634
8416 msgid "include objects referred by reflog entries"
8419 #: builtin/pack-objects.c:2637
8420 msgid "include objects referred to by the index"
8423 #: builtin/pack-objects.c:2640
8424 msgid "output pack to stdout"
8427 #: builtin/pack-objects.c:2642
8428 msgid "include tag objects that refer to objects to be packed"
8431 #: builtin/pack-objects.c:2644
8432 msgid "keep unreachable objects"
8435 #: builtin/pack-objects.c:2645 parse-options.h:142
8439 #: builtin/pack-objects.c:2646
8440 msgid "unpack unreachable objects newer than <time>"
8443 #: builtin/pack-objects.c:2649
8444 msgid "create thin packs"
8447 #: builtin/pack-objects.c:2651
8448 msgid "create packs suitable for shallow fetches"
8451 #: builtin/pack-objects.c:2653
8452 msgid "ignore packs that have companion .keep file"
8455 #: builtin/pack-objects.c:2655
8456 msgid "pack compression level"
8459 #: builtin/pack-objects.c:2657
8460 msgid "do not hide commits by grafts"
8463 #: builtin/pack-objects.c:2659
8464 msgid "use a bitmap index if available to speed up counting objects"
8467 #: builtin/pack-objects.c:2661
8468 msgid "write a bitmap index together with the pack index"
8471 #: builtin/pack-objects.c:2752
8472 msgid "Counting objects"
8475 #: builtin/pack-refs.c:6
8476 msgid "git pack-refs [<options>]"
8479 #: builtin/pack-refs.c:14
8480 msgid "pack everything"
8483 #: builtin/pack-refs.c:15
8484 msgid "prune loose refs (default)"
8487 #: builtin/prune-packed.c:7
8488 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8491 #: builtin/prune-packed.c:40
8492 msgid "Removing duplicate objects"
8495 #: builtin/prune.c:11
8496 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
8499 #: builtin/prune.c:105 builtin/worktree.c:124
8500 msgid "do not remove, show only"
8503 #: builtin/prune.c:106 builtin/worktree.c:125
8504 msgid "report pruned objects"
8507 #: builtin/prune.c:109 builtin/worktree.c:127
8508 msgid "expire objects older than <time>"
8511 #: builtin/prune.c:123
8512 msgid "cannot prune in a precious-objects repo"
8515 #: builtin/pull.c:72
8516 msgid "git pull [<options>] [<repository> [<refspec>...]]"
8519 #: builtin/pull.c:117
8520 msgid "Options related to merging"
8523 #: builtin/pull.c:120
8524 msgid "incorporate changes by rebasing rather than merging"
8527 #: builtin/pull.c:144 builtin/revert.c:105
8528 msgid "allow fast-forward"
8531 #: builtin/pull.c:150
8532 msgid "verify that the named commit has a valid GPG signature"
8535 #: builtin/pull.c:164
8536 msgid "Options related to fetching"
8539 #: builtin/pull.c:186
8540 msgid "number of submodules pulled in parallel"
8543 #: builtin/pull.c:275
8545 msgid "Invalid value for pull.ff: %s"
8548 #: builtin/pull.c:359
8549 msgid "Cannot pull with rebase: You have unstaged changes."
8552 #: builtin/pull.c:365
8553 msgid "Additionally, your index contains uncommitted changes."
8556 #: builtin/pull.c:367
8557 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
8560 #: builtin/pull.c:443
8562 "There is no candidate for rebasing against among the refs that you just "
8566 #: builtin/pull.c:445
8568 "There are no candidates for merging among the refs that you just fetched."
8571 #: builtin/pull.c:446
8573 "Generally this means that you provided a wildcard refspec which had no\n"
8574 "matches on the remote end."
8577 #: builtin/pull.c:449
8580 "You asked to pull from the remote '%s', but did not specify\n"
8581 "a branch. Because this is not the default configured remote\n"
8582 "for your current branch, you must specify a branch on the command line."
8585 #: builtin/pull.c:454
8586 msgid "You are not currently on a branch."
8589 #: builtin/pull.c:456 builtin/pull.c:471
8590 msgid "Please specify which branch you want to rebase against."
8593 #: builtin/pull.c:458 builtin/pull.c:473
8594 msgid "Please specify which branch you want to merge with."
8597 #: builtin/pull.c:459 builtin/pull.c:474
8598 msgid "See git-pull(1) for details."
8601 #: builtin/pull.c:469
8602 msgid "There is no tracking information for the current branch."
8605 #: builtin/pull.c:478
8608 "If you wish to set tracking information for this branch you can do so with:\n"
8610 " git branch --set-upstream-to=%s/<branch> %s\n"
8613 #: builtin/pull.c:483
8616 "Your configuration specifies to merge with the ref '%s'\n"
8617 "from the remote, but no such ref was fetched."
8620 #: builtin/pull.c:841
8621 msgid "Updating an unborn branch with changes added to the index."
8624 #: builtin/pull.c:870
8627 "fetch updated the current branch head.\n"
8628 "fast-forwarding your working tree from\n"
8632 #: builtin/pull.c:875
8635 "Cannot fast-forward your working tree.\n"
8636 "After making sure that you saved anything precious from\n"
8639 "$ git reset --hard\n"
8643 #: builtin/pull.c:890
8644 msgid "Cannot merge multiple branches into empty head."
8647 #: builtin/pull.c:894
8648 msgid "Cannot rebase onto multiple branches."
8651 #: builtin/push.c:16
8652 msgid "git push [<options>] [<repository> [<refspec>...]]"
8655 #: builtin/push.c:89
8656 msgid "tag shorthand without <tag>"
8659 #: builtin/push.c:99
8660 msgid "--delete only accepts plain target ref names"
8663 #: builtin/push.c:143
8666 "To choose either option permanently, see push.default in 'git help config'."
8669 #: builtin/push.c:146
8672 "The upstream branch of your current branch does not match\n"
8673 "the name of your current branch. To push to the upstream branch\n"
8674 "on the remote, use\n"
8676 " git push %s HEAD:%s\n"
8678 "To push to the branch of the same name on the remote, use\n"
8684 #: builtin/push.c:161
8687 "You are not currently on a branch.\n"
8688 "To push the history leading to the current (detached HEAD)\n"
8691 " git push %s HEAD:<name-of-remote-branch>\n"
8694 #: builtin/push.c:175
8697 "The current branch %s has no upstream branch.\n"
8698 "To push the current branch and set the remote as upstream, use\n"
8700 " git push --set-upstream %s %s\n"
8703 #: builtin/push.c:183
8705 msgid "The current branch %s has multiple upstream branches, refusing to push."
8708 #: builtin/push.c:186
8711 "You are pushing to remote '%s', which is not the upstream of\n"
8712 "your current branch '%s', without telling me what to push\n"
8713 "to update which remote branch."
8716 #: builtin/push.c:242
8718 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
8721 #: builtin/push.c:249
8723 "Updates were rejected because the tip of your current branch is behind\n"
8724 "its remote counterpart. Integrate the remote changes (e.g.\n"
8725 "'git pull ...') before pushing again.\n"
8726 "See the 'Note about fast-forwards' in 'git push --help' for details."
8729 #: builtin/push.c:255
8731 "Updates were rejected because a pushed branch tip is behind its remote\n"
8732 "counterpart. Check out this branch and integrate the remote changes\n"
8733 "(e.g. 'git pull ...') before pushing again.\n"
8734 "See the 'Note about fast-forwards' in 'git push --help' for details."
8737 #: builtin/push.c:261
8739 "Updates were rejected because the remote contains work that you do\n"
8740 "not have locally. This is usually caused by another repository pushing\n"
8741 "to the same ref. You may want to first integrate the remote changes\n"
8742 "(e.g., 'git pull ...') before pushing again.\n"
8743 "See the 'Note about fast-forwards' in 'git push --help' for details."
8746 #: builtin/push.c:268
8747 msgid "Updates were rejected because the tag already exists in the remote."
8750 #: builtin/push.c:271
8752 "You cannot update a remote ref that points at a non-commit object,\n"
8753 "or update a remote ref to make it point at a non-commit object,\n"
8754 "without using the '--force' option.\n"
8757 #: builtin/push.c:331
8759 msgid "Pushing to %s\n"
8762 #: builtin/push.c:335
8764 msgid "failed to push some refs to '%s'"
8767 #: builtin/push.c:365
8769 msgid "bad repository '%s'"
8772 #: builtin/push.c:366
8774 "No configured push destination.\n"
8775 "Either specify the URL from the command-line or configure a remote "
8776 "repository using\n"
8778 " git remote add <name> <url>\n"
8780 "and then push using the remote name\n"
8782 " git push <name>\n"
8785 #: builtin/push.c:381
8786 msgid "--all and --tags are incompatible"
8789 #: builtin/push.c:382
8790 msgid "--all can't be combined with refspecs"
8793 #: builtin/push.c:387
8794 msgid "--mirror and --tags are incompatible"
8797 #: builtin/push.c:388
8798 msgid "--mirror can't be combined with refspecs"
8801 #: builtin/push.c:393
8802 msgid "--all and --mirror are incompatible"
8805 #: builtin/push.c:505
8809 #: builtin/push.c:506 builtin/send-pack.c:161
8810 msgid "push all refs"
8813 #: builtin/push.c:507 builtin/send-pack.c:163
8814 msgid "mirror all refs"
8817 #: builtin/push.c:509
8821 #: builtin/push.c:510
8822 msgid "push tags (can't be used with --all or --mirror)"
8825 #: builtin/push.c:513 builtin/send-pack.c:164
8826 msgid "force updates"
8829 #: builtin/push.c:515 builtin/send-pack.c:175
8830 msgid "refname>:<expect"
8833 #: builtin/push.c:516 builtin/send-pack.c:176
8834 msgid "require old value of ref to be at this value"
8837 #: builtin/push.c:519
8838 msgid "control recursive pushing of submodules"
8841 #: builtin/push.c:521 builtin/send-pack.c:169
8842 msgid "use thin pack"
8845 #: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
8846 #: builtin/send-pack.c:159
8847 msgid "receive pack program"
8850 #: builtin/push.c:524
8851 msgid "set upstream for git pull/status"
8854 #: builtin/push.c:527
8855 msgid "prune locally removed refs"
8858 #: builtin/push.c:529
8859 msgid "bypass pre-push hook"
8862 #: builtin/push.c:530
8863 msgid "push missing but relevant tags"
8866 #: builtin/push.c:533 builtin/send-pack.c:166
8867 msgid "GPG sign the push"
8870 #: builtin/push.c:535 builtin/send-pack.c:170
8871 msgid "request atomic transaction on remote side"
8874 #: builtin/push.c:549
8875 msgid "--delete is incompatible with --all, --mirror and --tags"
8878 #: builtin/push.c:551
8879 msgid "--delete doesn't make sense without any refs"
8882 #: builtin/read-tree.c:37
8884 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
8885 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8886 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8889 #: builtin/read-tree.c:110
8890 msgid "write resulting index to <file>"
8893 #: builtin/read-tree.c:113
8894 msgid "only empty the index"
8897 #: builtin/read-tree.c:115
8901 #: builtin/read-tree.c:117
8902 msgid "perform a merge in addition to a read"
8905 #: builtin/read-tree.c:119
8906 msgid "3-way merge if no file level merging required"
8909 #: builtin/read-tree.c:121
8910 msgid "3-way merge in presence of adds and removes"
8913 #: builtin/read-tree.c:123
8914 msgid "same as -m, but discard unmerged entries"
8917 #: builtin/read-tree.c:124
8918 msgid "<subdirectory>/"
8921 #: builtin/read-tree.c:125
8922 msgid "read the tree into the index under <subdirectory>/"
8925 #: builtin/read-tree.c:128
8926 msgid "update working tree with merge result"
8929 #: builtin/read-tree.c:130
8933 #: builtin/read-tree.c:131
8934 msgid "allow explicitly ignored files to be overwritten"
8937 #: builtin/read-tree.c:134
8938 msgid "don't check the working tree after merging"
8941 #: builtin/read-tree.c:135
8942 msgid "don't update the index or the work tree"
8945 #: builtin/read-tree.c:137
8946 msgid "skip applying sparse checkout filter"
8949 #: builtin/read-tree.c:139
8950 msgid "debug unpack-trees"
8953 #: builtin/reflog.c:423
8955 msgid "'%s' for '%s' is not a valid timestamp"
8958 #: builtin/reflog.c:540 builtin/reflog.c:545
8960 msgid "'%s' is not a valid timestamp"
8963 #: builtin/remote.c:12
8964 msgid "git remote [-v | --verbose]"
8967 #: builtin/remote.c:13
8969 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
8970 "mirror=<fetch|push>] <name> <url>"
8973 #: builtin/remote.c:14 builtin/remote.c:34
8974 msgid "git remote rename <old> <new>"
8977 #: builtin/remote.c:15 builtin/remote.c:39
8978 msgid "git remote remove <name>"
8981 #: builtin/remote.c:16 builtin/remote.c:44
8982 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8985 #: builtin/remote.c:17
8986 msgid "git remote [-v | --verbose] show [-n] <name>"
8989 #: builtin/remote.c:18
8990 msgid "git remote prune [-n | --dry-run] <name>"
8993 #: builtin/remote.c:19
8995 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8998 #: builtin/remote.c:20
8999 msgid "git remote set-branches [--add] <name> <branch>..."
9002 #: builtin/remote.c:21 builtin/remote.c:70
9003 msgid "git remote get-url [--push] [--all] <name>"
9006 #: builtin/remote.c:22 builtin/remote.c:75
9007 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
9010 #: builtin/remote.c:23 builtin/remote.c:76
9011 msgid "git remote set-url --add <name> <newurl>"
9014 #: builtin/remote.c:24 builtin/remote.c:77
9015 msgid "git remote set-url --delete <name> <url>"
9018 #: builtin/remote.c:29
9019 msgid "git remote add [<options>] <name> <url>"
9022 #: builtin/remote.c:49
9023 msgid "git remote set-branches <name> <branch>..."
9026 #: builtin/remote.c:50
9027 msgid "git remote set-branches --add <name> <branch>..."
9030 #: builtin/remote.c:55
9031 msgid "git remote show [<options>] <name>"
9034 #: builtin/remote.c:60
9035 msgid "git remote prune [<options>] <name>"
9038 #: builtin/remote.c:65
9039 msgid "git remote update [<options>] [<group> | <remote>]..."
9042 #: builtin/remote.c:94
9047 #: builtin/remote.c:126
9049 "--mirror is dangerous and deprecated; please\n"
9050 "\t use --mirror=fetch or --mirror=push instead"
9053 #: builtin/remote.c:143
9055 msgid "unknown mirror argument: %s"
9058 #: builtin/remote.c:159
9059 msgid "fetch the remote branches"
9062 #: builtin/remote.c:161
9063 msgid "import all tags and associated objects when fetching"
9066 #: builtin/remote.c:164
9067 msgid "or do not fetch any tag at all (--no-tags)"
9070 #: builtin/remote.c:166
9071 msgid "branch(es) to track"
9074 #: builtin/remote.c:167
9075 msgid "master branch"
9078 #: builtin/remote.c:168
9082 #: builtin/remote.c:169
9083 msgid "set up remote as a mirror to push to or fetch from"
9086 #: builtin/remote.c:181
9087 msgid "specifying a master branch makes no sense with --mirror"
9090 #: builtin/remote.c:183
9091 msgid "specifying branches to track makes sense only with fetch mirrors"
9094 #: builtin/remote.c:190 builtin/remote.c:633
9096 msgid "remote %s already exists."
9099 #: builtin/remote.c:194 builtin/remote.c:637
9101 msgid "'%s' is not a valid remote name"
9104 #: builtin/remote.c:234
9106 msgid "Could not setup master '%s'"
9109 #: builtin/remote.c:336
9111 msgid "Could not get fetch map for refspec %s"
9114 #: builtin/remote.c:437 builtin/remote.c:445
9118 #: builtin/remote.c:449
9122 #: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
9124 msgid "No such remote: %s"
9127 #: builtin/remote.c:643
9129 msgid "Could not rename config section '%s' to '%s'"
9132 #: builtin/remote.c:663
9135 "Not updating non-default fetch refspec\n"
9137 "\tPlease update the configuration manually if necessary."
9140 #: builtin/remote.c:699
9142 msgid "deleting '%s' failed"
9145 #: builtin/remote.c:733
9147 msgid "creating '%s' failed"
9150 #: builtin/remote.c:796
9152 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
9153 "to delete it, use:"
9155 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
9156 "to delete them, use:"
9160 #: builtin/remote.c:810
9162 msgid "Could not remove config section '%s'"
9165 #: builtin/remote.c:911
9167 msgid " new (next fetch will store in remotes/%s)"
9170 #: builtin/remote.c:914
9174 #: builtin/remote.c:916
9175 msgid " stale (use 'git remote prune' to remove)"
9178 #: builtin/remote.c:918
9182 #: builtin/remote.c:959
9184 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
9187 #: builtin/remote.c:967
9189 msgid "rebases interactively onto remote %s"
9192 #: builtin/remote.c:971
9194 msgid " merges with remote %s"
9197 #: builtin/remote.c:972
9198 msgid " and with remote"
9201 #: builtin/remote.c:974
9203 msgid "merges with remote %s"
9206 #: builtin/remote.c:975
9207 msgid " and with remote"
9210 #: builtin/remote.c:1021
9214 #: builtin/remote.c:1024
9218 #: builtin/remote.c:1028
9222 #: builtin/remote.c:1031
9223 msgid "fast-forwardable"
9226 #: builtin/remote.c:1034
9227 msgid "local out of date"
9230 #: builtin/remote.c:1041
9232 msgid " %-*s forces to %-*s (%s)"
9235 #: builtin/remote.c:1044
9237 msgid " %-*s pushes to %-*s (%s)"
9240 #: builtin/remote.c:1048
9242 msgid " %-*s forces to %s"
9245 #: builtin/remote.c:1051
9247 msgid " %-*s pushes to %s"
9250 #: builtin/remote.c:1119
9251 msgid "do not query remotes"
9254 #: builtin/remote.c:1146
9259 #: builtin/remote.c:1147
9261 msgid " Fetch URL: %s"
9264 #: builtin/remote.c:1148 builtin/remote.c:1299
9268 #: builtin/remote.c:1157 builtin/remote.c:1159
9270 msgid " Push URL: %s"
9273 #: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
9275 msgid " HEAD branch: %s"
9278 #: builtin/remote.c:1167
9281 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
9284 #: builtin/remote.c:1179
9286 msgid " Remote branch:%s"
9287 msgid_plural " Remote branches:%s"
9291 #: builtin/remote.c:1182 builtin/remote.c:1209
9292 msgid " (status not queried)"
9295 #: builtin/remote.c:1191
9296 msgid " Local branch configured for 'git pull':"
9297 msgid_plural " Local branches configured for 'git pull':"
9301 #: builtin/remote.c:1199
9302 msgid " Local refs will be mirrored by 'git push'"
9305 #: builtin/remote.c:1206
9307 msgid " Local ref configured for 'git push'%s:"
9308 msgid_plural " Local refs configured for 'git push'%s:"
9312 #: builtin/remote.c:1227
9313 msgid "set refs/remotes/<name>/HEAD according to remote"
9316 #: builtin/remote.c:1229
9317 msgid "delete refs/remotes/<name>/HEAD"
9320 #: builtin/remote.c:1244
9321 msgid "Cannot determine remote HEAD"
9324 #: builtin/remote.c:1246
9325 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
9328 #: builtin/remote.c:1256
9330 msgid "Could not delete %s"
9333 #: builtin/remote.c:1264
9335 msgid "Not a valid ref: %s"
9338 #: builtin/remote.c:1266
9340 msgid "Could not setup %s"
9343 #: builtin/remote.c:1284
9345 msgid " %s will become dangling!"
9348 #: builtin/remote.c:1285
9350 msgid " %s has become dangling!"
9353 #: builtin/remote.c:1295
9358 #: builtin/remote.c:1296
9363 #: builtin/remote.c:1312
9365 msgid " * [would prune] %s"
9368 #: builtin/remote.c:1315
9370 msgid " * [pruned] %s"
9373 #: builtin/remote.c:1360
9374 msgid "prune remotes after fetching"
9377 #: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
9379 msgid "No such remote '%s'"
9382 #: builtin/remote.c:1439
9386 #: builtin/remote.c:1446
9387 msgid "no remote specified"
9390 #: builtin/remote.c:1463
9391 msgid "query push URLs rather than fetch URLs"
9394 #: builtin/remote.c:1465
9395 msgid "return all URLs"
9398 #: builtin/remote.c:1493
9400 msgid "no URLs configured for remote '%s'"
9403 #: builtin/remote.c:1519
9404 msgid "manipulate push URLs"
9407 #: builtin/remote.c:1521
9411 #: builtin/remote.c:1523
9415 #: builtin/remote.c:1530
9416 msgid "--add --delete doesn't make sense"
9419 #: builtin/remote.c:1571
9421 msgid "Invalid old URL pattern: %s"
9424 #: builtin/remote.c:1579
9426 msgid "No such URL found: %s"
9429 #: builtin/remote.c:1581
9430 msgid "Will not delete all non-push URLs"
9433 #: builtin/remote.c:1595
9434 msgid "be verbose; must be placed before a subcommand"
9437 #: builtin/repack.c:17
9438 msgid "git repack [<options>]"
9441 #: builtin/repack.c:159
9442 msgid "pack everything in a single pack"
9445 #: builtin/repack.c:161
9446 msgid "same as -a, and turn unreachable objects loose"
9449 #: builtin/repack.c:164
9450 msgid "remove redundant packs, and run git-prune-packed"
9453 #: builtin/repack.c:166
9454 msgid "pass --no-reuse-delta to git-pack-objects"
9457 #: builtin/repack.c:168
9458 msgid "pass --no-reuse-object to git-pack-objects"
9461 #: builtin/repack.c:170
9462 msgid "do not run git-update-server-info"
9465 #: builtin/repack.c:173
9466 msgid "pass --local to git-pack-objects"
9469 #: builtin/repack.c:175
9470 msgid "write bitmap index"
9473 #: builtin/repack.c:176
9477 #: builtin/repack.c:177
9478 msgid "with -A, do not loosen objects older than this"
9481 #: builtin/repack.c:179
9482 msgid "size of the window used for delta compression"
9485 #: builtin/repack.c:180 builtin/repack.c:184
9489 #: builtin/repack.c:181
9490 msgid "same as the above, but limit memory size instead of entries count"
9493 #: builtin/repack.c:183
9494 msgid "limits the maximum delta depth"
9497 #: builtin/repack.c:185
9498 msgid "maximum size of each packfile"
9501 #: builtin/repack.c:187
9502 msgid "repack objects in packs marked with .keep"
9505 #: builtin/repack.c:197
9506 msgid "cannot delete packs in a precious-objects repo"
9509 #: builtin/repack.c:381
9511 msgid "removing '%s' failed"
9514 #: builtin/replace.c:19
9515 msgid "git replace [-f] <object> <replacement>"
9518 #: builtin/replace.c:20
9519 msgid "git replace [-f] --edit <object>"
9522 #: builtin/replace.c:21
9523 msgid "git replace [-f] --graft <commit> [<parent>...]"
9526 #: builtin/replace.c:22
9527 msgid "git replace -d <object>..."
9530 #: builtin/replace.c:23
9531 msgid "git replace [--format=<format>] [-l [<pattern>]]"
9534 #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
9536 msgid "Not a valid object name: '%s'"
9539 #: builtin/replace.c:355
9541 msgid "bad mergetag in commit '%s'"
9544 #: builtin/replace.c:357
9546 msgid "malformed mergetag in commit '%s'"
9549 #: builtin/replace.c:368
9552 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9553 "instead of --graft"
9556 #: builtin/replace.c:401
9558 msgid "the original commit '%s' has a gpg signature."
9561 #: builtin/replace.c:402
9562 msgid "the signature will be removed in the replacement commit!"
9565 #: builtin/replace.c:408
9567 msgid "could not write replacement commit for: '%s'"
9570 #: builtin/replace.c:432
9571 msgid "list replace refs"
9574 #: builtin/replace.c:433
9575 msgid "delete replace refs"
9578 #: builtin/replace.c:434
9579 msgid "edit existing object"
9582 #: builtin/replace.c:435
9583 msgid "change a commit's parents"
9586 #: builtin/replace.c:436
9587 msgid "replace the ref if it exists"
9590 #: builtin/replace.c:437
9591 msgid "do not pretty-print contents for --edit"
9594 #: builtin/replace.c:438
9595 msgid "use this format"
9598 #: builtin/rerere.c:12
9599 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9602 #: builtin/rerere.c:58
9603 msgid "register clean resolutions in index"
9606 #: builtin/reset.c:26
9608 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
9611 #: builtin/reset.c:27
9612 msgid "git reset [-q] <tree-ish> [--] <paths>..."
9615 #: builtin/reset.c:28
9616 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9619 #: builtin/reset.c:34
9623 #: builtin/reset.c:34
9627 #: builtin/reset.c:34
9631 #: builtin/reset.c:34
9635 #: builtin/reset.c:34
9639 #: builtin/reset.c:74
9640 msgid "You do not have a valid HEAD."
9643 #: builtin/reset.c:76
9644 msgid "Failed to find tree of HEAD."
9647 #: builtin/reset.c:82
9649 msgid "Failed to find tree of %s."
9652 #: builtin/reset.c:100
9654 msgid "HEAD is now at %s"
9657 #: builtin/reset.c:183
9659 msgid "Cannot do a %s reset in the middle of a merge."
9662 #: builtin/reset.c:276
9663 msgid "be quiet, only report errors"
9666 #: builtin/reset.c:278
9667 msgid "reset HEAD and index"
9670 #: builtin/reset.c:279
9671 msgid "reset only HEAD"
9674 #: builtin/reset.c:281 builtin/reset.c:283
9675 msgid "reset HEAD, index and working tree"
9678 #: builtin/reset.c:285
9679 msgid "reset HEAD but keep local changes"
9682 #: builtin/reset.c:288
9683 msgid "record only the fact that removed paths will be added later"
9686 #: builtin/reset.c:305
9688 msgid "Failed to resolve '%s' as a valid revision."
9691 #: builtin/reset.c:313
9693 msgid "Failed to resolve '%s' as a valid tree."
9696 #: builtin/reset.c:322
9697 msgid "--patch is incompatible with --{hard,mixed,soft}"
9700 #: builtin/reset.c:331
9701 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
9704 #: builtin/reset.c:333
9706 msgid "Cannot do %s reset with paths."
9709 #: builtin/reset.c:343
9711 msgid "%s reset is not allowed in a bare repository"
9714 #: builtin/reset.c:347
9715 msgid "-N can only be used with --mixed"
9718 #: builtin/reset.c:364
9719 msgid "Unstaged changes after reset:"
9722 #: builtin/reset.c:370
9724 msgid "Could not reset index file to revision '%s'."
9727 #: builtin/reset.c:374
9728 msgid "Could not write new index file."
9731 #: builtin/rev-list.c:350
9732 msgid "rev-list does not support display of notes"
9735 #: builtin/rev-parse.c:358
9736 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
9739 #: builtin/rev-parse.c:363
9740 msgid "keep the `--` passed as an arg"
9743 #: builtin/rev-parse.c:365
9744 msgid "stop parsing after the first non-option argument"
9747 #: builtin/rev-parse.c:368
9748 msgid "output in stuck long form"
9751 #: builtin/rev-parse.c:499
9753 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
9754 " or: git rev-parse --sq-quote [<arg>...]\n"
9755 " or: git rev-parse [<options>] [<arg>...]\n"
9757 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9760 #: builtin/revert.c:22
9761 msgid "git revert [<options>] <commit-ish>..."
9764 #: builtin/revert.c:23
9765 msgid "git revert <subcommand>"
9768 #: builtin/revert.c:28
9769 msgid "git cherry-pick [<options>] <commit-ish>..."
9772 #: builtin/revert.c:29
9773 msgid "git cherry-pick <subcommand>"
9776 #: builtin/revert.c:71
9778 msgid "%s: %s cannot be used with %s"
9781 #: builtin/revert.c:80
9782 msgid "end revert or cherry-pick sequence"
9785 #: builtin/revert.c:81
9786 msgid "resume revert or cherry-pick sequence"
9789 #: builtin/revert.c:82
9790 msgid "cancel revert or cherry-pick sequence"
9793 #: builtin/revert.c:83
9794 msgid "don't automatically commit"
9797 #: builtin/revert.c:84
9798 msgid "edit the commit message"
9801 #: builtin/revert.c:87
9802 msgid "parent number"
9805 #: builtin/revert.c:89
9806 msgid "merge strategy"
9809 #: builtin/revert.c:90
9813 #: builtin/revert.c:91
9814 msgid "option for merge strategy"
9817 #: builtin/revert.c:104
9818 msgid "append commit name"
9821 #: builtin/revert.c:106
9822 msgid "preserve initially empty commits"
9825 #: builtin/revert.c:107
9826 msgid "allow commits with empty messages"
9829 #: builtin/revert.c:108
9830 msgid "keep redundant, empty commits"
9833 #: builtin/revert.c:112
9834 msgid "program error"
9837 #: builtin/revert.c:197
9838 msgid "revert failed"
9841 #: builtin/revert.c:212
9842 msgid "cherry-pick failed"
9846 msgid "git rm [<options>] [--] <file>..."
9851 "the following submodule (or one of its nested submodules)\n"
9852 "uses a .git directory:"
9854 "the following submodules (or one of their nested submodules)\n"
9855 "use a .git directory:"
9862 "(use 'rm -rf' if you really want to remove it including all of its history)"
9867 "the following file has staged content different from both the\n"
9868 "file and the HEAD:"
9870 "the following files have staged content different from both the\n"
9871 "file and the HEAD:"
9878 "(use -f to force removal)"
9882 msgid "the following file has changes staged in the index:"
9883 msgid_plural "the following files have changes staged in the index:"
9887 #: builtin/rm.c:243 builtin/rm.c:254
9890 "(use --cached to keep the file, or -f to force removal)"
9894 msgid "the following file has local modifications:"
9895 msgid_plural "the following files have local modifications:"
9900 msgid "do not list removed files"
9904 msgid "only remove from the index"
9908 msgid "override the up-to-date check"
9912 msgid "allow recursive removal"
9916 msgid "exit with a zero status even if nothing matched"
9920 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9925 msgid "not removing '%s' recursively without -r"
9930 msgid "git rm: unable to remove %s"
9933 #: builtin/send-pack.c:18
9935 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
9936 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
9938 " --all and explicit <ref> specification are mutually exclusive."
9941 #: builtin/send-pack.c:160
9945 #: builtin/send-pack.c:171
9946 msgid "use stateless RPC protocol"
9949 #: builtin/send-pack.c:172
9950 msgid "read refs from stdin"
9953 #: builtin/send-pack.c:173
9954 msgid "print status from remote helper"
9957 #: builtin/shortlog.c:13
9958 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
9961 #: builtin/shortlog.c:242
9962 msgid "sort output according to the number of commits per author"
9965 #: builtin/shortlog.c:244
9966 msgid "Suppress commit descriptions, only provides commit count"
9969 #: builtin/shortlog.c:246
9970 msgid "Show the email address of each author"
9973 #: builtin/shortlog.c:247
9977 #: builtin/shortlog.c:248
9978 msgid "Linewrap output"
9981 #: builtin/show-branch.c:10
9983 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9984 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9985 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9986 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9989 #: builtin/show-branch.c:14
9990 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
9993 #: builtin/show-branch.c:640
9994 msgid "show remote-tracking and local branches"
9997 #: builtin/show-branch.c:642
9998 msgid "show remote-tracking branches"
10001 #: builtin/show-branch.c:644
10002 msgid "color '*!+-' corresponding to the branch"
10005 #: builtin/show-branch.c:646
10006 msgid "show <n> more commits after the common ancestor"
10009 #: builtin/show-branch.c:648
10010 msgid "synonym to more=-1"
10013 #: builtin/show-branch.c:649
10014 msgid "suppress naming strings"
10017 #: builtin/show-branch.c:651
10018 msgid "include the current branch"
10021 #: builtin/show-branch.c:653
10022 msgid "name commits with their object names"
10025 #: builtin/show-branch.c:655
10026 msgid "show possible merge bases"
10029 #: builtin/show-branch.c:657
10030 msgid "show refs unreachable from any other ref"
10033 #: builtin/show-branch.c:659
10034 msgid "show commits in topological order"
10037 #: builtin/show-branch.c:662
10038 msgid "show only commits not on the first branch"
10041 #: builtin/show-branch.c:664
10042 msgid "show merges reachable from only one tip"
10045 #: builtin/show-branch.c:666
10046 msgid "topologically sort, maintaining date order where possible"
10049 #: builtin/show-branch.c:669
10050 msgid "<n>[,<base>]"
10053 #: builtin/show-branch.c:670
10054 msgid "show <n> most recent ref-log entries starting at base"
10057 #: builtin/show-ref.c:10
10059 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10060 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
10063 #: builtin/show-ref.c:11
10064 msgid "git show-ref --exclude-existing[=<pattern>]"
10067 #: builtin/show-ref.c:165
10068 msgid "only show tags (can be combined with heads)"
10071 #: builtin/show-ref.c:166
10072 msgid "only show heads (can be combined with tags)"
10075 #: builtin/show-ref.c:167
10076 msgid "stricter reference checking, requires exact ref path"
10079 #: builtin/show-ref.c:170 builtin/show-ref.c:172
10080 msgid "show the HEAD reference, even if it would be filtered out"
10083 #: builtin/show-ref.c:174
10084 msgid "dereference tags into object IDs"
10087 #: builtin/show-ref.c:176
10088 msgid "only show SHA1 hash using <n> digits"
10091 #: builtin/show-ref.c:180
10092 msgid "do not print results to stdout (useful with --verify)"
10095 #: builtin/show-ref.c:182
10096 msgid "show refs from stdin that aren't in local repository"
10099 #: builtin/stripspace.c:17
10100 msgid "git stripspace [-s | --strip-comments]"
10103 #: builtin/stripspace.c:18
10104 msgid "git stripspace [-c | --comment-lines]"
10107 #: builtin/stripspace.c:35
10108 msgid "skip and remove all lines starting with comment character"
10111 #: builtin/stripspace.c:38
10112 msgid "prepend comment character and space to each line"
10115 #: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
10116 msgid "alternative anchor for relative paths"
10119 #: builtin/submodule--helper.c:78
10120 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
10123 #: builtin/submodule--helper.c:108
10124 msgid "git submodule--helper name <path>"
10127 #: builtin/submodule--helper.c:114
10129 msgid "no submodule mapping found in .gitmodules for path '%s'"
10132 #: builtin/submodule--helper.c:164
10133 msgid "where the new submodule will be cloned to"
10136 #: builtin/submodule--helper.c:167
10137 msgid "name of the new submodule"
10140 #: builtin/submodule--helper.c:170
10141 msgid "url where to clone the submodule from"
10144 #: builtin/submodule--helper.c:176
10145 msgid "depth for shallow clones"
10148 #: builtin/submodule--helper.c:182
10150 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
10151 "<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
10154 #: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
10155 #: builtin/submodule--helper.c:210
10157 msgid "could not create directory '%s'"
10160 #: builtin/submodule--helper.c:198
10162 msgid "clone of '%s' into submodule path '%s' failed"
10165 #: builtin/submodule--helper.c:221
10167 msgid "cannot open file '%s'"
10170 #: builtin/submodule--helper.c:226
10172 msgid "could not close file %s"
10175 #: builtin/submodule--helper.c:241
10177 msgid "could not get submodule directory for '%s'"
10180 #: builtin/submodule--helper.c:267
10181 msgid "fatal: submodule--helper subcommand must be called with a subcommand"
10184 #: builtin/submodule--helper.c:274
10186 msgid "fatal: '%s' is not a valid submodule--helper subcommand"
10189 #: builtin/symbolic-ref.c:7
10190 msgid "git symbolic-ref [<options>] <name> [<ref>]"
10193 #: builtin/symbolic-ref.c:8
10194 msgid "git symbolic-ref -d [-q] <name>"
10197 #: builtin/symbolic-ref.c:40
10198 msgid "suppress error message for non-symbolic (detached) refs"
10201 #: builtin/symbolic-ref.c:41
10202 msgid "delete symbolic ref"
10205 #: builtin/symbolic-ref.c:42
10206 msgid "shorten ref output"
10209 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10213 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10214 msgid "reason of the update"
10217 #: builtin/tag.c:23
10219 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
10223 #: builtin/tag.c:24
10224 msgid "git tag -d <tagname>..."
10227 #: builtin/tag.c:25
10229 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
10230 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
10233 #: builtin/tag.c:27
10234 msgid "git tag -v <tagname>..."
10237 #: builtin/tag.c:80
10239 msgid "tag name too long: %.*s..."
10242 #: builtin/tag.c:85
10244 msgid "tag '%s' not found."
10247 #: builtin/tag.c:100
10249 msgid "Deleted tag '%s' (was %s)\n"
10252 #: builtin/tag.c:112
10254 msgid "could not verify the tag '%s'"
10257 #: builtin/tag.c:122
10261 "Write a message for tag:\n"
10263 "Lines starting with '%c' will be ignored.\n"
10266 #: builtin/tag.c:126
10270 "Write a message for tag:\n"
10272 "Lines starting with '%c' will be kept; you may remove them yourself if you "
10276 #: builtin/tag.c:199
10277 msgid "unable to sign the tag"
10280 #: builtin/tag.c:201
10281 msgid "unable to write tag file"
10284 #: builtin/tag.c:226
10285 msgid "bad object type."
10288 #: builtin/tag.c:239
10289 msgid "tag header too big."
10292 #: builtin/tag.c:275
10293 msgid "no tag message?"
10296 #: builtin/tag.c:281
10298 msgid "The tag message has been left in %s\n"
10301 #: builtin/tag.c:339
10302 msgid "list tag names"
10305 #: builtin/tag.c:341
10306 msgid "print <n> lines of each tag message"
10309 #: builtin/tag.c:343
10310 msgid "delete tags"
10313 #: builtin/tag.c:344
10314 msgid "verify tags"
10317 #: builtin/tag.c:346
10318 msgid "Tag creation options"
10321 #: builtin/tag.c:348
10322 msgid "annotated tag, needs a message"
10325 #: builtin/tag.c:350
10326 msgid "tag message"
10329 #: builtin/tag.c:352
10330 msgid "annotated and GPG-signed tag"
10333 #: builtin/tag.c:356
10334 msgid "use another key to sign the tag"
10337 #: builtin/tag.c:357
10338 msgid "replace the tag if exists"
10341 #: builtin/tag.c:358 builtin/update-ref.c:368
10342 msgid "create a reflog"
10345 #: builtin/tag.c:360
10346 msgid "Tag listing options"
10349 #: builtin/tag.c:361
10350 msgid "show tag list in columns"
10353 #: builtin/tag.c:362 builtin/tag.c:363
10354 msgid "print only tags that contain the commit"
10357 #: builtin/tag.c:364
10358 msgid "print only tags that are merged"
10361 #: builtin/tag.c:365
10362 msgid "print only tags that are not merged"
10365 #: builtin/tag.c:370
10366 msgid "print only tags of the object"
10369 #: builtin/tag.c:399
10370 msgid "--column and -n are incompatible"
10373 #: builtin/tag.c:419
10374 msgid "-n option is only allowed with -l."
10377 #: builtin/tag.c:421
10378 msgid "--contains option is only allowed with -l."
10381 #: builtin/tag.c:423
10382 msgid "--points-at option is only allowed with -l."
10385 #: builtin/tag.c:425
10386 msgid "--merged and --no-merged option are only allowed with -l"
10389 #: builtin/tag.c:433
10390 msgid "only one -F or -m option is allowed."
10393 #: builtin/tag.c:453
10394 msgid "too many params"
10397 #: builtin/tag.c:459
10399 msgid "'%s' is not a valid tag name."
10402 #: builtin/tag.c:464
10404 msgid "tag '%s' already exists"
10407 #: builtin/tag.c:489
10409 msgid "Updated tag '%s' (was %s)\n"
10412 #: builtin/unpack-objects.c:490
10413 msgid "Unpacking objects"
10416 #: builtin/update-index.c:79
10418 msgid "failed to create directory %s"
10421 #: builtin/update-index.c:85
10423 msgid "failed to stat %s"
10426 #: builtin/update-index.c:95
10428 msgid "failed to create file %s"
10431 #: builtin/update-index.c:103
10433 msgid "failed to delete file %s"
10436 #: builtin/update-index.c:110 builtin/update-index.c:212
10438 msgid "failed to delete directory %s"
10441 #: builtin/update-index.c:133
10443 msgid "Testing mtime in '%s' "
10446 #: builtin/update-index.c:145
10447 msgid "directory stat info does not change after adding a new file"
10450 #: builtin/update-index.c:158
10451 msgid "directory stat info does not change after adding a new directory"
10454 #: builtin/update-index.c:171
10455 msgid "directory stat info changes after updating a file"
10458 #: builtin/update-index.c:182
10459 msgid "directory stat info changes after adding a file inside subdirectory"
10462 #: builtin/update-index.c:193
10463 msgid "directory stat info does not change after deleting a file"
10466 #: builtin/update-index.c:206
10467 msgid "directory stat info does not change after deleting a directory"
10470 #: builtin/update-index.c:213
10474 #: builtin/update-index.c:575
10475 msgid "git update-index [<options>] [--] [<file>...]"
10478 #: builtin/update-index.c:930
10479 msgid "continue refresh even when index needs update"
10482 #: builtin/update-index.c:933
10483 msgid "refresh: ignore submodules"
10486 #: builtin/update-index.c:936
10487 msgid "do not ignore new files"
10490 #: builtin/update-index.c:938
10491 msgid "let files replace directories and vice-versa"
10494 #: builtin/update-index.c:940
10495 msgid "notice files missing from worktree"
10498 #: builtin/update-index.c:942
10499 msgid "refresh even if index contains unmerged entries"
10502 #: builtin/update-index.c:945
10503 msgid "refresh stat information"
10506 #: builtin/update-index.c:949
10507 msgid "like --refresh, but ignore assume-unchanged setting"
10510 #: builtin/update-index.c:953
10511 msgid "<mode>,<object>,<path>"
10514 #: builtin/update-index.c:954
10515 msgid "add the specified entry to the index"
10518 #: builtin/update-index.c:958
10522 #: builtin/update-index.c:959
10523 msgid "override the executable bit of the listed files"
10526 #: builtin/update-index.c:963
10527 msgid "mark files as \"not changing\""
10530 #: builtin/update-index.c:966
10531 msgid "clear assumed-unchanged bit"
10534 #: builtin/update-index.c:969
10535 msgid "mark files as \"index-only\""
10538 #: builtin/update-index.c:972
10539 msgid "clear skip-worktree bit"
10542 #: builtin/update-index.c:975
10543 msgid "add to index only; do not add content to object database"
10546 #: builtin/update-index.c:977
10547 msgid "remove named paths even if present in worktree"
10550 #: builtin/update-index.c:979
10551 msgid "with --stdin: input lines are terminated by null bytes"
10554 #: builtin/update-index.c:981
10555 msgid "read list of paths to be updated from standard input"
10558 #: builtin/update-index.c:985
10559 msgid "add entries from standard input to the index"
10562 #: builtin/update-index.c:989
10563 msgid "repopulate stages #2 and #3 for the listed paths"
10566 #: builtin/update-index.c:993
10567 msgid "only update entries that differ from HEAD"
10570 #: builtin/update-index.c:997
10571 msgid "ignore files missing from worktree"
10574 #: builtin/update-index.c:1000
10575 msgid "report actions to standard output"
10578 #: builtin/update-index.c:1002
10579 msgid "(for porcelains) forget saved unresolved conflicts"
10582 #: builtin/update-index.c:1006
10583 msgid "write index in this format"
10586 #: builtin/update-index.c:1008
10587 msgid "enable or disable split index"
10590 #: builtin/update-index.c:1010
10591 msgid "enable/disable untracked cache"
10594 #: builtin/update-index.c:1012
10595 msgid "test if the filesystem supports untracked cache"
10598 #: builtin/update-index.c:1014
10599 msgid "enable untracked cache without testing the filesystem"
10602 #: builtin/update-index.c:1134
10603 msgid "Untracked cache disabled"
10606 #: builtin/update-index.c:1146
10608 msgid "Untracked cache enabled for '%s'"
10611 #: builtin/update-ref.c:9
10612 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
10615 #: builtin/update-ref.c:10
10616 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
10619 #: builtin/update-ref.c:11
10620 msgid "git update-ref [<options>] --stdin [-z]"
10623 #: builtin/update-ref.c:363
10624 msgid "delete the reference"
10627 #: builtin/update-ref.c:365
10628 msgid "update <refname> not the one it points to"
10631 #: builtin/update-ref.c:366
10632 msgid "stdin has NUL-terminated arguments"
10635 #: builtin/update-ref.c:367
10636 msgid "read updates from stdin"
10639 #: builtin/update-server-info.c:6
10640 msgid "git update-server-info [--force]"
10643 #: builtin/update-server-info.c:14
10644 msgid "update the info files from scratch"
10647 #: builtin/verify-commit.c:17
10648 msgid "git verify-commit [-v | --verbose] <commit>..."
10651 #: builtin/verify-commit.c:72
10652 msgid "print commit contents"
10655 #: builtin/verify-commit.c:73 builtin/verify-tag.c:84
10656 msgid "print raw gpg status output"
10659 #: builtin/verify-pack.c:54
10660 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
10663 #: builtin/verify-pack.c:64
10667 #: builtin/verify-pack.c:66
10668 msgid "show statistics only"
10671 #: builtin/verify-tag.c:17
10672 msgid "git verify-tag [-v | --verbose] <tag>..."
10675 #: builtin/verify-tag.c:83
10676 msgid "print tag contents"
10679 #: builtin/worktree.c:15
10680 msgid "git worktree add [<options>] <path> [<branch>]"
10683 #: builtin/worktree.c:16
10684 msgid "git worktree prune [<options>]"
10687 #: builtin/worktree.c:17
10688 msgid "git worktree list [<options>]"
10691 #: builtin/worktree.c:39
10693 msgid "Removing worktrees/%s: not a valid directory"
10696 #: builtin/worktree.c:45
10698 msgid "Removing worktrees/%s: gitdir file does not exist"
10701 #: builtin/worktree.c:50
10703 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
10706 #: builtin/worktree.c:61
10708 msgid "Removing worktrees/%s: invalid gitdir file"
10711 #: builtin/worktree.c:77
10713 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
10716 #: builtin/worktree.c:112
10718 msgid "failed to remove: %s"
10721 #: builtin/worktree.c:201
10723 msgid "'%s' already exists"
10726 #: builtin/worktree.c:233
10728 msgid "could not create directory of '%s'"
10731 #: builtin/worktree.c:269
10733 msgid "Preparing %s (identifier %s)"
10736 #: builtin/worktree.c:317
10737 msgid "checkout <branch> even if already checked out in other worktree"
10740 #: builtin/worktree.c:319
10741 msgid "create a new branch"
10744 #: builtin/worktree.c:321
10745 msgid "create or reset a branch"
10748 #: builtin/worktree.c:322
10749 msgid "detach HEAD at named commit"
10752 #: builtin/worktree.c:329
10753 msgid "-b, -B, and --detach are mutually exclusive"
10756 #: builtin/write-tree.c:13
10757 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
10760 #: builtin/write-tree.c:26
10764 #: builtin/write-tree.c:27
10765 msgid "write tree object for a subdirectory <prefix>"
10768 #: builtin/write-tree.c:30
10769 msgid "only useful for debugging"
10772 #: credential-cache--daemon.c:262
10773 msgid "print debugging messages to stderr"
10778 "'git help -a' and 'git help -g' list available subcommands and some\n"
10779 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
10780 "to read about a specific subcommand or concept."
10784 msgid "Public key pinning not supported with cURL < 7.44.0"
10788 msgid "start a working area (see also: git help tutorial)"
10791 #: common-cmds.h:10
10792 msgid "work on the current change (see also: git help everyday)"
10795 #: common-cmds.h:11
10796 msgid "examine the history and state (see also: git help revisions)"
10799 #: common-cmds.h:12
10800 msgid "grow, mark and tweak your common history"
10803 #: common-cmds.h:13
10804 msgid "collaborate (see also: git help workflows)"
10807 #: common-cmds.h:17
10808 msgid "Add file contents to the index"
10811 #: common-cmds.h:18
10812 msgid "Use binary search to find the commit that introduced a bug"
10815 #: common-cmds.h:19
10816 msgid "List, create, or delete branches"
10819 #: common-cmds.h:20
10820 msgid "Switch branches or restore working tree files"
10823 #: common-cmds.h:21
10824 msgid "Clone a repository into a new directory"
10827 #: common-cmds.h:22
10828 msgid "Record changes to the repository"
10831 #: common-cmds.h:23
10832 msgid "Show changes between commits, commit and working tree, etc"
10835 #: common-cmds.h:24
10836 msgid "Download objects and refs from another repository"
10839 #: common-cmds.h:25
10840 msgid "Print lines matching a pattern"
10843 #: common-cmds.h:26
10844 msgid "Create an empty Git repository or reinitialize an existing one"
10847 #: common-cmds.h:27
10848 msgid "Show commit logs"
10851 #: common-cmds.h:28
10852 msgid "Join two or more development histories together"
10855 #: common-cmds.h:29
10856 msgid "Move or rename a file, a directory, or a symlink"
10859 #: common-cmds.h:30
10860 msgid "Fetch from and integrate with another repository or a local branch"
10863 #: common-cmds.h:31
10864 msgid "Update remote refs along with associated objects"
10867 #: common-cmds.h:32
10868 msgid "Reapply commits on top of another base tip"
10871 #: common-cmds.h:33
10872 msgid "Reset current HEAD to the specified state"
10875 #: common-cmds.h:34
10876 msgid "Remove files from the working tree and from the index"
10879 #: common-cmds.h:35
10880 msgid "Show various types of objects"
10883 #: common-cmds.h:36
10884 msgid "Show the working tree status"
10887 #: common-cmds.h:37
10888 msgid "Create, list, delete or verify a tag object signed with GPG"
10891 #: parse-options.h:145
10892 msgid "expiry-date"
10895 #: parse-options.h:160
10896 msgid "no-op (backward compatibility)"
10899 #: parse-options.h:237
10900 msgid "be more verbose"
10903 #: parse-options.h:239
10904 msgid "be more quiet"
10907 #: parse-options.h:245
10908 msgid "use <n> digits to display SHA-1s"
10912 msgid "update the index with reused conflict resolution if possible"
10915 #: git-bisect.sh:55
10916 msgid "You need to start by \"git bisect start\""
10919 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10920 #. translation. The program will only accept English input
10922 #: git-bisect.sh:61
10923 msgid "Do you want me to do it for you [Y/n]? "
10926 #: git-bisect.sh:122
10928 msgid "unrecognised option: '$arg'"
10931 #: git-bisect.sh:126
10933 msgid "'$arg' does not appear to be a valid revision"
10936 #: git-bisect.sh:155
10937 msgid "Bad HEAD - I need a HEAD"
10940 #: git-bisect.sh:168
10943 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
10946 #: git-bisect.sh:178
10947 msgid "won't bisect on cg-seek'ed tree"
10950 #: git-bisect.sh:182
10951 msgid "Bad HEAD - strange symbolic ref"
10954 #: git-bisect.sh:234
10956 msgid "Bad bisect_write argument: $state"
10959 #: git-bisect.sh:263
10961 msgid "Bad rev input: $arg"
10964 #: git-bisect.sh:278
10965 msgid "Please call 'bisect_state' with at least one argument."
10968 #: git-bisect.sh:290
10970 msgid "Bad rev input: $rev"
10973 #: git-bisect.sh:299
10975 msgid "'git bisect $TERM_BAD' can take only one argument."
10978 #: git-bisect.sh:322
10980 msgid "Warning: bisecting only with a $TERM_BAD commit."
10983 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10984 #. translation. The program will only accept English input
10986 #: git-bisect.sh:328
10987 msgid "Are you sure [Y/n]? "
10990 #: git-bisect.sh:340
10993 "You need to give me at least one $bad_syn and one $good_syn revision.\n"
10994 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
10997 #: git-bisect.sh:343
11000 "You need to start by \"git bisect start\".\n"
11001 "You then need to give me at least one $good_syn and one $bad_syn revision.\n"
11002 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11005 #: git-bisect.sh:414 git-bisect.sh:546
11006 msgid "We are not bisecting."
11009 #: git-bisect.sh:421
11011 msgid "'$invalid' is not a valid commit"
11014 #: git-bisect.sh:430
11017 "Could not check out original HEAD '$branch'.\n"
11018 "Try 'git bisect reset <commit>'."
11021 #: git-bisect.sh:458
11022 msgid "No logfile given"
11025 #: git-bisect.sh:459
11027 msgid "cannot read $file for replaying"
11030 #: git-bisect.sh:480
11031 msgid "?? what are you talking about?"
11034 #: git-bisect.sh:492
11036 msgid "running $command"
11039 #: git-bisect.sh:499
11042 "bisect run failed:\n"
11043 "exit code $res from '$command' is < 0 or >= 128"
11046 #: git-bisect.sh:525
11047 msgid "bisect run cannot continue any more"
11050 #: git-bisect.sh:531
11053 "bisect run failed:\n"
11054 "'bisect_state $state' exited with error code $res"
11057 #: git-bisect.sh:538
11058 msgid "bisect run success"
11061 #: git-bisect.sh:565
11062 msgid "please use two different terms"
11065 #: git-bisect.sh:575
11067 msgid "'$term' is not a valid term"
11070 #: git-bisect.sh:578
11072 msgid "can't use the builtin command '$term' as a term"
11075 #: git-bisect.sh:587 git-bisect.sh:593
11077 msgid "can't change the meaning of term '$term'"
11080 #: git-bisect.sh:606
11082 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
11085 #: git-bisect.sh:636
11086 msgid "no terms defined"
11089 #: git-bisect.sh:653
11092 "invalid argument $arg for 'git bisect terms'.\n"
11093 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
11096 #: git-rebase.sh:57
11098 "When you have resolved this problem, run \"git rebase --continue\".\n"
11099 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
11100 "To check out the original branch and stop rebasing, run \"git rebase --abort"
11104 #: git-rebase.sh:165
11105 msgid "Applied autostash."
11108 #: git-rebase.sh:168
11110 msgid "Cannot store $stash_sha1"
11113 #: git-rebase.sh:169
11115 "Applying autostash resulted in conflicts.\n"
11116 "Your changes are safe in the stash.\n"
11117 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
11120 #: git-rebase.sh:208
11121 msgid "The pre-rebase hook refused to rebase."
11124 #: git-rebase.sh:213
11125 msgid "It looks like git-am is in progress. Cannot rebase."
11128 #: git-rebase.sh:354
11129 msgid "The --exec option must be used with the --interactive option"
11132 #: git-rebase.sh:359
11133 msgid "No rebase in progress?"
11136 #: git-rebase.sh:370
11137 msgid "The --edit-todo action can only be used during interactive rebase."
11140 #: git-rebase.sh:377
11141 msgid "Cannot read HEAD"
11144 #: git-rebase.sh:380
11146 "You must edit all merge conflicts and then\n"
11147 "mark them as resolved using git add"
11150 #: git-rebase.sh:398
11152 msgid "Could not move back to $head_name"
11155 #: git-rebase.sh:417
11158 "It seems that there is already a $state_dir_base directory, and\n"
11159 "I wonder if you are in the middle of another rebase. If that is the\n"
11160 "case, please try\n"
11161 "\t$cmd_live_rebase\n"
11162 "If that is not the case, please\n"
11163 "\t$cmd_clear_stale_rebase\n"
11164 "and run me again. I am stopping in case you still have something\n"
11168 #: git-rebase.sh:468
11170 msgid "invalid upstream $upstream_name"
11173 #: git-rebase.sh:492
11175 msgid "$onto_name: there are more than one merge bases"
11178 #: git-rebase.sh:495 git-rebase.sh:499
11180 msgid "$onto_name: there is no merge base"
11183 #: git-rebase.sh:504
11185 msgid "Does not point to a valid commit: $onto_name"
11188 #: git-rebase.sh:527
11190 msgid "fatal: no such branch: $branch_name"
11193 #: git-rebase.sh:560
11194 msgid "Cannot autostash"
11197 #: git-rebase.sh:565
11199 msgid "Created autostash: $stash_abbrev"
11202 #: git-rebase.sh:569
11203 msgid "Please commit or stash them."
11206 #: git-rebase.sh:589
11208 msgid "Current branch $branch_name is up to date."
11211 #: git-rebase.sh:593
11213 msgid "Current branch $branch_name is up to date, rebase forced."
11216 #: git-rebase.sh:604
11218 msgid "Changes from $mb to $onto:"
11221 #: git-rebase.sh:613
11222 msgid "First, rewinding head to replay your work on top of it..."
11225 #: git-rebase.sh:623
11227 msgid "Fast-forwarded $branch_name to $onto_name."
11231 msgid "git stash clear with parameters is unimplemented"
11235 msgid "You do not have the initial commit yet"
11239 msgid "Cannot save the current index state"
11242 #: git-stash.sh:124 git-stash.sh:137
11243 msgid "Cannot save the current worktree state"
11246 #: git-stash.sh:141
11247 msgid "No changes selected"
11250 #: git-stash.sh:144
11251 msgid "Cannot remove temporary index (can't happen)"
11254 #: git-stash.sh:157
11255 msgid "Cannot record working tree state"
11258 #: git-stash.sh:189
11260 msgid "Cannot update $ref_stash with $w_commit"
11263 #. TRANSLATORS: $option is an invalid option, like
11264 #. `--blah-blah'. The 7 spaces at the beginning of the
11265 #. second line correspond to "error: ". So you should line
11266 #. up the second line with however many characters the
11267 #. translation of "error: " takes in your language. E.g. in
11268 #. English this is:
11270 #. $ git stash save --blah-blah 2>&1 | head -n 2
11271 #. error: unknown option for 'stash save': --blah-blah
11272 #. To provide a message, use git stash save -- '--blah-blah'
11273 #: git-stash.sh:239
11276 "error: unknown option for 'stash save': $option\n"
11277 " To provide a message, use git stash save -- '$option'"
11280 #: git-stash.sh:260
11281 msgid "No local changes to save"
11284 #: git-stash.sh:264
11285 msgid "Cannot initialize stash"
11288 #: git-stash.sh:268
11289 msgid "Cannot save the current status"
11292 #: git-stash.sh:286
11293 msgid "Cannot remove worktree changes"
11296 #: git-stash.sh:405
11298 msgid "unknown option: $opt"
11301 #: git-stash.sh:415
11302 msgid "No stash found."
11305 #: git-stash.sh:422
11307 msgid "Too many revisions specified: $REV"
11310 #: git-stash.sh:428
11312 msgid "$reference is not a valid reference"
11315 #: git-stash.sh:456
11317 msgid "'$args' is not a stash-like commit"
11320 #: git-stash.sh:467
11322 msgid "'$args' is not a stash reference"
11325 #: git-stash.sh:475
11326 msgid "unable to refresh index"
11329 #: git-stash.sh:479
11330 msgid "Cannot apply a stash in the middle of a merge"
11333 #: git-stash.sh:487
11334 msgid "Conflicts in index. Try without --index."
11337 #: git-stash.sh:489
11338 msgid "Could not save index tree"
11341 #: git-stash.sh:523
11342 msgid "Cannot unstage modified files"
11345 #: git-stash.sh:538
11346 msgid "Index was not unstashed."
11349 #: git-stash.sh:561
11351 msgid "Dropped ${REV} ($s)"
11354 #: git-stash.sh:562
11356 msgid "${REV}: Could not drop stash entry"
11359 #: git-stash.sh:570
11360 msgid "No branch name specified"
11363 #: git-stash.sh:642
11364 msgid "(To restore them type \"git stash apply\")"
11367 #: git-submodule.sh:104
11369 msgid "cannot strip one component off url '$remoteurl'"
11372 #: git-submodule.sh:281
11373 msgid "Relative path can only be used from the toplevel of the working tree"
11376 #: git-submodule.sh:291
11378 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
11381 #: git-submodule.sh:308
11383 msgid "'$sm_path' already exists in the index"
11386 #: git-submodule.sh:312
11389 "The following path is ignored by one of your .gitignore files:\n"
11391 "Use -f if you really want to add it."
11394 #: git-submodule.sh:330
11396 msgid "Adding existing repo at '$sm_path' to the index"
11399 #: git-submodule.sh:332
11401 msgid "'$sm_path' already exists and is not a valid git repo"
11404 #: git-submodule.sh:340
11406 msgid "A git directory for '$sm_name' is found locally with remote(s):"
11409 #: git-submodule.sh:342
11412 "If you want to reuse this local git directory instead of cloning again from"
11415 #: git-submodule.sh:344
11418 "use the '--force' option. If the local git directory is not the correct repo"
11421 #: git-submodule.sh:345
11424 "or you are unsure what this means choose another name with the '--name' "
11428 #: git-submodule.sh:347
11430 msgid "Reactivating local git directory for submodule '$sm_name'."
11433 #: git-submodule.sh:359
11435 msgid "Unable to checkout submodule '$sm_path'"
11438 #: git-submodule.sh:364
11440 msgid "Failed to add submodule '$sm_path'"
11443 #: git-submodule.sh:373
11445 msgid "Failed to register submodule '$sm_path'"
11448 #: git-submodule.sh:417
11450 msgid "Entering '$prefix$displaypath'"
11453 #: git-submodule.sh:437
11455 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11458 #: git-submodule.sh:483
11460 msgid "No url found for submodule path '$displaypath' in .gitmodules"
11463 #: git-submodule.sh:492
11465 msgid "Failed to register url for submodule path '$displaypath'"
11468 #: git-submodule.sh:494
11470 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11473 #: git-submodule.sh:511
11475 msgid "Failed to register update mode for submodule path '$displaypath'"
11478 #: git-submodule.sh:549
11480 msgid "Use '.' if you really want to deinitialize all submodules"
11483 #: git-submodule.sh:566
11485 msgid "Submodule work tree '$displaypath' contains a .git directory"
11488 #: git-submodule.sh:567
11491 "(use 'rm -rf' if you really want to remove it including all of its history)"
11494 #: git-submodule.sh:573
11497 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
11501 #: git-submodule.sh:576
11503 msgid "Cleared directory '$displaypath'"
11506 #: git-submodule.sh:577
11508 msgid "Could not remove submodule work tree '$displaypath'"
11511 #: git-submodule.sh:580
11513 msgid "Could not create empty submodule directory '$displaypath'"
11516 #: git-submodule.sh:589
11518 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11521 #: git-submodule.sh:723
11524 "Submodule path '$displaypath' not initialized\n"
11525 "Maybe you want to use 'update --init'?"
11528 #: git-submodule.sh:736
11530 msgid "Unable to find current revision in submodule path '$displaypath'"
11533 #: git-submodule.sh:745
11535 msgid "Unable to fetch in submodule path '$sm_path'"
11538 #: git-submodule.sh:768
11540 msgid "Unable to fetch in submodule path '$displaypath'"
11543 #: git-submodule.sh:788
11545 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11548 #: git-submodule.sh:789
11550 msgid "Submodule path '$displaypath': checked out '$sha1'"
11553 #: git-submodule.sh:793
11555 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
11558 #: git-submodule.sh:794
11560 msgid "Submodule path '$displaypath': rebased into '$sha1'"
11563 #: git-submodule.sh:799
11565 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
11568 #: git-submodule.sh:800
11570 msgid "Submodule path '$displaypath': merged in '$sha1'"
11573 #: git-submodule.sh:805
11576 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
11579 #: git-submodule.sh:806
11581 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
11584 #: git-submodule.sh:836
11586 msgid "Failed to recurse into submodule path '$displaypath'"
11589 #: git-submodule.sh:944
11590 msgid "The --cached option cannot be used with the --files option"
11593 #: git-submodule.sh:996
11595 msgid "unexpected mode $mod_dst"
11598 #: git-submodule.sh:1016
11600 msgid " Warn: $display_name doesn't contain commit $sha1_src"
11603 #: git-submodule.sh:1019
11605 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
11608 #: git-submodule.sh:1022
11610 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11613 #: git-submodule.sh:1047
11617 #: git-submodule.sh:1165
11619 msgid "Failed to recurse into submodule path '$sm_path'"
11622 #: git-submodule.sh:1229
11624 msgid "Synchronizing submodule url for '$displaypath'"