1 # SOME DESCRIPTIVE TITLE.
2 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3 # This file is distributed under the same license as the PACKAGE package.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11 "POT-Creation-Date: 2012-11-23 14:27+0800\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
17 "Content-Type: text/plain; charset=CHARSET\n"
18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
27 #. * Message used both when 'git commit' fails and when
28 #. * other commands doing a merge do.
32 "Fix them up in the work tree,\n"
33 "and then use 'git add/rm <file>' as\n"
34 "appropriate to mark resolution and make a commit,\n"
35 "or use 'git commit -a'."
39 msgid "git archive [options] <tree-ish> [<path>...]"
43 msgid "git archive --list"
48 "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
52 msgid "git archive --remote <repo> [--exec <cmd>] --list"
60 msgid "archive format"
63 #: archive.c:323 builtin/log.c:1084
68 msgid "prepend prefix to each pathname in the archive"
71 #: archive.c:325 builtin/archive.c:91 builtin/blame.c:2390
72 #: builtin/blame.c:2391 builtin/config.c:55 builtin/fast-export.c:642
73 #: builtin/fast-export.c:644 builtin/grep.c:715 builtin/hash-object.c:77
74 #: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540
75 #: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149
79 #: archive.c:326 builtin/archive.c:92
80 msgid "write the archive to this file"
84 msgid "read .gitattributes in working directory"
88 msgid "report archived files on stderr"
96 msgid "compress faster"
100 msgid "compress better"
104 msgid "list supported archive formats"
107 #: archive.c:344 builtin/archive.c:93 builtin/clone.c:85
111 #: archive.c:345 builtin/archive.c:94
112 msgid "retrieve the archive from remote repository <repo>"
115 #: archive.c:346 builtin/archive.c:95 builtin/notes.c:619
119 #: archive.c:347 builtin/archive.c:96
120 msgid "path to the remote git-upload-archive command"
125 "Negative patterns are forbidden in git attributes\n"
126 "Use '\\!' for literal leading exclamation."
131 msgid "'%s' does not look like a v2 bundle file"
136 msgid "unrecognized header: %s%s (%d)"
139 #: bundle.c:89 builtin/commit.c:674
141 msgid "could not open '%s'"
145 msgid "Repository lacks these prerequisite commits:"
148 #: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290
149 #: builtin/log.c:732 builtin/log.c:1319 builtin/log.c:1535 builtin/merge.c:347
150 #: builtin/shortlog.c:181
151 msgid "revision walk setup failed"
156 msgid "The bundle contains %d ref"
157 msgid_plural "The bundle contains %d refs"
162 msgid "The bundle records a complete history."
167 msgid "The bundle requires this ref"
168 msgid_plural "The bundle requires these %d refs"
173 msgid "rev-list died"
176 #: bundle.c:300 builtin/log.c:1215 builtin/shortlog.c:284
178 msgid "unrecognized argument: %s"
183 msgid "ref '%s' is excluded by the rev-list options"
187 msgid "Refusing to create empty bundle."
191 msgid "Could not spawn pack-objects"
195 msgid "pack-objects died"
200 msgid "cannot create '%s'"
204 msgid "index-pack died"
209 msgid "could not parse %s"
214 msgid "%s %s is not a commit!"
217 #: compat/obstack.c:406 compat/obstack.c:408
218 msgid "memory exhausted"
222 msgid "Could not run 'git rev-list'"
227 msgid "failed write to rev-list: %s"
232 msgid "failed to close rev-list's stdin: %s"
236 msgid "in the future"
241 msgid "%lu second ago"
242 msgid_plural "%lu seconds ago"
248 msgid "%lu minute ago"
249 msgid_plural "%lu minutes ago"
256 msgid_plural "%lu hours ago"
263 msgid_plural "%lu days ago"
270 msgid_plural "%lu weeks ago"
276 msgid "%lu month ago"
277 msgid_plural "%lu months ago"
284 msgid_plural "%lu years"
290 msgid "%s, %lu month ago"
291 msgid_plural "%s, %lu months ago"
295 #: date.c:154 date.c:159
298 msgid_plural "%lu years ago"
304 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
309 msgid " Unknown dirstat parameter '%s'\n"
315 "Found errors in 'diff.dirstat' config variable:\n"
322 "Failed to parse --dirstat/-X option parameter:\n"
326 #: gpg-interface.c:59
327 msgid "could not run gpg."
330 #: gpg-interface.c:71
331 msgid "gpg did not accept the data"
334 #: gpg-interface.c:82
335 msgid "gpg failed to sign the data"
340 msgid "'%s': unable to read %s"
350 msgid "'%s': short read %s"
355 msgid "available git commands in '%s'"
359 msgid "git commands available from elsewhere on your $PATH"
365 "'%s' appears to be a git command, but we were not\n"
366 "able to execute it. Maybe git-%s is broken?"
370 msgid "Uh oh. Your system reports no Git commands at all."
376 "WARNING: You called a Git command named '%s', which does not exist.\n"
377 "Continuing under the assumption that you meant '%s'"
382 msgid "in %0.1f seconds automatically..."
387 msgid "git: '%s' is not a git command. See 'git --help'."
396 "Did you mean one of these?"
401 msgid "failed to read the cache"
404 #: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534
405 #: builtin/clone.c:586
406 msgid "unable to write new index file"
409 #: merge-recursive.c:190
411 msgid "(bad commit)\n"
414 #: merge-recursive.c:206
416 msgid "addinfo_cache failed for path '%s'"
419 #: merge-recursive.c:268
420 msgid "error building trees"
423 #: merge-recursive.c:672
425 msgid "failed to create path '%s'%s"
428 #: merge-recursive.c:683
430 msgid "Removing %s to make room for subdirectory\n"
433 #. something else exists
434 #. .. but not some other error (who really cares what?)
435 #: merge-recursive.c:697 merge-recursive.c:718
436 msgid ": perhaps a D/F conflict?"
439 #: merge-recursive.c:708
441 msgid "refusing to lose untracked file at '%s'"
444 #: merge-recursive.c:748
446 msgid "cannot read object %s '%s'"
449 #: merge-recursive.c:750
451 msgid "blob expected for %s '%s'"
454 #: merge-recursive.c:773 builtin/clone.c:302
456 msgid "failed to open '%s'"
459 #: merge-recursive.c:781
461 msgid "failed to symlink '%s'"
464 #: merge-recursive.c:784
466 msgid "do not know what to do with %06o %s '%s'"
469 #: merge-recursive.c:922
470 msgid "Failed to execute internal merge"
473 #: merge-recursive.c:926
475 msgid "Unable to add %s to database"
478 #: merge-recursive.c:942
479 msgid "unsupported object type in the tree"
482 #: merge-recursive.c:1021 merge-recursive.c:1035
485 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
489 #: merge-recursive.c:1027 merge-recursive.c:1040
492 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
496 #: merge-recursive.c:1081
500 #: merge-recursive.c:1081
504 #: merge-recursive.c:1137
506 msgid "%s is a directory in %s adding as %s instead"
509 #: merge-recursive.c:1159
512 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
513 "\"->\"%s\" in \"%s\"%s"
516 #: merge-recursive.c:1164
517 msgid " (left unresolved)"
520 #: merge-recursive.c:1218
522 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
525 #: merge-recursive.c:1248
527 msgid "Renaming %s to %s and %s to %s instead"
530 #: merge-recursive.c:1447
532 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
535 #: merge-recursive.c:1457
537 msgid "Adding merged %s"
540 #: merge-recursive.c:1462 merge-recursive.c:1660
542 msgid "Adding as %s instead"
545 #: merge-recursive.c:1513
547 msgid "cannot read object %s"
550 #: merge-recursive.c:1516
552 msgid "object %s is not a blob"
555 #: merge-recursive.c:1564
559 #: merge-recursive.c:1564
563 #: merge-recursive.c:1574
567 #: merge-recursive.c:1581
571 #: merge-recursive.c:1615
573 msgid "Skipped %s (merged same as existing)"
576 #: merge-recursive.c:1629
578 msgid "Auto-merging %s"
581 #: merge-recursive.c:1633 git-submodule.sh:893
585 #: merge-recursive.c:1634
587 msgid "CONFLICT (%s): Merge conflict in %s"
590 #: merge-recursive.c:1724
595 #: merge-recursive.c:1749
596 msgid "file/directory"
599 #: merge-recursive.c:1755
600 msgid "directory/file"
603 #: merge-recursive.c:1760
605 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
608 #: merge-recursive.c:1770
613 #: merge-recursive.c:1787
614 msgid "Fatal merge failure, shouldn't happen."
617 #: merge-recursive.c:1806
618 msgid "Already up-to-date!"
621 #: merge-recursive.c:1815
623 msgid "merging of trees %s and %s failed"
626 #: merge-recursive.c:1845
628 msgid "Unprocessed path??? %s"
631 #: merge-recursive.c:1890
635 #: merge-recursive.c:1903
637 msgid "found %u common ancestor:"
638 msgid_plural "found %u common ancestors:"
642 #: merge-recursive.c:1940
643 msgid "merge returned no commit"
646 #: merge-recursive.c:1997
648 msgid "Could not parse object '%s'"
651 #: merge-recursive.c:2009 builtin/merge.c:643
652 msgid "Unable to write index."
655 #: parse-options.c:494
659 #: parse-options.c:512
664 #. TRANSLATORS: the colon here should align with the
665 #. one in "usage: %s" translation
666 #: parse-options.c:516
671 #: parse-options.c:519
678 msgid "Your branch is ahead of '%s' by %d commit.\n"
679 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
685 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
687 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
694 "Your branch and '%s' have diverged,\n"
695 "and have %d and %d different commit each, respectively.\n"
697 "Your branch and '%s' have diverged,\n"
698 "and have %d and %d different commits each, respectively.\n"
702 #: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984
703 #: builtin/merge.c:994
705 msgid "Could not open '%s' for writing"
708 #: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986
709 #: builtin/merge.c:999
711 msgid "Could not write to '%s'"
716 "after resolving the conflicts, mark the corrected paths\n"
717 "with 'git add <paths>' or 'git rm <paths>'"
722 "after resolving the conflicts, mark the corrected paths\n"
723 "with 'git add <paths>' or 'git rm <paths>'\n"
724 "and commit the result with 'git commit'"
727 #: sequencer.c:162 sequencer.c:770 sequencer.c:853
729 msgid "Could not write to %s"
734 msgid "Error wrapping up %s"
738 msgid "Your local changes would be overwritten by cherry-pick."
742 msgid "Your local changes would be overwritten by revert."
746 msgid "Commit your changes or stash them to proceed."
749 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
752 msgid "%s: Unable to write new index file"
756 msgid "Could not resolve HEAD commit\n"
760 msgid "Unable to update cache tree\n"
765 msgid "Could not parse commit %s\n"
770 msgid "Could not parse parent commit %s\n"
774 msgid "Your index file is unmerged."
778 msgid "You do not have a valid HEAD"
783 msgid "Commit %s is a merge but no -m option was given."
788 msgid "Commit %s does not have parent %d"
793 msgid "Mainline was specified but commit %s is not a merge."
796 #. TRANSLATORS: The first %s will be "revert" or
797 #. "cherry-pick", the second %s a SHA1
800 msgid "%s: cannot parse parent commit %s"
805 msgid "Cannot get commit message for %s"
810 msgid "could not revert %s... %s"
815 msgid "could not apply %s... %s"
819 msgid "empty commit set passed"
824 msgid "git %s: failed to read the index"
829 msgid "git %s: failed to refresh the index"
834 msgid "Cannot %s during a %s"
839 msgid "Could not parse line %d."
843 msgid "No commits parsed."
848 msgid "Could not open %s"
853 msgid "Could not read %s."
858 msgid "Unusable instruction sheet: %s"
863 msgid "Invalid key: %s"
868 msgid "Invalid value for %s: %s"
873 msgid "Malformed options sheet: %s"
877 msgid "a cherry-pick or revert is already in progress"
881 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
886 msgid "Could not create sequencer directory %s"
889 #: sequencer.c:772 sequencer.c:857
891 msgid "Error wrapping up %s."
894 #: sequencer.c:791 sequencer.c:925
895 msgid "no cherry-pick or revert in progress"
899 msgid "cannot resolve HEAD"
903 msgid "cannot abort from a branch yet to be born"
906 #: sequencer.c:817 builtin/apply.c:4005
908 msgid "cannot open %s: %s"
913 msgid "cannot read %s: %s"
917 msgid "unexpected end of file"
922 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
927 msgid "Could not format %s."
931 msgid "Can't revert as initial commit"
935 msgid "Can't cherry-pick into empty head"
939 msgid "HEAD does not point to a branch"
944 msgid "No such branch: '%s'"
949 msgid "No upstream configured for branch '%s'"
954 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
959 msgid "unable to access '%s': %s"
964 msgid "unable to look up current user in the passwd file: %s"
972 msgid "Unmerged paths:"
975 #: wt-status.c:167 wt-status.c:194
977 msgid " (use \"git reset %s <file>...\" to unstage)"
980 #: wt-status.c:169 wt-status.c:196
981 msgid " (use \"git rm --cached <file>...\" to unstage)"
985 msgid " (use \"git add <file>...\" to mark resolution)"
988 #: wt-status.c:175 wt-status.c:179
989 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
993 msgid " (use \"git rm <file>...\" to mark resolution)"
997 msgid "Changes to be committed:"
1001 msgid "Changes not staged for commit:"
1005 msgid " (use \"git add <file>...\" to update what will be committed)"
1009 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1014 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1018 msgid " (commit or discard the untracked or modified content in submodules)"
1023 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1031 msgid "both deleted:"
1035 msgid "added by us:"
1039 msgid "deleted by them:"
1043 msgid "added by them:"
1047 msgid "deleted by us:"
1055 msgid "both modified:"
1059 msgid "new commits, "
1063 msgid "modified content, "
1067 msgid "untracked content, "
1072 msgid "new file: %s"
1077 msgid "copied: %s -> %s"
1087 msgid "modified: %s"
1092 msgid "renamed: %s -> %s"
1097 msgid "typechange: %s"
1107 msgid "unmerged: %s"
1112 msgid "bug: unhandled diff status %c"
1116 msgid "You have unmerged paths."
1119 #: wt-status.c:788 wt-status.c:912
1120 msgid " (fix conflicts and run \"git commit\")"
1124 msgid "All conflicts fixed but you are still merging."
1128 msgid " (use \"git commit\" to conclude merge)"
1132 msgid "You are in the middle of an am session."
1136 msgid "The current patch is empty."
1140 msgid " (fix conflicts and then run \"git am --resolved\")"
1144 msgid " (use \"git am --skip\" to skip this patch)"
1148 msgid " (use \"git am --abort\" to restore the original branch)"
1151 #: wt-status.c:873 wt-status.c:883
1152 msgid "You are currently rebasing."
1156 msgid " (fix conflicts and then run \"git rebase --continue\")"
1160 msgid " (use \"git rebase --skip\" to skip this patch)"
1164 msgid " (use \"git rebase --abort\" to check out the original branch)"
1168 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1172 msgid "You are currently splitting a commit during a rebase."
1176 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1180 msgid "You are currently editing a commit during a rebase."
1184 msgid " (use \"git commit --amend\" to amend the current commit)"
1189 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1193 msgid "You are currently cherry-picking."
1197 msgid " (all conflicts fixed: run \"git commit\")"
1201 msgid "You are currently bisecting."
1205 msgid " (use \"git bisect reset\" to get back to the original branch)"
1213 msgid "Not currently on any branch."
1217 msgid "Initial commit"
1221 msgid "Untracked files"
1225 msgid "Ignored files"
1230 msgid "Untracked files not listed%s"
1234 msgid " (use -u option to show untracked files)"
1243 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1248 msgid "no changes added to commit\n"
1254 "nothing added to commit but untracked files present (use \"git add\" to "
1260 msgid "nothing added to commit but untracked files present\n"
1265 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1268 #: wt-status.c:1043 wt-status.c:1048
1270 msgid "nothing to commit\n"
1275 msgid "nothing to commit (use -u to show untracked files)\n"
1280 msgid "nothing to commit, working directory clean\n"
1284 msgid "HEAD (no branch)"
1288 msgid "Initial commit on "
1295 #: wt-status.c:1182 wt-status.c:1185
1303 #: compat/precompose_utf8.c:58 builtin/clone.c:341
1305 msgid "failed to unlink '%s'"
1309 msgid "git add [options] [--] <filepattern>..."
1314 msgid "unexpected diff status %c"
1317 #: builtin/add.c:67 builtin/commit.c:231
1318 msgid "updating files failed"
1323 msgid "remove '%s'\n"
1326 #: builtin/add.c:176
1328 msgid "Path '%s' is in submodule '%.*s'"
1331 #: builtin/add.c:192
1332 msgid "Unstaged changes after refreshing the index:"
1335 #: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:260
1337 msgid "pathspec '%s' did not match any files"
1340 #: builtin/add.c:209
1342 msgid "'%s' is beyond a symbolic link"
1345 #: builtin/add.c:276
1346 msgid "Could not read the index"
1349 #: builtin/add.c:286
1351 msgid "Could not open '%s' for writing."
1354 #: builtin/add.c:290
1355 msgid "Could not write patch"
1358 #: builtin/add.c:295
1360 msgid "Could not stat '%s'"
1363 #: builtin/add.c:297
1364 msgid "Empty patch. Aborted."
1367 #: builtin/add.c:303
1369 msgid "Could not apply '%s'"
1372 #: builtin/add.c:313
1373 msgid "The following paths are ignored by one of your .gitignore files:\n"
1376 #: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63
1377 #: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253
1382 #: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1160
1383 #: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1483
1384 #: builtin/mv.c:62 builtin/read-tree.c:112
1388 #: builtin/add.c:322
1389 msgid "interactive picking"
1392 #: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:248
1393 msgid "select hunks interactively"
1396 #: builtin/add.c:324
1397 msgid "edit current diff and apply"
1400 #: builtin/add.c:325
1401 msgid "allow adding otherwise ignored files"
1404 #: builtin/add.c:326
1405 msgid "update tracked files"
1408 #: builtin/add.c:327
1409 msgid "record only the fact that the path will be added later"
1412 #: builtin/add.c:328
1413 msgid "add changes from all tracked and untracked files"
1416 #: builtin/add.c:329
1417 msgid "don't add, only refresh the index"
1420 #: builtin/add.c:330
1421 msgid "just skip files which cannot be added because of errors"
1424 #: builtin/add.c:331
1425 msgid "check if - even missing - files are ignored in dry run"
1428 #: builtin/add.c:353
1430 msgid "Use -f if you really want to add them.\n"
1433 #: builtin/add.c:354
1434 msgid "no files added"
1437 #: builtin/add.c:360
1438 msgid "adding files failed"
1441 #: builtin/add.c:392
1442 msgid "-A and -u are mutually incompatible"
1445 #: builtin/add.c:394
1446 msgid "Option --ignore-missing can only be used together with --dry-run"
1449 #: builtin/add.c:414
1451 msgid "Nothing specified, nothing added.\n"
1454 #: builtin/add.c:415
1456 msgid "Maybe you wanted to say 'git add .'?\n"
1459 #: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:291 builtin/mv.c:82
1461 msgid "index file corrupt"
1464 #: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:355
1465 msgid "Unable to write new index file"
1468 #: builtin/apply.c:57
1469 msgid "git apply [options] [<patch>...]"
1472 #: builtin/apply.c:110
1474 msgid "unrecognized whitespace option '%s'"
1477 #: builtin/apply.c:125
1479 msgid "unrecognized whitespace ignore option '%s'"
1482 #: builtin/apply.c:823
1484 msgid "Cannot prepare timestamp regexp %s"
1487 #: builtin/apply.c:832
1489 msgid "regexec returned %d for input: %s"
1492 #: builtin/apply.c:913
1494 msgid "unable to find filename in patch at line %d"
1497 #: builtin/apply.c:945
1499 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1502 #: builtin/apply.c:949
1504 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1507 #: builtin/apply.c:950
1509 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1512 #: builtin/apply.c:957
1514 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1517 #: builtin/apply.c:1420
1519 msgid "recount: unexpected line: %.*s"
1522 #: builtin/apply.c:1477
1524 msgid "patch fragment without header at line %d: %.*s"
1527 #: builtin/apply.c:1494
1530 "git diff header lacks filename information when removing %d leading pathname "
1531 "component (line %d)"
1533 "git diff header lacks filename information when removing %d leading pathname "
1534 "components (line %d)"
1538 #: builtin/apply.c:1654
1539 msgid "new file depends on old contents"
1542 #: builtin/apply.c:1656
1543 msgid "deleted file still has contents"
1546 #: builtin/apply.c:1682
1548 msgid "corrupt patch at line %d"
1551 #: builtin/apply.c:1718
1553 msgid "new file %s depends on old contents"
1556 #: builtin/apply.c:1720
1558 msgid "deleted file %s still has contents"
1561 #: builtin/apply.c:1723
1563 msgid "** warning: file %s becomes empty but is not deleted"
1566 #: builtin/apply.c:1869
1568 msgid "corrupt binary patch at line %d: %.*s"
1571 #. there has to be one hunk (forward hunk)
1572 #: builtin/apply.c:1898
1574 msgid "unrecognized binary patch at line %d"
1577 #: builtin/apply.c:1984
1579 msgid "patch with only garbage at line %d"
1582 #: builtin/apply.c:2074
1584 msgid "unable to read symlink %s"
1587 #: builtin/apply.c:2078
1589 msgid "unable to open or read %s"
1592 #: builtin/apply.c:2149
1596 #: builtin/apply.c:2671
1598 msgid "invalid start of line: '%c'"
1601 #: builtin/apply.c:2789
1603 msgid "Hunk #%d succeeded at %d (offset %d line)."
1604 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1608 #: builtin/apply.c:2801
1610 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1613 #: builtin/apply.c:2807
1616 "while searching for:\n"
1620 #: builtin/apply.c:2826
1622 msgid "missing binary patch data for '%s'"
1625 #: builtin/apply.c:2929
1627 msgid "binary patch does not apply to '%s'"
1630 #: builtin/apply.c:2935
1632 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1635 #: builtin/apply.c:2956
1637 msgid "patch failed: %s:%ld"
1640 #: builtin/apply.c:3078
1642 msgid "cannot checkout %s"
1645 #: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176
1647 msgid "read of %s failed"
1650 #: builtin/apply.c:3156 builtin/apply.c:3378
1652 msgid "path %s has been renamed/deleted"
1655 #: builtin/apply.c:3237 builtin/apply.c:3392
1657 msgid "%s: does not exist in index"
1660 #: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406
1665 #: builtin/apply.c:3246 builtin/apply.c:3400
1667 msgid "%s: does not match index"
1670 #: builtin/apply.c:3348
1671 msgid "removal patch leaves file contents"
1674 #: builtin/apply.c:3417
1676 msgid "%s: wrong type"
1679 #: builtin/apply.c:3419
1681 msgid "%s has type %o, expected %o"
1684 #: builtin/apply.c:3520
1686 msgid "%s: already exists in index"
1689 #: builtin/apply.c:3523
1691 msgid "%s: already exists in working directory"
1694 #: builtin/apply.c:3543
1696 msgid "new mode (%o) of %s does not match old mode (%o)"
1699 #: builtin/apply.c:3548
1701 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1704 #: builtin/apply.c:3556
1706 msgid "%s: patch does not apply"
1709 #: builtin/apply.c:3569
1711 msgid "Checking patch %s..."
1714 #: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158
1716 msgid "make_cache_entry failed for path '%s'"
1719 #: builtin/apply.c:3767
1721 msgid "unable to remove %s from index"
1724 #: builtin/apply.c:3795
1726 msgid "corrupt patch for subproject %s"
1729 #: builtin/apply.c:3799
1731 msgid "unable to stat newly created file '%s'"
1734 #: builtin/apply.c:3804
1736 msgid "unable to create backing store for newly created file %s"
1739 #: builtin/apply.c:3807 builtin/apply.c:3915
1741 msgid "unable to add cache entry for %s"
1744 #: builtin/apply.c:3840
1746 msgid "closing file '%s'"
1749 #: builtin/apply.c:3889
1751 msgid "unable to write file '%s' mode %o"
1754 #: builtin/apply.c:3976
1756 msgid "Applied patch %s cleanly."
1759 #: builtin/apply.c:3984
1760 msgid "internal error"
1763 #. Say this even without --verbose
1764 #: builtin/apply.c:3987
1766 msgid "Applying patch %%s with %d reject..."
1767 msgid_plural "Applying patch %%s with %d rejects..."
1771 #: builtin/apply.c:3997
1773 msgid "truncating .rej filename to %.*s.rej"
1776 #: builtin/apply.c:4018
1778 msgid "Hunk #%d applied cleanly."
1781 #: builtin/apply.c:4021
1783 msgid "Rejected hunk #%d."
1786 #: builtin/apply.c:4171
1787 msgid "unrecognized input"
1790 #: builtin/apply.c:4182
1791 msgid "unable to read index file"
1794 #: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91
1795 #: builtin/fetch.c:63
1799 #: builtin/apply.c:4302
1800 msgid "don't apply changes matching the given path"
1803 #: builtin/apply.c:4305
1804 msgid "apply changes matching the given path"
1807 #: builtin/apply.c:4307
1811 #: builtin/apply.c:4308
1812 msgid "remove <num> leading slashes from traditional diff paths"
1815 #: builtin/apply.c:4311
1816 msgid "ignore additions made by the patch"
1819 #: builtin/apply.c:4313
1820 msgid "instead of applying the patch, output diffstat for the input"
1823 #: builtin/apply.c:4317
1824 msgid "show number of added and deleted lines in decimal notation"
1827 #: builtin/apply.c:4319
1828 msgid "instead of applying the patch, output a summary for the input"
1831 #: builtin/apply.c:4321
1832 msgid "instead of applying the patch, see if the patch is applicable"
1835 #: builtin/apply.c:4323
1836 msgid "make sure the patch is applicable to the current index"
1839 #: builtin/apply.c:4325
1840 msgid "apply a patch without touching the working tree"
1843 #: builtin/apply.c:4327
1844 msgid "also apply the patch (use with --stat/--summary/--check)"
1847 #: builtin/apply.c:4329
1848 msgid "attempt three-way merge if a patch does not apply"
1851 #: builtin/apply.c:4331
1852 msgid "build a temporary index based on embedded index information"
1855 #: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460
1856 msgid "paths are separated with NUL character"
1859 #: builtin/apply.c:4336
1860 msgid "ensure at least <n> lines of context match"
1863 #: builtin/apply.c:4337
1867 #: builtin/apply.c:4338
1868 msgid "detect new or modified lines that have whitespace errors"
1871 #: builtin/apply.c:4341 builtin/apply.c:4344
1872 msgid "ignore changes in whitespace when finding context"
1875 #: builtin/apply.c:4347
1876 msgid "apply the patch in reverse"
1879 #: builtin/apply.c:4349
1880 msgid "don't expect at least one line of context"
1883 #: builtin/apply.c:4351
1884 msgid "leave the rejected hunks in corresponding *.rej files"
1887 #: builtin/apply.c:4353
1888 msgid "allow overlapping hunks"
1891 #: builtin/apply.c:4356
1892 msgid "tolerate incorrectly detected missing new-line at the end of file"
1895 #: builtin/apply.c:4359
1896 msgid "do not trust the line counts in the hunk headers"
1899 #: builtin/apply.c:4361
1903 #: builtin/apply.c:4362
1904 msgid "prepend <root> to all filenames"
1907 #: builtin/apply.c:4384
1908 msgid "--3way outside a repository"
1911 #: builtin/apply.c:4392
1912 msgid "--index outside a repository"
1915 #: builtin/apply.c:4395
1916 msgid "--cached outside a repository"
1919 #: builtin/apply.c:4411
1921 msgid "can't open patch '%s'"
1924 #: builtin/apply.c:4425
1926 msgid "squelched %d whitespace error"
1927 msgid_plural "squelched %d whitespace errors"
1931 #: builtin/apply.c:4431 builtin/apply.c:4441
1933 msgid "%d line adds whitespace errors."
1934 msgid_plural "%d lines add whitespace errors."
1938 #: builtin/archive.c:17
1940 msgid "could not create archive file '%s'"
1943 #: builtin/archive.c:20
1944 msgid "could not redirect output"
1947 #: builtin/archive.c:37
1948 msgid "git archive: Remote with no URL"
1951 #: builtin/archive.c:58
1952 msgid "git archive: expected ACK/NAK, got EOF"
1955 #: builtin/archive.c:63
1957 msgid "git archive: NACK %s"
1960 #: builtin/archive.c:65
1962 msgid "remote error: %s"
1965 #: builtin/archive.c:66
1966 msgid "git archive: protocol error"
1969 #: builtin/archive.c:71
1970 msgid "git archive: expected a flush"
1973 #: builtin/bisect--helper.c:7
1974 msgid "git bisect--helper --next-all [--no-checkout]"
1977 #: builtin/bisect--helper.c:17
1978 msgid "perform 'git bisect next'"
1981 #: builtin/bisect--helper.c:19
1982 msgid "update BISECT_HEAD instead of checking out the current commit"
1985 #: builtin/blame.c:25
1986 msgid "git blame [options] [rev-opts] [rev] [--] file"
1989 #: builtin/blame.c:30 builtin/shortlog.c:15
1990 msgid "[rev-opts] are documented in git-rev-list(1)"
1993 #: builtin/blame.c:2374
1994 msgid "Show blame entries as we find them, incrementally"
1997 #: builtin/blame.c:2375
1998 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2001 #: builtin/blame.c:2376
2002 msgid "Do not treat root commits as boundaries (Default: off)"
2005 #: builtin/blame.c:2377
2006 msgid "Show work cost statistics"
2009 #: builtin/blame.c:2378
2010 msgid "Show output score for blame entries"
2013 #: builtin/blame.c:2379
2014 msgid "Show original filename (Default: auto)"
2017 #: builtin/blame.c:2380
2018 msgid "Show original linenumber (Default: off)"
2021 #: builtin/blame.c:2381
2022 msgid "Show in a format designed for machine consumption"
2025 #: builtin/blame.c:2382
2026 msgid "Show porcelain format with per-line commit information"
2029 #: builtin/blame.c:2383
2030 msgid "Use the same output mode as git-annotate (Default: off)"
2033 #: builtin/blame.c:2384
2034 msgid "Show raw timestamp (Default: off)"
2037 #: builtin/blame.c:2385
2038 msgid "Show long commit SHA1 (Default: off)"
2041 #: builtin/blame.c:2386
2042 msgid "Suppress author name and timestamp (Default: off)"
2045 #: builtin/blame.c:2387
2046 msgid "Show author email instead of name (Default: off)"
2049 #: builtin/blame.c:2388
2050 msgid "Ignore whitespace differences"
2053 #: builtin/blame.c:2389
2054 msgid "Spend extra cycles to find better match"
2057 #: builtin/blame.c:2390
2058 msgid "Use revisions from <file> instead of calling git-rev-list"
2061 #: builtin/blame.c:2391
2062 msgid "Use <file>'s contents as the final image"
2065 #: builtin/blame.c:2392 builtin/blame.c:2393
2069 #: builtin/blame.c:2392
2070 msgid "Find line copies within and across files"
2073 #: builtin/blame.c:2393
2074 msgid "Find line movements within and across files"
2077 #: builtin/blame.c:2394
2081 #: builtin/blame.c:2394
2082 msgid "Process only line range n,m, counting from 1"
2085 #: builtin/branch.c:23
2086 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2089 #: builtin/branch.c:24
2090 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2093 #: builtin/branch.c:25
2094 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2097 #: builtin/branch.c:26
2098 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2101 #: builtin/branch.c:145
2104 "deleting branch '%s' that has been merged to\n"
2105 " '%s', but not yet merged to HEAD."
2108 #: builtin/branch.c:149
2111 "not deleting branch '%s' that is not yet merged to\n"
2112 " '%s', even though it is merged to HEAD."
2115 #: builtin/branch.c:163
2117 msgid "Couldn't look up commit object for '%s'"
2120 #: builtin/branch.c:167
2123 "The branch '%s' is not fully merged.\n"
2124 "If you are sure you want to delete it, run 'git branch -D %s'."
2127 #: builtin/branch.c:180
2128 msgid "Update of config-file failed"
2131 #: builtin/branch.c:208
2132 msgid "cannot use -a with -d"
2135 #: builtin/branch.c:214
2136 msgid "Couldn't look up commit object for HEAD"
2139 #: builtin/branch.c:222
2141 msgid "Cannot delete the branch '%s' which you are currently on."
2144 #: builtin/branch.c:235
2146 msgid "remote branch '%s' not found."
2149 #: builtin/branch.c:236
2151 msgid "branch '%s' not found."
2154 #: builtin/branch.c:250
2156 msgid "Error deleting remote branch '%s'"
2159 #: builtin/branch.c:251
2161 msgid "Error deleting branch '%s'"
2164 #: builtin/branch.c:258
2166 msgid "Deleted remote branch %s (was %s).\n"
2169 #: builtin/branch.c:259
2171 msgid "Deleted branch %s (was %s).\n"
2174 #: builtin/branch.c:361
2176 msgid "branch '%s' does not point at a commit"
2179 #: builtin/branch.c:433
2181 msgid "[%s: behind %d]"
2184 #: builtin/branch.c:435
2189 #: builtin/branch.c:439
2191 msgid "[%s: ahead %d]"
2194 #: builtin/branch.c:441
2199 #: builtin/branch.c:444
2201 msgid "[%s: ahead %d, behind %d]"
2204 #: builtin/branch.c:447
2206 msgid "[ahead %d, behind %d]"
2209 #: builtin/branch.c:560
2213 #: builtin/branch.c:625
2214 msgid "some refs could not be read"
2217 #: builtin/branch.c:638
2218 msgid "cannot rename the current branch while not on any."
2221 #: builtin/branch.c:648
2223 msgid "Invalid branch name: '%s'"
2226 #: builtin/branch.c:663
2227 msgid "Branch rename failed"
2230 #: builtin/branch.c:667
2232 msgid "Renamed a misnamed branch '%s' away"
2235 #: builtin/branch.c:671
2237 msgid "Branch renamed to %s, but HEAD is not updated!"
2240 #: builtin/branch.c:678
2241 msgid "Branch is renamed, but update of config-file failed"
2244 #: builtin/branch.c:693
2246 msgid "malformed object name %s"
2249 #: builtin/branch.c:717
2251 msgid "could not write branch description template: %s"
2254 #: builtin/branch.c:747
2255 msgid "Generic options"
2258 #: builtin/branch.c:749
2259 msgid "show hash and subject, give twice for upstream branch"
2262 #: builtin/branch.c:750
2263 msgid "suppress informational messages"
2266 #: builtin/branch.c:751
2267 msgid "set up tracking mode (see git-pull(1))"
2270 #: builtin/branch.c:753
2271 msgid "change upstream info"
2274 #: builtin/branch.c:757
2275 msgid "use colored output"
2278 #: builtin/branch.c:758
2279 msgid "act on remote-tracking branches"
2282 #: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788
2283 #: builtin/branch.c:794 builtin/commit.c:1376 builtin/commit.c:1377
2284 #: builtin/commit.c:1378 builtin/commit.c:1379 builtin/tag.c:470
2288 #: builtin/branch.c:762 builtin/branch.c:768
2289 msgid "print only branches that contain the commit"
2292 #: builtin/branch.c:774
2293 msgid "Specific git-branch actions:"
2296 #: builtin/branch.c:775
2297 msgid "list both remote-tracking and local branches"
2300 #: builtin/branch.c:777
2301 msgid "delete fully merged branch"
2304 #: builtin/branch.c:778
2305 msgid "delete branch (even if not merged)"
2308 #: builtin/branch.c:779
2309 msgid "move/rename a branch and its reflog"
2312 #: builtin/branch.c:780
2313 msgid "move/rename a branch, even if target exists"
2316 #: builtin/branch.c:781
2317 msgid "list branch names"
2320 #: builtin/branch.c:782
2321 msgid "create the branch's reflog"
2324 #: builtin/branch.c:784
2325 msgid "edit the description for the branch"
2328 #: builtin/branch.c:785
2329 msgid "force creation (when already exists)"
2332 #: builtin/branch.c:788
2333 msgid "print only not merged branches"
2336 #: builtin/branch.c:794
2337 msgid "print only merged branches"
2340 #: builtin/branch.c:798
2341 msgid "list branches in columns"
2344 #: builtin/branch.c:811
2345 msgid "Failed to resolve HEAD as a valid ref."
2348 #: builtin/branch.c:816 builtin/clone.c:561
2349 msgid "HEAD not found below refs/heads!"
2352 #: builtin/branch.c:836
2353 msgid "--column and --verbose are incompatible"
2356 #: builtin/branch.c:887
2358 msgid "branch '%s' does not exist"
2361 #: builtin/branch.c:899
2363 msgid "Branch '%s' has no upstream information"
2366 #: builtin/branch.c:914
2367 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2370 #: builtin/branch.c:917
2373 "The --set-upstream flag is deprecated and will be removed. Consider using --"
2374 "track or --set-upstream-to\n"
2377 #: builtin/branch.c:934
2381 "If you wanted to make '%s' track '%s', do this:\n"
2385 #: builtin/branch.c:935
2387 msgid " git branch -d %s\n"
2390 #: builtin/branch.c:936
2392 msgid " git branch --set-upstream-to %s\n"
2395 #: builtin/bundle.c:47
2397 msgid "%s is okay\n"
2400 #: builtin/bundle.c:56
2401 msgid "Need a repository to create a bundle."
2404 #: builtin/bundle.c:60
2405 msgid "Need a repository to unbundle."
2408 #: builtin/cat-file.c:247
2409 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2412 #: builtin/cat-file.c:248
2413 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2416 #: builtin/cat-file.c:266
2417 msgid "<type> can be one of: blob, tree, commit, tag"
2420 #: builtin/cat-file.c:267
2421 msgid "show object type"
2424 #: builtin/cat-file.c:268
2425 msgid "show object size"
2428 #: builtin/cat-file.c:270
2429 msgid "exit with zero when there's no error"
2432 #: builtin/cat-file.c:271
2433 msgid "pretty-print object's content"
2436 #: builtin/cat-file.c:273
2437 msgid "for blob objects, run textconv on object's content"
2440 #: builtin/cat-file.c:275
2441 msgid "show info and content of objects fed from the standard input"
2444 #: builtin/cat-file.c:278
2445 msgid "show info about objects fed from the standard input"
2448 #: builtin/check-attr.c:11
2449 msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2452 #: builtin/check-attr.c:12
2453 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2456 #: builtin/check-attr.c:19
2457 msgid "report all attributes set on file"
2460 #: builtin/check-attr.c:20
2461 msgid "use .gitattributes only from the index"
2464 #: builtin/check-attr.c:21 builtin/hash-object.c:75
2465 msgid "read file names from stdin"
2468 #: builtin/check-attr.c:23
2469 msgid "input paths are terminated by a null character"
2472 #: builtin/checkout-index.c:126
2473 msgid "git checkout-index [options] [--] [<file>...]"
2476 #: builtin/checkout-index.c:187
2477 msgid "check out all files in the index"
2480 #: builtin/checkout-index.c:188
2481 msgid "force overwrite of existing files"
2484 #: builtin/checkout-index.c:190
2485 msgid "no warning for existing files and files not in index"
2488 #: builtin/checkout-index.c:192
2489 msgid "don't checkout new files"
2492 #: builtin/checkout-index.c:194
2493 msgid "update stat information in the index file"
2496 #: builtin/checkout-index.c:200
2497 msgid "read list of paths from the standard input"
2500 #: builtin/checkout-index.c:202
2501 msgid "write the content to temporary files"
2504 #: builtin/checkout-index.c:203 builtin/column.c:30
2508 #: builtin/checkout-index.c:204
2509 msgid "when creating files, prepend <string>"
2512 #: builtin/checkout-index.c:207
2513 msgid "copy out the files from named stage"
2516 #: builtin/checkout.c:25
2517 msgid "git checkout [options] <branch>"
2520 #: builtin/checkout.c:26
2521 msgid "git checkout [options] [<branch>] -- <file>..."
2524 #: builtin/checkout.c:116 builtin/checkout.c:149
2526 msgid "path '%s' does not have our version"
2529 #: builtin/checkout.c:118 builtin/checkout.c:151
2531 msgid "path '%s' does not have their version"
2534 #: builtin/checkout.c:134
2536 msgid "path '%s' does not have all necessary versions"
2539 #: builtin/checkout.c:178
2541 msgid "path '%s' does not have necessary versions"
2544 #: builtin/checkout.c:195
2546 msgid "path '%s': cannot merge"
2549 #: builtin/checkout.c:212
2551 msgid "Unable to add merge result for '%s'"
2554 #: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
2555 #: builtin/checkout.c:245
2557 msgid "'%s' cannot be used with updating paths"
2560 #: builtin/checkout.c:248 builtin/checkout.c:251
2562 msgid "'%s' cannot be used with %s"
2565 #: builtin/checkout.c:254
2567 msgid "Cannot update paths and switch to branch '%s' at the same time."
2570 #: builtin/checkout.c:265 builtin/checkout.c:426
2571 msgid "corrupt index file"
2574 #: builtin/checkout.c:295 builtin/checkout.c:302
2576 msgid "path '%s' is unmerged"
2579 #: builtin/checkout.c:448
2580 msgid "you need to resolve your current index first"
2583 #: builtin/checkout.c:569
2585 msgid "Can not do reflog for '%s'\n"
2588 #: builtin/checkout.c:602
2589 msgid "HEAD is now at"
2592 #: builtin/checkout.c:609
2594 msgid "Reset branch '%s'\n"
2597 #: builtin/checkout.c:612
2599 msgid "Already on '%s'\n"
2602 #: builtin/checkout.c:616
2604 msgid "Switched to and reset branch '%s'\n"
2607 #: builtin/checkout.c:618 builtin/checkout.c:955
2609 msgid "Switched to a new branch '%s'\n"
2612 #: builtin/checkout.c:620
2614 msgid "Switched to branch '%s'\n"
2617 #: builtin/checkout.c:676
2619 msgid " ... and %d more.\n"
2622 #. The singular version
2623 #: builtin/checkout.c:682
2626 "Warning: you are leaving %d commit behind, not connected to\n"
2627 "any of your branches:\n"
2631 "Warning: you are leaving %d commits behind, not connected to\n"
2632 "any of your branches:\n"
2638 #: builtin/checkout.c:700
2641 "If you want to keep them by creating a new branch, this may be a good time\n"
2644 " git branch new_branch_name %s\n"
2648 #: builtin/checkout.c:730
2649 msgid "internal error in revision walk"
2652 #: builtin/checkout.c:734
2653 msgid "Previous HEAD position was"
2656 #: builtin/checkout.c:761 builtin/checkout.c:950
2657 msgid "You are on a branch yet to be born"
2661 #: builtin/checkout.c:886
2663 msgid "invalid reference: %s"
2666 #. case (1): want a tree
2667 #: builtin/checkout.c:925
2669 msgid "reference is not a tree: %s"
2672 #: builtin/checkout.c:964
2673 msgid "paths cannot be used with switching branches"
2676 #: builtin/checkout.c:967 builtin/checkout.c:971
2678 msgid "'%s' cannot be used with switching branches"
2681 #: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983
2682 #: builtin/checkout.c:986
2684 msgid "'%s' cannot be used with '%s'"
2687 #: builtin/checkout.c:991
2689 msgid "Cannot switch branch to a non-commit '%s'"
2692 #: builtin/checkout.c:1012 builtin/gc.c:177
2693 msgid "suppress progress reporting"
2696 #: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89
2697 #: builtin/remote.c:169 builtin/remote.c:171
2701 #: builtin/checkout.c:1014
2702 msgid "create and checkout a new branch"
2705 #: builtin/checkout.c:1016
2706 msgid "create/reset and checkout a branch"
2709 #: builtin/checkout.c:1017
2710 msgid "create reflog for new branch"
2713 #: builtin/checkout.c:1018
2714 msgid "detach the HEAD at named commit"
2717 #: builtin/checkout.c:1019
2718 msgid "set upstream info for new branch"
2721 #: builtin/checkout.c:1021
2725 #: builtin/checkout.c:1021
2726 msgid "new unparented branch"
2729 #: builtin/checkout.c:1022
2730 msgid "checkout our version for unmerged files"
2733 #: builtin/checkout.c:1024
2734 msgid "checkout their version for unmerged files"
2737 #: builtin/checkout.c:1026
2738 msgid "force checkout (throw away local modifications)"
2741 #: builtin/checkout.c:1027
2742 msgid "perform a 3-way merge with the new branch"
2745 #: builtin/checkout.c:1028 builtin/merge.c:215
2746 msgid "update ignored files (default)"
2749 #: builtin/checkout.c:1029 builtin/log.c:1116 parse-options.h:241
2753 #: builtin/checkout.c:1030
2754 msgid "conflict style (merge or diff3)"
2757 #: builtin/checkout.c:1033
2758 msgid "second guess 'git checkout no-such-branch'"
2761 #: builtin/checkout.c:1057
2762 msgid "-b, -B and --orphan are mutually exclusive"
2765 #: builtin/checkout.c:1074
2766 msgid "--track needs a branch name"
2769 #: builtin/checkout.c:1081
2770 msgid "Missing branch name; try -b"
2773 #: builtin/checkout.c:1116
2774 msgid "invalid path specification"
2777 #: builtin/checkout.c:1123
2780 "Cannot update paths and switch to branch '%s' at the same time.\n"
2781 "Did you intend to checkout '%s' which can not be resolved as commit?"
2784 #: builtin/checkout.c:1128
2786 msgid "git checkout: --detach does not take a path argument '%s'"
2789 #: builtin/checkout.c:1132
2791 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
2792 "checking out of the index."
2795 #: builtin/clean.c:19
2796 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
2799 #: builtin/clean.c:51
2800 msgid "do not print names of files removed"
2803 #: builtin/clean.c:53
2807 #: builtin/clean.c:55
2808 msgid "remove whole directories"
2811 #: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:717
2812 #: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182
2816 #: builtin/clean.c:57
2817 msgid "add <pattern> to ignore rules"
2820 #: builtin/clean.c:58
2821 msgid "remove ignored files, too"
2824 #: builtin/clean.c:60
2825 msgid "remove only ignored files"
2828 #: builtin/clean.c:78
2829 msgid "-x and -X cannot be used together"
2832 #: builtin/clean.c:82
2834 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
2837 #: builtin/clean.c:85
2839 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
2843 #: builtin/clean.c:155 builtin/clean.c:176
2845 msgid "Would remove %s\n"
2848 #: builtin/clean.c:159 builtin/clean.c:179
2850 msgid "Removing %s\n"
2853 #: builtin/clean.c:162 builtin/clean.c:182
2855 msgid "failed to remove %s"
2858 #: builtin/clean.c:166
2860 msgid "Would not remove %s\n"
2863 #: builtin/clean.c:168
2865 msgid "Not removing %s\n"
2868 #: builtin/clone.c:36
2869 msgid "git clone [options] [--] <repo> [<dir>]"
2872 #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
2873 #: builtin/push.c:399
2874 msgid "force progress reporting"
2877 #: builtin/clone.c:66
2878 msgid "don't create a checkout"
2881 #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
2882 msgid "create a bare repository"
2885 #: builtin/clone.c:72
2886 msgid "create a mirror repository (implies bare)"
2889 #: builtin/clone.c:74
2890 msgid "to clone from a local repository"
2893 #: builtin/clone.c:76
2894 msgid "don't use local hardlinks, always copy"
2897 #: builtin/clone.c:78
2898 msgid "setup as shared repository"
2901 #: builtin/clone.c:80 builtin/clone.c:82
2902 msgid "initialize submodules in the clone"
2905 #: builtin/clone.c:83 builtin/init-db.c:485
2906 msgid "template-directory"
2909 #: builtin/clone.c:84 builtin/init-db.c:486
2910 msgid "directory from which templates will be used"
2913 #: builtin/clone.c:86
2914 msgid "reference repository"
2917 #: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
2921 #: builtin/clone.c:88
2922 msgid "use <name> instead of 'origin' to track upstream"
2925 #: builtin/clone.c:90
2926 msgid "checkout <branch> instead of the remote's HEAD"
2929 #: builtin/clone.c:92
2930 msgid "path to git-upload-pack on the remote"
2933 #: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662
2937 #: builtin/clone.c:94
2938 msgid "create a shallow clone of that depth"
2941 #: builtin/clone.c:96
2942 msgid "clone only one branch, HEAD or --branch"
2945 #: builtin/clone.c:97 builtin/init-db.c:494
2949 #: builtin/clone.c:98 builtin/init-db.c:495
2950 msgid "separate git dir from working tree"
2953 #: builtin/clone.c:99
2957 #: builtin/clone.c:100
2958 msgid "set config inside the new repository"
2961 #: builtin/clone.c:243
2963 msgid "reference repository '%s' is not a local directory."
2966 #: builtin/clone.c:306
2968 msgid "failed to create directory '%s'"
2971 #: builtin/clone.c:308 builtin/diff.c:77
2973 msgid "failed to stat '%s'"
2976 #: builtin/clone.c:310
2978 msgid "%s exists and is not a directory"
2981 #: builtin/clone.c:324
2983 msgid "failed to stat %s\n"
2986 #: builtin/clone.c:346
2988 msgid "failed to create link '%s'"
2991 #: builtin/clone.c:350
2993 msgid "failed to copy file to '%s'"
2996 #: builtin/clone.c:373
3001 #: builtin/clone.c:443
3003 msgid "Could not find remote branch %s to clone."
3006 #: builtin/clone.c:552
3007 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3010 #: builtin/clone.c:690
3011 msgid "Too many arguments."
3014 #: builtin/clone.c:694
3015 msgid "You must specify a repository to clone."
3018 #: builtin/clone.c:705
3020 msgid "--bare and --origin %s options are incompatible."
3023 #: builtin/clone.c:719
3025 msgid "repository '%s' does not exist"
3028 #: builtin/clone.c:724
3029 msgid "--depth is ignored in local clones; use file:// instead."
3032 #: builtin/clone.c:734
3034 msgid "destination path '%s' already exists and is not an empty directory."
3037 #: builtin/clone.c:744
3039 msgid "working tree '%s' already exists."
3042 #: builtin/clone.c:757 builtin/clone.c:771
3044 msgid "could not create leading directories of '%s'"
3047 #: builtin/clone.c:760
3049 msgid "could not create work tree dir '%s'."
3052 #: builtin/clone.c:779
3054 msgid "Cloning into bare repository '%s'...\n"
3057 #: builtin/clone.c:781
3059 msgid "Cloning into '%s'...\n"
3062 #: builtin/clone.c:823
3064 msgid "Don't know how to clone %s"
3067 #: builtin/clone.c:872
3069 msgid "Remote branch %s not found in upstream %s"
3072 #: builtin/clone.c:879
3073 msgid "You appear to have cloned an empty repository."
3076 #: builtin/column.c:9
3077 msgid "git column [options]"
3080 #: builtin/column.c:26
3081 msgid "lookup config vars"
3084 #: builtin/column.c:27 builtin/column.c:28
3085 msgid "layout to use"
3088 #: builtin/column.c:29
3089 msgid "Maximum width"
3092 #: builtin/column.c:30
3093 msgid "Padding space on left border"
3096 #: builtin/column.c:31
3097 msgid "Padding space on right border"
3100 #: builtin/column.c:32
3101 msgid "Padding space between columns"
3104 #: builtin/column.c:51
3105 msgid "--command must be the first argument"
3108 #: builtin/commit.c:34
3109 msgid "git commit [options] [--] <filepattern>..."
3112 #: builtin/commit.c:39
3113 msgid "git status [options] [--] <filepattern>..."
3116 #: builtin/commit.c:44
3118 "Your name and email address were configured automatically based\n"
3119 "on your username and hostname. Please check that they are accurate.\n"
3120 "You can suppress this message by setting them explicitly:\n"
3122 " git config --global user.name \"Your Name\"\n"
3123 " git config --global user.email you@example.com\n"
3125 "After doing this, you may fix the identity used for this commit with:\n"
3127 " git commit --amend --reset-author\n"
3130 #: builtin/commit.c:56
3132 "You asked to amend the most recent commit, but doing so would make\n"
3133 "it empty. You can repeat your command with --allow-empty, or you can\n"
3134 "remove the commit entirely with \"git reset HEAD^\".\n"
3137 #: builtin/commit.c:61
3139 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3140 "If you wish to commit it anyway, use:\n"
3142 " git commit --allow-empty\n"
3144 "Otherwise, please use 'git reset'\n"
3147 #: builtin/commit.c:258
3148 msgid "failed to unpack HEAD tree object"
3151 #: builtin/commit.c:300
3152 msgid "unable to create temporary index"
3155 #: builtin/commit.c:306
3156 msgid "interactive add failed"
3159 #: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410
3160 msgid "unable to write new_index file"
3163 #: builtin/commit.c:391
3164 msgid "cannot do a partial commit during a merge."
3167 #: builtin/commit.c:393
3168 msgid "cannot do a partial commit during a cherry-pick."
3171 #: builtin/commit.c:403
3172 msgid "cannot read the index"
3175 #: builtin/commit.c:423
3176 msgid "unable to write temporary index file"
3179 #: builtin/commit.c:511 builtin/commit.c:517
3181 msgid "invalid commit: %s"
3184 #: builtin/commit.c:540
3185 msgid "malformed --author parameter"
3188 #: builtin/commit.c:560
3190 msgid "Malformed ident string: '%s'"
3193 #: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954
3195 msgid "could not lookup commit %s"
3198 #: builtin/commit.c:610 builtin/shortlog.c:296
3200 msgid "(reading log message from standard input)\n"
3203 #: builtin/commit.c:612
3204 msgid "could not read log from standard input"
3207 #: builtin/commit.c:616
3209 msgid "could not read log file '%s'"
3212 #: builtin/commit.c:622
3213 msgid "commit has empty message"
3216 #: builtin/commit.c:638
3217 msgid "could not read MERGE_MSG"
3220 #: builtin/commit.c:642
3221 msgid "could not read SQUASH_MSG"
3224 #: builtin/commit.c:646
3226 msgid "could not read '%s'"
3229 #: builtin/commit.c:707
3230 msgid "could not write commit template"
3233 #: builtin/commit.c:718
3237 "It looks like you may be committing a merge.\n"
3238 "If this is not correct, please remove the file\n"
3243 #: builtin/commit.c:723
3247 "It looks like you may be committing a cherry-pick.\n"
3248 "If this is not correct, please remove the file\n"
3253 #: builtin/commit.c:735
3255 "Please enter the commit message for your changes. Lines starting\n"
3256 "with '#' will be ignored, and an empty message aborts the commit.\n"
3259 #: builtin/commit.c:740
3261 "Please enter the commit message for your changes. Lines starting\n"
3262 "with '#' will be kept; you may remove them yourself if you want to.\n"
3263 "An empty message aborts the commit.\n"
3266 #: builtin/commit.c:753
3268 msgid "%sAuthor: %s"
3271 #: builtin/commit.c:760
3273 msgid "%sCommitter: %s"
3276 #: builtin/commit.c:780
3277 msgid "Cannot read index"
3280 #: builtin/commit.c:817
3281 msgid "Error building trees"
3284 #: builtin/commit.c:832 builtin/tag.c:361
3286 msgid "Please supply the message using either -m or -F option.\n"
3289 #: builtin/commit.c:929
3291 msgid "No existing author found with '%s'"
3294 #: builtin/commit.c:944 builtin/commit.c:1148
3296 msgid "Invalid untracked files mode '%s'"
3299 #: builtin/commit.c:984
3300 msgid "Using both --reset-author and --author does not make sense"
3303 #: builtin/commit.c:995
3304 msgid "You have nothing to amend."
3307 #: builtin/commit.c:998
3308 msgid "You are in the middle of a merge -- cannot amend."
3311 #: builtin/commit.c:1000
3312 msgid "You are in the middle of a cherry-pick -- cannot amend."
3315 #: builtin/commit.c:1003
3316 msgid "Options --squash and --fixup cannot be used together"
3319 #: builtin/commit.c:1013
3320 msgid "Only one of -c/-C/-F/--fixup can be used."
3323 #: builtin/commit.c:1015
3324 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3327 #: builtin/commit.c:1023
3328 msgid "--reset-author can be used only with -C, -c or --amend."
3331 #: builtin/commit.c:1040
3332 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3335 #: builtin/commit.c:1042
3336 msgid "No paths with --include/--only does not make sense."
3339 #: builtin/commit.c:1044
3340 msgid "Clever... amending the last one with dirty index."
3343 #: builtin/commit.c:1046
3344 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3347 #: builtin/commit.c:1056 builtin/tag.c:577
3349 msgid "Invalid cleanup mode %s"
3352 #: builtin/commit.c:1061
3353 msgid "Paths with -a does not make sense."
3356 #: builtin/commit.c:1067 builtin/commit.c:1202
3357 msgid "--long and -z are incompatible"
3360 #: builtin/commit.c:1162 builtin/commit.c:1398
3361 msgid "show status concisely"
3364 #: builtin/commit.c:1164 builtin/commit.c:1400
3365 msgid "show branch information"
3368 #: builtin/commit.c:1166 builtin/commit.c:1402 builtin/push.c:389
3369 msgid "machine-readable output"
3372 #: builtin/commit.c:1169 builtin/commit.c:1404
3373 msgid "show status in long format (default)"
3376 #: builtin/commit.c:1172 builtin/commit.c:1407
3377 msgid "terminate entries with NUL"
3380 #: builtin/commit.c:1174 builtin/commit.c:1410 builtin/fast-export.c:636
3381 #: builtin/fast-export.c:639 builtin/tag.c:461
3385 #: builtin/commit.c:1175 builtin/commit.c:1410
3386 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3389 #: builtin/commit.c:1178
3390 msgid "show ignored files"
3393 #: builtin/commit.c:1179 parse-options.h:151
3397 #: builtin/commit.c:1180
3399 "ignore changes to submodules, optional when: all, dirty, untracked. "
3403 #: builtin/commit.c:1182
3404 msgid "list untracked files in columns"
3407 #: builtin/commit.c:1256
3408 msgid "couldn't look up newly created commit"
3411 #: builtin/commit.c:1258
3412 msgid "could not parse newly created commit"
3415 #: builtin/commit.c:1299
3416 msgid "detached HEAD"
3419 #: builtin/commit.c:1301
3420 msgid " (root-commit)"
3423 #: builtin/commit.c:1368
3424 msgid "suppress summary after successful commit"
3427 #: builtin/commit.c:1369
3428 msgid "show diff in commit message template"
3431 #: builtin/commit.c:1371
3432 msgid "Commit message options"
3435 #: builtin/commit.c:1372 builtin/tag.c:459
3436 msgid "read message from file"
3439 #: builtin/commit.c:1373
3443 #: builtin/commit.c:1373
3444 msgid "override author for commit"
3447 #: builtin/commit.c:1374 builtin/gc.c:178
3451 #: builtin/commit.c:1374
3452 msgid "override date for commit"
3455 #: builtin/commit.c:1375 builtin/merge.c:206 builtin/notes.c:537
3456 #: builtin/notes.c:694 builtin/tag.c:457
3460 #: builtin/commit.c:1375
3461 msgid "commit message"
3464 #: builtin/commit.c:1376
3465 msgid "reuse and edit message from specified commit"
3468 #: builtin/commit.c:1377
3469 msgid "reuse message from specified commit"
3472 #: builtin/commit.c:1378
3473 msgid "use autosquash formatted message to fixup specified commit"
3476 #: builtin/commit.c:1379
3477 msgid "use autosquash formatted message to squash specified commit"
3480 #: builtin/commit.c:1380
3481 msgid "the commit is authored by me now (used with -C/-c/--amend)"
3484 #: builtin/commit.c:1381 builtin/log.c:1073 builtin/revert.c:109
3485 msgid "add Signed-off-by:"
3488 #: builtin/commit.c:1382
3489 msgid "use specified template file"
3492 #: builtin/commit.c:1383
3493 msgid "force edit of commit"
3496 #: builtin/commit.c:1384
3500 #: builtin/commit.c:1384 builtin/tag.c:462
3501 msgid "how to strip spaces and #comments from message"
3504 #: builtin/commit.c:1385
3505 msgid "include status in commit message template"
3508 #: builtin/commit.c:1386 builtin/merge.c:213 builtin/tag.c:463
3512 #: builtin/commit.c:1387 builtin/merge.c:214
3513 msgid "GPG sign commit"
3516 #. end commit message options
3517 #: builtin/commit.c:1390
3518 msgid "Commit contents options"
3521 #: builtin/commit.c:1391
3522 msgid "commit all changed files"
3525 #: builtin/commit.c:1392
3526 msgid "add specified files to index for commit"
3529 #: builtin/commit.c:1393
3530 msgid "interactively add files"
3533 #: builtin/commit.c:1394
3534 msgid "interactively add changes"
3537 #: builtin/commit.c:1395
3538 msgid "commit only specified files"
3541 #: builtin/commit.c:1396
3542 msgid "bypass pre-commit hook"
3545 #: builtin/commit.c:1397
3546 msgid "show what would be committed"
3549 #: builtin/commit.c:1408
3550 msgid "amend previous commit"
3553 #: builtin/commit.c:1409
3554 msgid "bypass post-rewrite hook"
3557 #: builtin/commit.c:1414
3558 msgid "ok to record an empty change"
3561 #: builtin/commit.c:1417
3562 msgid "ok to record a change with an empty message"
3565 #: builtin/commit.c:1449
3566 msgid "could not parse HEAD commit"
3569 #: builtin/commit.c:1487 builtin/merge.c:508
3571 msgid "could not open '%s' for reading"
3574 #: builtin/commit.c:1494
3576 msgid "Corrupt MERGE_HEAD file (%s)"
3579 #: builtin/commit.c:1501
3580 msgid "could not read MERGE_MODE"
3583 #: builtin/commit.c:1520
3585 msgid "could not read commit message: %s"
3588 #: builtin/commit.c:1534
3590 msgid "Aborting commit; you did not edit the message.\n"
3593 #: builtin/commit.c:1539
3595 msgid "Aborting commit due to empty commit message.\n"
3598 #: builtin/commit.c:1554 builtin/merge.c:832 builtin/merge.c:857
3599 msgid "failed to write commit object"
3602 #: builtin/commit.c:1575
3603 msgid "cannot lock HEAD ref"
3606 #: builtin/commit.c:1579
3607 msgid "cannot update HEAD ref"
3610 #: builtin/commit.c:1590
3612 "Repository has been updated, but unable to write\n"
3613 "new_index file. Check that disk is not full or quota is\n"
3614 "not exceeded, and then \"git reset HEAD\" to recover."
3617 #: builtin/config.c:7
3618 msgid "git config [options]"
3621 #: builtin/config.c:51
3622 msgid "Config file location"
3625 #: builtin/config.c:52
3626 msgid "use global config file"
3629 #: builtin/config.c:53
3630 msgid "use system config file"
3633 #: builtin/config.c:54
3634 msgid "use repository config file"
3637 #: builtin/config.c:55
3638 msgid "use given config file"
3641 #: builtin/config.c:56
3645 #: builtin/config.c:57
3646 msgid "get value: name [value-regex]"
3649 #: builtin/config.c:58
3650 msgid "get all values: key [value-regex]"
3653 #: builtin/config.c:59
3654 msgid "get values for regexp: name-regex [value-regex]"
3657 #: builtin/config.c:60
3658 msgid "replace all matching variables: name value [value_regex]"
3661 #: builtin/config.c:61
3662 msgid "add a new variable: name value"
3665 #: builtin/config.c:62
3666 msgid "remove a variable: name [value-regex]"
3669 #: builtin/config.c:63
3670 msgid "remove all matches: name [value-regex]"
3673 #: builtin/config.c:64
3674 msgid "rename section: old-name new-name"
3677 #: builtin/config.c:65
3678 msgid "remove a section: name"
3681 #: builtin/config.c:66
3685 #: builtin/config.c:67
3686 msgid "open an editor"
3689 #: builtin/config.c:68 builtin/config.c:69
3693 #: builtin/config.c:68
3694 msgid "find the color configured: [default]"
3697 #: builtin/config.c:69
3698 msgid "find the color setting: [stdout-is-tty]"
3701 #: builtin/config.c:70
3705 #: builtin/config.c:71
3706 msgid "value is \"true\" or \"false\""
3709 #: builtin/config.c:72
3710 msgid "value is decimal number"
3713 #: builtin/config.c:73
3714 msgid "value is --bool or --int"
3717 #: builtin/config.c:74
3718 msgid "value is a path (file or directory name)"
3721 #: builtin/config.c:75
3725 #: builtin/config.c:76
3726 msgid "terminate values with NUL byte"
3729 #: builtin/config.c:77
3730 msgid "respect include directives on lookup"
3733 #: builtin/count-objects.c:69
3734 msgid "git count-objects [-v]"
3737 #: builtin/describe.c:15
3738 msgid "git describe [options] <committish>*"
3741 #: builtin/describe.c:16
3742 msgid "git describe [options] --dirty"
3745 #: builtin/describe.c:234
3747 msgid "annotated tag %s not available"
3750 #: builtin/describe.c:238
3752 msgid "annotated tag %s has no embedded name"
3755 #: builtin/describe.c:240
3757 msgid "tag '%s' is really '%s' here"
3760 #: builtin/describe.c:267
3762 msgid "Not a valid object name %s"
3765 #: builtin/describe.c:270
3767 msgid "%s is not a valid '%s' object"
3770 #: builtin/describe.c:287
3772 msgid "no tag exactly matches '%s'"
3775 #: builtin/describe.c:289
3777 msgid "searching to describe %s\n"
3780 #: builtin/describe.c:329
3782 msgid "finished search at %s\n"
3785 #: builtin/describe.c:353
3788 "No annotated tags can describe '%s'.\n"
3789 "However, there were unannotated tags: try --tags."
3792 #: builtin/describe.c:357
3795 "No tags can describe '%s'.\n"
3796 "Try --always, or create some tags."
3799 #: builtin/describe.c:378
3801 msgid "traversed %lu commits\n"
3804 #: builtin/describe.c:381
3807 "more than %i tags found; listed %i most recent\n"
3808 "gave up search at %s\n"
3811 #: builtin/describe.c:403
3812 msgid "find the tag that comes after the commit"
3815 #: builtin/describe.c:404
3816 msgid "debug search strategy on stderr"
3819 #: builtin/describe.c:405
3820 msgid "use any ref in .git/refs"
3823 #: builtin/describe.c:406
3824 msgid "use any tag in .git/refs/tags"
3827 #: builtin/describe.c:407
3828 msgid "always use long format"
3831 #: builtin/describe.c:410
3832 msgid "only output exact matches"
3835 #: builtin/describe.c:412
3836 msgid "consider <n> most recent tags (default: 10)"
3839 #: builtin/describe.c:414
3840 msgid "only consider tags matching <pattern>"
3843 #: builtin/describe.c:416 builtin/name-rev.c:238
3844 msgid "show abbreviated commit object as fallback"
3847 #: builtin/describe.c:417
3851 #: builtin/describe.c:418
3852 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
3855 #: builtin/describe.c:436
3856 msgid "--long is incompatible with --abbrev=0"
3859 #: builtin/describe.c:462
3860 msgid "No names found, cannot describe anything."
3863 #: builtin/describe.c:482
3864 msgid "--dirty is incompatible with committishes"
3867 #: builtin/diff.c:79
3869 msgid "'%s': not a regular file or symlink"
3872 #: builtin/diff.c:228
3874 msgid "invalid option: %s"
3877 #: builtin/diff.c:305
3878 msgid "Not a git repository"
3881 #: builtin/diff.c:348
3883 msgid "invalid object '%s' given."
3886 #: builtin/diff.c:353
3888 msgid "more than %d trees given: '%s'"
3891 #: builtin/diff.c:363
3893 msgid "more than two blobs given: '%s'"
3896 #: builtin/diff.c:371
3898 msgid "unhandled object '%s' given."
3901 #: builtin/fast-export.c:22
3902 msgid "git fast-export [rev-list-opts]"
3905 #: builtin/fast-export.c:635
3906 msgid "show progress after <n> objects"
3909 #: builtin/fast-export.c:637
3910 msgid "select handling of signed tags"
3913 #: builtin/fast-export.c:640
3914 msgid "select handling of tags that tag filtered objects"
3917 #: builtin/fast-export.c:643
3918 msgid "Dump marks to this file"
3921 #: builtin/fast-export.c:645
3922 msgid "Import marks from this file"
3925 #: builtin/fast-export.c:647
3926 msgid "Fake a tagger when tags lack one"
3929 #: builtin/fast-export.c:649
3930 msgid "Output full tree for each commit"
3933 #: builtin/fast-export.c:651
3934 msgid "Use the done feature to terminate the stream"
3937 #: builtin/fast-export.c:652
3938 msgid "Skip output of blob data"
3941 #: builtin/fetch.c:20
3942 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
3945 #: builtin/fetch.c:21
3946 msgid "git fetch [<options>] <group>"
3949 #: builtin/fetch.c:22
3950 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
3953 #: builtin/fetch.c:23
3954 msgid "git fetch --all [<options>]"
3957 #: builtin/fetch.c:60
3958 msgid "fetch from all remotes"
3961 #: builtin/fetch.c:62
3962 msgid "append to .git/FETCH_HEAD instead of overwriting"
3965 #: builtin/fetch.c:64
3966 msgid "path to upload pack on remote end"
3969 #: builtin/fetch.c:65
3970 msgid "force overwrite of local branch"
3973 #: builtin/fetch.c:67
3974 msgid "fetch from multiple remotes"
3977 #: builtin/fetch.c:69
3978 msgid "fetch all tags and associated objects"
3981 #: builtin/fetch.c:71
3982 msgid "do not fetch all tags (--no-tags)"
3985 #: builtin/fetch.c:73
3986 msgid "prune remote-tracking branches no longer on remote"
3989 #: builtin/fetch.c:74
3993 #: builtin/fetch.c:75
3994 msgid "control recursive fetching of submodules"
3997 #: builtin/fetch.c:79
3998 msgid "keep downloaded pack"
4001 #: builtin/fetch.c:81
4002 msgid "allow updating of HEAD ref"
4005 #: builtin/fetch.c:84
4006 msgid "deepen history of shallow clone"
4009 #: builtin/fetch.c:85 builtin/log.c:1088
4013 #: builtin/fetch.c:86
4014 msgid "prepend this to submodule path output"
4017 #: builtin/fetch.c:89
4018 msgid "default mode for recursion"
4021 #: builtin/fetch.c:201
4022 msgid "Couldn't find remote ref HEAD"
4025 #: builtin/fetch.c:254
4027 msgid "object %s not found"
4030 #: builtin/fetch.c:259
4031 msgid "[up to date]"
4034 #: builtin/fetch.c:273
4036 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4039 #: builtin/fetch.c:274 builtin/fetch.c:360
4043 #: builtin/fetch.c:285
4044 msgid "[tag update]"
4047 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
4048 msgid " (unable to update local ref)"
4051 #: builtin/fetch.c:305
4055 #: builtin/fetch.c:308
4056 msgid "[new branch]"
4059 #: builtin/fetch.c:311
4063 #: builtin/fetch.c:356
4064 msgid "unable to update local ref"
4067 #: builtin/fetch.c:356
4068 msgid "forced update"
4071 #: builtin/fetch.c:362
4072 msgid "(non-fast-forward)"
4075 #: builtin/fetch.c:393 builtin/fetch.c:685
4077 msgid "cannot open %s: %s\n"
4080 #: builtin/fetch.c:402
4082 msgid "%s did not send all necessary objects\n"
4085 #: builtin/fetch.c:488
4090 #: builtin/fetch.c:499
4093 "some local refs could not be updated; try running\n"
4094 " 'git remote prune %s' to remove any old, conflicting branches"
4097 #: builtin/fetch.c:549
4099 msgid " (%s will become dangling)"
4102 #: builtin/fetch.c:550
4104 msgid " (%s has become dangling)"
4107 #: builtin/fetch.c:557
4111 #: builtin/fetch.c:558 builtin/remote.c:1055
4115 #: builtin/fetch.c:675
4117 msgid "Refusing to fetch into current branch %s of non-bare repository"
4120 #: builtin/fetch.c:709
4122 msgid "Don't know how to fetch from %s"
4125 #: builtin/fetch.c:786
4127 msgid "Option \"%s\" value \"%s\" is not valid for %s"
4130 #: builtin/fetch.c:789
4132 msgid "Option \"%s\" is ignored for %s\n"
4135 #: builtin/fetch.c:891
4137 msgid "Fetching %s\n"
4140 #: builtin/fetch.c:893 builtin/remote.c:100
4142 msgid "Could not fetch %s"
4145 #: builtin/fetch.c:912
4147 "No remote repository specified. Please, specify either a URL or a\n"
4148 "remote name from which new revisions should be fetched."
4151 #: builtin/fetch.c:932
4152 msgid "You need to specify a tag name."
4155 #: builtin/fetch.c:984
4156 msgid "fetch --all does not take a repository argument"
4159 #: builtin/fetch.c:986
4160 msgid "fetch --all does not make sense with refspecs"
4163 #: builtin/fetch.c:997
4165 msgid "No such remote or remote group: %s"
4168 #: builtin/fetch.c:1005
4169 msgid "Fetching a group and specifying refspecs does not make sense"
4172 #: builtin/fmt-merge-msg.c:13
4173 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4176 #: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:701
4177 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175
4178 #: builtin/tag.c:448 parse-options.h:133 parse-options.h:235
4182 #: builtin/fmt-merge-msg.c:654
4183 msgid "populate log with at most <n> entries from shortlog"
4186 #: builtin/fmt-merge-msg.c:657
4187 msgid "alias for --log (deprecated)"
4190 #: builtin/fmt-merge-msg.c:660
4194 #: builtin/fmt-merge-msg.c:661
4195 msgid "use <text> as start of message"
4198 #: builtin/fmt-merge-msg.c:662
4199 msgid "file to read from"
4202 #: builtin/for-each-ref.c:979
4203 msgid "git for-each-ref [options] [<pattern>]"
4206 #: builtin/for-each-ref.c:994
4207 msgid "quote placeholders suitably for shells"
4210 #: builtin/for-each-ref.c:996
4211 msgid "quote placeholders suitably for perl"
4214 #: builtin/for-each-ref.c:998
4215 msgid "quote placeholders suitably for python"
4218 #: builtin/for-each-ref.c:1000
4219 msgid "quote placeholders suitably for tcl"
4222 #: builtin/for-each-ref.c:1003
4223 msgid "show only <n> matched refs"
4226 #: builtin/for-each-ref.c:1004
4230 #: builtin/for-each-ref.c:1004
4231 msgid "format to use for the output"
4234 #: builtin/for-each-ref.c:1005
4238 #: builtin/for-each-ref.c:1006
4239 msgid "field name to sort on"
4242 #: builtin/fsck.c:608
4243 msgid "git fsck [options] [<object>...]"
4246 #: builtin/fsck.c:614
4247 msgid "show unreachable objects"
4250 #: builtin/fsck.c:615
4251 msgid "show dangling objects"
4254 #: builtin/fsck.c:616
4258 #: builtin/fsck.c:617
4259 msgid "report root nodes"
4262 #: builtin/fsck.c:618
4263 msgid "make index objects head nodes"
4266 #: builtin/fsck.c:619
4267 msgid "make reflogs head nodes (default)"
4270 #: builtin/fsck.c:620
4271 msgid "also consider packs and alternate objects"
4274 #: builtin/fsck.c:621
4275 msgid "enable more strict checking"
4278 #: builtin/fsck.c:623
4279 msgid "write dangling objects in .git/lost-found"
4282 #: builtin/fsck.c:624 builtin/prune.c:134
4283 msgid "show progress"
4287 msgid "git gc [options]"
4292 msgid "Invalid %s: '%s'"
4297 msgid "insanely long object directory %.*s"
4301 msgid "prune unreferenced objects"
4305 msgid "be more thorough (increased runtime)"
4309 msgid "enable auto-gc mode"
4315 "Auto packing the repository for optimum performance. You may also\n"
4316 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
4321 "There are too many unreachable loose objects; run 'git prune' to remove them."
4324 #: builtin/grep.c:22
4325 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4328 #: builtin/grep.c:217
4330 msgid "grep: failed to create thread: %s"
4333 #: builtin/grep.c:365
4335 msgid "Failed to chdir: %s"
4338 #: builtin/grep.c:443 builtin/grep.c:478
4340 msgid "unable to read tree (%s)"
4343 #: builtin/grep.c:493
4345 msgid "unable to grep from object of type %s"
4348 #: builtin/grep.c:551
4350 msgid "switch `%c' expects a numerical value"
4353 #: builtin/grep.c:568
4355 msgid "cannot open '%s'"
4358 #: builtin/grep.c:643
4359 msgid "search in index instead of in the work tree"
4362 #: builtin/grep.c:645
4363 msgid "find in contents not managed by git"
4366 #: builtin/grep.c:647
4367 msgid "search in both tracked and untracked files"
4370 #: builtin/grep.c:649
4371 msgid "search also in ignored files"
4374 #: builtin/grep.c:652
4375 msgid "show non-matching lines"
4378 #: builtin/grep.c:654
4379 msgid "case insensitive matching"
4382 #: builtin/grep.c:656
4383 msgid "match patterns only at word boundaries"
4386 #: builtin/grep.c:658
4387 msgid "process binary files as text"
4390 #: builtin/grep.c:660
4391 msgid "don't match patterns in binary files"
4394 #: builtin/grep.c:663
4395 msgid "descend at most <depth> levels"
4398 #: builtin/grep.c:667
4399 msgid "use extended POSIX regular expressions"
4402 #: builtin/grep.c:670
4403 msgid "use basic POSIX regular expressions (default)"
4406 #: builtin/grep.c:673
4407 msgid "interpret patterns as fixed strings"
4410 #: builtin/grep.c:676
4411 msgid "use Perl-compatible regular expressions"
4414 #: builtin/grep.c:679
4415 msgid "show line numbers"
4418 #: builtin/grep.c:680
4419 msgid "don't show filenames"
4422 #: builtin/grep.c:681
4423 msgid "show filenames"
4426 #: builtin/grep.c:683
4427 msgid "show filenames relative to top directory"
4430 #: builtin/grep.c:685
4431 msgid "show only filenames instead of matching lines"
4434 #: builtin/grep.c:687
4435 msgid "synonym for --files-with-matches"
4438 #: builtin/grep.c:690
4439 msgid "show only the names of files without match"
4442 #: builtin/grep.c:692
4443 msgid "print NUL after filenames"
4446 #: builtin/grep.c:694
4447 msgid "show the number of matches instead of matching lines"
4450 #: builtin/grep.c:695
4451 msgid "highlight matches"
4454 #: builtin/grep.c:697
4455 msgid "print empty line between matches from different files"
4458 #: builtin/grep.c:699
4459 msgid "show filename only once above matches from same file"
4462 #: builtin/grep.c:702
4463 msgid "show <n> context lines before and after matches"
4466 #: builtin/grep.c:705
4467 msgid "show <n> context lines before matches"
4470 #: builtin/grep.c:707
4471 msgid "show <n> context lines after matches"
4474 #: builtin/grep.c:708
4475 msgid "shortcut for -C NUM"
4478 #: builtin/grep.c:711
4479 msgid "show a line with the function name before matches"
4482 #: builtin/grep.c:713
4483 msgid "show the surrounding function"
4486 #: builtin/grep.c:716
4487 msgid "read patterns from file"
4490 #: builtin/grep.c:718
4491 msgid "match <pattern>"
4494 #: builtin/grep.c:720
4495 msgid "combine patterns specified with -e"
4498 #: builtin/grep.c:732
4499 msgid "indicate hit with exit status without output"
4502 #: builtin/grep.c:734
4503 msgid "show only matches from files that match all patterns"
4506 #: builtin/grep.c:736
4507 msgid "show parse tree for grep expression"
4510 #: builtin/grep.c:740
4514 #: builtin/grep.c:740
4515 msgid "show matching files in the pager"
4518 #: builtin/grep.c:743
4519 msgid "allow calling of grep(1) (ignored by this build)"
4522 #: builtin/grep.c:744 builtin/show-ref.c:184
4526 #: builtin/grep.c:811
4527 msgid "no pattern given."
4530 #: builtin/grep.c:825
4532 msgid "bad object %s"
4535 #: builtin/grep.c:866
4536 msgid "--open-files-in-pager only works on the worktree"
4539 #: builtin/grep.c:889
4540 msgid "--cached or --untracked cannot be used with --no-index."
4543 #: builtin/grep.c:894
4544 msgid "--no-index or --untracked cannot be used with revs."
4547 #: builtin/grep.c:897
4548 msgid "--[no-]exclude-standard cannot be used for tracked contents."
4551 #: builtin/grep.c:905
4552 msgid "both --cached and trees are given."
4555 #: builtin/hash-object.c:60
4557 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
4561 #: builtin/hash-object.c:61
4562 msgid "git hash-object --stdin-paths < <list-of-paths>"
4565 #: builtin/hash-object.c:72
4569 #: builtin/hash-object.c:72
4573 #: builtin/hash-object.c:73
4574 msgid "write the object into the object database"
4577 #: builtin/hash-object.c:74
4578 msgid "read the object from stdin"
4581 #: builtin/hash-object.c:76
4582 msgid "store file as is without filters"
4585 #: builtin/hash-object.c:77
4586 msgid "process file as it were from this path"
4589 #: builtin/help.c:43
4590 msgid "print all available commands"
4593 #: builtin/help.c:44
4594 msgid "show man page"
4597 #: builtin/help.c:45
4598 msgid "show manual in web browser"
4601 #: builtin/help.c:47
4602 msgid "show info page"
4605 #: builtin/help.c:53
4606 msgid "git help [--all] [--man|--web|--info] [command]"
4609 #: builtin/help.c:65
4611 msgid "unrecognized help format '%s'"
4614 #: builtin/help.c:93
4615 msgid "Failed to start emacsclient."
4618 #: builtin/help.c:106
4619 msgid "Failed to parse emacsclient version."
4622 #: builtin/help.c:114
4624 msgid "emacsclient version '%d' too old (< 22)."
4627 #: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
4629 msgid "failed to exec '%s': %s"
4632 #: builtin/help.c:217
4635 "'%s': path for unsupported man viewer.\n"
4636 "Please consider using 'man.<tool>.cmd' instead."
4639 #: builtin/help.c:229
4642 "'%s': cmd for supported man viewer.\n"
4643 "Please consider using 'man.<tool>.path' instead."
4646 #: builtin/help.c:299
4647 msgid "The most commonly used git commands are:"
4650 #: builtin/help.c:367
4652 msgid "'%s': unknown man viewer."
4655 #: builtin/help.c:384
4656 msgid "no man viewer handled the request"
4659 #: builtin/help.c:392
4660 msgid "no info viewer handled the request"
4663 #: builtin/help.c:447 builtin/help.c:454
4668 #: builtin/help.c:470
4670 msgid "`git %s' is aliased to `%s'"
4673 #: builtin/index-pack.c:170
4675 msgid "object type mismatch at %s"
4678 #: builtin/index-pack.c:190
4679 msgid "object of unexpected type"
4682 #: builtin/index-pack.c:227
4684 msgid "cannot fill %d byte"
4685 msgid_plural "cannot fill %d bytes"
4689 #: builtin/index-pack.c:237
4693 #: builtin/index-pack.c:238
4694 msgid "read error on input"
4697 #: builtin/index-pack.c:250
4698 msgid "used more bytes than were available"
4701 #: builtin/index-pack.c:257
4702 msgid "pack too large for current definition of off_t"
4705 #: builtin/index-pack.c:273
4707 msgid "unable to create '%s'"
4710 #: builtin/index-pack.c:278
4712 msgid "cannot open packfile '%s'"
4715 #: builtin/index-pack.c:292
4716 msgid "pack signature mismatch"
4719 #: builtin/index-pack.c:294
4721 msgid "pack version %<PRIu32> unsupported"
4724 #: builtin/index-pack.c:312
4726 msgid "pack has bad object at offset %lu: %s"
4729 #: builtin/index-pack.c:434
4731 msgid "inflate returned %d"
4734 #: builtin/index-pack.c:483
4735 msgid "offset value overflow for delta base object"
4738 #: builtin/index-pack.c:491
4739 msgid "delta base offset is out of bound"
4742 #: builtin/index-pack.c:499
4744 msgid "unknown object type %d"
4747 #: builtin/index-pack.c:530
4748 msgid "cannot pread pack file"
4751 #: builtin/index-pack.c:532
4753 msgid "premature end of pack file, %lu byte missing"
4754 msgid_plural "premature end of pack file, %lu bytes missing"
4758 #: builtin/index-pack.c:558
4759 msgid "serious inflate inconsistency"
4762 #: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
4763 #: builtin/index-pack.c:712 builtin/index-pack.c:721
4765 msgid "SHA1 COLLISION FOUND WITH %s !"
4768 #: builtin/index-pack.c:652 builtin/pack-objects.c:170
4769 #: builtin/pack-objects.c:262
4771 msgid "unable to read %s"
4774 #: builtin/index-pack.c:718
4776 msgid "cannot read existing object %s"
4779 #: builtin/index-pack.c:732
4781 msgid "invalid blob object %s"
4784 #: builtin/index-pack.c:747
4789 #: builtin/index-pack.c:749
4790 msgid "Error in object"
4793 #: builtin/index-pack.c:751
4795 msgid "Not all child objects of %s are reachable"
4798 #: builtin/index-pack.c:821 builtin/index-pack.c:847
4799 msgid "failed to apply delta"
4802 #: builtin/index-pack.c:986
4803 msgid "Receiving objects"
4806 #: builtin/index-pack.c:986
4807 msgid "Indexing objects"
4810 #: builtin/index-pack.c:1012
4811 msgid "pack is corrupted (SHA1 mismatch)"
4814 #: builtin/index-pack.c:1017
4815 msgid "cannot fstat packfile"
4818 #: builtin/index-pack.c:1020
4819 msgid "pack has junk at the end"
4822 #: builtin/index-pack.c:1031
4823 msgid "confusion beyond insanity in parse_pack_objects()"
4826 #: builtin/index-pack.c:1054
4827 msgid "Resolving deltas"
4830 #: builtin/index-pack.c:1064
4832 msgid "unable to create thread: %s"
4835 #: builtin/index-pack.c:1106
4836 msgid "confusion beyond insanity"
4839 #: builtin/index-pack.c:1112
4841 msgid "completed with %d local objects"
4844 #: builtin/index-pack.c:1121
4846 msgid "Unexpected tail checksum for %s (disk corruption?)"
4849 #: builtin/index-pack.c:1125
4851 msgid "pack has %d unresolved delta"
4852 msgid_plural "pack has %d unresolved deltas"
4856 #: builtin/index-pack.c:1150
4858 msgid "unable to deflate appended object (%d)"
4861 #: builtin/index-pack.c:1229
4863 msgid "local object %s is corrupt"
4866 #: builtin/index-pack.c:1253
4867 msgid "error while closing pack file"
4870 #: builtin/index-pack.c:1266
4872 msgid "cannot write keep file '%s'"
4875 #: builtin/index-pack.c:1274
4877 msgid "cannot close written keep file '%s'"
4880 #: builtin/index-pack.c:1287
4881 msgid "cannot store pack file"
4884 #: builtin/index-pack.c:1298
4885 msgid "cannot store index file"
4888 #: builtin/index-pack.c:1331
4890 msgid "bad pack.indexversion=%<PRIu32>"
4893 #: builtin/index-pack.c:1337
4895 msgid "invalid number of threads specified (%d)"
4898 #: builtin/index-pack.c:1341 builtin/index-pack.c:1514
4900 msgid "no threads support, ignoring %s"
4903 #: builtin/index-pack.c:1399
4905 msgid "Cannot open existing pack file '%s'"
4908 #: builtin/index-pack.c:1401
4910 msgid "Cannot open existing pack idx file for '%s'"
4913 #: builtin/index-pack.c:1448
4915 msgid "non delta: %d object"
4916 msgid_plural "non delta: %d objects"
4920 #: builtin/index-pack.c:1455
4922 msgid "chain length = %d: %lu object"
4923 msgid_plural "chain length = %d: %lu objects"
4927 #: builtin/index-pack.c:1482
4928 msgid "Cannot come back to cwd"
4931 #: builtin/index-pack.c:1526 builtin/index-pack.c:1529
4932 #: builtin/index-pack.c:1541 builtin/index-pack.c:1545
4937 #: builtin/index-pack.c:1559
4938 msgid "--fix-thin cannot be used without --stdin"
4941 #: builtin/index-pack.c:1563 builtin/index-pack.c:1573
4943 msgid "packfile name '%s' does not end with '.pack'"
4946 #: builtin/index-pack.c:1582
4947 msgid "--verify with no packfile name given"
4950 #: builtin/init-db.c:35
4952 msgid "Could not make %s writable by group"
4955 #: builtin/init-db.c:62
4957 msgid "insanely long template name %s"
4960 #: builtin/init-db.c:67
4962 msgid "cannot stat '%s'"
4965 #: builtin/init-db.c:73
4967 msgid "cannot stat template '%s'"
4970 #: builtin/init-db.c:80
4972 msgid "cannot opendir '%s'"
4975 #: builtin/init-db.c:97
4977 msgid "cannot readlink '%s'"
4980 #: builtin/init-db.c:99
4982 msgid "insanely long symlink %s"
4985 #: builtin/init-db.c:102
4987 msgid "cannot symlink '%s' '%s'"
4990 #: builtin/init-db.c:106
4992 msgid "cannot copy '%s' to '%s'"
4995 #: builtin/init-db.c:110
4997 msgid "ignoring template %s"
5000 #: builtin/init-db.c:133
5002 msgid "insanely long template path %s"
5005 #: builtin/init-db.c:141
5007 msgid "templates not found %s"
5010 #: builtin/init-db.c:154
5012 msgid "not copying templates of a wrong format version %d from '%s'"
5015 #: builtin/init-db.c:192
5017 msgid "insane git directory %s"
5020 #: builtin/init-db.c:323 builtin/init-db.c:326
5022 msgid "%s already exists"
5025 #: builtin/init-db.c:355
5027 msgid "unable to handle file type %d"
5030 #: builtin/init-db.c:358
5032 msgid "unable to move %s to %s"
5035 #: builtin/init-db.c:363
5037 msgid "Could not create git link %s"
5041 #. * TRANSLATORS: The first '%s' is either "Reinitialized
5042 #. * existing" or "Initialized empty", the second " shared" or
5043 #. * "", and the last '%s%s' is the verbatim directory name.
5045 #: builtin/init-db.c:420
5047 msgid "%s%s Git repository in %s%s\n"
5050 #: builtin/init-db.c:421
5051 msgid "Reinitialized existing"
5054 #: builtin/init-db.c:421
5055 msgid "Initialized empty"
5058 #: builtin/init-db.c:422
5062 #: builtin/init-db.c:441
5063 msgid "cannot tell cwd"
5066 #: builtin/init-db.c:467
5068 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"
5069 "[=<permissions>]] [directory]"
5072 #: builtin/init-db.c:490
5076 #: builtin/init-db.c:491
5077 msgid "specify that the git repository is to be shared amongst several users"
5080 #: builtin/init-db.c:493 builtin/prune-packed.c:77
5084 #: builtin/init-db.c:522 builtin/init-db.c:529
5086 msgid "cannot mkdir %s"
5089 #: builtin/init-db.c:533
5091 msgid "cannot chdir to %s"
5094 #: builtin/init-db.c:555
5097 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5101 #: builtin/init-db.c:579
5102 msgid "Cannot access current working directory"
5105 #: builtin/init-db.c:586
5107 msgid "Cannot access work tree '%s'"
5111 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
5115 msgid " or: git show [options] <object>..."
5118 #: builtin/log.c:100
5119 msgid "suppress diff output"
5122 #: builtin/log.c:101
5126 #: builtin/log.c:102
5127 msgid "decorate options"
5130 #: builtin/log.c:189
5132 msgid "Final output: %d %s\n"
5135 #: builtin/log.c:405 builtin/log.c:497
5137 msgid "Could not read object %s"
5140 #: builtin/log.c:521
5142 msgid "Unknown type: %d"
5145 #: builtin/log.c:613
5146 msgid "format.headers without value"
5149 #: builtin/log.c:687
5150 msgid "name of output directory is too long"
5153 #: builtin/log.c:698
5155 msgid "Cannot open patch file %s"
5158 #: builtin/log.c:712
5159 msgid "Need exactly one range."
5162 #: builtin/log.c:720
5163 msgid "Not a range."
5166 #: builtin/log.c:794
5167 msgid "Cover letter needs email format"
5170 #: builtin/log.c:867
5172 msgid "insane in-reply-to: %s"
5175 #: builtin/log.c:895
5176 msgid "git format-patch [options] [<since> | <revision range>]"
5179 #: builtin/log.c:940
5180 msgid "Two output directories?"
5183 #: builtin/log.c:1068
5184 msgid "use [PATCH n/m] even with a single patch"
5187 #: builtin/log.c:1071
5188 msgid "use [PATCH] even with multiple patches"
5191 #: builtin/log.c:1075
5192 msgid "print patches to standard out"
5195 #: builtin/log.c:1077
5196 msgid "generate a cover letter"
5199 #: builtin/log.c:1079
5200 msgid "use simple number sequence for output file names"
5203 #: builtin/log.c:1080
5207 #: builtin/log.c:1081
5208 msgid "use <sfx> instead of '.patch'"
5211 #: builtin/log.c:1083
5212 msgid "start numbering patches at <n> instead of 1"
5215 #: builtin/log.c:1085
5216 msgid "Use [<prefix>] instead of [PATCH]"
5219 #: builtin/log.c:1088
5220 msgid "store resulting files in <dir>"
5223 #: builtin/log.c:1091
5224 msgid "don't strip/add [PATCH]"
5227 #: builtin/log.c:1094
5228 msgid "don't output binary diffs"
5231 #: builtin/log.c:1096
5232 msgid "don't include a patch matching a commit upstream"
5235 #: builtin/log.c:1098
5236 msgid "show patch format instead of default (patch + stat)"
5239 #: builtin/log.c:1100
5243 #: builtin/log.c:1101
5247 #: builtin/log.c:1102
5248 msgid "add email header"
5251 #: builtin/log.c:1103 builtin/log.c:1105
5255 #: builtin/log.c:1103
5256 msgid "add To: header"
5259 #: builtin/log.c:1105
5260 msgid "add Cc: header"
5263 #: builtin/log.c:1107
5267 #: builtin/log.c:1108
5268 msgid "make first mail a reply to <message-id>"
5271 #: builtin/log.c:1109 builtin/log.c:1112
5275 #: builtin/log.c:1110
5276 msgid "attach the patch"
5279 #: builtin/log.c:1113
5280 msgid "inline the patch"
5283 #: builtin/log.c:1117
5284 msgid "enable message threading, styles: shallow, deep"
5287 #: builtin/log.c:1119
5291 #: builtin/log.c:1120
5292 msgid "add a signature"
5295 #: builtin/log.c:1122
5296 msgid "don't print the patch filenames"
5299 #: builtin/log.c:1163
5301 msgid "bogus committer info %s"
5304 #: builtin/log.c:1208
5305 msgid "-n and -k are mutually exclusive."
5308 #: builtin/log.c:1210
5309 msgid "--subject-prefix and -k are mutually exclusive."
5312 #: builtin/log.c:1218
5313 msgid "--name-only does not make sense"
5316 #: builtin/log.c:1220
5317 msgid "--name-status does not make sense"
5320 #: builtin/log.c:1222
5321 msgid "--check does not make sense"
5324 #: builtin/log.c:1245
5325 msgid "standard output, or directory, which one?"
5328 #: builtin/log.c:1247
5330 msgid "Could not create directory '%s'"
5333 #: builtin/log.c:1400
5334 msgid "Failed to create output files"
5337 #: builtin/log.c:1449
5338 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5341 #: builtin/log.c:1504
5344 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
5347 #: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
5349 msgid "Unknown commit %s"
5352 #: builtin/ls-files.c:408
5353 msgid "git ls-files [options] [<file>...]"
5356 #: builtin/ls-files.c:463
5357 msgid "identify the file status with tags"
5360 #: builtin/ls-files.c:465
5361 msgid "use lowercase letters for 'assume unchanged' files"
5364 #: builtin/ls-files.c:467
5365 msgid "show cached files in the output (default)"
5368 #: builtin/ls-files.c:469
5369 msgid "show deleted files in the output"
5372 #: builtin/ls-files.c:471
5373 msgid "show modified files in the output"
5376 #: builtin/ls-files.c:473
5377 msgid "show other files in the output"
5380 #: builtin/ls-files.c:475
5381 msgid "show ignored files in the output"
5384 #: builtin/ls-files.c:478
5385 msgid "show staged contents' object name in the output"
5388 #: builtin/ls-files.c:480
5389 msgid "show files on the filesystem that need to be removed"
5392 #: builtin/ls-files.c:482
5393 msgid "show 'other' directories' name only"
5396 #: builtin/ls-files.c:485
5397 msgid "don't show empty directories"
5400 #: builtin/ls-files.c:488
5401 msgid "show unmerged files in the output"
5404 #: builtin/ls-files.c:490
5405 msgid "show resolve-undo information"
5408 #: builtin/ls-files.c:492
5409 msgid "skip files matching pattern"
5412 #: builtin/ls-files.c:495
5413 msgid "exclude patterns are read from <file>"
5416 #: builtin/ls-files.c:498
5417 msgid "read additional per-directory exclude patterns in <file>"
5420 #: builtin/ls-files.c:500
5421 msgid "add the standard git exclusions"
5424 #: builtin/ls-files.c:503
5425 msgid "make the output relative to the project top directory"
5428 #: builtin/ls-files.c:506
5429 msgid "if any <file> is not in the index, treat this as an error"
5432 #: builtin/ls-files.c:507
5436 #: builtin/ls-files.c:508
5437 msgid "pretend that paths removed since <tree-ish> are still present"
5440 #: builtin/ls-files.c:510
5441 msgid "show debugging data"
5444 #: builtin/ls-tree.c:27
5445 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
5448 #: builtin/ls-tree.c:125
5449 msgid "only show trees"
5452 #: builtin/ls-tree.c:127
5453 msgid "recurse into subtrees"
5456 #: builtin/ls-tree.c:129
5457 msgid "show trees when recursing"
5460 #: builtin/ls-tree.c:132
5461 msgid "terminate entries with NUL byte"
5464 #: builtin/ls-tree.c:133
5465 msgid "include object size"
5468 #: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5469 msgid "list only filenames"
5472 #: builtin/ls-tree.c:140
5473 msgid "use full path names"
5476 #: builtin/ls-tree.c:142
5477 msgid "list entire tree; not just current directory (implies --full-name)"
5480 #: builtin/merge.c:43
5481 msgid "git merge [options] [<commit>...]"
5484 #: builtin/merge.c:44
5485 msgid "git merge [options] <msg> HEAD <commit>"
5488 #: builtin/merge.c:45
5489 msgid "git merge --abort"
5492 #: builtin/merge.c:90
5493 msgid "switch `m' requires a value"
5496 #: builtin/merge.c:127
5498 msgid "Could not find merge strategy '%s'.\n"
5501 #: builtin/merge.c:128
5503 msgid "Available strategies are:"
5506 #: builtin/merge.c:133
5508 msgid "Available custom strategies are:"
5511 #: builtin/merge.c:183
5512 msgid "do not show a diffstat at the end of the merge"
5515 #: builtin/merge.c:186
5516 msgid "show a diffstat at the end of the merge"
5519 #: builtin/merge.c:187
5520 msgid "(synonym to --stat)"
5523 #: builtin/merge.c:189
5524 msgid "add (at most <n>) entries from shortlog to merge commit message"
5527 #: builtin/merge.c:192
5528 msgid "create a single commit instead of doing a merge"
5531 #: builtin/merge.c:194
5532 msgid "perform a commit if the merge succeeds (default)"
5535 #: builtin/merge.c:196
5536 msgid "edit message before committing"
5539 #: builtin/merge.c:198
5540 msgid "allow fast-forward (default)"
5543 #: builtin/merge.c:200
5544 msgid "abort if fast-forward is not possible"
5547 #: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112
5551 #: builtin/merge.c:203
5552 msgid "merge strategy to use"
5555 #: builtin/merge.c:204
5556 msgid "option=value"
5559 #: builtin/merge.c:205
5560 msgid "option for selected merge strategy"
5563 #: builtin/merge.c:207
5564 msgid "merge commit message (for a non-fast-forward merge)"
5567 #: builtin/merge.c:211
5568 msgid "abort the current in-progress merge"
5571 #: builtin/merge.c:240
5572 msgid "could not run stash."
5575 #: builtin/merge.c:245
5576 msgid "stash failed"
5579 #: builtin/merge.c:250
5581 msgid "not a valid object: %s"
5584 #: builtin/merge.c:269 builtin/merge.c:286
5585 msgid "read-tree failed"
5588 #: builtin/merge.c:316
5589 msgid " (nothing to squash)"
5592 #: builtin/merge.c:329
5594 msgid "Squash commit -- not updating HEAD\n"
5597 #: builtin/merge.c:361
5598 msgid "Writing SQUASH_MSG"
5601 #: builtin/merge.c:363
5602 msgid "Finishing SQUASH_MSG"
5605 #: builtin/merge.c:386
5607 msgid "No merge message -- not updating HEAD\n"
5610 #: builtin/merge.c:436
5612 msgid "'%s' does not point to a commit"
5615 #: builtin/merge.c:535
5617 msgid "Bad branch.%s.mergeoptions string: %s"
5620 #: builtin/merge.c:628
5621 msgid "git write-tree failed to write a tree"
5624 #: builtin/merge.c:656
5625 msgid "Not handling anything other than two heads merge."
5628 #: builtin/merge.c:670
5630 msgid "Unknown option for merge-recursive: -X%s"
5633 #: builtin/merge.c:684
5635 msgid "unable to write %s"
5638 #: builtin/merge.c:773
5640 msgid "Could not read from '%s'"
5643 #: builtin/merge.c:782
5645 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
5648 #: builtin/merge.c:788
5650 "Please enter a commit message to explain why this merge is necessary,\n"
5651 "especially if it merges an updated upstream into a topic branch.\n"
5653 "Lines starting with '#' will be ignored, and an empty message aborts\n"
5657 #: builtin/merge.c:812
5658 msgid "Empty commit message."
5661 #: builtin/merge.c:824
5663 msgid "Wonderful.\n"
5666 #: builtin/merge.c:889
5668 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
5671 #: builtin/merge.c:905
5673 msgid "'%s' is not a commit"
5676 #: builtin/merge.c:946
5677 msgid "No current branch."
5680 #: builtin/merge.c:948
5681 msgid "No remote for the current branch."
5684 #: builtin/merge.c:950
5685 msgid "No default upstream defined for the current branch."
5688 #: builtin/merge.c:955
5690 msgid "No remote tracking branch for %s from %s"
5693 #: builtin/merge.c:1042 builtin/merge.c:1199
5695 msgid "%s - not something we can merge"
5698 #: builtin/merge.c:1110
5699 msgid "There is no merge to abort (MERGE_HEAD missing)."
5702 #: builtin/merge.c:1126 git-pull.sh:31
5704 "You have not concluded your merge (MERGE_HEAD exists).\n"
5705 "Please, commit your changes before you can merge."
5708 #: builtin/merge.c:1129 git-pull.sh:34
5709 msgid "You have not concluded your merge (MERGE_HEAD exists)."
5712 #: builtin/merge.c:1133
5714 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
5715 "Please, commit your changes before you can merge."
5718 #: builtin/merge.c:1136
5719 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
5722 #: builtin/merge.c:1145
5723 msgid "You cannot combine --squash with --no-ff."
5726 #: builtin/merge.c:1150
5727 msgid "You cannot combine --no-ff with --ff-only."
5730 #: builtin/merge.c:1157
5731 msgid "No commit specified and merge.defaultToUpstream not set."
5734 #: builtin/merge.c:1189
5735 msgid "Can merge only exactly one commit into empty head"
5738 #: builtin/merge.c:1192
5739 msgid "Squash commit into empty head not supported yet"
5742 #: builtin/merge.c:1194
5743 msgid "Non-fast-forward commit does not make sense into an empty head"
5746 #: builtin/merge.c:1309
5748 msgid "Updating %s..%s\n"
5751 #: builtin/merge.c:1348
5753 msgid "Trying really trivial in-index merge...\n"
5756 #: builtin/merge.c:1355
5761 #: builtin/merge.c:1387
5762 msgid "Not possible to fast-forward, aborting."
5765 #: builtin/merge.c:1410 builtin/merge.c:1489
5767 msgid "Rewinding the tree to pristine...\n"
5770 #: builtin/merge.c:1414
5772 msgid "Trying merge strategy %s...\n"
5775 #: builtin/merge.c:1480
5777 msgid "No merge strategy handled the merge.\n"
5780 #: builtin/merge.c:1482
5782 msgid "Merge with strategy %s failed.\n"
5785 #: builtin/merge.c:1491
5787 msgid "Using the %s to prepare resolving by hand.\n"
5790 #: builtin/merge.c:1503
5792 msgid "Automatic merge went well; stopped before committing as requested\n"
5795 #: builtin/merge-base.c:26
5796 msgid "git merge-base [-a|--all] <commit> <commit>..."
5799 #: builtin/merge-base.c:27
5800 msgid "git merge-base [-a|--all] --octopus <commit>..."
5803 #: builtin/merge-base.c:28
5804 msgid "git merge-base --independent <commit>..."
5807 #: builtin/merge-base.c:29
5808 msgid "git merge-base --is-ancestor <commit> <commit>"
5811 #: builtin/merge-base.c:98
5812 msgid "output all common ancestors"
5815 #: builtin/merge-base.c:99
5816 msgid "find ancestors for a single n-way merge"
5819 #: builtin/merge-base.c:100
5820 msgid "list revs not reachable from others"
5823 #: builtin/merge-base.c:102
5824 msgid "is the first one ancestor of the other?"
5827 #: builtin/merge-file.c:8
5829 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
5833 #: builtin/merge-file.c:33
5834 msgid "send results to standard output"
5837 #: builtin/merge-file.c:34
5838 msgid "use a diff3 based merge"
5841 #: builtin/merge-file.c:35
5842 msgid "for conflicts, use our version"
5845 #: builtin/merge-file.c:37
5846 msgid "for conflicts, use their version"
5849 #: builtin/merge-file.c:39
5850 msgid "for conflicts, use a union version"
5853 #: builtin/merge-file.c:42
5854 msgid "for conflicts, use this marker size"
5857 #: builtin/merge-file.c:43
5858 msgid "do not warn about conflicts"
5861 #: builtin/merge-file.c:45
5862 msgid "set labels for file1/orig_file/file2"
5865 #: builtin/mktree.c:67
5866 msgid "git mktree [-z] [--missing] [--batch]"
5869 #: builtin/mktree.c:153
5870 msgid "input is NUL terminated"
5873 #: builtin/mktree.c:154 builtin/write-tree.c:24
5874 msgid "allow missing objects"
5877 #: builtin/mktree.c:155
5878 msgid "allow creation of more than one tree"
5882 msgid "git mv [options] <source>... <destination>"
5886 msgid "force move/rename even if target exists"
5890 msgid "skip move/rename errors"
5895 msgid "Checking rename of '%s' to '%s'\n"
5903 msgid "can not move directory into itself"
5907 msgid "cannot move directory over file"
5912 msgid "Huh? %.*s is in index?"
5916 msgid "source directory is empty"
5920 msgid "not under version control"
5924 msgid "destination exists"
5929 msgid "overwriting '%s'"
5933 msgid "Cannot overwrite"
5937 msgid "multiple sources for the same target"
5942 msgid "%s, source=%s, destination=%s"
5947 msgid "Renaming %s to %s\n"
5950 #: builtin/mv.c:215 builtin/remote.c:731
5952 msgid "renaming '%s' failed"
5955 #: builtin/name-rev.c:175
5956 msgid "git name-rev [options] <commit>..."
5959 #: builtin/name-rev.c:176
5960 msgid "git name-rev [options] --all"
5963 #: builtin/name-rev.c:177
5964 msgid "git name-rev [options] --stdin"
5967 #: builtin/name-rev.c:229
5968 msgid "print only names (no SHA-1)"
5971 #: builtin/name-rev.c:230
5972 msgid "only use tags to name the commits"
5975 #: builtin/name-rev.c:232
5976 msgid "only use refs matching <pattern>"
5979 #: builtin/name-rev.c:234
5980 msgid "list all commits reachable from all refs"
5983 #: builtin/name-rev.c:235
5984 msgid "read from stdin"
5987 #: builtin/name-rev.c:236
5988 msgid "allow to print `undefined` names"
5991 #: builtin/notes.c:26
5992 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
5995 #: builtin/notes.c:27
5997 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
5998 "<object>] [<object>]"
6001 #: builtin/notes.c:28
6002 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6005 #: builtin/notes.c:29
6007 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6008 "<object>] [<object>]"
6011 #: builtin/notes.c:30
6012 msgid "git notes [--ref <notes_ref>] edit [<object>]"
6015 #: builtin/notes.c:31
6016 msgid "git notes [--ref <notes_ref>] show [<object>]"
6019 #: builtin/notes.c:32
6021 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6024 #: builtin/notes.c:33
6025 msgid "git notes merge --commit [-v | -q]"
6028 #: builtin/notes.c:34
6029 msgid "git notes merge --abort [-v | -q]"
6032 #: builtin/notes.c:35
6033 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6036 #: builtin/notes.c:36
6037 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6040 #: builtin/notes.c:37
6041 msgid "git notes [--ref <notes_ref>] get-ref"
6044 #: builtin/notes.c:42
6045 msgid "git notes [list [<object>]]"
6048 #: builtin/notes.c:47
6049 msgid "git notes add [<options>] [<object>]"
6052 #: builtin/notes.c:52
6053 msgid "git notes copy [<options>] <from-object> <to-object>"
6056 #: builtin/notes.c:53
6057 msgid "git notes copy --stdin [<from-object> <to-object>]..."
6060 #: builtin/notes.c:58
6061 msgid "git notes append [<options>] [<object>]"
6064 #: builtin/notes.c:63
6065 msgid "git notes edit [<object>]"
6068 #: builtin/notes.c:68
6069 msgid "git notes show [<object>]"
6072 #: builtin/notes.c:73
6073 msgid "git notes merge [<options>] <notes_ref>"
6076 #: builtin/notes.c:74
6077 msgid "git notes merge --commit [<options>]"
6080 #: builtin/notes.c:75
6081 msgid "git notes merge --abort [<options>]"
6084 #: builtin/notes.c:80
6085 msgid "git notes remove [<object>]"
6088 #: builtin/notes.c:85
6089 msgid "git notes prune [<options>]"
6092 #: builtin/notes.c:90
6093 msgid "git notes get-ref"
6096 #: builtin/notes.c:142
6098 msgid "unable to start 'show' for object '%s'"
6101 #: builtin/notes.c:148
6102 msgid "can't fdopen 'show' output fd"
6105 #: builtin/notes.c:158
6107 msgid "failed to close pipe to 'show' for object '%s'"
6110 #: builtin/notes.c:161
6112 msgid "failed to finish 'show' for object '%s'"
6115 #: builtin/notes.c:178 builtin/tag.c:347
6117 msgid "could not create file '%s'"
6120 #: builtin/notes.c:192
6121 msgid "Please supply the note contents using either -m or -F option"
6124 #: builtin/notes.c:213 builtin/notes.c:976
6126 msgid "Removing note for object %s\n"
6129 #: builtin/notes.c:218
6130 msgid "unable to write note object"
6133 #: builtin/notes.c:220
6135 msgid "The note contents has been left in %s"
6138 #: builtin/notes.c:254 builtin/tag.c:542
6140 msgid "cannot read '%s'"
6143 #: builtin/notes.c:256 builtin/tag.c:545
6145 msgid "could not open or read '%s'"
6148 #: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450
6149 #: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647
6150 #: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769
6151 #: builtin/notes.c:971 builtin/reset.c:293 builtin/tag.c:558
6153 msgid "Failed to resolve '%s' as a valid ref."
6156 #: builtin/notes.c:278
6158 msgid "Failed to read object '%s'."
6161 #: builtin/notes.c:302
6162 msgid "Cannot commit uninitialized/unreferenced notes tree"
6165 #: builtin/notes.c:343
6167 msgid "Bad notes.rewriteMode value: '%s'"
6170 #: builtin/notes.c:353
6172 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6175 #. TRANSLATORS: The first %s is the name of the
6176 #. environment variable, the second %s is its value
6177 #: builtin/notes.c:380
6179 msgid "Bad %s value: '%s'"
6182 #: builtin/notes.c:444
6184 msgid "Malformed input line: '%s'."
6187 #: builtin/notes.c:459
6189 msgid "Failed to copy notes from '%s' to '%s'"
6192 #: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630
6193 #: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762
6194 #: builtin/notes.c:1036
6195 msgid "too many parameters"
6198 #: builtin/notes.c:516 builtin/notes.c:775
6200 msgid "No note found for object %s."
6203 #: builtin/notes.c:538 builtin/notes.c:695
6204 msgid "note contents as a string"
6207 #: builtin/notes.c:541 builtin/notes.c:698
6208 msgid "note contents in a file"
6211 #: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700
6212 #: builtin/notes.c:703 builtin/tag.c:476
6216 #: builtin/notes.c:544 builtin/notes.c:701
6217 msgid "reuse and edit specified note object"
6220 #: builtin/notes.c:547 builtin/notes.c:704
6221 msgid "reuse specified note object"
6224 #: builtin/notes.c:549 builtin/notes.c:617
6225 msgid "replace existing notes"
6228 #: builtin/notes.c:583
6231 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6235 #: builtin/notes.c:588 builtin/notes.c:665
6237 msgid "Overwriting existing notes for object %s\n"
6240 #: builtin/notes.c:618
6241 msgid "read objects from stdin"
6244 #: builtin/notes.c:620
6245 msgid "load rewriting config for <command> (implies --stdin)"
6248 #: builtin/notes.c:638
6249 msgid "too few parameters"
6252 #: builtin/notes.c:659
6255 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6259 #: builtin/notes.c:671
6261 msgid "Missing notes on source object %s. Cannot copy."
6264 #: builtin/notes.c:720
6267 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6268 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6271 #: builtin/notes.c:867
6272 msgid "General options"
6275 #: builtin/notes.c:869
6276 msgid "Merge options"
6279 #: builtin/notes.c:871
6281 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6285 #: builtin/notes.c:873
6286 msgid "Committing unmerged notes"
6289 #: builtin/notes.c:875
6290 msgid "finalize notes merge by committing unmerged notes"
6293 #: builtin/notes.c:877
6294 msgid "Aborting notes merge resolution"
6297 #: builtin/notes.c:879
6298 msgid "abort notes merge"
6301 #: builtin/notes.c:974
6303 msgid "Object %s has no note\n"
6306 #: builtin/notes.c:986
6307 msgid "attempt to remove non-existent note is not an error"
6310 #: builtin/notes.c:989
6311 msgid "read object names from the standard input"
6314 #: builtin/notes.c:1070
6318 #: builtin/notes.c:1071
6319 msgid "use notes from <notes_ref>"
6322 #: builtin/notes.c:1106 builtin/remote.c:1598
6324 msgid "Unknown subcommand: %s"
6327 #: builtin/pack-objects.c:23
6328 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
6331 #: builtin/pack-objects.c:24
6332 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
6335 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6337 msgid "deflate error (%d)"
6340 #: builtin/pack-objects.c:2397
6342 msgid "unsupported index version %s"
6345 #: builtin/pack-objects.c:2401
6347 msgid "bad index version '%s'"
6350 #: builtin/pack-objects.c:2424
6352 msgid "option %s does not accept negative form"
6355 #: builtin/pack-objects.c:2428
6357 msgid "unable to parse value '%s' for option %s"
6360 #: builtin/pack-objects.c:2447
6361 msgid "do not show progress meter"
6364 #: builtin/pack-objects.c:2449
6365 msgid "show progress meter"
6368 #: builtin/pack-objects.c:2451
6369 msgid "show progress meter during object writing phase"
6372 #: builtin/pack-objects.c:2454
6373 msgid "similar to --all-progress when progress meter is shown"
6376 #: builtin/pack-objects.c:2455
6377 msgid "version[,offset]"
6380 #: builtin/pack-objects.c:2456
6381 msgid "write the pack index file in the specified idx format version"
6384 #: builtin/pack-objects.c:2459
6385 msgid "maximum size of each output pack file"
6388 #: builtin/pack-objects.c:2461
6389 msgid "ignore borrowed objects from alternate object store"
6392 #: builtin/pack-objects.c:2463
6393 msgid "ignore packed objects"
6396 #: builtin/pack-objects.c:2465
6397 msgid "limit pack window by objects"
6400 #: builtin/pack-objects.c:2467
6401 msgid "limit pack window by memory in addition to object limit"
6404 #: builtin/pack-objects.c:2469
6405 msgid "maximum length of delta chain allowed in the resulting pack"
6408 #: builtin/pack-objects.c:2471
6409 msgid "reuse existing deltas"
6412 #: builtin/pack-objects.c:2473
6413 msgid "reuse existing objects"
6416 #: builtin/pack-objects.c:2475
6417 msgid "use OFS_DELTA objects"
6420 #: builtin/pack-objects.c:2477
6421 msgid "use threads when searching for best delta matches"
6424 #: builtin/pack-objects.c:2479
6425 msgid "do not create an empty pack output"
6428 #: builtin/pack-objects.c:2481
6429 msgid "read revision arguments from standard input"
6432 #: builtin/pack-objects.c:2483
6433 msgid "limit the objects to those that are not yet packed"
6436 #: builtin/pack-objects.c:2486
6437 msgid "include objects reachable from any reference"
6440 #: builtin/pack-objects.c:2489
6441 msgid "include objects referred by reflog entries"
6444 #: builtin/pack-objects.c:2492
6445 msgid "output pack to stdout"
6448 #: builtin/pack-objects.c:2494
6449 msgid "include tag objects that refer to objects to be packed"
6452 #: builtin/pack-objects.c:2496
6453 msgid "keep unreachable objects"
6456 #: builtin/pack-objects.c:2497 parse-options.h:141
6460 #: builtin/pack-objects.c:2498
6461 msgid "unpack unreachable objects newer than <time>"
6464 #: builtin/pack-objects.c:2501
6465 msgid "create thin packs"
6468 #: builtin/pack-objects.c:2503
6469 msgid "ignore packs that have companion .keep file"
6472 #: builtin/pack-objects.c:2505
6473 msgid "pack compression level"
6476 #: builtin/pack-objects.c:2507
6477 msgid "do not hide commits by grafts"
6480 #: builtin/pack-refs.c:6
6481 msgid "git pack-refs [options]"
6484 #: builtin/pack-refs.c:14
6485 msgid "pack everything"
6488 #: builtin/pack-refs.c:15
6489 msgid "prune loose refs (default)"
6492 #: builtin/prune-packed.c:7
6493 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
6496 #: builtin/prune.c:12
6497 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
6500 #: builtin/prune.c:132
6501 msgid "do not remove, show only"
6504 #: builtin/prune.c:133
6505 msgid "report pruned objects"
6508 #: builtin/prune.c:136
6509 msgid "expire objects older than <time>"
6512 #: builtin/push.c:14
6513 msgid "git push [<options>] [<repository> [<refspec>...]]"
6516 #: builtin/push.c:45
6517 msgid "tag shorthand without <tag>"
6520 #: builtin/push.c:64
6521 msgid "--delete only accepts plain target ref names"
6524 #: builtin/push.c:99
6527 "To choose either option permanently, see push.default in 'git help config'."
6530 #: builtin/push.c:102
6533 "The upstream branch of your current branch does not match\n"
6534 "the name of your current branch. To push to the upstream branch\n"
6535 "on the remote, use\n"
6537 " git push %s HEAD:%s\n"
6539 "To push to the branch of the same name on the remote, use\n"
6545 #: builtin/push.c:121
6548 "You are not currently on a branch.\n"
6549 "To push the history leading to the current (detached HEAD)\n"
6552 " git push %s HEAD:<name-of-remote-branch>\n"
6555 #: builtin/push.c:128
6558 "The current branch %s has no upstream branch.\n"
6559 "To push the current branch and set the remote as upstream, use\n"
6561 " git push --set-upstream %s %s\n"
6564 #: builtin/push.c:136
6566 msgid "The current branch %s has multiple upstream branches, refusing to push."
6569 #: builtin/push.c:139
6572 "You are pushing to remote '%s', which is not the upstream of\n"
6573 "your current branch '%s', without telling me what to push\n"
6574 "to update which remote branch."
6577 #: builtin/push.c:151
6579 "push.default is unset; its implicit value is changing in\n"
6580 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6581 "and maintain the current behavior after the default changes, use:\n"
6583 " git config --global push.default matching\n"
6585 "To squelch this message and adopt the new behavior now, use:\n"
6587 " git config --global push.default simple\n"
6589 "See 'git help config' and search for 'push.default' for further "
6591 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
6592 "'current' instead of 'simple' if you sometimes use older versions of Git)"
6595 #: builtin/push.c:199
6597 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
6600 #: builtin/push.c:206
6602 "Updates were rejected because the tip of your current branch is behind\n"
6603 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
6604 "before pushing again.\n"
6605 "See the 'Note about fast-forwards' in 'git push --help' for details."
6608 #: builtin/push.c:212
6610 "Updates were rejected because a pushed branch tip is behind its remote\n"
6611 "counterpart. If you did not intend to push that branch, you may want to\n"
6612 "specify branches to push or set the 'push.default' configuration variable\n"
6613 "to 'simple', 'current' or 'upstream' to push only the current branch."
6616 #: builtin/push.c:218
6618 "Updates were rejected because a pushed branch tip is behind its remote\n"
6619 "counterpart. Check out this branch and merge the remote changes\n"
6620 "(e.g. 'git pull') before pushing again.\n"
6621 "See the 'Note about fast-forwards' in 'git push --help' for details."
6624 #: builtin/push.c:258
6626 msgid "Pushing to %s\n"
6629 #: builtin/push.c:262
6631 msgid "failed to push some refs to '%s'"
6634 #: builtin/push.c:294
6636 msgid "bad repository '%s'"
6639 #: builtin/push.c:295
6641 "No configured push destination.\n"
6642 "Either specify the URL from the command-line or configure a remote "
6643 "repository using\n"
6645 " git remote add <name> <url>\n"
6647 "and then push using the remote name\n"
6649 " git push <name>\n"
6652 #: builtin/push.c:310
6653 msgid "--all and --tags are incompatible"
6656 #: builtin/push.c:311
6657 msgid "--all can't be combined with refspecs"
6660 #: builtin/push.c:316
6661 msgid "--mirror and --tags are incompatible"
6664 #: builtin/push.c:317
6665 msgid "--mirror can't be combined with refspecs"
6668 #: builtin/push.c:322
6669 msgid "--all and --mirror are incompatible"
6672 #: builtin/push.c:382
6676 #: builtin/push.c:383
6677 msgid "push all refs"
6680 #: builtin/push.c:384
6681 msgid "mirror all refs"
6684 #: builtin/push.c:386
6688 #: builtin/push.c:387
6689 msgid "push tags (can't be used with --all or --mirror)"
6692 #: builtin/push.c:390
6693 msgid "force updates"
6696 #: builtin/push.c:391
6700 #: builtin/push.c:392
6701 msgid "control recursive pushing of submodules"
6704 #: builtin/push.c:394
6705 msgid "use thin pack"
6708 #: builtin/push.c:395 builtin/push.c:396
6709 msgid "receive pack program"
6712 #: builtin/push.c:397
6713 msgid "set upstream for git pull/status"
6716 #: builtin/push.c:400
6717 msgid "prune locally removed refs"
6720 #: builtin/push.c:410
6721 msgid "--delete is incompatible with --all, --mirror and --tags"
6724 #: builtin/push.c:412
6725 msgid "--delete doesn't make sense without any refs"
6728 #: builtin/read-tree.c:36
6730 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
6731 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
6732 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
6735 #: builtin/read-tree.c:108
6736 msgid "write resulting index to <file>"
6739 #: builtin/read-tree.c:111
6740 msgid "only empty the index"
6743 #: builtin/read-tree.c:113
6747 #: builtin/read-tree.c:115
6748 msgid "perform a merge in addition to a read"
6751 #: builtin/read-tree.c:117
6752 msgid "3-way merge if no file level merging required"
6755 #: builtin/read-tree.c:119
6756 msgid "3-way merge in presence of adds and removes"
6759 #: builtin/read-tree.c:121
6760 msgid "same as -m, but discard unmerged entries"
6763 #: builtin/read-tree.c:122
6764 msgid "<subdirectory>/"
6767 #: builtin/read-tree.c:123
6768 msgid "read the tree into the index under <subdirectory>/"
6771 #: builtin/read-tree.c:126
6772 msgid "update working tree with merge result"
6775 #: builtin/read-tree.c:128
6779 #: builtin/read-tree.c:129
6780 msgid "allow explicitly ignored files to be overwritten"
6783 #: builtin/read-tree.c:132
6784 msgid "don't check the working tree after merging"
6787 #: builtin/read-tree.c:133
6788 msgid "don't update the index or the work tree"
6791 #: builtin/read-tree.c:135
6792 msgid "skip applying sparse checkout filter"
6795 #: builtin/read-tree.c:137
6796 msgid "debug unpack-trees"
6799 #: builtin/remote.c:11
6800 msgid "git remote [-v | --verbose]"
6803 #: builtin/remote.c:12
6805 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
6806 "mirror=<fetch|push>] <name> <url>"
6809 #: builtin/remote.c:13 builtin/remote.c:32
6810 msgid "git remote rename <old> <new>"
6813 #: builtin/remote.c:14 builtin/remote.c:37
6814 msgid "git remote remove <name>"
6817 #: builtin/remote.c:15
6818 msgid "git remote set-head <name> (-a | -d | <branch>)"
6821 #: builtin/remote.c:16
6822 msgid "git remote [-v | --verbose] show [-n] <name>"
6825 #: builtin/remote.c:17
6826 msgid "git remote prune [-n | --dry-run] <name>"
6829 #: builtin/remote.c:18
6831 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
6834 #: builtin/remote.c:19
6835 msgid "git remote set-branches [--add] <name> <branch>..."
6838 #: builtin/remote.c:20 builtin/remote.c:68
6839 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
6842 #: builtin/remote.c:21 builtin/remote.c:69
6843 msgid "git remote set-url --add <name> <newurl>"
6846 #: builtin/remote.c:22 builtin/remote.c:70
6847 msgid "git remote set-url --delete <name> <url>"
6850 #: builtin/remote.c:27
6851 msgid "git remote add [<options>] <name> <url>"
6854 #: builtin/remote.c:42
6855 msgid "git remote set-head <name> (-a | -d | <branch>])"
6858 #: builtin/remote.c:47
6859 msgid "git remote set-branches <name> <branch>..."
6862 #: builtin/remote.c:48
6863 msgid "git remote set-branches --add <name> <branch>..."
6866 #: builtin/remote.c:53
6867 msgid "git remote show [<options>] <name>"
6870 #: builtin/remote.c:58
6871 msgid "git remote prune [<options>] <name>"
6874 #: builtin/remote.c:63
6875 msgid "git remote update [<options>] [<group> | <remote>]..."
6878 #: builtin/remote.c:98
6883 #: builtin/remote.c:130
6885 "--mirror is dangerous and deprecated; please\n"
6886 "\t use --mirror=fetch or --mirror=push instead"
6889 #: builtin/remote.c:147
6891 msgid "unknown mirror argument: %s"
6894 #: builtin/remote.c:163
6895 msgid "fetch the remote branches"
6898 #: builtin/remote.c:165
6899 msgid "import all tags and associated objects when fetching"
6902 #: builtin/remote.c:168
6903 msgid "or do not fetch any tag at all (--no-tags)"
6906 #: builtin/remote.c:170
6907 msgid "branch(es) to track"
6910 #: builtin/remote.c:171
6911 msgid "master branch"
6914 #: builtin/remote.c:172
6918 #: builtin/remote.c:173
6919 msgid "set up remote as a mirror to push to or fetch from"
6922 #: builtin/remote.c:185
6923 msgid "specifying a master branch makes no sense with --mirror"
6926 #: builtin/remote.c:187
6927 msgid "specifying branches to track makes sense only with fetch mirrors"
6930 #: builtin/remote.c:195 builtin/remote.c:646
6932 msgid "remote %s already exists."
6935 #: builtin/remote.c:199 builtin/remote.c:650
6937 msgid "'%s' is not a valid remote name"
6940 #: builtin/remote.c:243
6942 msgid "Could not setup master '%s'"
6945 #: builtin/remote.c:299
6947 msgid "more than one %s"
6950 #: builtin/remote.c:339
6952 msgid "Could not get fetch map for refspec %s"
6955 #: builtin/remote.c:440 builtin/remote.c:448
6959 #: builtin/remote.c:452
6963 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
6965 msgid "Could not append '%s' to '%s'"
6968 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
6970 msgid "No such remote: %s"
6973 #: builtin/remote.c:656
6975 msgid "Could not rename config section '%s' to '%s'"
6978 #: builtin/remote.c:662 builtin/remote.c:799
6980 msgid "Could not remove config section '%s'"
6983 #: builtin/remote.c:677
6986 "Not updating non-default fetch refspec\n"
6988 "\tPlease update the configuration manually if necessary."
6991 #: builtin/remote.c:683
6993 msgid "Could not append '%s'"
6996 #: builtin/remote.c:694
6998 msgid "Could not set '%s'"
7001 #: builtin/remote.c:716
7003 msgid "deleting '%s' failed"
7006 #: builtin/remote.c:750
7008 msgid "creating '%s' failed"
7011 #: builtin/remote.c:764
7013 msgid "Could not remove branch %s"
7016 #: builtin/remote.c:834
7018 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7019 "to delete it, use:"
7021 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7022 "to delete them, use:"
7026 #: builtin/remote.c:943
7028 msgid " new (next fetch will store in remotes/%s)"
7031 #: builtin/remote.c:946
7035 #: builtin/remote.c:948
7036 msgid " stale (use 'git remote prune' to remove)"
7039 #: builtin/remote.c:950
7043 #: builtin/remote.c:991
7045 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7048 #: builtin/remote.c:998
7050 msgid "rebases onto remote %s"
7053 #: builtin/remote.c:1001
7055 msgid " merges with remote %s"
7058 #: builtin/remote.c:1002
7059 msgid " and with remote"
7062 #: builtin/remote.c:1004
7064 msgid "merges with remote %s"
7067 #: builtin/remote.c:1005
7068 msgid " and with remote"
7071 #: builtin/remote.c:1051
7075 #: builtin/remote.c:1054
7079 #: builtin/remote.c:1058
7083 #: builtin/remote.c:1061
7084 msgid "fast-forwardable"
7087 #: builtin/remote.c:1064
7088 msgid "local out of date"
7091 #: builtin/remote.c:1071
7093 msgid " %-*s forces to %-*s (%s)"
7096 #: builtin/remote.c:1074
7098 msgid " %-*s pushes to %-*s (%s)"
7101 #: builtin/remote.c:1078
7103 msgid " %-*s forces to %s"
7106 #: builtin/remote.c:1081
7108 msgid " %-*s pushes to %s"
7111 #: builtin/remote.c:1091
7112 msgid "do not query remotes"
7115 #: builtin/remote.c:1118
7120 #: builtin/remote.c:1119
7122 msgid " Fetch URL: %s"
7125 #: builtin/remote.c:1120 builtin/remote.c:1285
7129 #: builtin/remote.c:1129 builtin/remote.c:1131
7131 msgid " Push URL: %s"
7134 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
7136 msgid " HEAD branch: %s"
7139 #: builtin/remote.c:1139
7142 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
7145 #: builtin/remote.c:1151
7147 msgid " Remote branch:%s"
7148 msgid_plural " Remote branches:%s"
7152 #: builtin/remote.c:1154 builtin/remote.c:1181
7153 msgid " (status not queried)"
7156 #: builtin/remote.c:1163
7157 msgid " Local branch configured for 'git pull':"
7158 msgid_plural " Local branches configured for 'git pull':"
7162 #: builtin/remote.c:1171
7163 msgid " Local refs will be mirrored by 'git push'"
7166 #: builtin/remote.c:1178
7168 msgid " Local ref configured for 'git push'%s:"
7169 msgid_plural " Local refs configured for 'git push'%s:"
7173 #: builtin/remote.c:1199
7174 msgid "set refs/remotes/<name>/HEAD according to remote"
7177 #: builtin/remote.c:1201
7178 msgid "delete refs/remotes/<name>/HEAD"
7181 #: builtin/remote.c:1216
7182 msgid "Cannot determine remote HEAD"
7185 #: builtin/remote.c:1218
7186 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
7189 #: builtin/remote.c:1228
7191 msgid "Could not delete %s"
7194 #: builtin/remote.c:1236
7196 msgid "Not a valid ref: %s"
7199 #: builtin/remote.c:1238
7201 msgid "Could not setup %s"
7204 #: builtin/remote.c:1274
7206 msgid " %s will become dangling!"
7209 #: builtin/remote.c:1275
7211 msgid " %s has become dangling!"
7214 #: builtin/remote.c:1281
7219 #: builtin/remote.c:1282
7224 #: builtin/remote.c:1295
7226 msgid " * [would prune] %s"
7229 #: builtin/remote.c:1298
7231 msgid " * [pruned] %s"
7234 #: builtin/remote.c:1321
7235 msgid "prune remotes after fetching"
7238 #: builtin/remote.c:1387 builtin/remote.c:1461
7240 msgid "No such remote '%s'"
7243 #: builtin/remote.c:1407
7247 #: builtin/remote.c:1414
7248 msgid "no remote specified"
7251 #: builtin/remote.c:1436
7252 msgid "manipulate push URLs"
7255 #: builtin/remote.c:1438
7259 #: builtin/remote.c:1440
7263 #: builtin/remote.c:1447
7264 msgid "--add --delete doesn't make sense"
7267 #: builtin/remote.c:1487
7269 msgid "Invalid old URL pattern: %s"
7272 #: builtin/remote.c:1495
7274 msgid "No such URL found: %s"
7277 #: builtin/remote.c:1497
7278 msgid "Will not delete all non-push URLs"
7281 #: builtin/remote.c:1569
7282 msgid "be verbose; must be placed before a subcommand"
7285 #: builtin/replace.c:17
7286 msgid "git replace [-f] <object> <replacement>"
7289 #: builtin/replace.c:18
7290 msgid "git replace -d <object>..."
7293 #: builtin/replace.c:19
7294 msgid "git replace -l [<pattern>]"
7297 #: builtin/replace.c:121
7298 msgid "list replace refs"
7301 #: builtin/replace.c:122
7302 msgid "delete replace refs"
7305 #: builtin/replace.c:123
7306 msgid "replace the ref if it exists"
7309 #: builtin/rerere.c:11
7310 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
7313 #: builtin/rerere.c:56
7314 msgid "register clean resolutions in index"
7317 #: builtin/reset.c:25
7319 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
7322 #: builtin/reset.c:26
7323 msgid "git reset [-q] <commit> [--] <paths>..."
7326 #: builtin/reset.c:27
7327 msgid "git reset --patch [<commit>] [--] [<paths>...]"
7330 #: builtin/reset.c:33
7334 #: builtin/reset.c:33
7338 #: builtin/reset.c:33
7342 #: builtin/reset.c:33
7346 #: builtin/reset.c:33
7350 #: builtin/reset.c:77
7351 msgid "You do not have a valid HEAD."
7354 #: builtin/reset.c:79
7355 msgid "Failed to find tree of HEAD."
7358 #: builtin/reset.c:85
7360 msgid "Failed to find tree of %s."
7363 #: builtin/reset.c:96
7364 msgid "Could not write new index file."
7367 #: builtin/reset.c:106
7369 msgid "HEAD is now at %s"
7372 #: builtin/reset.c:130
7373 msgid "Could not read index"
7376 #: builtin/reset.c:133
7377 msgid "Unstaged changes after reset:"
7380 #: builtin/reset.c:223
7382 msgid "Cannot do a %s reset in the middle of a merge."
7385 #: builtin/reset.c:238
7386 msgid "be quiet, only report errors"
7389 #: builtin/reset.c:240
7390 msgid "reset HEAD and index"
7393 #: builtin/reset.c:241
7394 msgid "reset only HEAD"
7397 #: builtin/reset.c:243 builtin/reset.c:245
7398 msgid "reset HEAD, index and working tree"
7401 #: builtin/reset.c:247
7402 msgid "reset HEAD but keep local changes"
7405 #: builtin/reset.c:303
7407 msgid "Could not parse object '%s'."
7410 #: builtin/reset.c:308
7411 msgid "--patch is incompatible with --{hard,mixed,soft}"
7414 #: builtin/reset.c:317
7415 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
7418 #: builtin/reset.c:319
7420 msgid "Cannot do %s reset with paths."
7423 #: builtin/reset.c:331
7425 msgid "%s reset is not allowed in a bare repository"
7428 #: builtin/reset.c:347
7430 msgid "Could not reset index file to revision '%s'."
7433 #: builtin/rev-parse.c:339
7434 msgid "git rev-parse --parseopt [options] -- [<args>...]"
7437 #: builtin/rev-parse.c:344
7438 msgid "keep the `--` passed as an arg"
7441 #: builtin/rev-parse.c:346
7442 msgid "stop parsing after the first non-option argument"
7445 #: builtin/rev-parse.c:464
7447 "git rev-parse --parseopt [options] -- [<args>...]\n"
7448 " or: git rev-parse --sq-quote [<arg>...]\n"
7449 " or: git rev-parse [options] [<arg>...]\n"
7451 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
7454 #: builtin/revert.c:22
7455 msgid "git revert [options] <commit-ish>"
7458 #: builtin/revert.c:23
7459 msgid "git revert <subcommand>"
7462 #: builtin/revert.c:28
7463 msgid "git cherry-pick [options] <commit-ish>"
7466 #: builtin/revert.c:29
7467 msgid "git cherry-pick <subcommand>"
7470 #: builtin/revert.c:70 builtin/revert.c:92
7472 msgid "%s: %s cannot be used with %s"
7475 #: builtin/revert.c:103
7476 msgid "end revert or cherry-pick sequence"
7479 #: builtin/revert.c:104
7480 msgid "resume revert or cherry-pick sequence"
7483 #: builtin/revert.c:105
7484 msgid "cancel revert or cherry-pick sequence"
7487 #: builtin/revert.c:106
7488 msgid "don't automatically commit"
7491 #: builtin/revert.c:107
7492 msgid "edit the commit message"
7495 #: builtin/revert.c:110
7496 msgid "parent number"
7499 #: builtin/revert.c:112
7500 msgid "merge strategy"
7503 #: builtin/revert.c:113
7507 #: builtin/revert.c:114
7508 msgid "option for merge strategy"
7511 #: builtin/revert.c:125
7512 msgid "append commit name"
7515 #: builtin/revert.c:126
7516 msgid "allow fast-forward"
7519 #: builtin/revert.c:127
7520 msgid "preserve initially empty commits"
7523 #: builtin/revert.c:128
7524 msgid "allow commits with empty messages"
7527 #: builtin/revert.c:129
7528 msgid "keep redundant, empty commits"
7531 #: builtin/revert.c:133
7532 msgid "program error"
7535 #: builtin/revert.c:223
7536 msgid "revert failed"
7539 #: builtin/revert.c:238
7540 msgid "cherry-pick failed"
7544 msgid "git rm [options] [--] <file>..."
7547 #: builtin/rm.c:64 builtin/rm.c:186
7550 "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
7551 "(use 'rm -rf' if you really want to remove it including all of its history)"
7557 "'%s' has staged content different from both the file and the HEAD\n"
7558 "(use -f to force removal)"
7564 "'%s' has changes staged in the index\n"
7565 "(use --cached to keep the file, or -f to force removal)"
7571 "'%s' has local modifications\n"
7572 "(use --cached to keep the file, or -f to force removal)"
7576 msgid "do not list removed files"
7580 msgid "only remove from the index"
7584 msgid "override the up-to-date check"
7588 msgid "allow recursive removal"
7592 msgid "exit with a zero status even if nothing matched"
7597 msgid "not removing '%s' recursively without -r"
7602 msgid "git rm: unable to remove %s"
7605 #: builtin/shortlog.c:13
7606 msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
7609 #: builtin/shortlog.c:157
7611 msgid "Missing author: %s"
7614 #: builtin/shortlog.c:253
7615 msgid "sort output according to the number of commits per author"
7618 #: builtin/shortlog.c:255
7619 msgid "Suppress commit descriptions, only provides commit count"
7622 #: builtin/shortlog.c:257
7623 msgid "Show the email address of each author"
7626 #: builtin/shortlog.c:258
7630 #: builtin/shortlog.c:259
7631 msgid "Linewrap output"
7634 #: builtin/show-branch.c:9
7636 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
7637 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
7638 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
7642 #: builtin/show-branch.c:10
7643 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
7646 #: builtin/show-branch.c:651
7647 msgid "show remote-tracking and local branches"
7650 #: builtin/show-branch.c:653
7651 msgid "show remote-tracking branches"
7654 #: builtin/show-branch.c:655
7655 msgid "color '*!+-' corresponding to the branch"
7658 #: builtin/show-branch.c:657
7659 msgid "show <n> more commits after the common ancestor"
7662 #: builtin/show-branch.c:659
7663 msgid "synonym to more=-1"
7666 #: builtin/show-branch.c:660
7667 msgid "suppress naming strings"
7670 #: builtin/show-branch.c:662
7671 msgid "include the current branch"
7674 #: builtin/show-branch.c:664
7675 msgid "name commits with their object names"
7678 #: builtin/show-branch.c:666
7679 msgid "show possible merge bases"
7682 #: builtin/show-branch.c:668
7683 msgid "show refs unreachable from any other ref"
7686 #: builtin/show-branch.c:670
7687 msgid "show commits in topological order"
7690 #: builtin/show-branch.c:672
7691 msgid "show only commits not on the first branch"
7694 #: builtin/show-branch.c:674
7695 msgid "show merges reachable from only one tip"
7698 #: builtin/show-branch.c:676
7699 msgid "show commits where no parent comes before its children"
7702 #: builtin/show-branch.c:678
7703 msgid "<n>[,<base>]"
7706 #: builtin/show-branch.c:679
7707 msgid "show <n> most recent ref-log entries starting at base"
7710 #: builtin/show-ref.c:10
7712 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"
7713 "[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
7716 #: builtin/show-ref.c:11
7717 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
7720 #: builtin/show-ref.c:165
7721 msgid "only show tags (can be combined with heads)"
7724 #: builtin/show-ref.c:166
7725 msgid "only show heads (can be combined with tags)"
7728 #: builtin/show-ref.c:167
7729 msgid "stricter reference checking, requires exact ref path"
7732 #: builtin/show-ref.c:170 builtin/show-ref.c:172
7733 msgid "show the HEAD reference"
7736 #: builtin/show-ref.c:174
7737 msgid "dereference tags into object IDs"
7740 #: builtin/show-ref.c:176
7741 msgid "only show SHA1 hash using <n> digits"
7744 #: builtin/show-ref.c:180
7745 msgid "do not print results to stdout (useful with --verify)"
7748 #: builtin/show-ref.c:182
7749 msgid "show refs from stdin that aren't in local repository"
7752 #: builtin/symbolic-ref.c:7
7753 msgid "git symbolic-ref [options] name [ref]"
7756 #: builtin/symbolic-ref.c:8
7757 msgid "git symbolic-ref -d [-q] name"
7760 #: builtin/symbolic-ref.c:40
7761 msgid "suppress error message for non-symbolic (detached) refs"
7764 #: builtin/symbolic-ref.c:41
7765 msgid "delete symbolic ref"
7768 #: builtin/symbolic-ref.c:42
7769 msgid "shorten ref output"
7772 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
7776 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
7777 msgid "reason of the update"
7782 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
7786 msgid "git tag -d <tagname>..."
7791 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
7792 "\t\t[<pattern>...]"
7796 msgid "git tag -v <tagname>..."
7801 msgid "malformed object at '%s'"
7804 #: builtin/tag.c:207
7806 msgid "tag name too long: %.*s..."
7809 #: builtin/tag.c:212
7811 msgid "tag '%s' not found."
7814 #: builtin/tag.c:227
7816 msgid "Deleted tag '%s' (was %s)\n"
7819 #: builtin/tag.c:239
7821 msgid "could not verify the tag '%s'"
7824 #: builtin/tag.c:249
7828 "# Write a tag message\n"
7829 "# Lines starting with '#' will be ignored.\n"
7833 #: builtin/tag.c:256
7837 "# Write a tag message\n"
7838 "# Lines starting with '#' will be kept; you may remove them yourself if you "
7843 #: builtin/tag.c:298
7844 msgid "unable to sign the tag"
7847 #: builtin/tag.c:300
7848 msgid "unable to write tag file"
7851 #: builtin/tag.c:325
7852 msgid "bad object type."
7855 #: builtin/tag.c:338
7856 msgid "tag header too big."
7859 #: builtin/tag.c:370
7860 msgid "no tag message?"
7863 #: builtin/tag.c:376
7865 msgid "The tag message has been left in %s\n"
7868 #: builtin/tag.c:425
7869 msgid "switch 'points-at' requires an object"
7872 #: builtin/tag.c:427
7874 msgid "malformed object name '%s'"
7877 #: builtin/tag.c:447
7878 msgid "list tag names"
7881 #: builtin/tag.c:449
7882 msgid "print <n> lines of each tag message"
7885 #: builtin/tag.c:451
7889 #: builtin/tag.c:452
7893 #: builtin/tag.c:454
7894 msgid "Tag creation options"
7897 #: builtin/tag.c:456
7898 msgid "annotated tag, needs a message"
7901 #: builtin/tag.c:458
7905 #: builtin/tag.c:460
7906 msgid "annotated and GPG-signed tag"
7909 #: builtin/tag.c:464
7910 msgid "use another key to sign the tag"
7913 #: builtin/tag.c:465
7914 msgid "replace the tag if exists"
7917 #: builtin/tag.c:466
7918 msgid "show tag list in columns"
7921 #: builtin/tag.c:468
7922 msgid "Tag listing options"
7925 #: builtin/tag.c:471
7926 msgid "print only tags that contain the commit"
7929 #: builtin/tag.c:477
7930 msgid "print only tags of the object"
7933 #: builtin/tag.c:506
7934 msgid "--column and -n are incompatible"
7937 #: builtin/tag.c:523
7938 msgid "-n option is only allowed with -l."
7941 #: builtin/tag.c:525
7942 msgid "--contains option is only allowed with -l."
7945 #: builtin/tag.c:527
7946 msgid "--points-at option is only allowed with -l."
7949 #: builtin/tag.c:535
7950 msgid "only one -F or -m option is allowed."
7953 #: builtin/tag.c:555
7954 msgid "too many params"
7957 #: builtin/tag.c:561
7959 msgid "'%s' is not a valid tag name."
7962 #: builtin/tag.c:566
7964 msgid "tag '%s' already exists"
7967 #: builtin/tag.c:584
7969 msgid "%s: cannot lock the ref"
7972 #: builtin/tag.c:586
7974 msgid "%s: cannot update the ref"
7977 #: builtin/tag.c:588
7979 msgid "Updated tag '%s' (was %s)\n"
7982 #: builtin/update-index.c:401
7983 msgid "git update-index [options] [--] [<file>...]"
7986 #: builtin/update-index.c:718
7987 msgid "continue refresh even when index needs update"
7990 #: builtin/update-index.c:721
7991 msgid "refresh: ignore submodules"
7994 #: builtin/update-index.c:724
7995 msgid "do not ignore new files"
7998 #: builtin/update-index.c:726
7999 msgid "let files replace directories and vice-versa"
8002 #: builtin/update-index.c:728
8003 msgid "notice files missing from worktree"
8006 #: builtin/update-index.c:730
8007 msgid "refresh even if index contains unmerged entries"
8010 #: builtin/update-index.c:733
8011 msgid "refresh stat information"
8014 #: builtin/update-index.c:737
8015 msgid "like --refresh, but ignore assume-unchanged setting"
8018 #: builtin/update-index.c:741
8019 msgid "<mode> <object> <path>"
8022 #: builtin/update-index.c:742
8023 msgid "add the specified entry to the index"
8026 #: builtin/update-index.c:746
8030 #: builtin/update-index.c:747
8031 msgid "override the executable bit of the listed files"
8034 #: builtin/update-index.c:751
8035 msgid "mark files as \"not changing\""
8038 #: builtin/update-index.c:754
8039 msgid "clear assumed-unchanged bit"
8042 #: builtin/update-index.c:757
8043 msgid "mark files as \"index-only\""
8046 #: builtin/update-index.c:760
8047 msgid "clear skip-worktree bit"
8050 #: builtin/update-index.c:763
8051 msgid "add to index only; do not add content to object database"
8054 #: builtin/update-index.c:765
8055 msgid "remove named paths even if present in worktree"
8058 #: builtin/update-index.c:767
8059 msgid "with --stdin: input lines are terminated by null bytes"
8062 #: builtin/update-index.c:769
8063 msgid "read list of paths to be updated from standard input"
8066 #: builtin/update-index.c:773
8067 msgid "add entries from standard input to the index"
8070 #: builtin/update-index.c:777
8071 msgid "repopulate stages #2 and #3 for the listed paths"
8074 #: builtin/update-index.c:781
8075 msgid "only update entries that differ from HEAD"
8078 #: builtin/update-index.c:785
8079 msgid "ignore files missing from worktree"
8082 #: builtin/update-index.c:788
8083 msgid "report actions to standard output"
8086 #: builtin/update-index.c:790
8087 msgid "(for porcelains) forget saved unresolved conflicts"
8090 #: builtin/update-index.c:794
8091 msgid "write index in this format"
8094 #: builtin/update-ref.c:7
8095 msgid "git update-ref [options] -d <refname> [<oldval>]"
8098 #: builtin/update-ref.c:8
8099 msgid "git update-ref [options] <refname> <newval> [<oldval>]"
8102 #: builtin/update-ref.c:19
8103 msgid "delete the reference"
8106 #: builtin/update-ref.c:21
8107 msgid "update <refname> not the one it points to"
8110 #: builtin/update-server-info.c:6
8111 msgid "git update-server-info [--force]"
8114 #: builtin/update-server-info.c:14
8115 msgid "update the info files from scratch"
8118 #: builtin/verify-pack.c:56
8119 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8122 #: builtin/verify-pack.c:66
8126 #: builtin/verify-pack.c:68
8127 msgid "show statistics only"
8130 #: builtin/verify-tag.c:17
8131 msgid "git verify-tag [-v|--verbose] <tag>..."
8134 #: builtin/verify-tag.c:73
8135 msgid "print tag contents"
8138 #: builtin/write-tree.c:13
8139 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
8142 #: builtin/write-tree.c:26
8146 #: builtin/write-tree.c:27
8147 msgid "write tree object for a subdirectory <prefix>"
8150 #: builtin/write-tree.c:30
8151 msgid "only useful for debugging"
8155 msgid "See 'git help <command>' for more information on a specific command."
8158 #: parse-options.h:156
8159 msgid "no-op (backward compatibility)"
8162 #: parse-options.h:228
8163 msgid "be more verbose"
8166 #: parse-options.h:230
8167 msgid "be more quiet"
8170 #: parse-options.h:236
8171 msgid "use <n> digits to display SHA-1s"
8175 msgid "Add file contents to the index"
8179 msgid "Find by binary search the change that introduced a bug"
8183 msgid "List, create, or delete branches"
8187 msgid "Checkout a branch or paths to the working tree"
8191 msgid "Clone a repository into a new directory"
8195 msgid "Record changes to the repository"
8199 msgid "Show changes between commits, commit and working tree, etc"
8203 msgid "Download objects and refs from another repository"
8207 msgid "Print lines matching a pattern"
8211 msgid "Create an empty git repository or reinitialize an existing one"
8215 msgid "Show commit logs"
8219 msgid "Join two or more development histories together"
8223 msgid "Move or rename a file, a directory, or a symlink"
8227 msgid "Fetch from and merge with another repository or a local branch"
8231 msgid "Update remote refs along with associated objects"
8235 msgid "Forward-port local commits to the updated upstream head"
8239 msgid "Reset current HEAD to the specified state"
8243 msgid "Remove files from the working tree and from the index"
8247 msgid "Show various types of objects"
8251 msgid "Show the working tree status"
8255 msgid "Create, list, delete or verify a tag object signed with GPG"
8259 msgid "You need to set your committer info first"
8264 "You seem to have moved HEAD since the last 'am' failure.\n"
8265 "Not rewinding to ORIG_HEAD"
8271 "When you have resolved this problem, run \"$cmdline --resolved\".\n"
8272 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8273 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
8277 msgid "Cannot fall back to three-way merge."
8281 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
8285 msgid "Using index info to reconstruct a base tree..."
8290 "Did you hand edit your patch?\n"
8291 "It does not apply to blobs recorded in its index."
8295 msgid "Falling back to patching base and 3-way merge..."
8299 msgid "Failed to merge in the changes."
8303 msgid "Only one StGIT patch series can be applied at once"
8308 msgid "Patch format $patch_format is not supported."
8312 msgid "Patch format detection failed."
8317 "The -b/--binary option has been a no-op for long time, and\n"
8318 "it will be removed. Please do not use it anymore."
8323 msgid "previous rebase directory $dotest still exists but mbox given."
8327 msgid "Please make up your mind. --skip or --abort?"
8331 msgid "Resolve operation not in progress, we are not resuming."
8336 msgid "Dirty index: cannot apply patches (dirty: $files)"
8342 "Patch is empty. Was it split wrong?\n"
8343 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
8344 "To restore the original branch and stop patching run \"$cmdline --abort\"."
8348 msgid "Patch does not have a valid e-mail address."
8352 msgid "cannot be interactive without stdin connected to a terminal."
8356 msgid "Commit Body is:"
8359 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
8360 #. in your translation. The program will only accept English
8361 #. input at this point.
8363 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8368 msgid "Applying: $FIRSTLINE"
8373 "No changes - did you forget to use 'git add'?\n"
8374 "If there is nothing left to stage, chances are that something else\n"
8375 "already introduced the same changes; you might want to skip this patch."
8380 "You still have unmerged paths in your index\n"
8381 "did you forget to use 'git add'?"
8385 msgid "No changes -- Patch already applied."
8390 msgid "Patch failed at $msgnum $FIRSTLINE"
8396 "The copy of the patch that failed is found in:\n"
8401 msgid "applying to an empty history"
8405 msgid "You need to start by \"git bisect start\""
8408 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8409 #. translation. The program will only accept English input
8412 msgid "Do you want me to do it for you [Y/n]? "
8417 msgid "unrecognised option: '$arg'"
8422 msgid "'$arg' does not appear to be a valid revision"
8425 #: git-bisect.sh:117
8426 msgid "Bad HEAD - I need a HEAD"
8429 #: git-bisect.sh:130
8432 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
8435 #: git-bisect.sh:140
8436 msgid "won't bisect on seeked tree"
8439 #: git-bisect.sh:144
8440 msgid "Bad HEAD - strange symbolic ref"
8443 #: git-bisect.sh:189
8445 msgid "Bad bisect_write argument: $state"
8448 #: git-bisect.sh:218
8450 msgid "Bad rev input: $arg"
8453 #: git-bisect.sh:232
8454 msgid "Please call 'bisect_state' with at least one argument."
8457 #: git-bisect.sh:244
8459 msgid "Bad rev input: $rev"
8462 #: git-bisect.sh:250
8463 msgid "'git bisect bad' can take only one argument."
8466 #. have bad but not good. we could bisect although
8467 #. this is less optimum.
8468 #: git-bisect.sh:273
8469 msgid "Warning: bisecting only with a bad commit."
8472 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8473 #. translation. The program will only accept English input
8475 #: git-bisect.sh:279
8476 msgid "Are you sure [Y/n]? "
8479 #: git-bisect.sh:289
8481 "You need to give me at least one good and one bad revisions.\n"
8482 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8485 #: git-bisect.sh:292
8487 "You need to start by \"git bisect start\".\n"
8488 "You then need to give me at least one good and one bad revisions.\n"
8489 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8492 #: git-bisect.sh:347 git-bisect.sh:474
8493 msgid "We are not bisecting."
8496 #: git-bisect.sh:354
8498 msgid "'$invalid' is not a valid commit"
8501 #: git-bisect.sh:363
8504 "Could not check out original HEAD '$branch'.\n"
8505 "Try 'git bisect reset <commit>'."
8508 #: git-bisect.sh:390
8509 msgid "No logfile given"
8512 #: git-bisect.sh:391
8514 msgid "cannot read $file for replaying"
8517 #: git-bisect.sh:408
8518 msgid "?? what are you talking about?"
8521 #: git-bisect.sh:420
8523 msgid "running $command"
8526 #: git-bisect.sh:427
8529 "bisect run failed:\n"
8530 "exit code $res from '$command' is < 0 or >= 128"
8533 #: git-bisect.sh:453
8534 msgid "bisect run cannot continue any more"
8537 #: git-bisect.sh:459
8540 "bisect run failed:\n"
8541 "'bisect_state $state' exited with error code $res"
8544 #: git-bisect.sh:466
8545 msgid "bisect run success"
8550 "Pull is not possible because you have unmerged files.\n"
8551 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
8552 "as appropriate to mark resolution, or use 'git commit -a'."
8556 msgid "Pull is not possible because you have unmerged files."
8560 msgid "updating an unborn branch with changes added to the index"
8563 #. The fetch involved updating the current branch.
8564 #. The working tree and the index file is still based on the
8565 #. $orig_head commit, but we are merging into $curr_head.
8566 #. First update the working tree to match $curr_head.
8570 "Warning: fetch updated the current branch head.\n"
8571 "Warning: fast-forwarding your working tree from\n"
8572 "Warning: commit $orig_head."
8576 msgid "Cannot merge multiple branches into empty head"
8580 msgid "Cannot rebase onto multiple branches"
8585 "When you have resolved this problem, run \"git rebase --continue\".\n"
8586 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
8587 "To check out the original branch and stop rebasing, run \"git rebase --abort"
8591 #: git-rebase.sh:160
8592 msgid "The pre-rebase hook refused to rebase."
8595 #: git-rebase.sh:165
8596 msgid "It looks like git-am is in progress. Cannot rebase."
8599 #: git-rebase.sh:296
8600 msgid "The --exec option must be used with the --interactive option"
8603 #: git-rebase.sh:301
8604 msgid "No rebase in progress?"
8607 #: git-rebase.sh:312
8608 msgid "The --edit-todo action can only be used during interactive rebase."
8611 #: git-rebase.sh:319
8612 msgid "Cannot read HEAD"
8615 #: git-rebase.sh:322
8617 "You must edit all merge conflicts and then\n"
8618 "mark them as resolved using git add"
8621 #: git-rebase.sh:340
8623 msgid "Could not move back to $head_name"
8626 #: git-rebase.sh:359
8629 "It seems that there is already a $state_dir_base directory, and\n"
8630 "I wonder if you are in the middle of another rebase. If that is the\n"
8631 "case, please try\n"
8632 "\t$cmd_live_rebase\n"
8633 "If that is not the case, please\n"
8634 "\t$cmd_clear_stale_rebase\n"
8635 "and run me again. I am stopping in case you still have something\n"
8639 #: git-rebase.sh:404
8641 msgid "invalid upstream $upstream_name"
8644 #: git-rebase.sh:428
8646 msgid "$onto_name: there are more than one merge bases"
8649 #: git-rebase.sh:431 git-rebase.sh:435
8651 msgid "$onto_name: there is no merge base"
8654 #: git-rebase.sh:440
8656 msgid "Does not point to a valid commit: $onto_name"
8659 #: git-rebase.sh:463
8661 msgid "fatal: no such branch: $branch_name"
8664 #: git-rebase.sh:483
8665 msgid "Please commit or stash them."
8668 #: git-rebase.sh:501
8670 msgid "Current branch $branch_name is up to date."
8673 #: git-rebase.sh:504
8675 msgid "Current branch $branch_name is up to date, rebase forced."
8678 #: git-rebase.sh:515
8680 msgid "Changes from $mb to $onto:"
8683 #. Detach HEAD and reset the tree
8684 #: git-rebase.sh:524
8685 msgid "First, rewinding head to replay your work on top of it..."
8688 #: git-rebase.sh:532
8690 msgid "Fast-forwarded $branch_name to $onto_name."
8694 msgid "git stash clear with parameters is unimplemented"
8698 msgid "You do not have the initial commit yet"
8702 msgid "Cannot save the current index state"
8705 #: git-stash.sh:123 git-stash.sh:136
8706 msgid "Cannot save the current worktree state"
8710 msgid "No changes selected"
8714 msgid "Cannot remove temporary index (can't happen)"
8718 msgid "Cannot record working tree state"
8721 #. TRANSLATORS: $option is an invalid option, like
8722 #. `--blah-blah'. The 7 spaces at the beginning of the
8723 #. second line correspond to "error: ". So you should line
8724 #. up the second line with however many characters the
8725 #. translation of "error: " takes in your language. E.g. in
8728 #. $ git stash save --blah-blah 2>&1 | head -n 2
8729 #. error: unknown option for 'stash save': --blah-blah
8730 #. To provide a message, use git stash save -- '--blah-blah'
8734 "error: unknown option for 'stash save': $option\n"
8735 " To provide a message, use git stash save -- '$option'"
8739 msgid "No local changes to save"
8743 msgid "Cannot initialize stash"
8747 msgid "Cannot save the current status"
8751 msgid "Cannot remove worktree changes"
8755 msgid "No stash found."
8760 msgid "Too many revisions specified: $REV"
8765 msgid "$reference is not valid reference"
8770 msgid "'$args' is not a stash-like commit"
8775 msgid "'$args' is not a stash reference"
8779 msgid "unable to refresh index"
8783 msgid "Cannot apply a stash in the middle of a merge"
8787 msgid "Conflicts in index. Try without --index."
8791 msgid "Could not save index tree"
8795 msgid "Cannot unstage modified files"
8799 msgid "Index was not unstashed."
8804 msgid "Dropped ${REV} ($s)"
8809 msgid "${REV}: Could not drop stash entry"
8813 msgid "No branch name specified"
8817 msgid "(To restore them type \"git stash apply\")"
8820 #: git-submodule.sh:89
8822 msgid "cannot strip one component off url '$remoteurl'"
8825 #: git-submodule.sh:168
8827 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
8830 #: git-submodule.sh:211
8832 msgid "Clone of '$url' into submodule path '$sm_path' failed"
8835 #: git-submodule.sh:223
8837 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
8840 #: git-submodule.sh:316
8842 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
8845 #: git-submodule.sh:333
8847 msgid "'$sm_path' already exists in the index"
8850 #: git-submodule.sh:337
8853 "The following path is ignored by one of your .gitignore files:\n"
8855 "Use -f if you really want to add it."
8858 #: git-submodule.sh:355
8860 msgid "Adding existing repo at '$sm_path' to the index"
8863 #: git-submodule.sh:357
8865 msgid "'$sm_path' already exists and is not a valid git repo"
8868 #: git-submodule.sh:365
8870 msgid "A git directory for '$sm_name' is found locally with remote(s):"
8873 #: git-submodule.sh:367
8876 "If you want to reuse this local git directory instead of cloning again from"
8879 #: git-submodule.sh:369
8882 "use the '--force' option. If the local git directory is not the correct repo"
8885 #: git-submodule.sh:370
8888 "or you are unsure what this means choose another name with the '--name' "
8892 #: git-submodule.sh:372
8894 msgid "Reactivating local git directory for submodule '$sm_name'."
8897 #: git-submodule.sh:384
8899 msgid "Unable to checkout submodule '$sm_path'"
8902 #: git-submodule.sh:389
8904 msgid "Failed to add submodule '$sm_path'"
8907 #: git-submodule.sh:394
8909 msgid "Failed to register submodule '$sm_path'"
8912 #: git-submodule.sh:437
8914 msgid "Entering '$prefix$sm_path'"
8917 #: git-submodule.sh:451
8919 msgid "Stopping at '$sm_path'; script returned non-zero status."
8922 #: git-submodule.sh:495
8924 msgid "No url found for submodule path '$sm_path' in .gitmodules"
8927 #: git-submodule.sh:504
8929 msgid "Failed to register url for submodule path '$sm_path'"
8932 #: git-submodule.sh:506
8934 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
8937 #: git-submodule.sh:514
8939 msgid "Failed to register update mode for submodule path '$sm_path'"
8942 #: git-submodule.sh:614
8945 "Submodule path '$sm_path' not initialized\n"
8946 "Maybe you want to use 'update --init'?"
8949 #: git-submodule.sh:627
8951 msgid "Unable to find current revision in submodule path '$sm_path'"
8954 #: git-submodule.sh:646
8956 msgid "Unable to fetch in submodule path '$sm_path'"
8959 #: git-submodule.sh:660
8961 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
8964 #: git-submodule.sh:661
8966 msgid "Submodule path '$sm_path': rebased into '$sha1'"
8969 #: git-submodule.sh:666
8971 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
8974 #: git-submodule.sh:667
8976 msgid "Submodule path '$sm_path': merged in '$sha1'"
8979 #: git-submodule.sh:672
8981 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
8984 #: git-submodule.sh:673
8986 msgid "Submodule path '$sm_path': checked out '$sha1'"
8989 #: git-submodule.sh:695 git-submodule.sh:1017
8991 msgid "Failed to recurse into submodule path '$sm_path'"
8994 #: git-submodule.sh:803
8995 msgid "The --cached option cannot be used with the --files option"
8999 #: git-submodule.sh:843
9001 msgid "unexpected mode $mod_dst"
9004 #: git-submodule.sh:861
9006 msgid " Warn: $name doesn't contain commit $sha1_src"
9009 #: git-submodule.sh:864
9011 msgid " Warn: $name doesn't contain commit $sha1_dst"
9014 #: git-submodule.sh:867
9016 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9019 #: git-submodule.sh:892
9023 #: git-submodule.sh:930
9024 msgid "# Submodules changed but not updated:"
9027 #: git-submodule.sh:932
9028 msgid "# Submodule changes to be committed:"
9031 #: git-submodule.sh:1080
9033 msgid "Synchronizing submodule url for '$prefix$sm_path'"