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-09-15 10:21+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:1079
68 msgid "prepend prefix to each pathname in the archive"
71 #: archive.c:325 builtin/archive.c:91 builtin/blame.c:2332
72 #: builtin/blame.c:2333 builtin/config.c:56 builtin/fast-export.c:642
73 #: builtin/fast-export.c:644 builtin/grep.c:800 builtin/hash-object.c:77
74 #: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:537
75 #: builtin/notes.c:694 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:616
119 #: archive.c:347 builtin/archive.c:96
120 msgid "path to the remote git-upload-archive command"
125 msgid "'%s' does not look like a v2 bundle file"
130 msgid "unrecognized header: %s%s (%d)"
133 #: bundle.c:89 builtin/commit.c:714
135 msgid "could not open '%s'"
139 msgid "Repository lacks these prerequisite commits:"
142 #: bundle.c:164 sequencer.c:557 sequencer.c:989 builtin/log.c:290
143 #: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347
144 #: builtin/shortlog.c:181
145 msgid "revision walk setup failed"
150 msgid "The bundle contains %d ref"
151 msgid_plural "The bundle contains %d refs"
156 msgid "The bundle records a complete history."
161 msgid "The bundle requires this ref"
162 msgid_plural "The bundle requires these %d refs"
167 msgid "rev-list died"
170 #: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284
172 msgid "unrecognized argument: %s"
177 msgid "ref '%s' is excluded by the rev-list options"
181 msgid "Refusing to create empty bundle."
185 msgid "Could not spawn pack-objects"
189 msgid "pack-objects died"
194 msgid "cannot create '%s'"
198 msgid "index-pack died"
203 msgid "could not parse %s"
208 msgid "%s %s is not a commit!"
211 #: compat/obstack.c:406 compat/obstack.c:408
212 msgid "memory exhausted"
216 msgid "Could not run 'git rev-list'"
221 msgid "failed write to rev-list: %s"
226 msgid "failed to close rev-list's stdin: %s"
230 msgid "in the future"
235 msgid "%lu second ago"
236 msgid_plural "%lu seconds ago"
242 msgid "%lu minute ago"
243 msgid_plural "%lu minutes ago"
250 msgid_plural "%lu hours ago"
257 msgid_plural "%lu days ago"
264 msgid_plural "%lu weeks ago"
270 msgid "%lu month ago"
271 msgid_plural "%lu months ago"
278 msgid_plural "%lu years"
284 msgid "%s, %lu month ago"
285 msgid_plural "%s, %lu months ago"
289 #: date.c:154 date.c:159
292 msgid_plural "%lu years ago"
298 msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
303 msgid " Unknown dirstat parameter '%.*s'\n"
309 "Found errors in 'diff.dirstat' config variable:\n"
314 msgid " 0 files changed"
319 msgid " %d file changed"
320 msgid_plural " %d files changed"
326 msgid ", %d insertion(+)"
327 msgid_plural ", %d insertions(+)"
333 msgid ", %d deletion(-)"
334 msgid_plural ", %d deletions(-)"
341 "Failed to parse --dirstat/-X option parameter:\n"
345 #: gpg-interface.c:59
346 msgid "could not run gpg."
349 #: gpg-interface.c:71
350 msgid "gpg did not accept the data"
353 #: gpg-interface.c:82
354 msgid "gpg failed to sign the data"
359 msgid "'%s': unable to read %s"
369 msgid "'%s': short read %s"
374 msgid "available git commands in '%s'"
378 msgid "git commands available from elsewhere on your $PATH"
384 "'%s' appears to be a git command, but we were not\n"
385 "able to execute it. Maybe git-%s is broken?"
389 msgid "Uh oh. Your system reports no Git commands at all."
395 "WARNING: You called a Git command named '%s', which does not exist.\n"
396 "Continuing under the assumption that you meant '%s'"
401 msgid "in %0.1f seconds automatically..."
406 msgid "git: '%s' is not a git command. See 'git --help'."
415 "Did you mean one of these?"
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:869
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:696
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"
695 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
697 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
704 "Your branch and '%s' have diverged,\n"
705 "and have %d and %d different commit each, respectively.\n"
707 "Your branch and '%s' have diverged,\n"
708 "and have %d and %d different commits each, respectively.\n"
712 #: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977
713 #: builtin/merge.c:1087 builtin/merge.c:1097
715 msgid "Could not open '%s' for writing"
718 #: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867
719 #: builtin/merge.c:1089 builtin/merge.c:1102
721 msgid "Could not write to '%s'"
726 "after resolving the conflicts, mark the corrected paths\n"
727 "with 'git add <paths>' or 'git rm <paths>'"
732 "after resolving the conflicts, mark the corrected paths\n"
733 "with 'git add <paths>' or 'git rm <paths>'\n"
734 "and commit the result with 'git commit'"
737 #: sequencer.c:160 sequencer.c:765 sequencer.c:848
739 msgid "Could not write to %s"
744 msgid "Error wrapping up %s"
748 msgid "Your local changes would be overwritten by cherry-pick."
752 msgid "Your local changes would be overwritten by revert."
756 msgid "Commit your changes or stash them to proceed."
759 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
762 msgid "%s: Unable to write new index file"
766 msgid "Could not resolve HEAD commit\n"
770 msgid "Unable to update cache tree\n"
775 msgid "Could not parse commit %s\n"
780 msgid "Could not parse parent commit %s\n"
784 msgid "Your index file is unmerged."
788 msgid "You do not have a valid HEAD"
793 msgid "Commit %s is a merge but no -m option was given."
798 msgid "Commit %s does not have parent %d"
803 msgid "Mainline was specified but commit %s is not a merge."
806 #. TRANSLATORS: The first %s will be "revert" or
807 #. "cherry-pick", the second %s a SHA1
810 msgid "%s: cannot parse parent commit %s"
815 msgid "Cannot get commit message for %s"
820 msgid "could not revert %s... %s"
825 msgid "could not apply %s... %s"
829 msgid "empty commit set passed"
834 msgid "git %s: failed to read the index"
839 msgid "git %s: failed to refresh the index"
844 msgid "Cannot %s during a %s"
849 msgid "Could not parse line %d."
853 msgid "No commits parsed."
858 msgid "Could not open %s"
863 msgid "Could not read %s."
868 msgid "Unusable instruction sheet: %s"
873 msgid "Invalid key: %s"
878 msgid "Invalid value for %s: %s"
883 msgid "Malformed options sheet: %s"
887 msgid "a cherry-pick or revert is already in progress"
891 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
896 msgid "Could not create sequencer directory %s"
899 #: sequencer.c:767 sequencer.c:852
901 msgid "Error wrapping up %s."
904 #: sequencer.c:786 sequencer.c:920
905 msgid "no cherry-pick or revert in progress"
909 msgid "cannot resolve HEAD"
913 msgid "cannot abort from a branch yet to be born"
916 #: sequencer.c:812 builtin/apply.c:4005
918 msgid "cannot open %s: %s"
923 msgid "cannot read %s: %s"
927 msgid "unexpected end of file"
932 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
937 msgid "Could not format %s."
941 msgid "Can't revert as initial commit"
945 msgid "Can't cherry-pick into empty head"
949 msgid "HEAD does not point to a branch"
954 msgid "No such branch: '%s'"
959 msgid "No upstream configured for branch '%s'"
964 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
969 msgid "unable to access '%s': %s"
974 msgid "unable to look up current user in the passwd file: %s"
982 msgid "Unmerged paths:"
985 #: wt-status.c:167 wt-status.c:194
987 msgid " (use \"git reset %s <file>...\" to unstage)"
990 #: wt-status.c:169 wt-status.c:196
991 msgid " (use \"git rm --cached <file>...\" to unstage)"
995 msgid " (use \"git add <file>...\" to mark resolution)"
998 #: wt-status.c:175 wt-status.c:179
999 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1003 msgid " (use \"git rm <file>...\" to mark resolution)"
1007 msgid "Changes to be committed:"
1011 msgid "Changes not staged for commit:"
1015 msgid " (use \"git add <file>...\" to update what will be committed)"
1019 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1024 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1028 msgid " (commit or discard the untracked or modified content in submodules)"
1033 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1041 msgid "both deleted:"
1045 msgid "added by us:"
1049 msgid "deleted by them:"
1053 msgid "added by them:"
1057 msgid "deleted by us:"
1065 msgid "both modified:"
1069 msgid "new commits, "
1073 msgid "modified content, "
1077 msgid "untracked content, "
1082 msgid "new file: %s"
1087 msgid "copied: %s -> %s"
1097 msgid "modified: %s"
1102 msgid "renamed: %s -> %s"
1107 msgid "typechange: %s"
1117 msgid "unmerged: %s"
1122 msgid "bug: unhandled diff status %c"
1126 msgid "You have unmerged paths."
1129 #: wt-status.c:788 wt-status.c:912
1130 msgid " (fix conflicts and run \"git commit\")"
1134 msgid "All conflicts fixed but you are still merging."
1138 msgid " (use \"git commit\" to conclude merge)"
1142 msgid "You are in the middle of an am session."
1146 msgid "The current patch is empty."
1150 msgid " (fix conflicts and then run \"git am --resolved\")"
1154 msgid " (use \"git am --skip\" to skip this patch)"
1158 msgid " (use \"git am --abort\" to restore the original branch)"
1161 #: wt-status.c:873 wt-status.c:883
1162 msgid "You are currently rebasing."
1166 msgid " (fix conflicts and then run \"git rebase --continue\")"
1170 msgid " (use \"git rebase --skip\" to skip this patch)"
1174 msgid " (use \"git rebase --abort\" to check out the original branch)"
1178 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1182 msgid "You are currently splitting a commit during a rebase."
1186 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1190 msgid "You are currently editing a commit during a rebase."
1194 msgid " (use \"git commit --amend\" to amend the current commit)"
1199 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1203 msgid "You are currently cherry-picking."
1207 msgid " (all conflicts fixed: run \"git commit\")"
1211 msgid "You are currently bisecting."
1215 msgid " (use \"git bisect reset\" to get back to the original branch)"
1223 msgid "Not currently on any branch."
1227 msgid "Initial commit"
1231 msgid "Untracked files"
1235 msgid "Ignored files"
1240 msgid "Untracked files not listed%s"
1244 msgid " (use -u option to show untracked files)"
1253 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1258 msgid "no changes added to commit\n"
1264 "nothing added to commit but untracked files present (use \"git add\" to "
1270 msgid "nothing added to commit but untracked files present\n"
1275 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1278 #: wt-status.c:1043 wt-status.c:1048
1280 msgid "nothing to commit\n"
1285 msgid "nothing to commit (use -u to show untracked files)\n"
1290 msgid "nothing to commit, working directory clean\n"
1294 msgid "HEAD (no branch)"
1298 msgid "Initial commit on "
1305 #: wt-status.c:1182 wt-status.c:1185
1313 #: compat/precompose_utf8.c:58 builtin/clone.c:341
1315 msgid "failed to unlink '%s'"
1319 msgid "git add [options] [--] <filepattern>..."
1324 msgid "unexpected diff status %c"
1327 #: builtin/add.c:67 builtin/commit.c:229
1328 msgid "updating files failed"
1333 msgid "remove '%s'\n"
1336 #: builtin/add.c:176
1338 msgid "Path '%s' is in submodule '%.*s'"
1341 #: builtin/add.c:192
1342 msgid "Unstaged changes after refreshing the index:"
1345 #: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186
1347 msgid "pathspec '%s' did not match any files"
1350 #: builtin/add.c:209
1352 msgid "'%s' is beyond a symbolic link"
1355 #: builtin/add.c:276
1356 msgid "Could not read the index"
1359 #: builtin/add.c:286
1361 msgid "Could not open '%s' for writing."
1364 #: builtin/add.c:290
1365 msgid "Could not write patch"
1368 #: builtin/add.c:295
1370 msgid "Could not stat '%s'"
1373 #: builtin/add.c:297
1374 msgid "Empty patch. Aborted."
1377 #: builtin/add.c:303
1379 msgid "Could not apply '%s'"
1382 #: builtin/add.c:313
1383 msgid "The following paths are ignored by one of your .gitignore files:\n"
1386 #: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63
1387 #: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253
1392 #: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1187
1393 #: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477
1394 #: builtin/mv.c:62 builtin/read-tree.c:112
1398 #: builtin/add.c:322
1399 msgid "interactive picking"
1402 #: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248
1403 msgid "select hunks interactively"
1406 #: builtin/add.c:324
1407 msgid "edit current diff and apply"
1410 #: builtin/add.c:325
1411 msgid "allow adding otherwise ignored files"
1414 #: builtin/add.c:326
1415 msgid "update tracked files"
1418 #: builtin/add.c:327
1419 msgid "record only the fact that the path will be added later"
1422 #: builtin/add.c:328
1423 msgid "add changes from all tracked and untracked files"
1426 #: builtin/add.c:329
1427 msgid "don't add, only refresh the index"
1430 #: builtin/add.c:330
1431 msgid "just skip files which cannot be added because of errors"
1434 #: builtin/add.c:331
1435 msgid "check if - even missing - files are ignored in dry run"
1438 #: builtin/add.c:353
1440 msgid "Use -f if you really want to add them.\n"
1443 #: builtin/add.c:354
1444 msgid "no files added"
1447 #: builtin/add.c:360
1448 msgid "adding files failed"
1451 #: builtin/add.c:392
1452 msgid "-A and -u are mutually incompatible"
1455 #: builtin/add.c:394
1456 msgid "Option --ignore-missing can only be used together with --dry-run"
1459 #: builtin/add.c:414
1461 msgid "Nothing specified, nothing added.\n"
1464 #: builtin/add.c:415
1466 msgid "Maybe you wanted to say 'git add .'?\n"
1469 #: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82
1471 msgid "index file corrupt"
1474 #: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260
1475 msgid "Unable to write new index file"
1478 #: builtin/apply.c:57
1479 msgid "git apply [options] [<patch>...]"
1482 #: builtin/apply.c:110
1484 msgid "unrecognized whitespace option '%s'"
1487 #: builtin/apply.c:125
1489 msgid "unrecognized whitespace ignore option '%s'"
1492 #: builtin/apply.c:823
1494 msgid "Cannot prepare timestamp regexp %s"
1497 #: builtin/apply.c:832
1499 msgid "regexec returned %d for input: %s"
1502 #: builtin/apply.c:913
1504 msgid "unable to find filename in patch at line %d"
1507 #: builtin/apply.c:945
1509 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1512 #: builtin/apply.c:949
1514 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1517 #: builtin/apply.c:950
1519 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1522 #: builtin/apply.c:957
1524 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1527 #: builtin/apply.c:1420
1529 msgid "recount: unexpected line: %.*s"
1532 #: builtin/apply.c:1477
1534 msgid "patch fragment without header at line %d: %.*s"
1537 #: builtin/apply.c:1494
1540 "git diff header lacks filename information when removing %d leading pathname "
1541 "component (line %d)"
1543 "git diff header lacks filename information when removing %d leading pathname "
1544 "components (line %d)"
1548 #: builtin/apply.c:1654
1549 msgid "new file depends on old contents"
1552 #: builtin/apply.c:1656
1553 msgid "deleted file still has contents"
1556 #: builtin/apply.c:1682
1558 msgid "corrupt patch at line %d"
1561 #: builtin/apply.c:1718
1563 msgid "new file %s depends on old contents"
1566 #: builtin/apply.c:1720
1568 msgid "deleted file %s still has contents"
1571 #: builtin/apply.c:1723
1573 msgid "** warning: file %s becomes empty but is not deleted"
1576 #: builtin/apply.c:1869
1578 msgid "corrupt binary patch at line %d: %.*s"
1581 #. there has to be one hunk (forward hunk)
1582 #: builtin/apply.c:1898
1584 msgid "unrecognized binary patch at line %d"
1587 #: builtin/apply.c:1984
1589 msgid "patch with only garbage at line %d"
1592 #: builtin/apply.c:2074
1594 msgid "unable to read symlink %s"
1597 #: builtin/apply.c:2078
1599 msgid "unable to open or read %s"
1602 #: builtin/apply.c:2149
1606 #: builtin/apply.c:2671
1608 msgid "invalid start of line: '%c'"
1611 #: builtin/apply.c:2789
1613 msgid "Hunk #%d succeeded at %d (offset %d line)."
1614 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1618 #: builtin/apply.c:2801
1620 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1623 #: builtin/apply.c:2807
1626 "while searching for:\n"
1630 #: builtin/apply.c:2826
1632 msgid "missing binary patch data for '%s'"
1635 #: builtin/apply.c:2929
1637 msgid "binary patch does not apply to '%s'"
1640 #: builtin/apply.c:2935
1642 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1645 #: builtin/apply.c:2956
1647 msgid "patch failed: %s:%ld"
1650 #: builtin/apply.c:3078
1652 msgid "cannot checkout %s"
1655 #: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176
1657 msgid "read of %s failed"
1660 #: builtin/apply.c:3156 builtin/apply.c:3378
1662 msgid "path %s has been renamed/deleted"
1665 #: builtin/apply.c:3237 builtin/apply.c:3392
1667 msgid "%s: does not exist in index"
1670 #: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406
1675 #: builtin/apply.c:3246 builtin/apply.c:3400
1677 msgid "%s: does not match index"
1680 #: builtin/apply.c:3348
1681 msgid "removal patch leaves file contents"
1684 #: builtin/apply.c:3417
1686 msgid "%s: wrong type"
1689 #: builtin/apply.c:3419
1691 msgid "%s has type %o, expected %o"
1694 #: builtin/apply.c:3520
1696 msgid "%s: already exists in index"
1699 #: builtin/apply.c:3523
1701 msgid "%s: already exists in working directory"
1704 #: builtin/apply.c:3543
1706 msgid "new mode (%o) of %s does not match old mode (%o)"
1709 #: builtin/apply.c:3548
1711 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1714 #: builtin/apply.c:3556
1716 msgid "%s: patch does not apply"
1719 #: builtin/apply.c:3569
1721 msgid "Checking patch %s..."
1724 #: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158
1726 msgid "make_cache_entry failed for path '%s'"
1729 #: builtin/apply.c:3767
1731 msgid "unable to remove %s from index"
1734 #: builtin/apply.c:3795
1736 msgid "corrupt patch for subproject %s"
1739 #: builtin/apply.c:3799
1741 msgid "unable to stat newly created file '%s'"
1744 #: builtin/apply.c:3804
1746 msgid "unable to create backing store for newly created file %s"
1749 #: builtin/apply.c:3807 builtin/apply.c:3915
1751 msgid "unable to add cache entry for %s"
1754 #: builtin/apply.c:3840
1756 msgid "closing file '%s'"
1759 #: builtin/apply.c:3889
1761 msgid "unable to write file '%s' mode %o"
1764 #: builtin/apply.c:3976
1766 msgid "Applied patch %s cleanly."
1769 #: builtin/apply.c:3984
1770 msgid "internal error"
1773 #. Say this even without --verbose
1774 #: builtin/apply.c:3987
1776 msgid "Applying patch %%s with %d reject..."
1777 msgid_plural "Applying patch %%s with %d rejects..."
1781 #: builtin/apply.c:3997
1783 msgid "truncating .rej filename to %.*s.rej"
1786 #: builtin/apply.c:4018
1788 msgid "Hunk #%d applied cleanly."
1791 #: builtin/apply.c:4021
1793 msgid "Rejected hunk #%d."
1796 #: builtin/apply.c:4171
1797 msgid "unrecognized input"
1800 #: builtin/apply.c:4182
1801 msgid "unable to read index file"
1804 #: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91
1805 #: builtin/fetch.c:63
1809 #: builtin/apply.c:4302
1810 msgid "don't apply changes matching the given path"
1813 #: builtin/apply.c:4305
1814 msgid "apply changes matching the given path"
1817 #: builtin/apply.c:4307
1821 #: builtin/apply.c:4308
1822 msgid "remove <num> leading slashes from traditional diff paths"
1825 #: builtin/apply.c:4311
1826 msgid "ignore additions made by the patch"
1829 #: builtin/apply.c:4313
1830 msgid "instead of applying the patch, output diffstat for the input"
1833 #: builtin/apply.c:4317
1834 msgid "show number of added and deleted lines in decimal notation"
1837 #: builtin/apply.c:4319
1838 msgid "instead of applying the patch, output a summary for the input"
1841 #: builtin/apply.c:4321
1842 msgid "instead of applying the patch, see if the patch is applicable"
1845 #: builtin/apply.c:4323
1846 msgid "make sure the patch is applicable to the current index"
1849 #: builtin/apply.c:4325
1850 msgid "apply a patch without touching the working tree"
1853 #: builtin/apply.c:4327
1854 msgid "also apply the patch (use with --stat/--summary/--check)"
1857 #: builtin/apply.c:4329
1858 msgid "attempt three-way merge if a patch does not apply"
1861 #: builtin/apply.c:4331
1862 msgid "build a temporary index based on embedded index information"
1865 #: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460
1866 msgid "paths are separated with NUL character"
1869 #: builtin/apply.c:4336
1870 msgid "ensure at least <n> lines of context match"
1873 #: builtin/apply.c:4337
1877 #: builtin/apply.c:4338
1878 msgid "detect new or modified lines that have whitespace errors"
1881 #: builtin/apply.c:4341 builtin/apply.c:4344
1882 msgid "ignore changes in whitespace when finding context"
1885 #: builtin/apply.c:4347
1886 msgid "apply the patch in reverse"
1889 #: builtin/apply.c:4349
1890 msgid "don't expect at least one line of context"
1893 #: builtin/apply.c:4351
1894 msgid "leave the rejected hunks in corresponding *.rej files"
1897 #: builtin/apply.c:4353
1898 msgid "allow overlapping hunks"
1901 #: builtin/apply.c:4356
1902 msgid "tolerate incorrectly detected missing new-line at the end of file"
1905 #: builtin/apply.c:4359
1906 msgid "do not trust the line counts in the hunk headers"
1909 #: builtin/apply.c:4361
1913 #: builtin/apply.c:4362
1914 msgid "prepend <root> to all filenames"
1917 #: builtin/apply.c:4384
1918 msgid "--3way outside a repository"
1921 #: builtin/apply.c:4392
1922 msgid "--index outside a repository"
1925 #: builtin/apply.c:4395
1926 msgid "--cached outside a repository"
1929 #: builtin/apply.c:4411
1931 msgid "can't open patch '%s'"
1934 #: builtin/apply.c:4425
1936 msgid "squelched %d whitespace error"
1937 msgid_plural "squelched %d whitespace errors"
1941 #: builtin/apply.c:4431 builtin/apply.c:4441
1943 msgid "%d line adds whitespace errors."
1944 msgid_plural "%d lines add whitespace errors."
1948 #: builtin/archive.c:17
1950 msgid "could not create archive file '%s'"
1953 #: builtin/archive.c:20
1954 msgid "could not redirect output"
1957 #: builtin/archive.c:37
1958 msgid "git archive: Remote with no URL"
1961 #: builtin/archive.c:58
1962 msgid "git archive: expected ACK/NAK, got EOF"
1965 #: builtin/archive.c:63
1967 msgid "git archive: NACK %s"
1970 #: builtin/archive.c:65
1972 msgid "remote error: %s"
1975 #: builtin/archive.c:66
1976 msgid "git archive: protocol error"
1979 #: builtin/archive.c:71
1980 msgid "git archive: expected a flush"
1983 #: builtin/bisect--helper.c:7
1984 msgid "git bisect--helper --next-all [--no-checkout]"
1987 #: builtin/bisect--helper.c:17
1988 msgid "perform 'git bisect next'"
1991 #: builtin/bisect--helper.c:19
1992 msgid "update BISECT_HEAD instead of checking out the current commit"
1995 #: builtin/blame.c:25
1996 msgid "git blame [options] [rev-opts] [rev] [--] file"
1999 #: builtin/blame.c:30 builtin/shortlog.c:15
2000 msgid "[rev-opts] are documented in git-rev-list(1)"
2003 #: builtin/blame.c:2316
2004 msgid "Show blame entries as we find them, incrementally"
2007 #: builtin/blame.c:2317
2008 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2011 #: builtin/blame.c:2318
2012 msgid "Do not treat root commits as boundaries (Default: off)"
2015 #: builtin/blame.c:2319
2016 msgid "Show work cost statistics"
2019 #: builtin/blame.c:2320
2020 msgid "Show output score for blame entries"
2023 #: builtin/blame.c:2321
2024 msgid "Show original filename (Default: auto)"
2027 #: builtin/blame.c:2322
2028 msgid "Show original linenumber (Default: off)"
2031 #: builtin/blame.c:2323
2032 msgid "Show in a format designed for machine consumption"
2035 #: builtin/blame.c:2324
2036 msgid "Show porcelain format with per-line commit information"
2039 #: builtin/blame.c:2325
2040 msgid "Use the same output mode as git-annotate (Default: off)"
2043 #: builtin/blame.c:2326
2044 msgid "Show raw timestamp (Default: off)"
2047 #: builtin/blame.c:2327
2048 msgid "Show long commit SHA1 (Default: off)"
2051 #: builtin/blame.c:2328
2052 msgid "Suppress author name and timestamp (Default: off)"
2055 #: builtin/blame.c:2329
2056 msgid "Show author email instead of name (Default: off)"
2059 #: builtin/blame.c:2330
2060 msgid "Ignore whitespace differences"
2063 #: builtin/blame.c:2331
2064 msgid "Spend extra cycles to find better match"
2067 #: builtin/blame.c:2332
2068 msgid "Use revisions from <file> instead of calling git-rev-list"
2071 #: builtin/blame.c:2333
2072 msgid "Use <file>'s contents as the final image"
2075 #: builtin/blame.c:2334 builtin/blame.c:2335
2079 #: builtin/blame.c:2334
2080 msgid "Find line copies within and across files"
2083 #: builtin/blame.c:2335
2084 msgid "Find line movements within and across files"
2087 #: builtin/blame.c:2336
2091 #: builtin/blame.c:2336
2092 msgid "Process only line range n,m, counting from 1"
2095 #: builtin/branch.c:23
2096 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2099 #: builtin/branch.c:24
2100 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2103 #: builtin/branch.c:25
2104 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2107 #: builtin/branch.c:26
2108 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2111 #: builtin/branch.c:145
2114 "deleting branch '%s' that has been merged to\n"
2115 " '%s', but not yet merged to HEAD."
2118 #: builtin/branch.c:149
2121 "not deleting branch '%s' that is not yet merged to\n"
2122 " '%s', even though it is merged to HEAD."
2125 #: builtin/branch.c:181
2126 msgid "cannot use -a with -d"
2129 #: builtin/branch.c:187
2130 msgid "Couldn't look up commit object for HEAD"
2133 #: builtin/branch.c:192
2135 msgid "Cannot delete the branch '%s' which you are currently on."
2138 #: builtin/branch.c:203
2140 msgid "remote branch '%s' not found."
2143 #: builtin/branch.c:204
2145 msgid "branch '%s' not found."
2148 #: builtin/branch.c:211
2150 msgid "Couldn't look up commit object for '%s'"
2153 #: builtin/branch.c:217
2156 "The branch '%s' is not fully merged.\n"
2157 "If you are sure you want to delete it, run 'git branch -D %s'."
2160 #: builtin/branch.c:226
2162 msgid "Error deleting remote branch '%s'"
2165 #: builtin/branch.c:227
2167 msgid "Error deleting branch '%s'"
2170 #: builtin/branch.c:234
2172 msgid "Deleted remote branch %s (was %s).\n"
2175 #: builtin/branch.c:235
2177 msgid "Deleted branch %s (was %s).\n"
2180 #: builtin/branch.c:240
2181 msgid "Update of config-file failed"
2184 #: builtin/branch.c:338
2186 msgid "branch '%s' does not point at a commit"
2189 #: builtin/branch.c:410
2191 msgid "[%s: behind %d]"
2194 #: builtin/branch.c:412
2199 #: builtin/branch.c:416
2201 msgid "[%s: ahead %d]"
2204 #: builtin/branch.c:418
2209 #: builtin/branch.c:421
2211 msgid "[%s: ahead %d, behind %d]"
2214 #: builtin/branch.c:424
2216 msgid "[ahead %d, behind %d]"
2219 #: builtin/branch.c:537
2223 #: builtin/branch.c:602
2224 msgid "some refs could not be read"
2227 #: builtin/branch.c:615
2228 msgid "cannot rename the current branch while not on any."
2231 #: builtin/branch.c:625
2233 msgid "Invalid branch name: '%s'"
2236 #: builtin/branch.c:640
2237 msgid "Branch rename failed"
2240 #: builtin/branch.c:644
2242 msgid "Renamed a misnamed branch '%s' away"
2245 #: builtin/branch.c:648
2247 msgid "Branch renamed to %s, but HEAD is not updated!"
2250 #: builtin/branch.c:655
2251 msgid "Branch is renamed, but update of config-file failed"
2254 #: builtin/branch.c:670
2256 msgid "malformed object name %s"
2259 #: builtin/branch.c:694
2261 msgid "could not write branch description template: %s"
2264 #: builtin/branch.c:724
2265 msgid "Generic options"
2268 #: builtin/branch.c:726
2269 msgid "show hash and subject, give twice for upstream branch"
2272 #: builtin/branch.c:727
2273 msgid "suppress informational messages"
2276 #: builtin/branch.c:728
2277 msgid "set up tracking mode (see git-pull(1))"
2280 #: builtin/branch.c:730
2281 msgid "change upstream info"
2284 #: builtin/branch.c:734
2285 msgid "use colored output"
2288 #: builtin/branch.c:735
2289 msgid "act on remote-tracking branches"
2292 #: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765
2293 #: builtin/branch.c:771 builtin/commit.c:1395 builtin/commit.c:1396
2294 #: builtin/commit.c:1397 builtin/commit.c:1398 builtin/tag.c:470
2298 #: builtin/branch.c:739 builtin/branch.c:745
2299 msgid "print only branches that contain the commit"
2302 #: builtin/branch.c:751
2303 msgid "Specific git-branch actions:"
2306 #: builtin/branch.c:752
2307 msgid "list both remote-tracking and local branches"
2310 #: builtin/branch.c:754
2311 msgid "delete fully merged branch"
2314 #: builtin/branch.c:755
2315 msgid "delete branch (even if not merged)"
2318 #: builtin/branch.c:756
2319 msgid "move/rename a branch and its reflog"
2322 #: builtin/branch.c:757
2323 msgid "move/rename a branch, even if target exists"
2326 #: builtin/branch.c:758
2327 msgid "list branch names"
2330 #: builtin/branch.c:759
2331 msgid "create the branch's reflog"
2334 #: builtin/branch.c:761
2335 msgid "edit the description for the branch"
2338 #: builtin/branch.c:762
2339 msgid "force creation (when already exists)"
2342 #: builtin/branch.c:765
2343 msgid "print only not merged branches"
2346 #: builtin/branch.c:771
2347 msgid "print only merged branches"
2350 #: builtin/branch.c:775
2351 msgid "list branches in columns"
2354 #: builtin/branch.c:788
2355 msgid "Failed to resolve HEAD as a valid ref."
2358 #: builtin/branch.c:793 builtin/clone.c:561
2359 msgid "HEAD not found below refs/heads!"
2362 #: builtin/branch.c:813
2363 msgid "--column and --verbose are incompatible"
2366 #: builtin/branch.c:864
2368 msgid "branch '%s' does not exist"
2371 #: builtin/branch.c:876
2373 msgid "Branch '%s' has no upstream information"
2376 #: builtin/branch.c:891
2377 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2380 #: builtin/branch.c:894
2383 "The --set-upstream flag is deprecated and will be removed. Consider using --"
2384 "track or --set-upstream-to\n"
2387 #: builtin/branch.c:911
2391 "If you wanted to make '%s' track '%s', do this:\n"
2395 #: builtin/branch.c:912
2397 msgid " git branch -d %s\n"
2400 #: builtin/branch.c:913
2402 msgid " git branch --set-upstream-to %s\n"
2405 #: builtin/bundle.c:47
2407 msgid "%s is okay\n"
2410 #: builtin/bundle.c:56
2411 msgid "Need a repository to create a bundle."
2414 #: builtin/bundle.c:60
2415 msgid "Need a repository to unbundle."
2418 #: builtin/cat-file.c:247
2419 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2422 #: builtin/cat-file.c:248
2423 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2426 #: builtin/cat-file.c:266
2427 msgid "<type> can be one of: blob, tree, commit, tag"
2430 #: builtin/cat-file.c:267
2431 msgid "show object type"
2434 #: builtin/cat-file.c:268
2435 msgid "show object size"
2438 #: builtin/cat-file.c:270
2439 msgid "exit with zero when there's no error"
2442 #: builtin/cat-file.c:271
2443 msgid "pretty-print object's content"
2446 #: builtin/cat-file.c:273
2447 msgid "for blob objects, run textconv on object's content"
2450 #: builtin/cat-file.c:275
2451 msgid "show info and content of objects fed from the standard input"
2454 #: builtin/cat-file.c:278
2455 msgid "show info about objects fed from the standard input"
2458 #: builtin/check-attr.c:11
2459 msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2462 #: builtin/check-attr.c:12
2463 msgid "git check-attr --stdin [-a | --all | attr...] < <list-of-paths>"
2466 #: builtin/check-attr.c:19
2467 msgid "report all attributes set on file"
2470 #: builtin/check-attr.c:20
2471 msgid "use .gitattributes only from the index"
2474 #: builtin/check-attr.c:21 builtin/hash-object.c:75
2475 msgid "read file names from stdin"
2478 #: builtin/check-attr.c:23
2479 msgid "input paths are terminated by a null character"
2482 #: builtin/checkout-index.c:126
2483 msgid "git checkout-index [options] [--] [<file>...]"
2486 #: builtin/checkout-index.c:187
2487 msgid "check out all files in the index"
2490 #: builtin/checkout-index.c:188
2491 msgid "force overwrite of existing files"
2494 #: builtin/checkout-index.c:190
2495 msgid "no warning for existing files and files not in index"
2498 #: builtin/checkout-index.c:192
2499 msgid "don't checkout new files"
2502 #: builtin/checkout-index.c:194
2503 msgid "update stat information in the index file"
2506 #: builtin/checkout-index.c:200
2507 msgid "read list of paths from the standard input"
2510 #: builtin/checkout-index.c:202
2511 msgid "write the content to temporary files"
2514 #: builtin/checkout-index.c:203 builtin/column.c:30
2518 #: builtin/checkout-index.c:204
2519 msgid "when creating files, prepend <string>"
2522 #: builtin/checkout-index.c:207
2523 msgid "copy out the files from named stage"
2526 #: builtin/checkout.c:25
2527 msgid "git checkout [options] <branch>"
2530 #: builtin/checkout.c:26
2531 msgid "git checkout [options] [<branch>] -- <file>..."
2534 #: builtin/checkout.c:116 builtin/checkout.c:149
2536 msgid "path '%s' does not have our version"
2539 #: builtin/checkout.c:118 builtin/checkout.c:151
2541 msgid "path '%s' does not have their version"
2544 #: builtin/checkout.c:134
2546 msgid "path '%s' does not have all necessary versions"
2549 #: builtin/checkout.c:178
2551 msgid "path '%s' does not have necessary versions"
2554 #: builtin/checkout.c:195
2556 msgid "path '%s': cannot merge"
2559 #: builtin/checkout.c:212
2561 msgid "Unable to add merge result for '%s'"
2564 #: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
2565 #: builtin/checkout.c:245
2567 msgid "'%s' cannot be used with updating paths"
2570 #: builtin/checkout.c:248 builtin/checkout.c:251
2572 msgid "'%s' cannot be used with %s"
2575 #: builtin/checkout.c:254
2577 msgid "Cannot update paths and switch to branch '%s' at the same time."
2580 #: builtin/checkout.c:265 builtin/checkout.c:426
2581 msgid "corrupt index file"
2584 #: builtin/checkout.c:295 builtin/checkout.c:302
2586 msgid "path '%s' is unmerged"
2589 #: builtin/checkout.c:333 builtin/checkout.c:534 builtin/clone.c:586
2590 #: builtin/merge.c:811
2591 msgid "unable to write new index file"
2594 #: builtin/checkout.c:448
2595 msgid "you need to resolve your current index first"
2598 #: builtin/checkout.c:569
2600 msgid "Can not do reflog for '%s'\n"
2603 #: builtin/checkout.c:602
2604 msgid "HEAD is now at"
2607 #: builtin/checkout.c:609
2609 msgid "Reset branch '%s'\n"
2612 #: builtin/checkout.c:612
2614 msgid "Already on '%s'\n"
2617 #: builtin/checkout.c:616
2619 msgid "Switched to and reset branch '%s'\n"
2622 #: builtin/checkout.c:618
2624 msgid "Switched to a new branch '%s'\n"
2627 #: builtin/checkout.c:620
2629 msgid "Switched to branch '%s'\n"
2632 #: builtin/checkout.c:676
2634 msgid " ... and %d more.\n"
2637 #. The singular version
2638 #: builtin/checkout.c:682
2641 "Warning: you are leaving %d commit behind, not connected to\n"
2642 "any of your branches:\n"
2646 "Warning: you are leaving %d commits behind, not connected to\n"
2647 "any of your branches:\n"
2653 #: builtin/checkout.c:700
2656 "If you want to keep them by creating a new branch, this may be a good time\n"
2659 " git branch new_branch_name %s\n"
2663 #: builtin/checkout.c:730
2664 msgid "internal error in revision walk"
2667 #: builtin/checkout.c:734
2668 msgid "Previous HEAD position was"
2671 #: builtin/checkout.c:761 builtin/checkout.c:950
2672 msgid "You are on a branch yet to be born"
2676 #: builtin/checkout.c:886
2678 msgid "invalid reference: %s"
2681 #. case (1): want a tree
2682 #: builtin/checkout.c:925
2684 msgid "reference is not a tree: %s"
2687 #: builtin/checkout.c:961
2688 msgid "paths cannot be used with switching branches"
2691 #: builtin/checkout.c:964 builtin/checkout.c:968
2693 msgid "'%s' cannot be used with switching branches"
2696 #: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980
2697 #: builtin/checkout.c:983
2699 msgid "'%s' cannot be used with '%s'"
2702 #: builtin/checkout.c:988
2704 msgid "Cannot switch branch to a non-commit '%s'"
2707 #: builtin/checkout.c:1009 builtin/gc.c:177
2708 msgid "suppress progress reporting"
2711 #: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89
2712 #: builtin/remote.c:169 builtin/remote.c:171
2716 #: builtin/checkout.c:1011
2717 msgid "create and checkout a new branch"
2720 #: builtin/checkout.c:1013
2721 msgid "create/reset and checkout a branch"
2724 #: builtin/checkout.c:1014
2725 msgid "create reflog for new branch"
2728 #: builtin/checkout.c:1015
2729 msgid "detach the HEAD at named commit"
2732 #: builtin/checkout.c:1016
2733 msgid "set upstream info for new branch"
2736 #: builtin/checkout.c:1018
2740 #: builtin/checkout.c:1018
2741 msgid "new unparented branch"
2744 #: builtin/checkout.c:1019
2745 msgid "checkout our version for unmerged files"
2748 #: builtin/checkout.c:1021
2749 msgid "checkout their version for unmerged files"
2752 #: builtin/checkout.c:1023
2753 msgid "force checkout (throw away local modifications)"
2756 #: builtin/checkout.c:1024
2757 msgid "perform a 3-way merge with the new branch"
2760 #: builtin/checkout.c:1025 builtin/merge.c:215
2761 msgid "update ignored files (default)"
2764 #: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241
2768 #: builtin/checkout.c:1027
2769 msgid "conflict style (merge or diff3)"
2772 #: builtin/checkout.c:1030
2773 msgid "second guess 'git checkout no-such-branch'"
2776 #: builtin/checkout.c:1054
2777 msgid "-b, -B and --orphan are mutually exclusive"
2780 #: builtin/checkout.c:1071
2781 msgid "--track needs a branch name"
2784 #: builtin/checkout.c:1078
2785 msgid "Missing branch name; try -b"
2788 #: builtin/checkout.c:1113
2789 msgid "invalid path specification"
2792 #: builtin/checkout.c:1120
2795 "Cannot update paths and switch to branch '%s' at the same time.\n"
2796 "Did you intend to checkout '%s' which can not be resolved as commit?"
2799 #: builtin/checkout.c:1125
2801 msgid "git checkout: --detach does not take a path argument '%s'"
2804 #: builtin/checkout.c:1129
2806 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
2807 "checking out of the index."
2810 #: builtin/clean.c:19
2811 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
2814 #: builtin/clean.c:51
2815 msgid "do not print names of files removed"
2818 #: builtin/clean.c:53
2822 #: builtin/clean.c:55
2823 msgid "remove whole directories"
2826 #: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:802
2827 #: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199
2831 #: builtin/clean.c:57
2832 msgid "add <pattern> to ignore rules"
2835 #: builtin/clean.c:58
2836 msgid "remove ignored files, too"
2839 #: builtin/clean.c:60
2840 msgid "remove only ignored files"
2843 #: builtin/clean.c:78
2844 msgid "-x and -X cannot be used together"
2847 #: builtin/clean.c:82
2849 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
2852 #: builtin/clean.c:85
2854 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
2858 #: builtin/clean.c:155 builtin/clean.c:176
2860 msgid "Would remove %s\n"
2863 #: builtin/clean.c:159 builtin/clean.c:179
2865 msgid "Removing %s\n"
2868 #: builtin/clean.c:162 builtin/clean.c:182
2870 msgid "failed to remove %s"
2873 #: builtin/clean.c:166
2875 msgid "Would not remove %s\n"
2878 #: builtin/clean.c:168
2880 msgid "Not removing %s\n"
2883 #: builtin/clone.c:36
2884 msgid "git clone [options] [--] <repo> [<dir>]"
2887 #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
2888 #: builtin/push.c:399
2889 msgid "force progress reporting"
2892 #: builtin/clone.c:66
2893 msgid "don't create a checkout"
2896 #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
2897 msgid "create a bare repository"
2900 #: builtin/clone.c:72
2901 msgid "create a mirror repository (implies bare)"
2904 #: builtin/clone.c:74
2905 msgid "to clone from a local repository"
2908 #: builtin/clone.c:76
2909 msgid "don't use local hardlinks, always copy"
2912 #: builtin/clone.c:78
2913 msgid "setup as shared repository"
2916 #: builtin/clone.c:80 builtin/clone.c:82
2917 msgid "initialize submodules in the clone"
2920 #: builtin/clone.c:83 builtin/init-db.c:485
2921 msgid "template-directory"
2924 #: builtin/clone.c:84 builtin/init-db.c:486
2925 msgid "directory from which templates will be used"
2928 #: builtin/clone.c:86
2929 msgid "reference repository"
2932 #: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
2936 #: builtin/clone.c:88
2937 msgid "use <name> instead of 'origin' to track upstream"
2940 #: builtin/clone.c:90
2941 msgid "checkout <branch> instead of the remote's HEAD"
2944 #: builtin/clone.c:92
2945 msgid "path to git-upload-pack on the remote"
2948 #: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:747
2952 #: builtin/clone.c:94
2953 msgid "create a shallow clone of that depth"
2956 #: builtin/clone.c:96
2957 msgid "clone only one branch, HEAD or --branch"
2960 #: builtin/clone.c:97 builtin/init-db.c:494
2964 #: builtin/clone.c:98 builtin/init-db.c:495
2965 msgid "separate git dir from working tree"
2968 #: builtin/clone.c:99
2972 #: builtin/clone.c:100
2973 msgid "set config inside the new repository"
2976 #: builtin/clone.c:243
2978 msgid "reference repository '%s' is not a local directory."
2981 #: builtin/clone.c:306
2983 msgid "failed to create directory '%s'"
2986 #: builtin/clone.c:308 builtin/diff.c:77
2988 msgid "failed to stat '%s'"
2991 #: builtin/clone.c:310
2993 msgid "%s exists and is not a directory"
2996 #: builtin/clone.c:324
2998 msgid "failed to stat %s\n"
3001 #: builtin/clone.c:346
3003 msgid "failed to create link '%s'"
3006 #: builtin/clone.c:350
3008 msgid "failed to copy file to '%s'"
3011 #: builtin/clone.c:373
3016 #: builtin/clone.c:443
3018 msgid "Could not find remote branch %s to clone."
3021 #: builtin/clone.c:552
3022 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3025 #: builtin/clone.c:642
3026 msgid "Too many arguments."
3029 #: builtin/clone.c:646
3030 msgid "You must specify a repository to clone."
3033 #: builtin/clone.c:657
3035 msgid "--bare and --origin %s options are incompatible."
3038 #: builtin/clone.c:671
3040 msgid "repository '%s' does not exist"
3043 #: builtin/clone.c:676
3044 msgid "--depth is ignored in local clones; use file:// instead."
3047 #: builtin/clone.c:686
3049 msgid "destination path '%s' already exists and is not an empty directory."
3052 #: builtin/clone.c:696
3054 msgid "working tree '%s' already exists."
3057 #: builtin/clone.c:709 builtin/clone.c:723
3059 msgid "could not create leading directories of '%s'"
3062 #: builtin/clone.c:712
3064 msgid "could not create work tree dir '%s'."
3067 #: builtin/clone.c:731
3069 msgid "Cloning into bare repository '%s'...\n"
3072 #: builtin/clone.c:733
3074 msgid "Cloning into '%s'...\n"
3077 #: builtin/clone.c:789
3079 msgid "Don't know how to clone %s"
3082 #: builtin/clone.c:838
3084 msgid "Remote branch %s not found in upstream %s"
3087 #: builtin/clone.c:845
3088 msgid "You appear to have cloned an empty repository."
3091 #: builtin/column.c:9
3092 msgid "git column [options]"
3095 #: builtin/column.c:26
3096 msgid "lookup config vars"
3099 #: builtin/column.c:27 builtin/column.c:28
3100 msgid "layout to use"
3103 #: builtin/column.c:29
3104 msgid "Maximum width"
3107 #: builtin/column.c:30
3108 msgid "Padding space on left border"
3111 #: builtin/column.c:31
3112 msgid "Padding space on right border"
3115 #: builtin/column.c:32
3116 msgid "Padding space between columns"
3119 #: builtin/column.c:51
3120 msgid "--command must be the first argument"
3123 #: builtin/commit.c:33
3124 msgid "git commit [options] [--] <filepattern>..."
3127 #: builtin/commit.c:38
3128 msgid "git status [options] [--] <filepattern>..."
3131 #: builtin/commit.c:43
3133 "Your name and email address were configured automatically based\n"
3134 "on your username and hostname. Please check that they are accurate.\n"
3135 "You can suppress this message by setting them explicitly:\n"
3137 " git config --global user.name \"Your Name\"\n"
3138 " git config --global user.email you@example.com\n"
3140 "After doing this, you may fix the identity used for this commit with:\n"
3142 " git commit --amend --reset-author\n"
3145 #: builtin/commit.c:55
3147 "You asked to amend the most recent commit, but doing so would make\n"
3148 "it empty. You can repeat your command with --allow-empty, or you can\n"
3149 "remove the commit entirely with \"git reset HEAD^\".\n"
3152 #: builtin/commit.c:60
3154 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3155 "If you wish to commit it anyway, use:\n"
3157 " git commit --allow-empty\n"
3159 "Otherwise, please use 'git reset'\n"
3162 #: builtin/commit.c:256
3163 msgid "failed to unpack HEAD tree object"
3166 #: builtin/commit.c:298
3167 msgid "unable to create temporary index"
3170 #: builtin/commit.c:304
3171 msgid "interactive add failed"
3174 #: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408
3175 msgid "unable to write new_index file"
3178 #: builtin/commit.c:389
3179 msgid "cannot do a partial commit during a merge."
3182 #: builtin/commit.c:391
3183 msgid "cannot do a partial commit during a cherry-pick."
3186 #: builtin/commit.c:401
3187 msgid "cannot read the index"
3190 #: builtin/commit.c:421
3191 msgid "unable to write temporary index file"
3194 #: builtin/commit.c:510 builtin/commit.c:516
3196 msgid "invalid commit: %s"
3199 #: builtin/commit.c:539
3200 msgid "malformed --author parameter"
3203 #: builtin/commit.c:600
3205 msgid "Malformed ident string: '%s'"
3208 #: builtin/commit.c:638 builtin/commit.c:671 builtin/commit.c:985
3210 msgid "could not lookup commit %s"
3213 #: builtin/commit.c:650 builtin/shortlog.c:296
3215 msgid "(reading log message from standard input)\n"
3218 #: builtin/commit.c:652
3219 msgid "could not read log from standard input"
3222 #: builtin/commit.c:656
3224 msgid "could not read log file '%s'"
3227 #: builtin/commit.c:662
3228 msgid "commit has empty message"
3231 #: builtin/commit.c:678
3232 msgid "could not read MERGE_MSG"
3235 #: builtin/commit.c:682
3236 msgid "could not read SQUASH_MSG"
3239 #: builtin/commit.c:686
3241 msgid "could not read '%s'"
3244 #: builtin/commit.c:738
3245 msgid "could not write commit template"
3248 #: builtin/commit.c:749
3252 "It looks like you may be committing a merge.\n"
3253 "If this is not correct, please remove the file\n"
3258 #: builtin/commit.c:754
3262 "It looks like you may be committing a cherry-pick.\n"
3263 "If this is not correct, please remove the file\n"
3268 #: builtin/commit.c:766
3270 "Please enter the commit message for your changes. Lines starting\n"
3271 "with '#' will be ignored, and an empty message aborts the commit.\n"
3274 #: builtin/commit.c:771
3276 "Please enter the commit message for your changes. Lines starting\n"
3277 "with '#' will be kept; you may remove them yourself if you want to.\n"
3278 "An empty message aborts the commit.\n"
3281 #: builtin/commit.c:784
3283 msgid "%sAuthor: %s"
3286 #: builtin/commit.c:791
3288 msgid "%sCommitter: %s"
3291 #: builtin/commit.c:811
3292 msgid "Cannot read index"
3295 #: builtin/commit.c:848
3296 msgid "Error building trees"
3299 #: builtin/commit.c:863 builtin/tag.c:361
3301 msgid "Please supply the message using either -m or -F option.\n"
3304 #: builtin/commit.c:960
3306 msgid "No existing author found with '%s'"
3309 #: builtin/commit.c:975 builtin/commit.c:1175
3311 msgid "Invalid untracked files mode '%s'"
3314 #: builtin/commit.c:1015
3315 msgid "Using both --reset-author and --author does not make sense"
3318 #: builtin/commit.c:1026
3319 msgid "You have nothing to amend."
3322 #: builtin/commit.c:1029
3323 msgid "You are in the middle of a merge -- cannot amend."
3326 #: builtin/commit.c:1031
3327 msgid "You are in the middle of a cherry-pick -- cannot amend."
3330 #: builtin/commit.c:1034
3331 msgid "Options --squash and --fixup cannot be used together"
3334 #: builtin/commit.c:1044
3335 msgid "Only one of -c/-C/-F/--fixup can be used."
3338 #: builtin/commit.c:1046
3339 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3342 #: builtin/commit.c:1054
3343 msgid "--reset-author can be used only with -C, -c or --amend."
3346 #: builtin/commit.c:1071
3347 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3350 #: builtin/commit.c:1073
3351 msgid "No paths with --include/--only does not make sense."
3354 #: builtin/commit.c:1075
3355 msgid "Clever... amending the last one with dirty index."
3358 #: builtin/commit.c:1077
3359 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3362 #: builtin/commit.c:1087 builtin/tag.c:577
3364 msgid "Invalid cleanup mode %s"
3367 #: builtin/commit.c:1092
3368 msgid "Paths with -a does not make sense."
3371 #: builtin/commit.c:1189 builtin/commit.c:1417
3372 msgid "show status concisely"
3375 #: builtin/commit.c:1191 builtin/commit.c:1419
3376 msgid "show branch information"
3379 #: builtin/commit.c:1193 builtin/commit.c:1421 builtin/push.c:389
3380 msgid "machine-readable output"
3383 #: builtin/commit.c:1196 builtin/commit.c:1423
3384 msgid "terminate entries with NUL"
3387 #: builtin/commit.c:1198 builtin/commit.c:1426 builtin/fast-export.c:636
3388 #: builtin/fast-export.c:639 builtin/tag.c:461
3392 #: builtin/commit.c:1199 builtin/commit.c:1426
3393 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3396 #: builtin/commit.c:1202
3397 msgid "show ignored files"
3400 #: builtin/commit.c:1203 parse-options.h:151
3404 #: builtin/commit.c:1204
3406 "ignore changes to submodules, optional when: all, dirty, untracked. "
3410 #: builtin/commit.c:1206
3411 msgid "list untracked files in columns"
3414 #: builtin/commit.c:1275
3415 msgid "couldn't look up newly created commit"
3418 #: builtin/commit.c:1277
3419 msgid "could not parse newly created commit"
3422 #: builtin/commit.c:1318
3423 msgid "detached HEAD"
3426 #: builtin/commit.c:1320
3427 msgid " (root-commit)"
3430 #: builtin/commit.c:1387
3431 msgid "suppress summary after successful commit"
3434 #: builtin/commit.c:1388
3435 msgid "show diff in commit message template"
3438 #: builtin/commit.c:1390
3439 msgid "Commit message options"
3442 #: builtin/commit.c:1391 builtin/tag.c:459
3443 msgid "read message from file"
3446 #: builtin/commit.c:1392
3450 #: builtin/commit.c:1392
3451 msgid "override author for commit"
3454 #: builtin/commit.c:1393 builtin/gc.c:178
3458 #: builtin/commit.c:1393
3459 msgid "override date for commit"
3462 #: builtin/commit.c:1394 builtin/merge.c:206 builtin/notes.c:534
3463 #: builtin/notes.c:691 builtin/tag.c:457
3467 #: builtin/commit.c:1394
3468 msgid "commit message"
3471 #: builtin/commit.c:1395
3472 msgid "reuse and edit message from specified commit"
3475 #: builtin/commit.c:1396
3476 msgid "reuse message from specified commit"
3479 #: builtin/commit.c:1397
3480 msgid "use autosquash formatted message to fixup specified commit"
3483 #: builtin/commit.c:1398
3484 msgid "use autosquash formatted message to squash specified commit"
3487 #: builtin/commit.c:1399
3488 msgid "the commit is authored by me now (used with -C/-c/--amend)"
3491 #: builtin/commit.c:1400 builtin/log.c:1068 builtin/revert.c:109
3492 msgid "add Signed-off-by:"
3495 #: builtin/commit.c:1401
3496 msgid "use specified template file"
3499 #: builtin/commit.c:1402
3500 msgid "force edit of commit"
3503 #: builtin/commit.c:1403
3507 #: builtin/commit.c:1403 builtin/tag.c:462
3508 msgid "how to strip spaces and #comments from message"
3511 #: builtin/commit.c:1404
3512 msgid "include status in commit message template"
3515 #: builtin/commit.c:1405 builtin/merge.c:213 builtin/tag.c:463
3519 #: builtin/commit.c:1406 builtin/merge.c:214
3520 msgid "GPG sign commit"
3523 #. end commit message options
3524 #: builtin/commit.c:1409
3525 msgid "Commit contents options"
3528 #: builtin/commit.c:1410
3529 msgid "commit all changed files"
3532 #: builtin/commit.c:1411
3533 msgid "add specified files to index for commit"
3536 #: builtin/commit.c:1412
3537 msgid "interactively add files"
3540 #: builtin/commit.c:1413
3541 msgid "interactively add changes"
3544 #: builtin/commit.c:1414
3545 msgid "commit only specified files"
3548 #: builtin/commit.c:1415
3549 msgid "bypass pre-commit hook"
3552 #: builtin/commit.c:1416
3553 msgid "show what would be committed"
3556 #: builtin/commit.c:1424
3557 msgid "amend previous commit"
3560 #: builtin/commit.c:1425
3561 msgid "bypass post-rewrite hook"
3564 #: builtin/commit.c:1430
3565 msgid "ok to record an empty change"
3568 #: builtin/commit.c:1433
3569 msgid "ok to record a change with an empty message"
3572 #: builtin/commit.c:1464
3573 msgid "could not parse HEAD commit"
3576 #: builtin/commit.c:1502 builtin/merge.c:508
3578 msgid "could not open '%s' for reading"
3581 #: builtin/commit.c:1509
3583 msgid "Corrupt MERGE_HEAD file (%s)"
3586 #: builtin/commit.c:1516
3587 msgid "could not read MERGE_MODE"
3590 #: builtin/commit.c:1535
3592 msgid "could not read commit message: %s"
3595 #: builtin/commit.c:1549
3597 msgid "Aborting commit; you did not edit the message.\n"
3600 #: builtin/commit.c:1554
3602 msgid "Aborting commit due to empty commit message.\n"
3605 #: builtin/commit.c:1569 builtin/merge.c:935 builtin/merge.c:960
3606 msgid "failed to write commit object"
3609 #: builtin/commit.c:1590
3610 msgid "cannot lock HEAD ref"
3613 #: builtin/commit.c:1594
3614 msgid "cannot update HEAD ref"
3617 #: builtin/commit.c:1605
3619 "Repository has been updated, but unable to write\n"
3620 "new_index file. Check that disk is not full or quota is\n"
3621 "not exceeded, and then \"git reset HEAD\" to recover."
3624 #: builtin/config.c:7
3625 msgid "git config [options]"
3628 #: builtin/config.c:52
3629 msgid "Config file location"
3632 #: builtin/config.c:53
3633 msgid "use global config file"
3636 #: builtin/config.c:54
3637 msgid "use system config file"
3640 #: builtin/config.c:55
3641 msgid "use repository config file"
3644 #: builtin/config.c:56
3645 msgid "use given config file"
3648 #: builtin/config.c:57
3652 #: builtin/config.c:58
3653 msgid "get value: name [value-regex]"
3656 #: builtin/config.c:59
3657 msgid "get all values: key [value-regex]"
3660 #: builtin/config.c:60
3661 msgid "get values for regexp: name-regex [value-regex]"
3664 #: builtin/config.c:61
3665 msgid "replace all matching variables: name value [value_regex]"
3668 #: builtin/config.c:62
3669 msgid "add a new variable: name value"
3672 #: builtin/config.c:63
3673 msgid "remove a variable: name [value-regex]"
3676 #: builtin/config.c:64
3677 msgid "remove all matches: name [value-regex]"
3680 #: builtin/config.c:65
3681 msgid "rename section: old-name new-name"
3684 #: builtin/config.c:66
3685 msgid "remove a section: name"
3688 #: builtin/config.c:67
3692 #: builtin/config.c:68
3693 msgid "open an editor"
3696 #: builtin/config.c:69 builtin/config.c:70
3700 #: builtin/config.c:69
3701 msgid "find the color configured: [default]"
3704 #: builtin/config.c:70
3705 msgid "find the color setting: [stdout-is-tty]"
3708 #: builtin/config.c:71
3712 #: builtin/config.c:72
3713 msgid "value is \"true\" or \"false\""
3716 #: builtin/config.c:73
3717 msgid "value is decimal number"
3720 #: builtin/config.c:74
3721 msgid "value is --bool or --int"
3724 #: builtin/config.c:75
3725 msgid "value is a path (file or directory name)"
3728 #: builtin/config.c:76
3732 #: builtin/config.c:77
3733 msgid "terminate values with NUL byte"
3736 #: builtin/config.c:78
3737 msgid "respect include directives on lookup"
3740 #: builtin/count-objects.c:69
3741 msgid "git count-objects [-v]"
3744 #: builtin/describe.c:15
3745 msgid "git describe [options] <committish>*"
3748 #: builtin/describe.c:16
3749 msgid "git describe [options] --dirty"
3752 #: builtin/describe.c:234
3754 msgid "annotated tag %s not available"
3757 #: builtin/describe.c:238
3759 msgid "annotated tag %s has no embedded name"
3762 #: builtin/describe.c:240
3764 msgid "tag '%s' is really '%s' here"
3767 #: builtin/describe.c:267
3769 msgid "Not a valid object name %s"
3772 #: builtin/describe.c:270
3774 msgid "%s is not a valid '%s' object"
3777 #: builtin/describe.c:287
3779 msgid "no tag exactly matches '%s'"
3782 #: builtin/describe.c:289
3784 msgid "searching to describe %s\n"
3787 #: builtin/describe.c:329
3789 msgid "finished search at %s\n"
3792 #: builtin/describe.c:353
3795 "No annotated tags can describe '%s'.\n"
3796 "However, there were unannotated tags: try --tags."
3799 #: builtin/describe.c:357
3802 "No tags can describe '%s'.\n"
3803 "Try --always, or create some tags."
3806 #: builtin/describe.c:378
3808 msgid "traversed %lu commits\n"
3811 #: builtin/describe.c:381
3814 "more than %i tags found; listed %i most recent\n"
3815 "gave up search at %s\n"
3818 #: builtin/describe.c:403
3819 msgid "find the tag that comes after the commit"
3822 #: builtin/describe.c:404
3823 msgid "debug search strategy on stderr"
3826 #: builtin/describe.c:405
3827 msgid "use any ref in .git/refs"
3830 #: builtin/describe.c:406
3831 msgid "use any tag in .git/refs/tags"
3834 #: builtin/describe.c:407
3835 msgid "always use long format"
3838 #: builtin/describe.c:410
3839 msgid "only output exact matches"
3842 #: builtin/describe.c:412
3843 msgid "consider <n> most recent tags (default: 10)"
3846 #: builtin/describe.c:414
3847 msgid "only consider tags matching <pattern>"
3850 #: builtin/describe.c:416 builtin/name-rev.c:238
3851 msgid "show abbreviated commit object as fallback"
3854 #: builtin/describe.c:417
3858 #: builtin/describe.c:418
3859 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
3862 #: builtin/describe.c:436
3863 msgid "--long is incompatible with --abbrev=0"
3866 #: builtin/describe.c:462
3867 msgid "No names found, cannot describe anything."
3870 #: builtin/describe.c:482
3871 msgid "--dirty is incompatible with committishes"
3874 #: builtin/diff.c:79
3876 msgid "'%s': not a regular file or symlink"
3879 #: builtin/diff.c:224
3881 msgid "invalid option: %s"
3884 #: builtin/diff.c:301
3885 msgid "Not a git repository"
3888 #: builtin/diff.c:344
3890 msgid "invalid object '%s' given."
3893 #: builtin/diff.c:349
3895 msgid "more than %d trees given: '%s'"
3898 #: builtin/diff.c:359
3900 msgid "more than two blobs given: '%s'"
3903 #: builtin/diff.c:367
3905 msgid "unhandled object '%s' given."
3908 #: builtin/fast-export.c:22
3909 msgid "git fast-export [rev-list-opts]"
3912 #: builtin/fast-export.c:635
3913 msgid "show progress after <n> objects"
3916 #: builtin/fast-export.c:637
3917 msgid "select handling of signed tags"
3920 #: builtin/fast-export.c:640
3921 msgid "select handling of tags that tag filtered objects"
3924 #: builtin/fast-export.c:643
3925 msgid "Dump marks to this file"
3928 #: builtin/fast-export.c:645
3929 msgid "Import marks from this file"
3932 #: builtin/fast-export.c:647
3933 msgid "Fake a tagger when tags lack one"
3936 #: builtin/fast-export.c:649
3937 msgid "Output full tree for each commit"
3940 #: builtin/fast-export.c:651
3941 msgid "Use the done feature to terminate the stream"
3944 #: builtin/fast-export.c:652
3945 msgid "Skip output of blob data"
3948 #: builtin/fetch.c:20
3949 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
3952 #: builtin/fetch.c:21
3953 msgid "git fetch [<options>] <group>"
3956 #: builtin/fetch.c:22
3957 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
3960 #: builtin/fetch.c:23
3961 msgid "git fetch --all [<options>]"
3964 #: builtin/fetch.c:60
3965 msgid "fetch from all remotes"
3968 #: builtin/fetch.c:62
3969 msgid "append to .git/FETCH_HEAD instead of overwriting"
3972 #: builtin/fetch.c:64
3973 msgid "path to upload pack on remote end"
3976 #: builtin/fetch.c:65
3977 msgid "force overwrite of local branch"
3980 #: builtin/fetch.c:67
3981 msgid "fetch from multiple remotes"
3984 #: builtin/fetch.c:69
3985 msgid "fetch all tags and associated objects"
3988 #: builtin/fetch.c:71
3989 msgid "do not fetch all tags (--no-tags)"
3992 #: builtin/fetch.c:73
3993 msgid "prune remote-tracking branches no longer on remote"
3996 #: builtin/fetch.c:74
4000 #: builtin/fetch.c:75
4001 msgid "control recursive fetching of submodules"
4004 #: builtin/fetch.c:79
4005 msgid "keep downloaded pack"
4008 #: builtin/fetch.c:81
4009 msgid "allow updating of HEAD ref"
4012 #: builtin/fetch.c:84
4013 msgid "deepen history of shallow clone"
4016 #: builtin/fetch.c:85 builtin/log.c:1083
4020 #: builtin/fetch.c:86
4021 msgid "prepend this to submodule path output"
4024 #: builtin/fetch.c:89
4025 msgid "default mode for recursion"
4028 #: builtin/fetch.c:201
4029 msgid "Couldn't find remote ref HEAD"
4032 #: builtin/fetch.c:254
4034 msgid "object %s not found"
4037 #: builtin/fetch.c:260
4038 msgid "[up to date]"
4041 #: builtin/fetch.c:274
4043 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4046 #: builtin/fetch.c:275 builtin/fetch.c:361
4050 #: builtin/fetch.c:286
4051 msgid "[tag update]"
4054 #: builtin/fetch.c:288 builtin/fetch.c:323 builtin/fetch.c:341
4055 msgid " (unable to update local ref)"
4058 #: builtin/fetch.c:306
4062 #: builtin/fetch.c:309
4063 msgid "[new branch]"
4066 #: builtin/fetch.c:312
4070 #: builtin/fetch.c:357
4071 msgid "unable to update local ref"
4074 #: builtin/fetch.c:357
4075 msgid "forced update"
4078 #: builtin/fetch.c:363
4079 msgid "(non-fast-forward)"
4082 #: builtin/fetch.c:394 builtin/fetch.c:686
4084 msgid "cannot open %s: %s\n"
4087 #: builtin/fetch.c:403
4089 msgid "%s did not send all necessary objects\n"
4092 #: builtin/fetch.c:489
4097 #: builtin/fetch.c:500
4100 "some local refs could not be updated; try running\n"
4101 " 'git remote prune %s' to remove any old, conflicting branches"
4104 #: builtin/fetch.c:550
4106 msgid " (%s will become dangling)"
4109 #: builtin/fetch.c:551
4111 msgid " (%s has become dangling)"
4114 #: builtin/fetch.c:558
4118 #: builtin/fetch.c:559 builtin/remote.c:1055
4122 #: builtin/fetch.c:676
4124 msgid "Refusing to fetch into current branch %s of non-bare repository"
4127 #: builtin/fetch.c:710
4129 msgid "Don't know how to fetch from %s"
4132 #: builtin/fetch.c:787
4134 msgid "Option \"%s\" value \"%s\" is not valid for %s"
4137 #: builtin/fetch.c:790
4139 msgid "Option \"%s\" is ignored for %s\n"
4142 #: builtin/fetch.c:892
4144 msgid "Fetching %s\n"
4147 #: builtin/fetch.c:894 builtin/remote.c:100
4149 msgid "Could not fetch %s"
4152 #: builtin/fetch.c:913
4154 "No remote repository specified. Please, specify either a URL or a\n"
4155 "remote name from which new revisions should be fetched."
4158 #: builtin/fetch.c:933
4159 msgid "You need to specify a tag name."
4162 #: builtin/fetch.c:985
4163 msgid "fetch --all does not take a repository argument"
4166 #: builtin/fetch.c:987
4167 msgid "fetch --all does not make sense with refspecs"
4170 #: builtin/fetch.c:998
4172 msgid "No such remote or remote group: %s"
4175 #: builtin/fetch.c:1006
4176 msgid "Fetching a group and specifying refspecs does not make sense"
4179 #: builtin/fmt-merge-msg.c:13
4180 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4183 #: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:786
4184 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192
4185 #: builtin/tag.c:448 parse-options.h:133 parse-options.h:235
4189 #: builtin/fmt-merge-msg.c:654
4190 msgid "populate log with at most <n> entries from shortlog"
4193 #: builtin/fmt-merge-msg.c:657
4194 msgid "alias for --log (deprecated)"
4197 #: builtin/fmt-merge-msg.c:660
4201 #: builtin/fmt-merge-msg.c:661
4202 msgid "use <text> as start of message"
4205 #: builtin/fmt-merge-msg.c:662
4206 msgid "file to read from"
4209 #: builtin/for-each-ref.c:979
4210 msgid "git for-each-ref [options] [<pattern>]"
4213 #: builtin/for-each-ref.c:994
4214 msgid "quote placeholders suitably for shells"
4217 #: builtin/for-each-ref.c:996
4218 msgid "quote placeholders suitably for perl"
4221 #: builtin/for-each-ref.c:998
4222 msgid "quote placeholders suitably for python"
4225 #: builtin/for-each-ref.c:1000
4226 msgid "quote placeholders suitably for tcl"
4229 #: builtin/for-each-ref.c:1003
4230 msgid "show only <n> matched refs"
4233 #: builtin/for-each-ref.c:1004
4237 #: builtin/for-each-ref.c:1004
4238 msgid "format to use for the output"
4241 #: builtin/for-each-ref.c:1005
4245 #: builtin/for-each-ref.c:1006
4246 msgid "field name to sort on"
4249 #: builtin/fsck.c:608
4250 msgid "git fsck [options] [<object>...]"
4253 #: builtin/fsck.c:614
4254 msgid "show unreachable objects"
4257 #: builtin/fsck.c:615
4258 msgid "show dangling objects"
4261 #: builtin/fsck.c:616
4265 #: builtin/fsck.c:617
4266 msgid "report root nodes"
4269 #: builtin/fsck.c:618
4270 msgid "make index objects head nodes"
4273 #: builtin/fsck.c:619
4274 msgid "make reflogs head nodes (default)"
4277 #: builtin/fsck.c:620
4278 msgid "also consider packs and alternate objects"
4281 #: builtin/fsck.c:621
4282 msgid "enable more strict checking"
4285 #: builtin/fsck.c:623
4286 msgid "write dangling objects in .git/lost-found"
4289 #: builtin/fsck.c:624 builtin/prune.c:134
4290 msgid "show progress"
4294 msgid "git gc [options]"
4299 msgid "Invalid %s: '%s'"
4304 msgid "insanely long object directory %.*s"
4308 msgid "prune unreferenced objects"
4312 msgid "be more thorough (increased runtime)"
4316 msgid "enable auto-gc mode"
4321 msgid "Auto packing the repository for optimum performance.\n"
4327 "Auto packing the repository for optimum performance. You may also\n"
4328 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
4333 "There are too many unreachable loose objects; run 'git prune' to remove them."
4336 #: builtin/grep.c:22
4337 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4340 #: builtin/grep.c:216
4342 msgid "grep: failed to create thread: %s"
4345 #: builtin/grep.c:454
4347 msgid "Failed to chdir: %s"
4350 #: builtin/grep.c:530 builtin/grep.c:564
4352 msgid "unable to read tree (%s)"
4355 #: builtin/grep.c:578
4357 msgid "unable to grep from object of type %s"
4360 #: builtin/grep.c:636
4362 msgid "switch `%c' expects a numerical value"
4365 #: builtin/grep.c:653
4367 msgid "cannot open '%s'"
4370 #: builtin/grep.c:728
4371 msgid "search in index instead of in the work tree"
4374 #: builtin/grep.c:730
4375 msgid "find in contents not managed by git"
4378 #: builtin/grep.c:732
4379 msgid "search in both tracked and untracked files"
4382 #: builtin/grep.c:734
4383 msgid "search also in ignored files"
4386 #: builtin/grep.c:737
4387 msgid "show non-matching lines"
4390 #: builtin/grep.c:739
4391 msgid "case insensitive matching"
4394 #: builtin/grep.c:741
4395 msgid "match patterns only at word boundaries"
4398 #: builtin/grep.c:743
4399 msgid "process binary files as text"
4402 #: builtin/grep.c:745
4403 msgid "don't match patterns in binary files"
4406 #: builtin/grep.c:748
4407 msgid "descend at most <depth> levels"
4410 #: builtin/grep.c:752
4411 msgid "use extended POSIX regular expressions"
4414 #: builtin/grep.c:755
4415 msgid "use basic POSIX regular expressions (default)"
4418 #: builtin/grep.c:758
4419 msgid "interpret patterns as fixed strings"
4422 #: builtin/grep.c:761
4423 msgid "use Perl-compatible regular expressions"
4426 #: builtin/grep.c:764
4427 msgid "show line numbers"
4430 #: builtin/grep.c:765
4431 msgid "don't show filenames"
4434 #: builtin/grep.c:766
4435 msgid "show filenames"
4438 #: builtin/grep.c:768
4439 msgid "show filenames relative to top directory"
4442 #: builtin/grep.c:770
4443 msgid "show only filenames instead of matching lines"
4446 #: builtin/grep.c:772
4447 msgid "synonym for --files-with-matches"
4450 #: builtin/grep.c:775
4451 msgid "show only the names of files without match"
4454 #: builtin/grep.c:777
4455 msgid "print NUL after filenames"
4458 #: builtin/grep.c:779
4459 msgid "show the number of matches instead of matching lines"
4462 #: builtin/grep.c:780
4463 msgid "highlight matches"
4466 #: builtin/grep.c:782
4467 msgid "print empty line between matches from different files"
4470 #: builtin/grep.c:784
4471 msgid "show filename only once above matches from same file"
4474 #: builtin/grep.c:787
4475 msgid "show <n> context lines before and after matches"
4478 #: builtin/grep.c:790
4479 msgid "show <n> context lines before matches"
4482 #: builtin/grep.c:792
4483 msgid "show <n> context lines after matches"
4486 #: builtin/grep.c:793
4487 msgid "shortcut for -C NUM"
4490 #: builtin/grep.c:796
4491 msgid "show a line with the function name before matches"
4494 #: builtin/grep.c:798
4495 msgid "show the surrounding function"
4498 #: builtin/grep.c:801
4499 msgid "read patterns from file"
4502 #: builtin/grep.c:803
4503 msgid "match <pattern>"
4506 #: builtin/grep.c:805
4507 msgid "combine patterns specified with -e"
4510 #: builtin/grep.c:817
4511 msgid "indicate hit with exit status without output"
4514 #: builtin/grep.c:819
4515 msgid "show only matches from files that match all patterns"
4518 #: builtin/grep.c:822
4522 #: builtin/grep.c:822
4523 msgid "show matching files in the pager"
4526 #: builtin/grep.c:825
4527 msgid "allow calling of grep(1) (ignored by this build)"
4530 #: builtin/grep.c:826 builtin/show-ref.c:201
4534 #: builtin/grep.c:917
4535 msgid "no pattern given."
4538 #: builtin/grep.c:931
4540 msgid "bad object %s"
4543 #: builtin/grep.c:972
4544 msgid "--open-files-in-pager only works on the worktree"
4547 #: builtin/grep.c:995
4548 msgid "--cached or --untracked cannot be used with --no-index."
4551 #: builtin/grep.c:1000
4552 msgid "--no-index or --untracked cannot be used with revs."
4555 #: builtin/grep.c:1003
4556 msgid "--[no-]exclude-standard cannot be used for tracked contents."
4559 #: builtin/grep.c:1011
4560 msgid "both --cached and trees are given."
4563 #: builtin/hash-object.c:60
4565 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
4569 #: builtin/hash-object.c:61
4570 msgid "git hash-object --stdin-paths < <list-of-paths>"
4573 #: builtin/hash-object.c:72
4577 #: builtin/hash-object.c:72
4581 #: builtin/hash-object.c:73
4582 msgid "write the object into the object database"
4585 #: builtin/hash-object.c:74
4586 msgid "read the object from stdin"
4589 #: builtin/hash-object.c:76
4590 msgid "store file as is without filters"
4593 #: builtin/hash-object.c:77
4594 msgid "process file as it were from this path"
4597 #: builtin/help.c:43
4598 msgid "print all available commands"
4601 #: builtin/help.c:44
4602 msgid "show man page"
4605 #: builtin/help.c:45
4606 msgid "show manual in web browser"
4609 #: builtin/help.c:47
4610 msgid "show info page"
4613 #: builtin/help.c:53
4614 msgid "git help [--all] [--man|--web|--info] [command]"
4617 #: builtin/help.c:65
4619 msgid "unrecognized help format '%s'"
4622 #: builtin/help.c:93
4623 msgid "Failed to start emacsclient."
4626 #: builtin/help.c:106
4627 msgid "Failed to parse emacsclient version."
4630 #: builtin/help.c:114
4632 msgid "emacsclient version '%d' too old (< 22)."
4635 #: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
4637 msgid "failed to exec '%s': %s"
4640 #: builtin/help.c:217
4643 "'%s': path for unsupported man viewer.\n"
4644 "Please consider using 'man.<tool>.cmd' instead."
4647 #: builtin/help.c:229
4650 "'%s': cmd for supported man viewer.\n"
4651 "Please consider using 'man.<tool>.path' instead."
4654 #: builtin/help.c:299
4655 msgid "The most commonly used git commands are:"
4658 #: builtin/help.c:367
4660 msgid "'%s': unknown man viewer."
4663 #: builtin/help.c:384
4664 msgid "no man viewer handled the request"
4667 #: builtin/help.c:392
4668 msgid "no info viewer handled the request"
4671 #: builtin/help.c:447 builtin/help.c:454
4676 #: builtin/help.c:470
4678 msgid "`git %s' is aliased to `%s'"
4681 #: builtin/index-pack.c:170
4683 msgid "object type mismatch at %s"
4686 #: builtin/index-pack.c:190
4687 msgid "object of unexpected type"
4690 #: builtin/index-pack.c:227
4692 msgid "cannot fill %d byte"
4693 msgid_plural "cannot fill %d bytes"
4697 #: builtin/index-pack.c:237
4701 #: builtin/index-pack.c:238
4702 msgid "read error on input"
4705 #: builtin/index-pack.c:250
4706 msgid "used more bytes than were available"
4709 #: builtin/index-pack.c:257
4710 msgid "pack too large for current definition of off_t"
4713 #: builtin/index-pack.c:273
4715 msgid "unable to create '%s'"
4718 #: builtin/index-pack.c:278
4720 msgid "cannot open packfile '%s'"
4723 #: builtin/index-pack.c:292
4724 msgid "pack signature mismatch"
4727 #: builtin/index-pack.c:294
4729 msgid "pack version %<PRIu32> unsupported"
4732 #: builtin/index-pack.c:312
4734 msgid "pack has bad object at offset %lu: %s"
4737 #: builtin/index-pack.c:434
4739 msgid "inflate returned %d"
4742 #: builtin/index-pack.c:483
4743 msgid "offset value overflow for delta base object"
4746 #: builtin/index-pack.c:491
4747 msgid "delta base offset is out of bound"
4750 #: builtin/index-pack.c:499
4752 msgid "unknown object type %d"
4755 #: builtin/index-pack.c:530
4756 msgid "cannot pread pack file"
4759 #: builtin/index-pack.c:532
4761 msgid "premature end of pack file, %lu byte missing"
4762 msgid_plural "premature end of pack file, %lu bytes missing"
4766 #: builtin/index-pack.c:558
4767 msgid "serious inflate inconsistency"
4770 #: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
4771 #: builtin/index-pack.c:712 builtin/index-pack.c:721
4773 msgid "SHA1 COLLISION FOUND WITH %s !"
4776 #: builtin/index-pack.c:652 builtin/pack-objects.c:170
4777 #: builtin/pack-objects.c:262
4779 msgid "unable to read %s"
4782 #: builtin/index-pack.c:718
4784 msgid "cannot read existing object %s"
4787 #: builtin/index-pack.c:732
4789 msgid "invalid blob object %s"
4792 #: builtin/index-pack.c:747
4797 #: builtin/index-pack.c:749
4798 msgid "Error in object"
4801 #: builtin/index-pack.c:751
4803 msgid "Not all child objects of %s are reachable"
4806 #: builtin/index-pack.c:821 builtin/index-pack.c:847
4807 msgid "failed to apply delta"
4810 #: builtin/index-pack.c:986
4811 msgid "Receiving objects"
4814 #: builtin/index-pack.c:986
4815 msgid "Indexing objects"
4818 #: builtin/index-pack.c:1012
4819 msgid "pack is corrupted (SHA1 mismatch)"
4822 #: builtin/index-pack.c:1017
4823 msgid "cannot fstat packfile"
4826 #: builtin/index-pack.c:1020
4827 msgid "pack has junk at the end"
4830 #: builtin/index-pack.c:1031
4831 msgid "confusion beyond insanity in parse_pack_objects()"
4834 #: builtin/index-pack.c:1054
4835 msgid "Resolving deltas"
4838 #: builtin/index-pack.c:1064
4840 msgid "unable to create thread: %s"
4843 #: builtin/index-pack.c:1106
4844 msgid "confusion beyond insanity"
4847 #: builtin/index-pack.c:1112
4849 msgid "completed with %d local objects"
4852 #: builtin/index-pack.c:1121
4854 msgid "Unexpected tail checksum for %s (disk corruption?)"
4857 #: builtin/index-pack.c:1125
4859 msgid "pack has %d unresolved delta"
4860 msgid_plural "pack has %d unresolved deltas"
4864 #: builtin/index-pack.c:1150
4866 msgid "unable to deflate appended object (%d)"
4869 #: builtin/index-pack.c:1229
4871 msgid "local object %s is corrupt"
4874 #: builtin/index-pack.c:1253
4875 msgid "error while closing pack file"
4878 #: builtin/index-pack.c:1266
4880 msgid "cannot write keep file '%s'"
4883 #: builtin/index-pack.c:1274
4885 msgid "cannot close written keep file '%s'"
4888 #: builtin/index-pack.c:1287
4889 msgid "cannot store pack file"
4892 #: builtin/index-pack.c:1298
4893 msgid "cannot store index file"
4896 #: builtin/index-pack.c:1331
4898 msgid "bad pack.indexversion=%<PRIu32>"
4901 #: builtin/index-pack.c:1337
4903 msgid "invalid number of threads specified (%d)"
4906 #: builtin/index-pack.c:1341 builtin/index-pack.c:1514
4908 msgid "no threads support, ignoring %s"
4911 #: builtin/index-pack.c:1399
4913 msgid "Cannot open existing pack file '%s'"
4916 #: builtin/index-pack.c:1401
4918 msgid "Cannot open existing pack idx file for '%s'"
4921 #: builtin/index-pack.c:1448
4923 msgid "non delta: %d object"
4924 msgid_plural "non delta: %d objects"
4928 #: builtin/index-pack.c:1455
4930 msgid "chain length = %d: %lu object"
4931 msgid_plural "chain length = %d: %lu objects"
4935 #: builtin/index-pack.c:1482
4936 msgid "Cannot come back to cwd"
4939 #: builtin/index-pack.c:1526 builtin/index-pack.c:1529
4940 #: builtin/index-pack.c:1541 builtin/index-pack.c:1545
4945 #: builtin/index-pack.c:1559
4946 msgid "--fix-thin cannot be used without --stdin"
4949 #: builtin/index-pack.c:1563 builtin/index-pack.c:1573
4951 msgid "packfile name '%s' does not end with '.pack'"
4954 #: builtin/index-pack.c:1582
4955 msgid "--verify with no packfile name given"
4958 #: builtin/init-db.c:35
4960 msgid "Could not make %s writable by group"
4963 #: builtin/init-db.c:62
4965 msgid "insanely long template name %s"
4968 #: builtin/init-db.c:67
4970 msgid "cannot stat '%s'"
4973 #: builtin/init-db.c:73
4975 msgid "cannot stat template '%s'"
4978 #: builtin/init-db.c:80
4980 msgid "cannot opendir '%s'"
4983 #: builtin/init-db.c:97
4985 msgid "cannot readlink '%s'"
4988 #: builtin/init-db.c:99
4990 msgid "insanely long symlink %s"
4993 #: builtin/init-db.c:102
4995 msgid "cannot symlink '%s' '%s'"
4998 #: builtin/init-db.c:106
5000 msgid "cannot copy '%s' to '%s'"
5003 #: builtin/init-db.c:110
5005 msgid "ignoring template %s"
5008 #: builtin/init-db.c:133
5010 msgid "insanely long template path %s"
5013 #: builtin/init-db.c:141
5015 msgid "templates not found %s"
5018 #: builtin/init-db.c:154
5020 msgid "not copying templates of a wrong format version %d from '%s'"
5023 #: builtin/init-db.c:192
5025 msgid "insane git directory %s"
5028 #: builtin/init-db.c:323 builtin/init-db.c:326
5030 msgid "%s already exists"
5033 #: builtin/init-db.c:355
5035 msgid "unable to handle file type %d"
5038 #: builtin/init-db.c:358
5040 msgid "unable to move %s to %s"
5043 #: builtin/init-db.c:363
5045 msgid "Could not create git link %s"
5049 #. * TRANSLATORS: The first '%s' is either "Reinitialized
5050 #. * existing" or "Initialized empty", the second " shared" or
5051 #. * "", and the last '%s%s' is the verbatim directory name.
5053 #: builtin/init-db.c:420
5055 msgid "%s%s Git repository in %s%s\n"
5058 #: builtin/init-db.c:421
5059 msgid "Reinitialized existing"
5062 #: builtin/init-db.c:421
5063 msgid "Initialized empty"
5066 #: builtin/init-db.c:422
5070 #: builtin/init-db.c:441
5071 msgid "cannot tell cwd"
5074 #: builtin/init-db.c:467
5076 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"
5077 "[=<permissions>]] [directory]"
5080 #: builtin/init-db.c:490
5084 #: builtin/init-db.c:491
5085 msgid "specify that the git repository is to be shared amongst several users"
5088 #: builtin/init-db.c:493 builtin/prune-packed.c:77
5092 #: builtin/init-db.c:522 builtin/init-db.c:529
5094 msgid "cannot mkdir %s"
5097 #: builtin/init-db.c:533
5099 msgid "cannot chdir to %s"
5102 #: builtin/init-db.c:555
5105 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5109 #: builtin/init-db.c:579
5110 msgid "Cannot access current working directory"
5113 #: builtin/init-db.c:586
5115 msgid "Cannot access work tree '%s'"
5119 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
5123 msgid " or: git show [options] <object>..."
5126 #: builtin/log.c:100
5127 msgid "suppress diff output"
5130 #: builtin/log.c:101
5134 #: builtin/log.c:102
5135 msgid "decorate options"
5138 #: builtin/log.c:189
5140 msgid "Final output: %d %s\n"
5143 #: builtin/log.c:403 builtin/log.c:494
5145 msgid "Could not read object %s"
5148 #: builtin/log.c:518
5150 msgid "Unknown type: %d"
5153 #: builtin/log.c:608
5154 msgid "format.headers without value"
5157 #: builtin/log.c:682
5158 msgid "name of output directory is too long"
5161 #: builtin/log.c:693
5163 msgid "Cannot open patch file %s"
5166 #: builtin/log.c:707
5167 msgid "Need exactly one range."
5170 #: builtin/log.c:715
5171 msgid "Not a range."
5174 #: builtin/log.c:789
5175 msgid "Cover letter needs email format"
5178 #: builtin/log.c:862
5180 msgid "insane in-reply-to: %s"
5183 #: builtin/log.c:890
5184 msgid "git format-patch [options] [<since> | <revision range>]"
5187 #: builtin/log.c:935
5188 msgid "Two output directories?"
5191 #: builtin/log.c:1063
5192 msgid "use [PATCH n/m] even with a single patch"
5195 #: builtin/log.c:1066
5196 msgid "use [PATCH] even with multiple patches"
5199 #: builtin/log.c:1070
5200 msgid "print patches to standard out"
5203 #: builtin/log.c:1072
5204 msgid "generate a cover letter"
5207 #: builtin/log.c:1074
5208 msgid "use simple number sequence for output file names"
5211 #: builtin/log.c:1075
5215 #: builtin/log.c:1076
5216 msgid "use <sfx> instead of '.patch'"
5219 #: builtin/log.c:1078
5220 msgid "start numbering patches at <n> instead of 1"
5223 #: builtin/log.c:1080
5224 msgid "Use [<prefix>] instead of [PATCH]"
5227 #: builtin/log.c:1083
5228 msgid "store resulting files in <dir>"
5231 #: builtin/log.c:1086
5232 msgid "don't strip/add [PATCH]"
5235 #: builtin/log.c:1089
5236 msgid "don't output binary diffs"
5239 #: builtin/log.c:1091
5240 msgid "don't include a patch matching a commit upstream"
5243 #: builtin/log.c:1093
5244 msgid "show patch format instead of default (patch + stat)"
5247 #: builtin/log.c:1095
5251 #: builtin/log.c:1096
5255 #: builtin/log.c:1097
5256 msgid "add email header"
5259 #: builtin/log.c:1098 builtin/log.c:1100
5263 #: builtin/log.c:1098
5264 msgid "add To: header"
5267 #: builtin/log.c:1100
5268 msgid "add Cc: header"
5271 #: builtin/log.c:1102
5275 #: builtin/log.c:1103
5276 msgid "make first mail a reply to <message-id>"
5279 #: builtin/log.c:1104 builtin/log.c:1107
5283 #: builtin/log.c:1105
5284 msgid "attach the patch"
5287 #: builtin/log.c:1108
5288 msgid "inline the patch"
5291 #: builtin/log.c:1112
5292 msgid "enable message threading, styles: shallow, deep"
5295 #: builtin/log.c:1114
5299 #: builtin/log.c:1115
5300 msgid "add a signature"
5303 #: builtin/log.c:1117
5304 msgid "don't print the patch filenames"
5307 #: builtin/log.c:1157
5309 msgid "bogus committer info %s"
5312 #: builtin/log.c:1202
5313 msgid "-n and -k are mutually exclusive."
5316 #: builtin/log.c:1204
5317 msgid "--subject-prefix and -k are mutually exclusive."
5320 #: builtin/log.c:1212
5321 msgid "--name-only does not make sense"
5324 #: builtin/log.c:1214
5325 msgid "--name-status does not make sense"
5328 #: builtin/log.c:1216
5329 msgid "--check does not make sense"
5332 #: builtin/log.c:1239
5333 msgid "standard output, or directory, which one?"
5336 #: builtin/log.c:1241
5338 msgid "Could not create directory '%s'"
5341 #: builtin/log.c:1394
5342 msgid "Failed to create output files"
5345 #: builtin/log.c:1443
5346 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5349 #: builtin/log.c:1498
5352 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
5355 #: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
5357 msgid "Unknown commit %s"
5360 #: builtin/ls-files.c:408
5361 msgid "git ls-files [options] [<file>...]"
5364 #: builtin/ls-files.c:463
5365 msgid "identify the file status with tags"
5368 #: builtin/ls-files.c:465
5369 msgid "use lowercase letters for 'assume unchanged' files"
5372 #: builtin/ls-files.c:467
5373 msgid "show cached files in the output (default)"
5376 #: builtin/ls-files.c:469
5377 msgid "show deleted files in the output"
5380 #: builtin/ls-files.c:471
5381 msgid "show modified files in the output"
5384 #: builtin/ls-files.c:473
5385 msgid "show other files in the output"
5388 #: builtin/ls-files.c:475
5389 msgid "show ignored files in the output"
5392 #: builtin/ls-files.c:478
5393 msgid "show staged contents' object name in the output"
5396 #: builtin/ls-files.c:480
5397 msgid "show files on the filesystem that need to be removed"
5400 #: builtin/ls-files.c:482
5401 msgid "show 'other' directories' name only"
5404 #: builtin/ls-files.c:485
5405 msgid "don't show empty directories"
5408 #: builtin/ls-files.c:488
5409 msgid "show unmerged files in the output"
5412 #: builtin/ls-files.c:490
5413 msgid "show resolve-undo information"
5416 #: builtin/ls-files.c:492
5417 msgid "skip files matching pattern"
5420 #: builtin/ls-files.c:495
5421 msgid "exclude patterns are read from <file>"
5424 #: builtin/ls-files.c:498
5425 msgid "read additional per-directory exclude patterns in <file>"
5428 #: builtin/ls-files.c:500
5429 msgid "add the standard git exclusions"
5432 #: builtin/ls-files.c:503
5433 msgid "make the output relative to the project top directory"
5436 #: builtin/ls-files.c:506
5437 msgid "if any <file> is not in the index, treat this as an error"
5440 #: builtin/ls-files.c:507
5444 #: builtin/ls-files.c:508
5445 msgid "pretend that paths removed since <tree-ish> are still present"
5448 #: builtin/ls-files.c:510
5449 msgid "show debugging data"
5452 #: builtin/ls-tree.c:27
5453 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
5456 #: builtin/ls-tree.c:125
5457 msgid "only show trees"
5460 #: builtin/ls-tree.c:127
5461 msgid "recurse into subtrees"
5464 #: builtin/ls-tree.c:129
5465 msgid "show trees when recursing"
5468 #: builtin/ls-tree.c:132
5469 msgid "terminate entries with NUL byte"
5472 #: builtin/ls-tree.c:133
5473 msgid "include object size"
5476 #: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5477 msgid "list only filenames"
5480 #: builtin/ls-tree.c:140
5481 msgid "use full path names"
5484 #: builtin/ls-tree.c:142
5485 msgid "list entire tree; not just current directory (implies --full-name)"
5488 #: builtin/merge.c:43
5489 msgid "git merge [options] [<commit>...]"
5492 #: builtin/merge.c:44
5493 msgid "git merge [options] <msg> HEAD <commit>"
5496 #: builtin/merge.c:45
5497 msgid "git merge --abort"
5500 #: builtin/merge.c:90
5501 msgid "switch `m' requires a value"
5504 #: builtin/merge.c:127
5506 msgid "Could not find merge strategy '%s'.\n"
5509 #: builtin/merge.c:128
5511 msgid "Available strategies are:"
5514 #: builtin/merge.c:133
5516 msgid "Available custom strategies are:"
5519 #: builtin/merge.c:183
5520 msgid "do not show a diffstat at the end of the merge"
5523 #: builtin/merge.c:186
5524 msgid "show a diffstat at the end of the merge"
5527 #: builtin/merge.c:187
5528 msgid "(synonym to --stat)"
5531 #: builtin/merge.c:189
5532 msgid "add (at most <n>) entries from shortlog to merge commit message"
5535 #: builtin/merge.c:192
5536 msgid "create a single commit instead of doing a merge"
5539 #: builtin/merge.c:194
5540 msgid "perform a commit if the merge succeeds (default)"
5543 #: builtin/merge.c:196
5544 msgid "edit message before committing"
5547 #: builtin/merge.c:198
5548 msgid "allow fast-forward (default)"
5551 #: builtin/merge.c:200
5552 msgid "abort if fast-forward is not possible"
5555 #: builtin/merge.c:202 builtin/notes.c:867 builtin/revert.c:112
5559 #: builtin/merge.c:203
5560 msgid "merge strategy to use"
5563 #: builtin/merge.c:204
5564 msgid "option=value"
5567 #: builtin/merge.c:205
5568 msgid "option for selected merge strategy"
5571 #: builtin/merge.c:207
5572 msgid "merge commit message (for a non-fast-forward merge)"
5575 #: builtin/merge.c:211
5576 msgid "abort the current in-progress merge"
5579 #: builtin/merge.c:240
5580 msgid "could not run stash."
5583 #: builtin/merge.c:245
5584 msgid "stash failed"
5587 #: builtin/merge.c:250
5589 msgid "not a valid object: %s"
5592 #: builtin/merge.c:269 builtin/merge.c:286
5593 msgid "read-tree failed"
5596 #: builtin/merge.c:316
5597 msgid " (nothing to squash)"
5600 #: builtin/merge.c:329
5602 msgid "Squash commit -- not updating HEAD\n"
5605 #: builtin/merge.c:361
5606 msgid "Writing SQUASH_MSG"
5609 #: builtin/merge.c:363
5610 msgid "Finishing SQUASH_MSG"
5613 #: builtin/merge.c:386
5615 msgid "No merge message -- not updating HEAD\n"
5618 #: builtin/merge.c:436
5620 msgid "'%s' does not point to a commit"
5623 #: builtin/merge.c:535
5625 msgid "Bad branch.%s.mergeoptions string: %s"
5628 #: builtin/merge.c:628
5629 msgid "git write-tree failed to write a tree"
5632 #: builtin/merge.c:678
5633 msgid "failed to read the cache"
5636 #: builtin/merge.c:709
5637 msgid "Not handling anything other than two heads merge."
5640 #: builtin/merge.c:723
5642 msgid "Unknown option for merge-recursive: -X%s"
5645 #: builtin/merge.c:737
5647 msgid "unable to write %s"
5650 #: builtin/merge.c:876
5652 msgid "Could not read from '%s'"
5655 #: builtin/merge.c:885
5657 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
5660 #: builtin/merge.c:891
5662 "Please enter a commit message to explain why this merge is necessary,\n"
5663 "especially if it merges an updated upstream into a topic branch.\n"
5665 "Lines starting with '#' will be ignored, and an empty message aborts\n"
5669 #: builtin/merge.c:915
5670 msgid "Empty commit message."
5673 #: builtin/merge.c:927
5675 msgid "Wonderful.\n"
5678 #: builtin/merge.c:992
5680 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
5683 #: builtin/merge.c:1008
5685 msgid "'%s' is not a commit"
5688 #: builtin/merge.c:1049
5689 msgid "No current branch."
5692 #: builtin/merge.c:1051
5693 msgid "No remote for the current branch."
5696 #: builtin/merge.c:1053
5697 msgid "No default upstream defined for the current branch."
5700 #: builtin/merge.c:1058
5702 msgid "No remote tracking branch for %s from %s"
5705 #: builtin/merge.c:1145 builtin/merge.c:1302
5707 msgid "%s - not something we can merge"
5710 #: builtin/merge.c:1213
5711 msgid "There is no merge to abort (MERGE_HEAD missing)."
5714 #: builtin/merge.c:1229 git-pull.sh:31
5716 "You have not concluded your merge (MERGE_HEAD exists).\n"
5717 "Please, commit your changes before you can merge."
5720 #: builtin/merge.c:1232 git-pull.sh:34
5721 msgid "You have not concluded your merge (MERGE_HEAD exists)."
5724 #: builtin/merge.c:1236
5726 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
5727 "Please, commit your changes before you can merge."
5730 #: builtin/merge.c:1239
5731 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
5734 #: builtin/merge.c:1248
5735 msgid "You cannot combine --squash with --no-ff."
5738 #: builtin/merge.c:1253
5739 msgid "You cannot combine --no-ff with --ff-only."
5742 #: builtin/merge.c:1260
5743 msgid "No commit specified and merge.defaultToUpstream not set."
5746 #: builtin/merge.c:1292
5747 msgid "Can merge only exactly one commit into empty head"
5750 #: builtin/merge.c:1295
5751 msgid "Squash commit into empty head not supported yet"
5754 #: builtin/merge.c:1297
5755 msgid "Non-fast-forward commit does not make sense into an empty head"
5758 #: builtin/merge.c:1412
5760 msgid "Updating %s..%s\n"
5763 #: builtin/merge.c:1450
5765 msgid "Trying really trivial in-index merge...\n"
5768 #: builtin/merge.c:1457
5773 #: builtin/merge.c:1489
5774 msgid "Not possible to fast-forward, aborting."
5777 #: builtin/merge.c:1512 builtin/merge.c:1591
5779 msgid "Rewinding the tree to pristine...\n"
5782 #: builtin/merge.c:1516
5784 msgid "Trying merge strategy %s...\n"
5787 #: builtin/merge.c:1582
5789 msgid "No merge strategy handled the merge.\n"
5792 #: builtin/merge.c:1584
5794 msgid "Merge with strategy %s failed.\n"
5797 #: builtin/merge.c:1593
5799 msgid "Using the %s to prepare resolving by hand.\n"
5802 #: builtin/merge.c:1605
5804 msgid "Automatic merge went well; stopped before committing as requested\n"
5807 #: builtin/merge-base.c:26
5808 msgid "git merge-base [-a|--all] <commit> <commit>..."
5811 #: builtin/merge-base.c:27
5812 msgid "git merge-base [-a|--all] --octopus <commit>..."
5815 #: builtin/merge-base.c:28
5816 msgid "git merge-base --independent <commit>..."
5819 #: builtin/merge-base.c:29
5820 msgid "git merge-base --is-ancestor <commit> <commit>"
5823 #: builtin/merge-base.c:98
5824 msgid "output all common ancestors"
5827 #: builtin/merge-base.c:99
5828 msgid "find ancestors for a single n-way merge"
5831 #: builtin/merge-base.c:100
5832 msgid "list revs not reachable from others"
5835 #: builtin/merge-base.c:102
5836 msgid "is the first one ancestor of the other?"
5839 #: builtin/merge-file.c:8
5841 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
5845 #: builtin/merge-file.c:33
5846 msgid "send results to standard output"
5849 #: builtin/merge-file.c:34
5850 msgid "use a diff3 based merge"
5853 #: builtin/merge-file.c:35
5854 msgid "for conflicts, use our version"
5857 #: builtin/merge-file.c:37
5858 msgid "for conflicts, use their version"
5861 #: builtin/merge-file.c:39
5862 msgid "for conflicts, use a union version"
5865 #: builtin/merge-file.c:42
5866 msgid "for conflicts, use this marker size"
5869 #: builtin/merge-file.c:43
5870 msgid "do not warn about conflicts"
5873 #: builtin/merge-file.c:45
5874 msgid "set labels for file1/orig_file/file2"
5877 #: builtin/mktree.c:67
5878 msgid "git mktree [-z] [--missing] [--batch]"
5881 #: builtin/mktree.c:153
5882 msgid "input is NUL terminated"
5885 #: builtin/mktree.c:154 builtin/write-tree.c:24
5886 msgid "allow missing objects"
5889 #: builtin/mktree.c:155
5890 msgid "allow creation of more than one tree"
5894 msgid "git mv [options] <source>... <destination>"
5898 msgid "force move/rename even if target exists"
5902 msgid "skip move/rename errors"
5907 msgid "Checking rename of '%s' to '%s'\n"
5915 msgid "can not move directory into itself"
5919 msgid "cannot move directory over file"
5924 msgid "Huh? %.*s is in index?"
5928 msgid "source directory is empty"
5932 msgid "not under version control"
5936 msgid "destination exists"
5941 msgid "overwriting '%s'"
5945 msgid "Cannot overwrite"
5949 msgid "multiple sources for the same target"
5954 msgid "%s, source=%s, destination=%s"
5959 msgid "Renaming %s to %s\n"
5962 #: builtin/mv.c:215 builtin/remote.c:731
5964 msgid "renaming '%s' failed"
5967 #: builtin/name-rev.c:175
5968 msgid "git name-rev [options] <commit>..."
5971 #: builtin/name-rev.c:176
5972 msgid "git name-rev [options] --all"
5975 #: builtin/name-rev.c:177
5976 msgid "git name-rev [options] --stdin"
5979 #: builtin/name-rev.c:229
5980 msgid "print only names (no SHA-1)"
5983 #: builtin/name-rev.c:230
5984 msgid "only use tags to name the commits"
5987 #: builtin/name-rev.c:232
5988 msgid "only use refs matching <pattern>"
5991 #: builtin/name-rev.c:234
5992 msgid "list all commits reachable from all refs"
5995 #: builtin/name-rev.c:235
5996 msgid "read from stdin"
5999 #: builtin/name-rev.c:236
6000 msgid "allow to print `undefined` names"
6003 #: builtin/notes.c:23
6004 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
6007 #: builtin/notes.c:24
6009 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6010 "<object>] [<object>]"
6013 #: builtin/notes.c:25
6014 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6017 #: builtin/notes.c:26
6019 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6020 "<object>] [<object>]"
6023 #: builtin/notes.c:27
6024 msgid "git notes [--ref <notes_ref>] edit [<object>]"
6027 #: builtin/notes.c:28
6028 msgid "git notes [--ref <notes_ref>] show [<object>]"
6031 #: builtin/notes.c:29
6033 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6036 #: builtin/notes.c:30
6037 msgid "git notes merge --commit [-v | -q]"
6040 #: builtin/notes.c:31
6041 msgid "git notes merge --abort [-v | -q]"
6044 #: builtin/notes.c:32
6045 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6048 #: builtin/notes.c:33
6049 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6052 #: builtin/notes.c:34
6053 msgid "git notes [--ref <notes_ref>] get-ref"
6056 #: builtin/notes.c:39
6057 msgid "git notes [list [<object>]]"
6060 #: builtin/notes.c:44
6061 msgid "git notes add [<options>] [<object>]"
6064 #: builtin/notes.c:49
6065 msgid "git notes copy [<options>] <from-object> <to-object>"
6068 #: builtin/notes.c:50
6069 msgid "git notes copy --stdin [<from-object> <to-object>]..."
6072 #: builtin/notes.c:55
6073 msgid "git notes append [<options>] [<object>]"
6076 #: builtin/notes.c:60
6077 msgid "git notes edit [<object>]"
6080 #: builtin/notes.c:65
6081 msgid "git notes show [<object>]"
6084 #: builtin/notes.c:70
6085 msgid "git notes merge [<options>] <notes_ref>"
6088 #: builtin/notes.c:71
6089 msgid "git notes merge --commit [<options>]"
6092 #: builtin/notes.c:72
6093 msgid "git notes merge --abort [<options>]"
6096 #: builtin/notes.c:77
6097 msgid "git notes remove [<object>]"
6100 #: builtin/notes.c:82
6101 msgid "git notes prune [<options>]"
6104 #: builtin/notes.c:87
6105 msgid "git notes get-ref"
6108 #: builtin/notes.c:139
6110 msgid "unable to start 'show' for object '%s'"
6113 #: builtin/notes.c:145
6114 msgid "can't fdopen 'show' output fd"
6117 #: builtin/notes.c:155
6119 msgid "failed to close pipe to 'show' for object '%s'"
6122 #: builtin/notes.c:158
6124 msgid "failed to finish 'show' for object '%s'"
6127 #: builtin/notes.c:175 builtin/tag.c:347
6129 msgid "could not create file '%s'"
6132 #: builtin/notes.c:189
6133 msgid "Please supply the note contents using either -m or -F option"
6136 #: builtin/notes.c:210 builtin/notes.c:973
6138 msgid "Removing note for object %s\n"
6141 #: builtin/notes.c:215
6142 msgid "unable to write note object"
6145 #: builtin/notes.c:217
6147 msgid "The note contents has been left in %s"
6150 #: builtin/notes.c:251 builtin/tag.c:542
6152 msgid "cannot read '%s'"
6155 #: builtin/notes.c:253 builtin/tag.c:545
6157 msgid "could not open or read '%s'"
6160 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
6161 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
6162 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
6163 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
6165 msgid "Failed to resolve '%s' as a valid ref."
6168 #: builtin/notes.c:275
6170 msgid "Failed to read object '%s'."
6173 #: builtin/notes.c:299
6174 msgid "Cannot commit uninitialized/unreferenced notes tree"
6177 #: builtin/notes.c:340
6179 msgid "Bad notes.rewriteMode value: '%s'"
6182 #: builtin/notes.c:350
6184 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6187 #. TRANSLATORS: The first %s is the name of the
6188 #. environment variable, the second %s is its value
6189 #: builtin/notes.c:377
6191 msgid "Bad %s value: '%s'"
6194 #: builtin/notes.c:441
6196 msgid "Malformed input line: '%s'."
6199 #: builtin/notes.c:456
6201 msgid "Failed to copy notes from '%s' to '%s'"
6204 #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
6205 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
6206 #: builtin/notes.c:1033
6207 msgid "too many parameters"
6210 #: builtin/notes.c:513 builtin/notes.c:772
6212 msgid "No note found for object %s."
6215 #: builtin/notes.c:535 builtin/notes.c:692
6216 msgid "note contents as a string"
6219 #: builtin/notes.c:538 builtin/notes.c:695
6220 msgid "note contents in a file"
6223 #: builtin/notes.c:540 builtin/notes.c:543 builtin/notes.c:697
6224 #: builtin/notes.c:700 builtin/tag.c:476
6228 #: builtin/notes.c:541 builtin/notes.c:698
6229 msgid "reuse and edit specified note object"
6232 #: builtin/notes.c:544 builtin/notes.c:701
6233 msgid "reuse specified note object"
6236 #: builtin/notes.c:546 builtin/notes.c:614
6237 msgid "replace existing notes"
6240 #: builtin/notes.c:580
6243 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6247 #: builtin/notes.c:585 builtin/notes.c:662
6249 msgid "Overwriting existing notes for object %s\n"
6252 #: builtin/notes.c:615
6253 msgid "read objects from stdin"
6256 #: builtin/notes.c:617
6257 msgid "load rewriting config for <command> (implies --stdin)"
6260 #: builtin/notes.c:635
6261 msgid "too few parameters"
6264 #: builtin/notes.c:656
6267 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6271 #: builtin/notes.c:668
6273 msgid "Missing notes on source object %s. Cannot copy."
6276 #: builtin/notes.c:717
6279 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6280 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6283 #: builtin/notes.c:864
6284 msgid "General options"
6287 #: builtin/notes.c:866
6288 msgid "Merge options"
6291 #: builtin/notes.c:868
6293 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6297 #: builtin/notes.c:870
6298 msgid "Committing unmerged notes"
6301 #: builtin/notes.c:872
6302 msgid "finalize notes merge by committing unmerged notes"
6305 #: builtin/notes.c:874
6306 msgid "Aborting notes merge resolution"
6309 #: builtin/notes.c:876
6310 msgid "abort notes merge"
6313 #: builtin/notes.c:971
6315 msgid "Object %s has no note\n"
6318 #: builtin/notes.c:983
6319 msgid "attempt to remove non-existent note is not an error"
6322 #: builtin/notes.c:986
6323 msgid "read object names from the standard input"
6326 #: builtin/notes.c:1067
6330 #: builtin/notes.c:1068
6331 msgid "use notes from <notes_ref>"
6334 #: builtin/notes.c:1103 builtin/remote.c:1598
6336 msgid "Unknown subcommand: %s"
6339 #: builtin/pack-objects.c:23
6340 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
6343 #: builtin/pack-objects.c:24
6344 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
6347 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6349 msgid "deflate error (%d)"
6352 #: builtin/pack-objects.c:2398
6354 msgid "unsupported index version %s"
6357 #: builtin/pack-objects.c:2402
6359 msgid "bad index version '%s'"
6362 #: builtin/pack-objects.c:2425
6364 msgid "option %s does not accept negative form"
6367 #: builtin/pack-objects.c:2429
6369 msgid "unable to parse value '%s' for option %s"
6372 #: builtin/pack-objects.c:2448
6373 msgid "do not show progress meter"
6376 #: builtin/pack-objects.c:2450
6377 msgid "show progress meter"
6380 #: builtin/pack-objects.c:2452
6381 msgid "show progress meter during object writing phase"
6384 #: builtin/pack-objects.c:2455
6385 msgid "similar to --all-progress when progress meter is shown"
6388 #: builtin/pack-objects.c:2456
6389 msgid "version[,offset]"
6392 #: builtin/pack-objects.c:2457
6393 msgid "write the pack index file in the specified idx format version"
6396 #: builtin/pack-objects.c:2460
6397 msgid "maximum size of each output pack file"
6400 #: builtin/pack-objects.c:2462
6401 msgid "ignore borrowed objects from alternate object store"
6404 #: builtin/pack-objects.c:2464
6405 msgid "ignore packed objects"
6408 #: builtin/pack-objects.c:2466
6409 msgid "limit pack window by objects"
6412 #: builtin/pack-objects.c:2468
6413 msgid "limit pack window by memory in addition to object limit"
6416 #: builtin/pack-objects.c:2470
6417 msgid "maximum length of delta chain allowed in the resulting pack"
6420 #: builtin/pack-objects.c:2472
6421 msgid "reuse existing deltas"
6424 #: builtin/pack-objects.c:2474
6425 msgid "reuse existing objects"
6428 #: builtin/pack-objects.c:2476
6429 msgid "use OFS_DELTA objects"
6432 #: builtin/pack-objects.c:2478
6433 msgid "use threads when searching for best delta matches"
6436 #: builtin/pack-objects.c:2480
6437 msgid "do not create an empty pack output"
6440 #: builtin/pack-objects.c:2482
6441 msgid "read revision arguments from standard input"
6444 #: builtin/pack-objects.c:2484
6445 msgid "limit the objects to those that are not yet packed"
6448 #: builtin/pack-objects.c:2487
6449 msgid "include objects reachable from any reference"
6452 #: builtin/pack-objects.c:2490
6453 msgid "include objects referred by reflog entries"
6456 #: builtin/pack-objects.c:2493
6457 msgid "output pack to stdout"
6460 #: builtin/pack-objects.c:2495
6461 msgid "include tag objects that refer to objects to be packed"
6464 #: builtin/pack-objects.c:2497
6465 msgid "keep unreachable objects"
6468 #: builtin/pack-objects.c:2498 parse-options.h:141
6472 #: builtin/pack-objects.c:2499
6473 msgid "unpack unreachable objects newer than <time>"
6476 #: builtin/pack-objects.c:2502
6477 msgid "create thin packs"
6480 #: builtin/pack-objects.c:2504
6481 msgid "ignore packs that have companion .keep file"
6484 #: builtin/pack-objects.c:2506
6485 msgid "pack compression level"
6488 #: builtin/pack-objects.c:2508
6489 msgid "do not hide commits by grafts"
6492 #: builtin/pack-refs.c:6
6493 msgid "git pack-refs [options]"
6496 #: builtin/pack-refs.c:14
6497 msgid "pack everything"
6500 #: builtin/pack-refs.c:15
6501 msgid "prune loose refs (default)"
6504 #: builtin/prune-packed.c:7
6505 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
6508 #: builtin/prune.c:12
6509 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
6512 #: builtin/prune.c:132
6513 msgid "do not remove, show only"
6516 #: builtin/prune.c:133
6517 msgid "report pruned objects"
6520 #: builtin/prune.c:136
6521 msgid "expire objects older than <time>"
6524 #: builtin/push.c:14
6525 msgid "git push [<options>] [<repository> [<refspec>...]]"
6528 #: builtin/push.c:45
6529 msgid "tag shorthand without <tag>"
6532 #: builtin/push.c:64
6533 msgid "--delete only accepts plain target ref names"
6536 #: builtin/push.c:99
6539 "To choose either option permanently, see push.default in 'git help config'."
6542 #: builtin/push.c:102
6545 "The upstream branch of your current branch does not match\n"
6546 "the name of your current branch. To push to the upstream branch\n"
6547 "on the remote, use\n"
6549 " git push %s HEAD:%s\n"
6551 "To push to the branch of the same name on the remote, use\n"
6557 #: builtin/push.c:121
6560 "You are not currently on a branch.\n"
6561 "To push the history leading to the current (detached HEAD)\n"
6564 " git push %s HEAD:<name-of-remote-branch>\n"
6567 #: builtin/push.c:128
6570 "The current branch %s has no upstream branch.\n"
6571 "To push the current branch and set the remote as upstream, use\n"
6573 " git push --set-upstream %s %s\n"
6576 #: builtin/push.c:136
6578 msgid "The current branch %s has multiple upstream branches, refusing to push."
6581 #: builtin/push.c:139
6584 "You are pushing to remote '%s', which is not the upstream of\n"
6585 "your current branch '%s', without telling me what to push\n"
6586 "to update which remote branch."
6589 #: builtin/push.c:151
6591 "push.default is unset; its implicit value is changing in\n"
6592 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6593 "and maintain the current behavior after the default changes, use:\n"
6595 " git config --global push.default matching\n"
6597 "To squelch this message and adopt the new behavior now, use:\n"
6599 " git config --global push.default simple\n"
6601 "See 'git help config' and search for 'push.default' for further "
6603 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
6604 "'current' instead of 'simple' if you sometimes use older versions of Git)"
6607 #: builtin/push.c:199
6609 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
6612 #: builtin/push.c:206
6614 "Updates were rejected because the tip of your current branch is behind\n"
6615 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
6616 "before pushing again.\n"
6617 "See the 'Note about fast-forwards' in 'git push --help' for details."
6620 #: builtin/push.c:212
6622 "Updates were rejected because a pushed branch tip is behind its remote\n"
6623 "counterpart. If you did not intend to push that branch, you may want to\n"
6624 "specify branches to push or set the 'push.default' configuration variable\n"
6625 "to 'simple', 'current' or 'upstream' to push only the current branch."
6628 #: builtin/push.c:218
6630 "Updates were rejected because a pushed branch tip is behind its remote\n"
6631 "counterpart. Check out this branch and merge the remote changes\n"
6632 "(e.g. 'git pull') before pushing again.\n"
6633 "See the 'Note about fast-forwards' in 'git push --help' for details."
6636 #: builtin/push.c:258
6638 msgid "Pushing to %s\n"
6641 #: builtin/push.c:262
6643 msgid "failed to push some refs to '%s'"
6646 #: builtin/push.c:294
6648 msgid "bad repository '%s'"
6651 #: builtin/push.c:295
6653 "No configured push destination.\n"
6654 "Either specify the URL from the command-line or configure a remote "
6655 "repository using\n"
6657 " git remote add <name> <url>\n"
6659 "and then push using the remote name\n"
6661 " git push <name>\n"
6664 #: builtin/push.c:310
6665 msgid "--all and --tags are incompatible"
6668 #: builtin/push.c:311
6669 msgid "--all can't be combined with refspecs"
6672 #: builtin/push.c:316
6673 msgid "--mirror and --tags are incompatible"
6676 #: builtin/push.c:317
6677 msgid "--mirror can't be combined with refspecs"
6680 #: builtin/push.c:322
6681 msgid "--all and --mirror are incompatible"
6684 #: builtin/push.c:382
6688 #: builtin/push.c:383
6689 msgid "push all refs"
6692 #: builtin/push.c:384
6693 msgid "mirror all refs"
6696 #: builtin/push.c:386
6700 #: builtin/push.c:387
6701 msgid "push tags (can't be used with --all or --mirror)"
6704 #: builtin/push.c:390
6705 msgid "force updates"
6708 #: builtin/push.c:391
6712 #: builtin/push.c:392
6713 msgid "control recursive pushing of submodules"
6716 #: builtin/push.c:394
6717 msgid "use thin pack"
6720 #: builtin/push.c:395 builtin/push.c:396
6721 msgid "receive pack program"
6724 #: builtin/push.c:397
6725 msgid "set upstream for git pull/status"
6728 #: builtin/push.c:400
6729 msgid "prune locally removed refs"
6732 #: builtin/push.c:410
6733 msgid "--delete is incompatible with --all, --mirror and --tags"
6736 #: builtin/push.c:412
6737 msgid "--delete doesn't make sense without any refs"
6740 #: builtin/read-tree.c:36
6742 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
6743 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
6744 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
6747 #: builtin/read-tree.c:108
6748 msgid "write resulting index to <file>"
6751 #: builtin/read-tree.c:111
6752 msgid "only empty the index"
6755 #: builtin/read-tree.c:113
6759 #: builtin/read-tree.c:115
6760 msgid "perform a merge in addition to a read"
6763 #: builtin/read-tree.c:117
6764 msgid "3-way merge if no file level merging required"
6767 #: builtin/read-tree.c:119
6768 msgid "3-way merge in presence of adds and removes"
6771 #: builtin/read-tree.c:121
6772 msgid "same as -m, but discard unmerged entries"
6775 #: builtin/read-tree.c:122
6776 msgid "<subdirectory>/"
6779 #: builtin/read-tree.c:123
6780 msgid "read the tree into the index under <subdirectory>/"
6783 #: builtin/read-tree.c:126
6784 msgid "update working tree with merge result"
6787 #: builtin/read-tree.c:128
6791 #: builtin/read-tree.c:129
6792 msgid "allow explicitly ignored files to be overwritten"
6795 #: builtin/read-tree.c:132
6796 msgid "don't check the working tree after merging"
6799 #: builtin/read-tree.c:133
6800 msgid "don't update the index or the work tree"
6803 #: builtin/read-tree.c:135
6804 msgid "skip applying sparse checkout filter"
6807 #: builtin/read-tree.c:137
6808 msgid "debug unpack-trees"
6811 #: builtin/remote.c:11
6812 msgid "git remote [-v | --verbose]"
6815 #: builtin/remote.c:12
6817 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
6818 "mirror=<fetch|push>] <name> <url>"
6821 #: builtin/remote.c:13 builtin/remote.c:32
6822 msgid "git remote rename <old> <new>"
6825 #: builtin/remote.c:14 builtin/remote.c:37
6826 msgid "git remote remove <name>"
6829 #: builtin/remote.c:15
6830 msgid "git remote set-head <name> (-a | -d | <branch>)"
6833 #: builtin/remote.c:16
6834 msgid "git remote [-v | --verbose] show [-n] <name>"
6837 #: builtin/remote.c:17
6838 msgid "git remote prune [-n | --dry-run] <name>"
6841 #: builtin/remote.c:18
6843 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
6846 #: builtin/remote.c:19
6847 msgid "git remote set-branches [--add] <name> <branch>..."
6850 #: builtin/remote.c:20 builtin/remote.c:68
6851 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
6854 #: builtin/remote.c:21 builtin/remote.c:69
6855 msgid "git remote set-url --add <name> <newurl>"
6858 #: builtin/remote.c:22 builtin/remote.c:70
6859 msgid "git remote set-url --delete <name> <url>"
6862 #: builtin/remote.c:27
6863 msgid "git remote add [<options>] <name> <url>"
6866 #: builtin/remote.c:42
6867 msgid "git remote set-head <name> (-a | -d | <branch>])"
6870 #: builtin/remote.c:47
6871 msgid "git remote set-branches <name> <branch>..."
6874 #: builtin/remote.c:48
6875 msgid "git remote set-branches --add <name> <branch>..."
6878 #: builtin/remote.c:53
6879 msgid "git remote show [<options>] <name>"
6882 #: builtin/remote.c:58
6883 msgid "git remote prune [<options>] <name>"
6886 #: builtin/remote.c:63
6887 msgid "git remote update [<options>] [<group> | <remote>]..."
6890 #: builtin/remote.c:98
6895 #: builtin/remote.c:130
6897 "--mirror is dangerous and deprecated; please\n"
6898 "\t use --mirror=fetch or --mirror=push instead"
6901 #: builtin/remote.c:147
6903 msgid "unknown mirror argument: %s"
6906 #: builtin/remote.c:163
6907 msgid "fetch the remote branches"
6910 #: builtin/remote.c:165
6911 msgid "import all tags and associated objects when fetching"
6914 #: builtin/remote.c:168
6915 msgid "or do not fetch any tag at all (--no-tags)"
6918 #: builtin/remote.c:170
6919 msgid "branch(es) to track"
6922 #: builtin/remote.c:171
6923 msgid "master branch"
6926 #: builtin/remote.c:172
6930 #: builtin/remote.c:173
6931 msgid "set up remote as a mirror to push to or fetch from"
6934 #: builtin/remote.c:185
6935 msgid "specifying a master branch makes no sense with --mirror"
6938 #: builtin/remote.c:187
6939 msgid "specifying branches to track makes sense only with fetch mirrors"
6942 #: builtin/remote.c:195 builtin/remote.c:646
6944 msgid "remote %s already exists."
6947 #: builtin/remote.c:199 builtin/remote.c:650
6949 msgid "'%s' is not a valid remote name"
6952 #: builtin/remote.c:243
6954 msgid "Could not setup master '%s'"
6957 #: builtin/remote.c:299
6959 msgid "more than one %s"
6962 #: builtin/remote.c:339
6964 msgid "Could not get fetch map for refspec %s"
6967 #: builtin/remote.c:440 builtin/remote.c:448
6971 #: builtin/remote.c:452
6975 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
6977 msgid "Could not append '%s' to '%s'"
6980 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
6982 msgid "No such remote: %s"
6985 #: builtin/remote.c:656
6987 msgid "Could not rename config section '%s' to '%s'"
6990 #: builtin/remote.c:662 builtin/remote.c:799
6992 msgid "Could not remove config section '%s'"
6995 #: builtin/remote.c:677
6998 "Not updating non-default fetch refspec\n"
7000 "\tPlease update the configuration manually if necessary."
7003 #: builtin/remote.c:683
7005 msgid "Could not append '%s'"
7008 #: builtin/remote.c:694
7010 msgid "Could not set '%s'"
7013 #: builtin/remote.c:716
7015 msgid "deleting '%s' failed"
7018 #: builtin/remote.c:750
7020 msgid "creating '%s' failed"
7023 #: builtin/remote.c:764
7025 msgid "Could not remove branch %s"
7028 #: builtin/remote.c:834
7030 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7031 "to delete it, use:"
7033 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7034 "to delete them, use:"
7038 #: builtin/remote.c:943
7040 msgid " new (next fetch will store in remotes/%s)"
7043 #: builtin/remote.c:946
7047 #: builtin/remote.c:948
7048 msgid " stale (use 'git remote prune' to remove)"
7051 #: builtin/remote.c:950
7055 #: builtin/remote.c:991
7057 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7060 #: builtin/remote.c:998
7062 msgid "rebases onto remote %s"
7065 #: builtin/remote.c:1001
7067 msgid " merges with remote %s"
7070 #: builtin/remote.c:1002
7071 msgid " and with remote"
7074 #: builtin/remote.c:1004
7076 msgid "merges with remote %s"
7079 #: builtin/remote.c:1005
7080 msgid " and with remote"
7083 #: builtin/remote.c:1051
7087 #: builtin/remote.c:1054
7091 #: builtin/remote.c:1058
7095 #: builtin/remote.c:1061
7096 msgid "fast-forwardable"
7099 #: builtin/remote.c:1064
7100 msgid "local out of date"
7103 #: builtin/remote.c:1071
7105 msgid " %-*s forces to %-*s (%s)"
7108 #: builtin/remote.c:1074
7110 msgid " %-*s pushes to %-*s (%s)"
7113 #: builtin/remote.c:1078
7115 msgid " %-*s forces to %s"
7118 #: builtin/remote.c:1081
7120 msgid " %-*s pushes to %s"
7123 #: builtin/remote.c:1091
7124 msgid "do not query remotes"
7127 #: builtin/remote.c:1118
7132 #: builtin/remote.c:1119
7134 msgid " Fetch URL: %s"
7137 #: builtin/remote.c:1120 builtin/remote.c:1285
7141 #: builtin/remote.c:1129 builtin/remote.c:1131
7143 msgid " Push URL: %s"
7146 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
7148 msgid " HEAD branch: %s"
7151 #: builtin/remote.c:1139
7154 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
7157 #: builtin/remote.c:1151
7159 msgid " Remote branch:%s"
7160 msgid_plural " Remote branches:%s"
7164 #: builtin/remote.c:1154 builtin/remote.c:1181
7165 msgid " (status not queried)"
7168 #: builtin/remote.c:1163
7169 msgid " Local branch configured for 'git pull':"
7170 msgid_plural " Local branches configured for 'git pull':"
7174 #: builtin/remote.c:1171
7175 msgid " Local refs will be mirrored by 'git push'"
7178 #: builtin/remote.c:1178
7180 msgid " Local ref configured for 'git push'%s:"
7181 msgid_plural " Local refs configured for 'git push'%s:"
7185 #: builtin/remote.c:1199
7186 msgid "set refs/remotes/<name>/HEAD according to remote"
7189 #: builtin/remote.c:1201
7190 msgid "delete refs/remotes/<name>/HEAD"
7193 #: builtin/remote.c:1216
7194 msgid "Cannot determine remote HEAD"
7197 #: builtin/remote.c:1218
7198 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
7201 #: builtin/remote.c:1228
7203 msgid "Could not delete %s"
7206 #: builtin/remote.c:1236
7208 msgid "Not a valid ref: %s"
7211 #: builtin/remote.c:1238
7213 msgid "Could not setup %s"
7216 #: builtin/remote.c:1274
7218 msgid " %s will become dangling!"
7221 #: builtin/remote.c:1275
7223 msgid " %s has become dangling!"
7226 #: builtin/remote.c:1281
7231 #: builtin/remote.c:1282
7236 #: builtin/remote.c:1295
7238 msgid " * [would prune] %s"
7241 #: builtin/remote.c:1298
7243 msgid " * [pruned] %s"
7246 #: builtin/remote.c:1321
7247 msgid "prune remotes after fetching"
7250 #: builtin/remote.c:1387 builtin/remote.c:1461
7252 msgid "No such remote '%s'"
7255 #: builtin/remote.c:1407
7259 #: builtin/remote.c:1414
7260 msgid "no remote specified"
7263 #: builtin/remote.c:1436
7264 msgid "manipulate push URLs"
7267 #: builtin/remote.c:1438
7271 #: builtin/remote.c:1440
7275 #: builtin/remote.c:1447
7276 msgid "--add --delete doesn't make sense"
7279 #: builtin/remote.c:1487
7281 msgid "Invalid old URL pattern: %s"
7284 #: builtin/remote.c:1495
7286 msgid "No such URL found: %s"
7289 #: builtin/remote.c:1497
7290 msgid "Will not delete all non-push URLs"
7293 #: builtin/remote.c:1569
7294 msgid "be verbose; must be placed before a subcommand"
7297 #: builtin/replace.c:17
7298 msgid "git replace [-f] <object> <replacement>"
7301 #: builtin/replace.c:18
7302 msgid "git replace -d <object>..."
7305 #: builtin/replace.c:19
7306 msgid "git replace -l [<pattern>]"
7309 #: builtin/replace.c:118
7310 msgid "list replace refs"
7313 #: builtin/replace.c:119
7314 msgid "delete replace refs"
7317 #: builtin/replace.c:120
7318 msgid "replace the ref if it exists"
7321 #: builtin/rerere.c:11
7322 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
7325 #: builtin/rerere.c:56
7326 msgid "register clean resolutions in index"
7329 #: builtin/reset.c:25
7331 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
7334 #: builtin/reset.c:26
7335 msgid "git reset [-q] <commit> [--] <paths>..."
7338 #: builtin/reset.c:27
7339 msgid "git reset --patch [<commit>] [--] [<paths>...]"
7342 #: builtin/reset.c:33
7346 #: builtin/reset.c:33
7350 #: builtin/reset.c:33
7354 #: builtin/reset.c:33
7358 #: builtin/reset.c:33
7362 #: builtin/reset.c:77
7363 msgid "You do not have a valid HEAD."
7366 #: builtin/reset.c:79
7367 msgid "Failed to find tree of HEAD."
7370 #: builtin/reset.c:85
7372 msgid "Failed to find tree of %s."
7375 #: builtin/reset.c:96
7376 msgid "Could not write new index file."
7379 #: builtin/reset.c:106
7381 msgid "HEAD is now at %s"
7384 #: builtin/reset.c:130
7385 msgid "Could not read index"
7388 #: builtin/reset.c:133
7389 msgid "Unstaged changes after reset:"
7392 #: builtin/reset.c:223
7394 msgid "Cannot do a %s reset in the middle of a merge."
7397 #: builtin/reset.c:238
7398 msgid "be quiet, only report errors"
7401 #: builtin/reset.c:240
7402 msgid "reset HEAD and index"
7405 #: builtin/reset.c:241
7406 msgid "reset only HEAD"
7409 #: builtin/reset.c:243 builtin/reset.c:245
7410 msgid "reset HEAD, index and working tree"
7413 #: builtin/reset.c:247
7414 msgid "reset HEAD but keep local changes"
7417 #: builtin/reset.c:303
7419 msgid "Could not parse object '%s'."
7422 #: builtin/reset.c:308
7423 msgid "--patch is incompatible with --{hard,mixed,soft}"
7426 #: builtin/reset.c:317
7427 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
7430 #: builtin/reset.c:319
7432 msgid "Cannot do %s reset with paths."
7435 #: builtin/reset.c:331
7437 msgid "%s reset is not allowed in a bare repository"
7440 #: builtin/reset.c:347
7442 msgid "Could not reset index file to revision '%s'."
7445 #: builtin/rev-parse.c:339
7446 msgid "git rev-parse --parseopt [options] -- [<args>...]"
7449 #: builtin/rev-parse.c:344
7450 msgid "keep the `--` passed as an arg"
7453 #: builtin/rev-parse.c:346
7454 msgid "stop parsing after the first non-option argument"
7457 #: builtin/rev-parse.c:464
7459 "git rev-parse --parseopt [options] -- [<args>...]\n"
7460 " or: git rev-parse --sq-quote [<arg>...]\n"
7461 " or: git rev-parse [options] [<arg>...]\n"
7463 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
7466 #: builtin/revert.c:22
7467 msgid "git revert [options] <commit-ish>"
7470 #: builtin/revert.c:23
7471 msgid "git revert <subcommand>"
7474 #: builtin/revert.c:28
7475 msgid "git cherry-pick [options] <commit-ish>"
7478 #: builtin/revert.c:29
7479 msgid "git cherry-pick <subcommand>"
7482 #: builtin/revert.c:70 builtin/revert.c:92
7484 msgid "%s: %s cannot be used with %s"
7487 #: builtin/revert.c:103
7488 msgid "end revert or cherry-pick sequence"
7491 #: builtin/revert.c:104
7492 msgid "resume revert or cherry-pick sequence"
7495 #: builtin/revert.c:105
7496 msgid "cancel revert or cherry-pick sequence"
7499 #: builtin/revert.c:106
7500 msgid "don't automatically commit"
7503 #: builtin/revert.c:107
7504 msgid "edit the commit message"
7507 #: builtin/revert.c:110
7508 msgid "parent number"
7511 #: builtin/revert.c:112
7512 msgid "merge strategy"
7515 #: builtin/revert.c:113
7519 #: builtin/revert.c:114
7520 msgid "option for merge strategy"
7523 #: builtin/revert.c:125
7524 msgid "append commit name"
7527 #: builtin/revert.c:126
7528 msgid "allow fast-forward"
7531 #: builtin/revert.c:127
7532 msgid "preserve initially empty commits"
7535 #: builtin/revert.c:128
7536 msgid "allow commits with empty messages"
7539 #: builtin/revert.c:129
7540 msgid "keep redundant, empty commits"
7543 #: builtin/revert.c:133
7544 msgid "program error"
7547 #: builtin/revert.c:223
7548 msgid "revert failed"
7551 #: builtin/revert.c:238
7552 msgid "cherry-pick failed"
7556 msgid "git rm [options] [--] <file>..."
7562 "'%s' has staged content different from both the file and the HEAD\n"
7563 "(use -f to force removal)"
7569 "'%s' has changes staged in the index\n"
7570 "(use --cached to keep the file, or -f to force removal)"
7576 "'%s' has local modifications\n"
7577 "(use --cached to keep the file, or -f to force removal)"
7581 msgid "do not list removed files"
7585 msgid "only remove from the index"
7589 msgid "override the up-to-date check"
7593 msgid "allow recursive removal"
7597 msgid "exit with a zero status even if nothing matched"
7602 msgid "not removing '%s' recursively without -r"
7607 msgid "git rm: unable to remove %s"
7610 #: builtin/shortlog.c:13
7611 msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
7614 #: builtin/shortlog.c:157
7616 msgid "Missing author: %s"
7619 #: builtin/shortlog.c:253
7620 msgid "sort output according to the number of commits per author"
7623 #: builtin/shortlog.c:255
7624 msgid "Suppress commit descriptions, only provides commit count"
7627 #: builtin/shortlog.c:257
7628 msgid "Show the email address of each author"
7631 #: builtin/shortlog.c:258
7635 #: builtin/shortlog.c:259
7636 msgid "Linewrap output"
7639 #: builtin/show-branch.c:9
7641 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
7642 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
7643 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
7647 #: builtin/show-branch.c:10
7648 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
7651 #: builtin/show-branch.c:651
7652 msgid "show remote-tracking and local branches"
7655 #: builtin/show-branch.c:653
7656 msgid "show remote-tracking branches"
7659 #: builtin/show-branch.c:655
7660 msgid "color '*!+-' corresponding to the branch"
7663 #: builtin/show-branch.c:657
7664 msgid "show <n> more commits after the common ancestor"
7667 #: builtin/show-branch.c:659
7668 msgid "synonym to more=-1"
7671 #: builtin/show-branch.c:660
7672 msgid "suppress naming strings"
7675 #: builtin/show-branch.c:662
7676 msgid "include the current branch"
7679 #: builtin/show-branch.c:664
7680 msgid "name commits with their object names"
7683 #: builtin/show-branch.c:666
7684 msgid "show possible merge bases"
7687 #: builtin/show-branch.c:668
7688 msgid "show refs unreachable from any other ref"
7691 #: builtin/show-branch.c:670
7692 msgid "show commits in topological order"
7695 #: builtin/show-branch.c:672
7696 msgid "show only commits not on the first branch"
7699 #: builtin/show-branch.c:674
7700 msgid "show merges reachable from only one tip"
7703 #: builtin/show-branch.c:676
7704 msgid "show commits where no parent comes before its children"
7707 #: builtin/show-branch.c:678
7708 msgid "<n>[,<base>]"
7711 #: builtin/show-branch.c:679
7712 msgid "show <n> most recent ref-log entries starting at base"
7715 #: builtin/show-ref.c:10
7717 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"
7718 "[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
7721 #: builtin/show-ref.c:11
7722 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
7725 #: builtin/show-ref.c:182
7726 msgid "only show tags (can be combined with heads)"
7729 #: builtin/show-ref.c:183
7730 msgid "only show heads (can be combined with tags)"
7733 #: builtin/show-ref.c:184
7734 msgid "stricter reference checking, requires exact ref path"
7737 #: builtin/show-ref.c:187 builtin/show-ref.c:189
7738 msgid "show the HEAD reference"
7741 #: builtin/show-ref.c:191
7742 msgid "dereference tags into object IDs"
7745 #: builtin/show-ref.c:193
7746 msgid "only show SHA1 hash using <n> digits"
7749 #: builtin/show-ref.c:197
7750 msgid "do not print results to stdout (useful with --verify)"
7753 #: builtin/show-ref.c:199
7754 msgid "show refs from stdin that aren't in local repository"
7757 #: builtin/symbolic-ref.c:7
7758 msgid "git symbolic-ref [options] name [ref]"
7761 #: builtin/symbolic-ref.c:38
7762 msgid "suppress error message for non-symbolic (detached) refs"
7765 #: builtin/symbolic-ref.c:39
7766 msgid "shorten ref output"
7769 #: builtin/symbolic-ref.c:40 builtin/update-ref.c:18
7773 #: builtin/symbolic-ref.c:40 builtin/update-ref.c:18
7774 msgid "reason of the update"
7779 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
7783 msgid "git tag -d <tagname>..."
7788 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
7789 "\t\t[<pattern>...]"
7793 msgid "git tag -v <tagname>..."
7798 msgid "malformed object at '%s'"
7801 #: builtin/tag.c:207
7803 msgid "tag name too long: %.*s..."
7806 #: builtin/tag.c:212
7808 msgid "tag '%s' not found."
7811 #: builtin/tag.c:227
7813 msgid "Deleted tag '%s' (was %s)\n"
7816 #: builtin/tag.c:239
7818 msgid "could not verify the tag '%s'"
7821 #: builtin/tag.c:249
7825 "# Write a tag message\n"
7826 "# Lines starting with '#' will be ignored.\n"
7830 #: builtin/tag.c:256
7834 "# Write a tag message\n"
7835 "# Lines starting with '#' will be kept; you may remove them yourself if you "
7840 #: builtin/tag.c:298
7841 msgid "unable to sign the tag"
7844 #: builtin/tag.c:300
7845 msgid "unable to write tag file"
7848 #: builtin/tag.c:325
7849 msgid "bad object type."
7852 #: builtin/tag.c:338
7853 msgid "tag header too big."
7856 #: builtin/tag.c:370
7857 msgid "no tag message?"
7860 #: builtin/tag.c:376
7862 msgid "The tag message has been left in %s\n"
7865 #: builtin/tag.c:425
7866 msgid "switch 'points-at' requires an object"
7869 #: builtin/tag.c:427
7871 msgid "malformed object name '%s'"
7874 #: builtin/tag.c:447
7875 msgid "list tag names"
7878 #: builtin/tag.c:449
7879 msgid "print <n> lines of each tag message"
7882 #: builtin/tag.c:451
7886 #: builtin/tag.c:452
7890 #: builtin/tag.c:454
7891 msgid "Tag creation options"
7894 #: builtin/tag.c:456
7895 msgid "annotated tag, needs a message"
7898 #: builtin/tag.c:458
7902 #: builtin/tag.c:460
7903 msgid "annotated and GPG-signed tag"
7906 #: builtin/tag.c:464
7907 msgid "use another key to sign the tag"
7910 #: builtin/tag.c:465
7911 msgid "replace the tag if exists"
7914 #: builtin/tag.c:466
7915 msgid "show tag list in columns"
7918 #: builtin/tag.c:468
7919 msgid "Tag listing options"
7922 #: builtin/tag.c:471
7923 msgid "print only tags that contain the commit"
7926 #: builtin/tag.c:477
7927 msgid "print only tags of the object"
7930 #: builtin/tag.c:506
7931 msgid "--column and -n are incompatible"
7934 #: builtin/tag.c:523
7935 msgid "-n option is only allowed with -l."
7938 #: builtin/tag.c:525
7939 msgid "--contains option is only allowed with -l."
7942 #: builtin/tag.c:527
7943 msgid "--points-at option is only allowed with -l."
7946 #: builtin/tag.c:535
7947 msgid "only one -F or -m option is allowed."
7950 #: builtin/tag.c:555
7951 msgid "too many params"
7954 #: builtin/tag.c:561
7956 msgid "'%s' is not a valid tag name."
7959 #: builtin/tag.c:566
7961 msgid "tag '%s' already exists"
7964 #: builtin/tag.c:584
7966 msgid "%s: cannot lock the ref"
7969 #: builtin/tag.c:586
7971 msgid "%s: cannot update the ref"
7974 #: builtin/tag.c:588
7976 msgid "Updated tag '%s' (was %s)\n"
7979 #: builtin/update-index.c:401
7980 msgid "git update-index [options] [--] [<file>...]"
7983 #: builtin/update-index.c:717
7984 msgid "continue refresh even when index needs update"
7987 #: builtin/update-index.c:720
7988 msgid "refresh: ignore submodules"
7991 #: builtin/update-index.c:723
7992 msgid "do not ignore new files"
7995 #: builtin/update-index.c:725
7996 msgid "let files replace directories and vice-versa"
7999 #: builtin/update-index.c:727
8000 msgid "notice files missing from worktree"
8003 #: builtin/update-index.c:729
8004 msgid "refresh even if index contains unmerged entries"
8007 #: builtin/update-index.c:732
8008 msgid "refresh stat information"
8011 #: builtin/update-index.c:736
8012 msgid "like --refresh, but ignore assume-unchanged setting"
8015 #: builtin/update-index.c:740
8016 msgid "<mode> <object> <path>"
8019 #: builtin/update-index.c:741
8020 msgid "add the specified entry to the index"
8023 #: builtin/update-index.c:745
8027 #: builtin/update-index.c:746
8028 msgid "override the executable bit of the listed files"
8031 #: builtin/update-index.c:750
8032 msgid "mark files as \"not changing\""
8035 #: builtin/update-index.c:753
8036 msgid "clear assumed-unchanged bit"
8039 #: builtin/update-index.c:756
8040 msgid "mark files as \"index-only\""
8043 #: builtin/update-index.c:759
8044 msgid "clear skip-worktree bit"
8047 #: builtin/update-index.c:762
8048 msgid "add to index only; do not add content to object database"
8051 #: builtin/update-index.c:764
8052 msgid "remove named paths even if present in worktree"
8055 #: builtin/update-index.c:766
8056 msgid "with --stdin: input lines are terminated by null bytes"
8059 #: builtin/update-index.c:768
8060 msgid "read list of paths to be updated from standard input"
8063 #: builtin/update-index.c:772
8064 msgid "add entries from standard input to the index"
8067 #: builtin/update-index.c:776
8068 msgid "repopulate stages #2 and #3 for the listed paths"
8071 #: builtin/update-index.c:780
8072 msgid "only update entries that differ from HEAD"
8075 #: builtin/update-index.c:784
8076 msgid "ignore files missing from worktree"
8079 #: builtin/update-index.c:787
8080 msgid "report actions to standard output"
8083 #: builtin/update-index.c:789
8084 msgid "(for porcelains) forget saved unresolved conflicts"
8087 #: builtin/update-index.c:793
8088 msgid "write index in this format"
8091 #: builtin/update-ref.c:7
8092 msgid "git update-ref [options] -d <refname> [<oldval>]"
8095 #: builtin/update-ref.c:8
8096 msgid "git update-ref [options] <refname> <newval> [<oldval>]"
8099 #: builtin/update-ref.c:19
8100 msgid "delete the reference"
8103 #: builtin/update-ref.c:21
8104 msgid "update <refname> not the one it points to"
8107 #: builtin/update-server-info.c:6
8108 msgid "git update-server-info [--force]"
8111 #: builtin/update-server-info.c:14
8112 msgid "update the info files from scratch"
8115 #: builtin/verify-pack.c:56
8116 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8119 #: builtin/verify-pack.c:66
8123 #: builtin/verify-pack.c:68
8124 msgid "show statistics only"
8127 #: builtin/verify-tag.c:17
8128 msgid "git verify-tag [-v|--verbose] <tag>..."
8131 #: builtin/verify-tag.c:73
8132 msgid "print tag contents"
8135 #: builtin/write-tree.c:13
8136 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
8139 #: builtin/write-tree.c:26
8143 #: builtin/write-tree.c:27
8144 msgid "write tree object for a subdirectory <prefix>"
8147 #: builtin/write-tree.c:30
8148 msgid "only useful for debugging"
8152 msgid "See 'git help <command>' for more information on a specific command."
8155 #: parse-options.h:156
8156 msgid "no-op (backward compatibility)"
8159 #: parse-options.h:228
8160 msgid "be more verbose"
8163 #: parse-options.h:230
8164 msgid "be more quiet"
8167 #: parse-options.h:236
8168 msgid "use <n> digits to display SHA-1s"
8172 msgid "Add file contents to the index"
8176 msgid "Find by binary search the change that introduced a bug"
8180 msgid "List, create, or delete branches"
8184 msgid "Checkout a branch or paths to the working tree"
8188 msgid "Clone a repository into a new directory"
8192 msgid "Record changes to the repository"
8196 msgid "Show changes between commits, commit and working tree, etc"
8200 msgid "Download objects and refs from another repository"
8204 msgid "Print lines matching a pattern"
8208 msgid "Create an empty git repository or reinitialize an existing one"
8212 msgid "Show commit logs"
8216 msgid "Join two or more development histories together"
8220 msgid "Move or rename a file, a directory, or a symlink"
8224 msgid "Fetch from and merge with another repository or a local branch"
8228 msgid "Update remote refs along with associated objects"
8232 msgid "Forward-port local commits to the updated upstream head"
8236 msgid "Reset current HEAD to the specified state"
8240 msgid "Remove files from the working tree and from the index"
8244 msgid "Show various types of objects"
8248 msgid "Show the working tree status"
8252 msgid "Create, list, delete or verify a tag object signed with GPG"
8256 msgid "You need to set your committer info first"
8261 "You seem to have moved HEAD since the last 'am' failure.\n"
8262 "Not rewinding to ORIG_HEAD"
8268 "When you have resolved this problem, run \"$cmdline --resolved\".\n"
8269 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8270 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
8274 msgid "Cannot fall back to three-way merge."
8278 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
8282 msgid "Using index info to reconstruct a base tree..."
8287 "Did you hand edit your patch?\n"
8288 "It does not apply to blobs recorded in its index."
8292 msgid "Falling back to patching base and 3-way merge..."
8296 msgid "Failed to merge in the changes."
8300 msgid "Only one StGIT patch series can be applied at once"
8305 msgid "Patch format $patch_format is not supported."
8309 msgid "Patch format detection failed."
8314 "The -b/--binary option has been a no-op for long time, and\n"
8315 "it will be removed. Please do not use it anymore."
8320 msgid "previous rebase directory $dotest still exists but mbox given."
8324 msgid "Please make up your mind. --skip or --abort?"
8328 msgid "Resolve operation not in progress, we are not resuming."
8333 msgid "Dirty index: cannot apply patches (dirty: $files)"
8339 "Patch is empty. Was it split wrong?\n"
8340 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
8341 "To restore the original branch and stop patching run \"$cmdline --abort\"."
8345 msgid "Patch does not have a valid e-mail address."
8349 msgid "cannot be interactive without stdin connected to a terminal."
8353 msgid "Commit Body is:"
8356 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
8357 #. in your translation. The program will only accept English
8358 #. input at this point.
8360 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8365 msgid "Applying: $FIRSTLINE"
8370 "No changes - did you forget to use 'git add'?\n"
8371 "If there is nothing left to stage, chances are that something else\n"
8372 "already introduced the same changes; you might want to skip this patch."
8377 "You still have unmerged paths in your index\n"
8378 "did you forget to use 'git add'?"
8382 msgid "No changes -- Patch already applied."
8387 msgid "Patch failed at $msgnum $FIRSTLINE"
8393 "The copy of the patch that failed is found in:\n"
8398 msgid "applying to an empty history"
8402 msgid "You need to start by \"git bisect start\""
8405 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8406 #. translation. The program will only accept English input
8409 msgid "Do you want me to do it for you [Y/n]? "
8414 msgid "unrecognised option: '$arg'"
8419 msgid "'$arg' does not appear to be a valid revision"
8422 #: git-bisect.sh:117
8423 msgid "Bad HEAD - I need a HEAD"
8426 #: git-bisect.sh:130
8429 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
8432 #: git-bisect.sh:140
8433 msgid "won't bisect on seeked tree"
8436 #: git-bisect.sh:144
8437 msgid "Bad HEAD - strange symbolic ref"
8440 #: git-bisect.sh:189
8442 msgid "Bad bisect_write argument: $state"
8445 #: git-bisect.sh:218
8447 msgid "Bad rev input: $arg"
8450 #: git-bisect.sh:232
8451 msgid "Please call 'bisect_state' with at least one argument."
8454 #: git-bisect.sh:244
8456 msgid "Bad rev input: $rev"
8459 #: git-bisect.sh:250
8460 msgid "'git bisect bad' can take only one argument."
8463 #. have bad but not good. we could bisect although
8464 #. this is less optimum.
8465 #: git-bisect.sh:273
8466 msgid "Warning: bisecting only with a bad commit."
8469 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8470 #. translation. The program will only accept English input
8472 #: git-bisect.sh:279
8473 msgid "Are you sure [Y/n]? "
8476 #: git-bisect.sh:289
8478 "You need to give me at least one good and one bad revisions.\n"
8479 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8482 #: git-bisect.sh:292
8484 "You need to start by \"git bisect start\".\n"
8485 "You then need to give me at least one good and one bad revisions.\n"
8486 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8489 #: git-bisect.sh:347 git-bisect.sh:474
8490 msgid "We are not bisecting."
8493 #: git-bisect.sh:354
8495 msgid "'$invalid' is not a valid commit"
8498 #: git-bisect.sh:363
8501 "Could not check out original HEAD '$branch'.\n"
8502 "Try 'git bisect reset <commit>'."
8505 #: git-bisect.sh:390
8506 msgid "No logfile given"
8509 #: git-bisect.sh:391
8511 msgid "cannot read $file for replaying"
8514 #: git-bisect.sh:408
8515 msgid "?? what are you talking about?"
8518 #: git-bisect.sh:420
8520 msgid "running $command"
8523 #: git-bisect.sh:427
8526 "bisect run failed:\n"
8527 "exit code $res from '$command' is < 0 or >= 128"
8530 #: git-bisect.sh:453
8531 msgid "bisect run cannot continue any more"
8534 #: git-bisect.sh:459
8537 "bisect run failed:\n"
8538 "'bisect_state $state' exited with error code $res"
8541 #: git-bisect.sh:466
8542 msgid "bisect run success"
8547 "Pull is not possible because you have unmerged files.\n"
8548 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
8549 "as appropriate to mark resolution, or use 'git commit -a'."
8553 msgid "Pull is not possible because you have unmerged files."
8557 msgid "updating an unborn branch with changes added to the index"
8560 #. The fetch involved updating the current branch.
8561 #. The working tree and the index file is still based on the
8562 #. $orig_head commit, but we are merging into $curr_head.
8563 #. First update the working tree to match $curr_head.
8567 "Warning: fetch updated the current branch head.\n"
8568 "Warning: fast-forwarding your working tree from\n"
8569 "Warning: commit $orig_head."
8573 msgid "Cannot merge multiple branches into empty head"
8577 msgid "Cannot rebase onto multiple branches"
8582 "When you have resolved this problem, run \"git rebase --continue\".\n"
8583 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
8584 "To check out the original branch and stop rebasing, run \"git rebase --abort"
8588 #: git-rebase.sh:159
8589 msgid "The pre-rebase hook refused to rebase."
8592 #: git-rebase.sh:164
8593 msgid "It looks like git-am is in progress. Cannot rebase."
8596 #: git-rebase.sh:295
8597 msgid "The --exec option must be used with the --interactive option"
8600 #: git-rebase.sh:300
8601 msgid "No rebase in progress?"
8604 #: git-rebase.sh:313
8605 msgid "Cannot read HEAD"
8608 #: git-rebase.sh:316
8610 "You must edit all merge conflicts and then\n"
8611 "mark them as resolved using git add"
8614 #: git-rebase.sh:334
8616 msgid "Could not move back to $head_name"
8619 #: git-rebase.sh:350
8622 "It seems that there is already a $state_dir_base directory, and\n"
8623 "I wonder if you are in the middle of another rebase. If that is the\n"
8624 "case, please try\n"
8625 "\t$cmd_live_rebase\n"
8626 "If that is not the case, please\n"
8627 "\t$cmd_clear_stale_rebase\n"
8628 "and run me again. I am stopping in case you still have something\n"
8632 #: git-rebase.sh:395
8634 msgid "invalid upstream $upstream_name"
8637 #: git-rebase.sh:419
8639 msgid "$onto_name: there are more than one merge bases"
8642 #: git-rebase.sh:422 git-rebase.sh:426
8644 msgid "$onto_name: there is no merge base"
8647 #: git-rebase.sh:431
8649 msgid "Does not point to a valid commit: $onto_name"
8652 #: git-rebase.sh:454
8654 msgid "fatal: no such branch: $branch_name"
8657 #: git-rebase.sh:474
8658 msgid "Please commit or stash them."
8661 #: git-rebase.sh:492
8663 msgid "Current branch $branch_name is up to date."
8666 #: git-rebase.sh:495
8668 msgid "Current branch $branch_name is up to date, rebase forced."
8671 #: git-rebase.sh:506
8673 msgid "Changes from $mb to $onto:"
8676 #. Detach HEAD and reset the tree
8677 #: git-rebase.sh:515
8678 msgid "First, rewinding head to replay your work on top of it..."
8681 #: git-rebase.sh:523
8683 msgid "Fast-forwarded $branch_name to $onto_name."
8687 msgid "git stash clear with parameters is unimplemented"
8691 msgid "You do not have the initial commit yet"
8695 msgid "Cannot save the current index state"
8698 #: git-stash.sh:123 git-stash.sh:136
8699 msgid "Cannot save the current worktree state"
8703 msgid "No changes selected"
8707 msgid "Cannot remove temporary index (can't happen)"
8711 msgid "Cannot record working tree state"
8714 #. TRANSLATORS: $option is an invalid option, like
8715 #. `--blah-blah'. The 7 spaces at the beginning of the
8716 #. second line correspond to "error: ". So you should line
8717 #. up the second line with however many characters the
8718 #. translation of "error: " takes in your language. E.g. in
8721 #. $ git stash save --blah-blah 2>&1 | head -n 2
8722 #. error: unknown option for 'stash save': --blah-blah
8723 #. To provide a message, use git stash save -- '--blah-blah'
8727 "error: unknown option for 'stash save': $option\n"
8728 " To provide a message, use git stash save -- '$option'"
8732 msgid "No local changes to save"
8736 msgid "Cannot initialize stash"
8740 msgid "Cannot save the current status"
8744 msgid "Cannot remove worktree changes"
8748 msgid "No stash found."
8753 msgid "Too many revisions specified: $REV"
8758 msgid "$reference is not valid reference"
8763 msgid "'$args' is not a stash-like commit"
8768 msgid "'$args' is not a stash reference"
8772 msgid "unable to refresh index"
8776 msgid "Cannot apply a stash in the middle of a merge"
8780 msgid "Conflicts in index. Try without --index."
8784 msgid "Could not save index tree"
8788 msgid "Cannot unstage modified files"
8792 msgid "Index was not unstashed."
8797 msgid "Dropped ${REV} ($s)"
8802 msgid "${REV}: Could not drop stash entry"
8806 msgid "No branch name specified"
8810 msgid "(To restore them type \"git stash apply\")"
8813 #: git-submodule.sh:88
8815 msgid "cannot strip one component off url '$remoteurl'"
8818 #: git-submodule.sh:167
8820 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
8823 #: git-submodule.sh:211
8825 msgid "Clone of '$url' into submodule path '$sm_path' failed"
8828 #: git-submodule.sh:223
8830 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
8833 #: git-submodule.sh:312
8835 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
8838 #: git-submodule.sh:329
8840 msgid "'$sm_path' already exists in the index"
8843 #: git-submodule.sh:333
8846 "The following path is ignored by one of your .gitignore files:\n"
8848 "Use -f if you really want to add it."
8851 #: git-submodule.sh:344
8853 msgid "Adding existing repo at '$sm_path' to the index"
8856 #: git-submodule.sh:346
8858 msgid "'$sm_path' already exists and is not a valid git repo"
8861 #: git-submodule.sh:360
8863 msgid "Unable to checkout submodule '$sm_path'"
8866 #: git-submodule.sh:365
8868 msgid "Failed to add submodule '$sm_path'"
8871 #: git-submodule.sh:370
8873 msgid "Failed to register submodule '$sm_path'"
8876 #: git-submodule.sh:413
8878 msgid "Entering '$prefix$sm_path'"
8881 #: git-submodule.sh:427
8883 msgid "Stopping at '$sm_path'; script returned non-zero status."
8886 #: git-submodule.sh:471
8888 msgid "No url found for submodule path '$sm_path' in .gitmodules"
8891 #: git-submodule.sh:480
8893 msgid "Failed to register url for submodule path '$sm_path'"
8896 #: git-submodule.sh:482
8898 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
8901 #: git-submodule.sh:490
8903 msgid "Failed to register update mode for submodule path '$sm_path'"
8906 #: git-submodule.sh:590
8909 "Submodule path '$sm_path' not initialized\n"
8910 "Maybe you want to use 'update --init'?"
8913 #: git-submodule.sh:603
8915 msgid "Unable to find current revision in submodule path '$sm_path'"
8918 #: git-submodule.sh:622
8920 msgid "Unable to fetch in submodule path '$sm_path'"
8923 #: git-submodule.sh:636
8925 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
8928 #: git-submodule.sh:637
8930 msgid "Submodule path '$sm_path': rebased into '$sha1'"
8933 #: git-submodule.sh:642
8935 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
8938 #: git-submodule.sh:643
8940 msgid "Submodule path '$sm_path': merged in '$sha1'"
8943 #: git-submodule.sh:648
8945 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
8948 #: git-submodule.sh:649
8950 msgid "Submodule path '$sm_path': checked out '$sha1'"
8953 #: git-submodule.sh:671 git-submodule.sh:995
8955 msgid "Failed to recurse into submodule path '$sm_path'"
8958 #: git-submodule.sh:779
8959 msgid "The --cached option cannot be used with the --files option"
8963 #: git-submodule.sh:819
8965 msgid "unexpected mode $mod_dst"
8968 #: git-submodule.sh:837
8970 msgid " Warn: $name doesn't contain commit $sha1_src"
8973 #: git-submodule.sh:840
8975 msgid " Warn: $name doesn't contain commit $sha1_dst"
8978 #: git-submodule.sh:843
8980 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
8983 #: git-submodule.sh:868
8987 #: git-submodule.sh:906
8988 msgid "# Submodules changed but not updated:"
8991 #: git-submodule.sh:908
8992 msgid "# Submodule changes to be committed:"
8995 #: git-submodule.sh:1054
8997 msgid "Synchronizing submodule url for '$name'"