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: 2012-11-30 12:40+0800\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
17 "Content-Type: text/plain; charset=CHARSET\n"
18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
27 #. * Message used both when 'git commit' fails and when
28 #. * other commands doing a merge do.
32 "Fix them up in the work tree,\n"
33 "and then use 'git add/rm <file>' as\n"
34 "appropriate to mark resolution and make a commit,\n"
35 "or use 'git commit -a'."
39 msgid "git archive [options] <tree-ish> [<path>...]"
43 msgid "git archive --list"
48 "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
52 msgid "git archive --remote <repo> [--exec <cmd>] --list"
60 msgid "archive format"
63 #: archive.c:323 builtin/log.c:1084
68 msgid "prepend prefix to each pathname in the archive"
71 #: archive.c:325 builtin/archive.c:91 builtin/blame.c:2390
72 #: builtin/blame.c:2391 builtin/config.c:55 builtin/fast-export.c:642
73 #: builtin/fast-export.c:644 builtin/grep.c:715 builtin/hash-object.c:77
74 #: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540
75 #: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149
79 #: archive.c:326 builtin/archive.c:92
80 msgid "write the archive to this file"
84 msgid "read .gitattributes in working directory"
88 msgid "report archived files on stderr"
96 msgid "compress faster"
100 msgid "compress better"
104 msgid "list supported archive formats"
107 #: archive.c:344 builtin/archive.c:93 builtin/clone.c:85
111 #: archive.c:345 builtin/archive.c:94
112 msgid "retrieve the archive from remote repository <repo>"
115 #: archive.c:346 builtin/archive.c:95 builtin/notes.c:619
119 #: archive.c:347 builtin/archive.c:96
120 msgid "path to the remote git-upload-archive command"
125 "Negative patterns are forbidden in git attributes\n"
126 "Use '\\!' for literal leading exclamation."
131 msgid "'%s' does not look like a v2 bundle file"
136 msgid "unrecognized header: %s%s (%d)"
139 #: bundle.c:89 builtin/commit.c:674
141 msgid "could not open '%s'"
145 msgid "Repository lacks these prerequisite commits:"
148 #: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290
149 #: builtin/log.c:732 builtin/log.c:1319 builtin/log.c:1535 builtin/merge.c:347
150 #: builtin/shortlog.c:181
151 msgid "revision walk setup failed"
156 msgid "The bundle contains %d ref"
157 msgid_plural "The bundle contains %d refs"
162 msgid "The bundle records a complete history."
167 msgid "The bundle requires this ref"
168 msgid_plural "The bundle requires these %d refs"
173 msgid "rev-list died"
176 #: bundle.c:300 builtin/log.c:1215 builtin/shortlog.c:284
178 msgid "unrecognized argument: %s"
183 msgid "ref '%s' is excluded by the rev-list options"
187 msgid "Refusing to create empty bundle."
191 msgid "Could not spawn pack-objects"
195 msgid "pack-objects died"
200 msgid "cannot create '%s'"
204 msgid "index-pack died"
209 msgid "could not parse %s"
214 msgid "%s %s is not a commit!"
217 #: compat/obstack.c:406 compat/obstack.c:408
218 msgid "memory exhausted"
222 msgid "Could not run 'git rev-list'"
227 msgid "failed write to rev-list: %s"
232 msgid "failed to close rev-list's stdin: %s"
236 msgid "in the future"
241 msgid "%lu second ago"
242 msgid_plural "%lu seconds ago"
248 msgid "%lu minute ago"
249 msgid_plural "%lu minutes ago"
256 msgid_plural "%lu hours ago"
263 msgid_plural "%lu days ago"
270 msgid_plural "%lu weeks ago"
276 msgid "%lu month ago"
277 msgid_plural "%lu months ago"
284 msgid_plural "%lu years"
290 msgid "%s, %lu month ago"
291 msgid_plural "%s, %lu months ago"
295 #: date.c:154 date.c:159
298 msgid_plural "%lu years ago"
304 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
309 msgid " Unknown dirstat parameter '%s'\n"
314 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
320 "Found errors in 'diff.dirstat' config variable:\n"
327 "Failed to parse --dirstat/-X option parameter:\n"
333 msgid "Failed to parse --submodule option parameter: '%s'"
336 #: gpg-interface.c:59
337 msgid "could not run gpg."
340 #: gpg-interface.c:71
341 msgid "gpg did not accept the data"
344 #: gpg-interface.c:82
345 msgid "gpg failed to sign the data"
350 msgid "'%s': unable to read %s"
360 msgid "'%s': short read %s"
365 msgid "available git commands in '%s'"
369 msgid "git commands available from elsewhere on your $PATH"
375 "'%s' appears to be a git command, but we were not\n"
376 "able to execute it. Maybe git-%s is broken?"
380 msgid "Uh oh. Your system reports no Git commands at all."
386 "WARNING: You called a Git command named '%s', which does not exist.\n"
387 "Continuing under the assumption that you meant '%s'"
392 msgid "in %0.1f seconds automatically..."
397 msgid "git: '%s' is not a git command. See 'git --help'."
406 "Did you mean one of these?"
411 msgid "failed to read the cache"
414 #: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534
415 #: builtin/clone.c:586
416 msgid "unable to write new index file"
419 #: merge-recursive.c:190
421 msgid "(bad commit)\n"
424 #: merge-recursive.c:206
426 msgid "addinfo_cache failed for path '%s'"
429 #: merge-recursive.c:268
430 msgid "error building trees"
433 #: merge-recursive.c:672
435 msgid "failed to create path '%s'%s"
438 #: merge-recursive.c:683
440 msgid "Removing %s to make room for subdirectory\n"
443 #. something else exists
444 #. .. but not some other error (who really cares what?)
445 #: merge-recursive.c:697 merge-recursive.c:718
446 msgid ": perhaps a D/F conflict?"
449 #: merge-recursive.c:708
451 msgid "refusing to lose untracked file at '%s'"
454 #: merge-recursive.c:748
456 msgid "cannot read object %s '%s'"
459 #: merge-recursive.c:750
461 msgid "blob expected for %s '%s'"
464 #: merge-recursive.c:773 builtin/clone.c:302
466 msgid "failed to open '%s'"
469 #: merge-recursive.c:781
471 msgid "failed to symlink '%s'"
474 #: merge-recursive.c:784
476 msgid "do not know what to do with %06o %s '%s'"
479 #: merge-recursive.c:922
480 msgid "Failed to execute internal merge"
483 #: merge-recursive.c:926
485 msgid "Unable to add %s to database"
488 #: merge-recursive.c:942
489 msgid "unsupported object type in the tree"
492 #: merge-recursive.c:1021 merge-recursive.c:1035
495 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
499 #: merge-recursive.c:1027 merge-recursive.c:1040
502 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
506 #: merge-recursive.c:1081
510 #: merge-recursive.c:1081
514 #: merge-recursive.c:1137
516 msgid "%s is a directory in %s adding as %s instead"
519 #: merge-recursive.c:1159
522 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
523 "\"->\"%s\" in \"%s\"%s"
526 #: merge-recursive.c:1164
527 msgid " (left unresolved)"
530 #: merge-recursive.c:1218
532 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
535 #: merge-recursive.c:1248
537 msgid "Renaming %s to %s and %s to %s instead"
540 #: merge-recursive.c:1447
542 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
545 #: merge-recursive.c:1457
547 msgid "Adding merged %s"
550 #: merge-recursive.c:1462 merge-recursive.c:1660
552 msgid "Adding as %s instead"
555 #: merge-recursive.c:1513
557 msgid "cannot read object %s"
560 #: merge-recursive.c:1516
562 msgid "object %s is not a blob"
565 #: merge-recursive.c:1564
569 #: merge-recursive.c:1564
573 #: merge-recursive.c:1574
577 #: merge-recursive.c:1581
581 #: merge-recursive.c:1615
583 msgid "Skipped %s (merged same as existing)"
586 #: merge-recursive.c:1629
588 msgid "Auto-merging %s"
591 #: merge-recursive.c:1633 git-submodule.sh:893
595 #: merge-recursive.c:1634
597 msgid "CONFLICT (%s): Merge conflict in %s"
600 #: merge-recursive.c:1724
605 #: merge-recursive.c:1749
606 msgid "file/directory"
609 #: merge-recursive.c:1755
610 msgid "directory/file"
613 #: merge-recursive.c:1760
615 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
618 #: merge-recursive.c:1770
623 #: merge-recursive.c:1787
624 msgid "Fatal merge failure, shouldn't happen."
627 #: merge-recursive.c:1806
628 msgid "Already up-to-date!"
631 #: merge-recursive.c:1815
633 msgid "merging of trees %s and %s failed"
636 #: merge-recursive.c:1845
638 msgid "Unprocessed path??? %s"
641 #: merge-recursive.c:1890
645 #: merge-recursive.c:1903
647 msgid "found %u common ancestor:"
648 msgid_plural "found %u common ancestors:"
652 #: merge-recursive.c:1940
653 msgid "merge returned no commit"
656 #: merge-recursive.c:1997
658 msgid "Could not parse object '%s'"
661 #: merge-recursive.c:2009 builtin/merge.c:643
662 msgid "Unable to write index."
665 #: parse-options.c:494
669 #: parse-options.c:512
674 #. TRANSLATORS: the colon here should align with the
675 #. one in "usage: %s" translation
676 #: parse-options.c:516
681 #: parse-options.c:519
688 msgid "Your branch is ahead of '%s' by %d commit.\n"
689 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
694 msgid " (use \"git push\" to publish your local commits)\n"
699 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
701 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
706 msgid " (use \"git pull\" to update your local branch)\n"
712 "Your branch and '%s' have diverged,\n"
713 "and have %d and %d different commit each, respectively.\n"
715 "Your branch and '%s' have diverged,\n"
716 "and have %d and %d different commits each, respectively.\n"
721 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
724 #: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984
725 #: builtin/merge.c:994
727 msgid "Could not open '%s' for writing"
730 #: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986
731 #: builtin/merge.c:999
733 msgid "Could not write to '%s'"
738 "after resolving the conflicts, mark the corrected paths\n"
739 "with 'git add <paths>' or 'git rm <paths>'"
744 "after resolving the conflicts, mark the corrected paths\n"
745 "with 'git add <paths>' or 'git rm <paths>'\n"
746 "and commit the result with 'git commit'"
749 #: sequencer.c:162 sequencer.c:770 sequencer.c:853
751 msgid "Could not write to %s"
756 msgid "Error wrapping up %s"
760 msgid "Your local changes would be overwritten by cherry-pick."
764 msgid "Your local changes would be overwritten by revert."
768 msgid "Commit your changes or stash them to proceed."
771 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
774 msgid "%s: Unable to write new index file"
778 msgid "Could not resolve HEAD commit\n"
782 msgid "Unable to update cache tree\n"
787 msgid "Could not parse commit %s\n"
792 msgid "Could not parse parent commit %s\n"
796 msgid "Your index file is unmerged."
800 msgid "You do not have a valid HEAD"
805 msgid "Commit %s is a merge but no -m option was given."
810 msgid "Commit %s does not have parent %d"
815 msgid "Mainline was specified but commit %s is not a merge."
818 #. TRANSLATORS: The first %s will be "revert" or
819 #. "cherry-pick", the second %s a SHA1
822 msgid "%s: cannot parse parent commit %s"
827 msgid "Cannot get commit message for %s"
832 msgid "could not revert %s... %s"
837 msgid "could not apply %s... %s"
841 msgid "empty commit set passed"
846 msgid "git %s: failed to read the index"
851 msgid "git %s: failed to refresh the index"
856 msgid "Cannot %s during a %s"
861 msgid "Could not parse line %d."
865 msgid "No commits parsed."
870 msgid "Could not open %s"
875 msgid "Could not read %s."
880 msgid "Unusable instruction sheet: %s"
885 msgid "Invalid key: %s"
890 msgid "Invalid value for %s: %s"
895 msgid "Malformed options sheet: %s"
899 msgid "a cherry-pick or revert is already in progress"
903 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
908 msgid "Could not create sequencer directory %s"
911 #: sequencer.c:772 sequencer.c:857
913 msgid "Error wrapping up %s."
916 #: sequencer.c:791 sequencer.c:925
917 msgid "no cherry-pick or revert in progress"
921 msgid "cannot resolve HEAD"
925 msgid "cannot abort from a branch yet to be born"
928 #: sequencer.c:817 builtin/apply.c:4005
930 msgid "cannot open %s: %s"
935 msgid "cannot read %s: %s"
939 msgid "unexpected end of file"
944 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
949 msgid "Could not format %s."
953 msgid "Can't revert as initial commit"
957 msgid "Can't cherry-pick into empty head"
961 msgid "HEAD does not point to a branch"
966 msgid "No such branch: '%s'"
971 msgid "No upstream configured for branch '%s'"
976 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
981 msgid "unable to access '%s': %s"
986 msgid "unable to look up current user in the passwd file: %s"
994 msgid "Unmerged paths:"
997 #: wt-status.c:167 wt-status.c:194
999 msgid " (use \"git reset %s <file>...\" to unstage)"
1002 #: wt-status.c:169 wt-status.c:196
1003 msgid " (use \"git rm --cached <file>...\" to unstage)"
1007 msgid " (use \"git add <file>...\" to mark resolution)"
1010 #: wt-status.c:175 wt-status.c:179
1011 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1015 msgid " (use \"git rm <file>...\" to mark resolution)"
1019 msgid "Changes to be committed:"
1023 msgid "Changes not staged for commit:"
1027 msgid " (use \"git add <file>...\" to update what will be committed)"
1031 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1036 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1040 msgid " (commit or discard the untracked or modified content in submodules)"
1045 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1053 msgid "both deleted:"
1057 msgid "added by us:"
1061 msgid "deleted by them:"
1065 msgid "added by them:"
1069 msgid "deleted by us:"
1077 msgid "both modified:"
1081 msgid "new commits, "
1085 msgid "modified content, "
1089 msgid "untracked content, "
1094 msgid "new file: %s"
1099 msgid "copied: %s -> %s"
1109 msgid "modified: %s"
1114 msgid "renamed: %s -> %s"
1119 msgid "typechange: %s"
1129 msgid "unmerged: %s"
1134 msgid "bug: unhandled diff status %c"
1138 msgid "You have unmerged paths."
1141 #: wt-status.c:788 wt-status.c:912
1142 msgid " (fix conflicts and run \"git commit\")"
1146 msgid "All conflicts fixed but you are still merging."
1150 msgid " (use \"git commit\" to conclude merge)"
1154 msgid "You are in the middle of an am session."
1158 msgid "The current patch is empty."
1162 msgid " (fix conflicts and then run \"git am --resolved\")"
1166 msgid " (use \"git am --skip\" to skip this patch)"
1170 msgid " (use \"git am --abort\" to restore the original branch)"
1173 #: wt-status.c:873 wt-status.c:883
1174 msgid "You are currently rebasing."
1178 msgid " (fix conflicts and then run \"git rebase --continue\")"
1182 msgid " (use \"git rebase --skip\" to skip this patch)"
1186 msgid " (use \"git rebase --abort\" to check out the original branch)"
1190 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1194 msgid "You are currently splitting a commit during a rebase."
1198 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1202 msgid "You are currently editing a commit during a rebase."
1206 msgid " (use \"git commit --amend\" to amend the current commit)"
1211 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1215 msgid "You are currently cherry-picking."
1219 msgid " (all conflicts fixed: run \"git commit\")"
1223 msgid "You are currently bisecting."
1227 msgid " (use \"git bisect reset\" to get back to the original branch)"
1235 msgid "Not currently on any branch."
1239 msgid "Initial commit"
1243 msgid "Untracked files"
1247 msgid "Ignored files"
1252 msgid "Untracked files not listed%s"
1256 msgid " (use -u option to show untracked files)"
1265 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1270 msgid "no changes added to commit\n"
1276 "nothing added to commit but untracked files present (use \"git add\" to "
1282 msgid "nothing added to commit but untracked files present\n"
1287 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1290 #: wt-status.c:1043 wt-status.c:1048
1292 msgid "nothing to commit\n"
1297 msgid "nothing to commit (use -u to show untracked files)\n"
1302 msgid "nothing to commit, working directory clean\n"
1306 msgid "HEAD (no branch)"
1310 msgid "Initial commit on "
1317 #: wt-status.c:1182 wt-status.c:1185
1325 #: compat/precompose_utf8.c:58 builtin/clone.c:341
1327 msgid "failed to unlink '%s'"
1331 msgid "git add [options] [--] <filepattern>..."
1336 msgid "unexpected diff status %c"
1339 #: builtin/add.c:67 builtin/commit.c:231
1340 msgid "updating files failed"
1345 msgid "remove '%s'\n"
1348 #: builtin/add.c:176
1350 msgid "Path '%s' is in submodule '%.*s'"
1353 #: builtin/add.c:192
1354 msgid "Unstaged changes after refreshing the index:"
1357 #: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275
1359 msgid "pathspec '%s' did not match any files"
1362 #: builtin/add.c:209
1364 msgid "'%s' is beyond a symbolic link"
1367 #: builtin/add.c:276
1368 msgid "Could not read the index"
1371 #: builtin/add.c:286
1373 msgid "Could not open '%s' for writing."
1376 #: builtin/add.c:290
1377 msgid "Could not write patch"
1380 #: builtin/add.c:295
1382 msgid "Could not stat '%s'"
1385 #: builtin/add.c:297
1386 msgid "Empty patch. Aborted."
1389 #: builtin/add.c:303
1391 msgid "Could not apply '%s'"
1394 #: builtin/add.c:313
1395 msgid "The following paths are ignored by one of your .gitignore files:\n"
1398 #: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63
1399 #: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253
1404 #: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1160
1405 #: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1483
1406 #: builtin/mv.c:62 builtin/read-tree.c:112
1410 #: builtin/add.c:322
1411 msgid "interactive picking"
1414 #: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:248
1415 msgid "select hunks interactively"
1418 #: builtin/add.c:324
1419 msgid "edit current diff and apply"
1422 #: builtin/add.c:325
1423 msgid "allow adding otherwise ignored files"
1426 #: builtin/add.c:326
1427 msgid "update tracked files"
1430 #: builtin/add.c:327
1431 msgid "record only the fact that the path will be added later"
1434 #: builtin/add.c:328
1435 msgid "add changes from all tracked and untracked files"
1438 #: builtin/add.c:329
1439 msgid "don't add, only refresh the index"
1442 #: builtin/add.c:330
1443 msgid "just skip files which cannot be added because of errors"
1446 #: builtin/add.c:331
1447 msgid "check if - even missing - files are ignored in dry run"
1450 #: builtin/add.c:353
1452 msgid "Use -f if you really want to add them.\n"
1455 #: builtin/add.c:354
1456 msgid "no files added"
1459 #: builtin/add.c:360
1460 msgid "adding files failed"
1463 #: builtin/add.c:392
1464 msgid "-A and -u are mutually incompatible"
1467 #: builtin/add.c:394
1468 msgid "Option --ignore-missing can only be used together with --dry-run"
1471 #: builtin/add.c:414
1473 msgid "Nothing specified, nothing added.\n"
1476 #: builtin/add.c:415
1478 msgid "Maybe you wanted to say 'git add .'?\n"
1481 #: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:291 builtin/mv.c:82
1483 msgid "index file corrupt"
1486 #: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:370
1487 msgid "Unable to write new index file"
1490 #: builtin/apply.c:57
1491 msgid "git apply [options] [<patch>...]"
1494 #: builtin/apply.c:110
1496 msgid "unrecognized whitespace option '%s'"
1499 #: builtin/apply.c:125
1501 msgid "unrecognized whitespace ignore option '%s'"
1504 #: builtin/apply.c:823
1506 msgid "Cannot prepare timestamp regexp %s"
1509 #: builtin/apply.c:832
1511 msgid "regexec returned %d for input: %s"
1514 #: builtin/apply.c:913
1516 msgid "unable to find filename in patch at line %d"
1519 #: builtin/apply.c:945
1521 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1524 #: builtin/apply.c:949
1526 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1529 #: builtin/apply.c:950
1531 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1534 #: builtin/apply.c:957
1536 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1539 #: builtin/apply.c:1420
1541 msgid "recount: unexpected line: %.*s"
1544 #: builtin/apply.c:1477
1546 msgid "patch fragment without header at line %d: %.*s"
1549 #: builtin/apply.c:1494
1552 "git diff header lacks filename information when removing %d leading pathname "
1553 "component (line %d)"
1555 "git diff header lacks filename information when removing %d leading pathname "
1556 "components (line %d)"
1560 #: builtin/apply.c:1654
1561 msgid "new file depends on old contents"
1564 #: builtin/apply.c:1656
1565 msgid "deleted file still has contents"
1568 #: builtin/apply.c:1682
1570 msgid "corrupt patch at line %d"
1573 #: builtin/apply.c:1718
1575 msgid "new file %s depends on old contents"
1578 #: builtin/apply.c:1720
1580 msgid "deleted file %s still has contents"
1583 #: builtin/apply.c:1723
1585 msgid "** warning: file %s becomes empty but is not deleted"
1588 #: builtin/apply.c:1869
1590 msgid "corrupt binary patch at line %d: %.*s"
1593 #. there has to be one hunk (forward hunk)
1594 #: builtin/apply.c:1898
1596 msgid "unrecognized binary patch at line %d"
1599 #: builtin/apply.c:1984
1601 msgid "patch with only garbage at line %d"
1604 #: builtin/apply.c:2074
1606 msgid "unable to read symlink %s"
1609 #: builtin/apply.c:2078
1611 msgid "unable to open or read %s"
1614 #: builtin/apply.c:2149
1618 #: builtin/apply.c:2671
1620 msgid "invalid start of line: '%c'"
1623 #: builtin/apply.c:2789
1625 msgid "Hunk #%d succeeded at %d (offset %d line)."
1626 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1630 #: builtin/apply.c:2801
1632 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1635 #: builtin/apply.c:2807
1638 "while searching for:\n"
1642 #: builtin/apply.c:2826
1644 msgid "missing binary patch data for '%s'"
1647 #: builtin/apply.c:2929
1649 msgid "binary patch does not apply to '%s'"
1652 #: builtin/apply.c:2935
1654 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1657 #: builtin/apply.c:2956
1659 msgid "patch failed: %s:%ld"
1662 #: builtin/apply.c:3078
1664 msgid "cannot checkout %s"
1667 #: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176
1669 msgid "read of %s failed"
1672 #: builtin/apply.c:3156 builtin/apply.c:3378
1674 msgid "path %s has been renamed/deleted"
1677 #: builtin/apply.c:3237 builtin/apply.c:3392
1679 msgid "%s: does not exist in index"
1682 #: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406
1687 #: builtin/apply.c:3246 builtin/apply.c:3400
1689 msgid "%s: does not match index"
1692 #: builtin/apply.c:3348
1693 msgid "removal patch leaves file contents"
1696 #: builtin/apply.c:3417
1698 msgid "%s: wrong type"
1701 #: builtin/apply.c:3419
1703 msgid "%s has type %o, expected %o"
1706 #: builtin/apply.c:3520
1708 msgid "%s: already exists in index"
1711 #: builtin/apply.c:3523
1713 msgid "%s: already exists in working directory"
1716 #: builtin/apply.c:3543
1718 msgid "new mode (%o) of %s does not match old mode (%o)"
1721 #: builtin/apply.c:3548
1723 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1726 #: builtin/apply.c:3556
1728 msgid "%s: patch does not apply"
1731 #: builtin/apply.c:3569
1733 msgid "Checking patch %s..."
1736 #: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158
1738 msgid "make_cache_entry failed for path '%s'"
1741 #: builtin/apply.c:3767
1743 msgid "unable to remove %s from index"
1746 #: builtin/apply.c:3795
1748 msgid "corrupt patch for subproject %s"
1751 #: builtin/apply.c:3799
1753 msgid "unable to stat newly created file '%s'"
1756 #: builtin/apply.c:3804
1758 msgid "unable to create backing store for newly created file %s"
1761 #: builtin/apply.c:3807 builtin/apply.c:3915
1763 msgid "unable to add cache entry for %s"
1766 #: builtin/apply.c:3840
1768 msgid "closing file '%s'"
1771 #: builtin/apply.c:3889
1773 msgid "unable to write file '%s' mode %o"
1776 #: builtin/apply.c:3976
1778 msgid "Applied patch %s cleanly."
1781 #: builtin/apply.c:3984
1782 msgid "internal error"
1785 #. Say this even without --verbose
1786 #: builtin/apply.c:3987
1788 msgid "Applying patch %%s with %d reject..."
1789 msgid_plural "Applying patch %%s with %d rejects..."
1793 #: builtin/apply.c:3997
1795 msgid "truncating .rej filename to %.*s.rej"
1798 #: builtin/apply.c:4018
1800 msgid "Hunk #%d applied cleanly."
1803 #: builtin/apply.c:4021
1805 msgid "Rejected hunk #%d."
1808 #: builtin/apply.c:4171
1809 msgid "unrecognized input"
1812 #: builtin/apply.c:4182
1813 msgid "unable to read index file"
1816 #: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91
1817 #: builtin/fetch.c:63
1821 #: builtin/apply.c:4302
1822 msgid "don't apply changes matching the given path"
1825 #: builtin/apply.c:4305
1826 msgid "apply changes matching the given path"
1829 #: builtin/apply.c:4307
1833 #: builtin/apply.c:4308
1834 msgid "remove <num> leading slashes from traditional diff paths"
1837 #: builtin/apply.c:4311
1838 msgid "ignore additions made by the patch"
1841 #: builtin/apply.c:4313
1842 msgid "instead of applying the patch, output diffstat for the input"
1845 #: builtin/apply.c:4317
1846 msgid "show number of added and deleted lines in decimal notation"
1849 #: builtin/apply.c:4319
1850 msgid "instead of applying the patch, output a summary for the input"
1853 #: builtin/apply.c:4321
1854 msgid "instead of applying the patch, see if the patch is applicable"
1857 #: builtin/apply.c:4323
1858 msgid "make sure the patch is applicable to the current index"
1861 #: builtin/apply.c:4325
1862 msgid "apply a patch without touching the working tree"
1865 #: builtin/apply.c:4327
1866 msgid "also apply the patch (use with --stat/--summary/--check)"
1869 #: builtin/apply.c:4329
1870 msgid "attempt three-way merge if a patch does not apply"
1873 #: builtin/apply.c:4331
1874 msgid "build a temporary index based on embedded index information"
1877 #: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460
1878 msgid "paths are separated with NUL character"
1881 #: builtin/apply.c:4336
1882 msgid "ensure at least <n> lines of context match"
1885 #: builtin/apply.c:4337
1889 #: builtin/apply.c:4338
1890 msgid "detect new or modified lines that have whitespace errors"
1893 #: builtin/apply.c:4341 builtin/apply.c:4344
1894 msgid "ignore changes in whitespace when finding context"
1897 #: builtin/apply.c:4347
1898 msgid "apply the patch in reverse"
1901 #: builtin/apply.c:4349
1902 msgid "don't expect at least one line of context"
1905 #: builtin/apply.c:4351
1906 msgid "leave the rejected hunks in corresponding *.rej files"
1909 #: builtin/apply.c:4353
1910 msgid "allow overlapping hunks"
1913 #: builtin/apply.c:4356
1914 msgid "tolerate incorrectly detected missing new-line at the end of file"
1917 #: builtin/apply.c:4359
1918 msgid "do not trust the line counts in the hunk headers"
1921 #: builtin/apply.c:4361
1925 #: builtin/apply.c:4362
1926 msgid "prepend <root> to all filenames"
1929 #: builtin/apply.c:4384
1930 msgid "--3way outside a repository"
1933 #: builtin/apply.c:4392
1934 msgid "--index outside a repository"
1937 #: builtin/apply.c:4395
1938 msgid "--cached outside a repository"
1941 #: builtin/apply.c:4411
1943 msgid "can't open patch '%s'"
1946 #: builtin/apply.c:4425
1948 msgid "squelched %d whitespace error"
1949 msgid_plural "squelched %d whitespace errors"
1953 #: builtin/apply.c:4431 builtin/apply.c:4441
1955 msgid "%d line adds whitespace errors."
1956 msgid_plural "%d lines add whitespace errors."
1960 #: builtin/archive.c:17
1962 msgid "could not create archive file '%s'"
1965 #: builtin/archive.c:20
1966 msgid "could not redirect output"
1969 #: builtin/archive.c:37
1970 msgid "git archive: Remote with no URL"
1973 #: builtin/archive.c:58
1974 msgid "git archive: expected ACK/NAK, got EOF"
1977 #: builtin/archive.c:63
1979 msgid "git archive: NACK %s"
1982 #: builtin/archive.c:65
1984 msgid "remote error: %s"
1987 #: builtin/archive.c:66
1988 msgid "git archive: protocol error"
1991 #: builtin/archive.c:71
1992 msgid "git archive: expected a flush"
1995 #: builtin/bisect--helper.c:7
1996 msgid "git bisect--helper --next-all [--no-checkout]"
1999 #: builtin/bisect--helper.c:17
2000 msgid "perform 'git bisect next'"
2003 #: builtin/bisect--helper.c:19
2004 msgid "update BISECT_HEAD instead of checking out the current commit"
2007 #: builtin/blame.c:25
2008 msgid "git blame [options] [rev-opts] [rev] [--] file"
2011 #: builtin/blame.c:30 builtin/shortlog.c:15
2012 msgid "[rev-opts] are documented in git-rev-list(1)"
2015 #: builtin/blame.c:2374
2016 msgid "Show blame entries as we find them, incrementally"
2019 #: builtin/blame.c:2375
2020 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2023 #: builtin/blame.c:2376
2024 msgid "Do not treat root commits as boundaries (Default: off)"
2027 #: builtin/blame.c:2377
2028 msgid "Show work cost statistics"
2031 #: builtin/blame.c:2378
2032 msgid "Show output score for blame entries"
2035 #: builtin/blame.c:2379
2036 msgid "Show original filename (Default: auto)"
2039 #: builtin/blame.c:2380
2040 msgid "Show original linenumber (Default: off)"
2043 #: builtin/blame.c:2381
2044 msgid "Show in a format designed for machine consumption"
2047 #: builtin/blame.c:2382
2048 msgid "Show porcelain format with per-line commit information"
2051 #: builtin/blame.c:2383
2052 msgid "Use the same output mode as git-annotate (Default: off)"
2055 #: builtin/blame.c:2384
2056 msgid "Show raw timestamp (Default: off)"
2059 #: builtin/blame.c:2385
2060 msgid "Show long commit SHA1 (Default: off)"
2063 #: builtin/blame.c:2386
2064 msgid "Suppress author name and timestamp (Default: off)"
2067 #: builtin/blame.c:2387
2068 msgid "Show author email instead of name (Default: off)"
2071 #: builtin/blame.c:2388
2072 msgid "Ignore whitespace differences"
2075 #: builtin/blame.c:2389
2076 msgid "Spend extra cycles to find better match"
2079 #: builtin/blame.c:2390
2080 msgid "Use revisions from <file> instead of calling git-rev-list"
2083 #: builtin/blame.c:2391
2084 msgid "Use <file>'s contents as the final image"
2087 #: builtin/blame.c:2392 builtin/blame.c:2393
2091 #: builtin/blame.c:2392
2092 msgid "Find line copies within and across files"
2095 #: builtin/blame.c:2393
2096 msgid "Find line movements within and across files"
2099 #: builtin/blame.c:2394
2103 #: builtin/blame.c:2394
2104 msgid "Process only line range n,m, counting from 1"
2107 #: builtin/branch.c:23
2108 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2111 #: builtin/branch.c:24
2112 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2115 #: builtin/branch.c:25
2116 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2119 #: builtin/branch.c:26
2120 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2123 #: builtin/branch.c:145
2126 "deleting branch '%s' that has been merged to\n"
2127 " '%s', but not yet merged to HEAD."
2130 #: builtin/branch.c:149
2133 "not deleting branch '%s' that is not yet merged to\n"
2134 " '%s', even though it is merged to HEAD."
2137 #: builtin/branch.c:163
2139 msgid "Couldn't look up commit object for '%s'"
2142 #: builtin/branch.c:167
2145 "The branch '%s' is not fully merged.\n"
2146 "If you are sure you want to delete it, run 'git branch -D %s'."
2149 #: builtin/branch.c:180
2150 msgid "Update of config-file failed"
2153 #: builtin/branch.c:208
2154 msgid "cannot use -a with -d"
2157 #: builtin/branch.c:214
2158 msgid "Couldn't look up commit object for HEAD"
2161 #: builtin/branch.c:222
2163 msgid "Cannot delete the branch '%s' which you are currently on."
2166 #: builtin/branch.c:235
2168 msgid "remote branch '%s' not found."
2171 #: builtin/branch.c:236
2173 msgid "branch '%s' not found."
2176 #: builtin/branch.c:250
2178 msgid "Error deleting remote branch '%s'"
2181 #: builtin/branch.c:251
2183 msgid "Error deleting branch '%s'"
2186 #: builtin/branch.c:258
2188 msgid "Deleted remote branch %s (was %s).\n"
2191 #: builtin/branch.c:259
2193 msgid "Deleted branch %s (was %s).\n"
2196 #: builtin/branch.c:361
2198 msgid "branch '%s' does not point at a commit"
2201 #: builtin/branch.c:433
2203 msgid "[%s: behind %d]"
2206 #: builtin/branch.c:435
2211 #: builtin/branch.c:439
2213 msgid "[%s: ahead %d]"
2216 #: builtin/branch.c:441
2221 #: builtin/branch.c:444
2223 msgid "[%s: ahead %d, behind %d]"
2226 #: builtin/branch.c:447
2228 msgid "[ahead %d, behind %d]"
2231 #: builtin/branch.c:560
2235 #: builtin/branch.c:625
2236 msgid "some refs could not be read"
2239 #: builtin/branch.c:638
2240 msgid "cannot rename the current branch while not on any."
2243 #: builtin/branch.c:648
2245 msgid "Invalid branch name: '%s'"
2248 #: builtin/branch.c:663
2249 msgid "Branch rename failed"
2252 #: builtin/branch.c:667
2254 msgid "Renamed a misnamed branch '%s' away"
2257 #: builtin/branch.c:671
2259 msgid "Branch renamed to %s, but HEAD is not updated!"
2262 #: builtin/branch.c:678
2263 msgid "Branch is renamed, but update of config-file failed"
2266 #: builtin/branch.c:693
2268 msgid "malformed object name %s"
2271 #: builtin/branch.c:717
2273 msgid "could not write branch description template: %s"
2276 #: builtin/branch.c:747
2277 msgid "Generic options"
2280 #: builtin/branch.c:749
2281 msgid "show hash and subject, give twice for upstream branch"
2284 #: builtin/branch.c:750
2285 msgid "suppress informational messages"
2288 #: builtin/branch.c:751
2289 msgid "set up tracking mode (see git-pull(1))"
2292 #: builtin/branch.c:753
2293 msgid "change upstream info"
2296 #: builtin/branch.c:757
2297 msgid "use colored output"
2300 #: builtin/branch.c:758
2301 msgid "act on remote-tracking branches"
2304 #: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788
2305 #: builtin/branch.c:794 builtin/commit.c:1376 builtin/commit.c:1377
2306 #: builtin/commit.c:1378 builtin/commit.c:1379 builtin/tag.c:470
2310 #: builtin/branch.c:762 builtin/branch.c:768
2311 msgid "print only branches that contain the commit"
2314 #: builtin/branch.c:774
2315 msgid "Specific git-branch actions:"
2318 #: builtin/branch.c:775
2319 msgid "list both remote-tracking and local branches"
2322 #: builtin/branch.c:777
2323 msgid "delete fully merged branch"
2326 #: builtin/branch.c:778
2327 msgid "delete branch (even if not merged)"
2330 #: builtin/branch.c:779
2331 msgid "move/rename a branch and its reflog"
2334 #: builtin/branch.c:780
2335 msgid "move/rename a branch, even if target exists"
2338 #: builtin/branch.c:781
2339 msgid "list branch names"
2342 #: builtin/branch.c:782
2343 msgid "create the branch's reflog"
2346 #: builtin/branch.c:784
2347 msgid "edit the description for the branch"
2350 #: builtin/branch.c:785
2351 msgid "force creation (when already exists)"
2354 #: builtin/branch.c:788
2355 msgid "print only not merged branches"
2358 #: builtin/branch.c:794
2359 msgid "print only merged branches"
2362 #: builtin/branch.c:798
2363 msgid "list branches in columns"
2366 #: builtin/branch.c:811
2367 msgid "Failed to resolve HEAD as a valid ref."
2370 #: builtin/branch.c:816 builtin/clone.c:561
2371 msgid "HEAD not found below refs/heads!"
2374 #: builtin/branch.c:836
2375 msgid "--column and --verbose are incompatible"
2378 #: builtin/branch.c:887
2380 msgid "branch '%s' does not exist"
2383 #: builtin/branch.c:899
2385 msgid "Branch '%s' has no upstream information"
2388 #: builtin/branch.c:914
2389 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2392 #: builtin/branch.c:917
2395 "The --set-upstream flag is deprecated and will be removed. Consider using --"
2396 "track or --set-upstream-to\n"
2399 #: builtin/branch.c:934
2403 "If you wanted to make '%s' track '%s', do this:\n"
2407 #: builtin/branch.c:935
2409 msgid " git branch -d %s\n"
2412 #: builtin/branch.c:936
2414 msgid " git branch --set-upstream-to %s\n"
2417 #: builtin/bundle.c:47
2419 msgid "%s is okay\n"
2422 #: builtin/bundle.c:56
2423 msgid "Need a repository to create a bundle."
2426 #: builtin/bundle.c:60
2427 msgid "Need a repository to unbundle."
2430 #: builtin/cat-file.c:247
2431 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2434 #: builtin/cat-file.c:248
2435 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2438 #: builtin/cat-file.c:266
2439 msgid "<type> can be one of: blob, tree, commit, tag"
2442 #: builtin/cat-file.c:267
2443 msgid "show object type"
2446 #: builtin/cat-file.c:268
2447 msgid "show object size"
2450 #: builtin/cat-file.c:270
2451 msgid "exit with zero when there's no error"
2454 #: builtin/cat-file.c:271
2455 msgid "pretty-print object's content"
2458 #: builtin/cat-file.c:273
2459 msgid "for blob objects, run textconv on object's content"
2462 #: builtin/cat-file.c:275
2463 msgid "show info and content of objects fed from the standard input"
2466 #: builtin/cat-file.c:278
2467 msgid "show info about objects fed from the standard input"
2470 #: builtin/check-attr.c:11
2471 msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2474 #: builtin/check-attr.c:12
2475 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2478 #: builtin/check-attr.c:19
2479 msgid "report all attributes set on file"
2482 #: builtin/check-attr.c:20
2483 msgid "use .gitattributes only from the index"
2486 #: builtin/check-attr.c:21 builtin/hash-object.c:75
2487 msgid "read file names from stdin"
2490 #: builtin/check-attr.c:23
2491 msgid "input paths are terminated by a null character"
2494 #: builtin/checkout-index.c:126
2495 msgid "git checkout-index [options] [--] [<file>...]"
2498 #: builtin/checkout-index.c:187
2499 msgid "check out all files in the index"
2502 #: builtin/checkout-index.c:188
2503 msgid "force overwrite of existing files"
2506 #: builtin/checkout-index.c:190
2507 msgid "no warning for existing files and files not in index"
2510 #: builtin/checkout-index.c:192
2511 msgid "don't checkout new files"
2514 #: builtin/checkout-index.c:194
2515 msgid "update stat information in the index file"
2518 #: builtin/checkout-index.c:200
2519 msgid "read list of paths from the standard input"
2522 #: builtin/checkout-index.c:202
2523 msgid "write the content to temporary files"
2526 #: builtin/checkout-index.c:203 builtin/column.c:30
2530 #: builtin/checkout-index.c:204
2531 msgid "when creating files, prepend <string>"
2534 #: builtin/checkout-index.c:207
2535 msgid "copy out the files from named stage"
2538 #: builtin/checkout.c:25
2539 msgid "git checkout [options] <branch>"
2542 #: builtin/checkout.c:26
2543 msgid "git checkout [options] [<branch>] -- <file>..."
2546 #: builtin/checkout.c:116 builtin/checkout.c:149
2548 msgid "path '%s' does not have our version"
2551 #: builtin/checkout.c:118 builtin/checkout.c:151
2553 msgid "path '%s' does not have their version"
2556 #: builtin/checkout.c:134
2558 msgid "path '%s' does not have all necessary versions"
2561 #: builtin/checkout.c:178
2563 msgid "path '%s' does not have necessary versions"
2566 #: builtin/checkout.c:195
2568 msgid "path '%s': cannot merge"
2571 #: builtin/checkout.c:212
2573 msgid "Unable to add merge result for '%s'"
2576 #: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
2577 #: builtin/checkout.c:245
2579 msgid "'%s' cannot be used with updating paths"
2582 #: builtin/checkout.c:248 builtin/checkout.c:251
2584 msgid "'%s' cannot be used with %s"
2587 #: builtin/checkout.c:254
2589 msgid "Cannot update paths and switch to branch '%s' at the same time."
2592 #: builtin/checkout.c:265 builtin/checkout.c:426
2593 msgid "corrupt index file"
2596 #: builtin/checkout.c:295 builtin/checkout.c:302
2598 msgid "path '%s' is unmerged"
2601 #: builtin/checkout.c:448
2602 msgid "you need to resolve your current index first"
2605 #: builtin/checkout.c:569
2607 msgid "Can not do reflog for '%s'\n"
2610 #: builtin/checkout.c:602
2611 msgid "HEAD is now at"
2614 #: builtin/checkout.c:609
2616 msgid "Reset branch '%s'\n"
2619 #: builtin/checkout.c:612
2621 msgid "Already on '%s'\n"
2624 #: builtin/checkout.c:616
2626 msgid "Switched to and reset branch '%s'\n"
2629 #: builtin/checkout.c:618 builtin/checkout.c:955
2631 msgid "Switched to a new branch '%s'\n"
2634 #: builtin/checkout.c:620
2636 msgid "Switched to branch '%s'\n"
2639 #: builtin/checkout.c:676
2641 msgid " ... and %d more.\n"
2644 #. The singular version
2645 #: builtin/checkout.c:682
2648 "Warning: you are leaving %d commit behind, not connected to\n"
2649 "any of your branches:\n"
2653 "Warning: you are leaving %d commits behind, not connected to\n"
2654 "any of your branches:\n"
2660 #: builtin/checkout.c:700
2663 "If you want to keep them by creating a new branch, this may be a good time\n"
2666 " git branch new_branch_name %s\n"
2670 #: builtin/checkout.c:730
2671 msgid "internal error in revision walk"
2674 #: builtin/checkout.c:734
2675 msgid "Previous HEAD position was"
2678 #: builtin/checkout.c:761 builtin/checkout.c:950
2679 msgid "You are on a branch yet to be born"
2683 #: builtin/checkout.c:886
2685 msgid "invalid reference: %s"
2688 #. case (1): want a tree
2689 #: builtin/checkout.c:925
2691 msgid "reference is not a tree: %s"
2694 #: builtin/checkout.c:964
2695 msgid "paths cannot be used with switching branches"
2698 #: builtin/checkout.c:967 builtin/checkout.c:971
2700 msgid "'%s' cannot be used with switching branches"
2703 #: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983
2704 #: builtin/checkout.c:986
2706 msgid "'%s' cannot be used with '%s'"
2709 #: builtin/checkout.c:991
2711 msgid "Cannot switch branch to a non-commit '%s'"
2714 #: builtin/checkout.c:1012 builtin/gc.c:177
2715 msgid "suppress progress reporting"
2718 #: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89
2719 #: builtin/remote.c:169 builtin/remote.c:171
2723 #: builtin/checkout.c:1014
2724 msgid "create and checkout a new branch"
2727 #: builtin/checkout.c:1016
2728 msgid "create/reset and checkout a branch"
2731 #: builtin/checkout.c:1017
2732 msgid "create reflog for new branch"
2735 #: builtin/checkout.c:1018
2736 msgid "detach the HEAD at named commit"
2739 #: builtin/checkout.c:1019
2740 msgid "set upstream info for new branch"
2743 #: builtin/checkout.c:1021
2747 #: builtin/checkout.c:1021
2748 msgid "new unparented branch"
2751 #: builtin/checkout.c:1022
2752 msgid "checkout our version for unmerged files"
2755 #: builtin/checkout.c:1024
2756 msgid "checkout their version for unmerged files"
2759 #: builtin/checkout.c:1026
2760 msgid "force checkout (throw away local modifications)"
2763 #: builtin/checkout.c:1027
2764 msgid "perform a 3-way merge with the new branch"
2767 #: builtin/checkout.c:1028 builtin/merge.c:215
2768 msgid "update ignored files (default)"
2771 #: builtin/checkout.c:1029 builtin/log.c:1116 parse-options.h:241
2775 #: builtin/checkout.c:1030
2776 msgid "conflict style (merge or diff3)"
2779 #: builtin/checkout.c:1033
2780 msgid "second guess 'git checkout no-such-branch'"
2783 #: builtin/checkout.c:1057
2784 msgid "-b, -B and --orphan are mutually exclusive"
2787 #: builtin/checkout.c:1074
2788 msgid "--track needs a branch name"
2791 #: builtin/checkout.c:1081
2792 msgid "Missing branch name; try -b"
2795 #: builtin/checkout.c:1116
2796 msgid "invalid path specification"
2799 #: builtin/checkout.c:1123
2802 "Cannot update paths and switch to branch '%s' at the same time.\n"
2803 "Did you intend to checkout '%s' which can not be resolved as commit?"
2806 #: builtin/checkout.c:1128
2808 msgid "git checkout: --detach does not take a path argument '%s'"
2811 #: builtin/checkout.c:1132
2813 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
2814 "checking out of the index."
2817 #: builtin/clean.c:19
2818 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
2821 #: builtin/clean.c:51
2822 msgid "do not print names of files removed"
2825 #: builtin/clean.c:53
2829 #: builtin/clean.c:55
2830 msgid "remove whole directories"
2833 #: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:717
2834 #: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182
2838 #: builtin/clean.c:57
2839 msgid "add <pattern> to ignore rules"
2842 #: builtin/clean.c:58
2843 msgid "remove ignored files, too"
2846 #: builtin/clean.c:60
2847 msgid "remove only ignored files"
2850 #: builtin/clean.c:78
2851 msgid "-x and -X cannot be used together"
2854 #: builtin/clean.c:82
2856 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
2859 #: builtin/clean.c:85
2861 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
2865 #: builtin/clean.c:155 builtin/clean.c:176
2867 msgid "Would remove %s\n"
2870 #: builtin/clean.c:159 builtin/clean.c:179
2872 msgid "Removing %s\n"
2875 #: builtin/clean.c:162 builtin/clean.c:182
2877 msgid "failed to remove %s"
2880 #: builtin/clean.c:166
2882 msgid "Would not remove %s\n"
2885 #: builtin/clean.c:168
2887 msgid "Not removing %s\n"
2890 #: builtin/clone.c:36
2891 msgid "git clone [options] [--] <repo> [<dir>]"
2894 #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
2895 #: builtin/push.c:399
2896 msgid "force progress reporting"
2899 #: builtin/clone.c:66
2900 msgid "don't create a checkout"
2903 #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
2904 msgid "create a bare repository"
2907 #: builtin/clone.c:72
2908 msgid "create a mirror repository (implies bare)"
2911 #: builtin/clone.c:74
2912 msgid "to clone from a local repository"
2915 #: builtin/clone.c:76
2916 msgid "don't use local hardlinks, always copy"
2919 #: builtin/clone.c:78
2920 msgid "setup as shared repository"
2923 #: builtin/clone.c:80 builtin/clone.c:82
2924 msgid "initialize submodules in the clone"
2927 #: builtin/clone.c:83 builtin/init-db.c:485
2928 msgid "template-directory"
2931 #: builtin/clone.c:84 builtin/init-db.c:486
2932 msgid "directory from which templates will be used"
2935 #: builtin/clone.c:86
2936 msgid "reference repository"
2939 #: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
2943 #: builtin/clone.c:88
2944 msgid "use <name> instead of 'origin' to track upstream"
2947 #: builtin/clone.c:90
2948 msgid "checkout <branch> instead of the remote's HEAD"
2951 #: builtin/clone.c:92
2952 msgid "path to git-upload-pack on the remote"
2955 #: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662
2959 #: builtin/clone.c:94
2960 msgid "create a shallow clone of that depth"
2963 #: builtin/clone.c:96
2964 msgid "clone only one branch, HEAD or --branch"
2967 #: builtin/clone.c:97 builtin/init-db.c:494
2971 #: builtin/clone.c:98 builtin/init-db.c:495
2972 msgid "separate git dir from working tree"
2975 #: builtin/clone.c:99
2979 #: builtin/clone.c:100
2980 msgid "set config inside the new repository"
2983 #: builtin/clone.c:243
2985 msgid "reference repository '%s' is not a local directory."
2988 #: builtin/clone.c:306
2990 msgid "failed to create directory '%s'"
2993 #: builtin/clone.c:308 builtin/diff.c:77
2995 msgid "failed to stat '%s'"
2998 #: builtin/clone.c:310
3000 msgid "%s exists and is not a directory"
3003 #: builtin/clone.c:324
3005 msgid "failed to stat %s\n"
3008 #: builtin/clone.c:346
3010 msgid "failed to create link '%s'"
3013 #: builtin/clone.c:350
3015 msgid "failed to copy file to '%s'"
3018 #: builtin/clone.c:373
3023 #: builtin/clone.c:443
3025 msgid "Could not find remote branch %s to clone."
3028 #: builtin/clone.c:552
3029 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3032 #: builtin/clone.c:690
3033 msgid "Too many arguments."
3036 #: builtin/clone.c:694
3037 msgid "You must specify a repository to clone."
3040 #: builtin/clone.c:705
3042 msgid "--bare and --origin %s options are incompatible."
3045 #: builtin/clone.c:719
3047 msgid "repository '%s' does not exist"
3050 #: builtin/clone.c:724
3051 msgid "--depth is ignored in local clones; use file:// instead."
3054 #: builtin/clone.c:734
3056 msgid "destination path '%s' already exists and is not an empty directory."
3059 #: builtin/clone.c:744
3061 msgid "working tree '%s' already exists."
3064 #: builtin/clone.c:757 builtin/clone.c:771
3066 msgid "could not create leading directories of '%s'"
3069 #: builtin/clone.c:760
3071 msgid "could not create work tree dir '%s'."
3074 #: builtin/clone.c:779
3076 msgid "Cloning into bare repository '%s'...\n"
3079 #: builtin/clone.c:781
3081 msgid "Cloning into '%s'...\n"
3084 #: builtin/clone.c:823
3086 msgid "Don't know how to clone %s"
3089 #: builtin/clone.c:872
3091 msgid "Remote branch %s not found in upstream %s"
3094 #: builtin/clone.c:879
3095 msgid "You appear to have cloned an empty repository."
3098 #: builtin/column.c:9
3099 msgid "git column [options]"
3102 #: builtin/column.c:26
3103 msgid "lookup config vars"
3106 #: builtin/column.c:27 builtin/column.c:28
3107 msgid "layout to use"
3110 #: builtin/column.c:29
3111 msgid "Maximum width"
3114 #: builtin/column.c:30
3115 msgid "Padding space on left border"
3118 #: builtin/column.c:31
3119 msgid "Padding space on right border"
3122 #: builtin/column.c:32
3123 msgid "Padding space between columns"
3126 #: builtin/column.c:51
3127 msgid "--command must be the first argument"
3130 #: builtin/commit.c:34
3131 msgid "git commit [options] [--] <filepattern>..."
3134 #: builtin/commit.c:39
3135 msgid "git status [options] [--] <filepattern>..."
3138 #: builtin/commit.c:44
3140 "Your name and email address were configured automatically based\n"
3141 "on your username and hostname. Please check that they are accurate.\n"
3142 "You can suppress this message by setting them explicitly:\n"
3144 " git config --global user.name \"Your Name\"\n"
3145 " git config --global user.email you@example.com\n"
3147 "After doing this, you may fix the identity used for this commit with:\n"
3149 " git commit --amend --reset-author\n"
3152 #: builtin/commit.c:56
3154 "You asked to amend the most recent commit, but doing so would make\n"
3155 "it empty. You can repeat your command with --allow-empty, or you can\n"
3156 "remove the commit entirely with \"git reset HEAD^\".\n"
3159 #: builtin/commit.c:61
3161 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3162 "If you wish to commit it anyway, use:\n"
3164 " git commit --allow-empty\n"
3166 "Otherwise, please use 'git reset'\n"
3169 #: builtin/commit.c:258
3170 msgid "failed to unpack HEAD tree object"
3173 #: builtin/commit.c:300
3174 msgid "unable to create temporary index"
3177 #: builtin/commit.c:306
3178 msgid "interactive add failed"
3181 #: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410
3182 msgid "unable to write new_index file"
3185 #: builtin/commit.c:391
3186 msgid "cannot do a partial commit during a merge."
3189 #: builtin/commit.c:393
3190 msgid "cannot do a partial commit during a cherry-pick."
3193 #: builtin/commit.c:403
3194 msgid "cannot read the index"
3197 #: builtin/commit.c:423
3198 msgid "unable to write temporary index file"
3201 #: builtin/commit.c:511 builtin/commit.c:517
3203 msgid "invalid commit: %s"
3206 #: builtin/commit.c:540
3207 msgid "malformed --author parameter"
3210 #: builtin/commit.c:560
3212 msgid "Malformed ident string: '%s'"
3215 #: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954
3217 msgid "could not lookup commit %s"
3220 #: builtin/commit.c:610 builtin/shortlog.c:296
3222 msgid "(reading log message from standard input)\n"
3225 #: builtin/commit.c:612
3226 msgid "could not read log from standard input"
3229 #: builtin/commit.c:616
3231 msgid "could not read log file '%s'"
3234 #: builtin/commit.c:622
3235 msgid "commit has empty message"
3238 #: builtin/commit.c:638
3239 msgid "could not read MERGE_MSG"
3242 #: builtin/commit.c:642
3243 msgid "could not read SQUASH_MSG"
3246 #: builtin/commit.c:646
3248 msgid "could not read '%s'"
3251 #: builtin/commit.c:707
3252 msgid "could not write commit template"
3255 #: builtin/commit.c:718
3259 "It looks like you may be committing a merge.\n"
3260 "If this is not correct, please remove the file\n"
3265 #: builtin/commit.c:723
3269 "It looks like you may be committing a cherry-pick.\n"
3270 "If this is not correct, please remove the file\n"
3275 #: builtin/commit.c:735
3277 "Please enter the commit message for your changes. Lines starting\n"
3278 "with '#' will be ignored, and an empty message aborts the commit.\n"
3281 #: builtin/commit.c:740
3283 "Please enter the commit message for your changes. Lines starting\n"
3284 "with '#' will be kept; you may remove them yourself if you want to.\n"
3285 "An empty message aborts the commit.\n"
3288 #: builtin/commit.c:753
3290 msgid "%sAuthor: %s"
3293 #: builtin/commit.c:760
3295 msgid "%sCommitter: %s"
3298 #: builtin/commit.c:780
3299 msgid "Cannot read index"
3302 #: builtin/commit.c:817
3303 msgid "Error building trees"
3306 #: builtin/commit.c:832 builtin/tag.c:361
3308 msgid "Please supply the message using either -m or -F option.\n"
3311 #: builtin/commit.c:929
3313 msgid "No existing author found with '%s'"
3316 #: builtin/commit.c:944 builtin/commit.c:1148
3318 msgid "Invalid untracked files mode '%s'"
3321 #: builtin/commit.c:984
3322 msgid "Using both --reset-author and --author does not make sense"
3325 #: builtin/commit.c:995
3326 msgid "You have nothing to amend."
3329 #: builtin/commit.c:998
3330 msgid "You are in the middle of a merge -- cannot amend."
3333 #: builtin/commit.c:1000
3334 msgid "You are in the middle of a cherry-pick -- cannot amend."
3337 #: builtin/commit.c:1003
3338 msgid "Options --squash and --fixup cannot be used together"
3341 #: builtin/commit.c:1013
3342 msgid "Only one of -c/-C/-F/--fixup can be used."
3345 #: builtin/commit.c:1015
3346 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3349 #: builtin/commit.c:1023
3350 msgid "--reset-author can be used only with -C, -c or --amend."
3353 #: builtin/commit.c:1040
3354 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3357 #: builtin/commit.c:1042
3358 msgid "No paths with --include/--only does not make sense."
3361 #: builtin/commit.c:1044
3362 msgid "Clever... amending the last one with dirty index."
3365 #: builtin/commit.c:1046
3366 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3369 #: builtin/commit.c:1056 builtin/tag.c:577
3371 msgid "Invalid cleanup mode %s"
3374 #: builtin/commit.c:1061
3375 msgid "Paths with -a does not make sense."
3378 #: builtin/commit.c:1067 builtin/commit.c:1202
3379 msgid "--long and -z are incompatible"
3382 #: builtin/commit.c:1162 builtin/commit.c:1398
3383 msgid "show status concisely"
3386 #: builtin/commit.c:1164 builtin/commit.c:1400
3387 msgid "show branch information"
3390 #: builtin/commit.c:1166 builtin/commit.c:1402 builtin/push.c:389
3391 msgid "machine-readable output"
3394 #: builtin/commit.c:1169 builtin/commit.c:1404
3395 msgid "show status in long format (default)"
3398 #: builtin/commit.c:1172 builtin/commit.c:1407
3399 msgid "terminate entries with NUL"
3402 #: builtin/commit.c:1174 builtin/commit.c:1410 builtin/fast-export.c:636
3403 #: builtin/fast-export.c:639 builtin/tag.c:461
3407 #: builtin/commit.c:1175 builtin/commit.c:1410
3408 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3411 #: builtin/commit.c:1178
3412 msgid "show ignored files"
3415 #: builtin/commit.c:1179 parse-options.h:151
3419 #: builtin/commit.c:1180
3421 "ignore changes to submodules, optional when: all, dirty, untracked. "
3425 #: builtin/commit.c:1182
3426 msgid "list untracked files in columns"
3429 #: builtin/commit.c:1256
3430 msgid "couldn't look up newly created commit"
3433 #: builtin/commit.c:1258
3434 msgid "could not parse newly created commit"
3437 #: builtin/commit.c:1299
3438 msgid "detached HEAD"
3441 #: builtin/commit.c:1301
3442 msgid " (root-commit)"
3445 #: builtin/commit.c:1368
3446 msgid "suppress summary after successful commit"
3449 #: builtin/commit.c:1369
3450 msgid "show diff in commit message template"
3453 #: builtin/commit.c:1371
3454 msgid "Commit message options"
3457 #: builtin/commit.c:1372 builtin/tag.c:459
3458 msgid "read message from file"
3461 #: builtin/commit.c:1373
3465 #: builtin/commit.c:1373
3466 msgid "override author for commit"
3469 #: builtin/commit.c:1374 builtin/gc.c:178
3473 #: builtin/commit.c:1374
3474 msgid "override date for commit"
3477 #: builtin/commit.c:1375 builtin/merge.c:206 builtin/notes.c:537
3478 #: builtin/notes.c:694 builtin/tag.c:457
3482 #: builtin/commit.c:1375
3483 msgid "commit message"
3486 #: builtin/commit.c:1376
3487 msgid "reuse and edit message from specified commit"
3490 #: builtin/commit.c:1377
3491 msgid "reuse message from specified commit"
3494 #: builtin/commit.c:1378
3495 msgid "use autosquash formatted message to fixup specified commit"
3498 #: builtin/commit.c:1379
3499 msgid "use autosquash formatted message to squash specified commit"
3502 #: builtin/commit.c:1380
3503 msgid "the commit is authored by me now (used with -C/-c/--amend)"
3506 #: builtin/commit.c:1381 builtin/log.c:1073 builtin/revert.c:109
3507 msgid "add Signed-off-by:"
3510 #: builtin/commit.c:1382
3511 msgid "use specified template file"
3514 #: builtin/commit.c:1383
3515 msgid "force edit of commit"
3518 #: builtin/commit.c:1384
3522 #: builtin/commit.c:1384 builtin/tag.c:462
3523 msgid "how to strip spaces and #comments from message"
3526 #: builtin/commit.c:1385
3527 msgid "include status in commit message template"
3530 #: builtin/commit.c:1386 builtin/merge.c:213 builtin/tag.c:463
3534 #: builtin/commit.c:1387 builtin/merge.c:214
3535 msgid "GPG sign commit"
3538 #. end commit message options
3539 #: builtin/commit.c:1390
3540 msgid "Commit contents options"
3543 #: builtin/commit.c:1391
3544 msgid "commit all changed files"
3547 #: builtin/commit.c:1392
3548 msgid "add specified files to index for commit"
3551 #: builtin/commit.c:1393
3552 msgid "interactively add files"
3555 #: builtin/commit.c:1394
3556 msgid "interactively add changes"
3559 #: builtin/commit.c:1395
3560 msgid "commit only specified files"
3563 #: builtin/commit.c:1396
3564 msgid "bypass pre-commit hook"
3567 #: builtin/commit.c:1397
3568 msgid "show what would be committed"
3571 #: builtin/commit.c:1408
3572 msgid "amend previous commit"
3575 #: builtin/commit.c:1409
3576 msgid "bypass post-rewrite hook"
3579 #: builtin/commit.c:1414
3580 msgid "ok to record an empty change"
3583 #: builtin/commit.c:1417
3584 msgid "ok to record a change with an empty message"
3587 #: builtin/commit.c:1449
3588 msgid "could not parse HEAD commit"
3591 #: builtin/commit.c:1487 builtin/merge.c:508
3593 msgid "could not open '%s' for reading"
3596 #: builtin/commit.c:1494
3598 msgid "Corrupt MERGE_HEAD file (%s)"
3601 #: builtin/commit.c:1501
3602 msgid "could not read MERGE_MODE"
3605 #: builtin/commit.c:1520
3607 msgid "could not read commit message: %s"
3610 #: builtin/commit.c:1534
3612 msgid "Aborting commit; you did not edit the message.\n"
3615 #: builtin/commit.c:1539
3617 msgid "Aborting commit due to empty commit message.\n"
3620 #: builtin/commit.c:1554 builtin/merge.c:832 builtin/merge.c:857
3621 msgid "failed to write commit object"
3624 #: builtin/commit.c:1575
3625 msgid "cannot lock HEAD ref"
3628 #: builtin/commit.c:1579
3629 msgid "cannot update HEAD ref"
3632 #: builtin/commit.c:1590
3634 "Repository has been updated, but unable to write\n"
3635 "new_index file. Check that disk is not full or quota is\n"
3636 "not exceeded, and then \"git reset HEAD\" to recover."
3639 #: builtin/config.c:7
3640 msgid "git config [options]"
3643 #: builtin/config.c:51
3644 msgid "Config file location"
3647 #: builtin/config.c:52
3648 msgid "use global config file"
3651 #: builtin/config.c:53
3652 msgid "use system config file"
3655 #: builtin/config.c:54
3656 msgid "use repository config file"
3659 #: builtin/config.c:55
3660 msgid "use given config file"
3663 #: builtin/config.c:56
3667 #: builtin/config.c:57
3668 msgid "get value: name [value-regex]"
3671 #: builtin/config.c:58
3672 msgid "get all values: key [value-regex]"
3675 #: builtin/config.c:59
3676 msgid "get values for regexp: name-regex [value-regex]"
3679 #: builtin/config.c:60
3680 msgid "replace all matching variables: name value [value_regex]"
3683 #: builtin/config.c:61
3684 msgid "add a new variable: name value"
3687 #: builtin/config.c:62
3688 msgid "remove a variable: name [value-regex]"
3691 #: builtin/config.c:63
3692 msgid "remove all matches: name [value-regex]"
3695 #: builtin/config.c:64
3696 msgid "rename section: old-name new-name"
3699 #: builtin/config.c:65
3700 msgid "remove a section: name"
3703 #: builtin/config.c:66
3707 #: builtin/config.c:67
3708 msgid "open an editor"
3711 #: builtin/config.c:68 builtin/config.c:69
3715 #: builtin/config.c:68
3716 msgid "find the color configured: [default]"
3719 #: builtin/config.c:69
3720 msgid "find the color setting: [stdout-is-tty]"
3723 #: builtin/config.c:70
3727 #: builtin/config.c:71
3728 msgid "value is \"true\" or \"false\""
3731 #: builtin/config.c:72
3732 msgid "value is decimal number"
3735 #: builtin/config.c:73
3736 msgid "value is --bool or --int"
3739 #: builtin/config.c:74
3740 msgid "value is a path (file or directory name)"
3743 #: builtin/config.c:75
3747 #: builtin/config.c:76
3748 msgid "terminate values with NUL byte"
3751 #: builtin/config.c:77
3752 msgid "respect include directives on lookup"
3755 #: builtin/count-objects.c:69
3756 msgid "git count-objects [-v]"
3759 #: builtin/describe.c:15
3760 msgid "git describe [options] <committish>*"
3763 #: builtin/describe.c:16
3764 msgid "git describe [options] --dirty"
3767 #: builtin/describe.c:234
3769 msgid "annotated tag %s not available"
3772 #: builtin/describe.c:238
3774 msgid "annotated tag %s has no embedded name"
3777 #: builtin/describe.c:240
3779 msgid "tag '%s' is really '%s' here"
3782 #: builtin/describe.c:267
3784 msgid "Not a valid object name %s"
3787 #: builtin/describe.c:270
3789 msgid "%s is not a valid '%s' object"
3792 #: builtin/describe.c:287
3794 msgid "no tag exactly matches '%s'"
3797 #: builtin/describe.c:289
3799 msgid "searching to describe %s\n"
3802 #: builtin/describe.c:329
3804 msgid "finished search at %s\n"
3807 #: builtin/describe.c:353
3810 "No annotated tags can describe '%s'.\n"
3811 "However, there were unannotated tags: try --tags."
3814 #: builtin/describe.c:357
3817 "No tags can describe '%s'.\n"
3818 "Try --always, or create some tags."
3821 #: builtin/describe.c:378
3823 msgid "traversed %lu commits\n"
3826 #: builtin/describe.c:381
3829 "more than %i tags found; listed %i most recent\n"
3830 "gave up search at %s\n"
3833 #: builtin/describe.c:403
3834 msgid "find the tag that comes after the commit"
3837 #: builtin/describe.c:404
3838 msgid "debug search strategy on stderr"
3841 #: builtin/describe.c:405
3842 msgid "use any ref in .git/refs"
3845 #: builtin/describe.c:406
3846 msgid "use any tag in .git/refs/tags"
3849 #: builtin/describe.c:407
3850 msgid "always use long format"
3853 #: builtin/describe.c:410
3854 msgid "only output exact matches"
3857 #: builtin/describe.c:412
3858 msgid "consider <n> most recent tags (default: 10)"
3861 #: builtin/describe.c:414
3862 msgid "only consider tags matching <pattern>"
3865 #: builtin/describe.c:416 builtin/name-rev.c:238
3866 msgid "show abbreviated commit object as fallback"
3869 #: builtin/describe.c:417
3873 #: builtin/describe.c:418
3874 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
3877 #: builtin/describe.c:436
3878 msgid "--long is incompatible with --abbrev=0"
3881 #: builtin/describe.c:462
3882 msgid "No names found, cannot describe anything."
3885 #: builtin/describe.c:482
3886 msgid "--dirty is incompatible with committishes"
3889 #: builtin/diff.c:79
3891 msgid "'%s': not a regular file or symlink"
3894 #: builtin/diff.c:228
3896 msgid "invalid option: %s"
3899 #: builtin/diff.c:305
3900 msgid "Not a git repository"
3903 #: builtin/diff.c:348
3905 msgid "invalid object '%s' given."
3908 #: builtin/diff.c:353
3910 msgid "more than %d trees given: '%s'"
3913 #: builtin/diff.c:363
3915 msgid "more than two blobs given: '%s'"
3918 #: builtin/diff.c:371
3920 msgid "unhandled object '%s' given."
3923 #: builtin/fast-export.c:22
3924 msgid "git fast-export [rev-list-opts]"
3927 #: builtin/fast-export.c:635
3928 msgid "show progress after <n> objects"
3931 #: builtin/fast-export.c:637
3932 msgid "select handling of signed tags"
3935 #: builtin/fast-export.c:640
3936 msgid "select handling of tags that tag filtered objects"
3939 #: builtin/fast-export.c:643
3940 msgid "Dump marks to this file"
3943 #: builtin/fast-export.c:645
3944 msgid "Import marks from this file"
3947 #: builtin/fast-export.c:647
3948 msgid "Fake a tagger when tags lack one"
3951 #: builtin/fast-export.c:649
3952 msgid "Output full tree for each commit"
3955 #: builtin/fast-export.c:651
3956 msgid "Use the done feature to terminate the stream"
3959 #: builtin/fast-export.c:652
3960 msgid "Skip output of blob data"
3963 #: builtin/fetch.c:20
3964 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
3967 #: builtin/fetch.c:21
3968 msgid "git fetch [<options>] <group>"
3971 #: builtin/fetch.c:22
3972 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
3975 #: builtin/fetch.c:23
3976 msgid "git fetch --all [<options>]"
3979 #: builtin/fetch.c:60
3980 msgid "fetch from all remotes"
3983 #: builtin/fetch.c:62
3984 msgid "append to .git/FETCH_HEAD instead of overwriting"
3987 #: builtin/fetch.c:64
3988 msgid "path to upload pack on remote end"
3991 #: builtin/fetch.c:65
3992 msgid "force overwrite of local branch"
3995 #: builtin/fetch.c:67
3996 msgid "fetch from multiple remotes"
3999 #: builtin/fetch.c:69
4000 msgid "fetch all tags and associated objects"
4003 #: builtin/fetch.c:71
4004 msgid "do not fetch all tags (--no-tags)"
4007 #: builtin/fetch.c:73
4008 msgid "prune remote-tracking branches no longer on remote"
4011 #: builtin/fetch.c:74
4015 #: builtin/fetch.c:75
4016 msgid "control recursive fetching of submodules"
4019 #: builtin/fetch.c:79
4020 msgid "keep downloaded pack"
4023 #: builtin/fetch.c:81
4024 msgid "allow updating of HEAD ref"
4027 #: builtin/fetch.c:84
4028 msgid "deepen history of shallow clone"
4031 #: builtin/fetch.c:85 builtin/log.c:1088
4035 #: builtin/fetch.c:86
4036 msgid "prepend this to submodule path output"
4039 #: builtin/fetch.c:89
4040 msgid "default mode for recursion"
4043 #: builtin/fetch.c:201
4044 msgid "Couldn't find remote ref HEAD"
4047 #: builtin/fetch.c:254
4049 msgid "object %s not found"
4052 #: builtin/fetch.c:259
4053 msgid "[up to date]"
4056 #: builtin/fetch.c:273
4058 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4061 #: builtin/fetch.c:274 builtin/fetch.c:360
4065 #: builtin/fetch.c:285
4066 msgid "[tag update]"
4069 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
4070 msgid " (unable to update local ref)"
4073 #: builtin/fetch.c:305
4077 #: builtin/fetch.c:308
4078 msgid "[new branch]"
4081 #: builtin/fetch.c:311
4085 #: builtin/fetch.c:356
4086 msgid "unable to update local ref"
4089 #: builtin/fetch.c:356
4090 msgid "forced update"
4093 #: builtin/fetch.c:362
4094 msgid "(non-fast-forward)"
4097 #: builtin/fetch.c:393 builtin/fetch.c:685
4099 msgid "cannot open %s: %s\n"
4102 #: builtin/fetch.c:402
4104 msgid "%s did not send all necessary objects\n"
4107 #: builtin/fetch.c:488
4112 #: builtin/fetch.c:499
4115 "some local refs could not be updated; try running\n"
4116 " 'git remote prune %s' to remove any old, conflicting branches"
4119 #: builtin/fetch.c:549
4121 msgid " (%s will become dangling)"
4124 #: builtin/fetch.c:550
4126 msgid " (%s has become dangling)"
4129 #: builtin/fetch.c:557
4133 #: builtin/fetch.c:558 builtin/remote.c:1055
4137 #: builtin/fetch.c:675
4139 msgid "Refusing to fetch into current branch %s of non-bare repository"
4142 #: builtin/fetch.c:709
4144 msgid "Don't know how to fetch from %s"
4147 #: builtin/fetch.c:786
4149 msgid "Option \"%s\" value \"%s\" is not valid for %s"
4152 #: builtin/fetch.c:789
4154 msgid "Option \"%s\" is ignored for %s\n"
4157 #: builtin/fetch.c:891
4159 msgid "Fetching %s\n"
4162 #: builtin/fetch.c:893 builtin/remote.c:100
4164 msgid "Could not fetch %s"
4167 #: builtin/fetch.c:912
4169 "No remote repository specified. Please, specify either a URL or a\n"
4170 "remote name from which new revisions should be fetched."
4173 #: builtin/fetch.c:932
4174 msgid "You need to specify a tag name."
4177 #: builtin/fetch.c:984
4178 msgid "fetch --all does not take a repository argument"
4181 #: builtin/fetch.c:986
4182 msgid "fetch --all does not make sense with refspecs"
4185 #: builtin/fetch.c:997
4187 msgid "No such remote or remote group: %s"
4190 #: builtin/fetch.c:1005
4191 msgid "Fetching a group and specifying refspecs does not make sense"
4194 #: builtin/fmt-merge-msg.c:13
4195 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4198 #: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:701
4199 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175
4200 #: builtin/tag.c:448 parse-options.h:133 parse-options.h:235
4204 #: builtin/fmt-merge-msg.c:654
4205 msgid "populate log with at most <n> entries from shortlog"
4208 #: builtin/fmt-merge-msg.c:657
4209 msgid "alias for --log (deprecated)"
4212 #: builtin/fmt-merge-msg.c:660
4216 #: builtin/fmt-merge-msg.c:661
4217 msgid "use <text> as start of message"
4220 #: builtin/fmt-merge-msg.c:662
4221 msgid "file to read from"
4224 #: builtin/for-each-ref.c:979
4225 msgid "git for-each-ref [options] [<pattern>]"
4228 #: builtin/for-each-ref.c:994
4229 msgid "quote placeholders suitably for shells"
4232 #: builtin/for-each-ref.c:996
4233 msgid "quote placeholders suitably for perl"
4236 #: builtin/for-each-ref.c:998
4237 msgid "quote placeholders suitably for python"
4240 #: builtin/for-each-ref.c:1000
4241 msgid "quote placeholders suitably for tcl"
4244 #: builtin/for-each-ref.c:1003
4245 msgid "show only <n> matched refs"
4248 #: builtin/for-each-ref.c:1004
4252 #: builtin/for-each-ref.c:1004
4253 msgid "format to use for the output"
4256 #: builtin/for-each-ref.c:1005
4260 #: builtin/for-each-ref.c:1006
4261 msgid "field name to sort on"
4264 #: builtin/fsck.c:608
4265 msgid "git fsck [options] [<object>...]"
4268 #: builtin/fsck.c:614
4269 msgid "show unreachable objects"
4272 #: builtin/fsck.c:615
4273 msgid "show dangling objects"
4276 #: builtin/fsck.c:616
4280 #: builtin/fsck.c:617
4281 msgid "report root nodes"
4284 #: builtin/fsck.c:618
4285 msgid "make index objects head nodes"
4288 #: builtin/fsck.c:619
4289 msgid "make reflogs head nodes (default)"
4292 #: builtin/fsck.c:620
4293 msgid "also consider packs and alternate objects"
4296 #: builtin/fsck.c:621
4297 msgid "enable more strict checking"
4300 #: builtin/fsck.c:623
4301 msgid "write dangling objects in .git/lost-found"
4304 #: builtin/fsck.c:624 builtin/prune.c:134
4305 msgid "show progress"
4309 msgid "git gc [options]"
4314 msgid "Invalid %s: '%s'"
4319 msgid "insanely long object directory %.*s"
4323 msgid "prune unreferenced objects"
4327 msgid "be more thorough (increased runtime)"
4331 msgid "enable auto-gc mode"
4337 "Auto packing the repository for optimum performance. You may also\n"
4338 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
4343 "There are too many unreachable loose objects; run 'git prune' to remove them."
4346 #: builtin/grep.c:22
4347 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4350 #: builtin/grep.c:217
4352 msgid "grep: failed to create thread: %s"
4355 #: builtin/grep.c:365
4357 msgid "Failed to chdir: %s"
4360 #: builtin/grep.c:443 builtin/grep.c:478
4362 msgid "unable to read tree (%s)"
4365 #: builtin/grep.c:493
4367 msgid "unable to grep from object of type %s"
4370 #: builtin/grep.c:551
4372 msgid "switch `%c' expects a numerical value"
4375 #: builtin/grep.c:568
4377 msgid "cannot open '%s'"
4380 #: builtin/grep.c:643
4381 msgid "search in index instead of in the work tree"
4384 #: builtin/grep.c:645
4385 msgid "find in contents not managed by git"
4388 #: builtin/grep.c:647
4389 msgid "search in both tracked and untracked files"
4392 #: builtin/grep.c:649
4393 msgid "search also in ignored files"
4396 #: builtin/grep.c:652
4397 msgid "show non-matching lines"
4400 #: builtin/grep.c:654
4401 msgid "case insensitive matching"
4404 #: builtin/grep.c:656
4405 msgid "match patterns only at word boundaries"
4408 #: builtin/grep.c:658
4409 msgid "process binary files as text"
4412 #: builtin/grep.c:660
4413 msgid "don't match patterns in binary files"
4416 #: builtin/grep.c:663
4417 msgid "descend at most <depth> levels"
4420 #: builtin/grep.c:667
4421 msgid "use extended POSIX regular expressions"
4424 #: builtin/grep.c:670
4425 msgid "use basic POSIX regular expressions (default)"
4428 #: builtin/grep.c:673
4429 msgid "interpret patterns as fixed strings"
4432 #: builtin/grep.c:676
4433 msgid "use Perl-compatible regular expressions"
4436 #: builtin/grep.c:679
4437 msgid "show line numbers"
4440 #: builtin/grep.c:680
4441 msgid "don't show filenames"
4444 #: builtin/grep.c:681
4445 msgid "show filenames"
4448 #: builtin/grep.c:683
4449 msgid "show filenames relative to top directory"
4452 #: builtin/grep.c:685
4453 msgid "show only filenames instead of matching lines"
4456 #: builtin/grep.c:687
4457 msgid "synonym for --files-with-matches"
4460 #: builtin/grep.c:690
4461 msgid "show only the names of files without match"
4464 #: builtin/grep.c:692
4465 msgid "print NUL after filenames"
4468 #: builtin/grep.c:694
4469 msgid "show the number of matches instead of matching lines"
4472 #: builtin/grep.c:695
4473 msgid "highlight matches"
4476 #: builtin/grep.c:697
4477 msgid "print empty line between matches from different files"
4480 #: builtin/grep.c:699
4481 msgid "show filename only once above matches from same file"
4484 #: builtin/grep.c:702
4485 msgid "show <n> context lines before and after matches"
4488 #: builtin/grep.c:705
4489 msgid "show <n> context lines before matches"
4492 #: builtin/grep.c:707
4493 msgid "show <n> context lines after matches"
4496 #: builtin/grep.c:708
4497 msgid "shortcut for -C NUM"
4500 #: builtin/grep.c:711
4501 msgid "show a line with the function name before matches"
4504 #: builtin/grep.c:713
4505 msgid "show the surrounding function"
4508 #: builtin/grep.c:716
4509 msgid "read patterns from file"
4512 #: builtin/grep.c:718
4513 msgid "match <pattern>"
4516 #: builtin/grep.c:720
4517 msgid "combine patterns specified with -e"
4520 #: builtin/grep.c:732
4521 msgid "indicate hit with exit status without output"
4524 #: builtin/grep.c:734
4525 msgid "show only matches from files that match all patterns"
4528 #: builtin/grep.c:736
4529 msgid "show parse tree for grep expression"
4532 #: builtin/grep.c:740
4536 #: builtin/grep.c:740
4537 msgid "show matching files in the pager"
4540 #: builtin/grep.c:743
4541 msgid "allow calling of grep(1) (ignored by this build)"
4544 #: builtin/grep.c:744 builtin/show-ref.c:184
4548 #: builtin/grep.c:811
4549 msgid "no pattern given."
4552 #: builtin/grep.c:825
4554 msgid "bad object %s"
4557 #: builtin/grep.c:866
4558 msgid "--open-files-in-pager only works on the worktree"
4561 #: builtin/grep.c:889
4562 msgid "--cached or --untracked cannot be used with --no-index."
4565 #: builtin/grep.c:894
4566 msgid "--no-index or --untracked cannot be used with revs."
4569 #: builtin/grep.c:897
4570 msgid "--[no-]exclude-standard cannot be used for tracked contents."
4573 #: builtin/grep.c:905
4574 msgid "both --cached and trees are given."
4577 #: builtin/hash-object.c:60
4579 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
4583 #: builtin/hash-object.c:61
4584 msgid "git hash-object --stdin-paths < <list-of-paths>"
4587 #: builtin/hash-object.c:72
4591 #: builtin/hash-object.c:72
4595 #: builtin/hash-object.c:73
4596 msgid "write the object into the object database"
4599 #: builtin/hash-object.c:74
4600 msgid "read the object from stdin"
4603 #: builtin/hash-object.c:76
4604 msgid "store file as is without filters"
4607 #: builtin/hash-object.c:77
4608 msgid "process file as it were from this path"
4611 #: builtin/help.c:43
4612 msgid "print all available commands"
4615 #: builtin/help.c:44
4616 msgid "show man page"
4619 #: builtin/help.c:45
4620 msgid "show manual in web browser"
4623 #: builtin/help.c:47
4624 msgid "show info page"
4627 #: builtin/help.c:53
4628 msgid "git help [--all] [--man|--web|--info] [command]"
4631 #: builtin/help.c:65
4633 msgid "unrecognized help format '%s'"
4636 #: builtin/help.c:93
4637 msgid "Failed to start emacsclient."
4640 #: builtin/help.c:106
4641 msgid "Failed to parse emacsclient version."
4644 #: builtin/help.c:114
4646 msgid "emacsclient version '%d' too old (< 22)."
4649 #: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
4651 msgid "failed to exec '%s': %s"
4654 #: builtin/help.c:217
4657 "'%s': path for unsupported man viewer.\n"
4658 "Please consider using 'man.<tool>.cmd' instead."
4661 #: builtin/help.c:229
4664 "'%s': cmd for supported man viewer.\n"
4665 "Please consider using 'man.<tool>.path' instead."
4668 #: builtin/help.c:299
4669 msgid "The most commonly used git commands are:"
4672 #: builtin/help.c:367
4674 msgid "'%s': unknown man viewer."
4677 #: builtin/help.c:384
4678 msgid "no man viewer handled the request"
4681 #: builtin/help.c:392
4682 msgid "no info viewer handled the request"
4685 #: builtin/help.c:447 builtin/help.c:454
4690 #: builtin/help.c:470
4692 msgid "`git %s' is aliased to `%s'"
4695 #: builtin/index-pack.c:170
4697 msgid "object type mismatch at %s"
4700 #: builtin/index-pack.c:190
4701 msgid "object of unexpected type"
4704 #: builtin/index-pack.c:227
4706 msgid "cannot fill %d byte"
4707 msgid_plural "cannot fill %d bytes"
4711 #: builtin/index-pack.c:237
4715 #: builtin/index-pack.c:238
4716 msgid "read error on input"
4719 #: builtin/index-pack.c:250
4720 msgid "used more bytes than were available"
4723 #: builtin/index-pack.c:257
4724 msgid "pack too large for current definition of off_t"
4727 #: builtin/index-pack.c:273
4729 msgid "unable to create '%s'"
4732 #: builtin/index-pack.c:278
4734 msgid "cannot open packfile '%s'"
4737 #: builtin/index-pack.c:292
4738 msgid "pack signature mismatch"
4741 #: builtin/index-pack.c:294
4743 msgid "pack version %<PRIu32> unsupported"
4746 #: builtin/index-pack.c:312
4748 msgid "pack has bad object at offset %lu: %s"
4751 #: builtin/index-pack.c:434
4753 msgid "inflate returned %d"
4756 #: builtin/index-pack.c:483
4757 msgid "offset value overflow for delta base object"
4760 #: builtin/index-pack.c:491
4761 msgid "delta base offset is out of bound"
4764 #: builtin/index-pack.c:499
4766 msgid "unknown object type %d"
4769 #: builtin/index-pack.c:530
4770 msgid "cannot pread pack file"
4773 #: builtin/index-pack.c:532
4775 msgid "premature end of pack file, %lu byte missing"
4776 msgid_plural "premature end of pack file, %lu bytes missing"
4780 #: builtin/index-pack.c:558
4781 msgid "serious inflate inconsistency"
4784 #: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
4785 #: builtin/index-pack.c:712 builtin/index-pack.c:721
4787 msgid "SHA1 COLLISION FOUND WITH %s !"
4790 #: builtin/index-pack.c:652 builtin/pack-objects.c:170
4791 #: builtin/pack-objects.c:262
4793 msgid "unable to read %s"
4796 #: builtin/index-pack.c:718
4798 msgid "cannot read existing object %s"
4801 #: builtin/index-pack.c:732
4803 msgid "invalid blob object %s"
4806 #: builtin/index-pack.c:747
4811 #: builtin/index-pack.c:749
4812 msgid "Error in object"
4815 #: builtin/index-pack.c:751
4817 msgid "Not all child objects of %s are reachable"
4820 #: builtin/index-pack.c:821 builtin/index-pack.c:847
4821 msgid "failed to apply delta"
4824 #: builtin/index-pack.c:986
4825 msgid "Receiving objects"
4828 #: builtin/index-pack.c:986
4829 msgid "Indexing objects"
4832 #: builtin/index-pack.c:1012
4833 msgid "pack is corrupted (SHA1 mismatch)"
4836 #: builtin/index-pack.c:1017
4837 msgid "cannot fstat packfile"
4840 #: builtin/index-pack.c:1020
4841 msgid "pack has junk at the end"
4844 #: builtin/index-pack.c:1031
4845 msgid "confusion beyond insanity in parse_pack_objects()"
4848 #: builtin/index-pack.c:1054
4849 msgid "Resolving deltas"
4852 #: builtin/index-pack.c:1064
4854 msgid "unable to create thread: %s"
4857 #: builtin/index-pack.c:1106
4858 msgid "confusion beyond insanity"
4861 #: builtin/index-pack.c:1112
4863 msgid "completed with %d local objects"
4866 #: builtin/index-pack.c:1121
4868 msgid "Unexpected tail checksum for %s (disk corruption?)"
4871 #: builtin/index-pack.c:1125
4873 msgid "pack has %d unresolved delta"
4874 msgid_plural "pack has %d unresolved deltas"
4878 #: builtin/index-pack.c:1150
4880 msgid "unable to deflate appended object (%d)"
4883 #: builtin/index-pack.c:1229
4885 msgid "local object %s is corrupt"
4888 #: builtin/index-pack.c:1253
4889 msgid "error while closing pack file"
4892 #: builtin/index-pack.c:1266
4894 msgid "cannot write keep file '%s'"
4897 #: builtin/index-pack.c:1274
4899 msgid "cannot close written keep file '%s'"
4902 #: builtin/index-pack.c:1287
4903 msgid "cannot store pack file"
4906 #: builtin/index-pack.c:1298
4907 msgid "cannot store index file"
4910 #: builtin/index-pack.c:1331
4912 msgid "bad pack.indexversion=%<PRIu32>"
4915 #: builtin/index-pack.c:1337
4917 msgid "invalid number of threads specified (%d)"
4920 #: builtin/index-pack.c:1341 builtin/index-pack.c:1514
4922 msgid "no threads support, ignoring %s"
4925 #: builtin/index-pack.c:1399
4927 msgid "Cannot open existing pack file '%s'"
4930 #: builtin/index-pack.c:1401
4932 msgid "Cannot open existing pack idx file for '%s'"
4935 #: builtin/index-pack.c:1448
4937 msgid "non delta: %d object"
4938 msgid_plural "non delta: %d objects"
4942 #: builtin/index-pack.c:1455
4944 msgid "chain length = %d: %lu object"
4945 msgid_plural "chain length = %d: %lu objects"
4949 #: builtin/index-pack.c:1482
4950 msgid "Cannot come back to cwd"
4953 #: builtin/index-pack.c:1526 builtin/index-pack.c:1529
4954 #: builtin/index-pack.c:1541 builtin/index-pack.c:1545
4959 #: builtin/index-pack.c:1559
4960 msgid "--fix-thin cannot be used without --stdin"
4963 #: builtin/index-pack.c:1563 builtin/index-pack.c:1573
4965 msgid "packfile name '%s' does not end with '.pack'"
4968 #: builtin/index-pack.c:1582
4969 msgid "--verify with no packfile name given"
4972 #: builtin/init-db.c:35
4974 msgid "Could not make %s writable by group"
4977 #: builtin/init-db.c:62
4979 msgid "insanely long template name %s"
4982 #: builtin/init-db.c:67
4984 msgid "cannot stat '%s'"
4987 #: builtin/init-db.c:73
4989 msgid "cannot stat template '%s'"
4992 #: builtin/init-db.c:80
4994 msgid "cannot opendir '%s'"
4997 #: builtin/init-db.c:97
4999 msgid "cannot readlink '%s'"
5002 #: builtin/init-db.c:99
5004 msgid "insanely long symlink %s"
5007 #: builtin/init-db.c:102
5009 msgid "cannot symlink '%s' '%s'"
5012 #: builtin/init-db.c:106
5014 msgid "cannot copy '%s' to '%s'"
5017 #: builtin/init-db.c:110
5019 msgid "ignoring template %s"
5022 #: builtin/init-db.c:133
5024 msgid "insanely long template path %s"
5027 #: builtin/init-db.c:141
5029 msgid "templates not found %s"
5032 #: builtin/init-db.c:154
5034 msgid "not copying templates of a wrong format version %d from '%s'"
5037 #: builtin/init-db.c:192
5039 msgid "insane git directory %s"
5042 #: builtin/init-db.c:323 builtin/init-db.c:326
5044 msgid "%s already exists"
5047 #: builtin/init-db.c:355
5049 msgid "unable to handle file type %d"
5052 #: builtin/init-db.c:358
5054 msgid "unable to move %s to %s"
5057 #: builtin/init-db.c:363
5059 msgid "Could not create git link %s"
5063 #. * TRANSLATORS: The first '%s' is either "Reinitialized
5064 #. * existing" or "Initialized empty", the second " shared" or
5065 #. * "", and the last '%s%s' is the verbatim directory name.
5067 #: builtin/init-db.c:420
5069 msgid "%s%s Git repository in %s%s\n"
5072 #: builtin/init-db.c:421
5073 msgid "Reinitialized existing"
5076 #: builtin/init-db.c:421
5077 msgid "Initialized empty"
5080 #: builtin/init-db.c:422
5084 #: builtin/init-db.c:441
5085 msgid "cannot tell cwd"
5088 #: builtin/init-db.c:467
5090 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"
5091 "[=<permissions>]] [directory]"
5094 #: builtin/init-db.c:490
5098 #: builtin/init-db.c:491
5099 msgid "specify that the git repository is to be shared amongst several users"
5102 #: builtin/init-db.c:493 builtin/prune-packed.c:77
5106 #: builtin/init-db.c:522 builtin/init-db.c:529
5108 msgid "cannot mkdir %s"
5111 #: builtin/init-db.c:533
5113 msgid "cannot chdir to %s"
5116 #: builtin/init-db.c:555
5119 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5123 #: builtin/init-db.c:579
5124 msgid "Cannot access current working directory"
5127 #: builtin/init-db.c:586
5129 msgid "Cannot access work tree '%s'"
5133 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
5137 msgid " or: git show [options] <object>..."
5140 #: builtin/log.c:100
5141 msgid "suppress diff output"
5144 #: builtin/log.c:101
5148 #: builtin/log.c:102
5149 msgid "decorate options"
5152 #: builtin/log.c:189
5154 msgid "Final output: %d %s\n"
5157 #: builtin/log.c:405 builtin/log.c:497
5159 msgid "Could not read object %s"
5162 #: builtin/log.c:521
5164 msgid "Unknown type: %d"
5167 #: builtin/log.c:613
5168 msgid "format.headers without value"
5171 #: builtin/log.c:687
5172 msgid "name of output directory is too long"
5175 #: builtin/log.c:698
5177 msgid "Cannot open patch file %s"
5180 #: builtin/log.c:712
5181 msgid "Need exactly one range."
5184 #: builtin/log.c:720
5185 msgid "Not a range."
5188 #: builtin/log.c:794
5189 msgid "Cover letter needs email format"
5192 #: builtin/log.c:867
5194 msgid "insane in-reply-to: %s"
5197 #: builtin/log.c:895
5198 msgid "git format-patch [options] [<since> | <revision range>]"
5201 #: builtin/log.c:940
5202 msgid "Two output directories?"
5205 #: builtin/log.c:1068
5206 msgid "use [PATCH n/m] even with a single patch"
5209 #: builtin/log.c:1071
5210 msgid "use [PATCH] even with multiple patches"
5213 #: builtin/log.c:1075
5214 msgid "print patches to standard out"
5217 #: builtin/log.c:1077
5218 msgid "generate a cover letter"
5221 #: builtin/log.c:1079
5222 msgid "use simple number sequence for output file names"
5225 #: builtin/log.c:1080
5229 #: builtin/log.c:1081
5230 msgid "use <sfx> instead of '.patch'"
5233 #: builtin/log.c:1083
5234 msgid "start numbering patches at <n> instead of 1"
5237 #: builtin/log.c:1085
5238 msgid "Use [<prefix>] instead of [PATCH]"
5241 #: builtin/log.c:1088
5242 msgid "store resulting files in <dir>"
5245 #: builtin/log.c:1091
5246 msgid "don't strip/add [PATCH]"
5249 #: builtin/log.c:1094
5250 msgid "don't output binary diffs"
5253 #: builtin/log.c:1096
5254 msgid "don't include a patch matching a commit upstream"
5257 #: builtin/log.c:1098
5258 msgid "show patch format instead of default (patch + stat)"
5261 #: builtin/log.c:1100
5265 #: builtin/log.c:1101
5269 #: builtin/log.c:1102
5270 msgid "add email header"
5273 #: builtin/log.c:1103 builtin/log.c:1105
5277 #: builtin/log.c:1103
5278 msgid "add To: header"
5281 #: builtin/log.c:1105
5282 msgid "add Cc: header"
5285 #: builtin/log.c:1107
5289 #: builtin/log.c:1108
5290 msgid "make first mail a reply to <message-id>"
5293 #: builtin/log.c:1109 builtin/log.c:1112
5297 #: builtin/log.c:1110
5298 msgid "attach the patch"
5301 #: builtin/log.c:1113
5302 msgid "inline the patch"
5305 #: builtin/log.c:1117
5306 msgid "enable message threading, styles: shallow, deep"
5309 #: builtin/log.c:1119
5313 #: builtin/log.c:1120
5314 msgid "add a signature"
5317 #: builtin/log.c:1122
5318 msgid "don't print the patch filenames"
5321 #: builtin/log.c:1163
5323 msgid "bogus committer info %s"
5326 #: builtin/log.c:1208
5327 msgid "-n and -k are mutually exclusive."
5330 #: builtin/log.c:1210
5331 msgid "--subject-prefix and -k are mutually exclusive."
5334 #: builtin/log.c:1218
5335 msgid "--name-only does not make sense"
5338 #: builtin/log.c:1220
5339 msgid "--name-status does not make sense"
5342 #: builtin/log.c:1222
5343 msgid "--check does not make sense"
5346 #: builtin/log.c:1245
5347 msgid "standard output, or directory, which one?"
5350 #: builtin/log.c:1247
5352 msgid "Could not create directory '%s'"
5355 #: builtin/log.c:1400
5356 msgid "Failed to create output files"
5359 #: builtin/log.c:1449
5360 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5363 #: builtin/log.c:1504
5366 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
5369 #: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
5371 msgid "Unknown commit %s"
5374 #: builtin/ls-files.c:408
5375 msgid "git ls-files [options] [<file>...]"
5378 #: builtin/ls-files.c:463
5379 msgid "identify the file status with tags"
5382 #: builtin/ls-files.c:465
5383 msgid "use lowercase letters for 'assume unchanged' files"
5386 #: builtin/ls-files.c:467
5387 msgid "show cached files in the output (default)"
5390 #: builtin/ls-files.c:469
5391 msgid "show deleted files in the output"
5394 #: builtin/ls-files.c:471
5395 msgid "show modified files in the output"
5398 #: builtin/ls-files.c:473
5399 msgid "show other files in the output"
5402 #: builtin/ls-files.c:475
5403 msgid "show ignored files in the output"
5406 #: builtin/ls-files.c:478
5407 msgid "show staged contents' object name in the output"
5410 #: builtin/ls-files.c:480
5411 msgid "show files on the filesystem that need to be removed"
5414 #: builtin/ls-files.c:482
5415 msgid "show 'other' directories' name only"
5418 #: builtin/ls-files.c:485
5419 msgid "don't show empty directories"
5422 #: builtin/ls-files.c:488
5423 msgid "show unmerged files in the output"
5426 #: builtin/ls-files.c:490
5427 msgid "show resolve-undo information"
5430 #: builtin/ls-files.c:492
5431 msgid "skip files matching pattern"
5434 #: builtin/ls-files.c:495
5435 msgid "exclude patterns are read from <file>"
5438 #: builtin/ls-files.c:498
5439 msgid "read additional per-directory exclude patterns in <file>"
5442 #: builtin/ls-files.c:500
5443 msgid "add the standard git exclusions"
5446 #: builtin/ls-files.c:503
5447 msgid "make the output relative to the project top directory"
5450 #: builtin/ls-files.c:506
5451 msgid "if any <file> is not in the index, treat this as an error"
5454 #: builtin/ls-files.c:507
5458 #: builtin/ls-files.c:508
5459 msgid "pretend that paths removed since <tree-ish> are still present"
5462 #: builtin/ls-files.c:510
5463 msgid "show debugging data"
5466 #: builtin/ls-tree.c:27
5467 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
5470 #: builtin/ls-tree.c:125
5471 msgid "only show trees"
5474 #: builtin/ls-tree.c:127
5475 msgid "recurse into subtrees"
5478 #: builtin/ls-tree.c:129
5479 msgid "show trees when recursing"
5482 #: builtin/ls-tree.c:132
5483 msgid "terminate entries with NUL byte"
5486 #: builtin/ls-tree.c:133
5487 msgid "include object size"
5490 #: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5491 msgid "list only filenames"
5494 #: builtin/ls-tree.c:140
5495 msgid "use full path names"
5498 #: builtin/ls-tree.c:142
5499 msgid "list entire tree; not just current directory (implies --full-name)"
5502 #: builtin/merge.c:43
5503 msgid "git merge [options] [<commit>...]"
5506 #: builtin/merge.c:44
5507 msgid "git merge [options] <msg> HEAD <commit>"
5510 #: builtin/merge.c:45
5511 msgid "git merge --abort"
5514 #: builtin/merge.c:90
5515 msgid "switch `m' requires a value"
5518 #: builtin/merge.c:127
5520 msgid "Could not find merge strategy '%s'.\n"
5523 #: builtin/merge.c:128
5525 msgid "Available strategies are:"
5528 #: builtin/merge.c:133
5530 msgid "Available custom strategies are:"
5533 #: builtin/merge.c:183
5534 msgid "do not show a diffstat at the end of the merge"
5537 #: builtin/merge.c:186
5538 msgid "show a diffstat at the end of the merge"
5541 #: builtin/merge.c:187
5542 msgid "(synonym to --stat)"
5545 #: builtin/merge.c:189
5546 msgid "add (at most <n>) entries from shortlog to merge commit message"
5549 #: builtin/merge.c:192
5550 msgid "create a single commit instead of doing a merge"
5553 #: builtin/merge.c:194
5554 msgid "perform a commit if the merge succeeds (default)"
5557 #: builtin/merge.c:196
5558 msgid "edit message before committing"
5561 #: builtin/merge.c:198
5562 msgid "allow fast-forward (default)"
5565 #: builtin/merge.c:200
5566 msgid "abort if fast-forward is not possible"
5569 #: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112
5573 #: builtin/merge.c:203
5574 msgid "merge strategy to use"
5577 #: builtin/merge.c:204
5578 msgid "option=value"
5581 #: builtin/merge.c:205
5582 msgid "option for selected merge strategy"
5585 #: builtin/merge.c:207
5586 msgid "merge commit message (for a non-fast-forward merge)"
5589 #: builtin/merge.c:211
5590 msgid "abort the current in-progress merge"
5593 #: builtin/merge.c:240
5594 msgid "could not run stash."
5597 #: builtin/merge.c:245
5598 msgid "stash failed"
5601 #: builtin/merge.c:250
5603 msgid "not a valid object: %s"
5606 #: builtin/merge.c:269 builtin/merge.c:286
5607 msgid "read-tree failed"
5610 #: builtin/merge.c:316
5611 msgid " (nothing to squash)"
5614 #: builtin/merge.c:329
5616 msgid "Squash commit -- not updating HEAD\n"
5619 #: builtin/merge.c:361
5620 msgid "Writing SQUASH_MSG"
5623 #: builtin/merge.c:363
5624 msgid "Finishing SQUASH_MSG"
5627 #: builtin/merge.c:386
5629 msgid "No merge message -- not updating HEAD\n"
5632 #: builtin/merge.c:436
5634 msgid "'%s' does not point to a commit"
5637 #: builtin/merge.c:535
5639 msgid "Bad branch.%s.mergeoptions string: %s"
5642 #: builtin/merge.c:628
5643 msgid "git write-tree failed to write a tree"
5646 #: builtin/merge.c:656
5647 msgid "Not handling anything other than two heads merge."
5650 #: builtin/merge.c:670
5652 msgid "Unknown option for merge-recursive: -X%s"
5655 #: builtin/merge.c:684
5657 msgid "unable to write %s"
5660 #: builtin/merge.c:773
5662 msgid "Could not read from '%s'"
5665 #: builtin/merge.c:782
5667 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
5670 #: builtin/merge.c:788
5672 "Please enter a commit message to explain why this merge is necessary,\n"
5673 "especially if it merges an updated upstream into a topic branch.\n"
5675 "Lines starting with '#' will be ignored, and an empty message aborts\n"
5679 #: builtin/merge.c:812
5680 msgid "Empty commit message."
5683 #: builtin/merge.c:824
5685 msgid "Wonderful.\n"
5688 #: builtin/merge.c:889
5690 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
5693 #: builtin/merge.c:905
5695 msgid "'%s' is not a commit"
5698 #: builtin/merge.c:946
5699 msgid "No current branch."
5702 #: builtin/merge.c:948
5703 msgid "No remote for the current branch."
5706 #: builtin/merge.c:950
5707 msgid "No default upstream defined for the current branch."
5710 #: builtin/merge.c:955
5712 msgid "No remote tracking branch for %s from %s"
5715 #: builtin/merge.c:1042 builtin/merge.c:1199
5717 msgid "%s - not something we can merge"
5720 #: builtin/merge.c:1110
5721 msgid "There is no merge to abort (MERGE_HEAD missing)."
5724 #: builtin/merge.c:1126 git-pull.sh:31
5726 "You have not concluded your merge (MERGE_HEAD exists).\n"
5727 "Please, commit your changes before you can merge."
5730 #: builtin/merge.c:1129 git-pull.sh:34
5731 msgid "You have not concluded your merge (MERGE_HEAD exists)."
5734 #: builtin/merge.c:1133
5736 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
5737 "Please, commit your changes before you can merge."
5740 #: builtin/merge.c:1136
5741 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
5744 #: builtin/merge.c:1145
5745 msgid "You cannot combine --squash with --no-ff."
5748 #: builtin/merge.c:1150
5749 msgid "You cannot combine --no-ff with --ff-only."
5752 #: builtin/merge.c:1157
5753 msgid "No commit specified and merge.defaultToUpstream not set."
5756 #: builtin/merge.c:1189
5757 msgid "Can merge only exactly one commit into empty head"
5760 #: builtin/merge.c:1192
5761 msgid "Squash commit into empty head not supported yet"
5764 #: builtin/merge.c:1194
5765 msgid "Non-fast-forward commit does not make sense into an empty head"
5768 #: builtin/merge.c:1309
5770 msgid "Updating %s..%s\n"
5773 #: builtin/merge.c:1348
5775 msgid "Trying really trivial in-index merge...\n"
5778 #: builtin/merge.c:1355
5783 #: builtin/merge.c:1387
5784 msgid "Not possible to fast-forward, aborting."
5787 #: builtin/merge.c:1410 builtin/merge.c:1489
5789 msgid "Rewinding the tree to pristine...\n"
5792 #: builtin/merge.c:1414
5794 msgid "Trying merge strategy %s...\n"
5797 #: builtin/merge.c:1480
5799 msgid "No merge strategy handled the merge.\n"
5802 #: builtin/merge.c:1482
5804 msgid "Merge with strategy %s failed.\n"
5807 #: builtin/merge.c:1491
5809 msgid "Using the %s to prepare resolving by hand.\n"
5812 #: builtin/merge.c:1503
5814 msgid "Automatic merge went well; stopped before committing as requested\n"
5817 #: builtin/merge-base.c:26
5818 msgid "git merge-base [-a|--all] <commit> <commit>..."
5821 #: builtin/merge-base.c:27
5822 msgid "git merge-base [-a|--all] --octopus <commit>..."
5825 #: builtin/merge-base.c:28
5826 msgid "git merge-base --independent <commit>..."
5829 #: builtin/merge-base.c:29
5830 msgid "git merge-base --is-ancestor <commit> <commit>"
5833 #: builtin/merge-base.c:98
5834 msgid "output all common ancestors"
5837 #: builtin/merge-base.c:99
5838 msgid "find ancestors for a single n-way merge"
5841 #: builtin/merge-base.c:100
5842 msgid "list revs not reachable from others"
5845 #: builtin/merge-base.c:102
5846 msgid "is the first one ancestor of the other?"
5849 #: builtin/merge-file.c:8
5851 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
5855 #: builtin/merge-file.c:33
5856 msgid "send results to standard output"
5859 #: builtin/merge-file.c:34
5860 msgid "use a diff3 based merge"
5863 #: builtin/merge-file.c:35
5864 msgid "for conflicts, use our version"
5867 #: builtin/merge-file.c:37
5868 msgid "for conflicts, use their version"
5871 #: builtin/merge-file.c:39
5872 msgid "for conflicts, use a union version"
5875 #: builtin/merge-file.c:42
5876 msgid "for conflicts, use this marker size"
5879 #: builtin/merge-file.c:43
5880 msgid "do not warn about conflicts"
5883 #: builtin/merge-file.c:45
5884 msgid "set labels for file1/orig_file/file2"
5887 #: builtin/mktree.c:67
5888 msgid "git mktree [-z] [--missing] [--batch]"
5891 #: builtin/mktree.c:153
5892 msgid "input is NUL terminated"
5895 #: builtin/mktree.c:154 builtin/write-tree.c:24
5896 msgid "allow missing objects"
5899 #: builtin/mktree.c:155
5900 msgid "allow creation of more than one tree"
5904 msgid "git mv [options] <source>... <destination>"
5908 msgid "force move/rename even if target exists"
5912 msgid "skip move/rename errors"
5917 msgid "Checking rename of '%s' to '%s'\n"
5925 msgid "can not move directory into itself"
5929 msgid "cannot move directory over file"
5934 msgid "Huh? %.*s is in index?"
5938 msgid "source directory is empty"
5942 msgid "not under version control"
5946 msgid "destination exists"
5951 msgid "overwriting '%s'"
5955 msgid "Cannot overwrite"
5959 msgid "multiple sources for the same target"
5964 msgid "%s, source=%s, destination=%s"
5969 msgid "Renaming %s to %s\n"
5972 #: builtin/mv.c:215 builtin/remote.c:731
5974 msgid "renaming '%s' failed"
5977 #: builtin/name-rev.c:175
5978 msgid "git name-rev [options] <commit>..."
5981 #: builtin/name-rev.c:176
5982 msgid "git name-rev [options] --all"
5985 #: builtin/name-rev.c:177
5986 msgid "git name-rev [options] --stdin"
5989 #: builtin/name-rev.c:229
5990 msgid "print only names (no SHA-1)"
5993 #: builtin/name-rev.c:230
5994 msgid "only use tags to name the commits"
5997 #: builtin/name-rev.c:232
5998 msgid "only use refs matching <pattern>"
6001 #: builtin/name-rev.c:234
6002 msgid "list all commits reachable from all refs"
6005 #: builtin/name-rev.c:235
6006 msgid "read from stdin"
6009 #: builtin/name-rev.c:236
6010 msgid "allow to print `undefined` names"
6013 #: builtin/notes.c:26
6014 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
6017 #: builtin/notes.c:27
6019 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6020 "<object>] [<object>]"
6023 #: builtin/notes.c:28
6024 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6027 #: builtin/notes.c:29
6029 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6030 "<object>] [<object>]"
6033 #: builtin/notes.c:30
6034 msgid "git notes [--ref <notes_ref>] edit [<object>]"
6037 #: builtin/notes.c:31
6038 msgid "git notes [--ref <notes_ref>] show [<object>]"
6041 #: builtin/notes.c:32
6043 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6046 #: builtin/notes.c:33
6047 msgid "git notes merge --commit [-v | -q]"
6050 #: builtin/notes.c:34
6051 msgid "git notes merge --abort [-v | -q]"
6054 #: builtin/notes.c:35
6055 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6058 #: builtin/notes.c:36
6059 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6062 #: builtin/notes.c:37
6063 msgid "git notes [--ref <notes_ref>] get-ref"
6066 #: builtin/notes.c:42
6067 msgid "git notes [list [<object>]]"
6070 #: builtin/notes.c:47
6071 msgid "git notes add [<options>] [<object>]"
6074 #: builtin/notes.c:52
6075 msgid "git notes copy [<options>] <from-object> <to-object>"
6078 #: builtin/notes.c:53
6079 msgid "git notes copy --stdin [<from-object> <to-object>]..."
6082 #: builtin/notes.c:58
6083 msgid "git notes append [<options>] [<object>]"
6086 #: builtin/notes.c:63
6087 msgid "git notes edit [<object>]"
6090 #: builtin/notes.c:68
6091 msgid "git notes show [<object>]"
6094 #: builtin/notes.c:73
6095 msgid "git notes merge [<options>] <notes_ref>"
6098 #: builtin/notes.c:74
6099 msgid "git notes merge --commit [<options>]"
6102 #: builtin/notes.c:75
6103 msgid "git notes merge --abort [<options>]"
6106 #: builtin/notes.c:80
6107 msgid "git notes remove [<object>]"
6110 #: builtin/notes.c:85
6111 msgid "git notes prune [<options>]"
6114 #: builtin/notes.c:90
6115 msgid "git notes get-ref"
6118 #: builtin/notes.c:142
6120 msgid "unable to start 'show' for object '%s'"
6123 #: builtin/notes.c:148
6124 msgid "can't fdopen 'show' output fd"
6127 #: builtin/notes.c:158
6129 msgid "failed to close pipe to 'show' for object '%s'"
6132 #: builtin/notes.c:161
6134 msgid "failed to finish 'show' for object '%s'"
6137 #: builtin/notes.c:178 builtin/tag.c:347
6139 msgid "could not create file '%s'"
6142 #: builtin/notes.c:192
6143 msgid "Please supply the note contents using either -m or -F option"
6146 #: builtin/notes.c:213 builtin/notes.c:976
6148 msgid "Removing note for object %s\n"
6151 #: builtin/notes.c:218
6152 msgid "unable to write note object"
6155 #: builtin/notes.c:220
6157 msgid "The note contents has been left in %s"
6160 #: builtin/notes.c:254 builtin/tag.c:542
6162 msgid "cannot read '%s'"
6165 #: builtin/notes.c:256 builtin/tag.c:545
6167 msgid "could not open or read '%s'"
6170 #: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450
6171 #: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647
6172 #: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769
6173 #: builtin/notes.c:971 builtin/reset.c:293 builtin/tag.c:558
6175 msgid "Failed to resolve '%s' as a valid ref."
6178 #: builtin/notes.c:278
6180 msgid "Failed to read object '%s'."
6183 #: builtin/notes.c:302
6184 msgid "Cannot commit uninitialized/unreferenced notes tree"
6187 #: builtin/notes.c:343
6189 msgid "Bad notes.rewriteMode value: '%s'"
6192 #: builtin/notes.c:353
6194 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6197 #. TRANSLATORS: The first %s is the name of the
6198 #. environment variable, the second %s is its value
6199 #: builtin/notes.c:380
6201 msgid "Bad %s value: '%s'"
6204 #: builtin/notes.c:444
6206 msgid "Malformed input line: '%s'."
6209 #: builtin/notes.c:459
6211 msgid "Failed to copy notes from '%s' to '%s'"
6214 #: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630
6215 #: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762
6216 #: builtin/notes.c:1036
6217 msgid "too many parameters"
6220 #: builtin/notes.c:516 builtin/notes.c:775
6222 msgid "No note found for object %s."
6225 #: builtin/notes.c:538 builtin/notes.c:695
6226 msgid "note contents as a string"
6229 #: builtin/notes.c:541 builtin/notes.c:698
6230 msgid "note contents in a file"
6233 #: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700
6234 #: builtin/notes.c:703 builtin/tag.c:476
6238 #: builtin/notes.c:544 builtin/notes.c:701
6239 msgid "reuse and edit specified note object"
6242 #: builtin/notes.c:547 builtin/notes.c:704
6243 msgid "reuse specified note object"
6246 #: builtin/notes.c:549 builtin/notes.c:617
6247 msgid "replace existing notes"
6250 #: builtin/notes.c:583
6253 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6257 #: builtin/notes.c:588 builtin/notes.c:665
6259 msgid "Overwriting existing notes for object %s\n"
6262 #: builtin/notes.c:618
6263 msgid "read objects from stdin"
6266 #: builtin/notes.c:620
6267 msgid "load rewriting config for <command> (implies --stdin)"
6270 #: builtin/notes.c:638
6271 msgid "too few parameters"
6274 #: builtin/notes.c:659
6277 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6281 #: builtin/notes.c:671
6283 msgid "Missing notes on source object %s. Cannot copy."
6286 #: builtin/notes.c:720
6289 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6290 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6293 #: builtin/notes.c:867
6294 msgid "General options"
6297 #: builtin/notes.c:869
6298 msgid "Merge options"
6301 #: builtin/notes.c:871
6303 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6307 #: builtin/notes.c:873
6308 msgid "Committing unmerged notes"
6311 #: builtin/notes.c:875
6312 msgid "finalize notes merge by committing unmerged notes"
6315 #: builtin/notes.c:877
6316 msgid "Aborting notes merge resolution"
6319 #: builtin/notes.c:879
6320 msgid "abort notes merge"
6323 #: builtin/notes.c:974
6325 msgid "Object %s has no note\n"
6328 #: builtin/notes.c:986
6329 msgid "attempt to remove non-existent note is not an error"
6332 #: builtin/notes.c:989
6333 msgid "read object names from the standard input"
6336 #: builtin/notes.c:1070
6340 #: builtin/notes.c:1071
6341 msgid "use notes from <notes_ref>"
6344 #: builtin/notes.c:1106 builtin/remote.c:1598
6346 msgid "Unknown subcommand: %s"
6349 #: builtin/pack-objects.c:23
6350 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
6353 #: builtin/pack-objects.c:24
6354 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
6357 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6359 msgid "deflate error (%d)"
6362 #: builtin/pack-objects.c:2397
6364 msgid "unsupported index version %s"
6367 #: builtin/pack-objects.c:2401
6369 msgid "bad index version '%s'"
6372 #: builtin/pack-objects.c:2424
6374 msgid "option %s does not accept negative form"
6377 #: builtin/pack-objects.c:2428
6379 msgid "unable to parse value '%s' for option %s"
6382 #: builtin/pack-objects.c:2447
6383 msgid "do not show progress meter"
6386 #: builtin/pack-objects.c:2449
6387 msgid "show progress meter"
6390 #: builtin/pack-objects.c:2451
6391 msgid "show progress meter during object writing phase"
6394 #: builtin/pack-objects.c:2454
6395 msgid "similar to --all-progress when progress meter is shown"
6398 #: builtin/pack-objects.c:2455
6399 msgid "version[,offset]"
6402 #: builtin/pack-objects.c:2456
6403 msgid "write the pack index file in the specified idx format version"
6406 #: builtin/pack-objects.c:2459
6407 msgid "maximum size of each output pack file"
6410 #: builtin/pack-objects.c:2461
6411 msgid "ignore borrowed objects from alternate object store"
6414 #: builtin/pack-objects.c:2463
6415 msgid "ignore packed objects"
6418 #: builtin/pack-objects.c:2465
6419 msgid "limit pack window by objects"
6422 #: builtin/pack-objects.c:2467
6423 msgid "limit pack window by memory in addition to object limit"
6426 #: builtin/pack-objects.c:2469
6427 msgid "maximum length of delta chain allowed in the resulting pack"
6430 #: builtin/pack-objects.c:2471
6431 msgid "reuse existing deltas"
6434 #: builtin/pack-objects.c:2473
6435 msgid "reuse existing objects"
6438 #: builtin/pack-objects.c:2475
6439 msgid "use OFS_DELTA objects"
6442 #: builtin/pack-objects.c:2477
6443 msgid "use threads when searching for best delta matches"
6446 #: builtin/pack-objects.c:2479
6447 msgid "do not create an empty pack output"
6450 #: builtin/pack-objects.c:2481
6451 msgid "read revision arguments from standard input"
6454 #: builtin/pack-objects.c:2483
6455 msgid "limit the objects to those that are not yet packed"
6458 #: builtin/pack-objects.c:2486
6459 msgid "include objects reachable from any reference"
6462 #: builtin/pack-objects.c:2489
6463 msgid "include objects referred by reflog entries"
6466 #: builtin/pack-objects.c:2492
6467 msgid "output pack to stdout"
6470 #: builtin/pack-objects.c:2494
6471 msgid "include tag objects that refer to objects to be packed"
6474 #: builtin/pack-objects.c:2496
6475 msgid "keep unreachable objects"
6478 #: builtin/pack-objects.c:2497 parse-options.h:141
6482 #: builtin/pack-objects.c:2498
6483 msgid "unpack unreachable objects newer than <time>"
6486 #: builtin/pack-objects.c:2501
6487 msgid "create thin packs"
6490 #: builtin/pack-objects.c:2503
6491 msgid "ignore packs that have companion .keep file"
6494 #: builtin/pack-objects.c:2505
6495 msgid "pack compression level"
6498 #: builtin/pack-objects.c:2507
6499 msgid "do not hide commits by grafts"
6502 #: builtin/pack-refs.c:6
6503 msgid "git pack-refs [options]"
6506 #: builtin/pack-refs.c:14
6507 msgid "pack everything"
6510 #: builtin/pack-refs.c:15
6511 msgid "prune loose refs (default)"
6514 #: builtin/prune-packed.c:7
6515 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
6518 #: builtin/prune.c:12
6519 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
6522 #: builtin/prune.c:132
6523 msgid "do not remove, show only"
6526 #: builtin/prune.c:133
6527 msgid "report pruned objects"
6530 #: builtin/prune.c:136
6531 msgid "expire objects older than <time>"
6534 #: builtin/push.c:14
6535 msgid "git push [<options>] [<repository> [<refspec>...]]"
6538 #: builtin/push.c:45
6539 msgid "tag shorthand without <tag>"
6542 #: builtin/push.c:64
6543 msgid "--delete only accepts plain target ref names"
6546 #: builtin/push.c:99
6549 "To choose either option permanently, see push.default in 'git help config'."
6552 #: builtin/push.c:102
6555 "The upstream branch of your current branch does not match\n"
6556 "the name of your current branch. To push to the upstream branch\n"
6557 "on the remote, use\n"
6559 " git push %s HEAD:%s\n"
6561 "To push to the branch of the same name on the remote, use\n"
6567 #: builtin/push.c:121
6570 "You are not currently on a branch.\n"
6571 "To push the history leading to the current (detached HEAD)\n"
6574 " git push %s HEAD:<name-of-remote-branch>\n"
6577 #: builtin/push.c:128
6580 "The current branch %s has no upstream branch.\n"
6581 "To push the current branch and set the remote as upstream, use\n"
6583 " git push --set-upstream %s %s\n"
6586 #: builtin/push.c:136
6588 msgid "The current branch %s has multiple upstream branches, refusing to push."
6591 #: builtin/push.c:139
6594 "You are pushing to remote '%s', which is not the upstream of\n"
6595 "your current branch '%s', without telling me what to push\n"
6596 "to update which remote branch."
6599 #: builtin/push.c:151
6601 "push.default is unset; its implicit value is changing in\n"
6602 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6603 "and maintain the current behavior after the default changes, use:\n"
6605 " git config --global push.default matching\n"
6607 "To squelch this message and adopt the new behavior now, use:\n"
6609 " git config --global push.default simple\n"
6611 "See 'git help config' and search for 'push.default' for further "
6613 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
6614 "'current' instead of 'simple' if you sometimes use older versions of Git)"
6617 #: builtin/push.c:199
6619 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
6622 #: builtin/push.c:206
6624 "Updates were rejected because the tip of your current branch is behind\n"
6625 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
6626 "before pushing again.\n"
6627 "See the 'Note about fast-forwards' in 'git push --help' for details."
6630 #: builtin/push.c:212
6632 "Updates were rejected because a pushed branch tip is behind its remote\n"
6633 "counterpart. If you did not intend to push that branch, you may want to\n"
6634 "specify branches to push or set the 'push.default' configuration variable\n"
6635 "to 'simple', 'current' or 'upstream' to push only the current branch."
6638 #: builtin/push.c:218
6640 "Updates were rejected because a pushed branch tip is behind its remote\n"
6641 "counterpart. Check out this branch and merge the remote changes\n"
6642 "(e.g. 'git pull') before pushing again.\n"
6643 "See the 'Note about fast-forwards' in 'git push --help' for details."
6646 #: builtin/push.c:258
6648 msgid "Pushing to %s\n"
6651 #: builtin/push.c:262
6653 msgid "failed to push some refs to '%s'"
6656 #: builtin/push.c:294
6658 msgid "bad repository '%s'"
6661 #: builtin/push.c:295
6663 "No configured push destination.\n"
6664 "Either specify the URL from the command-line or configure a remote "
6665 "repository using\n"
6667 " git remote add <name> <url>\n"
6669 "and then push using the remote name\n"
6671 " git push <name>\n"
6674 #: builtin/push.c:310
6675 msgid "--all and --tags are incompatible"
6678 #: builtin/push.c:311
6679 msgid "--all can't be combined with refspecs"
6682 #: builtin/push.c:316
6683 msgid "--mirror and --tags are incompatible"
6686 #: builtin/push.c:317
6687 msgid "--mirror can't be combined with refspecs"
6690 #: builtin/push.c:322
6691 msgid "--all and --mirror are incompatible"
6694 #: builtin/push.c:382
6698 #: builtin/push.c:383
6699 msgid "push all refs"
6702 #: builtin/push.c:384
6703 msgid "mirror all refs"
6706 #: builtin/push.c:386
6710 #: builtin/push.c:387
6711 msgid "push tags (can't be used with --all or --mirror)"
6714 #: builtin/push.c:390
6715 msgid "force updates"
6718 #: builtin/push.c:391
6722 #: builtin/push.c:392
6723 msgid "control recursive pushing of submodules"
6726 #: builtin/push.c:394
6727 msgid "use thin pack"
6730 #: builtin/push.c:395 builtin/push.c:396
6731 msgid "receive pack program"
6734 #: builtin/push.c:397
6735 msgid "set upstream for git pull/status"
6738 #: builtin/push.c:400
6739 msgid "prune locally removed refs"
6742 #: builtin/push.c:410
6743 msgid "--delete is incompatible with --all, --mirror and --tags"
6746 #: builtin/push.c:412
6747 msgid "--delete doesn't make sense without any refs"
6750 #: builtin/read-tree.c:36
6752 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
6753 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
6754 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
6757 #: builtin/read-tree.c:108
6758 msgid "write resulting index to <file>"
6761 #: builtin/read-tree.c:111
6762 msgid "only empty the index"
6765 #: builtin/read-tree.c:113
6769 #: builtin/read-tree.c:115
6770 msgid "perform a merge in addition to a read"
6773 #: builtin/read-tree.c:117
6774 msgid "3-way merge if no file level merging required"
6777 #: builtin/read-tree.c:119
6778 msgid "3-way merge in presence of adds and removes"
6781 #: builtin/read-tree.c:121
6782 msgid "same as -m, but discard unmerged entries"
6785 #: builtin/read-tree.c:122
6786 msgid "<subdirectory>/"
6789 #: builtin/read-tree.c:123
6790 msgid "read the tree into the index under <subdirectory>/"
6793 #: builtin/read-tree.c:126
6794 msgid "update working tree with merge result"
6797 #: builtin/read-tree.c:128
6801 #: builtin/read-tree.c:129
6802 msgid "allow explicitly ignored files to be overwritten"
6805 #: builtin/read-tree.c:132
6806 msgid "don't check the working tree after merging"
6809 #: builtin/read-tree.c:133
6810 msgid "don't update the index or the work tree"
6813 #: builtin/read-tree.c:135
6814 msgid "skip applying sparse checkout filter"
6817 #: builtin/read-tree.c:137
6818 msgid "debug unpack-trees"
6821 #: builtin/remote.c:11
6822 msgid "git remote [-v | --verbose]"
6825 #: builtin/remote.c:12
6827 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
6828 "mirror=<fetch|push>] <name> <url>"
6831 #: builtin/remote.c:13 builtin/remote.c:32
6832 msgid "git remote rename <old> <new>"
6835 #: builtin/remote.c:14 builtin/remote.c:37
6836 msgid "git remote remove <name>"
6839 #: builtin/remote.c:15 builtin/remote.c:42
6840 msgid "git remote set-head <name> (-a | -d | <branch>)"
6843 #: builtin/remote.c:16
6844 msgid "git remote [-v | --verbose] show [-n] <name>"
6847 #: builtin/remote.c:17
6848 msgid "git remote prune [-n | --dry-run] <name>"
6851 #: builtin/remote.c:18
6853 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
6856 #: builtin/remote.c:19
6857 msgid "git remote set-branches [--add] <name> <branch>..."
6860 #: builtin/remote.c:20 builtin/remote.c:68
6861 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
6864 #: builtin/remote.c:21 builtin/remote.c:69
6865 msgid "git remote set-url --add <name> <newurl>"
6868 #: builtin/remote.c:22 builtin/remote.c:70
6869 msgid "git remote set-url --delete <name> <url>"
6872 #: builtin/remote.c:27
6873 msgid "git remote add [<options>] <name> <url>"
6876 #: builtin/remote.c:47
6877 msgid "git remote set-branches <name> <branch>..."
6880 #: builtin/remote.c:48
6881 msgid "git remote set-branches --add <name> <branch>..."
6884 #: builtin/remote.c:53
6885 msgid "git remote show [<options>] <name>"
6888 #: builtin/remote.c:58
6889 msgid "git remote prune [<options>] <name>"
6892 #: builtin/remote.c:63
6893 msgid "git remote update [<options>] [<group> | <remote>]..."
6896 #: builtin/remote.c:98
6901 #: builtin/remote.c:130
6903 "--mirror is dangerous and deprecated; please\n"
6904 "\t use --mirror=fetch or --mirror=push instead"
6907 #: builtin/remote.c:147
6909 msgid "unknown mirror argument: %s"
6912 #: builtin/remote.c:163
6913 msgid "fetch the remote branches"
6916 #: builtin/remote.c:165
6917 msgid "import all tags and associated objects when fetching"
6920 #: builtin/remote.c:168
6921 msgid "or do not fetch any tag at all (--no-tags)"
6924 #: builtin/remote.c:170
6925 msgid "branch(es) to track"
6928 #: builtin/remote.c:171
6929 msgid "master branch"
6932 #: builtin/remote.c:172
6936 #: builtin/remote.c:173
6937 msgid "set up remote as a mirror to push to or fetch from"
6940 #: builtin/remote.c:185
6941 msgid "specifying a master branch makes no sense with --mirror"
6944 #: builtin/remote.c:187
6945 msgid "specifying branches to track makes sense only with fetch mirrors"
6948 #: builtin/remote.c:195 builtin/remote.c:646
6950 msgid "remote %s already exists."
6953 #: builtin/remote.c:199 builtin/remote.c:650
6955 msgid "'%s' is not a valid remote name"
6958 #: builtin/remote.c:243
6960 msgid "Could not setup master '%s'"
6963 #: builtin/remote.c:299
6965 msgid "more than one %s"
6968 #: builtin/remote.c:339
6970 msgid "Could not get fetch map for refspec %s"
6973 #: builtin/remote.c:440 builtin/remote.c:448
6977 #: builtin/remote.c:452
6981 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
6983 msgid "Could not append '%s' to '%s'"
6986 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
6988 msgid "No such remote: %s"
6991 #: builtin/remote.c:656
6993 msgid "Could not rename config section '%s' to '%s'"
6996 #: builtin/remote.c:662 builtin/remote.c:799
6998 msgid "Could not remove config section '%s'"
7001 #: builtin/remote.c:677
7004 "Not updating non-default fetch refspec\n"
7006 "\tPlease update the configuration manually if necessary."
7009 #: builtin/remote.c:683
7011 msgid "Could not append '%s'"
7014 #: builtin/remote.c:694
7016 msgid "Could not set '%s'"
7019 #: builtin/remote.c:716
7021 msgid "deleting '%s' failed"
7024 #: builtin/remote.c:750
7026 msgid "creating '%s' failed"
7029 #: builtin/remote.c:764
7031 msgid "Could not remove branch %s"
7034 #: builtin/remote.c:834
7036 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7037 "to delete it, use:"
7039 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7040 "to delete them, use:"
7044 #: builtin/remote.c:943
7046 msgid " new (next fetch will store in remotes/%s)"
7049 #: builtin/remote.c:946
7053 #: builtin/remote.c:948
7054 msgid " stale (use 'git remote prune' to remove)"
7057 #: builtin/remote.c:950
7061 #: builtin/remote.c:991
7063 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7066 #: builtin/remote.c:998
7068 msgid "rebases onto remote %s"
7071 #: builtin/remote.c:1001
7073 msgid " merges with remote %s"
7076 #: builtin/remote.c:1002
7077 msgid " and with remote"
7080 #: builtin/remote.c:1004
7082 msgid "merges with remote %s"
7085 #: builtin/remote.c:1005
7086 msgid " and with remote"
7089 #: builtin/remote.c:1051
7093 #: builtin/remote.c:1054
7097 #: builtin/remote.c:1058
7101 #: builtin/remote.c:1061
7102 msgid "fast-forwardable"
7105 #: builtin/remote.c:1064
7106 msgid "local out of date"
7109 #: builtin/remote.c:1071
7111 msgid " %-*s forces to %-*s (%s)"
7114 #: builtin/remote.c:1074
7116 msgid " %-*s pushes to %-*s (%s)"
7119 #: builtin/remote.c:1078
7121 msgid " %-*s forces to %s"
7124 #: builtin/remote.c:1081
7126 msgid " %-*s pushes to %s"
7129 #: builtin/remote.c:1091
7130 msgid "do not query remotes"
7133 #: builtin/remote.c:1118
7138 #: builtin/remote.c:1119
7140 msgid " Fetch URL: %s"
7143 #: builtin/remote.c:1120 builtin/remote.c:1285
7147 #: builtin/remote.c:1129 builtin/remote.c:1131
7149 msgid " Push URL: %s"
7152 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
7154 msgid " HEAD branch: %s"
7157 #: builtin/remote.c:1139
7160 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
7163 #: builtin/remote.c:1151
7165 msgid " Remote branch:%s"
7166 msgid_plural " Remote branches:%s"
7170 #: builtin/remote.c:1154 builtin/remote.c:1181
7171 msgid " (status not queried)"
7174 #: builtin/remote.c:1163
7175 msgid " Local branch configured for 'git pull':"
7176 msgid_plural " Local branches configured for 'git pull':"
7180 #: builtin/remote.c:1171
7181 msgid " Local refs will be mirrored by 'git push'"
7184 #: builtin/remote.c:1178
7186 msgid " Local ref configured for 'git push'%s:"
7187 msgid_plural " Local refs configured for 'git push'%s:"
7191 #: builtin/remote.c:1199
7192 msgid "set refs/remotes/<name>/HEAD according to remote"
7195 #: builtin/remote.c:1201
7196 msgid "delete refs/remotes/<name>/HEAD"
7199 #: builtin/remote.c:1216
7200 msgid "Cannot determine remote HEAD"
7203 #: builtin/remote.c:1218
7204 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
7207 #: builtin/remote.c:1228
7209 msgid "Could not delete %s"
7212 #: builtin/remote.c:1236
7214 msgid "Not a valid ref: %s"
7217 #: builtin/remote.c:1238
7219 msgid "Could not setup %s"
7222 #: builtin/remote.c:1274
7224 msgid " %s will become dangling!"
7227 #: builtin/remote.c:1275
7229 msgid " %s has become dangling!"
7232 #: builtin/remote.c:1281
7237 #: builtin/remote.c:1282
7242 #: builtin/remote.c:1295
7244 msgid " * [would prune] %s"
7247 #: builtin/remote.c:1298
7249 msgid " * [pruned] %s"
7252 #: builtin/remote.c:1321
7253 msgid "prune remotes after fetching"
7256 #: builtin/remote.c:1387 builtin/remote.c:1461
7258 msgid "No such remote '%s'"
7261 #: builtin/remote.c:1407
7265 #: builtin/remote.c:1414
7266 msgid "no remote specified"
7269 #: builtin/remote.c:1436
7270 msgid "manipulate push URLs"
7273 #: builtin/remote.c:1438
7277 #: builtin/remote.c:1440
7281 #: builtin/remote.c:1447
7282 msgid "--add --delete doesn't make sense"
7285 #: builtin/remote.c:1487
7287 msgid "Invalid old URL pattern: %s"
7290 #: builtin/remote.c:1495
7292 msgid "No such URL found: %s"
7295 #: builtin/remote.c:1497
7296 msgid "Will not delete all non-push URLs"
7299 #: builtin/remote.c:1569
7300 msgid "be verbose; must be placed before a subcommand"
7303 #: builtin/replace.c:17
7304 msgid "git replace [-f] <object> <replacement>"
7307 #: builtin/replace.c:18
7308 msgid "git replace -d <object>..."
7311 #: builtin/replace.c:19
7312 msgid "git replace -l [<pattern>]"
7315 #: builtin/replace.c:121
7316 msgid "list replace refs"
7319 #: builtin/replace.c:122
7320 msgid "delete replace refs"
7323 #: builtin/replace.c:123
7324 msgid "replace the ref if it exists"
7327 #: builtin/rerere.c:11
7328 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
7331 #: builtin/rerere.c:56
7332 msgid "register clean resolutions in index"
7335 #: builtin/reset.c:25
7337 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
7340 #: builtin/reset.c:26
7341 msgid "git reset [-q] <commit> [--] <paths>..."
7344 #: builtin/reset.c:27
7345 msgid "git reset --patch [<commit>] [--] [<paths>...]"
7348 #: builtin/reset.c:33
7352 #: builtin/reset.c:33
7356 #: builtin/reset.c:33
7360 #: builtin/reset.c:33
7364 #: builtin/reset.c:33
7368 #: builtin/reset.c:77
7369 msgid "You do not have a valid HEAD."
7372 #: builtin/reset.c:79
7373 msgid "Failed to find tree of HEAD."
7376 #: builtin/reset.c:85
7378 msgid "Failed to find tree of %s."
7381 #: builtin/reset.c:96
7382 msgid "Could not write new index file."
7385 #: builtin/reset.c:106
7387 msgid "HEAD is now at %s"
7390 #: builtin/reset.c:130
7391 msgid "Could not read index"
7394 #: builtin/reset.c:133
7395 msgid "Unstaged changes after reset:"
7398 #: builtin/reset.c:223
7400 msgid "Cannot do a %s reset in the middle of a merge."
7403 #: builtin/reset.c:238
7404 msgid "be quiet, only report errors"
7407 #: builtin/reset.c:240
7408 msgid "reset HEAD and index"
7411 #: builtin/reset.c:241
7412 msgid "reset only HEAD"
7415 #: builtin/reset.c:243 builtin/reset.c:245
7416 msgid "reset HEAD, index and working tree"
7419 #: builtin/reset.c:247
7420 msgid "reset HEAD but keep local changes"
7423 #: builtin/reset.c:303
7425 msgid "Could not parse object '%s'."
7428 #: builtin/reset.c:308
7429 msgid "--patch is incompatible with --{hard,mixed,soft}"
7432 #: builtin/reset.c:317
7433 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
7436 #: builtin/reset.c:319
7438 msgid "Cannot do %s reset with paths."
7441 #: builtin/reset.c:331
7443 msgid "%s reset is not allowed in a bare repository"
7446 #: builtin/reset.c:347
7448 msgid "Could not reset index file to revision '%s'."
7451 #: builtin/rev-parse.c:339
7452 msgid "git rev-parse --parseopt [options] -- [<args>...]"
7455 #: builtin/rev-parse.c:344
7456 msgid "keep the `--` passed as an arg"
7459 #: builtin/rev-parse.c:346
7460 msgid "stop parsing after the first non-option argument"
7463 #: builtin/rev-parse.c:464
7465 "git rev-parse --parseopt [options] -- [<args>...]\n"
7466 " or: git rev-parse --sq-quote [<arg>...]\n"
7467 " or: git rev-parse [options] [<arg>...]\n"
7469 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
7472 #: builtin/revert.c:22
7473 msgid "git revert [options] <commit-ish>"
7476 #: builtin/revert.c:23
7477 msgid "git revert <subcommand>"
7480 #: builtin/revert.c:28
7481 msgid "git cherry-pick [options] <commit-ish>"
7484 #: builtin/revert.c:29
7485 msgid "git cherry-pick <subcommand>"
7488 #: builtin/revert.c:70 builtin/revert.c:92
7490 msgid "%s: %s cannot be used with %s"
7493 #: builtin/revert.c:103
7494 msgid "end revert or cherry-pick sequence"
7497 #: builtin/revert.c:104
7498 msgid "resume revert or cherry-pick sequence"
7501 #: builtin/revert.c:105
7502 msgid "cancel revert or cherry-pick sequence"
7505 #: builtin/revert.c:106
7506 msgid "don't automatically commit"
7509 #: builtin/revert.c:107
7510 msgid "edit the commit message"
7513 #: builtin/revert.c:110
7514 msgid "parent number"
7517 #: builtin/revert.c:112
7518 msgid "merge strategy"
7521 #: builtin/revert.c:113
7525 #: builtin/revert.c:114
7526 msgid "option for merge strategy"
7529 #: builtin/revert.c:125
7530 msgid "append commit name"
7533 #: builtin/revert.c:126
7534 msgid "allow fast-forward"
7537 #: builtin/revert.c:127
7538 msgid "preserve initially empty commits"
7541 #: builtin/revert.c:128
7542 msgid "allow commits with empty messages"
7545 #: builtin/revert.c:129
7546 msgid "keep redundant, empty commits"
7549 #: builtin/revert.c:133
7550 msgid "program error"
7553 #: builtin/revert.c:223
7554 msgid "revert failed"
7557 #: builtin/revert.c:238
7558 msgid "cherry-pick failed"
7562 msgid "git rm [options] [--] <file>..."
7565 #: builtin/rm.c:64 builtin/rm.c:186
7568 "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
7569 "(use 'rm -rf' if you really want to remove it including all of its history)"
7575 "'%s' has staged content different from both the file and the HEAD\n"
7576 "(use -f to force removal)"
7582 "'%s' has changes staged in the index\n"
7583 "(use --cached to keep the file, or -f to force removal)"
7589 "'%s' has local modifications\n"
7590 "(use --cached to keep the file, or -f to force removal)"
7594 msgid "do not list removed files"
7598 msgid "only remove from the index"
7602 msgid "override the up-to-date check"
7606 msgid "allow recursive removal"
7610 msgid "exit with a zero status even if nothing matched"
7615 msgid "not removing '%s' recursively without -r"
7620 msgid "git rm: unable to remove %s"
7623 #: builtin/shortlog.c:13
7624 msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
7627 #: builtin/shortlog.c:157
7629 msgid "Missing author: %s"
7632 #: builtin/shortlog.c:253
7633 msgid "sort output according to the number of commits per author"
7636 #: builtin/shortlog.c:255
7637 msgid "Suppress commit descriptions, only provides commit count"
7640 #: builtin/shortlog.c:257
7641 msgid "Show the email address of each author"
7644 #: builtin/shortlog.c:258
7648 #: builtin/shortlog.c:259
7649 msgid "Linewrap output"
7652 #: builtin/show-branch.c:9
7654 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
7655 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
7656 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
7660 #: builtin/show-branch.c:10
7661 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
7664 #: builtin/show-branch.c:651
7665 msgid "show remote-tracking and local branches"
7668 #: builtin/show-branch.c:653
7669 msgid "show remote-tracking branches"
7672 #: builtin/show-branch.c:655
7673 msgid "color '*!+-' corresponding to the branch"
7676 #: builtin/show-branch.c:657
7677 msgid "show <n> more commits after the common ancestor"
7680 #: builtin/show-branch.c:659
7681 msgid "synonym to more=-1"
7684 #: builtin/show-branch.c:660
7685 msgid "suppress naming strings"
7688 #: builtin/show-branch.c:662
7689 msgid "include the current branch"
7692 #: builtin/show-branch.c:664
7693 msgid "name commits with their object names"
7696 #: builtin/show-branch.c:666
7697 msgid "show possible merge bases"
7700 #: builtin/show-branch.c:668
7701 msgid "show refs unreachable from any other ref"
7704 #: builtin/show-branch.c:670
7705 msgid "show commits in topological order"
7708 #: builtin/show-branch.c:672
7709 msgid "show only commits not on the first branch"
7712 #: builtin/show-branch.c:674
7713 msgid "show merges reachable from only one tip"
7716 #: builtin/show-branch.c:676
7717 msgid "show commits where no parent comes before its children"
7720 #: builtin/show-branch.c:678
7721 msgid "<n>[,<base>]"
7724 #: builtin/show-branch.c:679
7725 msgid "show <n> most recent ref-log entries starting at base"
7728 #: builtin/show-ref.c:10
7730 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"
7731 "[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
7734 #: builtin/show-ref.c:11
7735 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
7738 #: builtin/show-ref.c:165
7739 msgid "only show tags (can be combined with heads)"
7742 #: builtin/show-ref.c:166
7743 msgid "only show heads (can be combined with tags)"
7746 #: builtin/show-ref.c:167
7747 msgid "stricter reference checking, requires exact ref path"
7750 #: builtin/show-ref.c:170 builtin/show-ref.c:172
7751 msgid "show the HEAD reference"
7754 #: builtin/show-ref.c:174
7755 msgid "dereference tags into object IDs"
7758 #: builtin/show-ref.c:176
7759 msgid "only show SHA1 hash using <n> digits"
7762 #: builtin/show-ref.c:180
7763 msgid "do not print results to stdout (useful with --verify)"
7766 #: builtin/show-ref.c:182
7767 msgid "show refs from stdin that aren't in local repository"
7770 #: builtin/symbolic-ref.c:7
7771 msgid "git symbolic-ref [options] name [ref]"
7774 #: builtin/symbolic-ref.c:8
7775 msgid "git symbolic-ref -d [-q] name"
7778 #: builtin/symbolic-ref.c:40
7779 msgid "suppress error message for non-symbolic (detached) refs"
7782 #: builtin/symbolic-ref.c:41
7783 msgid "delete symbolic ref"
7786 #: builtin/symbolic-ref.c:42
7787 msgid "shorten ref output"
7790 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
7794 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
7795 msgid "reason of the update"
7800 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
7804 msgid "git tag -d <tagname>..."
7809 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
7810 "\t\t[<pattern>...]"
7814 msgid "git tag -v <tagname>..."
7819 msgid "malformed object at '%s'"
7822 #: builtin/tag.c:207
7824 msgid "tag name too long: %.*s..."
7827 #: builtin/tag.c:212
7829 msgid "tag '%s' not found."
7832 #: builtin/tag.c:227
7834 msgid "Deleted tag '%s' (was %s)\n"
7837 #: builtin/tag.c:239
7839 msgid "could not verify the tag '%s'"
7842 #: builtin/tag.c:249
7846 "# Write a tag message\n"
7847 "# Lines starting with '#' will be ignored.\n"
7851 #: builtin/tag.c:256
7855 "# Write a tag message\n"
7856 "# Lines starting with '#' will be kept; you may remove them yourself if you "
7861 #: builtin/tag.c:298
7862 msgid "unable to sign the tag"
7865 #: builtin/tag.c:300
7866 msgid "unable to write tag file"
7869 #: builtin/tag.c:325
7870 msgid "bad object type."
7873 #: builtin/tag.c:338
7874 msgid "tag header too big."
7877 #: builtin/tag.c:370
7878 msgid "no tag message?"
7881 #: builtin/tag.c:376
7883 msgid "The tag message has been left in %s\n"
7886 #: builtin/tag.c:425
7887 msgid "switch 'points-at' requires an object"
7890 #: builtin/tag.c:427
7892 msgid "malformed object name '%s'"
7895 #: builtin/tag.c:447
7896 msgid "list tag names"
7899 #: builtin/tag.c:449
7900 msgid "print <n> lines of each tag message"
7903 #: builtin/tag.c:451
7907 #: builtin/tag.c:452
7911 #: builtin/tag.c:454
7912 msgid "Tag creation options"
7915 #: builtin/tag.c:456
7916 msgid "annotated tag, needs a message"
7919 #: builtin/tag.c:458
7923 #: builtin/tag.c:460
7924 msgid "annotated and GPG-signed tag"
7927 #: builtin/tag.c:464
7928 msgid "use another key to sign the tag"
7931 #: builtin/tag.c:465
7932 msgid "replace the tag if exists"
7935 #: builtin/tag.c:466
7936 msgid "show tag list in columns"
7939 #: builtin/tag.c:468
7940 msgid "Tag listing options"
7943 #: builtin/tag.c:471
7944 msgid "print only tags that contain the commit"
7947 #: builtin/tag.c:477
7948 msgid "print only tags of the object"
7951 #: builtin/tag.c:506
7952 msgid "--column and -n are incompatible"
7955 #: builtin/tag.c:523
7956 msgid "-n option is only allowed with -l."
7959 #: builtin/tag.c:525
7960 msgid "--contains option is only allowed with -l."
7963 #: builtin/tag.c:527
7964 msgid "--points-at option is only allowed with -l."
7967 #: builtin/tag.c:535
7968 msgid "only one -F or -m option is allowed."
7971 #: builtin/tag.c:555
7972 msgid "too many params"
7975 #: builtin/tag.c:561
7977 msgid "'%s' is not a valid tag name."
7980 #: builtin/tag.c:566
7982 msgid "tag '%s' already exists"
7985 #: builtin/tag.c:584
7987 msgid "%s: cannot lock the ref"
7990 #: builtin/tag.c:586
7992 msgid "%s: cannot update the ref"
7995 #: builtin/tag.c:588
7997 msgid "Updated tag '%s' (was %s)\n"
8000 #: builtin/update-index.c:401
8001 msgid "git update-index [options] [--] [<file>...]"
8004 #: builtin/update-index.c:718
8005 msgid "continue refresh even when index needs update"
8008 #: builtin/update-index.c:721
8009 msgid "refresh: ignore submodules"
8012 #: builtin/update-index.c:724
8013 msgid "do not ignore new files"
8016 #: builtin/update-index.c:726
8017 msgid "let files replace directories and vice-versa"
8020 #: builtin/update-index.c:728
8021 msgid "notice files missing from worktree"
8024 #: builtin/update-index.c:730
8025 msgid "refresh even if index contains unmerged entries"
8028 #: builtin/update-index.c:733
8029 msgid "refresh stat information"
8032 #: builtin/update-index.c:737
8033 msgid "like --refresh, but ignore assume-unchanged setting"
8036 #: builtin/update-index.c:741
8037 msgid "<mode> <object> <path>"
8040 #: builtin/update-index.c:742
8041 msgid "add the specified entry to the index"
8044 #: builtin/update-index.c:746
8048 #: builtin/update-index.c:747
8049 msgid "override the executable bit of the listed files"
8052 #: builtin/update-index.c:751
8053 msgid "mark files as \"not changing\""
8056 #: builtin/update-index.c:754
8057 msgid "clear assumed-unchanged bit"
8060 #: builtin/update-index.c:757
8061 msgid "mark files as \"index-only\""
8064 #: builtin/update-index.c:760
8065 msgid "clear skip-worktree bit"
8068 #: builtin/update-index.c:763
8069 msgid "add to index only; do not add content to object database"
8072 #: builtin/update-index.c:765
8073 msgid "remove named paths even if present in worktree"
8076 #: builtin/update-index.c:767
8077 msgid "with --stdin: input lines are terminated by null bytes"
8080 #: builtin/update-index.c:769
8081 msgid "read list of paths to be updated from standard input"
8084 #: builtin/update-index.c:773
8085 msgid "add entries from standard input to the index"
8088 #: builtin/update-index.c:777
8089 msgid "repopulate stages #2 and #3 for the listed paths"
8092 #: builtin/update-index.c:781
8093 msgid "only update entries that differ from HEAD"
8096 #: builtin/update-index.c:785
8097 msgid "ignore files missing from worktree"
8100 #: builtin/update-index.c:788
8101 msgid "report actions to standard output"
8104 #: builtin/update-index.c:790
8105 msgid "(for porcelains) forget saved unresolved conflicts"
8108 #: builtin/update-index.c:794
8109 msgid "write index in this format"
8112 #: builtin/update-ref.c:7
8113 msgid "git update-ref [options] -d <refname> [<oldval>]"
8116 #: builtin/update-ref.c:8
8117 msgid "git update-ref [options] <refname> <newval> [<oldval>]"
8120 #: builtin/update-ref.c:19
8121 msgid "delete the reference"
8124 #: builtin/update-ref.c:21
8125 msgid "update <refname> not the one it points to"
8128 #: builtin/update-server-info.c:6
8129 msgid "git update-server-info [--force]"
8132 #: builtin/update-server-info.c:14
8133 msgid "update the info files from scratch"
8136 #: builtin/verify-pack.c:56
8137 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8140 #: builtin/verify-pack.c:66
8144 #: builtin/verify-pack.c:68
8145 msgid "show statistics only"
8148 #: builtin/verify-tag.c:17
8149 msgid "git verify-tag [-v|--verbose] <tag>..."
8152 #: builtin/verify-tag.c:73
8153 msgid "print tag contents"
8156 #: builtin/write-tree.c:13
8157 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
8160 #: builtin/write-tree.c:26
8164 #: builtin/write-tree.c:27
8165 msgid "write tree object for a subdirectory <prefix>"
8168 #: builtin/write-tree.c:30
8169 msgid "only useful for debugging"
8173 msgid "See 'git help <command>' for more information on a specific command."
8176 #: parse-options.h:156
8177 msgid "no-op (backward compatibility)"
8180 #: parse-options.h:228
8181 msgid "be more verbose"
8184 #: parse-options.h:230
8185 msgid "be more quiet"
8188 #: parse-options.h:236
8189 msgid "use <n> digits to display SHA-1s"
8193 msgid "Add file contents to the index"
8197 msgid "Find by binary search the change that introduced a bug"
8201 msgid "List, create, or delete branches"
8205 msgid "Checkout a branch or paths to the working tree"
8209 msgid "Clone a repository into a new directory"
8213 msgid "Record changes to the repository"
8217 msgid "Show changes between commits, commit and working tree, etc"
8221 msgid "Download objects and refs from another repository"
8225 msgid "Print lines matching a pattern"
8229 msgid "Create an empty git repository or reinitialize an existing one"
8233 msgid "Show commit logs"
8237 msgid "Join two or more development histories together"
8241 msgid "Move or rename a file, a directory, or a symlink"
8245 msgid "Fetch from and merge with another repository or a local branch"
8249 msgid "Update remote refs along with associated objects"
8253 msgid "Forward-port local commits to the updated upstream head"
8257 msgid "Reset current HEAD to the specified state"
8261 msgid "Remove files from the working tree and from the index"
8265 msgid "Show various types of objects"
8269 msgid "Show the working tree status"
8273 msgid "Create, list, delete or verify a tag object signed with GPG"
8277 msgid "You need to set your committer info first"
8282 "You seem to have moved HEAD since the last 'am' failure.\n"
8283 "Not rewinding to ORIG_HEAD"
8289 "When you have resolved this problem, run \"$cmdline --resolved\".\n"
8290 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8291 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
8295 msgid "Cannot fall back to three-way merge."
8299 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
8303 msgid "Using index info to reconstruct a base tree..."
8308 "Did you hand edit your patch?\n"
8309 "It does not apply to blobs recorded in its index."
8313 msgid "Falling back to patching base and 3-way merge..."
8317 msgid "Failed to merge in the changes."
8321 msgid "Only one StGIT patch series can be applied at once"
8326 msgid "Patch format $patch_format is not supported."
8330 msgid "Patch format detection failed."
8335 "The -b/--binary option has been a no-op for long time, and\n"
8336 "it will be removed. Please do not use it anymore."
8341 msgid "previous rebase directory $dotest still exists but mbox given."
8345 msgid "Please make up your mind. --skip or --abort?"
8349 msgid "Resolve operation not in progress, we are not resuming."
8354 msgid "Dirty index: cannot apply patches (dirty: $files)"
8360 "Patch is empty. Was it split wrong?\n"
8361 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
8362 "To restore the original branch and stop patching run \"$cmdline --abort\"."
8366 msgid "Patch does not have a valid e-mail address."
8370 msgid "cannot be interactive without stdin connected to a terminal."
8374 msgid "Commit Body is:"
8377 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
8378 #. in your translation. The program will only accept English
8379 #. input at this point.
8381 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8386 msgid "Applying: $FIRSTLINE"
8391 "No changes - did you forget to use 'git add'?\n"
8392 "If there is nothing left to stage, chances are that something else\n"
8393 "already introduced the same changes; you might want to skip this patch."
8398 "You still have unmerged paths in your index\n"
8399 "did you forget to use 'git add'?"
8403 msgid "No changes -- Patch already applied."
8408 msgid "Patch failed at $msgnum $FIRSTLINE"
8414 "The copy of the patch that failed is found in:\n"
8419 msgid "applying to an empty history"
8423 msgid "You need to start by \"git bisect start\""
8426 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8427 #. translation. The program will only accept English input
8430 msgid "Do you want me to do it for you [Y/n]? "
8435 msgid "unrecognised option: '$arg'"
8440 msgid "'$arg' does not appear to be a valid revision"
8443 #: git-bisect.sh:117
8444 msgid "Bad HEAD - I need a HEAD"
8447 #: git-bisect.sh:130
8450 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
8453 #: git-bisect.sh:140
8454 msgid "won't bisect on seeked tree"
8457 #: git-bisect.sh:144
8458 msgid "Bad HEAD - strange symbolic ref"
8461 #: git-bisect.sh:189
8463 msgid "Bad bisect_write argument: $state"
8466 #: git-bisect.sh:218
8468 msgid "Bad rev input: $arg"
8471 #: git-bisect.sh:232
8472 msgid "Please call 'bisect_state' with at least one argument."
8475 #: git-bisect.sh:244
8477 msgid "Bad rev input: $rev"
8480 #: git-bisect.sh:250
8481 msgid "'git bisect bad' can take only one argument."
8484 #. have bad but not good. we could bisect although
8485 #. this is less optimum.
8486 #: git-bisect.sh:273
8487 msgid "Warning: bisecting only with a bad commit."
8490 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8491 #. translation. The program will only accept English input
8493 #: git-bisect.sh:279
8494 msgid "Are you sure [Y/n]? "
8497 #: git-bisect.sh:289
8499 "You need to give me at least one good and one bad revisions.\n"
8500 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8503 #: git-bisect.sh:292
8505 "You need to start by \"git bisect start\".\n"
8506 "You then need to give me at least one good and one bad revisions.\n"
8507 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8510 #: git-bisect.sh:347 git-bisect.sh:474
8511 msgid "We are not bisecting."
8514 #: git-bisect.sh:354
8516 msgid "'$invalid' is not a valid commit"
8519 #: git-bisect.sh:363
8522 "Could not check out original HEAD '$branch'.\n"
8523 "Try 'git bisect reset <commit>'."
8526 #: git-bisect.sh:390
8527 msgid "No logfile given"
8530 #: git-bisect.sh:391
8532 msgid "cannot read $file for replaying"
8535 #: git-bisect.sh:408
8536 msgid "?? what are you talking about?"
8539 #: git-bisect.sh:420
8541 msgid "running $command"
8544 #: git-bisect.sh:427
8547 "bisect run failed:\n"
8548 "exit code $res from '$command' is < 0 or >= 128"
8551 #: git-bisect.sh:453
8552 msgid "bisect run cannot continue any more"
8555 #: git-bisect.sh:459
8558 "bisect run failed:\n"
8559 "'bisect_state $state' exited with error code $res"
8562 #: git-bisect.sh:466
8563 msgid "bisect run success"
8568 "Pull is not possible because you have unmerged files.\n"
8569 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
8570 "as appropriate to mark resolution, or use 'git commit -a'."
8574 msgid "Pull is not possible because you have unmerged files."
8578 msgid "updating an unborn branch with changes added to the index"
8581 #. The fetch involved updating the current branch.
8582 #. The working tree and the index file is still based on the
8583 #. $orig_head commit, but we are merging into $curr_head.
8584 #. First update the working tree to match $curr_head.
8588 "Warning: fetch updated the current branch head.\n"
8589 "Warning: fast-forwarding your working tree from\n"
8590 "Warning: commit $orig_head."
8594 msgid "Cannot merge multiple branches into empty head"
8598 msgid "Cannot rebase onto multiple branches"
8603 "When you have resolved this problem, run \"git rebase --continue\".\n"
8604 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
8605 "To check out the original branch and stop rebasing, run \"git rebase --abort"
8609 #: git-rebase.sh:160
8610 msgid "The pre-rebase hook refused to rebase."
8613 #: git-rebase.sh:165
8614 msgid "It looks like git-am is in progress. Cannot rebase."
8617 #: git-rebase.sh:296
8618 msgid "The --exec option must be used with the --interactive option"
8621 #: git-rebase.sh:301
8622 msgid "No rebase in progress?"
8625 #: git-rebase.sh:312
8626 msgid "The --edit-todo action can only be used during interactive rebase."
8629 #: git-rebase.sh:319
8630 msgid "Cannot read HEAD"
8633 #: git-rebase.sh:322
8635 "You must edit all merge conflicts and then\n"
8636 "mark them as resolved using git add"
8639 #: git-rebase.sh:340
8641 msgid "Could not move back to $head_name"
8644 #: git-rebase.sh:359
8647 "It seems that there is already a $state_dir_base directory, and\n"
8648 "I wonder if you are in the middle of another rebase. If that is the\n"
8649 "case, please try\n"
8650 "\t$cmd_live_rebase\n"
8651 "If that is not the case, please\n"
8652 "\t$cmd_clear_stale_rebase\n"
8653 "and run me again. I am stopping in case you still have something\n"
8657 #: git-rebase.sh:404
8659 msgid "invalid upstream $upstream_name"
8662 #: git-rebase.sh:428
8664 msgid "$onto_name: there are more than one merge bases"
8667 #: git-rebase.sh:431 git-rebase.sh:435
8669 msgid "$onto_name: there is no merge base"
8672 #: git-rebase.sh:440
8674 msgid "Does not point to a valid commit: $onto_name"
8677 #: git-rebase.sh:463
8679 msgid "fatal: no such branch: $branch_name"
8682 #: git-rebase.sh:483
8683 msgid "Please commit or stash them."
8686 #: git-rebase.sh:501
8688 msgid "Current branch $branch_name is up to date."
8691 #: git-rebase.sh:504
8693 msgid "Current branch $branch_name is up to date, rebase forced."
8696 #: git-rebase.sh:515
8698 msgid "Changes from $mb to $onto:"
8701 #. Detach HEAD and reset the tree
8702 #: git-rebase.sh:524
8703 msgid "First, rewinding head to replay your work on top of it..."
8706 #: git-rebase.sh:532
8708 msgid "Fast-forwarded $branch_name to $onto_name."
8712 msgid "git stash clear with parameters is unimplemented"
8716 msgid "You do not have the initial commit yet"
8720 msgid "Cannot save the current index state"
8723 #: git-stash.sh:123 git-stash.sh:136
8724 msgid "Cannot save the current worktree state"
8728 msgid "No changes selected"
8732 msgid "Cannot remove temporary index (can't happen)"
8736 msgid "Cannot record working tree state"
8739 #. TRANSLATORS: $option is an invalid option, like
8740 #. `--blah-blah'. The 7 spaces at the beginning of the
8741 #. second line correspond to "error: ". So you should line
8742 #. up the second line with however many characters the
8743 #. translation of "error: " takes in your language. E.g. in
8746 #. $ git stash save --blah-blah 2>&1 | head -n 2
8747 #. error: unknown option for 'stash save': --blah-blah
8748 #. To provide a message, use git stash save -- '--blah-blah'
8752 "error: unknown option for 'stash save': $option\n"
8753 " To provide a message, use git stash save -- '$option'"
8757 msgid "No local changes to save"
8761 msgid "Cannot initialize stash"
8765 msgid "Cannot save the current status"
8769 msgid "Cannot remove worktree changes"
8773 msgid "No stash found."
8778 msgid "Too many revisions specified: $REV"
8783 msgid "$reference is not valid reference"
8788 msgid "'$args' is not a stash-like commit"
8793 msgid "'$args' is not a stash reference"
8797 msgid "unable to refresh index"
8801 msgid "Cannot apply a stash in the middle of a merge"
8805 msgid "Conflicts in index. Try without --index."
8809 msgid "Could not save index tree"
8813 msgid "Cannot unstage modified files"
8817 msgid "Index was not unstashed."
8822 msgid "Dropped ${REV} ($s)"
8827 msgid "${REV}: Could not drop stash entry"
8831 msgid "No branch name specified"
8835 msgid "(To restore them type \"git stash apply\")"
8838 #: git-submodule.sh:89
8840 msgid "cannot strip one component off url '$remoteurl'"
8843 #: git-submodule.sh:168
8845 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
8848 #: git-submodule.sh:211
8850 msgid "Clone of '$url' into submodule path '$sm_path' failed"
8853 #: git-submodule.sh:223
8855 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
8858 #: git-submodule.sh:316
8860 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
8863 #: git-submodule.sh:333
8865 msgid "'$sm_path' already exists in the index"
8868 #: git-submodule.sh:337
8871 "The following path is ignored by one of your .gitignore files:\n"
8873 "Use -f if you really want to add it."
8876 #: git-submodule.sh:355
8878 msgid "Adding existing repo at '$sm_path' to the index"
8881 #: git-submodule.sh:357
8883 msgid "'$sm_path' already exists and is not a valid git repo"
8886 #: git-submodule.sh:365
8888 msgid "A git directory for '$sm_name' is found locally with remote(s):"
8891 #: git-submodule.sh:367
8894 "If you want to reuse this local git directory instead of cloning again from"
8897 #: git-submodule.sh:369
8900 "use the '--force' option. If the local git directory is not the correct repo"
8903 #: git-submodule.sh:370
8906 "or you are unsure what this means choose another name with the '--name' "
8910 #: git-submodule.sh:372
8912 msgid "Reactivating local git directory for submodule '$sm_name'."
8915 #: git-submodule.sh:384
8917 msgid "Unable to checkout submodule '$sm_path'"
8920 #: git-submodule.sh:389
8922 msgid "Failed to add submodule '$sm_path'"
8925 #: git-submodule.sh:394
8927 msgid "Failed to register submodule '$sm_path'"
8930 #: git-submodule.sh:437
8932 msgid "Entering '$prefix$sm_path'"
8935 #: git-submodule.sh:451
8937 msgid "Stopping at '$sm_path'; script returned non-zero status."
8940 #: git-submodule.sh:495
8942 msgid "No url found for submodule path '$sm_path' in .gitmodules"
8945 #: git-submodule.sh:504
8947 msgid "Failed to register url for submodule path '$sm_path'"
8950 #: git-submodule.sh:506
8952 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
8955 #: git-submodule.sh:514
8957 msgid "Failed to register update mode for submodule path '$sm_path'"
8960 #: git-submodule.sh:614
8963 "Submodule path '$sm_path' not initialized\n"
8964 "Maybe you want to use 'update --init'?"
8967 #: git-submodule.sh:627
8969 msgid "Unable to find current revision in submodule path '$sm_path'"
8972 #: git-submodule.sh:646
8974 msgid "Unable to fetch in submodule path '$sm_path'"
8977 #: git-submodule.sh:660
8979 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
8982 #: git-submodule.sh:661
8984 msgid "Submodule path '$sm_path': rebased into '$sha1'"
8987 #: git-submodule.sh:666
8989 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
8992 #: git-submodule.sh:667
8994 msgid "Submodule path '$sm_path': merged in '$sha1'"
8997 #: git-submodule.sh:672
8999 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
9002 #: git-submodule.sh:673
9004 msgid "Submodule path '$sm_path': checked out '$sha1'"
9007 #: git-submodule.sh:695 git-submodule.sh:1017
9009 msgid "Failed to recurse into submodule path '$sm_path'"
9012 #: git-submodule.sh:803
9013 msgid "The --cached option cannot be used with the --files option"
9017 #: git-submodule.sh:843
9019 msgid "unexpected mode $mod_dst"
9022 #: git-submodule.sh:861
9024 msgid " Warn: $name doesn't contain commit $sha1_src"
9027 #: git-submodule.sh:864
9029 msgid " Warn: $name doesn't contain commit $sha1_dst"
9032 #: git-submodule.sh:867
9034 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9037 #: git-submodule.sh:892
9041 #: git-submodule.sh:930
9042 msgid "# Submodules changed but not updated:"
9045 #: git-submodule.sh:932
9046 msgid "# Submodule changes to be committed:"
9049 #: git-submodule.sh:1080
9051 msgid "Synchronizing submodule url for '$prefix$sm_path'"