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: 2013-01-25 12:33+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:324 builtin/log.c:1115
68 msgid "prepend prefix to each pathname in the archive"
71 #: archive.c:326 builtin/archive.c:91 builtin/blame.c:2380
72 #: builtin/blame.c:2381 builtin/config.c:55 builtin/fast-export.c:653
73 #: builtin/fast-export.c:655 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:327 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:345 builtin/archive.c:93 builtin/clone.c:85
111 #: archive.c:346 builtin/archive.c:94
112 msgid "retrieve the archive from remote repository <repo>"
115 #: archive.c:347 builtin/archive.c:95 builtin/notes.c:619
119 #: archive.c:348 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:566 sequencer.c:998 builtin/log.c:299
149 #: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347
150 #: builtin/shortlog.c:157
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:1254 builtin/shortlog.c:260
178 msgid "unrecognized argument: %s"
183 msgid "ref '%s' is excluded by the rev-list options"
187 msgid "Refusing to create empty bundle."
191 msgid "Could not spawn pack-objects"
195 msgid "pack-objects died"
200 msgid "cannot create '%s'"
204 msgid "index-pack died"
209 msgid "could not parse %s"
214 msgid "%s %s is not a commit!"
217 #: compat/obstack.c:406 compat/obstack.c:408
218 msgid "memory exhausted"
222 msgid "Could not run 'git rev-list'"
227 msgid "failed write to rev-list: %s"
232 msgid "failed to close rev-list's stdin: %s"
236 msgid "in the future"
241 msgid "%lu second ago"
242 msgid_plural "%lu seconds ago"
248 msgid "%lu minute ago"
249 msgid_plural "%lu minutes ago"
256 msgid_plural "%lu hours ago"
263 msgid_plural "%lu days ago"
270 msgid_plural "%lu weeks ago"
276 msgid "%lu month ago"
277 msgid_plural "%lu months ago"
284 msgid_plural "%lu years"
290 msgid "%s, %lu month ago"
291 msgid_plural "%s, %lu months ago"
295 #: date.c:154 date.c:159
298 msgid_plural "%lu years ago"
304 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
309 msgid " Unknown dirstat parameter '%s'\n"
314 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
320 "Found errors in 'diff.dirstat' config variable:\n"
327 "Failed to parse --dirstat/-X option parameter:\n"
333 msgid "Failed to parse --submodule option parameter: '%s'"
336 #: gpg-interface.c:59
337 msgid "could not run gpg."
340 #: gpg-interface.c:71
341 msgid "gpg did not accept the data"
344 #: gpg-interface.c:82
345 msgid "gpg failed to sign the data"
350 msgid "'%s': unable to read %s"
360 msgid "'%s': short read %s"
365 msgid "available git commands in '%s'"
369 msgid "git commands available from elsewhere on your $PATH"
375 "'%s' appears to be a git command, but we were not\n"
376 "able to execute it. Maybe git-%s is broken?"
380 msgid "Uh oh. Your system reports no Git commands at all."
386 "WARNING: You called a Git command named '%s', which does not exist.\n"
387 "Continuing under the assumption that you meant '%s'"
392 msgid "in %0.1f seconds automatically..."
397 msgid "git: '%s' is not a git command. See 'git --help'."
406 "Did you mean one of these?"
411 msgid "failed to read the cache"
414 #: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534
415 #: builtin/clone.c:586
416 msgid "unable to write new index file"
419 #: merge-recursive.c:190
421 msgid "(bad commit)\n"
424 #: merge-recursive.c:206
426 msgid "addinfo_cache failed for path '%s'"
429 #: merge-recursive.c:268
430 msgid "error building trees"
433 #: merge-recursive.c:672
435 msgid "failed to create path '%s'%s"
438 #: merge-recursive.c:683
440 msgid "Removing %s to make room for subdirectory\n"
443 #. something else exists
444 #. .. but not some other error (who really cares what?)
445 #: merge-recursive.c:697 merge-recursive.c:718
446 msgid ": perhaps a D/F conflict?"
449 #: merge-recursive.c:708
451 msgid "refusing to lose untracked file at '%s'"
454 #: merge-recursive.c:748
456 msgid "cannot read object %s '%s'"
459 #: merge-recursive.c:750
461 msgid "blob expected for %s '%s'"
464 #: merge-recursive.c:773 builtin/clone.c:302
466 msgid "failed to open '%s'"
469 #: merge-recursive.c:781
471 msgid "failed to symlink '%s'"
474 #: merge-recursive.c:784
476 msgid "do not know what to do with %06o %s '%s'"
479 #: merge-recursive.c:922
480 msgid "Failed to execute internal merge"
483 #: merge-recursive.c:926
485 msgid "Unable to add %s to database"
488 #: merge-recursive.c:942
489 msgid "unsupported object type in the tree"
492 #: merge-recursive.c:1021 merge-recursive.c:1035
495 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
499 #: merge-recursive.c:1027 merge-recursive.c:1040
502 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
506 #: merge-recursive.c:1081
510 #: merge-recursive.c:1081
514 #: merge-recursive.c:1137
516 msgid "%s is a directory in %s adding as %s instead"
519 #: merge-recursive.c:1159
522 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
523 "\"->\"%s\" in \"%s\"%s"
526 #: merge-recursive.c:1164
527 msgid " (left unresolved)"
530 #: merge-recursive.c:1218
532 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
535 #: merge-recursive.c:1248
537 msgid "Renaming %s to %s and %s to %s instead"
540 #: merge-recursive.c:1447
542 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
545 #: merge-recursive.c:1457
547 msgid "Adding merged %s"
550 #: merge-recursive.c:1462 merge-recursive.c:1660
552 msgid "Adding as %s instead"
555 #: merge-recursive.c:1513
557 msgid "cannot read object %s"
560 #: merge-recursive.c:1516
562 msgid "object %s is not a blob"
565 #: merge-recursive.c:1564
569 #: merge-recursive.c:1564
573 #: merge-recursive.c:1574
577 #: merge-recursive.c:1581
581 #: merge-recursive.c:1615
583 msgid "Skipped %s (merged same as existing)"
586 #: merge-recursive.c:1629
588 msgid "Auto-merging %s"
591 #: merge-recursive.c:1633 git-submodule.sh:942
595 #: merge-recursive.c:1634
597 msgid "CONFLICT (%s): Merge conflict in %s"
600 #: merge-recursive.c:1724
605 #: merge-recursive.c:1749
606 msgid "file/directory"
609 #: merge-recursive.c:1755
610 msgid "directory/file"
613 #: merge-recursive.c:1760
615 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
618 #: merge-recursive.c:1770
623 #: merge-recursive.c:1787
624 msgid "Fatal merge failure, shouldn't happen."
627 #: merge-recursive.c:1806
628 msgid "Already up-to-date!"
631 #: merge-recursive.c:1815
633 msgid "merging of trees %s and %s failed"
636 #: merge-recursive.c:1845
638 msgid "Unprocessed path??? %s"
641 #: merge-recursive.c:1890
645 #: merge-recursive.c:1903
647 msgid "found %u common ancestor:"
648 msgid_plural "found %u common ancestors:"
652 #: merge-recursive.c:1940
653 msgid "merge returned no commit"
656 #: merge-recursive.c:1997
658 msgid "Could not parse object '%s'"
661 #: merge-recursive.c:2009 builtin/merge.c:643
662 msgid "Unable to write index."
665 #: parse-options.c:485
669 #: parse-options.c:503
674 #. TRANSLATORS: the colon here should align with the
675 #. one in "usage: %s" translation
676 #: parse-options.c:507
681 #: parse-options.c:510
688 msgid "Your branch is ahead of '%s' by %d commit.\n"
689 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
694 msgid " (use \"git push\" to publish your local commits)\n"
699 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
701 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
706 msgid " (use \"git pull\" to update your local branch)\n"
712 "Your branch and '%s' have diverged,\n"
713 "and have %d and %d different commit each, respectively.\n"
715 "Your branch and '%s' have diverged,\n"
716 "and have %d and %d different commits each, respectively.\n"
721 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
724 #: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:875 builtin/merge.c:985
725 #: builtin/merge.c:995
727 msgid "Could not open '%s' for writing"
730 #: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:987
731 #: builtin/merge.c:1000
733 msgid "Could not write to '%s'"
738 "after resolving the conflicts, mark the corrected paths\n"
739 "with 'git add <paths>' or 'git rm <paths>'"
744 "after resolving the conflicts, mark the corrected paths\n"
745 "with 'git add <paths>' or 'git rm <paths>'\n"
746 "and commit the result with 'git commit'"
749 #: sequencer.c:162 sequencer.c:774 sequencer.c:857
751 msgid "Could not write to %s"
756 msgid "Error wrapping up %s"
760 msgid "Your local changes would be overwritten by cherry-pick."
764 msgid "Your local changes would be overwritten by revert."
768 msgid "Commit your changes or stash them to proceed."
771 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
774 msgid "%s: Unable to write new index file"
778 msgid "Could not resolve HEAD commit\n"
782 msgid "Unable to update cache tree\n"
787 msgid "Could not parse commit %s\n"
792 msgid "Could not parse parent commit %s\n"
796 msgid "Your index file is unmerged."
801 msgid "Commit %s is a merge but no -m option was given."
806 msgid "Commit %s does not have parent %d"
811 msgid "Mainline was specified but commit %s is not a merge."
814 #. TRANSLATORS: The first %s will be "revert" or
815 #. "cherry-pick", the second %s a SHA1
818 msgid "%s: cannot parse parent commit %s"
823 msgid "Cannot get commit message for %s"
828 msgid "could not revert %s... %s"
833 msgid "could not apply %s... %s"
837 msgid "empty commit set passed"
842 msgid "git %s: failed to read the index"
847 msgid "git %s: failed to refresh the index"
852 msgid "Cannot %s during a %s"
857 msgid "Could not parse line %d."
861 msgid "No commits parsed."
866 msgid "Could not open %s"
871 msgid "Could not read %s."
876 msgid "Unusable instruction sheet: %s"
881 msgid "Invalid key: %s"
886 msgid "Invalid value for %s: %s"
891 msgid "Malformed options sheet: %s"
895 msgid "a cherry-pick or revert is already in progress"
899 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
904 msgid "Could not create sequencer directory %s"
907 #: sequencer.c:776 sequencer.c:861
909 msgid "Error wrapping up %s."
912 #: sequencer.c:795 sequencer.c:929
913 msgid "no cherry-pick or revert in progress"
917 msgid "cannot resolve HEAD"
921 msgid "cannot abort from a branch yet to be born"
924 #: sequencer.c:821 builtin/apply.c:4016
926 msgid "cannot open %s: %s"
931 msgid "cannot read %s: %s"
935 msgid "unexpected end of file"
940 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
945 msgid "Could not format %s."
949 msgid "Can't revert as initial commit"
953 msgid "Can't cherry-pick into empty head"
957 msgid "HEAD does not point to a branch"
962 msgid "No such branch: '%s'"
967 msgid "No upstream configured for branch '%s'"
972 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
977 msgid "unable to access '%s': %s"
982 msgid "unable to access '%s'"
987 msgid "unable to look up current user in the passwd file: %s"
995 msgid "Unmerged paths:"
998 #: wt-status.c:167 wt-status.c:194
1000 msgid " (use \"git reset %s <file>...\" to unstage)"
1003 #: wt-status.c:169 wt-status.c:196
1004 msgid " (use \"git rm --cached <file>...\" to unstage)"
1008 msgid " (use \"git add <file>...\" to mark resolution)"
1011 #: wt-status.c:175 wt-status.c:179
1012 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1016 msgid " (use \"git rm <file>...\" to mark resolution)"
1020 msgid "Changes to be committed:"
1024 msgid "Changes not staged for commit:"
1028 msgid " (use \"git add <file>...\" to update what will be committed)"
1032 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1037 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1041 msgid " (commit or discard the untracked or modified content in submodules)"
1046 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1054 msgid "both deleted:"
1058 msgid "added by us:"
1062 msgid "deleted by them:"
1066 msgid "added by them:"
1070 msgid "deleted by us:"
1078 msgid "both modified:"
1082 msgid "new commits, "
1086 msgid "modified content, "
1090 msgid "untracked content, "
1095 msgid "new file: %s"
1100 msgid "copied: %s -> %s"
1110 msgid "modified: %s"
1115 msgid "renamed: %s -> %s"
1120 msgid "typechange: %s"
1130 msgid "unmerged: %s"
1135 msgid "bug: unhandled diff status %c"
1139 msgid "You have unmerged paths."
1142 #: wt-status.c:790 wt-status.c:914
1143 msgid " (fix conflicts and run \"git commit\")"
1147 msgid "All conflicts fixed but you are still merging."
1151 msgid " (use \"git commit\" to conclude merge)"
1155 msgid "You are in the middle of an am session."
1159 msgid "The current patch is empty."
1163 msgid " (fix conflicts and then run \"git am --resolved\")"
1167 msgid " (use \"git am --skip\" to skip this patch)"
1171 msgid " (use \"git am --abort\" to restore the original branch)"
1174 #: wt-status.c:875 wt-status.c:885
1175 msgid "You are currently rebasing."
1179 msgid " (fix conflicts and then run \"git rebase --continue\")"
1183 msgid " (use \"git rebase --skip\" to skip this patch)"
1187 msgid " (use \"git rebase --abort\" to check out the original branch)"
1191 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1195 msgid "You are currently splitting a commit during a rebase."
1199 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1203 msgid "You are currently editing a commit during a rebase."
1207 msgid " (use \"git commit --amend\" to amend the current commit)"
1212 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1216 msgid "You are currently cherry-picking."
1220 msgid " (all conflicts fixed: run \"git commit\")"
1224 msgid "You are currently bisecting."
1228 msgid " (use \"git bisect reset\" to get back to the original branch)"
1236 msgid "Not currently on any branch."
1240 msgid "Initial commit"
1244 msgid "Untracked files"
1248 msgid "Ignored files"
1253 msgid "Untracked files not listed%s"
1257 msgid " (use -u option to show untracked files)"
1266 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1271 msgid "no changes added to commit\n"
1277 "nothing added to commit but untracked files present (use \"git add\" to "
1283 msgid "nothing added to commit but untracked files present\n"
1288 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1291 #: wt-status.c:1045 wt-status.c:1050
1293 msgid "nothing to commit\n"
1298 msgid "nothing to commit (use -u to show untracked files)\n"
1303 msgid "nothing to commit, working directory clean\n"
1307 msgid "HEAD (no branch)"
1311 msgid "Initial commit on "
1318 #: wt-status.c:1184 wt-status.c:1187
1327 msgid "git add [options] [--] <filepattern>..."
1332 msgid "unexpected diff status %c"
1335 #: builtin/add.c:67 builtin/commit.c:231
1336 msgid "updating files failed"
1341 msgid "remove '%s'\n"
1344 #: builtin/add.c:176
1346 msgid "Path '%s' is in submodule '%.*s'"
1349 #: builtin/add.c:192
1350 msgid "Unstaged changes after refreshing the index:"
1353 #: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275
1355 msgid "pathspec '%s' did not match any files"
1358 #: builtin/add.c:209
1360 msgid "'%s' is beyond a symbolic link"
1363 #: builtin/add.c:276
1364 msgid "Could not read the index"
1367 #: builtin/add.c:286
1369 msgid "Could not open '%s' for writing."
1372 #: builtin/add.c:290
1373 msgid "Could not write patch"
1376 #: builtin/add.c:295
1378 msgid "Could not stat '%s'"
1381 #: builtin/add.c:297
1382 msgid "Empty patch. Aborted."
1385 #: builtin/add.c:303
1387 msgid "Could not apply '%s'"
1390 #: builtin/add.c:313
1391 msgid "The following paths are ignored by one of your .gitignore files:\n"
1394 #: builtin/add.c:319 builtin/clean.c:160 builtin/fetch.c:78 builtin/mv.c:63
1395 #: builtin/prune-packed.c:76 builtin/push.c:396 builtin/remote.c:1253
1400 #: builtin/add.c:320 builtin/apply.c:4365 builtin/commit.c:1160
1401 #: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1522
1402 #: builtin/mv.c:62 builtin/read-tree.c:112
1406 #: builtin/add.c:322
1407 msgid "interactive picking"
1410 #: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:258
1411 msgid "select hunks interactively"
1414 #: builtin/add.c:324
1415 msgid "edit current diff and apply"
1418 #: builtin/add.c:325
1419 msgid "allow adding otherwise ignored files"
1422 #: builtin/add.c:326
1423 msgid "update tracked files"
1426 #: builtin/add.c:327
1427 msgid "record only the fact that the path will be added later"
1430 #: builtin/add.c:328
1431 msgid "add changes from all tracked and untracked files"
1434 #: builtin/add.c:329
1435 msgid "don't add, only refresh the index"
1438 #: builtin/add.c:330
1439 msgid "just skip files which cannot be added because of errors"
1442 #: builtin/add.c:331
1443 msgid "check if - even missing - files are ignored in dry run"
1446 #: builtin/add.c:353
1448 msgid "Use -f if you really want to add them.\n"
1451 #: builtin/add.c:354
1452 msgid "no files added"
1455 #: builtin/add.c:360
1456 msgid "adding files failed"
1459 #: builtin/add.c:392
1460 msgid "-A and -u are mutually incompatible"
1463 #: builtin/add.c:394
1464 msgid "Option --ignore-missing can only be used together with --dry-run"
1467 #: builtin/add.c:414
1469 msgid "Nothing specified, nothing added.\n"
1472 #: builtin/add.c:415
1474 msgid "Maybe you wanted to say 'git add .'?\n"
1477 #: builtin/add.c:421 builtin/clean.c:203 builtin/commit.c:291 builtin/mv.c:82
1479 msgid "index file corrupt"
1482 #: builtin/add.c:481 builtin/apply.c:4461 builtin/mv.c:229 builtin/rm.c:370
1483 msgid "Unable to write new index file"
1486 #: builtin/apply.c:57
1487 msgid "git apply [options] [<patch>...]"
1490 #: builtin/apply.c:110
1492 msgid "unrecognized whitespace option '%s'"
1495 #: builtin/apply.c:125
1497 msgid "unrecognized whitespace ignore option '%s'"
1500 #: builtin/apply.c:823
1502 msgid "Cannot prepare timestamp regexp %s"
1505 #: builtin/apply.c:832
1507 msgid "regexec returned %d for input: %s"
1510 #: builtin/apply.c:913
1512 msgid "unable to find filename in patch at line %d"
1515 #: builtin/apply.c:945
1517 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1520 #: builtin/apply.c:949
1522 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1525 #: builtin/apply.c:950
1527 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1530 #: builtin/apply.c:957
1532 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1535 #: builtin/apply.c:1420
1537 msgid "recount: unexpected line: %.*s"
1540 #: builtin/apply.c:1477
1542 msgid "patch fragment without header at line %d: %.*s"
1545 #: builtin/apply.c:1494
1548 "git diff header lacks filename information when removing %d leading pathname "
1549 "component (line %d)"
1551 "git diff header lacks filename information when removing %d leading pathname "
1552 "components (line %d)"
1556 #: builtin/apply.c:1654
1557 msgid "new file depends on old contents"
1560 #: builtin/apply.c:1656
1561 msgid "deleted file still has contents"
1564 #: builtin/apply.c:1682
1566 msgid "corrupt patch at line %d"
1569 #: builtin/apply.c:1718
1571 msgid "new file %s depends on old contents"
1574 #: builtin/apply.c:1720
1576 msgid "deleted file %s still has contents"
1579 #: builtin/apply.c:1723
1581 msgid "** warning: file %s becomes empty but is not deleted"
1584 #: builtin/apply.c:1869
1586 msgid "corrupt binary patch at line %d: %.*s"
1589 #. there has to be one hunk (forward hunk)
1590 #: builtin/apply.c:1898
1592 msgid "unrecognized binary patch at line %d"
1595 #: builtin/apply.c:1984
1597 msgid "patch with only garbage at line %d"
1600 #: builtin/apply.c:2074
1602 msgid "unable to read symlink %s"
1605 #: builtin/apply.c:2078
1607 msgid "unable to open or read %s"
1610 #: builtin/apply.c:2682
1612 msgid "invalid start of line: '%c'"
1615 #: builtin/apply.c:2800
1617 msgid "Hunk #%d succeeded at %d (offset %d line)."
1618 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1622 #: builtin/apply.c:2812
1624 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1627 #: builtin/apply.c:2818
1630 "while searching for:\n"
1634 #: builtin/apply.c:2837
1636 msgid "missing binary patch data for '%s'"
1639 #: builtin/apply.c:2940
1641 msgid "binary patch does not apply to '%s'"
1644 #: builtin/apply.c:2946
1646 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1649 #: builtin/apply.c:2967
1651 msgid "patch failed: %s:%ld"
1654 #: builtin/apply.c:3089
1656 msgid "cannot checkout %s"
1659 #: builtin/apply.c:3134 builtin/apply.c:3143 builtin/apply.c:3187
1661 msgid "read of %s failed"
1664 #: builtin/apply.c:3167 builtin/apply.c:3389
1666 msgid "path %s has been renamed/deleted"
1669 #: builtin/apply.c:3248 builtin/apply.c:3403
1671 msgid "%s: does not exist in index"
1674 #: builtin/apply.c:3252 builtin/apply.c:3395 builtin/apply.c:3417
1679 #: builtin/apply.c:3257 builtin/apply.c:3411
1681 msgid "%s: does not match index"
1684 #: builtin/apply.c:3359
1685 msgid "removal patch leaves file contents"
1688 #: builtin/apply.c:3428
1690 msgid "%s: wrong type"
1693 #: builtin/apply.c:3430
1695 msgid "%s has type %o, expected %o"
1698 #: builtin/apply.c:3531
1700 msgid "%s: already exists in index"
1703 #: builtin/apply.c:3534
1705 msgid "%s: already exists in working directory"
1708 #: builtin/apply.c:3554
1710 msgid "new mode (%o) of %s does not match old mode (%o)"
1713 #: builtin/apply.c:3559
1715 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1718 #: builtin/apply.c:3567
1720 msgid "%s: patch does not apply"
1723 #: builtin/apply.c:3580
1725 msgid "Checking patch %s..."
1728 #: builtin/apply.c:3635 builtin/checkout.c:215 builtin/reset.c:124
1730 msgid "make_cache_entry failed for path '%s'"
1733 #: builtin/apply.c:3778
1735 msgid "unable to remove %s from index"
1738 #: builtin/apply.c:3806
1740 msgid "corrupt patch for subproject %s"
1743 #: builtin/apply.c:3810
1745 msgid "unable to stat newly created file '%s'"
1748 #: builtin/apply.c:3815
1750 msgid "unable to create backing store for newly created file %s"
1753 #: builtin/apply.c:3818 builtin/apply.c:3926
1755 msgid "unable to add cache entry for %s"
1758 #: builtin/apply.c:3851
1760 msgid "closing file '%s'"
1763 #: builtin/apply.c:3900
1765 msgid "unable to write file '%s' mode %o"
1768 #: builtin/apply.c:3987
1770 msgid "Applied patch %s cleanly."
1773 #: builtin/apply.c:3995
1774 msgid "internal error"
1777 #. Say this even without --verbose
1778 #: builtin/apply.c:3998
1780 msgid "Applying patch %%s with %d reject..."
1781 msgid_plural "Applying patch %%s with %d rejects..."
1785 #: builtin/apply.c:4008
1787 msgid "truncating .rej filename to %.*s.rej"
1790 #: builtin/apply.c:4029
1792 msgid "Hunk #%d applied cleanly."
1795 #: builtin/apply.c:4032
1797 msgid "Rejected hunk #%d."
1800 #: builtin/apply.c:4182
1801 msgid "unrecognized input"
1804 #: builtin/apply.c:4193
1805 msgid "unable to read index file"
1808 #: builtin/apply.c:4312 builtin/apply.c:4315 builtin/clone.c:91
1809 #: builtin/fetch.c:63
1813 #: builtin/apply.c:4313
1814 msgid "don't apply changes matching the given path"
1817 #: builtin/apply.c:4316
1818 msgid "apply changes matching the given path"
1821 #: builtin/apply.c:4318
1825 #: builtin/apply.c:4319
1826 msgid "remove <num> leading slashes from traditional diff paths"
1829 #: builtin/apply.c:4322
1830 msgid "ignore additions made by the patch"
1833 #: builtin/apply.c:4324
1834 msgid "instead of applying the patch, output diffstat for the input"
1837 #: builtin/apply.c:4328
1838 msgid "show number of added and deleted lines in decimal notation"
1841 #: builtin/apply.c:4330
1842 msgid "instead of applying the patch, output a summary for the input"
1845 #: builtin/apply.c:4332
1846 msgid "instead of applying the patch, see if the patch is applicable"
1849 #: builtin/apply.c:4334
1850 msgid "make sure the patch is applicable to the current index"
1853 #: builtin/apply.c:4336
1854 msgid "apply a patch without touching the working tree"
1857 #: builtin/apply.c:4338
1858 msgid "also apply the patch (use with --stat/--summary/--check)"
1861 #: builtin/apply.c:4340
1862 msgid "attempt three-way merge if a patch does not apply"
1865 #: builtin/apply.c:4342
1866 msgid "build a temporary index based on embedded index information"
1869 #: builtin/apply.c:4344 builtin/checkout-index.c:197 builtin/ls-files.c:460
1870 msgid "paths are separated with NUL character"
1873 #: builtin/apply.c:4347
1874 msgid "ensure at least <n> lines of context match"
1877 #: builtin/apply.c:4348
1881 #: builtin/apply.c:4349
1882 msgid "detect new or modified lines that have whitespace errors"
1885 #: builtin/apply.c:4352 builtin/apply.c:4355
1886 msgid "ignore changes in whitespace when finding context"
1889 #: builtin/apply.c:4358
1890 msgid "apply the patch in reverse"
1893 #: builtin/apply.c:4360
1894 msgid "don't expect at least one line of context"
1897 #: builtin/apply.c:4362
1898 msgid "leave the rejected hunks in corresponding *.rej files"
1901 #: builtin/apply.c:4364
1902 msgid "allow overlapping hunks"
1905 #: builtin/apply.c:4367
1906 msgid "tolerate incorrectly detected missing new-line at the end of file"
1909 #: builtin/apply.c:4370
1910 msgid "do not trust the line counts in the hunk headers"
1913 #: builtin/apply.c:4372
1917 #: builtin/apply.c:4373
1918 msgid "prepend <root> to all filenames"
1921 #: builtin/apply.c:4395
1922 msgid "--3way outside a repository"
1925 #: builtin/apply.c:4403
1926 msgid "--index outside a repository"
1929 #: builtin/apply.c:4406
1930 msgid "--cached outside a repository"
1933 #: builtin/apply.c:4422
1935 msgid "can't open patch '%s'"
1938 #: builtin/apply.c:4436
1940 msgid "squelched %d whitespace error"
1941 msgid_plural "squelched %d whitespace errors"
1945 #: builtin/apply.c:4442 builtin/apply.c:4452
1947 msgid "%d line adds whitespace errors."
1948 msgid_plural "%d lines add whitespace errors."
1952 #: builtin/archive.c:17
1954 msgid "could not create archive file '%s'"
1957 #: builtin/archive.c:20
1958 msgid "could not redirect output"
1961 #: builtin/archive.c:37
1962 msgid "git archive: Remote with no URL"
1965 #: builtin/archive.c:58
1966 msgid "git archive: expected ACK/NAK, got EOF"
1969 #: builtin/archive.c:63
1971 msgid "git archive: NACK %s"
1974 #: builtin/archive.c:65
1976 msgid "remote error: %s"
1979 #: builtin/archive.c:66
1980 msgid "git archive: protocol error"
1983 #: builtin/archive.c:71
1984 msgid "git archive: expected a flush"
1987 #: builtin/bisect--helper.c:7
1988 msgid "git bisect--helper --next-all [--no-checkout]"
1991 #: builtin/bisect--helper.c:17
1992 msgid "perform 'git bisect next'"
1995 #: builtin/bisect--helper.c:19
1996 msgid "update BISECT_HEAD instead of checking out the current commit"
1999 #: builtin/blame.c:25
2000 msgid "git blame [options] [rev-opts] [rev] [--] file"
2003 #: builtin/blame.c:30 builtin/shortlog.c:15
2004 msgid "[rev-opts] are documented in git-rev-list(1)"
2007 #: builtin/blame.c:2364
2008 msgid "Show blame entries as we find them, incrementally"
2011 #: builtin/blame.c:2365
2012 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2015 #: builtin/blame.c:2366
2016 msgid "Do not treat root commits as boundaries (Default: off)"
2019 #: builtin/blame.c:2367
2020 msgid "Show work cost statistics"
2023 #: builtin/blame.c:2368
2024 msgid "Show output score for blame entries"
2027 #: builtin/blame.c:2369
2028 msgid "Show original filename (Default: auto)"
2031 #: builtin/blame.c:2370
2032 msgid "Show original linenumber (Default: off)"
2035 #: builtin/blame.c:2371
2036 msgid "Show in a format designed for machine consumption"
2039 #: builtin/blame.c:2372
2040 msgid "Show porcelain format with per-line commit information"
2043 #: builtin/blame.c:2373
2044 msgid "Use the same output mode as git-annotate (Default: off)"
2047 #: builtin/blame.c:2374
2048 msgid "Show raw timestamp (Default: off)"
2051 #: builtin/blame.c:2375
2052 msgid "Show long commit SHA1 (Default: off)"
2055 #: builtin/blame.c:2376
2056 msgid "Suppress author name and timestamp (Default: off)"
2059 #: builtin/blame.c:2377
2060 msgid "Show author email instead of name (Default: off)"
2063 #: builtin/blame.c:2378
2064 msgid "Ignore whitespace differences"
2067 #: builtin/blame.c:2379
2068 msgid "Spend extra cycles to find better match"
2071 #: builtin/blame.c:2380
2072 msgid "Use revisions from <file> instead of calling git-rev-list"
2075 #: builtin/blame.c:2381
2076 msgid "Use <file>'s contents as the final image"
2079 #: builtin/blame.c:2382 builtin/blame.c:2383
2083 #: builtin/blame.c:2382
2084 msgid "Find line copies within and across files"
2087 #: builtin/blame.c:2383
2088 msgid "Find line movements within and across files"
2091 #: builtin/blame.c:2384
2095 #: builtin/blame.c:2384
2096 msgid "Process only line range n,m, counting from 1"
2099 #: builtin/branch.c:23
2100 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2103 #: builtin/branch.c:24
2104 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2107 #: builtin/branch.c:25
2108 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2111 #: builtin/branch.c:26
2112 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2115 #: builtin/branch.c:145
2118 "deleting branch '%s' that has been merged to\n"
2119 " '%s', but not yet merged to HEAD."
2122 #: builtin/branch.c:149
2125 "not deleting branch '%s' that is not yet merged to\n"
2126 " '%s', even though it is merged to HEAD."
2129 #: builtin/branch.c:163
2131 msgid "Couldn't look up commit object for '%s'"
2134 #: builtin/branch.c:167
2137 "The branch '%s' is not fully merged.\n"
2138 "If you are sure you want to delete it, run 'git branch -D %s'."
2141 #: builtin/branch.c:180
2142 msgid "Update of config-file failed"
2145 #: builtin/branch.c:208
2146 msgid "cannot use -a with -d"
2149 #: builtin/branch.c:214
2150 msgid "Couldn't look up commit object for HEAD"
2153 #: builtin/branch.c:222
2155 msgid "Cannot delete the branch '%s' which you are currently on."
2158 #: builtin/branch.c:235
2160 msgid "remote branch '%s' not found."
2163 #: builtin/branch.c:236
2165 msgid "branch '%s' not found."
2168 #: builtin/branch.c:250
2170 msgid "Error deleting remote branch '%s'"
2173 #: builtin/branch.c:251
2175 msgid "Error deleting branch '%s'"
2178 #: builtin/branch.c:258
2180 msgid "Deleted remote branch %s (was %s).\n"
2183 #: builtin/branch.c:259
2185 msgid "Deleted branch %s (was %s).\n"
2188 #: builtin/branch.c:361
2190 msgid "branch '%s' does not point at a commit"
2193 #: builtin/branch.c:433
2195 msgid "[%s: behind %d]"
2198 #: builtin/branch.c:435
2203 #: builtin/branch.c:439
2205 msgid "[%s: ahead %d]"
2208 #: builtin/branch.c:441
2213 #: builtin/branch.c:444
2215 msgid "[%s: ahead %d, behind %d]"
2218 #: builtin/branch.c:447
2220 msgid "[ahead %d, behind %d]"
2223 #: builtin/branch.c:560
2227 #: builtin/branch.c:625
2228 msgid "some refs could not be read"
2231 #: builtin/branch.c:638
2232 msgid "cannot rename the current branch while not on any."
2235 #: builtin/branch.c:648
2237 msgid "Invalid branch name: '%s'"
2240 #: builtin/branch.c:663
2241 msgid "Branch rename failed"
2244 #: builtin/branch.c:667
2246 msgid "Renamed a misnamed branch '%s' away"
2249 #: builtin/branch.c:671
2251 msgid "Branch renamed to %s, but HEAD is not updated!"
2254 #: builtin/branch.c:678
2255 msgid "Branch is renamed, but update of config-file failed"
2258 #: builtin/branch.c:693
2260 msgid "malformed object name %s"
2263 #: builtin/branch.c:717
2265 msgid "could not write branch description template: %s"
2268 #: builtin/branch.c:747
2269 msgid "Generic options"
2272 #: builtin/branch.c:749
2273 msgid "show hash and subject, give twice for upstream branch"
2276 #: builtin/branch.c:750
2277 msgid "suppress informational messages"
2280 #: builtin/branch.c:751
2281 msgid "set up tracking mode (see git-pull(1))"
2284 #: builtin/branch.c:753
2285 msgid "change upstream info"
2288 #: builtin/branch.c:757
2289 msgid "use colored output"
2292 #: builtin/branch.c:758
2293 msgid "act on remote-tracking branches"
2296 #: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788
2297 #: builtin/branch.c:794 builtin/commit.c:1378 builtin/commit.c:1379
2298 #: builtin/commit.c:1380 builtin/commit.c:1381 builtin/tag.c:470
2302 #: builtin/branch.c:762 builtin/branch.c:768
2303 msgid "print only branches that contain the commit"
2306 #: builtin/branch.c:774
2307 msgid "Specific git-branch actions:"
2310 #: builtin/branch.c:775
2311 msgid "list both remote-tracking and local branches"
2314 #: builtin/branch.c:777
2315 msgid "delete fully merged branch"
2318 #: builtin/branch.c:778
2319 msgid "delete branch (even if not merged)"
2322 #: builtin/branch.c:779
2323 msgid "move/rename a branch and its reflog"
2326 #: builtin/branch.c:780
2327 msgid "move/rename a branch, even if target exists"
2330 #: builtin/branch.c:781
2331 msgid "list branch names"
2334 #: builtin/branch.c:782
2335 msgid "create the branch's reflog"
2338 #: builtin/branch.c:784
2339 msgid "edit the description for the branch"
2342 #: builtin/branch.c:785
2343 msgid "force creation (when already exists)"
2346 #: builtin/branch.c:788
2347 msgid "print only not merged branches"
2350 #: builtin/branch.c:794
2351 msgid "print only merged branches"
2354 #: builtin/branch.c:798
2355 msgid "list branches in columns"
2358 #: builtin/branch.c:811
2359 msgid "Failed to resolve HEAD as a valid ref."
2362 #: builtin/branch.c:816 builtin/clone.c:561
2363 msgid "HEAD not found below refs/heads!"
2366 #: builtin/branch.c:836
2367 msgid "--column and --verbose are incompatible"
2370 #: builtin/branch.c:887
2372 msgid "branch '%s' does not exist"
2375 #: builtin/branch.c:899
2377 msgid "Branch '%s' has no upstream information"
2380 #: builtin/branch.c:914
2381 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2384 #: builtin/branch.c:917
2387 "The --set-upstream flag is deprecated and will be removed. Consider using --"
2388 "track or --set-upstream-to\n"
2391 #: builtin/branch.c:934
2395 "If you wanted to make '%s' track '%s', do this:\n"
2399 #: builtin/branch.c:935
2401 msgid " git branch -d %s\n"
2404 #: builtin/branch.c:936
2406 msgid " git branch --set-upstream-to %s\n"
2409 #: builtin/bundle.c:47
2411 msgid "%s is okay\n"
2414 #: builtin/bundle.c:56
2415 msgid "Need a repository to create a bundle."
2418 #: builtin/bundle.c:60
2419 msgid "Need a repository to unbundle."
2422 #: builtin/cat-file.c:247
2423 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2426 #: builtin/cat-file.c:248
2427 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2430 #: builtin/cat-file.c:266
2431 msgid "<type> can be one of: blob, tree, commit, tag"
2434 #: builtin/cat-file.c:267
2435 msgid "show object type"
2438 #: builtin/cat-file.c:268
2439 msgid "show object size"
2442 #: builtin/cat-file.c:270
2443 msgid "exit with zero when there's no error"
2446 #: builtin/cat-file.c:271
2447 msgid "pretty-print object's content"
2450 #: builtin/cat-file.c:273
2451 msgid "for blob objects, run textconv on object's content"
2454 #: builtin/cat-file.c:275
2455 msgid "show info and content of objects fed from the standard input"
2458 #: builtin/cat-file.c:278
2459 msgid "show info about objects fed from the standard input"
2462 #: builtin/check-attr.c:11
2463 msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2466 #: builtin/check-attr.c:12
2467 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2470 #: builtin/check-attr.c:19
2471 msgid "report all attributes set on file"
2474 #: builtin/check-attr.c:20
2475 msgid "use .gitattributes only from the index"
2478 #: builtin/check-attr.c:21 builtin/hash-object.c:75
2479 msgid "read file names from stdin"
2482 #: builtin/check-attr.c:23
2483 msgid "input paths are terminated by a null character"
2486 #: builtin/checkout-index.c:126
2487 msgid "git checkout-index [options] [--] [<file>...]"
2490 #: builtin/checkout-index.c:187
2491 msgid "check out all files in the index"
2494 #: builtin/checkout-index.c:188
2495 msgid "force overwrite of existing files"
2498 #: builtin/checkout-index.c:190
2499 msgid "no warning for existing files and files not in index"
2502 #: builtin/checkout-index.c:192
2503 msgid "don't checkout new files"
2506 #: builtin/checkout-index.c:194
2507 msgid "update stat information in the index file"
2510 #: builtin/checkout-index.c:200
2511 msgid "read list of paths from the standard input"
2514 #: builtin/checkout-index.c:202
2515 msgid "write the content to temporary files"
2518 #: builtin/checkout-index.c:203 builtin/column.c:30
2522 #: builtin/checkout-index.c:204
2523 msgid "when creating files, prepend <string>"
2526 #: builtin/checkout-index.c:207
2527 msgid "copy out the files from named stage"
2530 #: builtin/checkout.c:25
2531 msgid "git checkout [options] <branch>"
2534 #: builtin/checkout.c:26
2535 msgid "git checkout [options] [<branch>] -- <file>..."
2538 #: builtin/checkout.c:116 builtin/checkout.c:149
2540 msgid "path '%s' does not have our version"
2543 #: builtin/checkout.c:118 builtin/checkout.c:151
2545 msgid "path '%s' does not have their version"
2548 #: builtin/checkout.c:134
2550 msgid "path '%s' does not have all necessary versions"
2553 #: builtin/checkout.c:178
2555 msgid "path '%s' does not have necessary versions"
2558 #: builtin/checkout.c:195
2560 msgid "path '%s': cannot merge"
2563 #: builtin/checkout.c:212
2565 msgid "Unable to add merge result for '%s'"
2568 #: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
2569 #: builtin/checkout.c:245
2571 msgid "'%s' cannot be used with updating paths"
2574 #: builtin/checkout.c:248 builtin/checkout.c:251
2576 msgid "'%s' cannot be used with %s"
2579 #: builtin/checkout.c:254
2581 msgid "Cannot update paths and switch to branch '%s' at the same time."
2584 #: builtin/checkout.c:265 builtin/checkout.c:426
2585 msgid "corrupt index file"
2588 #: builtin/checkout.c:295 builtin/checkout.c:302
2590 msgid "path '%s' is unmerged"
2593 #: builtin/checkout.c:448
2594 msgid "you need to resolve your current index first"
2597 #: builtin/checkout.c:569
2599 msgid "Can not do reflog for '%s'\n"
2602 #: builtin/checkout.c:602
2603 msgid "HEAD is now at"
2606 #: builtin/checkout.c:609
2608 msgid "Reset branch '%s'\n"
2611 #: builtin/checkout.c:612
2613 msgid "Already on '%s'\n"
2616 #: builtin/checkout.c:616
2618 msgid "Switched to and reset branch '%s'\n"
2621 #: builtin/checkout.c:618 builtin/checkout.c:955
2623 msgid "Switched to a new branch '%s'\n"
2626 #: builtin/checkout.c:620
2628 msgid "Switched to branch '%s'\n"
2631 #: builtin/checkout.c:676
2633 msgid " ... and %d more.\n"
2636 #. The singular version
2637 #: builtin/checkout.c:682
2640 "Warning: you are leaving %d commit behind, not connected to\n"
2641 "any of your branches:\n"
2645 "Warning: you are leaving %d commits behind, not connected to\n"
2646 "any of your branches:\n"
2652 #: builtin/checkout.c:700
2655 "If you want to keep them by creating a new branch, this may be a good time\n"
2658 " git branch new_branch_name %s\n"
2662 #: builtin/checkout.c:730
2663 msgid "internal error in revision walk"
2666 #: builtin/checkout.c:734
2667 msgid "Previous HEAD position was"
2670 #: builtin/checkout.c:761 builtin/checkout.c:950
2671 msgid "You are on a branch yet to be born"
2675 #: builtin/checkout.c:886
2677 msgid "invalid reference: %s"
2680 #. case (1): want a tree
2681 #: builtin/checkout.c:925
2683 msgid "reference is not a tree: %s"
2686 #: builtin/checkout.c:964
2687 msgid "paths cannot be used with switching branches"
2690 #: builtin/checkout.c:967 builtin/checkout.c:971
2692 msgid "'%s' cannot be used with switching branches"
2695 #: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983
2696 #: builtin/checkout.c:986
2698 msgid "'%s' cannot be used with '%s'"
2701 #: builtin/checkout.c:991
2703 msgid "Cannot switch branch to a non-commit '%s'"
2706 #: builtin/checkout.c:1012 builtin/gc.c:177
2707 msgid "suppress progress reporting"
2710 #: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89
2711 #: builtin/remote.c:169 builtin/remote.c:171
2715 #: builtin/checkout.c:1014
2716 msgid "create and checkout a new branch"
2719 #: builtin/checkout.c:1016
2720 msgid "create/reset and checkout a branch"
2723 #: builtin/checkout.c:1017
2724 msgid "create reflog for new branch"
2727 #: builtin/checkout.c:1018
2728 msgid "detach the HEAD at named commit"
2731 #: builtin/checkout.c:1019
2732 msgid "set upstream info for new branch"
2735 #: builtin/checkout.c:1021
2739 #: builtin/checkout.c:1021
2740 msgid "new unparented branch"
2743 #: builtin/checkout.c:1022
2744 msgid "checkout our version for unmerged files"
2747 #: builtin/checkout.c:1024
2748 msgid "checkout their version for unmerged files"
2751 #: builtin/checkout.c:1026
2752 msgid "force checkout (throw away local modifications)"
2755 #: builtin/checkout.c:1027
2756 msgid "perform a 3-way merge with the new branch"
2759 #: builtin/checkout.c:1028 builtin/merge.c:215
2760 msgid "update ignored files (default)"
2763 #: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245
2767 #: builtin/checkout.c:1030
2768 msgid "conflict style (merge or diff3)"
2771 #: builtin/checkout.c:1033
2772 msgid "second guess 'git checkout no-such-branch'"
2775 #: builtin/checkout.c:1057
2776 msgid "-b, -B and --orphan are mutually exclusive"
2779 #: builtin/checkout.c:1074
2780 msgid "--track needs a branch name"
2783 #: builtin/checkout.c:1081
2784 msgid "Missing branch name; try -b"
2787 #: builtin/checkout.c:1116
2788 msgid "invalid path specification"
2791 #: builtin/checkout.c:1123
2794 "Cannot update paths and switch to branch '%s' at the same time.\n"
2795 "Did you intend to checkout '%s' which can not be resolved as commit?"
2798 #: builtin/checkout.c:1128
2800 msgid "git checkout: --detach does not take a path argument '%s'"
2803 #: builtin/checkout.c:1132
2805 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
2806 "checking out of the index."
2809 #: builtin/clean.c:20
2810 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
2813 #: builtin/clean.c:24
2815 msgid "Removing %s\n"
2818 #: builtin/clean.c:25
2820 msgid "Would remove %s\n"
2823 #: builtin/clean.c:26
2825 msgid "Skipping repository %s\n"
2828 #: builtin/clean.c:27
2830 msgid "Would skip repository %s\n"
2833 #: builtin/clean.c:28
2835 msgid "failed to remove %s"
2838 #: builtin/clean.c:159
2839 msgid "do not print names of files removed"
2842 #: builtin/clean.c:161
2846 #: builtin/clean.c:163
2847 msgid "remove whole directories"
2850 #: builtin/clean.c:164 builtin/describe.c:413 builtin/grep.c:717
2851 #: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182
2855 #: builtin/clean.c:165
2856 msgid "add <pattern> to ignore rules"
2859 #: builtin/clean.c:166
2860 msgid "remove ignored files, too"
2863 #: builtin/clean.c:168
2864 msgid "remove only ignored files"
2867 #: builtin/clean.c:186
2868 msgid "-x and -X cannot be used together"
2871 #: builtin/clean.c:190
2873 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
2876 #: builtin/clean.c:193
2878 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
2882 #: builtin/clone.c:36
2883 msgid "git clone [options] [--] <repo> [<dir>]"
2886 #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
2887 #: builtin/push.c:407
2888 msgid "force progress reporting"
2891 #: builtin/clone.c:66
2892 msgid "don't create a checkout"
2895 #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
2896 msgid "create a bare repository"
2899 #: builtin/clone.c:72
2900 msgid "create a mirror repository (implies bare)"
2903 #: builtin/clone.c:74
2904 msgid "to clone from a local repository"
2907 #: builtin/clone.c:76
2908 msgid "don't use local hardlinks, always copy"
2911 #: builtin/clone.c:78
2912 msgid "setup as shared repository"
2915 #: builtin/clone.c:80 builtin/clone.c:82
2916 msgid "initialize submodules in the clone"
2919 #: builtin/clone.c:83 builtin/init-db.c:485
2920 msgid "template-directory"
2923 #: builtin/clone.c:84 builtin/init-db.c:486
2924 msgid "directory from which templates will be used"
2927 #: builtin/clone.c:86
2928 msgid "reference repository"
2931 #: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
2935 #: builtin/clone.c:88
2936 msgid "use <name> instead of 'origin' to track upstream"
2939 #: builtin/clone.c:90
2940 msgid "checkout <branch> instead of the remote's HEAD"
2943 #: builtin/clone.c:92
2944 msgid "path to git-upload-pack on the remote"
2947 #: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662
2951 #: builtin/clone.c:94
2952 msgid "create a shallow clone of that depth"
2955 #: builtin/clone.c:96
2956 msgid "clone only one branch, HEAD or --branch"
2959 #: builtin/clone.c:97 builtin/init-db.c:494
2963 #: builtin/clone.c:98 builtin/init-db.c:495
2964 msgid "separate git dir from working tree"
2967 #: builtin/clone.c:99
2971 #: builtin/clone.c:100
2972 msgid "set config inside the new repository"
2975 #: builtin/clone.c:243
2977 msgid "reference repository '%s' is not a local directory."
2980 #: builtin/clone.c:306
2982 msgid "failed to create directory '%s'"
2985 #: builtin/clone.c:308 builtin/diff.c:77
2987 msgid "failed to stat '%s'"
2990 #: builtin/clone.c:310
2992 msgid "%s exists and is not a directory"
2995 #: builtin/clone.c:324
2997 msgid "failed to stat %s\n"
3000 #: builtin/clone.c:341
3002 msgid "failed to unlink '%s'"
3005 #: builtin/clone.c:346
3007 msgid "failed to create link '%s'"
3010 #: builtin/clone.c:350
3012 msgid "failed to copy file to '%s'"
3015 #: builtin/clone.c:373
3020 #: builtin/clone.c:443
3022 msgid "Could not find remote branch %s to clone."
3025 #: builtin/clone.c:552
3026 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3029 #: builtin/clone.c:690
3030 msgid "Too many arguments."
3033 #: builtin/clone.c:694
3034 msgid "You must specify a repository to clone."
3037 #: builtin/clone.c:705
3039 msgid "--bare and --origin %s options are incompatible."
3042 #: builtin/clone.c:708
3043 msgid "--bare and --separate-git-dir are incompatible."
3046 #: builtin/clone.c:721
3048 msgid "repository '%s' does not exist"
3051 #: builtin/clone.c:726
3052 msgid "--depth is ignored in local clones; use file:// instead."
3055 #: builtin/clone.c:736
3057 msgid "destination path '%s' already exists and is not an empty directory."
3060 #: builtin/clone.c:746
3062 msgid "working tree '%s' already exists."
3065 #: builtin/clone.c:759 builtin/clone.c:773
3067 msgid "could not create leading directories of '%s'"
3070 #: builtin/clone.c:762
3072 msgid "could not create work tree dir '%s'."
3075 #: builtin/clone.c:783
3077 msgid "Cloning into bare repository '%s'...\n"
3080 #: builtin/clone.c:785
3082 msgid "Cloning into '%s'...\n"
3085 #: builtin/clone.c:827
3087 msgid "Don't know how to clone %s"
3090 #: builtin/clone.c:876
3092 msgid "Remote branch %s not found in upstream %s"
3095 #: builtin/clone.c:883
3096 msgid "You appear to have cloned an empty repository."
3099 #: builtin/column.c:9
3100 msgid "git column [options]"
3103 #: builtin/column.c:26
3104 msgid "lookup config vars"
3107 #: builtin/column.c:27 builtin/column.c:28
3108 msgid "layout to use"
3111 #: builtin/column.c:29
3112 msgid "Maximum width"
3115 #: builtin/column.c:30
3116 msgid "Padding space on left border"
3119 #: builtin/column.c:31
3120 msgid "Padding space on right border"
3123 #: builtin/column.c:32
3124 msgid "Padding space between columns"
3127 #: builtin/column.c:51
3128 msgid "--command must be the first argument"
3131 #: builtin/commit.c:34
3132 msgid "git commit [options] [--] <filepattern>..."
3135 #: builtin/commit.c:39
3136 msgid "git status [options] [--] <filepattern>..."
3139 #: builtin/commit.c:44
3141 "Your name and email address were configured automatically based\n"
3142 "on your username and hostname. Please check that they are accurate.\n"
3143 "You can suppress this message by setting them explicitly:\n"
3145 " git config --global user.name \"Your Name\"\n"
3146 " git config --global user.email you@example.com\n"
3148 "After doing this, you may fix the identity used for this commit with:\n"
3150 " git commit --amend --reset-author\n"
3153 #: builtin/commit.c:56
3155 "You asked to amend the most recent commit, but doing so would make\n"
3156 "it empty. You can repeat your command with --allow-empty, or you can\n"
3157 "remove the commit entirely with \"git reset HEAD^\".\n"
3160 #: builtin/commit.c:61
3162 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3163 "If you wish to commit it anyway, use:\n"
3165 " git commit --allow-empty\n"
3167 "Otherwise, please use 'git reset'\n"
3170 #: builtin/commit.c:258
3171 msgid "failed to unpack HEAD tree object"
3174 #: builtin/commit.c:300
3175 msgid "unable to create temporary index"
3178 #: builtin/commit.c:306
3179 msgid "interactive add failed"
3182 #: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410
3183 msgid "unable to write new_index file"
3186 #: builtin/commit.c:391
3187 msgid "cannot do a partial commit during a merge."
3190 #: builtin/commit.c:393
3191 msgid "cannot do a partial commit during a cherry-pick."
3194 #: builtin/commit.c:403
3195 msgid "cannot read the index"
3198 #: builtin/commit.c:423
3199 msgid "unable to write temporary index file"
3202 #: builtin/commit.c:511 builtin/commit.c:517
3204 msgid "invalid commit: %s"
3207 #: builtin/commit.c:540
3208 msgid "malformed --author parameter"
3211 #: builtin/commit.c:560
3213 msgid "Malformed ident string: '%s'"
3216 #: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954
3218 msgid "could not lookup commit %s"
3221 #: builtin/commit.c:610 builtin/shortlog.c:272
3223 msgid "(reading log message from standard input)\n"
3226 #: builtin/commit.c:612
3227 msgid "could not read log from standard input"
3230 #: builtin/commit.c:616
3232 msgid "could not read log file '%s'"
3235 #: builtin/commit.c:622
3236 msgid "commit has empty message"
3239 #: builtin/commit.c:638
3240 msgid "could not read MERGE_MSG"
3243 #: builtin/commit.c:642
3244 msgid "could not read SQUASH_MSG"
3247 #: builtin/commit.c:646
3249 msgid "could not read '%s'"
3252 #: builtin/commit.c:707
3253 msgid "could not write commit template"
3256 #: builtin/commit.c:718
3260 "It looks like you may be committing a merge.\n"
3261 "If this is not correct, please remove the file\n"
3266 #: builtin/commit.c:723
3270 "It looks like you may be committing a cherry-pick.\n"
3271 "If this is not correct, please remove the file\n"
3276 #: builtin/commit.c:735
3278 "Please enter the commit message for your changes. Lines starting\n"
3279 "with '#' will be ignored, and an empty message aborts the commit.\n"
3282 #: builtin/commit.c:740
3284 "Please enter the commit message for your changes. Lines starting\n"
3285 "with '#' will be kept; you may remove them yourself if you want to.\n"
3286 "An empty message aborts the commit.\n"
3289 #: builtin/commit.c:753
3291 msgid "%sAuthor: %s"
3294 #: builtin/commit.c:760
3296 msgid "%sCommitter: %s"
3299 #: builtin/commit.c:780
3300 msgid "Cannot read index"
3303 #: builtin/commit.c:817
3304 msgid "Error building trees"
3307 #: builtin/commit.c:832 builtin/tag.c:361
3309 msgid "Please supply the message using either -m or -F option.\n"
3312 #: builtin/commit.c:929
3314 msgid "No existing author found with '%s'"
3317 #: builtin/commit.c:944 builtin/commit.c:1148
3319 msgid "Invalid untracked files mode '%s'"
3322 #: builtin/commit.c:984
3323 msgid "Using both --reset-author and --author does not make sense"
3326 #: builtin/commit.c:995
3327 msgid "You have nothing to amend."
3330 #: builtin/commit.c:998
3331 msgid "You are in the middle of a merge -- cannot amend."
3334 #: builtin/commit.c:1000
3335 msgid "You are in the middle of a cherry-pick -- cannot amend."
3338 #: builtin/commit.c:1003
3339 msgid "Options --squash and --fixup cannot be used together"
3342 #: builtin/commit.c:1013
3343 msgid "Only one of -c/-C/-F/--fixup can be used."
3346 #: builtin/commit.c:1015
3347 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3350 #: builtin/commit.c:1023
3351 msgid "--reset-author can be used only with -C, -c or --amend."
3354 #: builtin/commit.c:1040
3355 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3358 #: builtin/commit.c:1042
3359 msgid "No paths with --include/--only does not make sense."
3362 #: builtin/commit.c:1044
3363 msgid "Clever... amending the last one with dirty index."
3366 #: builtin/commit.c:1046
3367 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3370 #: builtin/commit.c:1056 builtin/tag.c:577
3372 msgid "Invalid cleanup mode %s"
3375 #: builtin/commit.c:1061
3376 msgid "Paths with -a does not make sense."
3379 #: builtin/commit.c:1067 builtin/commit.c:1202
3380 msgid "--long and -z are incompatible"
3383 #: builtin/commit.c:1162 builtin/commit.c:1400
3384 msgid "show status concisely"
3387 #: builtin/commit.c:1164 builtin/commit.c:1402
3388 msgid "show branch information"
3391 #: builtin/commit.c:1166 builtin/commit.c:1404 builtin/push.c:397
3392 msgid "machine-readable output"
3395 #: builtin/commit.c:1169 builtin/commit.c:1406
3396 msgid "show status in long format (default)"
3399 #: builtin/commit.c:1172 builtin/commit.c:1409
3400 msgid "terminate entries with NUL"
3403 #: builtin/commit.c:1174 builtin/commit.c:1412 builtin/fast-export.c:647
3404 #: builtin/fast-export.c:650 builtin/tag.c:461
3408 #: builtin/commit.c:1175 builtin/commit.c:1412
3409 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3412 #: builtin/commit.c:1178
3413 msgid "show ignored files"
3416 #: builtin/commit.c:1179 parse-options.h:151
3420 #: builtin/commit.c:1180
3422 "ignore changes to submodules, optional when: all, dirty, untracked. "
3426 #: builtin/commit.c:1182
3427 msgid "list untracked files in columns"
3430 #: builtin/commit.c:1256
3431 msgid "couldn't look up newly created commit"
3434 #: builtin/commit.c:1258
3435 msgid "could not parse newly created commit"
3438 #: builtin/commit.c:1299
3439 msgid "detached HEAD"
3442 #: builtin/commit.c:1301
3443 msgid " (root-commit)"
3446 #: builtin/commit.c:1370
3447 msgid "suppress summary after successful commit"
3450 #: builtin/commit.c:1371
3451 msgid "show diff in commit message template"
3454 #: builtin/commit.c:1373
3455 msgid "Commit message options"
3458 #: builtin/commit.c:1374 builtin/tag.c:459
3459 msgid "read message from file"
3462 #: builtin/commit.c:1375
3466 #: builtin/commit.c:1375
3467 msgid "override author for commit"
3470 #: builtin/commit.c:1376 builtin/gc.c:178
3474 #: builtin/commit.c:1376
3475 msgid "override date for commit"
3478 #: builtin/commit.c:1377 builtin/merge.c:206 builtin/notes.c:537
3479 #: builtin/notes.c:694 builtin/tag.c:457
3483 #: builtin/commit.c:1377
3484 msgid "commit message"
3487 #: builtin/commit.c:1378
3488 msgid "reuse and edit message from specified commit"
3491 #: builtin/commit.c:1379
3492 msgid "reuse message from specified commit"
3495 #: builtin/commit.c:1380
3496 msgid "use autosquash formatted message to fixup specified commit"
3499 #: builtin/commit.c:1381
3500 msgid "use autosquash formatted message to squash specified commit"
3503 #: builtin/commit.c:1382
3504 msgid "the commit is authored by me now (used with -C/-c/--amend)"
3507 #: builtin/commit.c:1383 builtin/log.c:1102 builtin/revert.c:109
3508 msgid "add Signed-off-by:"
3511 #: builtin/commit.c:1384
3512 msgid "use specified template file"
3515 #: builtin/commit.c:1385
3516 msgid "force edit of commit"
3519 #: builtin/commit.c:1386
3523 #: builtin/commit.c:1386 builtin/tag.c:462
3524 msgid "how to strip spaces and #comments from message"
3527 #: builtin/commit.c:1387
3528 msgid "include status in commit message template"
3531 #: builtin/commit.c:1388 builtin/merge.c:213 builtin/tag.c:463
3535 #: builtin/commit.c:1389 builtin/merge.c:214
3536 msgid "GPG sign commit"
3539 #. end commit message options
3540 #: builtin/commit.c:1392
3541 msgid "Commit contents options"
3544 #: builtin/commit.c:1393
3545 msgid "commit all changed files"
3548 #: builtin/commit.c:1394
3549 msgid "add specified files to index for commit"
3552 #: builtin/commit.c:1395
3553 msgid "interactively add files"
3556 #: builtin/commit.c:1396
3557 msgid "interactively add changes"
3560 #: builtin/commit.c:1397
3561 msgid "commit only specified files"
3564 #: builtin/commit.c:1398
3565 msgid "bypass pre-commit hook"
3568 #: builtin/commit.c:1399
3569 msgid "show what would be committed"
3572 #: builtin/commit.c:1410
3573 msgid "amend previous commit"
3576 #: builtin/commit.c:1411
3577 msgid "bypass post-rewrite hook"
3580 #: builtin/commit.c:1416
3581 msgid "ok to record an empty change"
3584 #: builtin/commit.c:1419
3585 msgid "ok to record a change with an empty message"
3588 #: builtin/commit.c:1451
3589 msgid "could not parse HEAD commit"
3592 #: builtin/commit.c:1489 builtin/merge.c:508
3594 msgid "could not open '%s' for reading"
3597 #: builtin/commit.c:1496
3599 msgid "Corrupt MERGE_HEAD file (%s)"
3602 #: builtin/commit.c:1503
3603 msgid "could not read MERGE_MODE"
3606 #: builtin/commit.c:1522
3608 msgid "could not read commit message: %s"
3611 #: builtin/commit.c:1536
3613 msgid "Aborting commit; you did not edit the message.\n"
3616 #: builtin/commit.c:1541
3618 msgid "Aborting commit due to empty commit message.\n"
3621 #: builtin/commit.c:1556 builtin/merge.c:833 builtin/merge.c:858
3622 msgid "failed to write commit object"
3625 #: builtin/commit.c:1577
3626 msgid "cannot lock HEAD ref"
3629 #: builtin/commit.c:1581
3630 msgid "cannot update HEAD ref"
3633 #: builtin/commit.c:1592
3635 "Repository has been updated, but unable to write\n"
3636 "new_index file. Check that disk is not full or quota is\n"
3637 "not exceeded, and then \"git reset HEAD\" to recover."
3640 #: builtin/config.c:7
3641 msgid "git config [options]"
3644 #: builtin/config.c:51
3645 msgid "Config file location"
3648 #: builtin/config.c:52
3649 msgid "use global config file"
3652 #: builtin/config.c:53
3653 msgid "use system config file"
3656 #: builtin/config.c:54
3657 msgid "use repository config file"
3660 #: builtin/config.c:55
3661 msgid "use given config file"
3664 #: builtin/config.c:56
3668 #: builtin/config.c:57
3669 msgid "get value: name [value-regex]"
3672 #: builtin/config.c:58
3673 msgid "get all values: key [value-regex]"
3676 #: builtin/config.c:59
3677 msgid "get values for regexp: name-regex [value-regex]"
3680 #: builtin/config.c:60
3681 msgid "replace all matching variables: name value [value_regex]"
3684 #: builtin/config.c:61
3685 msgid "add a new variable: name value"
3688 #: builtin/config.c:62
3689 msgid "remove a variable: name [value-regex]"
3692 #: builtin/config.c:63
3693 msgid "remove all matches: name [value-regex]"
3696 #: builtin/config.c:64
3697 msgid "rename section: old-name new-name"
3700 #: builtin/config.c:65
3701 msgid "remove a section: name"
3704 #: builtin/config.c:66
3708 #: builtin/config.c:67
3709 msgid "open an editor"
3712 #: builtin/config.c:68 builtin/config.c:69
3716 #: builtin/config.c:68
3717 msgid "find the color configured: [default]"
3720 #: builtin/config.c:69
3721 msgid "find the color setting: [stdout-is-tty]"
3724 #: builtin/config.c:70
3728 #: builtin/config.c:71
3729 msgid "value is \"true\" or \"false\""
3732 #: builtin/config.c:72
3733 msgid "value is decimal number"
3736 #: builtin/config.c:73
3737 msgid "value is --bool or --int"
3740 #: builtin/config.c:74
3741 msgid "value is a path (file or directory name)"
3744 #: builtin/config.c:75
3748 #: builtin/config.c:76
3749 msgid "terminate values with NUL byte"
3752 #: builtin/config.c:77
3753 msgid "respect include directives on lookup"
3756 #: builtin/count-objects.c:69
3757 msgid "git count-objects [-v]"
3760 #: builtin/describe.c:15
3761 msgid "git describe [options] <committish>*"
3764 #: builtin/describe.c:16
3765 msgid "git describe [options] --dirty"
3768 #: builtin/describe.c:234
3770 msgid "annotated tag %s not available"
3773 #: builtin/describe.c:238
3775 msgid "annotated tag %s has no embedded name"
3778 #: builtin/describe.c:240
3780 msgid "tag '%s' is really '%s' here"
3783 #: builtin/describe.c:267
3785 msgid "Not a valid object name %s"
3788 #: builtin/describe.c:270
3790 msgid "%s is not a valid '%s' object"
3793 #: builtin/describe.c:287
3795 msgid "no tag exactly matches '%s'"
3798 #: builtin/describe.c:289
3800 msgid "searching to describe %s\n"
3803 #: builtin/describe.c:329
3805 msgid "finished search at %s\n"
3808 #: builtin/describe.c:353
3811 "No annotated tags can describe '%s'.\n"
3812 "However, there were unannotated tags: try --tags."
3815 #: builtin/describe.c:357
3818 "No tags can describe '%s'.\n"
3819 "Try --always, or create some tags."
3822 #: builtin/describe.c:378
3824 msgid "traversed %lu commits\n"
3827 #: builtin/describe.c:381
3830 "more than %i tags found; listed %i most recent\n"
3831 "gave up search at %s\n"
3834 #: builtin/describe.c:403
3835 msgid "find the tag that comes after the commit"
3838 #: builtin/describe.c:404
3839 msgid "debug search strategy on stderr"
3842 #: builtin/describe.c:405
3843 msgid "use any ref in .git/refs"
3846 #: builtin/describe.c:406
3847 msgid "use any tag in .git/refs/tags"
3850 #: builtin/describe.c:407
3851 msgid "always use long format"
3854 #: builtin/describe.c:410
3855 msgid "only output exact matches"
3858 #: builtin/describe.c:412
3859 msgid "consider <n> most recent tags (default: 10)"
3862 #: builtin/describe.c:414
3863 msgid "only consider tags matching <pattern>"
3866 #: builtin/describe.c:416 builtin/name-rev.c:238
3867 msgid "show abbreviated commit object as fallback"
3870 #: builtin/describe.c:417
3874 #: builtin/describe.c:418
3875 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
3878 #: builtin/describe.c:436
3879 msgid "--long is incompatible with --abbrev=0"
3882 #: builtin/describe.c:462
3883 msgid "No names found, cannot describe anything."
3886 #: builtin/describe.c:482
3887 msgid "--dirty is incompatible with committishes"
3890 #: builtin/diff.c:79
3892 msgid "'%s': not a regular file or symlink"
3895 #: builtin/diff.c:228
3897 msgid "invalid option: %s"
3900 #: builtin/diff.c:305
3901 msgid "Not a git repository"
3904 #: builtin/diff.c:348
3906 msgid "invalid object '%s' given."
3909 #: builtin/diff.c:353
3911 msgid "more than %d trees given: '%s'"
3914 #: builtin/diff.c:363
3916 msgid "more than two blobs given: '%s'"
3919 #: builtin/diff.c:371
3921 msgid "unhandled object '%s' given."
3924 #: builtin/fast-export.c:22
3925 msgid "git fast-export [rev-list-opts]"
3928 #: builtin/fast-export.c:646
3929 msgid "show progress after <n> objects"
3932 #: builtin/fast-export.c:648
3933 msgid "select handling of signed tags"
3936 #: builtin/fast-export.c:651
3937 msgid "select handling of tags that tag filtered objects"
3940 #: builtin/fast-export.c:654
3941 msgid "Dump marks to this file"
3944 #: builtin/fast-export.c:656
3945 msgid "Import marks from this file"
3948 #: builtin/fast-export.c:658
3949 msgid "Fake a tagger when tags lack one"
3952 #: builtin/fast-export.c:660
3953 msgid "Output full tree for each commit"
3956 #: builtin/fast-export.c:662
3957 msgid "Use the done feature to terminate the stream"
3960 #: builtin/fast-export.c:663
3961 msgid "Skip output of blob data"
3964 #: builtin/fetch.c:20
3965 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
3968 #: builtin/fetch.c:21
3969 msgid "git fetch [<options>] <group>"
3972 #: builtin/fetch.c:22
3973 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
3976 #: builtin/fetch.c:23
3977 msgid "git fetch --all [<options>]"
3980 #: builtin/fetch.c:60
3981 msgid "fetch from all remotes"
3984 #: builtin/fetch.c:62
3985 msgid "append to .git/FETCH_HEAD instead of overwriting"
3988 #: builtin/fetch.c:64
3989 msgid "path to upload pack on remote end"
3992 #: builtin/fetch.c:65
3993 msgid "force overwrite of local branch"
3996 #: builtin/fetch.c:67
3997 msgid "fetch from multiple remotes"
4000 #: builtin/fetch.c:69
4001 msgid "fetch all tags and associated objects"
4004 #: builtin/fetch.c:71
4005 msgid "do not fetch all tags (--no-tags)"
4008 #: builtin/fetch.c:73
4009 msgid "prune remote-tracking branches no longer on remote"
4012 #: builtin/fetch.c:74
4016 #: builtin/fetch.c:75
4017 msgid "control recursive fetching of submodules"
4020 #: builtin/fetch.c:79
4021 msgid "keep downloaded pack"
4024 #: builtin/fetch.c:81
4025 msgid "allow updating of HEAD ref"
4028 #: builtin/fetch.c:84
4029 msgid "deepen history of shallow clone"
4032 #: builtin/fetch.c:85 builtin/log.c:1119
4036 #: builtin/fetch.c:86
4037 msgid "prepend this to submodule path output"
4040 #: builtin/fetch.c:89
4041 msgid "default mode for recursion"
4044 #: builtin/fetch.c:201
4045 msgid "Couldn't find remote ref HEAD"
4048 #: builtin/fetch.c:254
4050 msgid "object %s not found"
4053 #: builtin/fetch.c:259
4054 msgid "[up to date]"
4057 #: builtin/fetch.c:273
4059 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4062 #: builtin/fetch.c:274 builtin/fetch.c:360
4066 #: builtin/fetch.c:285
4067 msgid "[tag update]"
4070 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
4071 msgid " (unable to update local ref)"
4074 #: builtin/fetch.c:305
4078 #: builtin/fetch.c:308
4079 msgid "[new branch]"
4082 #: builtin/fetch.c:311
4086 #: builtin/fetch.c:356
4087 msgid "unable to update local ref"
4090 #: builtin/fetch.c:356
4091 msgid "forced update"
4094 #: builtin/fetch.c:362
4095 msgid "(non-fast-forward)"
4098 #: builtin/fetch.c:393 builtin/fetch.c:685
4100 msgid "cannot open %s: %s\n"
4103 #: builtin/fetch.c:402
4105 msgid "%s did not send all necessary objects\n"
4108 #: builtin/fetch.c:488
4113 #: builtin/fetch.c:499
4116 "some local refs could not be updated; try running\n"
4117 " 'git remote prune %s' to remove any old, conflicting branches"
4120 #: builtin/fetch.c:549
4122 msgid " (%s will become dangling)"
4125 #: builtin/fetch.c:550
4127 msgid " (%s has become dangling)"
4130 #: builtin/fetch.c:557
4134 #: builtin/fetch.c:558 builtin/remote.c:1055
4138 #: builtin/fetch.c:675
4140 msgid "Refusing to fetch into current branch %s of non-bare repository"
4143 #: builtin/fetch.c:709
4145 msgid "Don't know how to fetch from %s"
4148 #: builtin/fetch.c:786
4150 msgid "Option \"%s\" value \"%s\" is not valid for %s"
4153 #: builtin/fetch.c:789
4155 msgid "Option \"%s\" is ignored for %s\n"
4158 #: builtin/fetch.c:891
4160 msgid "Fetching %s\n"
4163 #: builtin/fetch.c:893 builtin/remote.c:100
4165 msgid "Could not fetch %s"
4168 #: builtin/fetch.c:912
4170 "No remote repository specified. Please, specify either a URL or a\n"
4171 "remote name from which new revisions should be fetched."
4174 #: builtin/fetch.c:932
4175 msgid "You need to specify a tag name."
4178 #: builtin/fetch.c:984
4179 msgid "fetch --all does not take a repository argument"
4182 #: builtin/fetch.c:986
4183 msgid "fetch --all does not make sense with refspecs"
4186 #: builtin/fetch.c:997
4188 msgid "No such remote or remote group: %s"
4191 #: builtin/fetch.c:1005
4192 msgid "Fetching a group and specifying refspecs does not make sense"
4195 #: builtin/fmt-merge-msg.c:13
4196 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4199 #: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701
4200 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175
4201 #: builtin/tag.c:448 parse-options.h:133 parse-options.h:239
4205 #: builtin/fmt-merge-msg.c:660
4206 msgid "populate log with at most <n> entries from shortlog"
4209 #: builtin/fmt-merge-msg.c:663
4210 msgid "alias for --log (deprecated)"
4213 #: builtin/fmt-merge-msg.c:666
4217 #: builtin/fmt-merge-msg.c:667
4218 msgid "use <text> as start of message"
4221 #: builtin/fmt-merge-msg.c:668
4222 msgid "file to read from"
4225 #: builtin/for-each-ref.c:979
4226 msgid "git for-each-ref [options] [<pattern>]"
4229 #: builtin/for-each-ref.c:994
4230 msgid "quote placeholders suitably for shells"
4233 #: builtin/for-each-ref.c:996
4234 msgid "quote placeholders suitably for perl"
4237 #: builtin/for-each-ref.c:998
4238 msgid "quote placeholders suitably for python"
4241 #: builtin/for-each-ref.c:1000
4242 msgid "quote placeholders suitably for tcl"
4245 #: builtin/for-each-ref.c:1003
4246 msgid "show only <n> matched refs"
4249 #: builtin/for-each-ref.c:1004
4253 #: builtin/for-each-ref.c:1004
4254 msgid "format to use for the output"
4257 #: builtin/for-each-ref.c:1005
4261 #: builtin/for-each-ref.c:1006
4262 msgid "field name to sort on"
4265 #: builtin/fsck.c:608
4266 msgid "git fsck [options] [<object>...]"
4269 #: builtin/fsck.c:614
4270 msgid "show unreachable objects"
4273 #: builtin/fsck.c:615
4274 msgid "show dangling objects"
4277 #: builtin/fsck.c:616
4281 #: builtin/fsck.c:617
4282 msgid "report root nodes"
4285 #: builtin/fsck.c:618
4286 msgid "make index objects head nodes"
4289 #: builtin/fsck.c:619
4290 msgid "make reflogs head nodes (default)"
4293 #: builtin/fsck.c:620
4294 msgid "also consider packs and alternate objects"
4297 #: builtin/fsck.c:621
4298 msgid "enable more strict checking"
4301 #: builtin/fsck.c:623
4302 msgid "write dangling objects in .git/lost-found"
4305 #: builtin/fsck.c:624 builtin/prune.c:134
4306 msgid "show progress"
4310 msgid "git gc [options]"
4315 msgid "Invalid %s: '%s'"
4320 msgid "insanely long object directory %.*s"
4324 msgid "prune unreferenced objects"
4328 msgid "be more thorough (increased runtime)"
4332 msgid "enable auto-gc mode"
4338 "Auto packing the repository for optimum performance. You may also\n"
4339 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
4344 "There are too many unreachable loose objects; run 'git prune' to remove them."
4347 #: builtin/grep.c:22
4348 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4351 #: builtin/grep.c:217
4353 msgid "grep: failed to create thread: %s"
4356 #: builtin/grep.c:365
4358 msgid "Failed to chdir: %s"
4361 #: builtin/grep.c:443 builtin/grep.c:478
4363 msgid "unable to read tree (%s)"
4366 #: builtin/grep.c:493
4368 msgid "unable to grep from object of type %s"
4371 #: builtin/grep.c:551
4373 msgid "switch `%c' expects a numerical value"
4376 #: builtin/grep.c:568
4378 msgid "cannot open '%s'"
4381 #: builtin/grep.c:643
4382 msgid "search in index instead of in the work tree"
4385 #: builtin/grep.c:645
4386 msgid "find in contents not managed by git"
4389 #: builtin/grep.c:647
4390 msgid "search in both tracked and untracked files"
4393 #: builtin/grep.c:649
4394 msgid "search also in ignored files"
4397 #: builtin/grep.c:652
4398 msgid "show non-matching lines"
4401 #: builtin/grep.c:654
4402 msgid "case insensitive matching"
4405 #: builtin/grep.c:656
4406 msgid "match patterns only at word boundaries"
4409 #: builtin/grep.c:658
4410 msgid "process binary files as text"
4413 #: builtin/grep.c:660
4414 msgid "don't match patterns in binary files"
4417 #: builtin/grep.c:663
4418 msgid "descend at most <depth> levels"
4421 #: builtin/grep.c:667
4422 msgid "use extended POSIX regular expressions"
4425 #: builtin/grep.c:670
4426 msgid "use basic POSIX regular expressions (default)"
4429 #: builtin/grep.c:673
4430 msgid "interpret patterns as fixed strings"
4433 #: builtin/grep.c:676
4434 msgid "use Perl-compatible regular expressions"
4437 #: builtin/grep.c:679
4438 msgid "show line numbers"
4441 #: builtin/grep.c:680
4442 msgid "don't show filenames"
4445 #: builtin/grep.c:681
4446 msgid "show filenames"
4449 #: builtin/grep.c:683
4450 msgid "show filenames relative to top directory"
4453 #: builtin/grep.c:685
4454 msgid "show only filenames instead of matching lines"
4457 #: builtin/grep.c:687
4458 msgid "synonym for --files-with-matches"
4461 #: builtin/grep.c:690
4462 msgid "show only the names of files without match"
4465 #: builtin/grep.c:692
4466 msgid "print NUL after filenames"
4469 #: builtin/grep.c:694
4470 msgid "show the number of matches instead of matching lines"
4473 #: builtin/grep.c:695
4474 msgid "highlight matches"
4477 #: builtin/grep.c:697
4478 msgid "print empty line between matches from different files"
4481 #: builtin/grep.c:699
4482 msgid "show filename only once above matches from same file"
4485 #: builtin/grep.c:702
4486 msgid "show <n> context lines before and after matches"
4489 #: builtin/grep.c:705
4490 msgid "show <n> context lines before matches"
4493 #: builtin/grep.c:707
4494 msgid "show <n> context lines after matches"
4497 #: builtin/grep.c:708
4498 msgid "shortcut for -C NUM"
4501 #: builtin/grep.c:711
4502 msgid "show a line with the function name before matches"
4505 #: builtin/grep.c:713
4506 msgid "show the surrounding function"
4509 #: builtin/grep.c:716
4510 msgid "read patterns from file"
4513 #: builtin/grep.c:718
4514 msgid "match <pattern>"
4517 #: builtin/grep.c:720
4518 msgid "combine patterns specified with -e"
4521 #: builtin/grep.c:732
4522 msgid "indicate hit with exit status without output"
4525 #: builtin/grep.c:734
4526 msgid "show only matches from files that match all patterns"
4529 #: builtin/grep.c:736
4530 msgid "show parse tree for grep expression"
4533 #: builtin/grep.c:740
4537 #: builtin/grep.c:740
4538 msgid "show matching files in the pager"
4541 #: builtin/grep.c:743
4542 msgid "allow calling of grep(1) (ignored by this build)"
4545 #: builtin/grep.c:744 builtin/show-ref.c:184
4549 #: builtin/grep.c:811
4550 msgid "no pattern given."
4553 #: builtin/grep.c:825
4555 msgid "bad object %s"
4558 #: builtin/grep.c:866
4559 msgid "--open-files-in-pager only works on the worktree"
4562 #: builtin/grep.c:889
4563 msgid "--cached or --untracked cannot be used with --no-index."
4566 #: builtin/grep.c:894
4567 msgid "--no-index or --untracked cannot be used with revs."
4570 #: builtin/grep.c:897
4571 msgid "--[no-]exclude-standard cannot be used for tracked contents."
4574 #: builtin/grep.c:905
4575 msgid "both --cached and trees are given."
4578 #: builtin/hash-object.c:60
4580 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
4584 #: builtin/hash-object.c:61
4585 msgid "git hash-object --stdin-paths < <list-of-paths>"
4588 #: builtin/hash-object.c:72
4592 #: builtin/hash-object.c:72
4596 #: builtin/hash-object.c:73
4597 msgid "write the object into the object database"
4600 #: builtin/hash-object.c:74
4601 msgid "read the object from stdin"
4604 #: builtin/hash-object.c:76
4605 msgid "store file as is without filters"
4608 #: builtin/hash-object.c:77
4609 msgid "process file as it were from this path"
4612 #: builtin/help.c:43
4613 msgid "print all available commands"
4616 #: builtin/help.c:44
4617 msgid "show man page"
4620 #: builtin/help.c:45
4621 msgid "show manual in web browser"
4624 #: builtin/help.c:47
4625 msgid "show info page"
4628 #: builtin/help.c:53
4629 msgid "git help [--all] [--man|--web|--info] [command]"
4632 #: builtin/help.c:65
4634 msgid "unrecognized help format '%s'"
4637 #: builtin/help.c:93
4638 msgid "Failed to start emacsclient."
4641 #: builtin/help.c:106
4642 msgid "Failed to parse emacsclient version."
4645 #: builtin/help.c:114
4647 msgid "emacsclient version '%d' too old (< 22)."
4650 #: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
4652 msgid "failed to exec '%s': %s"
4655 #: builtin/help.c:217
4658 "'%s': path for unsupported man viewer.\n"
4659 "Please consider using 'man.<tool>.cmd' instead."
4662 #: builtin/help.c:229
4665 "'%s': cmd for supported man viewer.\n"
4666 "Please consider using 'man.<tool>.path' instead."
4669 #: builtin/help.c:299
4670 msgid "The most commonly used git commands are:"
4673 #: builtin/help.c:367
4675 msgid "'%s': unknown man viewer."
4678 #: builtin/help.c:384
4679 msgid "no man viewer handled the request"
4682 #: builtin/help.c:392
4683 msgid "no info viewer handled the request"
4686 #: builtin/help.c:447 builtin/help.c:454
4691 #: builtin/help.c:470
4693 msgid "`git %s' is aliased to `%s'"
4696 #: builtin/index-pack.c:170
4698 msgid "object type mismatch at %s"
4701 #: builtin/index-pack.c:190
4702 msgid "object of unexpected type"
4705 #: builtin/index-pack.c:227
4707 msgid "cannot fill %d byte"
4708 msgid_plural "cannot fill %d bytes"
4712 #: builtin/index-pack.c:237
4716 #: builtin/index-pack.c:238
4717 msgid "read error on input"
4720 #: builtin/index-pack.c:250
4721 msgid "used more bytes than were available"
4724 #: builtin/index-pack.c:257
4725 msgid "pack too large for current definition of off_t"
4728 #: builtin/index-pack.c:273
4730 msgid "unable to create '%s'"
4733 #: builtin/index-pack.c:278
4735 msgid "cannot open packfile '%s'"
4738 #: builtin/index-pack.c:292
4739 msgid "pack signature mismatch"
4742 #: builtin/index-pack.c:294
4744 msgid "pack version %<PRIu32> unsupported"
4747 #: builtin/index-pack.c:312
4749 msgid "pack has bad object at offset %lu: %s"
4752 #: builtin/index-pack.c:434
4754 msgid "inflate returned %d"
4757 #: builtin/index-pack.c:483
4758 msgid "offset value overflow for delta base object"
4761 #: builtin/index-pack.c:491
4762 msgid "delta base offset is out of bound"
4765 #: builtin/index-pack.c:499
4767 msgid "unknown object type %d"
4770 #: builtin/index-pack.c:530
4771 msgid "cannot pread pack file"
4774 #: builtin/index-pack.c:532
4776 msgid "premature end of pack file, %lu byte missing"
4777 msgid_plural "premature end of pack file, %lu bytes missing"
4781 #: builtin/index-pack.c:558
4782 msgid "serious inflate inconsistency"
4785 #: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
4786 #: builtin/index-pack.c:712 builtin/index-pack.c:721
4788 msgid "SHA1 COLLISION FOUND WITH %s !"
4791 #: builtin/index-pack.c:652 builtin/pack-objects.c:170
4792 #: builtin/pack-objects.c:262
4794 msgid "unable to read %s"
4797 #: builtin/index-pack.c:718
4799 msgid "cannot read existing object %s"
4802 #: builtin/index-pack.c:732
4804 msgid "invalid blob object %s"
4807 #: builtin/index-pack.c:747
4812 #: builtin/index-pack.c:749
4813 msgid "Error in object"
4816 #: builtin/index-pack.c:751
4818 msgid "Not all child objects of %s are reachable"
4821 #: builtin/index-pack.c:821 builtin/index-pack.c:847
4822 msgid "failed to apply delta"
4825 #: builtin/index-pack.c:986
4826 msgid "Receiving objects"
4829 #: builtin/index-pack.c:986
4830 msgid "Indexing objects"
4833 #: builtin/index-pack.c:1012
4834 msgid "pack is corrupted (SHA1 mismatch)"
4837 #: builtin/index-pack.c:1017
4838 msgid "cannot fstat packfile"
4841 #: builtin/index-pack.c:1020
4842 msgid "pack has junk at the end"
4845 #: builtin/index-pack.c:1031
4846 msgid "confusion beyond insanity in parse_pack_objects()"
4849 #: builtin/index-pack.c:1054
4850 msgid "Resolving deltas"
4853 #: builtin/index-pack.c:1064
4855 msgid "unable to create thread: %s"
4858 #: builtin/index-pack.c:1106
4859 msgid "confusion beyond insanity"
4862 #: builtin/index-pack.c:1112
4864 msgid "completed with %d local objects"
4867 #: builtin/index-pack.c:1121
4869 msgid "Unexpected tail checksum for %s (disk corruption?)"
4872 #: builtin/index-pack.c:1125
4874 msgid "pack has %d unresolved delta"
4875 msgid_plural "pack has %d unresolved deltas"
4879 #: builtin/index-pack.c:1150
4881 msgid "unable to deflate appended object (%d)"
4884 #: builtin/index-pack.c:1229
4886 msgid "local object %s is corrupt"
4889 #: builtin/index-pack.c:1253
4890 msgid "error while closing pack file"
4893 #: builtin/index-pack.c:1266
4895 msgid "cannot write keep file '%s'"
4898 #: builtin/index-pack.c:1274
4900 msgid "cannot close written keep file '%s'"
4903 #: builtin/index-pack.c:1287
4904 msgid "cannot store pack file"
4907 #: builtin/index-pack.c:1298
4908 msgid "cannot store index file"
4911 #: builtin/index-pack.c:1331
4913 msgid "bad pack.indexversion=%<PRIu32>"
4916 #: builtin/index-pack.c:1337
4918 msgid "invalid number of threads specified (%d)"
4921 #: builtin/index-pack.c:1341 builtin/index-pack.c:1514
4923 msgid "no threads support, ignoring %s"
4926 #: builtin/index-pack.c:1399
4928 msgid "Cannot open existing pack file '%s'"
4931 #: builtin/index-pack.c:1401
4933 msgid "Cannot open existing pack idx file for '%s'"
4936 #: builtin/index-pack.c:1448
4938 msgid "non delta: %d object"
4939 msgid_plural "non delta: %d objects"
4943 #: builtin/index-pack.c:1455
4945 msgid "chain length = %d: %lu object"
4946 msgid_plural "chain length = %d: %lu objects"
4950 #: builtin/index-pack.c:1482
4951 msgid "Cannot come back to cwd"
4954 #: builtin/index-pack.c:1526 builtin/index-pack.c:1529
4955 #: builtin/index-pack.c:1541 builtin/index-pack.c:1545
4960 #: builtin/index-pack.c:1559
4961 msgid "--fix-thin cannot be used without --stdin"
4964 #: builtin/index-pack.c:1563 builtin/index-pack.c:1573
4966 msgid "packfile name '%s' does not end with '.pack'"
4969 #: builtin/index-pack.c:1582
4970 msgid "--verify with no packfile name given"
4973 #: builtin/init-db.c:35
4975 msgid "Could not make %s writable by group"
4978 #: builtin/init-db.c:62
4980 msgid "insanely long template name %s"
4983 #: builtin/init-db.c:67
4985 msgid "cannot stat '%s'"
4988 #: builtin/init-db.c:73
4990 msgid "cannot stat template '%s'"
4993 #: builtin/init-db.c:80
4995 msgid "cannot opendir '%s'"
4998 #: builtin/init-db.c:97
5000 msgid "cannot readlink '%s'"
5003 #: builtin/init-db.c:99
5005 msgid "insanely long symlink %s"
5008 #: builtin/init-db.c:102
5010 msgid "cannot symlink '%s' '%s'"
5013 #: builtin/init-db.c:106
5015 msgid "cannot copy '%s' to '%s'"
5018 #: builtin/init-db.c:110
5020 msgid "ignoring template %s"
5023 #: builtin/init-db.c:133
5025 msgid "insanely long template path %s"
5028 #: builtin/init-db.c:141
5030 msgid "templates not found %s"
5033 #: builtin/init-db.c:154
5035 msgid "not copying templates of a wrong format version %d from '%s'"
5038 #: builtin/init-db.c:192
5040 msgid "insane git directory %s"
5043 #: builtin/init-db.c:323 builtin/init-db.c:326
5045 msgid "%s already exists"
5048 #: builtin/init-db.c:355
5050 msgid "unable to handle file type %d"
5053 #: builtin/init-db.c:358
5055 msgid "unable to move %s to %s"
5058 #: builtin/init-db.c:363
5060 msgid "Could not create git link %s"
5064 #. * TRANSLATORS: The first '%s' is either "Reinitialized
5065 #. * existing" or "Initialized empty", the second " shared" or
5066 #. * "", and the last '%s%s' is the verbatim directory name.
5068 #: builtin/init-db.c:420
5070 msgid "%s%s Git repository in %s%s\n"
5073 #: builtin/init-db.c:421
5074 msgid "Reinitialized existing"
5077 #: builtin/init-db.c:421
5078 msgid "Initialized empty"
5081 #: builtin/init-db.c:422
5085 #: builtin/init-db.c:441
5086 msgid "cannot tell cwd"
5089 #: builtin/init-db.c:467
5091 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"
5092 "[=<permissions>]] [directory]"
5095 #: builtin/init-db.c:490
5099 #: builtin/init-db.c:491
5100 msgid "specify that the git repository is to be shared amongst several users"
5103 #: builtin/init-db.c:493 builtin/prune-packed.c:77
5107 #: builtin/init-db.c:522 builtin/init-db.c:529
5109 msgid "cannot mkdir %s"
5112 #: builtin/init-db.c:533
5114 msgid "cannot chdir to %s"
5117 #: builtin/init-db.c:555
5120 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5124 #: builtin/init-db.c:579
5125 msgid "Cannot access current working directory"
5128 #: builtin/init-db.c:586
5130 msgid "Cannot access work tree '%s'"
5134 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
5138 msgid " or: git show [options] <object>..."
5141 #: builtin/log.c:102
5142 msgid "suppress diff output"
5145 #: builtin/log.c:103
5149 #: builtin/log.c:104
5150 msgid "Use mail map file"
5153 #: builtin/log.c:105
5154 msgid "decorate options"
5157 #: builtin/log.c:198
5159 msgid "Final output: %d %s\n"
5162 #: builtin/log.c:419 builtin/log.c:511
5164 msgid "Could not read object %s"
5167 #: builtin/log.c:535
5169 msgid "Unknown type: %d"
5172 #: builtin/log.c:627
5173 msgid "format.headers without value"
5176 #: builtin/log.c:701
5177 msgid "name of output directory is too long"
5180 #: builtin/log.c:717
5182 msgid "Cannot open patch file %s"
5185 #: builtin/log.c:731
5186 msgid "Need exactly one range."
5189 #: builtin/log.c:739
5190 msgid "Not a range."
5193 #: builtin/log.c:812
5194 msgid "Cover letter needs email format"
5197 #: builtin/log.c:885
5199 msgid "insane in-reply-to: %s"
5202 #: builtin/log.c:913
5203 msgid "git format-patch [options] [<since> | <revision range>]"
5206 #: builtin/log.c:958
5207 msgid "Two output directories?"
5210 #: builtin/log.c:1097
5211 msgid "use [PATCH n/m] even with a single patch"
5214 #: builtin/log.c:1100
5215 msgid "use [PATCH] even with multiple patches"
5218 #: builtin/log.c:1104
5219 msgid "print patches to standard out"
5222 #: builtin/log.c:1106
5223 msgid "generate a cover letter"
5226 #: builtin/log.c:1108
5227 msgid "use simple number sequence for output file names"
5230 #: builtin/log.c:1109
5234 #: builtin/log.c:1110
5235 msgid "use <sfx> instead of '.patch'"
5238 #: builtin/log.c:1112
5239 msgid "start numbering patches at <n> instead of 1"
5242 #: builtin/log.c:1114
5243 msgid "mark the series as Nth re-roll"
5246 #: builtin/log.c:1116
5247 msgid "Use [<prefix>] instead of [PATCH]"
5250 #: builtin/log.c:1119
5251 msgid "store resulting files in <dir>"
5254 #: builtin/log.c:1122
5255 msgid "don't strip/add [PATCH]"
5258 #: builtin/log.c:1125
5259 msgid "don't output binary diffs"
5262 #: builtin/log.c:1127
5263 msgid "don't include a patch matching a commit upstream"
5266 #: builtin/log.c:1129
5267 msgid "show patch format instead of default (patch + stat)"
5270 #: builtin/log.c:1131
5274 #: builtin/log.c:1132
5278 #: builtin/log.c:1133
5279 msgid "add email header"
5282 #: builtin/log.c:1134 builtin/log.c:1136
5286 #: builtin/log.c:1134
5287 msgid "add To: header"
5290 #: builtin/log.c:1136
5291 msgid "add Cc: header"
5294 #: builtin/log.c:1138
5298 #: builtin/log.c:1139
5299 msgid "make first mail a reply to <message-id>"
5302 #: builtin/log.c:1140 builtin/log.c:1143
5306 #: builtin/log.c:1141
5307 msgid "attach the patch"
5310 #: builtin/log.c:1144
5311 msgid "inline the patch"
5314 #: builtin/log.c:1148
5315 msgid "enable message threading, styles: shallow, deep"
5318 #: builtin/log.c:1150
5322 #: builtin/log.c:1151
5323 msgid "add a signature"
5326 #: builtin/log.c:1153
5327 msgid "don't print the patch filenames"
5330 #: builtin/log.c:1202
5332 msgid "bogus committer info %s"
5335 #: builtin/log.c:1247
5336 msgid "-n and -k are mutually exclusive."
5339 #: builtin/log.c:1249
5340 msgid "--subject-prefix and -k are mutually exclusive."
5343 #: builtin/log.c:1257
5344 msgid "--name-only does not make sense"
5347 #: builtin/log.c:1259
5348 msgid "--name-status does not make sense"
5351 #: builtin/log.c:1261
5352 msgid "--check does not make sense"
5355 #: builtin/log.c:1284
5356 msgid "standard output, or directory, which one?"
5359 #: builtin/log.c:1286
5361 msgid "Could not create directory '%s'"
5364 #: builtin/log.c:1439
5365 msgid "Failed to create output files"
5368 #: builtin/log.c:1488
5369 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5372 #: builtin/log.c:1543
5375 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
5378 #: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570
5380 msgid "Unknown commit %s"
5383 #: builtin/ls-files.c:408
5384 msgid "git ls-files [options] [<file>...]"
5387 #: builtin/ls-files.c:463
5388 msgid "identify the file status with tags"
5391 #: builtin/ls-files.c:465
5392 msgid "use lowercase letters for 'assume unchanged' files"
5395 #: builtin/ls-files.c:467
5396 msgid "show cached files in the output (default)"
5399 #: builtin/ls-files.c:469
5400 msgid "show deleted files in the output"
5403 #: builtin/ls-files.c:471
5404 msgid "show modified files in the output"
5407 #: builtin/ls-files.c:473
5408 msgid "show other files in the output"
5411 #: builtin/ls-files.c:475
5412 msgid "show ignored files in the output"
5415 #: builtin/ls-files.c:478
5416 msgid "show staged contents' object name in the output"
5419 #: builtin/ls-files.c:480
5420 msgid "show files on the filesystem that need to be removed"
5423 #: builtin/ls-files.c:482
5424 msgid "show 'other' directories' name only"
5427 #: builtin/ls-files.c:485
5428 msgid "don't show empty directories"
5431 #: builtin/ls-files.c:488
5432 msgid "show unmerged files in the output"
5435 #: builtin/ls-files.c:490
5436 msgid "show resolve-undo information"
5439 #: builtin/ls-files.c:492
5440 msgid "skip files matching pattern"
5443 #: builtin/ls-files.c:495
5444 msgid "exclude patterns are read from <file>"
5447 #: builtin/ls-files.c:498
5448 msgid "read additional per-directory exclude patterns in <file>"
5451 #: builtin/ls-files.c:500
5452 msgid "add the standard git exclusions"
5455 #: builtin/ls-files.c:503
5456 msgid "make the output relative to the project top directory"
5459 #: builtin/ls-files.c:506
5460 msgid "if any <file> is not in the index, treat this as an error"
5463 #: builtin/ls-files.c:507
5467 #: builtin/ls-files.c:508
5468 msgid "pretend that paths removed since <tree-ish> are still present"
5471 #: builtin/ls-files.c:510
5472 msgid "show debugging data"
5475 #: builtin/ls-tree.c:27
5476 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
5479 #: builtin/ls-tree.c:125
5480 msgid "only show trees"
5483 #: builtin/ls-tree.c:127
5484 msgid "recurse into subtrees"
5487 #: builtin/ls-tree.c:129
5488 msgid "show trees when recursing"
5491 #: builtin/ls-tree.c:132
5492 msgid "terminate entries with NUL byte"
5495 #: builtin/ls-tree.c:133
5496 msgid "include object size"
5499 #: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5500 msgid "list only filenames"
5503 #: builtin/ls-tree.c:140
5504 msgid "use full path names"
5507 #: builtin/ls-tree.c:142
5508 msgid "list entire tree; not just current directory (implies --full-name)"
5511 #: builtin/merge.c:43
5512 msgid "git merge [options] [<commit>...]"
5515 #: builtin/merge.c:44
5516 msgid "git merge [options] <msg> HEAD <commit>"
5519 #: builtin/merge.c:45
5520 msgid "git merge --abort"
5523 #: builtin/merge.c:90
5524 msgid "switch `m' requires a value"
5527 #: builtin/merge.c:127
5529 msgid "Could not find merge strategy '%s'.\n"
5532 #: builtin/merge.c:128
5534 msgid "Available strategies are:"
5537 #: builtin/merge.c:133
5539 msgid "Available custom strategies are:"
5542 #: builtin/merge.c:183
5543 msgid "do not show a diffstat at the end of the merge"
5546 #: builtin/merge.c:186
5547 msgid "show a diffstat at the end of the merge"
5550 #: builtin/merge.c:187
5551 msgid "(synonym to --stat)"
5554 #: builtin/merge.c:189
5555 msgid "add (at most <n>) entries from shortlog to merge commit message"
5558 #: builtin/merge.c:192
5559 msgid "create a single commit instead of doing a merge"
5562 #: builtin/merge.c:194
5563 msgid "perform a commit if the merge succeeds (default)"
5566 #: builtin/merge.c:196
5567 msgid "edit message before committing"
5570 #: builtin/merge.c:198
5571 msgid "allow fast-forward (default)"
5574 #: builtin/merge.c:200
5575 msgid "abort if fast-forward is not possible"
5578 #: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112
5582 #: builtin/merge.c:203
5583 msgid "merge strategy to use"
5586 #: builtin/merge.c:204
5587 msgid "option=value"
5590 #: builtin/merge.c:205
5591 msgid "option for selected merge strategy"
5594 #: builtin/merge.c:207
5595 msgid "merge commit message (for a non-fast-forward merge)"
5598 #: builtin/merge.c:211
5599 msgid "abort the current in-progress merge"
5602 #: builtin/merge.c:240
5603 msgid "could not run stash."
5606 #: builtin/merge.c:245
5607 msgid "stash failed"
5610 #: builtin/merge.c:250
5612 msgid "not a valid object: %s"
5615 #: builtin/merge.c:269 builtin/merge.c:286
5616 msgid "read-tree failed"
5619 #: builtin/merge.c:316
5620 msgid " (nothing to squash)"
5623 #: builtin/merge.c:329
5625 msgid "Squash commit -- not updating HEAD\n"
5628 #: builtin/merge.c:361
5629 msgid "Writing SQUASH_MSG"
5632 #: builtin/merge.c:363
5633 msgid "Finishing SQUASH_MSG"
5636 #: builtin/merge.c:386
5638 msgid "No merge message -- not updating HEAD\n"
5641 #: builtin/merge.c:436
5643 msgid "'%s' does not point to a commit"
5646 #: builtin/merge.c:535
5648 msgid "Bad branch.%s.mergeoptions string: %s"
5651 #: builtin/merge.c:628
5652 msgid "git write-tree failed to write a tree"
5655 #: builtin/merge.c:656
5656 msgid "Not handling anything other than two heads merge."
5659 #: builtin/merge.c:670
5661 msgid "Unknown option for merge-recursive: -X%s"
5664 #: builtin/merge.c:684
5666 msgid "unable to write %s"
5669 #: builtin/merge.c:773
5671 msgid "Could not read from '%s'"
5674 #: builtin/merge.c:782
5676 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
5679 #: builtin/merge.c:788
5681 "Please enter a commit message to explain why this merge is necessary,\n"
5682 "especially if it merges an updated upstream into a topic branch.\n"
5684 "Lines starting with '#' will be ignored, and an empty message aborts\n"
5688 #: builtin/merge.c:813
5689 msgid "Empty commit message."
5692 #: builtin/merge.c:825
5694 msgid "Wonderful.\n"
5697 #: builtin/merge.c:890
5699 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
5702 #: builtin/merge.c:906
5704 msgid "'%s' is not a commit"
5707 #: builtin/merge.c:947
5708 msgid "No current branch."
5711 #: builtin/merge.c:949
5712 msgid "No remote for the current branch."
5715 #: builtin/merge.c:951
5716 msgid "No default upstream defined for the current branch."
5719 #: builtin/merge.c:956
5721 msgid "No remote tracking branch for %s from %s"
5724 #: builtin/merge.c:1043 builtin/merge.c:1200
5726 msgid "%s - not something we can merge"
5729 #: builtin/merge.c:1111
5730 msgid "There is no merge to abort (MERGE_HEAD missing)."
5733 #: builtin/merge.c:1127 git-pull.sh:31
5735 "You have not concluded your merge (MERGE_HEAD exists).\n"
5736 "Please, commit your changes before you can merge."
5739 #: builtin/merge.c:1130 git-pull.sh:34
5740 msgid "You have not concluded your merge (MERGE_HEAD exists)."
5743 #: builtin/merge.c:1134
5745 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
5746 "Please, commit your changes before you can merge."
5749 #: builtin/merge.c:1137
5750 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
5753 #: builtin/merge.c:1146
5754 msgid "You cannot combine --squash with --no-ff."
5757 #: builtin/merge.c:1151
5758 msgid "You cannot combine --no-ff with --ff-only."
5761 #: builtin/merge.c:1158
5762 msgid "No commit specified and merge.defaultToUpstream not set."
5765 #: builtin/merge.c:1190
5766 msgid "Can merge only exactly one commit into empty head"
5769 #: builtin/merge.c:1193
5770 msgid "Squash commit into empty head not supported yet"
5773 #: builtin/merge.c:1195
5774 msgid "Non-fast-forward commit does not make sense into an empty head"
5777 #: builtin/merge.c:1311
5779 msgid "Updating %s..%s\n"
5782 #: builtin/merge.c:1350
5784 msgid "Trying really trivial in-index merge...\n"
5787 #: builtin/merge.c:1357
5792 #: builtin/merge.c:1389
5793 msgid "Not possible to fast-forward, aborting."
5796 #: builtin/merge.c:1412 builtin/merge.c:1491
5798 msgid "Rewinding the tree to pristine...\n"
5801 #: builtin/merge.c:1416
5803 msgid "Trying merge strategy %s...\n"
5806 #: builtin/merge.c:1482
5808 msgid "No merge strategy handled the merge.\n"
5811 #: builtin/merge.c:1484
5813 msgid "Merge with strategy %s failed.\n"
5816 #: builtin/merge.c:1493
5818 msgid "Using the %s to prepare resolving by hand.\n"
5821 #: builtin/merge.c:1505
5823 msgid "Automatic merge went well; stopped before committing as requested\n"
5826 #: builtin/merge-base.c:26
5827 msgid "git merge-base [-a|--all] <commit> <commit>..."
5830 #: builtin/merge-base.c:27
5831 msgid "git merge-base [-a|--all] --octopus <commit>..."
5834 #: builtin/merge-base.c:28
5835 msgid "git merge-base --independent <commit>..."
5838 #: builtin/merge-base.c:29
5839 msgid "git merge-base --is-ancestor <commit> <commit>"
5842 #: builtin/merge-base.c:98
5843 msgid "output all common ancestors"
5846 #: builtin/merge-base.c:99
5847 msgid "find ancestors for a single n-way merge"
5850 #: builtin/merge-base.c:100
5851 msgid "list revs not reachable from others"
5854 #: builtin/merge-base.c:102
5855 msgid "is the first one ancestor of the other?"
5858 #: builtin/merge-file.c:8
5860 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
5864 #: builtin/merge-file.c:33
5865 msgid "send results to standard output"
5868 #: builtin/merge-file.c:34
5869 msgid "use a diff3 based merge"
5872 #: builtin/merge-file.c:35
5873 msgid "for conflicts, use our version"
5876 #: builtin/merge-file.c:37
5877 msgid "for conflicts, use their version"
5880 #: builtin/merge-file.c:39
5881 msgid "for conflicts, use a union version"
5884 #: builtin/merge-file.c:42
5885 msgid "for conflicts, use this marker size"
5888 #: builtin/merge-file.c:43
5889 msgid "do not warn about conflicts"
5892 #: builtin/merge-file.c:45
5893 msgid "set labels for file1/orig_file/file2"
5896 #: builtin/mktree.c:67
5897 msgid "git mktree [-z] [--missing] [--batch]"
5900 #: builtin/mktree.c:153
5901 msgid "input is NUL terminated"
5904 #: builtin/mktree.c:154 builtin/write-tree.c:24
5905 msgid "allow missing objects"
5908 #: builtin/mktree.c:155
5909 msgid "allow creation of more than one tree"
5913 msgid "git mv [options] <source>... <destination>"
5917 msgid "force move/rename even if target exists"
5921 msgid "skip move/rename errors"
5926 msgid "Checking rename of '%s' to '%s'\n"
5934 msgid "can not move directory into itself"
5938 msgid "cannot move directory over file"
5943 msgid "Huh? %.*s is in index?"
5947 msgid "source directory is empty"
5951 msgid "not under version control"
5955 msgid "destination exists"
5960 msgid "overwriting '%s'"
5964 msgid "Cannot overwrite"
5968 msgid "multiple sources for the same target"
5973 msgid "%s, source=%s, destination=%s"
5978 msgid "Renaming %s to %s\n"
5981 #: builtin/mv.c:215 builtin/remote.c:731
5983 msgid "renaming '%s' failed"
5986 #: builtin/name-rev.c:175
5987 msgid "git name-rev [options] <commit>..."
5990 #: builtin/name-rev.c:176
5991 msgid "git name-rev [options] --all"
5994 #: builtin/name-rev.c:177
5995 msgid "git name-rev [options] --stdin"
5998 #: builtin/name-rev.c:229
5999 msgid "print only names (no SHA-1)"
6002 #: builtin/name-rev.c:230
6003 msgid "only use tags to name the commits"
6006 #: builtin/name-rev.c:232
6007 msgid "only use refs matching <pattern>"
6010 #: builtin/name-rev.c:234
6011 msgid "list all commits reachable from all refs"
6014 #: builtin/name-rev.c:235
6015 msgid "read from stdin"
6018 #: builtin/name-rev.c:236
6019 msgid "allow to print `undefined` names"
6022 #: builtin/notes.c:26
6023 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
6026 #: builtin/notes.c:27
6028 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6029 "<object>] [<object>]"
6032 #: builtin/notes.c:28
6033 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6036 #: builtin/notes.c:29
6038 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6039 "<object>] [<object>]"
6042 #: builtin/notes.c:30
6043 msgid "git notes [--ref <notes_ref>] edit [<object>]"
6046 #: builtin/notes.c:31
6047 msgid "git notes [--ref <notes_ref>] show [<object>]"
6050 #: builtin/notes.c:32
6052 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6055 #: builtin/notes.c:33
6056 msgid "git notes merge --commit [-v | -q]"
6059 #: builtin/notes.c:34
6060 msgid "git notes merge --abort [-v | -q]"
6063 #: builtin/notes.c:35
6064 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6067 #: builtin/notes.c:36
6068 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6071 #: builtin/notes.c:37
6072 msgid "git notes [--ref <notes_ref>] get-ref"
6075 #: builtin/notes.c:42
6076 msgid "git notes [list [<object>]]"
6079 #: builtin/notes.c:47
6080 msgid "git notes add [<options>] [<object>]"
6083 #: builtin/notes.c:52
6084 msgid "git notes copy [<options>] <from-object> <to-object>"
6087 #: builtin/notes.c:53
6088 msgid "git notes copy --stdin [<from-object> <to-object>]..."
6091 #: builtin/notes.c:58
6092 msgid "git notes append [<options>] [<object>]"
6095 #: builtin/notes.c:63
6096 msgid "git notes edit [<object>]"
6099 #: builtin/notes.c:68
6100 msgid "git notes show [<object>]"
6103 #: builtin/notes.c:73
6104 msgid "git notes merge [<options>] <notes_ref>"
6107 #: builtin/notes.c:74
6108 msgid "git notes merge --commit [<options>]"
6111 #: builtin/notes.c:75
6112 msgid "git notes merge --abort [<options>]"
6115 #: builtin/notes.c:80
6116 msgid "git notes remove [<object>]"
6119 #: builtin/notes.c:85
6120 msgid "git notes prune [<options>]"
6123 #: builtin/notes.c:90
6124 msgid "git notes get-ref"
6127 #: builtin/notes.c:142
6129 msgid "unable to start 'show' for object '%s'"
6132 #: builtin/notes.c:148
6133 msgid "can't fdopen 'show' output fd"
6136 #: builtin/notes.c:158
6138 msgid "failed to close pipe to 'show' for object '%s'"
6141 #: builtin/notes.c:161
6143 msgid "failed to finish 'show' for object '%s'"
6146 #: builtin/notes.c:178 builtin/tag.c:347
6148 msgid "could not create file '%s'"
6151 #: builtin/notes.c:192
6152 msgid "Please supply the note contents using either -m or -F option"
6155 #: builtin/notes.c:213 builtin/notes.c:976
6157 msgid "Removing note for object %s\n"
6160 #: builtin/notes.c:218
6161 msgid "unable to write note object"
6164 #: builtin/notes.c:220
6166 msgid "The note contents has been left in %s"
6169 #: builtin/notes.c:254 builtin/tag.c:542
6171 msgid "cannot read '%s'"
6174 #: builtin/notes.c:256 builtin/tag.c:545
6176 msgid "could not open or read '%s'"
6179 #: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450
6180 #: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647
6181 #: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769
6182 #: builtin/notes.c:971 builtin/tag.c:558
6184 msgid "Failed to resolve '%s' as a valid ref."
6187 #: builtin/notes.c:278
6189 msgid "Failed to read object '%s'."
6192 #: builtin/notes.c:302
6193 msgid "Cannot commit uninitialized/unreferenced notes tree"
6196 #: builtin/notes.c:343
6198 msgid "Bad notes.rewriteMode value: '%s'"
6201 #: builtin/notes.c:353
6203 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6206 #. TRANSLATORS: The first %s is the name of the
6207 #. environment variable, the second %s is its value
6208 #: builtin/notes.c:380
6210 msgid "Bad %s value: '%s'"
6213 #: builtin/notes.c:444
6215 msgid "Malformed input line: '%s'."
6218 #: builtin/notes.c:459
6220 msgid "Failed to copy notes from '%s' to '%s'"
6223 #: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630
6224 #: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762
6225 #: builtin/notes.c:1036
6226 msgid "too many parameters"
6229 #: builtin/notes.c:516 builtin/notes.c:775
6231 msgid "No note found for object %s."
6234 #: builtin/notes.c:538 builtin/notes.c:695
6235 msgid "note contents as a string"
6238 #: builtin/notes.c:541 builtin/notes.c:698
6239 msgid "note contents in a file"
6242 #: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700
6243 #: builtin/notes.c:703 builtin/tag.c:476
6247 #: builtin/notes.c:544 builtin/notes.c:701
6248 msgid "reuse and edit specified note object"
6251 #: builtin/notes.c:547 builtin/notes.c:704
6252 msgid "reuse specified note object"
6255 #: builtin/notes.c:549 builtin/notes.c:617
6256 msgid "replace existing notes"
6259 #: builtin/notes.c:583
6262 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6266 #: builtin/notes.c:588 builtin/notes.c:665
6268 msgid "Overwriting existing notes for object %s\n"
6271 #: builtin/notes.c:618
6272 msgid "read objects from stdin"
6275 #: builtin/notes.c:620
6276 msgid "load rewriting config for <command> (implies --stdin)"
6279 #: builtin/notes.c:638
6280 msgid "too few parameters"
6283 #: builtin/notes.c:659
6286 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6290 #: builtin/notes.c:671
6292 msgid "Missing notes on source object %s. Cannot copy."
6295 #: builtin/notes.c:720
6298 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6299 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6302 #: builtin/notes.c:867
6303 msgid "General options"
6306 #: builtin/notes.c:869
6307 msgid "Merge options"
6310 #: builtin/notes.c:871
6312 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6316 #: builtin/notes.c:873
6317 msgid "Committing unmerged notes"
6320 #: builtin/notes.c:875
6321 msgid "finalize notes merge by committing unmerged notes"
6324 #: builtin/notes.c:877
6325 msgid "Aborting notes merge resolution"
6328 #: builtin/notes.c:879
6329 msgid "abort notes merge"
6332 #: builtin/notes.c:974
6334 msgid "Object %s has no note\n"
6337 #: builtin/notes.c:986
6338 msgid "attempt to remove non-existent note is not an error"
6341 #: builtin/notes.c:989
6342 msgid "read object names from the standard input"
6345 #: builtin/notes.c:1070
6349 #: builtin/notes.c:1071
6350 msgid "use notes from <notes_ref>"
6353 #: builtin/notes.c:1106 builtin/remote.c:1598
6355 msgid "Unknown subcommand: %s"
6358 #: builtin/pack-objects.c:23
6359 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
6362 #: builtin/pack-objects.c:24
6363 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
6366 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6368 msgid "deflate error (%d)"
6371 #: builtin/pack-objects.c:2397
6373 msgid "unsupported index version %s"
6376 #: builtin/pack-objects.c:2401
6378 msgid "bad index version '%s'"
6381 #: builtin/pack-objects.c:2424
6383 msgid "option %s does not accept negative form"
6386 #: builtin/pack-objects.c:2428
6388 msgid "unable to parse value '%s' for option %s"
6391 #: builtin/pack-objects.c:2447
6392 msgid "do not show progress meter"
6395 #: builtin/pack-objects.c:2449
6396 msgid "show progress meter"
6399 #: builtin/pack-objects.c:2451
6400 msgid "show progress meter during object writing phase"
6403 #: builtin/pack-objects.c:2454
6404 msgid "similar to --all-progress when progress meter is shown"
6407 #: builtin/pack-objects.c:2455
6408 msgid "version[,offset]"
6411 #: builtin/pack-objects.c:2456
6412 msgid "write the pack index file in the specified idx format version"
6415 #: builtin/pack-objects.c:2459
6416 msgid "maximum size of each output pack file"
6419 #: builtin/pack-objects.c:2461
6420 msgid "ignore borrowed objects from alternate object store"
6423 #: builtin/pack-objects.c:2463
6424 msgid "ignore packed objects"
6427 #: builtin/pack-objects.c:2465
6428 msgid "limit pack window by objects"
6431 #: builtin/pack-objects.c:2467
6432 msgid "limit pack window by memory in addition to object limit"
6435 #: builtin/pack-objects.c:2469
6436 msgid "maximum length of delta chain allowed in the resulting pack"
6439 #: builtin/pack-objects.c:2471
6440 msgid "reuse existing deltas"
6443 #: builtin/pack-objects.c:2473
6444 msgid "reuse existing objects"
6447 #: builtin/pack-objects.c:2475
6448 msgid "use OFS_DELTA objects"
6451 #: builtin/pack-objects.c:2477
6452 msgid "use threads when searching for best delta matches"
6455 #: builtin/pack-objects.c:2479
6456 msgid "do not create an empty pack output"
6459 #: builtin/pack-objects.c:2481
6460 msgid "read revision arguments from standard input"
6463 #: builtin/pack-objects.c:2483
6464 msgid "limit the objects to those that are not yet packed"
6467 #: builtin/pack-objects.c:2486
6468 msgid "include objects reachable from any reference"
6471 #: builtin/pack-objects.c:2489
6472 msgid "include objects referred by reflog entries"
6475 #: builtin/pack-objects.c:2492
6476 msgid "output pack to stdout"
6479 #: builtin/pack-objects.c:2494
6480 msgid "include tag objects that refer to objects to be packed"
6483 #: builtin/pack-objects.c:2496
6484 msgid "keep unreachable objects"
6487 #: builtin/pack-objects.c:2497 parse-options.h:141
6491 #: builtin/pack-objects.c:2498
6492 msgid "unpack unreachable objects newer than <time>"
6495 #: builtin/pack-objects.c:2501
6496 msgid "create thin packs"
6499 #: builtin/pack-objects.c:2503
6500 msgid "ignore packs that have companion .keep file"
6503 #: builtin/pack-objects.c:2505
6504 msgid "pack compression level"
6507 #: builtin/pack-objects.c:2507
6508 msgid "do not hide commits by grafts"
6511 #: builtin/pack-refs.c:6
6512 msgid "git pack-refs [options]"
6515 #: builtin/pack-refs.c:14
6516 msgid "pack everything"
6519 #: builtin/pack-refs.c:15
6520 msgid "prune loose refs (default)"
6523 #: builtin/prune-packed.c:7
6524 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
6527 #: builtin/prune.c:12
6528 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
6531 #: builtin/prune.c:132
6532 msgid "do not remove, show only"
6535 #: builtin/prune.c:133
6536 msgid "report pruned objects"
6539 #: builtin/prune.c:136
6540 msgid "expire objects older than <time>"
6543 #: builtin/push.c:14
6544 msgid "git push [<options>] [<repository> [<refspec>...]]"
6547 #: builtin/push.c:45
6548 msgid "tag shorthand without <tag>"
6551 #: builtin/push.c:64
6552 msgid "--delete only accepts plain target ref names"
6555 #: builtin/push.c:99
6558 "To choose either option permanently, see push.default in 'git help config'."
6561 #: builtin/push.c:102
6564 "The upstream branch of your current branch does not match\n"
6565 "the name of your current branch. To push to the upstream branch\n"
6566 "on the remote, use\n"
6568 " git push %s HEAD:%s\n"
6570 "To push to the branch of the same name on the remote, use\n"
6576 #: builtin/push.c:121
6579 "You are not currently on a branch.\n"
6580 "To push the history leading to the current (detached HEAD)\n"
6583 " git push %s HEAD:<name-of-remote-branch>\n"
6586 #: builtin/push.c:128
6589 "The current branch %s has no upstream branch.\n"
6590 "To push the current branch and set the remote as upstream, use\n"
6592 " git push --set-upstream %s %s\n"
6595 #: builtin/push.c:136
6597 msgid "The current branch %s has multiple upstream branches, refusing to push."
6600 #: builtin/push.c:139
6603 "You are pushing to remote '%s', which is not the upstream of\n"
6604 "your current branch '%s', without telling me what to push\n"
6605 "to update which remote branch."
6608 #: builtin/push.c:151
6610 "push.default is unset; its implicit value is changing in\n"
6611 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6612 "and maintain the current behavior after the default changes, use:\n"
6614 " git config --global push.default matching\n"
6616 "To squelch this message and adopt the new behavior now, use:\n"
6618 " git config --global push.default simple\n"
6620 "See 'git help config' and search for 'push.default' for further "
6622 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
6623 "'current' instead of 'simple' if you sometimes use older versions of Git)"
6626 #: builtin/push.c:199
6628 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
6631 #: builtin/push.c:206
6633 "Updates were rejected because the tip of your current branch is behind\n"
6634 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
6635 "before pushing again.\n"
6636 "See the 'Note about fast-forwards' in 'git push --help' for details."
6639 #: builtin/push.c:212
6641 "Updates were rejected because a pushed branch tip is behind its remote\n"
6642 "counterpart. If you did not intend to push that branch, you may want to\n"
6643 "specify branches to push or set the 'push.default' configuration variable\n"
6644 "to 'simple', 'current' or 'upstream' to push only the current branch."
6647 #: builtin/push.c:218
6649 "Updates were rejected because a pushed branch tip is behind its remote\n"
6650 "counterpart. Check out this branch and merge the remote changes\n"
6651 "(e.g. 'git pull') before pushing again.\n"
6652 "See the 'Note about fast-forwards' in 'git push --help' for details."
6655 #: builtin/push.c:224
6657 "Updates were rejected because the destination reference already exists\n"
6661 #: builtin/push.c:269
6663 msgid "Pushing to %s\n"
6666 #: builtin/push.c:273
6668 msgid "failed to push some refs to '%s'"
6671 #: builtin/push.c:302
6673 msgid "bad repository '%s'"
6676 #: builtin/push.c:303
6678 "No configured push destination.\n"
6679 "Either specify the URL from the command-line or configure a remote "
6680 "repository using\n"
6682 " git remote add <name> <url>\n"
6684 "and then push using the remote name\n"
6686 " git push <name>\n"
6689 #: builtin/push.c:318
6690 msgid "--all and --tags are incompatible"
6693 #: builtin/push.c:319
6694 msgid "--all can't be combined with refspecs"
6697 #: builtin/push.c:324
6698 msgid "--mirror and --tags are incompatible"
6701 #: builtin/push.c:325
6702 msgid "--mirror can't be combined with refspecs"
6705 #: builtin/push.c:330
6706 msgid "--all and --mirror are incompatible"
6709 #: builtin/push.c:390
6713 #: builtin/push.c:391
6714 msgid "push all refs"
6717 #: builtin/push.c:392
6718 msgid "mirror all refs"
6721 #: builtin/push.c:394
6725 #: builtin/push.c:395
6726 msgid "push tags (can't be used with --all or --mirror)"
6729 #: builtin/push.c:398
6730 msgid "force updates"
6733 #: builtin/push.c:399
6737 #: builtin/push.c:400
6738 msgid "control recursive pushing of submodules"
6741 #: builtin/push.c:402
6742 msgid "use thin pack"
6745 #: builtin/push.c:403 builtin/push.c:404
6746 msgid "receive pack program"
6749 #: builtin/push.c:405
6750 msgid "set upstream for git pull/status"
6753 #: builtin/push.c:408
6754 msgid "prune locally removed refs"
6757 #: builtin/push.c:418
6758 msgid "--delete is incompatible with --all, --mirror and --tags"
6761 #: builtin/push.c:420
6762 msgid "--delete doesn't make sense without any refs"
6765 #: builtin/read-tree.c:36
6767 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
6768 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
6769 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
6772 #: builtin/read-tree.c:108
6773 msgid "write resulting index to <file>"
6776 #: builtin/read-tree.c:111
6777 msgid "only empty the index"
6780 #: builtin/read-tree.c:113
6784 #: builtin/read-tree.c:115
6785 msgid "perform a merge in addition to a read"
6788 #: builtin/read-tree.c:117
6789 msgid "3-way merge if no file level merging required"
6792 #: builtin/read-tree.c:119
6793 msgid "3-way merge in presence of adds and removes"
6796 #: builtin/read-tree.c:121
6797 msgid "same as -m, but discard unmerged entries"
6800 #: builtin/read-tree.c:122
6801 msgid "<subdirectory>/"
6804 #: builtin/read-tree.c:123
6805 msgid "read the tree into the index under <subdirectory>/"
6808 #: builtin/read-tree.c:126
6809 msgid "update working tree with merge result"
6812 #: builtin/read-tree.c:128
6816 #: builtin/read-tree.c:129
6817 msgid "allow explicitly ignored files to be overwritten"
6820 #: builtin/read-tree.c:132
6821 msgid "don't check the working tree after merging"
6824 #: builtin/read-tree.c:133
6825 msgid "don't update the index or the work tree"
6828 #: builtin/read-tree.c:135
6829 msgid "skip applying sparse checkout filter"
6832 #: builtin/read-tree.c:137
6833 msgid "debug unpack-trees"
6836 #: builtin/remote.c:11
6837 msgid "git remote [-v | --verbose]"
6840 #: builtin/remote.c:12
6842 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
6843 "mirror=<fetch|push>] <name> <url>"
6846 #: builtin/remote.c:13 builtin/remote.c:32
6847 msgid "git remote rename <old> <new>"
6850 #: builtin/remote.c:14 builtin/remote.c:37
6851 msgid "git remote remove <name>"
6854 #: builtin/remote.c:15 builtin/remote.c:42
6855 msgid "git remote set-head <name> (-a | -d | <branch>)"
6858 #: builtin/remote.c:16
6859 msgid "git remote [-v | --verbose] show [-n] <name>"
6862 #: builtin/remote.c:17
6863 msgid "git remote prune [-n | --dry-run] <name>"
6866 #: builtin/remote.c:18
6868 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
6871 #: builtin/remote.c:19
6872 msgid "git remote set-branches [--add] <name> <branch>..."
6875 #: builtin/remote.c:20 builtin/remote.c:68
6876 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
6879 #: builtin/remote.c:21 builtin/remote.c:69
6880 msgid "git remote set-url --add <name> <newurl>"
6883 #: builtin/remote.c:22 builtin/remote.c:70
6884 msgid "git remote set-url --delete <name> <url>"
6887 #: builtin/remote.c:27
6888 msgid "git remote add [<options>] <name> <url>"
6891 #: builtin/remote.c:47
6892 msgid "git remote set-branches <name> <branch>..."
6895 #: builtin/remote.c:48
6896 msgid "git remote set-branches --add <name> <branch>..."
6899 #: builtin/remote.c:53
6900 msgid "git remote show [<options>] <name>"
6903 #: builtin/remote.c:58
6904 msgid "git remote prune [<options>] <name>"
6907 #: builtin/remote.c:63
6908 msgid "git remote update [<options>] [<group> | <remote>]..."
6911 #: builtin/remote.c:98
6916 #: builtin/remote.c:130
6918 "--mirror is dangerous and deprecated; please\n"
6919 "\t use --mirror=fetch or --mirror=push instead"
6922 #: builtin/remote.c:147
6924 msgid "unknown mirror argument: %s"
6927 #: builtin/remote.c:163
6928 msgid "fetch the remote branches"
6931 #: builtin/remote.c:165
6932 msgid "import all tags and associated objects when fetching"
6935 #: builtin/remote.c:168
6936 msgid "or do not fetch any tag at all (--no-tags)"
6939 #: builtin/remote.c:170
6940 msgid "branch(es) to track"
6943 #: builtin/remote.c:171
6944 msgid "master branch"
6947 #: builtin/remote.c:172
6951 #: builtin/remote.c:173
6952 msgid "set up remote as a mirror to push to or fetch from"
6955 #: builtin/remote.c:185
6956 msgid "specifying a master branch makes no sense with --mirror"
6959 #: builtin/remote.c:187
6960 msgid "specifying branches to track makes sense only with fetch mirrors"
6963 #: builtin/remote.c:195 builtin/remote.c:646
6965 msgid "remote %s already exists."
6968 #: builtin/remote.c:199 builtin/remote.c:650
6970 msgid "'%s' is not a valid remote name"
6973 #: builtin/remote.c:243
6975 msgid "Could not setup master '%s'"
6978 #: builtin/remote.c:299
6980 msgid "more than one %s"
6983 #: builtin/remote.c:339
6985 msgid "Could not get fetch map for refspec %s"
6988 #: builtin/remote.c:440 builtin/remote.c:448
6992 #: builtin/remote.c:452
6996 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
6998 msgid "Could not append '%s' to '%s'"
7001 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
7003 msgid "No such remote: %s"
7006 #: builtin/remote.c:656
7008 msgid "Could not rename config section '%s' to '%s'"
7011 #: builtin/remote.c:662 builtin/remote.c:799
7013 msgid "Could not remove config section '%s'"
7016 #: builtin/remote.c:677
7019 "Not updating non-default fetch refspec\n"
7021 "\tPlease update the configuration manually if necessary."
7024 #: builtin/remote.c:683
7026 msgid "Could not append '%s'"
7029 #: builtin/remote.c:694
7031 msgid "Could not set '%s'"
7034 #: builtin/remote.c:716
7036 msgid "deleting '%s' failed"
7039 #: builtin/remote.c:750
7041 msgid "creating '%s' failed"
7044 #: builtin/remote.c:764
7046 msgid "Could not remove branch %s"
7049 #: builtin/remote.c:834
7051 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7052 "to delete it, use:"
7054 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7055 "to delete them, use:"
7059 #: builtin/remote.c:943
7061 msgid " new (next fetch will store in remotes/%s)"
7064 #: builtin/remote.c:946
7068 #: builtin/remote.c:948
7069 msgid " stale (use 'git remote prune' to remove)"
7072 #: builtin/remote.c:950
7076 #: builtin/remote.c:991
7078 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7081 #: builtin/remote.c:998
7083 msgid "rebases onto remote %s"
7086 #: builtin/remote.c:1001
7088 msgid " merges with remote %s"
7091 #: builtin/remote.c:1002
7092 msgid " and with remote"
7095 #: builtin/remote.c:1004
7097 msgid "merges with remote %s"
7100 #: builtin/remote.c:1005
7101 msgid " and with remote"
7104 #: builtin/remote.c:1051
7108 #: builtin/remote.c:1054
7112 #: builtin/remote.c:1058
7116 #: builtin/remote.c:1061
7117 msgid "fast-forwardable"
7120 #: builtin/remote.c:1064
7121 msgid "local out of date"
7124 #: builtin/remote.c:1071
7126 msgid " %-*s forces to %-*s (%s)"
7129 #: builtin/remote.c:1074
7131 msgid " %-*s pushes to %-*s (%s)"
7134 #: builtin/remote.c:1078
7136 msgid " %-*s forces to %s"
7139 #: builtin/remote.c:1081
7141 msgid " %-*s pushes to %s"
7144 #: builtin/remote.c:1091
7145 msgid "do not query remotes"
7148 #: builtin/remote.c:1118
7153 #: builtin/remote.c:1119
7155 msgid " Fetch URL: %s"
7158 #: builtin/remote.c:1120 builtin/remote.c:1285
7162 #: builtin/remote.c:1129 builtin/remote.c:1131
7164 msgid " Push URL: %s"
7167 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
7169 msgid " HEAD branch: %s"
7172 #: builtin/remote.c:1139
7175 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
7178 #: builtin/remote.c:1151
7180 msgid " Remote branch:%s"
7181 msgid_plural " Remote branches:%s"
7185 #: builtin/remote.c:1154 builtin/remote.c:1181
7186 msgid " (status not queried)"
7189 #: builtin/remote.c:1163
7190 msgid " Local branch configured for 'git pull':"
7191 msgid_plural " Local branches configured for 'git pull':"
7195 #: builtin/remote.c:1171
7196 msgid " Local refs will be mirrored by 'git push'"
7199 #: builtin/remote.c:1178
7201 msgid " Local ref configured for 'git push'%s:"
7202 msgid_plural " Local refs configured for 'git push'%s:"
7206 #: builtin/remote.c:1199
7207 msgid "set refs/remotes/<name>/HEAD according to remote"
7210 #: builtin/remote.c:1201
7211 msgid "delete refs/remotes/<name>/HEAD"
7214 #: builtin/remote.c:1216
7215 msgid "Cannot determine remote HEAD"
7218 #: builtin/remote.c:1218
7219 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
7222 #: builtin/remote.c:1228
7224 msgid "Could not delete %s"
7227 #: builtin/remote.c:1236
7229 msgid "Not a valid ref: %s"
7232 #: builtin/remote.c:1238
7234 msgid "Could not setup %s"
7237 #: builtin/remote.c:1274
7239 msgid " %s will become dangling!"
7242 #: builtin/remote.c:1275
7244 msgid " %s has become dangling!"
7247 #: builtin/remote.c:1281
7252 #: builtin/remote.c:1282
7257 #: builtin/remote.c:1295
7259 msgid " * [would prune] %s"
7262 #: builtin/remote.c:1298
7264 msgid " * [pruned] %s"
7267 #: builtin/remote.c:1321
7268 msgid "prune remotes after fetching"
7271 #: builtin/remote.c:1387 builtin/remote.c:1461
7273 msgid "No such remote '%s'"
7276 #: builtin/remote.c:1407
7280 #: builtin/remote.c:1414
7281 msgid "no remote specified"
7284 #: builtin/remote.c:1436
7285 msgid "manipulate push URLs"
7288 #: builtin/remote.c:1438
7292 #: builtin/remote.c:1440
7296 #: builtin/remote.c:1447
7297 msgid "--add --delete doesn't make sense"
7300 #: builtin/remote.c:1487
7302 msgid "Invalid old URL pattern: %s"
7305 #: builtin/remote.c:1495
7307 msgid "No such URL found: %s"
7310 #: builtin/remote.c:1497
7311 msgid "Will not delete all non-push URLs"
7314 #: builtin/remote.c:1569
7315 msgid "be verbose; must be placed before a subcommand"
7318 #: builtin/replace.c:17
7319 msgid "git replace [-f] <object> <replacement>"
7322 #: builtin/replace.c:18
7323 msgid "git replace -d <object>..."
7326 #: builtin/replace.c:19
7327 msgid "git replace -l [<pattern>]"
7330 #: builtin/replace.c:121
7331 msgid "list replace refs"
7334 #: builtin/replace.c:122
7335 msgid "delete replace refs"
7338 #: builtin/replace.c:123
7339 msgid "replace the ref if it exists"
7342 #: builtin/rerere.c:11
7343 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
7346 #: builtin/rerere.c:56
7347 msgid "register clean resolutions in index"
7350 #: builtin/reset.c:25
7352 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
7355 #: builtin/reset.c:26
7356 msgid "git reset [-q] <tree-ish> [--] <paths>..."
7359 #: builtin/reset.c:27
7360 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
7363 #: builtin/reset.c:33
7367 #: builtin/reset.c:33
7371 #: builtin/reset.c:33
7375 #: builtin/reset.c:33
7379 #: builtin/reset.c:33
7383 #: builtin/reset.c:73
7384 msgid "You do not have a valid HEAD."
7387 #: builtin/reset.c:75
7388 msgid "Failed to find tree of HEAD."
7391 #: builtin/reset.c:81
7393 msgid "Failed to find tree of %s."
7396 #: builtin/reset.c:98
7398 msgid "HEAD is now at %s"
7401 #: builtin/reset.c:169
7403 msgid "Cannot do a %s reset in the middle of a merge."
7406 #: builtin/reset.c:248
7407 msgid "be quiet, only report errors"
7410 #: builtin/reset.c:250
7411 msgid "reset HEAD and index"
7414 #: builtin/reset.c:251
7415 msgid "reset only HEAD"
7418 #: builtin/reset.c:253 builtin/reset.c:255
7419 msgid "reset HEAD, index and working tree"
7422 #: builtin/reset.c:257
7423 msgid "reset HEAD but keep local changes"
7426 #: builtin/reset.c:275
7428 msgid "Failed to resolve '%s' as a valid revision."
7431 #: builtin/reset.c:278 builtin/reset.c:286
7433 msgid "Could not parse object '%s'."
7436 #: builtin/reset.c:283
7438 msgid "Failed to resolve '%s' as a valid tree."
7441 #: builtin/reset.c:292
7442 msgid "--patch is incompatible with --{hard,mixed,soft}"
7445 #: builtin/reset.c:301
7446 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
7449 #: builtin/reset.c:303
7451 msgid "Cannot do %s reset with paths."
7454 #: builtin/reset.c:313
7456 msgid "%s reset is not allowed in a bare repository"
7459 #: builtin/reset.c:333
7461 msgid "Could not reset index file to revision '%s'."
7464 #: builtin/reset.c:339
7465 msgid "Unstaged changes after reset:"
7468 #: builtin/reset.c:344
7469 msgid "Could not write new index file."
7472 #: builtin/rev-parse.c:339
7473 msgid "git rev-parse --parseopt [options] -- [<args>...]"
7476 #: builtin/rev-parse.c:344
7477 msgid "keep the `--` passed as an arg"
7480 #: builtin/rev-parse.c:346
7481 msgid "stop parsing after the first non-option argument"
7484 #: builtin/rev-parse.c:464
7486 "git rev-parse --parseopt [options] -- [<args>...]\n"
7487 " or: git rev-parse --sq-quote [<arg>...]\n"
7488 " or: git rev-parse [options] [<arg>...]\n"
7490 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
7493 #: builtin/revert.c:22
7494 msgid "git revert [options] <commit-ish>"
7497 #: builtin/revert.c:23
7498 msgid "git revert <subcommand>"
7501 #: builtin/revert.c:28
7502 msgid "git cherry-pick [options] <commit-ish>"
7505 #: builtin/revert.c:29
7506 msgid "git cherry-pick <subcommand>"
7509 #: builtin/revert.c:70 builtin/revert.c:92
7511 msgid "%s: %s cannot be used with %s"
7514 #: builtin/revert.c:103
7515 msgid "end revert or cherry-pick sequence"
7518 #: builtin/revert.c:104
7519 msgid "resume revert or cherry-pick sequence"
7522 #: builtin/revert.c:105
7523 msgid "cancel revert or cherry-pick sequence"
7526 #: builtin/revert.c:106
7527 msgid "don't automatically commit"
7530 #: builtin/revert.c:107
7531 msgid "edit the commit message"
7534 #: builtin/revert.c:110
7535 msgid "parent number"
7538 #: builtin/revert.c:112
7539 msgid "merge strategy"
7542 #: builtin/revert.c:113
7546 #: builtin/revert.c:114
7547 msgid "option for merge strategy"
7550 #: builtin/revert.c:125
7551 msgid "append commit name"
7554 #: builtin/revert.c:126
7555 msgid "allow fast-forward"
7558 #: builtin/revert.c:127
7559 msgid "preserve initially empty commits"
7562 #: builtin/revert.c:128
7563 msgid "allow commits with empty messages"
7566 #: builtin/revert.c:129
7567 msgid "keep redundant, empty commits"
7570 #: builtin/revert.c:133
7571 msgid "program error"
7574 #: builtin/revert.c:223
7575 msgid "revert failed"
7578 #: builtin/revert.c:238
7579 msgid "cherry-pick failed"
7583 msgid "git rm [options] [--] <file>..."
7586 #: builtin/rm.c:64 builtin/rm.c:186
7589 "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
7590 "(use 'rm -rf' if you really want to remove it including all of its history)"
7596 "'%s' has staged content different from both the file and the HEAD\n"
7597 "(use -f to force removal)"
7603 "'%s' has changes staged in the index\n"
7604 "(use --cached to keep the file, or -f to force removal)"
7610 "'%s' has local modifications\n"
7611 "(use --cached to keep the file, or -f to force removal)"
7615 msgid "do not list removed files"
7619 msgid "only remove from the index"
7623 msgid "override the up-to-date check"
7627 msgid "allow recursive removal"
7631 msgid "exit with a zero status even if nothing matched"
7636 msgid "not removing '%s' recursively without -r"
7641 msgid "git rm: unable to remove %s"
7644 #: builtin/shortlog.c:13
7645 msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
7648 #: builtin/shortlog.c:133
7650 msgid "Missing author: %s"
7653 #: builtin/shortlog.c:229
7654 msgid "sort output according to the number of commits per author"
7657 #: builtin/shortlog.c:231
7658 msgid "Suppress commit descriptions, only provides commit count"
7661 #: builtin/shortlog.c:233
7662 msgid "Show the email address of each author"
7665 #: builtin/shortlog.c:234
7669 #: builtin/shortlog.c:235
7670 msgid "Linewrap output"
7673 #: builtin/show-branch.c:9
7675 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
7676 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
7677 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
7681 #: builtin/show-branch.c:10
7682 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
7685 #: builtin/show-branch.c:651
7686 msgid "show remote-tracking and local branches"
7689 #: builtin/show-branch.c:653
7690 msgid "show remote-tracking branches"
7693 #: builtin/show-branch.c:655
7694 msgid "color '*!+-' corresponding to the branch"
7697 #: builtin/show-branch.c:657
7698 msgid "show <n> more commits after the common ancestor"
7701 #: builtin/show-branch.c:659
7702 msgid "synonym to more=-1"
7705 #: builtin/show-branch.c:660
7706 msgid "suppress naming strings"
7709 #: builtin/show-branch.c:662
7710 msgid "include the current branch"
7713 #: builtin/show-branch.c:664
7714 msgid "name commits with their object names"
7717 #: builtin/show-branch.c:666
7718 msgid "show possible merge bases"
7721 #: builtin/show-branch.c:668
7722 msgid "show refs unreachable from any other ref"
7725 #: builtin/show-branch.c:670
7726 msgid "show commits in topological order"
7729 #: builtin/show-branch.c:672
7730 msgid "show only commits not on the first branch"
7733 #: builtin/show-branch.c:674
7734 msgid "show merges reachable from only one tip"
7737 #: builtin/show-branch.c:676
7738 msgid "show commits where no parent comes before its children"
7741 #: builtin/show-branch.c:678
7742 msgid "<n>[,<base>]"
7745 #: builtin/show-branch.c:679
7746 msgid "show <n> most recent ref-log entries starting at base"
7749 #: builtin/show-ref.c:10
7751 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"
7752 "[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
7755 #: builtin/show-ref.c:11
7756 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
7759 #: builtin/show-ref.c:165
7760 msgid "only show tags (can be combined with heads)"
7763 #: builtin/show-ref.c:166
7764 msgid "only show heads (can be combined with tags)"
7767 #: builtin/show-ref.c:167
7768 msgid "stricter reference checking, requires exact ref path"
7771 #: builtin/show-ref.c:170 builtin/show-ref.c:172
7772 msgid "show the HEAD reference"
7775 #: builtin/show-ref.c:174
7776 msgid "dereference tags into object IDs"
7779 #: builtin/show-ref.c:176
7780 msgid "only show SHA1 hash using <n> digits"
7783 #: builtin/show-ref.c:180
7784 msgid "do not print results to stdout (useful with --verify)"
7787 #: builtin/show-ref.c:182
7788 msgid "show refs from stdin that aren't in local repository"
7791 #: builtin/symbolic-ref.c:7
7792 msgid "git symbolic-ref [options] name [ref]"
7795 #: builtin/symbolic-ref.c:8
7796 msgid "git symbolic-ref -d [-q] name"
7799 #: builtin/symbolic-ref.c:40
7800 msgid "suppress error message for non-symbolic (detached) refs"
7803 #: builtin/symbolic-ref.c:41
7804 msgid "delete symbolic ref"
7807 #: builtin/symbolic-ref.c:42
7808 msgid "shorten ref output"
7811 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
7815 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
7816 msgid "reason of the update"
7821 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
7825 msgid "git tag -d <tagname>..."
7830 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
7831 "\t\t[<pattern>...]"
7835 msgid "git tag -v <tagname>..."
7840 msgid "malformed object at '%s'"
7843 #: builtin/tag.c:207
7845 msgid "tag name too long: %.*s..."
7848 #: builtin/tag.c:212
7850 msgid "tag '%s' not found."
7853 #: builtin/tag.c:227
7855 msgid "Deleted tag '%s' (was %s)\n"
7858 #: builtin/tag.c:239
7860 msgid "could not verify the tag '%s'"
7863 #: builtin/tag.c:249
7867 "# Write a tag message\n"
7868 "# Lines starting with '#' will be ignored.\n"
7872 #: builtin/tag.c:256
7876 "# Write a tag message\n"
7877 "# Lines starting with '#' will be kept; you may remove them yourself if you "
7882 #: builtin/tag.c:298
7883 msgid "unable to sign the tag"
7886 #: builtin/tag.c:300
7887 msgid "unable to write tag file"
7890 #: builtin/tag.c:325
7891 msgid "bad object type."
7894 #: builtin/tag.c:338
7895 msgid "tag header too big."
7898 #: builtin/tag.c:370
7899 msgid "no tag message?"
7902 #: builtin/tag.c:376
7904 msgid "The tag message has been left in %s\n"
7907 #: builtin/tag.c:425
7908 msgid "switch 'points-at' requires an object"
7911 #: builtin/tag.c:427
7913 msgid "malformed object name '%s'"
7916 #: builtin/tag.c:447
7917 msgid "list tag names"
7920 #: builtin/tag.c:449
7921 msgid "print <n> lines of each tag message"
7924 #: builtin/tag.c:451
7928 #: builtin/tag.c:452
7932 #: builtin/tag.c:454
7933 msgid "Tag creation options"
7936 #: builtin/tag.c:456
7937 msgid "annotated tag, needs a message"
7940 #: builtin/tag.c:458
7944 #: builtin/tag.c:460
7945 msgid "annotated and GPG-signed tag"
7948 #: builtin/tag.c:464
7949 msgid "use another key to sign the tag"
7952 #: builtin/tag.c:465
7953 msgid "replace the tag if exists"
7956 #: builtin/tag.c:466
7957 msgid "show tag list in columns"
7960 #: builtin/tag.c:468
7961 msgid "Tag listing options"
7964 #: builtin/tag.c:471
7965 msgid "print only tags that contain the commit"
7968 #: builtin/tag.c:477
7969 msgid "print only tags of the object"
7972 #: builtin/tag.c:506
7973 msgid "--column and -n are incompatible"
7976 #: builtin/tag.c:523
7977 msgid "-n option is only allowed with -l."
7980 #: builtin/tag.c:525
7981 msgid "--contains option is only allowed with -l."
7984 #: builtin/tag.c:527
7985 msgid "--points-at option is only allowed with -l."
7988 #: builtin/tag.c:535
7989 msgid "only one -F or -m option is allowed."
7992 #: builtin/tag.c:555
7993 msgid "too many params"
7996 #: builtin/tag.c:561
7998 msgid "'%s' is not a valid tag name."
8001 #: builtin/tag.c:566
8003 msgid "tag '%s' already exists"
8006 #: builtin/tag.c:584
8008 msgid "%s: cannot lock the ref"
8011 #: builtin/tag.c:586
8013 msgid "%s: cannot update the ref"
8016 #: builtin/tag.c:588
8018 msgid "Updated tag '%s' (was %s)\n"
8021 #: builtin/update-index.c:401
8022 msgid "git update-index [options] [--] [<file>...]"
8025 #: builtin/update-index.c:718
8026 msgid "continue refresh even when index needs update"
8029 #: builtin/update-index.c:721
8030 msgid "refresh: ignore submodules"
8033 #: builtin/update-index.c:724
8034 msgid "do not ignore new files"
8037 #: builtin/update-index.c:726
8038 msgid "let files replace directories and vice-versa"
8041 #: builtin/update-index.c:728
8042 msgid "notice files missing from worktree"
8045 #: builtin/update-index.c:730
8046 msgid "refresh even if index contains unmerged entries"
8049 #: builtin/update-index.c:733
8050 msgid "refresh stat information"
8053 #: builtin/update-index.c:737
8054 msgid "like --refresh, but ignore assume-unchanged setting"
8057 #: builtin/update-index.c:741
8058 msgid "<mode> <object> <path>"
8061 #: builtin/update-index.c:742
8062 msgid "add the specified entry to the index"
8065 #: builtin/update-index.c:746
8069 #: builtin/update-index.c:747
8070 msgid "override the executable bit of the listed files"
8073 #: builtin/update-index.c:751
8074 msgid "mark files as \"not changing\""
8077 #: builtin/update-index.c:754
8078 msgid "clear assumed-unchanged bit"
8081 #: builtin/update-index.c:757
8082 msgid "mark files as \"index-only\""
8085 #: builtin/update-index.c:760
8086 msgid "clear skip-worktree bit"
8089 #: builtin/update-index.c:763
8090 msgid "add to index only; do not add content to object database"
8093 #: builtin/update-index.c:765
8094 msgid "remove named paths even if present in worktree"
8097 #: builtin/update-index.c:767
8098 msgid "with --stdin: input lines are terminated by null bytes"
8101 #: builtin/update-index.c:769
8102 msgid "read list of paths to be updated from standard input"
8105 #: builtin/update-index.c:773
8106 msgid "add entries from standard input to the index"
8109 #: builtin/update-index.c:777
8110 msgid "repopulate stages #2 and #3 for the listed paths"
8113 #: builtin/update-index.c:781
8114 msgid "only update entries that differ from HEAD"
8117 #: builtin/update-index.c:785
8118 msgid "ignore files missing from worktree"
8121 #: builtin/update-index.c:788
8122 msgid "report actions to standard output"
8125 #: builtin/update-index.c:790
8126 msgid "(for porcelains) forget saved unresolved conflicts"
8129 #: builtin/update-index.c:794
8130 msgid "write index in this format"
8133 #: builtin/update-ref.c:7
8134 msgid "git update-ref [options] -d <refname> [<oldval>]"
8137 #: builtin/update-ref.c:8
8138 msgid "git update-ref [options] <refname> <newval> [<oldval>]"
8141 #: builtin/update-ref.c:19
8142 msgid "delete the reference"
8145 #: builtin/update-ref.c:21
8146 msgid "update <refname> not the one it points to"
8149 #: builtin/update-server-info.c:6
8150 msgid "git update-server-info [--force]"
8153 #: builtin/update-server-info.c:14
8154 msgid "update the info files from scratch"
8157 #: builtin/verify-pack.c:56
8158 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8161 #: builtin/verify-pack.c:66
8165 #: builtin/verify-pack.c:68
8166 msgid "show statistics only"
8169 #: builtin/verify-tag.c:17
8170 msgid "git verify-tag [-v|--verbose] <tag>..."
8173 #: builtin/verify-tag.c:73
8174 msgid "print tag contents"
8177 #: builtin/write-tree.c:13
8178 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
8181 #: builtin/write-tree.c:26
8185 #: builtin/write-tree.c:27
8186 msgid "write tree object for a subdirectory <prefix>"
8189 #: builtin/write-tree.c:30
8190 msgid "only useful for debugging"
8194 msgid "See 'git help <command>' for more information on a specific command."
8197 #: parse-options.h:156
8198 msgid "no-op (backward compatibility)"
8201 #: parse-options.h:232
8202 msgid "be more verbose"
8205 #: parse-options.h:234
8206 msgid "be more quiet"
8209 #: parse-options.h:240
8210 msgid "use <n> digits to display SHA-1s"
8214 msgid "Add file contents to the index"
8218 msgid "Find by binary search the change that introduced a bug"
8222 msgid "List, create, or delete branches"
8226 msgid "Checkout a branch or paths to the working tree"
8230 msgid "Clone a repository into a new directory"
8234 msgid "Record changes to the repository"
8238 msgid "Show changes between commits, commit and working tree, etc"
8242 msgid "Download objects and refs from another repository"
8246 msgid "Print lines matching a pattern"
8250 msgid "Create an empty git repository or reinitialize an existing one"
8254 msgid "Show commit logs"
8258 msgid "Join two or more development histories together"
8262 msgid "Move or rename a file, a directory, or a symlink"
8266 msgid "Fetch from and merge with another repository or a local branch"
8270 msgid "Update remote refs along with associated objects"
8274 msgid "Forward-port local commits to the updated upstream head"
8278 msgid "Reset current HEAD to the specified state"
8282 msgid "Remove files from the working tree and from the index"
8286 msgid "Show various types of objects"
8290 msgid "Show the working tree status"
8294 msgid "Create, list, delete or verify a tag object signed with GPG"
8298 msgid "You need to set your committer info first"
8303 "You seem to have moved HEAD since the last 'am' failure.\n"
8304 "Not rewinding to ORIG_HEAD"
8310 "When you have resolved this problem, run \"$cmdline --resolved\".\n"
8311 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8312 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
8316 msgid "Cannot fall back to three-way merge."
8320 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
8324 msgid "Using index info to reconstruct a base tree..."
8329 "Did you hand edit your patch?\n"
8330 "It does not apply to blobs recorded in its index."
8334 msgid "Falling back to patching base and 3-way merge..."
8338 msgid "Failed to merge in the changes."
8342 msgid "Only one StGIT patch series can be applied at once"
8347 msgid "Patch format $patch_format is not supported."
8351 msgid "Patch format detection failed."
8356 "The -b/--binary option has been a no-op for long time, and\n"
8357 "it will be removed. Please do not use it anymore."
8362 msgid "previous rebase directory $dotest still exists but mbox given."
8366 msgid "Please make up your mind. --skip or --abort?"
8370 msgid "Resolve operation not in progress, we are not resuming."
8375 msgid "Dirty index: cannot apply patches (dirty: $files)"
8381 "Patch is empty. Was it split wrong?\n"
8382 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
8383 "To restore the original branch and stop patching run \"$cmdline --abort\"."
8387 msgid "Patch does not have a valid e-mail address."
8391 msgid "cannot be interactive without stdin connected to a terminal."
8395 msgid "Commit Body is:"
8398 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
8399 #. in your translation. The program will only accept English
8400 #. input at this point.
8402 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8407 msgid "Applying: $FIRSTLINE"
8412 "No changes - did you forget to use 'git add'?\n"
8413 "If there is nothing left to stage, chances are that something else\n"
8414 "already introduced the same changes; you might want to skip this patch."
8419 "You still have unmerged paths in your index\n"
8420 "did you forget to use 'git add'?"
8424 msgid "No changes -- Patch already applied."
8429 msgid "Patch failed at $msgnum $FIRSTLINE"
8435 "The copy of the patch that failed is found in:\n"
8440 msgid "applying to an empty history"
8444 msgid "You need to start by \"git bisect start\""
8447 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8448 #. translation. The program will only accept English input
8451 msgid "Do you want me to do it for you [Y/n]? "
8456 msgid "unrecognised option: '$arg'"
8461 msgid "'$arg' does not appear to be a valid revision"
8464 #: git-bisect.sh:117
8465 msgid "Bad HEAD - I need a HEAD"
8468 #: git-bisect.sh:130
8471 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
8474 #: git-bisect.sh:140
8475 msgid "won't bisect on seeked tree"
8478 #: git-bisect.sh:144
8479 msgid "Bad HEAD - strange symbolic ref"
8482 #: git-bisect.sh:189
8484 msgid "Bad bisect_write argument: $state"
8487 #: git-bisect.sh:218
8489 msgid "Bad rev input: $arg"
8492 #: git-bisect.sh:232
8493 msgid "Please call 'bisect_state' with at least one argument."
8496 #: git-bisect.sh:244
8498 msgid "Bad rev input: $rev"
8501 #: git-bisect.sh:250
8502 msgid "'git bisect bad' can take only one argument."
8505 #. have bad but not good. we could bisect although
8506 #. this is less optimum.
8507 #: git-bisect.sh:273
8508 msgid "Warning: bisecting only with a bad commit."
8511 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8512 #. translation. The program will only accept English input
8514 #: git-bisect.sh:279
8515 msgid "Are you sure [Y/n]? "
8518 #: git-bisect.sh:289
8520 "You need to give me at least one good and one bad revisions.\n"
8521 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8524 #: git-bisect.sh:292
8526 "You need to start by \"git bisect start\".\n"
8527 "You then need to give me at least one good and one bad revisions.\n"
8528 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8531 #: git-bisect.sh:347 git-bisect.sh:474
8532 msgid "We are not bisecting."
8535 #: git-bisect.sh:354
8537 msgid "'$invalid' is not a valid commit"
8540 #: git-bisect.sh:363
8543 "Could not check out original HEAD '$branch'.\n"
8544 "Try 'git bisect reset <commit>'."
8547 #: git-bisect.sh:390
8548 msgid "No logfile given"
8551 #: git-bisect.sh:391
8553 msgid "cannot read $file for replaying"
8556 #: git-bisect.sh:408
8557 msgid "?? what are you talking about?"
8560 #: git-bisect.sh:420
8562 msgid "running $command"
8565 #: git-bisect.sh:427
8568 "bisect run failed:\n"
8569 "exit code $res from '$command' is < 0 or >= 128"
8572 #: git-bisect.sh:453
8573 msgid "bisect run cannot continue any more"
8576 #: git-bisect.sh:459
8579 "bisect run failed:\n"
8580 "'bisect_state $state' exited with error code $res"
8583 #: git-bisect.sh:466
8584 msgid "bisect run success"
8589 "Pull is not possible because you have unmerged files.\n"
8590 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
8591 "as appropriate to mark resolution, or use 'git commit -a'."
8595 msgid "Pull is not possible because you have unmerged files."
8599 msgid "updating an unborn branch with changes added to the index"
8602 #. The fetch involved updating the current branch.
8603 #. The working tree and the index file is still based on the
8604 #. $orig_head commit, but we are merging into $curr_head.
8605 #. First update the working tree to match $curr_head.
8609 "Warning: fetch updated the current branch head.\n"
8610 "Warning: fast-forwarding your working tree from\n"
8611 "Warning: commit $orig_head."
8615 msgid "Cannot merge multiple branches into empty head"
8619 msgid "Cannot rebase onto multiple branches"
8624 "When you have resolved this problem, run \"git rebase --continue\".\n"
8625 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
8626 "To check out the original branch and stop rebasing, run \"git rebase --abort"
8630 #: git-rebase.sh:160
8631 msgid "The pre-rebase hook refused to rebase."
8634 #: git-rebase.sh:165
8635 msgid "It looks like git-am is in progress. Cannot rebase."
8638 #: git-rebase.sh:296
8639 msgid "The --exec option must be used with the --interactive option"
8642 #: git-rebase.sh:301
8643 msgid "No rebase in progress?"
8646 #: git-rebase.sh:312
8647 msgid "The --edit-todo action can only be used during interactive rebase."
8650 #: git-rebase.sh:319
8651 msgid "Cannot read HEAD"
8654 #: git-rebase.sh:322
8656 "You must edit all merge conflicts and then\n"
8657 "mark them as resolved using git add"
8660 #: git-rebase.sh:340
8662 msgid "Could not move back to $head_name"
8665 #: git-rebase.sh:359
8668 "It seems that there is already a $state_dir_base directory, and\n"
8669 "I wonder if you are in the middle of another rebase. If that is the\n"
8670 "case, please try\n"
8671 "\t$cmd_live_rebase\n"
8672 "If that is not the case, please\n"
8673 "\t$cmd_clear_stale_rebase\n"
8674 "and run me again. I am stopping in case you still have something\n"
8678 #: git-rebase.sh:404
8680 msgid "invalid upstream $upstream_name"
8683 #: git-rebase.sh:428
8685 msgid "$onto_name: there are more than one merge bases"
8688 #: git-rebase.sh:431 git-rebase.sh:435
8690 msgid "$onto_name: there is no merge base"
8693 #: git-rebase.sh:440
8695 msgid "Does not point to a valid commit: $onto_name"
8698 #: git-rebase.sh:463
8700 msgid "fatal: no such branch: $branch_name"
8703 #: git-rebase.sh:483
8704 msgid "Please commit or stash them."
8707 #: git-rebase.sh:501
8709 msgid "Current branch $branch_name is up to date."
8712 #: git-rebase.sh:504
8714 msgid "Current branch $branch_name is up to date, rebase forced."
8717 #: git-rebase.sh:515
8719 msgid "Changes from $mb to $onto:"
8722 #. Detach HEAD and reset the tree
8723 #: git-rebase.sh:524
8724 msgid "First, rewinding head to replay your work on top of it..."
8727 #: git-rebase.sh:532
8729 msgid "Fast-forwarded $branch_name to $onto_name."
8733 msgid "git stash clear with parameters is unimplemented"
8737 msgid "You do not have the initial commit yet"
8741 msgid "Cannot save the current index state"
8744 #: git-stash.sh:123 git-stash.sh:136
8745 msgid "Cannot save the current worktree state"
8749 msgid "No changes selected"
8753 msgid "Cannot remove temporary index (can't happen)"
8757 msgid "Cannot record working tree state"
8760 #. TRANSLATORS: $option is an invalid option, like
8761 #. `--blah-blah'. The 7 spaces at the beginning of the
8762 #. second line correspond to "error: ". So you should line
8763 #. up the second line with however many characters the
8764 #. translation of "error: " takes in your language. E.g. in
8767 #. $ git stash save --blah-blah 2>&1 | head -n 2
8768 #. error: unknown option for 'stash save': --blah-blah
8769 #. To provide a message, use git stash save -- '--blah-blah'
8773 "error: unknown option for 'stash save': $option\n"
8774 " To provide a message, use git stash save -- '$option'"
8778 msgid "No local changes to save"
8782 msgid "Cannot initialize stash"
8786 msgid "Cannot save the current status"
8790 msgid "Cannot remove worktree changes"
8794 msgid "No stash found."
8799 msgid "Too many revisions specified: $REV"
8804 msgid "$reference is not valid reference"
8809 msgid "'$args' is not a stash-like commit"
8814 msgid "'$args' is not a stash reference"
8818 msgid "unable to refresh index"
8822 msgid "Cannot apply a stash in the middle of a merge"
8826 msgid "Conflicts in index. Try without --index."
8830 msgid "Could not save index tree"
8834 msgid "Cannot unstage modified files"
8838 msgid "Index was not unstashed."
8843 msgid "Dropped ${REV} ($s)"
8848 msgid "${REV}: Could not drop stash entry"
8852 msgid "No branch name specified"
8856 msgid "(To restore them type \"git stash apply\")"
8859 #: git-submodule.sh:90
8861 msgid "cannot strip one component off url '$remoteurl'"
8864 #: git-submodule.sh:195
8866 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
8869 #: git-submodule.sh:238
8871 msgid "Clone of '$url' into submodule path '$sm_path' failed"
8874 #: git-submodule.sh:250
8876 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
8879 #: git-submodule.sh:343
8881 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
8884 #: git-submodule.sh:360
8886 msgid "'$sm_path' already exists in the index"
8889 #: git-submodule.sh:364
8892 "The following path is ignored by one of your .gitignore files:\n"
8894 "Use -f if you really want to add it."
8897 #: git-submodule.sh:382
8899 msgid "Adding existing repo at '$sm_path' to the index"
8902 #: git-submodule.sh:384
8904 msgid "'$sm_path' already exists and is not a valid git repo"
8907 #: git-submodule.sh:392
8909 msgid "A git directory for '$sm_name' is found locally with remote(s):"
8912 #: git-submodule.sh:394
8915 "If you want to reuse this local git directory instead of cloning again from"
8918 #: git-submodule.sh:396
8921 "use the '--force' option. If the local git directory is not the correct repo"
8924 #: git-submodule.sh:397
8927 "or you are unsure what this means choose another name with the '--name' "
8931 #: git-submodule.sh:399
8933 msgid "Reactivating local git directory for submodule '$sm_name'."
8936 #: git-submodule.sh:411
8938 msgid "Unable to checkout submodule '$sm_path'"
8941 #: git-submodule.sh:416
8943 msgid "Failed to add submodule '$sm_path'"
8946 #: git-submodule.sh:425
8948 msgid "Failed to register submodule '$sm_path'"
8951 #: git-submodule.sh:468
8953 msgid "Entering '$prefix$sm_path'"
8956 #: git-submodule.sh:482
8958 msgid "Stopping at '$sm_path'; script returned non-zero status."
8961 #: git-submodule.sh:526
8963 msgid "No url found for submodule path '$sm_path' in .gitmodules"
8966 #: git-submodule.sh:535
8968 msgid "Failed to register url for submodule path '$sm_path'"
8971 #: git-submodule.sh:537
8973 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
8976 #: git-submodule.sh:545
8978 msgid "Failed to register update mode for submodule path '$sm_path'"
8981 #: git-submodule.sh:649
8984 "Submodule path '$sm_path' not initialized\n"
8985 "Maybe you want to use 'update --init'?"
8988 #: git-submodule.sh:662
8990 msgid "Unable to find current revision in submodule path '$sm_path'"
8993 #: git-submodule.sh:671 git-submodule.sh:695
8995 msgid "Unable to fetch in submodule path '$sm_path'"
8998 #: git-submodule.sh:709
9000 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
9003 #: git-submodule.sh:710
9005 msgid "Submodule path '$sm_path': rebased into '$sha1'"
9008 #: git-submodule.sh:715
9010 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
9013 #: git-submodule.sh:716
9015 msgid "Submodule path '$sm_path': merged in '$sha1'"
9018 #: git-submodule.sh:721
9020 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
9023 #: git-submodule.sh:722
9025 msgid "Submodule path '$sm_path': checked out '$sha1'"
9028 #: git-submodule.sh:744 git-submodule.sh:1066
9030 msgid "Failed to recurse into submodule path '$sm_path'"
9033 #: git-submodule.sh:852
9034 msgid "The --cached option cannot be used with the --files option"
9038 #: git-submodule.sh:892
9040 msgid "unexpected mode $mod_dst"
9043 #: git-submodule.sh:910
9045 msgid " Warn: $name doesn't contain commit $sha1_src"
9048 #: git-submodule.sh:913
9050 msgid " Warn: $name doesn't contain commit $sha1_dst"
9053 #: git-submodule.sh:916
9055 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9058 #: git-submodule.sh:941
9062 #: git-submodule.sh:979
9063 msgid "# Submodules changed but not updated:"
9066 #: git-submodule.sh:981
9067 msgid "# Submodule changes to be committed:"
9070 #: git-submodule.sh:1129
9072 msgid "Synchronizing submodule url for '$prefix$sm_path'"