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-03-05 12:36+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:2366
72 #: builtin/blame.c:2367 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:497 builtin/ls-files.c:500 builtin/notes.c:536
75 #: builtin/notes.c:693 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:615
119 #: archive.c:348 builtin/archive.c:96
120 msgid "path to the remote git-upload-archive command"
125 "Negative patterns are ignored 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 gpg-interface.c:127
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"
348 #: gpg-interface.c:112
350 msgid "could not create temporary file '%s': %s"
353 #: gpg-interface.c:115
355 msgid "failed writing detached signature to '%s': %s"
360 msgid "'%s': unable to read %s"
370 msgid "'%s': short read %s"
375 msgid "available git commands in '%s'"
379 msgid "git commands available from elsewhere on your $PATH"
383 msgid "The most commonly used git commands are:"
389 "'%s' appears to be a git command, but we were not\n"
390 "able to execute it. Maybe git-%s is broken?"
394 msgid "Uh oh. Your system reports no Git commands at all."
400 "WARNING: You called a Git command named '%s', which does not exist.\n"
401 "Continuing under the assumption that you meant '%s'"
406 msgid "in %0.1f seconds automatically..."
411 msgid "git: '%s' is not a git command. See 'git --help'."
420 "Did you mean one of these?"
425 msgid "failed to read the cache"
428 #: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534
429 #: builtin/clone.c:586
430 msgid "unable to write new index file"
433 #: merge-recursive.c:190
435 msgid "(bad commit)\n"
438 #: merge-recursive.c:206
440 msgid "addinfo_cache failed for path '%s'"
443 #: merge-recursive.c:268
444 msgid "error building trees"
447 #: merge-recursive.c:672
449 msgid "failed to create path '%s'%s"
452 #: merge-recursive.c:683
454 msgid "Removing %s to make room for subdirectory\n"
457 #. something else exists
458 #. .. but not some other error (who really cares what?)
459 #: merge-recursive.c:697 merge-recursive.c:718
460 msgid ": perhaps a D/F conflict?"
463 #: merge-recursive.c:708
465 msgid "refusing to lose untracked file at '%s'"
468 #: merge-recursive.c:748
470 msgid "cannot read object %s '%s'"
473 #: merge-recursive.c:750
475 msgid "blob expected for %s '%s'"
478 #: merge-recursive.c:773 builtin/clone.c:302
480 msgid "failed to open '%s'"
483 #: merge-recursive.c:781
485 msgid "failed to symlink '%s'"
488 #: merge-recursive.c:784
490 msgid "do not know what to do with %06o %s '%s'"
493 #: merge-recursive.c:922
494 msgid "Failed to execute internal merge"
497 #: merge-recursive.c:926
499 msgid "Unable to add %s to database"
502 #: merge-recursive.c:942
503 msgid "unsupported object type in the tree"
506 #: merge-recursive.c:1021 merge-recursive.c:1035
509 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
513 #: merge-recursive.c:1027 merge-recursive.c:1040
516 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
520 #: merge-recursive.c:1081
524 #: merge-recursive.c:1081
528 #: merge-recursive.c:1137
530 msgid "%s is a directory in %s adding as %s instead"
533 #: merge-recursive.c:1159
536 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
537 "\"->\"%s\" in \"%s\"%s"
540 #: merge-recursive.c:1164
541 msgid " (left unresolved)"
544 #: merge-recursive.c:1218
546 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
549 #: merge-recursive.c:1248
551 msgid "Renaming %s to %s and %s to %s instead"
554 #: merge-recursive.c:1447
556 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
559 #: merge-recursive.c:1457
561 msgid "Adding merged %s"
564 #: merge-recursive.c:1462 merge-recursive.c:1660
566 msgid "Adding as %s instead"
569 #: merge-recursive.c:1513
571 msgid "cannot read object %s"
574 #: merge-recursive.c:1516
576 msgid "object %s is not a blob"
579 #: merge-recursive.c:1564
583 #: merge-recursive.c:1564
587 #: merge-recursive.c:1574
591 #: merge-recursive.c:1581
595 #: merge-recursive.c:1615
597 msgid "Skipped %s (merged same as existing)"
600 #: merge-recursive.c:1629
602 msgid "Auto-merging %s"
605 #: merge-recursive.c:1633 git-submodule.sh:942
609 #: merge-recursive.c:1634
611 msgid "CONFLICT (%s): Merge conflict in %s"
614 #: merge-recursive.c:1724
619 #: merge-recursive.c:1749
620 msgid "file/directory"
623 #: merge-recursive.c:1755
624 msgid "directory/file"
627 #: merge-recursive.c:1760
629 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
632 #: merge-recursive.c:1770
637 #: merge-recursive.c:1787
638 msgid "Fatal merge failure, shouldn't happen."
641 #: merge-recursive.c:1806
642 msgid "Already up-to-date!"
645 #: merge-recursive.c:1815
647 msgid "merging of trees %s and %s failed"
650 #: merge-recursive.c:1845
652 msgid "Unprocessed path??? %s"
655 #: merge-recursive.c:1890
659 #: merge-recursive.c:1903
661 msgid "found %u common ancestor:"
662 msgid_plural "found %u common ancestors:"
666 #: merge-recursive.c:1940
667 msgid "merge returned no commit"
670 #: merge-recursive.c:1997
672 msgid "Could not parse object '%s'"
675 #: merge-recursive.c:2009 builtin/merge.c:643
676 msgid "Unable to write index."
679 #: parse-options.c:489
683 #: parse-options.c:507
688 #. TRANSLATORS: the colon here should align with the
689 #. one in "usage: %s" translation
690 #: parse-options.c:511
695 #: parse-options.c:514
700 #: parse-options.c:548
706 msgid "Path '%s' is in submodule '%.*s'"
711 msgid "'%s' is beyond a symbolic link"
716 msgid "Your branch is ahead of '%s' by %d commit.\n"
717 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
722 msgid " (use \"git push\" to publish your local commits)\n"
727 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
729 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
734 msgid " (use \"git pull\" to update your local branch)\n"
740 "Your branch and '%s' have diverged,\n"
741 "and have %d and %d different commit each, respectively.\n"
743 "Your branch and '%s' have diverged,\n"
744 "and have %d and %d different commits each, respectively.\n"
749 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
752 #: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984
753 #: builtin/merge.c:994
755 msgid "Could not open '%s' for writing"
758 #: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986
759 #: builtin/merge.c:999
761 msgid "Could not write to '%s'"
766 "after resolving the conflicts, mark the corrected paths\n"
767 "with 'git add <paths>' or 'git rm <paths>'"
772 "after resolving the conflicts, mark the corrected paths\n"
773 "with 'git add <paths>' or 'git rm <paths>'\n"
774 "and commit the result with 'git commit'"
777 #: sequencer.c:162 sequencer.c:774 sequencer.c:857
779 msgid "Could not write to %s"
784 msgid "Error wrapping up %s"
788 msgid "Your local changes would be overwritten by cherry-pick."
792 msgid "Your local changes would be overwritten by revert."
796 msgid "Commit your changes or stash them to proceed."
799 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
802 msgid "%s: Unable to write new index file"
806 msgid "Could not resolve HEAD commit\n"
810 msgid "Unable to update cache tree\n"
815 msgid "Could not parse commit %s\n"
820 msgid "Could not parse parent commit %s\n"
824 msgid "Your index file is unmerged."
829 msgid "Commit %s is a merge but no -m option was given."
834 msgid "Commit %s does not have parent %d"
839 msgid "Mainline was specified but commit %s is not a merge."
842 #. TRANSLATORS: The first %s will be "revert" or
843 #. "cherry-pick", the second %s a SHA1
846 msgid "%s: cannot parse parent commit %s"
851 msgid "Cannot get commit message for %s"
856 msgid "could not revert %s... %s"
861 msgid "could not apply %s... %s"
865 msgid "empty commit set passed"
870 msgid "git %s: failed to read the index"
875 msgid "git %s: failed to refresh the index"
880 msgid "Cannot %s during a %s"
885 msgid "Could not parse line %d."
889 msgid "No commits parsed."
894 msgid "Could not open %s"
899 msgid "Could not read %s."
904 msgid "Unusable instruction sheet: %s"
909 msgid "Invalid key: %s"
914 msgid "Invalid value for %s: %s"
919 msgid "Malformed options sheet: %s"
923 msgid "a cherry-pick or revert is already in progress"
927 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
932 msgid "Could not create sequencer directory %s"
935 #: sequencer.c:776 sequencer.c:861
937 msgid "Error wrapping up %s."
940 #: sequencer.c:795 sequencer.c:929
941 msgid "no cherry-pick or revert in progress"
945 msgid "cannot resolve HEAD"
949 msgid "cannot abort from a branch yet to be born"
952 #: sequencer.c:821 builtin/apply.c:4056
954 msgid "cannot open %s: %s"
959 msgid "cannot read %s: %s"
963 msgid "unexpected end of file"
968 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
973 msgid "Could not format %s."
977 msgid "Can't revert as initial commit"
981 msgid "Can't cherry-pick into empty head"
985 msgid "HEAD does not point to a branch"
990 msgid "No such branch: '%s'"
995 msgid "No upstream configured for branch '%s'"
1000 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1005 msgid "unable to access '%s': %s"
1010 msgid "unable to access '%s'"
1015 msgid "unable to look up current user in the passwd file: %s"
1019 msgid "no such user"
1023 msgid "Unmerged paths:"
1026 #: wt-status.c:167 wt-status.c:194
1028 msgid " (use \"git reset %s <file>...\" to unstage)"
1031 #: wt-status.c:169 wt-status.c:196
1032 msgid " (use \"git rm --cached <file>...\" to unstage)"
1036 msgid " (use \"git add <file>...\" to mark resolution)"
1039 #: wt-status.c:175 wt-status.c:179
1040 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1044 msgid " (use \"git rm <file>...\" to mark resolution)"
1048 msgid "Changes to be committed:"
1052 msgid "Changes not staged for commit:"
1056 msgid " (use \"git add <file>...\" to update what will be committed)"
1060 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1065 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1069 msgid " (commit or discard the untracked or modified content in submodules)"
1074 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1082 msgid "both deleted:"
1086 msgid "added by us:"
1090 msgid "deleted by them:"
1094 msgid "added by them:"
1098 msgid "deleted by us:"
1106 msgid "both modified:"
1110 msgid "new commits, "
1114 msgid "modified content, "
1118 msgid "untracked content, "
1123 msgid "new file: %s"
1128 msgid "copied: %s -> %s"
1138 msgid "modified: %s"
1143 msgid "renamed: %s -> %s"
1148 msgid "typechange: %s"
1158 msgid "unmerged: %s"
1163 msgid "bug: unhandled diff status %c"
1167 msgid "You have unmerged paths."
1170 #: wt-status.c:792 wt-status.c:944
1171 msgid " (fix conflicts and run \"git commit\")"
1175 msgid "All conflicts fixed but you are still merging."
1179 msgid " (use \"git commit\" to conclude merge)"
1183 msgid "You are in the middle of an am session."
1187 msgid "The current patch is empty."
1191 msgid " (fix conflicts and then run \"git am --resolved\")"
1195 msgid " (use \"git am --skip\" to skip this patch)"
1199 msgid " (use \"git am --abort\" to restore the original branch)"
1202 #: wt-status.c:879 wt-status.c:896
1204 msgid "You are currently rebasing branch '%s' on '%s'."
1207 #: wt-status.c:884 wt-status.c:901
1208 msgid "You are currently rebasing."
1212 msgid " (fix conflicts and then run \"git rebase --continue\")"
1216 msgid " (use \"git rebase --skip\" to skip this patch)"
1220 msgid " (use \"git rebase --abort\" to check out the original branch)"
1224 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1230 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1234 msgid "You are currently splitting a commit during a rebase."
1238 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1243 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1247 msgid "You are currently editing a commit during a rebase."
1251 msgid " (use \"git commit --amend\" to amend the current commit)"
1256 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1260 msgid "You are currently cherry-picking."
1264 msgid " (all conflicts fixed: run \"git commit\")"
1269 msgid "You are currently bisecting branch '%s'."
1273 msgid "You are currently bisecting."
1277 msgid " (use \"git bisect reset\" to get back to the original branch)"
1285 msgid "Not currently on any branch."
1289 msgid "Initial commit"
1293 msgid "Untracked files"
1297 msgid "Ignored files"
1302 msgid "Untracked files not listed%s"
1306 msgid " (use -u option to show untracked files)"
1315 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1320 msgid "no changes added to commit\n"
1326 "nothing added to commit but untracked files present (use \"git add\" to "
1332 msgid "nothing added to commit but untracked files present\n"
1337 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1340 #: wt-status.c:1129 wt-status.c:1134
1342 msgid "nothing to commit\n"
1347 msgid "nothing to commit (use -u to show untracked files)\n"
1352 msgid "nothing to commit, working directory clean\n"
1356 msgid "HEAD (no branch)"
1360 msgid "Initial commit on "
1367 #: wt-status.c:1268 wt-status.c:1271
1375 #: compat/precompose_utf8.c:58 builtin/clone.c:341
1377 msgid "failed to unlink '%s'"
1381 msgid "git add [options] [--] <pathspec>..."
1386 msgid "unexpected diff status %c"
1389 #: builtin/add.c:68 builtin/commit.c:231
1390 msgid "updating files failed"
1395 msgid "remove '%s'\n"
1398 #: builtin/add.c:148
1399 msgid "Unstaged changes after refreshing the index:"
1402 #: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275
1404 msgid "pathspec '%s' did not match any files"
1407 #: builtin/add.c:234
1408 msgid "Could not read the index"
1411 #: builtin/add.c:244
1413 msgid "Could not open '%s' for writing."
1416 #: builtin/add.c:248
1417 msgid "Could not write patch"
1420 #: builtin/add.c:253
1422 msgid "Could not stat '%s'"
1425 #: builtin/add.c:255
1426 msgid "Empty patch. Aborted."
1429 #: builtin/add.c:261
1431 msgid "Could not apply '%s'"
1434 #: builtin/add.c:271
1435 msgid "The following paths are ignored by one of your .gitignore files:\n"
1438 #: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
1439 #: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253
1444 #: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19
1445 #: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613
1446 #: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112
1450 #: builtin/add.c:280
1451 msgid "interactive picking"
1454 #: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258
1455 msgid "select hunks interactively"
1458 #: builtin/add.c:282
1459 msgid "edit current diff and apply"
1462 #: builtin/add.c:283
1463 msgid "allow adding otherwise ignored files"
1466 #: builtin/add.c:284
1467 msgid "update tracked files"
1470 #: builtin/add.c:285
1471 msgid "record only the fact that the path will be added later"
1474 #: builtin/add.c:286
1475 msgid "add changes from all tracked and untracked files"
1478 #: builtin/add.c:287
1479 msgid "don't add, only refresh the index"
1482 #: builtin/add.c:288
1483 msgid "just skip files which cannot be added because of errors"
1486 #: builtin/add.c:289
1487 msgid "check if - even missing - files are ignored in dry run"
1490 #: builtin/add.c:311
1492 msgid "Use -f if you really want to add them.\n"
1495 #: builtin/add.c:312
1496 msgid "no files added"
1499 #: builtin/add.c:318
1500 msgid "adding files failed"
1504 #. * To be consistent with "git add -p" and most Git
1505 #. * commands, we should default to being tree-wide, but
1506 #. * this is not the original behavior and can't be
1507 #. * changed until users trained themselves not to type
1508 #. * "git add -u" or "git add -A". For now, we warn and
1509 #. * keep the old behavior. Later, this warning can be
1510 #. * turned into a die(...), and eventually we may
1511 #. * reallow the command with a new behavior.
1513 #: builtin/add.c:335
1516 "The behavior of 'git add %s (or %s)' with no path argument from a\n"
1517 "subdirectory of the tree will change in Git 2.0 and should not be used "
1519 "To add content for the whole tree, run:\n"
1522 " (or git add %s :/)\n"
1524 "To restrict the command to the current directory, run:\n"
1527 " (or git add %s .)\n"
1529 "With the current Git version, the command is restricted to the current "
1533 #: builtin/add.c:381
1534 msgid "-A and -u are mutually incompatible"
1537 #: builtin/add.c:383
1538 msgid "Option --ignore-missing can only be used together with --dry-run"
1541 #: builtin/add.c:414
1543 msgid "Nothing specified, nothing added.\n"
1546 #: builtin/add.c:415
1548 msgid "Maybe you wanted to say 'git add .'?\n"
1551 #: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204
1552 #: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235
1553 msgid "index file corrupt"
1556 #: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370
1557 msgid "Unable to write new index file"
1560 #: builtin/apply.c:57
1561 msgid "git apply [options] [<patch>...]"
1564 #: builtin/apply.c:110
1566 msgid "unrecognized whitespace option '%s'"
1569 #: builtin/apply.c:125
1571 msgid "unrecognized whitespace ignore option '%s'"
1574 #: builtin/apply.c:823
1576 msgid "Cannot prepare timestamp regexp %s"
1579 #: builtin/apply.c:832
1581 msgid "regexec returned %d for input: %s"
1584 #: builtin/apply.c:913
1586 msgid "unable to find filename in patch at line %d"
1589 #: builtin/apply.c:945
1591 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1594 #: builtin/apply.c:949
1596 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1599 #: builtin/apply.c:950
1601 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1604 #: builtin/apply.c:957
1606 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1609 #: builtin/apply.c:1422
1611 msgid "recount: unexpected line: %.*s"
1614 #: builtin/apply.c:1479
1616 msgid "patch fragment without header at line %d: %.*s"
1619 #: builtin/apply.c:1496
1622 "git diff header lacks filename information when removing %d leading pathname "
1623 "component (line %d)"
1625 "git diff header lacks filename information when removing %d leading pathname "
1626 "components (line %d)"
1630 #: builtin/apply.c:1656
1631 msgid "new file depends on old contents"
1634 #: builtin/apply.c:1658
1635 msgid "deleted file still has contents"
1638 #: builtin/apply.c:1684
1640 msgid "corrupt patch at line %d"
1643 #: builtin/apply.c:1720
1645 msgid "new file %s depends on old contents"
1648 #: builtin/apply.c:1722
1650 msgid "deleted file %s still has contents"
1653 #: builtin/apply.c:1725
1655 msgid "** warning: file %s becomes empty but is not deleted"
1658 #: builtin/apply.c:1871
1660 msgid "corrupt binary patch at line %d: %.*s"
1663 #. there has to be one hunk (forward hunk)
1664 #: builtin/apply.c:1900
1666 msgid "unrecognized binary patch at line %d"
1669 #: builtin/apply.c:1986
1671 msgid "patch with only garbage at line %d"
1674 #: builtin/apply.c:2076
1676 msgid "unable to read symlink %s"
1679 #: builtin/apply.c:2080
1681 msgid "unable to open or read %s"
1684 #: builtin/apply.c:2684
1686 msgid "invalid start of line: '%c'"
1689 #: builtin/apply.c:2802
1691 msgid "Hunk #%d succeeded at %d (offset %d line)."
1692 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1696 #: builtin/apply.c:2814
1698 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1701 #: builtin/apply.c:2820
1704 "while searching for:\n"
1708 #: builtin/apply.c:2839
1710 msgid "missing binary patch data for '%s'"
1713 #: builtin/apply.c:2942
1715 msgid "binary patch does not apply to '%s'"
1718 #: builtin/apply.c:2948
1720 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1723 #: builtin/apply.c:2969
1725 msgid "patch failed: %s:%ld"
1728 #: builtin/apply.c:3091
1730 msgid "cannot checkout %s"
1733 #: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189
1735 msgid "read of %s failed"
1738 #: builtin/apply.c:3169 builtin/apply.c:3391
1740 msgid "path %s has been renamed/deleted"
1743 #: builtin/apply.c:3250 builtin/apply.c:3405
1745 msgid "%s: does not exist in index"
1748 #: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419
1753 #: builtin/apply.c:3259 builtin/apply.c:3413
1755 msgid "%s: does not match index"
1758 #: builtin/apply.c:3361
1759 msgid "removal patch leaves file contents"
1762 #: builtin/apply.c:3430
1764 msgid "%s: wrong type"
1767 #: builtin/apply.c:3432
1769 msgid "%s has type %o, expected %o"
1772 #: builtin/apply.c:3533
1774 msgid "%s: already exists in index"
1777 #: builtin/apply.c:3536
1779 msgid "%s: already exists in working directory"
1782 #: builtin/apply.c:3556
1784 msgid "new mode (%o) of %s does not match old mode (%o)"
1787 #: builtin/apply.c:3561
1789 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1792 #: builtin/apply.c:3569
1794 msgid "%s: patch does not apply"
1797 #: builtin/apply.c:3582
1799 msgid "Checking patch %s..."
1802 #: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124
1804 msgid "make_cache_entry failed for path '%s'"
1807 #: builtin/apply.c:3818
1809 msgid "unable to remove %s from index"
1812 #: builtin/apply.c:3846
1814 msgid "corrupt patch for subproject %s"
1817 #: builtin/apply.c:3850
1819 msgid "unable to stat newly created file '%s'"
1822 #: builtin/apply.c:3855
1824 msgid "unable to create backing store for newly created file %s"
1827 #: builtin/apply.c:3858 builtin/apply.c:3966
1829 msgid "unable to add cache entry for %s"
1832 #: builtin/apply.c:3891
1834 msgid "closing file '%s'"
1837 #: builtin/apply.c:3940
1839 msgid "unable to write file '%s' mode %o"
1842 #: builtin/apply.c:4027
1844 msgid "Applied patch %s cleanly."
1847 #: builtin/apply.c:4035
1848 msgid "internal error"
1851 #. Say this even without --verbose
1852 #: builtin/apply.c:4038
1854 msgid "Applying patch %%s with %d reject..."
1855 msgid_plural "Applying patch %%s with %d rejects..."
1859 #: builtin/apply.c:4048
1861 msgid "truncating .rej filename to %.*s.rej"
1864 #: builtin/apply.c:4069
1866 msgid "Hunk #%d applied cleanly."
1869 #: builtin/apply.c:4072
1871 msgid "Rejected hunk #%d."
1874 #: builtin/apply.c:4222
1875 msgid "unrecognized input"
1878 #: builtin/apply.c:4233
1879 msgid "unable to read index file"
1882 #: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91
1883 #: builtin/fetch.c:63
1887 #: builtin/apply.c:4353
1888 msgid "don't apply changes matching the given path"
1891 #: builtin/apply.c:4356
1892 msgid "apply changes matching the given path"
1895 #: builtin/apply.c:4358
1899 #: builtin/apply.c:4359
1900 msgid "remove <num> leading slashes from traditional diff paths"
1903 #: builtin/apply.c:4362
1904 msgid "ignore additions made by the patch"
1907 #: builtin/apply.c:4364
1908 msgid "instead of applying the patch, output diffstat for the input"
1911 #: builtin/apply.c:4368
1912 msgid "show number of added and deleted lines in decimal notation"
1915 #: builtin/apply.c:4370
1916 msgid "instead of applying the patch, output a summary for the input"
1919 #: builtin/apply.c:4372
1920 msgid "instead of applying the patch, see if the patch is applicable"
1923 #: builtin/apply.c:4374
1924 msgid "make sure the patch is applicable to the current index"
1927 #: builtin/apply.c:4376
1928 msgid "apply a patch without touching the working tree"
1931 #: builtin/apply.c:4378
1932 msgid "also apply the patch (use with --stat/--summary/--check)"
1935 #: builtin/apply.c:4380
1936 msgid "attempt three-way merge if a patch does not apply"
1939 #: builtin/apply.c:4382
1940 msgid "build a temporary index based on embedded index information"
1943 #: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463
1944 msgid "paths are separated with NUL character"
1947 #: builtin/apply.c:4387
1948 msgid "ensure at least <n> lines of context match"
1951 #: builtin/apply.c:4388
1955 #: builtin/apply.c:4389
1956 msgid "detect new or modified lines that have whitespace errors"
1959 #: builtin/apply.c:4392 builtin/apply.c:4395
1960 msgid "ignore changes in whitespace when finding context"
1963 #: builtin/apply.c:4398
1964 msgid "apply the patch in reverse"
1967 #: builtin/apply.c:4400
1968 msgid "don't expect at least one line of context"
1971 #: builtin/apply.c:4402
1972 msgid "leave the rejected hunks in corresponding *.rej files"
1975 #: builtin/apply.c:4404
1976 msgid "allow overlapping hunks"
1979 #: builtin/apply.c:4407
1980 msgid "tolerate incorrectly detected missing new-line at the end of file"
1983 #: builtin/apply.c:4410
1984 msgid "do not trust the line counts in the hunk headers"
1987 #: builtin/apply.c:4412
1991 #: builtin/apply.c:4413
1992 msgid "prepend <root> to all filenames"
1995 #: builtin/apply.c:4435
1996 msgid "--3way outside a repository"
1999 #: builtin/apply.c:4443
2000 msgid "--index outside a repository"
2003 #: builtin/apply.c:4446
2004 msgid "--cached outside a repository"
2007 #: builtin/apply.c:4462
2009 msgid "can't open patch '%s'"
2012 #: builtin/apply.c:4476
2014 msgid "squelched %d whitespace error"
2015 msgid_plural "squelched %d whitespace errors"
2019 #: builtin/apply.c:4482 builtin/apply.c:4492
2021 msgid "%d line adds whitespace errors."
2022 msgid_plural "%d lines add whitespace errors."
2026 #: builtin/archive.c:17
2028 msgid "could not create archive file '%s'"
2031 #: builtin/archive.c:20
2032 msgid "could not redirect output"
2035 #: builtin/archive.c:37
2036 msgid "git archive: Remote with no URL"
2039 #: builtin/archive.c:58
2040 msgid "git archive: expected ACK/NAK, got EOF"
2043 #: builtin/archive.c:63
2045 msgid "git archive: NACK %s"
2048 #: builtin/archive.c:65
2050 msgid "remote error: %s"
2053 #: builtin/archive.c:66
2054 msgid "git archive: protocol error"
2057 #: builtin/archive.c:71
2058 msgid "git archive: expected a flush"
2061 #: builtin/bisect--helper.c:7
2062 msgid "git bisect--helper --next-all [--no-checkout]"
2065 #: builtin/bisect--helper.c:17
2066 msgid "perform 'git bisect next'"
2069 #: builtin/bisect--helper.c:19
2070 msgid "update BISECT_HEAD instead of checking out the current commit"
2073 #: builtin/blame.c:25
2074 msgid "git blame [options] [rev-opts] [rev] [--] file"
2077 #: builtin/blame.c:30 builtin/shortlog.c:15
2078 msgid "[rev-opts] are documented in git-rev-list(1)"
2081 #: builtin/blame.c:2350
2082 msgid "Show blame entries as we find them, incrementally"
2085 #: builtin/blame.c:2351
2086 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2089 #: builtin/blame.c:2352
2090 msgid "Do not treat root commits as boundaries (Default: off)"
2093 #: builtin/blame.c:2353
2094 msgid "Show work cost statistics"
2097 #: builtin/blame.c:2354
2098 msgid "Show output score for blame entries"
2101 #: builtin/blame.c:2355
2102 msgid "Show original filename (Default: auto)"
2105 #: builtin/blame.c:2356
2106 msgid "Show original linenumber (Default: off)"
2109 #: builtin/blame.c:2357
2110 msgid "Show in a format designed for machine consumption"
2113 #: builtin/blame.c:2358
2114 msgid "Show porcelain format with per-line commit information"
2117 #: builtin/blame.c:2359
2118 msgid "Use the same output mode as git-annotate (Default: off)"
2121 #: builtin/blame.c:2360
2122 msgid "Show raw timestamp (Default: off)"
2125 #: builtin/blame.c:2361
2126 msgid "Show long commit SHA1 (Default: off)"
2129 #: builtin/blame.c:2362
2130 msgid "Suppress author name and timestamp (Default: off)"
2133 #: builtin/blame.c:2363
2134 msgid "Show author email instead of name (Default: off)"
2137 #: builtin/blame.c:2364
2138 msgid "Ignore whitespace differences"
2141 #: builtin/blame.c:2365
2142 msgid "Spend extra cycles to find better match"
2145 #: builtin/blame.c:2366
2146 msgid "Use revisions from <file> instead of calling git-rev-list"
2149 #: builtin/blame.c:2367
2150 msgid "Use <file>'s contents as the final image"
2153 #: builtin/blame.c:2368 builtin/blame.c:2369
2157 #: builtin/blame.c:2368
2158 msgid "Find line copies within and across files"
2161 #: builtin/blame.c:2369
2162 msgid "Find line movements within and across files"
2165 #: builtin/blame.c:2370
2169 #: builtin/blame.c:2370
2170 msgid "Process only line range n,m, counting from 1"
2173 #: builtin/branch.c:23
2174 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2177 #: builtin/branch.c:24
2178 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2181 #: builtin/branch.c:25
2182 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2185 #: builtin/branch.c:26
2186 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2189 #: builtin/branch.c:145
2192 "deleting branch '%s' that has been merged to\n"
2193 " '%s', but not yet merged to HEAD."
2196 #: builtin/branch.c:149
2199 "not deleting branch '%s' that is not yet merged to\n"
2200 " '%s', even though it is merged to HEAD."
2203 #: builtin/branch.c:163
2205 msgid "Couldn't look up commit object for '%s'"
2208 #: builtin/branch.c:167
2211 "The branch '%s' is not fully merged.\n"
2212 "If you are sure you want to delete it, run 'git branch -D %s'."
2215 #: builtin/branch.c:180
2216 msgid "Update of config-file failed"
2219 #: builtin/branch.c:208
2220 msgid "cannot use -a with -d"
2223 #: builtin/branch.c:214
2224 msgid "Couldn't look up commit object for HEAD"
2227 #: builtin/branch.c:222
2229 msgid "Cannot delete the branch '%s' which you are currently on."
2232 #: builtin/branch.c:235
2234 msgid "remote branch '%s' not found."
2237 #: builtin/branch.c:236
2239 msgid "branch '%s' not found."
2242 #: builtin/branch.c:250
2244 msgid "Error deleting remote branch '%s'"
2247 #: builtin/branch.c:251
2249 msgid "Error deleting branch '%s'"
2252 #: builtin/branch.c:258
2254 msgid "Deleted remote branch %s (was %s).\n"
2257 #: builtin/branch.c:259
2259 msgid "Deleted branch %s (was %s).\n"
2262 #: builtin/branch.c:361
2264 msgid "branch '%s' does not point at a commit"
2267 #: builtin/branch.c:433
2269 msgid "[%s: behind %d]"
2272 #: builtin/branch.c:435
2277 #: builtin/branch.c:439
2279 msgid "[%s: ahead %d]"
2282 #: builtin/branch.c:441
2287 #: builtin/branch.c:444
2289 msgid "[%s: ahead %d, behind %d]"
2292 #: builtin/branch.c:447
2294 msgid "[ahead %d, behind %d]"
2297 #: builtin/branch.c:469
2298 msgid " **** invalid ref ****"
2301 #: builtin/branch.c:560
2305 #: builtin/branch.c:593
2307 msgid "object '%s' does not point to a commit"
2310 #: builtin/branch.c:625
2311 msgid "some refs could not be read"
2314 #: builtin/branch.c:638
2315 msgid "cannot rename the current branch while not on any."
2318 #: builtin/branch.c:648
2320 msgid "Invalid branch name: '%s'"
2323 #: builtin/branch.c:663
2324 msgid "Branch rename failed"
2327 #: builtin/branch.c:667
2329 msgid "Renamed a misnamed branch '%s' away"
2332 #: builtin/branch.c:671
2334 msgid "Branch renamed to %s, but HEAD is not updated!"
2337 #: builtin/branch.c:678
2338 msgid "Branch is renamed, but update of config-file failed"
2341 #: builtin/branch.c:693
2343 msgid "malformed object name %s"
2346 #: builtin/branch.c:717
2348 msgid "could not write branch description template: %s"
2351 #: builtin/branch.c:747
2352 msgid "Generic options"
2355 #: builtin/branch.c:749
2356 msgid "show hash and subject, give twice for upstream branch"
2359 #: builtin/branch.c:750
2360 msgid "suppress informational messages"
2363 #: builtin/branch.c:751
2364 msgid "set up tracking mode (see git-pull(1))"
2367 #: builtin/branch.c:753
2368 msgid "change upstream info"
2371 #: builtin/branch.c:757
2372 msgid "use colored output"
2375 #: builtin/branch.c:758
2376 msgid "act on remote-tracking branches"
2379 #: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788
2380 #: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367
2381 #: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468
2385 #: builtin/branch.c:762 builtin/branch.c:768
2386 msgid "print only branches that contain the commit"
2389 #: builtin/branch.c:774
2390 msgid "Specific git-branch actions:"
2393 #: builtin/branch.c:775
2394 msgid "list both remote-tracking and local branches"
2397 #: builtin/branch.c:777
2398 msgid "delete fully merged branch"
2401 #: builtin/branch.c:778
2402 msgid "delete branch (even if not merged)"
2405 #: builtin/branch.c:779
2406 msgid "move/rename a branch and its reflog"
2409 #: builtin/branch.c:780
2410 msgid "move/rename a branch, even if target exists"
2413 #: builtin/branch.c:781
2414 msgid "list branch names"
2417 #: builtin/branch.c:782
2418 msgid "create the branch's reflog"
2421 #: builtin/branch.c:784
2422 msgid "edit the description for the branch"
2425 #: builtin/branch.c:785
2426 msgid "force creation (when already exists)"
2429 #: builtin/branch.c:788
2430 msgid "print only not merged branches"
2433 #: builtin/branch.c:794
2434 msgid "print only merged branches"
2437 #: builtin/branch.c:798
2438 msgid "list branches in columns"
2441 #: builtin/branch.c:811
2442 msgid "Failed to resolve HEAD as a valid ref."
2445 #: builtin/branch.c:816 builtin/clone.c:561
2446 msgid "HEAD not found below refs/heads!"
2449 #: builtin/branch.c:839
2450 msgid "--column and --verbose are incompatible"
2453 #: builtin/branch.c:845
2454 msgid "branch name required"
2457 #: builtin/branch.c:860
2458 msgid "Cannot give description to detached HEAD"
2461 #: builtin/branch.c:865
2462 msgid "cannot edit description of more than one branch"
2465 #: builtin/branch.c:872
2467 msgid "No commit on branch '%s' yet."
2470 #: builtin/branch.c:875
2472 msgid "No branch named '%s'."
2475 #: builtin/branch.c:888
2476 msgid "too many branches for a rename operation"
2479 #: builtin/branch.c:893
2481 msgid "branch '%s' does not exist"
2484 #: builtin/branch.c:905
2486 msgid "Branch '%s' has no upstream information"
2489 #: builtin/branch.c:920
2490 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2493 #: builtin/branch.c:923
2496 "The --set-upstream flag is deprecated and will be removed. Consider using --"
2497 "track or --set-upstream-to\n"
2500 #: builtin/branch.c:940
2504 "If you wanted to make '%s' track '%s', do this:\n"
2508 #: builtin/branch.c:941
2510 msgid " git branch -d %s\n"
2513 #: builtin/branch.c:942
2515 msgid " git branch --set-upstream-to %s\n"
2518 #: builtin/bundle.c:47
2520 msgid "%s is okay\n"
2523 #: builtin/bundle.c:56
2524 msgid "Need a repository to create a bundle."
2527 #: builtin/bundle.c:60
2528 msgid "Need a repository to unbundle."
2531 #: builtin/cat-file.c:247
2532 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2535 #: builtin/cat-file.c:248
2536 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2539 #: builtin/cat-file.c:266
2540 msgid "<type> can be one of: blob, tree, commit, tag"
2543 #: builtin/cat-file.c:267
2544 msgid "show object type"
2547 #: builtin/cat-file.c:268
2548 msgid "show object size"
2551 #: builtin/cat-file.c:270
2552 msgid "exit with zero when there's no error"
2555 #: builtin/cat-file.c:271
2556 msgid "pretty-print object's content"
2559 #: builtin/cat-file.c:273
2560 msgid "for blob objects, run textconv on object's content"
2563 #: builtin/cat-file.c:275
2564 msgid "show info and content of objects fed from the standard input"
2567 #: builtin/cat-file.c:278
2568 msgid "show info about objects fed from the standard input"
2571 #: builtin/check-attr.c:11
2572 msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2575 #: builtin/check-attr.c:12
2576 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2579 #: builtin/check-attr.c:19
2580 msgid "report all attributes set on file"
2583 #: builtin/check-attr.c:20
2584 msgid "use .gitattributes only from the index"
2587 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
2588 msgid "read file names from stdin"
2591 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
2592 msgid "input paths are terminated by a null character"
2595 #: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177
2596 msgid "suppress progress reporting"
2599 #: builtin/check-ignore.c:151
2600 msgid "cannot specify pathnames with --stdin"
2603 #: builtin/check-ignore.c:154
2604 msgid "-z only makes sense with --stdin"
2607 #: builtin/check-ignore.c:156
2608 msgid "no path specified"
2611 #: builtin/check-ignore.c:160
2612 msgid "--quiet is only valid with a single pathname"
2615 #: builtin/check-ignore.c:162
2616 msgid "cannot have both --quiet and --verbose"
2619 #: builtin/checkout-index.c:126
2620 msgid "git checkout-index [options] [--] [<file>...]"
2623 #: builtin/checkout-index.c:187
2624 msgid "check out all files in the index"
2627 #: builtin/checkout-index.c:188
2628 msgid "force overwrite of existing files"
2631 #: builtin/checkout-index.c:190
2632 msgid "no warning for existing files and files not in index"
2635 #: builtin/checkout-index.c:192
2636 msgid "don't checkout new files"
2639 #: builtin/checkout-index.c:194
2640 msgid "update stat information in the index file"
2643 #: builtin/checkout-index.c:200
2644 msgid "read list of paths from the standard input"
2647 #: builtin/checkout-index.c:202
2648 msgid "write the content to temporary files"
2651 #: builtin/checkout-index.c:203 builtin/column.c:30
2655 #: builtin/checkout-index.c:204
2656 msgid "when creating files, prepend <string>"
2659 #: builtin/checkout-index.c:207
2660 msgid "copy out the files from named stage"
2663 #: builtin/checkout.c:25
2664 msgid "git checkout [options] <branch>"
2667 #: builtin/checkout.c:26
2668 msgid "git checkout [options] [<branch>] -- <file>..."
2671 #: builtin/checkout.c:116 builtin/checkout.c:149
2673 msgid "path '%s' does not have our version"
2676 #: builtin/checkout.c:118 builtin/checkout.c:151
2678 msgid "path '%s' does not have their version"
2681 #: builtin/checkout.c:134
2683 msgid "path '%s' does not have all necessary versions"
2686 #: builtin/checkout.c:178
2688 msgid "path '%s' does not have necessary versions"
2691 #: builtin/checkout.c:195
2693 msgid "path '%s': cannot merge"
2696 #: builtin/checkout.c:212
2698 msgid "Unable to add merge result for '%s'"
2701 #: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
2702 #: builtin/checkout.c:245
2704 msgid "'%s' cannot be used with updating paths"
2707 #: builtin/checkout.c:248 builtin/checkout.c:251
2709 msgid "'%s' cannot be used with %s"
2712 #: builtin/checkout.c:254
2714 msgid "Cannot update paths and switch to branch '%s' at the same time."
2717 #: builtin/checkout.c:265 builtin/checkout.c:426
2718 msgid "corrupt index file"
2721 #: builtin/checkout.c:295 builtin/checkout.c:302
2723 msgid "path '%s' is unmerged"
2726 #: builtin/checkout.c:448
2727 msgid "you need to resolve your current index first"
2730 #: builtin/checkout.c:569
2732 msgid "Can not do reflog for '%s'\n"
2735 #: builtin/checkout.c:602
2736 msgid "HEAD is now at"
2739 #: builtin/checkout.c:609
2741 msgid "Reset branch '%s'\n"
2744 #: builtin/checkout.c:612
2746 msgid "Already on '%s'\n"
2749 #: builtin/checkout.c:616
2751 msgid "Switched to and reset branch '%s'\n"
2754 #: builtin/checkout.c:618 builtin/checkout.c:955
2756 msgid "Switched to a new branch '%s'\n"
2759 #: builtin/checkout.c:620
2761 msgid "Switched to branch '%s'\n"
2764 #: builtin/checkout.c:676
2766 msgid " ... and %d more.\n"
2769 #. The singular version
2770 #: builtin/checkout.c:682
2773 "Warning: you are leaving %d commit behind, not connected to\n"
2774 "any of your branches:\n"
2778 "Warning: you are leaving %d commits behind, not connected to\n"
2779 "any of your branches:\n"
2785 #: builtin/checkout.c:700
2788 "If you want to keep them by creating a new branch, this may be a good time\n"
2791 " git branch new_branch_name %s\n"
2795 #: builtin/checkout.c:730
2796 msgid "internal error in revision walk"
2799 #: builtin/checkout.c:734
2800 msgid "Previous HEAD position was"
2803 #: builtin/checkout.c:761 builtin/checkout.c:950
2804 msgid "You are on a branch yet to be born"
2808 #: builtin/checkout.c:886
2810 msgid "invalid reference: %s"
2813 #. case (1): want a tree
2814 #: builtin/checkout.c:925
2816 msgid "reference is not a tree: %s"
2819 #: builtin/checkout.c:964
2820 msgid "paths cannot be used with switching branches"
2823 #: builtin/checkout.c:967 builtin/checkout.c:971
2825 msgid "'%s' cannot be used with switching branches"
2828 #: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983
2829 #: builtin/checkout.c:986
2831 msgid "'%s' cannot be used with '%s'"
2834 #: builtin/checkout.c:991
2836 msgid "Cannot switch branch to a non-commit '%s'"
2839 #: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89
2840 #: builtin/remote.c:169 builtin/remote.c:171
2844 #: builtin/checkout.c:1014
2845 msgid "create and checkout a new branch"
2848 #: builtin/checkout.c:1016
2849 msgid "create/reset and checkout a branch"
2852 #: builtin/checkout.c:1017
2853 msgid "create reflog for new branch"
2856 #: builtin/checkout.c:1018
2857 msgid "detach the HEAD at named commit"
2860 #: builtin/checkout.c:1019
2861 msgid "set upstream info for new branch"
2864 #: builtin/checkout.c:1021
2868 #: builtin/checkout.c:1021
2869 msgid "new unparented branch"
2872 #: builtin/checkout.c:1022
2873 msgid "checkout our version for unmerged files"
2876 #: builtin/checkout.c:1024
2877 msgid "checkout their version for unmerged files"
2880 #: builtin/checkout.c:1026
2881 msgid "force checkout (throw away local modifications)"
2884 #: builtin/checkout.c:1027
2885 msgid "perform a 3-way merge with the new branch"
2888 #: builtin/checkout.c:1028 builtin/merge.c:215
2889 msgid "update ignored files (default)"
2892 #: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245
2896 #: builtin/checkout.c:1030
2897 msgid "conflict style (merge or diff3)"
2900 #: builtin/checkout.c:1033
2901 msgid "second guess 'git checkout no-such-branch'"
2904 #: builtin/checkout.c:1057
2905 msgid "-b, -B and --orphan are mutually exclusive"
2908 #: builtin/checkout.c:1074
2909 msgid "--track needs a branch name"
2912 #: builtin/checkout.c:1081
2913 msgid "Missing branch name; try -b"
2916 #: builtin/checkout.c:1116
2917 msgid "invalid path specification"
2920 #: builtin/checkout.c:1123
2923 "Cannot update paths and switch to branch '%s' at the same time.\n"
2924 "Did you intend to checkout '%s' which can not be resolved as commit?"
2927 #: builtin/checkout.c:1128
2929 msgid "git checkout: --detach does not take a path argument '%s'"
2932 #: builtin/checkout.c:1132
2934 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
2935 "checking out of the index."
2938 #: builtin/clean.c:20
2939 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
2942 #: builtin/clean.c:24
2944 msgid "Removing %s\n"
2947 #: builtin/clean.c:25
2949 msgid "Would remove %s\n"
2952 #: builtin/clean.c:26
2954 msgid "Skipping repository %s\n"
2957 #: builtin/clean.c:27
2959 msgid "Would skip repository %s\n"
2962 #: builtin/clean.c:28
2964 msgid "failed to remove %s"
2967 #: builtin/clean.c:160
2968 msgid "do not print names of files removed"
2971 #: builtin/clean.c:162
2975 #: builtin/clean.c:164
2976 msgid "remove whole directories"
2979 #: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717
2980 #: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182
2984 #: builtin/clean.c:166
2985 msgid "add <pattern> to ignore rules"
2988 #: builtin/clean.c:167
2989 msgid "remove ignored files, too"
2992 #: builtin/clean.c:169
2993 msgid "remove only ignored files"
2996 #: builtin/clean.c:187
2997 msgid "-x and -X cannot be used together"
3000 #: builtin/clean.c:191
3002 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
3005 #: builtin/clean.c:194
3007 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
3011 #: builtin/clone.c:36
3012 msgid "git clone [options] [--] <repo> [<dir>]"
3015 #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
3016 #: builtin/push.c:436
3017 msgid "force progress reporting"
3020 #: builtin/clone.c:66
3021 msgid "don't create a checkout"
3024 #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
3025 msgid "create a bare repository"
3028 #: builtin/clone.c:72
3029 msgid "create a mirror repository (implies bare)"
3032 #: builtin/clone.c:74
3033 msgid "to clone from a local repository"
3036 #: builtin/clone.c:76
3037 msgid "don't use local hardlinks, always copy"
3040 #: builtin/clone.c:78
3041 msgid "setup as shared repository"
3044 #: builtin/clone.c:80 builtin/clone.c:82
3045 msgid "initialize submodules in the clone"
3048 #: builtin/clone.c:83 builtin/init-db.c:485
3049 msgid "template-directory"
3052 #: builtin/clone.c:84 builtin/init-db.c:486
3053 msgid "directory from which templates will be used"
3056 #: builtin/clone.c:86
3057 msgid "reference repository"
3060 #: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
3064 #: builtin/clone.c:88
3065 msgid "use <name> instead of 'origin' to track upstream"
3068 #: builtin/clone.c:90
3069 msgid "checkout <branch> instead of the remote's HEAD"
3072 #: builtin/clone.c:92
3073 msgid "path to git-upload-pack on the remote"
3076 #: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662
3080 #: builtin/clone.c:94
3081 msgid "create a shallow clone of that depth"
3084 #: builtin/clone.c:96
3085 msgid "clone only one branch, HEAD or --branch"
3088 #: builtin/clone.c:97 builtin/init-db.c:494
3092 #: builtin/clone.c:98 builtin/init-db.c:495
3093 msgid "separate git dir from working tree"
3096 #: builtin/clone.c:99
3100 #: builtin/clone.c:100
3101 msgid "set config inside the new repository"
3104 #: builtin/clone.c:243
3106 msgid "reference repository '%s' is not a local directory."
3109 #: builtin/clone.c:306
3111 msgid "failed to create directory '%s'"
3114 #: builtin/clone.c:308 builtin/diff.c:77
3116 msgid "failed to stat '%s'"
3119 #: builtin/clone.c:310
3121 msgid "%s exists and is not a directory"
3124 #: builtin/clone.c:324
3126 msgid "failed to stat %s\n"
3129 #: builtin/clone.c:346
3131 msgid "failed to create link '%s'"
3134 #: builtin/clone.c:350
3136 msgid "failed to copy file to '%s'"
3139 #: builtin/clone.c:373
3144 #: builtin/clone.c:443
3146 msgid "Could not find remote branch %s to clone."
3149 #: builtin/clone.c:552
3150 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3153 #: builtin/clone.c:690
3154 msgid "Too many arguments."
3157 #: builtin/clone.c:694
3158 msgid "You must specify a repository to clone."
3161 #: builtin/clone.c:705
3163 msgid "--bare and --origin %s options are incompatible."
3166 #: builtin/clone.c:708
3167 msgid "--bare and --separate-git-dir are incompatible."
3170 #: builtin/clone.c:721
3172 msgid "repository '%s' does not exist"
3175 #: builtin/clone.c:726
3176 msgid "--depth is ignored in local clones; use file:// instead."
3179 #: builtin/clone.c:736
3181 msgid "destination path '%s' already exists and is not an empty directory."
3184 #: builtin/clone.c:746
3186 msgid "working tree '%s' already exists."
3189 #: builtin/clone.c:759 builtin/clone.c:771
3191 msgid "could not create leading directories of '%s'"
3194 #: builtin/clone.c:762
3196 msgid "could not create work tree dir '%s'."
3199 #: builtin/clone.c:781
3201 msgid "Cloning into bare repository '%s'...\n"
3204 #: builtin/clone.c:783
3206 msgid "Cloning into '%s'...\n"
3209 #: builtin/clone.c:818
3211 msgid "Don't know how to clone %s"
3214 #: builtin/clone.c:867
3216 msgid "Remote branch %s not found in upstream %s"
3219 #: builtin/clone.c:874
3220 msgid "You appear to have cloned an empty repository."
3223 #: builtin/column.c:9
3224 msgid "git column [options]"
3227 #: builtin/column.c:26
3228 msgid "lookup config vars"
3231 #: builtin/column.c:27 builtin/column.c:28
3232 msgid "layout to use"
3235 #: builtin/column.c:29
3236 msgid "Maximum width"
3239 #: builtin/column.c:30
3240 msgid "Padding space on left border"
3243 #: builtin/column.c:31
3244 msgid "Padding space on right border"
3247 #: builtin/column.c:32
3248 msgid "Padding space between columns"
3251 #: builtin/column.c:51
3252 msgid "--command must be the first argument"
3255 #: builtin/commit.c:34
3256 msgid "git commit [options] [--] <pathspec>..."
3259 #: builtin/commit.c:39
3260 msgid "git status [options] [--] <pathspec>..."
3263 #: builtin/commit.c:44
3265 "Your name and email address were configured automatically based\n"
3266 "on your username and hostname. Please check that they are accurate.\n"
3267 "You can suppress this message by setting them explicitly:\n"
3269 " git config --global user.name \"Your Name\"\n"
3270 " git config --global user.email you@example.com\n"
3272 "After doing this, you may fix the identity used for this commit with:\n"
3274 " git commit --amend --reset-author\n"
3277 #: builtin/commit.c:56
3279 "You asked to amend the most recent commit, but doing so would make\n"
3280 "it empty. You can repeat your command with --allow-empty, or you can\n"
3281 "remove the commit entirely with \"git reset HEAD^\".\n"
3284 #: builtin/commit.c:61
3286 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3287 "If you wish to commit it anyway, use:\n"
3289 " git commit --allow-empty\n"
3291 "Otherwise, please use 'git reset'\n"
3294 #: builtin/commit.c:258
3295 msgid "failed to unpack HEAD tree object"
3298 #: builtin/commit.c:300
3299 msgid "unable to create temporary index"
3302 #: builtin/commit.c:306
3303 msgid "interactive add failed"
3306 #: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410
3307 msgid "unable to write new_index file"
3310 #: builtin/commit.c:391
3311 msgid "cannot do a partial commit during a merge."
3314 #: builtin/commit.c:393
3315 msgid "cannot do a partial commit during a cherry-pick."
3318 #: builtin/commit.c:403
3319 msgid "cannot read the index"
3322 #: builtin/commit.c:423
3323 msgid "unable to write temporary index file"
3326 #: builtin/commit.c:511 builtin/commit.c:517
3328 msgid "invalid commit: %s"
3331 #: builtin/commit.c:540
3332 msgid "malformed --author parameter"
3335 #: builtin/commit.c:560
3337 msgid "Malformed ident string: '%s'"
3340 #: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954
3342 msgid "could not lookup commit %s"
3345 #: builtin/commit.c:610 builtin/shortlog.c:272
3347 msgid "(reading log message from standard input)\n"
3350 #: builtin/commit.c:612
3351 msgid "could not read log from standard input"
3354 #: builtin/commit.c:616
3356 msgid "could not read log file '%s'"
3359 #: builtin/commit.c:622
3360 msgid "commit has empty message"
3363 #: builtin/commit.c:638
3364 msgid "could not read MERGE_MSG"
3367 #: builtin/commit.c:642
3368 msgid "could not read SQUASH_MSG"
3371 #: builtin/commit.c:646
3373 msgid "could not read '%s'"
3376 #: builtin/commit.c:707
3377 msgid "could not write commit template"
3380 #: builtin/commit.c:718
3384 "It looks like you may be committing a merge.\n"
3385 "If this is not correct, please remove the file\n"
3390 #: builtin/commit.c:723
3394 "It looks like you may be committing a cherry-pick.\n"
3395 "If this is not correct, please remove the file\n"
3400 #: builtin/commit.c:735
3403 "Please enter the commit message for your changes. Lines starting\n"
3404 "with '%c' will be ignored, and an empty message aborts the commit.\n"
3407 #: builtin/commit.c:740
3410 "Please enter the commit message for your changes. Lines starting\n"
3411 "with '%c' will be kept; you may remove them yourself if you want to.\n"
3412 "An empty message aborts the commit.\n"
3415 #: builtin/commit.c:753
3417 msgid "%sAuthor: %s"
3420 #: builtin/commit.c:760
3422 msgid "%sCommitter: %s"
3425 #: builtin/commit.c:780
3426 msgid "Cannot read index"
3429 #: builtin/commit.c:817
3430 msgid "Error building trees"
3433 #: builtin/commit.c:832 builtin/tag.c:359
3435 msgid "Please supply the message using either -m or -F option.\n"
3438 #: builtin/commit.c:929
3440 msgid "No existing author found with '%s'"
3443 #: builtin/commit.c:944 builtin/commit.c:1138
3445 msgid "Invalid untracked files mode '%s'"
3448 #: builtin/commit.c:974
3449 msgid "Using both --reset-author and --author does not make sense"
3452 #: builtin/commit.c:985
3453 msgid "You have nothing to amend."
3456 #: builtin/commit.c:988
3457 msgid "You are in the middle of a merge -- cannot amend."
3460 #: builtin/commit.c:990
3461 msgid "You are in the middle of a cherry-pick -- cannot amend."
3464 #: builtin/commit.c:993
3465 msgid "Options --squash and --fixup cannot be used together"
3468 #: builtin/commit.c:1003
3469 msgid "Only one of -c/-C/-F/--fixup can be used."
3472 #: builtin/commit.c:1005
3473 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3476 #: builtin/commit.c:1013
3477 msgid "--reset-author can be used only with -C, -c or --amend."
3480 #: builtin/commit.c:1030
3481 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3484 #: builtin/commit.c:1032
3485 msgid "No paths with --include/--only does not make sense."
3488 #: builtin/commit.c:1034
3489 msgid "Clever... amending the last one with dirty index."
3492 #: builtin/commit.c:1036
3493 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3496 #: builtin/commit.c:1046 builtin/tag.c:575
3498 msgid "Invalid cleanup mode %s"
3501 #: builtin/commit.c:1051
3502 msgid "Paths with -a does not make sense."
3505 #: builtin/commit.c:1057 builtin/commit.c:1192
3506 msgid "--long and -z are incompatible"
3509 #: builtin/commit.c:1152 builtin/commit.c:1388
3510 msgid "show status concisely"
3513 #: builtin/commit.c:1154 builtin/commit.c:1390
3514 msgid "show branch information"
3517 #: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426
3518 msgid "machine-readable output"
3521 #: builtin/commit.c:1159 builtin/commit.c:1394
3522 msgid "show status in long format (default)"
3525 #: builtin/commit.c:1162 builtin/commit.c:1397
3526 msgid "terminate entries with NUL"
3529 #: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647
3530 #: builtin/fast-export.c:650 builtin/tag.c:459
3534 #: builtin/commit.c:1165 builtin/commit.c:1400
3535 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3538 #: builtin/commit.c:1168
3539 msgid "show ignored files"
3542 #: builtin/commit.c:1169 parse-options.h:151
3546 #: builtin/commit.c:1170
3548 "ignore changes to submodules, optional when: all, dirty, untracked. "
3552 #: builtin/commit.c:1172
3553 msgid "list untracked files in columns"
3556 #: builtin/commit.c:1246
3557 msgid "couldn't look up newly created commit"
3560 #: builtin/commit.c:1248
3561 msgid "could not parse newly created commit"
3564 #: builtin/commit.c:1289
3565 msgid "detached HEAD"
3568 #: builtin/commit.c:1291
3569 msgid " (root-commit)"
3572 #: builtin/commit.c:1358
3573 msgid "suppress summary after successful commit"
3576 #: builtin/commit.c:1359
3577 msgid "show diff in commit message template"
3580 #: builtin/commit.c:1361
3581 msgid "Commit message options"
3584 #: builtin/commit.c:1362 builtin/tag.c:457
3585 msgid "read message from file"
3588 #: builtin/commit.c:1363
3592 #: builtin/commit.c:1363
3593 msgid "override author for commit"
3596 #: builtin/commit.c:1364 builtin/gc.c:178
3600 #: builtin/commit.c:1364
3601 msgid "override date for commit"
3604 #: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533
3605 #: builtin/notes.c:690 builtin/tag.c:455
3609 #: builtin/commit.c:1365
3610 msgid "commit message"
3613 #: builtin/commit.c:1366
3614 msgid "reuse and edit message from specified commit"
3617 #: builtin/commit.c:1367
3618 msgid "reuse message from specified commit"
3621 #: builtin/commit.c:1368
3622 msgid "use autosquash formatted message to fixup specified commit"
3625 #: builtin/commit.c:1369
3626 msgid "use autosquash formatted message to squash specified commit"
3629 #: builtin/commit.c:1370
3630 msgid "the commit is authored by me now (used with -C/-c/--amend)"
3633 #: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109
3634 msgid "add Signed-off-by:"
3637 #: builtin/commit.c:1372
3638 msgid "use specified template file"
3641 #: builtin/commit.c:1373
3642 msgid "force edit of commit"
3645 #: builtin/commit.c:1374
3649 #: builtin/commit.c:1374 builtin/tag.c:460
3650 msgid "how to strip spaces and #comments from message"
3653 #: builtin/commit.c:1375
3654 msgid "include status in commit message template"
3657 #: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461
3661 #: builtin/commit.c:1377 builtin/merge.c:214
3662 msgid "GPG sign commit"
3665 #. end commit message options
3666 #: builtin/commit.c:1380
3667 msgid "Commit contents options"
3670 #: builtin/commit.c:1381
3671 msgid "commit all changed files"
3674 #: builtin/commit.c:1382
3675 msgid "add specified files to index for commit"
3678 #: builtin/commit.c:1383
3679 msgid "interactively add files"
3682 #: builtin/commit.c:1384
3683 msgid "interactively add changes"
3686 #: builtin/commit.c:1385
3687 msgid "commit only specified files"
3690 #: builtin/commit.c:1386
3691 msgid "bypass pre-commit hook"
3694 #: builtin/commit.c:1387
3695 msgid "show what would be committed"
3698 #: builtin/commit.c:1398
3699 msgid "amend previous commit"
3702 #: builtin/commit.c:1399
3703 msgid "bypass post-rewrite hook"
3706 #: builtin/commit.c:1404
3707 msgid "ok to record an empty change"
3710 #: builtin/commit.c:1407
3711 msgid "ok to record a change with an empty message"
3714 #: builtin/commit.c:1439
3715 msgid "could not parse HEAD commit"
3718 #: builtin/commit.c:1477 builtin/merge.c:508
3720 msgid "could not open '%s' for reading"
3723 #: builtin/commit.c:1484
3725 msgid "Corrupt MERGE_HEAD file (%s)"
3728 #: builtin/commit.c:1491
3729 msgid "could not read MERGE_MODE"
3732 #: builtin/commit.c:1510
3734 msgid "could not read commit message: %s"
3737 #: builtin/commit.c:1524
3739 msgid "Aborting commit; you did not edit the message.\n"
3742 #: builtin/commit.c:1529
3744 msgid "Aborting commit due to empty commit message.\n"
3747 #: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857
3748 msgid "failed to write commit object"
3751 #: builtin/commit.c:1565
3752 msgid "cannot lock HEAD ref"
3755 #: builtin/commit.c:1569
3756 msgid "cannot update HEAD ref"
3759 #: builtin/commit.c:1580
3761 "Repository has been updated, but unable to write\n"
3762 "new_index file. Check that disk is not full or quota is\n"
3763 "not exceeded, and then \"git reset HEAD\" to recover."
3766 #: builtin/config.c:7
3767 msgid "git config [options]"
3770 #: builtin/config.c:51
3771 msgid "Config file location"
3774 #: builtin/config.c:52
3775 msgid "use global config file"
3778 #: builtin/config.c:53
3779 msgid "use system config file"
3782 #: builtin/config.c:54
3783 msgid "use repository config file"
3786 #: builtin/config.c:55
3787 msgid "use given config file"
3790 #: builtin/config.c:56
3794 #: builtin/config.c:57
3795 msgid "get value: name [value-regex]"
3798 #: builtin/config.c:58
3799 msgid "get all values: key [value-regex]"
3802 #: builtin/config.c:59
3803 msgid "get values for regexp: name-regex [value-regex]"
3806 #: builtin/config.c:60
3807 msgid "replace all matching variables: name value [value_regex]"
3810 #: builtin/config.c:61
3811 msgid "add a new variable: name value"
3814 #: builtin/config.c:62
3815 msgid "remove a variable: name [value-regex]"
3818 #: builtin/config.c:63
3819 msgid "remove all matches: name [value-regex]"
3822 #: builtin/config.c:64
3823 msgid "rename section: old-name new-name"
3826 #: builtin/config.c:65
3827 msgid "remove a section: name"
3830 #: builtin/config.c:66
3834 #: builtin/config.c:67
3835 msgid "open an editor"
3838 #: builtin/config.c:68 builtin/config.c:69
3842 #: builtin/config.c:68
3843 msgid "find the color configured: [default]"
3846 #: builtin/config.c:69
3847 msgid "find the color setting: [stdout-is-tty]"
3850 #: builtin/config.c:70
3854 #: builtin/config.c:71
3855 msgid "value is \"true\" or \"false\""
3858 #: builtin/config.c:72
3859 msgid "value is decimal number"
3862 #: builtin/config.c:73
3863 msgid "value is --bool or --int"
3866 #: builtin/config.c:74
3867 msgid "value is a path (file or directory name)"
3870 #: builtin/config.c:75
3874 #: builtin/config.c:76
3875 msgid "terminate values with NUL byte"
3878 #: builtin/config.c:77
3879 msgid "respect include directives on lookup"
3882 #: builtin/count-objects.c:69
3883 msgid "git count-objects [-v]"
3886 #: builtin/describe.c:15
3887 msgid "git describe [options] <committish>*"
3890 #: builtin/describe.c:16
3891 msgid "git describe [options] --dirty"
3894 #: builtin/describe.c:234
3896 msgid "annotated tag %s not available"
3899 #: builtin/describe.c:238
3901 msgid "annotated tag %s has no embedded name"
3904 #: builtin/describe.c:240
3906 msgid "tag '%s' is really '%s' here"
3909 #: builtin/describe.c:267
3911 msgid "Not a valid object name %s"
3914 #: builtin/describe.c:270
3916 msgid "%s is not a valid '%s' object"
3919 #: builtin/describe.c:287
3921 msgid "no tag exactly matches '%s'"
3924 #: builtin/describe.c:289
3926 msgid "searching to describe %s\n"
3929 #: builtin/describe.c:329
3931 msgid "finished search at %s\n"
3934 #: builtin/describe.c:353
3937 "No annotated tags can describe '%s'.\n"
3938 "However, there were unannotated tags: try --tags."
3941 #: builtin/describe.c:357
3944 "No tags can describe '%s'.\n"
3945 "Try --always, or create some tags."
3948 #: builtin/describe.c:378
3950 msgid "traversed %lu commits\n"
3953 #: builtin/describe.c:381
3956 "more than %i tags found; listed %i most recent\n"
3957 "gave up search at %s\n"
3960 #: builtin/describe.c:403
3961 msgid "find the tag that comes after the commit"
3964 #: builtin/describe.c:404
3965 msgid "debug search strategy on stderr"
3968 #: builtin/describe.c:405
3969 msgid "use any ref in .git/refs"
3972 #: builtin/describe.c:406
3973 msgid "use any tag in .git/refs/tags"
3976 #: builtin/describe.c:407
3977 msgid "always use long format"
3980 #: builtin/describe.c:410
3981 msgid "only output exact matches"
3984 #: builtin/describe.c:412
3985 msgid "consider <n> most recent tags (default: 10)"
3988 #: builtin/describe.c:414
3989 msgid "only consider tags matching <pattern>"
3992 #: builtin/describe.c:416 builtin/name-rev.c:238
3993 msgid "show abbreviated commit object as fallback"
3996 #: builtin/describe.c:417
4000 #: builtin/describe.c:418
4001 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4004 #: builtin/describe.c:436
4005 msgid "--long is incompatible with --abbrev=0"
4008 #: builtin/describe.c:462
4009 msgid "No names found, cannot describe anything."
4012 #: builtin/describe.c:482
4013 msgid "--dirty is incompatible with committishes"
4016 #: builtin/diff.c:79
4018 msgid "'%s': not a regular file or symlink"
4021 #: builtin/diff.c:228
4023 msgid "invalid option: %s"
4026 #: builtin/diff.c:305
4027 msgid "Not a git repository"
4030 #: builtin/diff.c:348
4032 msgid "invalid object '%s' given."
4035 #: builtin/diff.c:353
4037 msgid "more than %d trees given: '%s'"
4040 #: builtin/diff.c:363
4042 msgid "more than two blobs given: '%s'"
4045 #: builtin/diff.c:371
4047 msgid "unhandled object '%s' given."
4050 #: builtin/fast-export.c:22
4051 msgid "git fast-export [rev-list-opts]"
4054 #: builtin/fast-export.c:646
4055 msgid "show progress after <n> objects"
4058 #: builtin/fast-export.c:648
4059 msgid "select handling of signed tags"
4062 #: builtin/fast-export.c:651
4063 msgid "select handling of tags that tag filtered objects"
4066 #: builtin/fast-export.c:654
4067 msgid "Dump marks to this file"
4070 #: builtin/fast-export.c:656
4071 msgid "Import marks from this file"
4074 #: builtin/fast-export.c:658
4075 msgid "Fake a tagger when tags lack one"
4078 #: builtin/fast-export.c:660
4079 msgid "Output full tree for each commit"
4082 #: builtin/fast-export.c:662
4083 msgid "Use the done feature to terminate the stream"
4086 #: builtin/fast-export.c:663
4087 msgid "Skip output of blob data"
4090 #: builtin/fetch.c:20
4091 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4094 #: builtin/fetch.c:21
4095 msgid "git fetch [<options>] <group>"
4098 #: builtin/fetch.c:22
4099 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4102 #: builtin/fetch.c:23
4103 msgid "git fetch --all [<options>]"
4106 #: builtin/fetch.c:60
4107 msgid "fetch from all remotes"
4110 #: builtin/fetch.c:62
4111 msgid "append to .git/FETCH_HEAD instead of overwriting"
4114 #: builtin/fetch.c:64
4115 msgid "path to upload pack on remote end"
4118 #: builtin/fetch.c:65
4119 msgid "force overwrite of local branch"
4122 #: builtin/fetch.c:67
4123 msgid "fetch from multiple remotes"
4126 #: builtin/fetch.c:69
4127 msgid "fetch all tags and associated objects"
4130 #: builtin/fetch.c:71
4131 msgid "do not fetch all tags (--no-tags)"
4134 #: builtin/fetch.c:73
4135 msgid "prune remote-tracking branches no longer on remote"
4138 #: builtin/fetch.c:74
4142 #: builtin/fetch.c:75
4143 msgid "control recursive fetching of submodules"
4146 #: builtin/fetch.c:79
4147 msgid "keep downloaded pack"
4150 #: builtin/fetch.c:81
4151 msgid "allow updating of HEAD ref"
4154 #: builtin/fetch.c:84
4155 msgid "deepen history of shallow clone"
4158 #: builtin/fetch.c:86
4159 msgid "convert to a complete repository"
4162 #: builtin/fetch.c:88 builtin/log.c:1119
4166 #: builtin/fetch.c:89
4167 msgid "prepend this to submodule path output"
4170 #: builtin/fetch.c:92
4171 msgid "default mode for recursion"
4174 #: builtin/fetch.c:204
4175 msgid "Couldn't find remote ref HEAD"
4178 #: builtin/fetch.c:257
4180 msgid "object %s not found"
4183 #: builtin/fetch.c:262
4184 msgid "[up to date]"
4187 #: builtin/fetch.c:276
4189 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4192 #: builtin/fetch.c:277 builtin/fetch.c:363
4196 #: builtin/fetch.c:288
4197 msgid "[tag update]"
4200 #: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343
4201 msgid " (unable to update local ref)"
4204 #: builtin/fetch.c:308
4208 #: builtin/fetch.c:311
4209 msgid "[new branch]"
4212 #: builtin/fetch.c:314
4216 #: builtin/fetch.c:359
4217 msgid "unable to update local ref"
4220 #: builtin/fetch.c:359
4221 msgid "forced update"
4224 #: builtin/fetch.c:365
4225 msgid "(non-fast-forward)"
4228 #: builtin/fetch.c:396 builtin/fetch.c:688
4230 msgid "cannot open %s: %s\n"
4233 #: builtin/fetch.c:405
4235 msgid "%s did not send all necessary objects\n"
4238 #: builtin/fetch.c:491
4243 #: builtin/fetch.c:502
4246 "some local refs could not be updated; try running\n"
4247 " 'git remote prune %s' to remove any old, conflicting branches"
4250 #: builtin/fetch.c:552
4252 msgid " (%s will become dangling)"
4255 #: builtin/fetch.c:553
4257 msgid " (%s has become dangling)"
4260 #: builtin/fetch.c:560
4264 #: builtin/fetch.c:561 builtin/remote.c:1055
4268 #: builtin/fetch.c:678
4270 msgid "Refusing to fetch into current branch %s of non-bare repository"
4273 #: builtin/fetch.c:712
4275 msgid "Don't know how to fetch from %s"
4278 #: builtin/fetch.c:789
4280 msgid "Option \"%s\" value \"%s\" is not valid for %s"
4283 #: builtin/fetch.c:792
4285 msgid "Option \"%s\" is ignored for %s\n"
4288 #: builtin/fetch.c:894
4290 msgid "Fetching %s\n"
4293 #: builtin/fetch.c:896 builtin/remote.c:100
4295 msgid "Could not fetch %s"
4298 #: builtin/fetch.c:915
4300 "No remote repository specified. Please, specify either a URL or a\n"
4301 "remote name from which new revisions should be fetched."
4304 #: builtin/fetch.c:935
4305 msgid "You need to specify a tag name."
4308 #: builtin/fetch.c:981
4309 msgid "--depth and --unshallow cannot be used together"
4312 #: builtin/fetch.c:983
4313 msgid "--unshallow on a complete repository does not make sense"
4316 #: builtin/fetch.c:1002
4317 msgid "fetch --all does not take a repository argument"
4320 #: builtin/fetch.c:1004
4321 msgid "fetch --all does not make sense with refspecs"
4324 #: builtin/fetch.c:1015
4326 msgid "No such remote or remote group: %s"
4329 #: builtin/fetch.c:1023
4330 msgid "Fetching a group and specifying refspecs does not make sense"
4333 #: builtin/fmt-merge-msg.c:13
4334 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4337 #: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701
4338 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175
4339 #: builtin/tag.c:446 parse-options.h:133 parse-options.h:239
4343 #: builtin/fmt-merge-msg.c:660
4344 msgid "populate log with at most <n> entries from shortlog"
4347 #: builtin/fmt-merge-msg.c:663
4348 msgid "alias for --log (deprecated)"
4351 #: builtin/fmt-merge-msg.c:666
4355 #: builtin/fmt-merge-msg.c:667
4356 msgid "use <text> as start of message"
4359 #: builtin/fmt-merge-msg.c:668
4360 msgid "file to read from"
4363 #: builtin/for-each-ref.c:979
4364 msgid "git for-each-ref [options] [<pattern>]"
4367 #: builtin/for-each-ref.c:994
4368 msgid "quote placeholders suitably for shells"
4371 #: builtin/for-each-ref.c:996
4372 msgid "quote placeholders suitably for perl"
4375 #: builtin/for-each-ref.c:998
4376 msgid "quote placeholders suitably for python"
4379 #: builtin/for-each-ref.c:1000
4380 msgid "quote placeholders suitably for tcl"
4383 #: builtin/for-each-ref.c:1003
4384 msgid "show only <n> matched refs"
4387 #: builtin/for-each-ref.c:1004
4391 #: builtin/for-each-ref.c:1004
4392 msgid "format to use for the output"
4395 #: builtin/for-each-ref.c:1005
4399 #: builtin/for-each-ref.c:1006
4400 msgid "field name to sort on"
4403 #: builtin/fsck.c:608
4404 msgid "git fsck [options] [<object>...]"
4407 #: builtin/fsck.c:614
4408 msgid "show unreachable objects"
4411 #: builtin/fsck.c:615
4412 msgid "show dangling objects"
4415 #: builtin/fsck.c:616
4419 #: builtin/fsck.c:617
4420 msgid "report root nodes"
4423 #: builtin/fsck.c:618
4424 msgid "make index objects head nodes"
4427 #: builtin/fsck.c:619
4428 msgid "make reflogs head nodes (default)"
4431 #: builtin/fsck.c:620
4432 msgid "also consider packs and alternate objects"
4435 #: builtin/fsck.c:621
4436 msgid "enable more strict checking"
4439 #: builtin/fsck.c:623
4440 msgid "write dangling objects in .git/lost-found"
4443 #: builtin/fsck.c:624 builtin/prune.c:134
4444 msgid "show progress"
4448 msgid "git gc [options]"
4453 msgid "Invalid %s: '%s'"
4458 msgid "insanely long object directory %.*s"
4462 msgid "prune unreferenced objects"
4466 msgid "be more thorough (increased runtime)"
4470 msgid "enable auto-gc mode"
4476 "Auto packing the repository for optimum performance. You may also\n"
4477 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
4482 "There are too many unreachable loose objects; run 'git prune' to remove them."
4485 #: builtin/grep.c:22
4486 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4489 #: builtin/grep.c:217
4491 msgid "grep: failed to create thread: %s"
4494 #: builtin/grep.c:365
4496 msgid "Failed to chdir: %s"
4499 #: builtin/grep.c:443 builtin/grep.c:478
4501 msgid "unable to read tree (%s)"
4504 #: builtin/grep.c:493
4506 msgid "unable to grep from object of type %s"
4509 #: builtin/grep.c:551
4511 msgid "switch `%c' expects a numerical value"
4514 #: builtin/grep.c:568
4516 msgid "cannot open '%s'"
4519 #: builtin/grep.c:643
4520 msgid "search in index instead of in the work tree"
4523 #: builtin/grep.c:645
4524 msgid "find in contents not managed by git"
4527 #: builtin/grep.c:647
4528 msgid "search in both tracked and untracked files"
4531 #: builtin/grep.c:649
4532 msgid "search also in ignored files"
4535 #: builtin/grep.c:652
4536 msgid "show non-matching lines"
4539 #: builtin/grep.c:654
4540 msgid "case insensitive matching"
4543 #: builtin/grep.c:656
4544 msgid "match patterns only at word boundaries"
4547 #: builtin/grep.c:658
4548 msgid "process binary files as text"
4551 #: builtin/grep.c:660
4552 msgid "don't match patterns in binary files"
4555 #: builtin/grep.c:663
4556 msgid "descend at most <depth> levels"
4559 #: builtin/grep.c:667
4560 msgid "use extended POSIX regular expressions"
4563 #: builtin/grep.c:670
4564 msgid "use basic POSIX regular expressions (default)"
4567 #: builtin/grep.c:673
4568 msgid "interpret patterns as fixed strings"
4571 #: builtin/grep.c:676
4572 msgid "use Perl-compatible regular expressions"
4575 #: builtin/grep.c:679
4576 msgid "show line numbers"
4579 #: builtin/grep.c:680
4580 msgid "don't show filenames"
4583 #: builtin/grep.c:681
4584 msgid "show filenames"
4587 #: builtin/grep.c:683
4588 msgid "show filenames relative to top directory"
4591 #: builtin/grep.c:685
4592 msgid "show only filenames instead of matching lines"
4595 #: builtin/grep.c:687
4596 msgid "synonym for --files-with-matches"
4599 #: builtin/grep.c:690
4600 msgid "show only the names of files without match"
4603 #: builtin/grep.c:692
4604 msgid "print NUL after filenames"
4607 #: builtin/grep.c:694
4608 msgid "show the number of matches instead of matching lines"
4611 #: builtin/grep.c:695
4612 msgid "highlight matches"
4615 #: builtin/grep.c:697
4616 msgid "print empty line between matches from different files"
4619 #: builtin/grep.c:699
4620 msgid "show filename only once above matches from same file"
4623 #: builtin/grep.c:702
4624 msgid "show <n> context lines before and after matches"
4627 #: builtin/grep.c:705
4628 msgid "show <n> context lines before matches"
4631 #: builtin/grep.c:707
4632 msgid "show <n> context lines after matches"
4635 #: builtin/grep.c:708
4636 msgid "shortcut for -C NUM"
4639 #: builtin/grep.c:711
4640 msgid "show a line with the function name before matches"
4643 #: builtin/grep.c:713
4644 msgid "show the surrounding function"
4647 #: builtin/grep.c:716
4648 msgid "read patterns from file"
4651 #: builtin/grep.c:718
4652 msgid "match <pattern>"
4655 #: builtin/grep.c:720
4656 msgid "combine patterns specified with -e"
4659 #: builtin/grep.c:732
4660 msgid "indicate hit with exit status without output"
4663 #: builtin/grep.c:734
4664 msgid "show only matches from files that match all patterns"
4667 #: builtin/grep.c:736
4668 msgid "show parse tree for grep expression"
4671 #: builtin/grep.c:740
4675 #: builtin/grep.c:740
4676 msgid "show matching files in the pager"
4679 #: builtin/grep.c:743
4680 msgid "allow calling of grep(1) (ignored by this build)"
4683 #: builtin/grep.c:744 builtin/show-ref.c:184
4687 #: builtin/grep.c:811
4688 msgid "no pattern given."
4691 #: builtin/grep.c:825
4693 msgid "bad object %s"
4696 #: builtin/grep.c:868
4697 msgid "--open-files-in-pager only works on the worktree"
4700 #: builtin/grep.c:891
4701 msgid "--cached or --untracked cannot be used with --no-index."
4704 #: builtin/grep.c:896
4705 msgid "--no-index or --untracked cannot be used with revs."
4708 #: builtin/grep.c:899
4709 msgid "--[no-]exclude-standard cannot be used for tracked contents."
4712 #: builtin/grep.c:907
4713 msgid "both --cached and trees are given."
4716 #: builtin/hash-object.c:60
4718 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
4722 #: builtin/hash-object.c:61
4723 msgid "git hash-object --stdin-paths < <list-of-paths>"
4726 #: builtin/hash-object.c:72
4730 #: builtin/hash-object.c:72
4734 #: builtin/hash-object.c:73
4735 msgid "write the object into the object database"
4738 #: builtin/hash-object.c:74
4739 msgid "read the object from stdin"
4742 #: builtin/hash-object.c:76
4743 msgid "store file as is without filters"
4746 #: builtin/hash-object.c:77
4747 msgid "process file as it were from this path"
4750 #: builtin/help.c:42
4751 msgid "print all available commands"
4754 #: builtin/help.c:43
4755 msgid "show man page"
4758 #: builtin/help.c:44
4759 msgid "show manual in web browser"
4762 #: builtin/help.c:46
4763 msgid "show info page"
4766 #: builtin/help.c:52
4767 msgid "git help [--all] [--man|--web|--info] [command]"
4770 #: builtin/help.c:64
4772 msgid "unrecognized help format '%s'"
4775 #: builtin/help.c:92
4776 msgid "Failed to start emacsclient."
4779 #: builtin/help.c:105
4780 msgid "Failed to parse emacsclient version."
4783 #: builtin/help.c:113
4785 msgid "emacsclient version '%d' too old (< 22)."
4788 #: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
4790 msgid "failed to exec '%s': %s"
4793 #: builtin/help.c:216
4796 "'%s': path for unsupported man viewer.\n"
4797 "Please consider using 'man.<tool>.cmd' instead."
4800 #: builtin/help.c:228
4803 "'%s': cmd for supported man viewer.\n"
4804 "Please consider using 'man.<tool>.path' instead."
4807 #: builtin/help.c:349
4809 msgid "'%s': unknown man viewer."
4812 #: builtin/help.c:366
4813 msgid "no man viewer handled the request"
4816 #: builtin/help.c:374
4817 msgid "no info viewer handled the request"
4820 #: builtin/help.c:429 builtin/help.c:436
4825 #: builtin/help.c:452
4827 msgid "`git %s' is aliased to `%s'"
4830 #: builtin/index-pack.c:170
4832 msgid "object type mismatch at %s"
4835 #: builtin/index-pack.c:190
4836 msgid "object of unexpected type"
4839 #: builtin/index-pack.c:227
4841 msgid "cannot fill %d byte"
4842 msgid_plural "cannot fill %d bytes"
4846 #: builtin/index-pack.c:237
4850 #: builtin/index-pack.c:238
4851 msgid "read error on input"
4854 #: builtin/index-pack.c:250
4855 msgid "used more bytes than were available"
4858 #: builtin/index-pack.c:257
4859 msgid "pack too large for current definition of off_t"
4862 #: builtin/index-pack.c:273
4864 msgid "unable to create '%s'"
4867 #: builtin/index-pack.c:278
4869 msgid "cannot open packfile '%s'"
4872 #: builtin/index-pack.c:292
4873 msgid "pack signature mismatch"
4876 #: builtin/index-pack.c:294
4878 msgid "pack version %<PRIu32> unsupported"
4881 #: builtin/index-pack.c:312
4883 msgid "pack has bad object at offset %lu: %s"
4886 #: builtin/index-pack.c:434
4888 msgid "inflate returned %d"
4891 #: builtin/index-pack.c:483
4892 msgid "offset value overflow for delta base object"
4895 #: builtin/index-pack.c:491
4896 msgid "delta base offset is out of bound"
4899 #: builtin/index-pack.c:499
4901 msgid "unknown object type %d"
4904 #: builtin/index-pack.c:530
4905 msgid "cannot pread pack file"
4908 #: builtin/index-pack.c:532
4910 msgid "premature end of pack file, %lu byte missing"
4911 msgid_plural "premature end of pack file, %lu bytes missing"
4915 #: builtin/index-pack.c:558
4916 msgid "serious inflate inconsistency"
4919 #: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
4920 #: builtin/index-pack.c:712 builtin/index-pack.c:721
4922 msgid "SHA1 COLLISION FOUND WITH %s !"
4925 #: builtin/index-pack.c:652 builtin/pack-objects.c:170
4926 #: builtin/pack-objects.c:262
4928 msgid "unable to read %s"
4931 #: builtin/index-pack.c:718
4933 msgid "cannot read existing object %s"
4936 #: builtin/index-pack.c:732
4938 msgid "invalid blob object %s"
4941 #: builtin/index-pack.c:747
4946 #: builtin/index-pack.c:749
4947 msgid "Error in object"
4950 #: builtin/index-pack.c:751
4952 msgid "Not all child objects of %s are reachable"
4955 #: builtin/index-pack.c:821 builtin/index-pack.c:847
4956 msgid "failed to apply delta"
4959 #: builtin/index-pack.c:986
4960 msgid "Receiving objects"
4963 #: builtin/index-pack.c:986
4964 msgid "Indexing objects"
4967 #: builtin/index-pack.c:1012
4968 msgid "pack is corrupted (SHA1 mismatch)"
4971 #: builtin/index-pack.c:1017
4972 msgid "cannot fstat packfile"
4975 #: builtin/index-pack.c:1020
4976 msgid "pack has junk at the end"
4979 #: builtin/index-pack.c:1031
4980 msgid "confusion beyond insanity in parse_pack_objects()"
4983 #: builtin/index-pack.c:1054
4984 msgid "Resolving deltas"
4987 #: builtin/index-pack.c:1064
4989 msgid "unable to create thread: %s"
4992 #: builtin/index-pack.c:1106
4993 msgid "confusion beyond insanity"
4996 #: builtin/index-pack.c:1112
4998 msgid "completed with %d local objects"
5001 #: builtin/index-pack.c:1121
5003 msgid "Unexpected tail checksum for %s (disk corruption?)"
5006 #: builtin/index-pack.c:1125
5008 msgid "pack has %d unresolved delta"
5009 msgid_plural "pack has %d unresolved deltas"
5013 #: builtin/index-pack.c:1150
5015 msgid "unable to deflate appended object (%d)"
5018 #: builtin/index-pack.c:1229
5020 msgid "local object %s is corrupt"
5023 #: builtin/index-pack.c:1253
5024 msgid "error while closing pack file"
5027 #: builtin/index-pack.c:1266
5029 msgid "cannot write keep file '%s'"
5032 #: builtin/index-pack.c:1274
5034 msgid "cannot close written keep file '%s'"
5037 #: builtin/index-pack.c:1287
5038 msgid "cannot store pack file"
5041 #: builtin/index-pack.c:1298
5042 msgid "cannot store index file"
5045 #: builtin/index-pack.c:1331
5047 msgid "bad pack.indexversion=%<PRIu32>"
5050 #: builtin/index-pack.c:1337
5052 msgid "invalid number of threads specified (%d)"
5055 #: builtin/index-pack.c:1341 builtin/index-pack.c:1514
5057 msgid "no threads support, ignoring %s"
5060 #: builtin/index-pack.c:1399
5062 msgid "Cannot open existing pack file '%s'"
5065 #: builtin/index-pack.c:1401
5067 msgid "Cannot open existing pack idx file for '%s'"
5070 #: builtin/index-pack.c:1448
5072 msgid "non delta: %d object"
5073 msgid_plural "non delta: %d objects"
5077 #: builtin/index-pack.c:1455
5079 msgid "chain length = %d: %lu object"
5080 msgid_plural "chain length = %d: %lu objects"
5084 #: builtin/index-pack.c:1482
5085 msgid "Cannot come back to cwd"
5088 #: builtin/index-pack.c:1526 builtin/index-pack.c:1529
5089 #: builtin/index-pack.c:1541 builtin/index-pack.c:1545
5094 #: builtin/index-pack.c:1559
5095 msgid "--fix-thin cannot be used without --stdin"
5098 #: builtin/index-pack.c:1563 builtin/index-pack.c:1573
5100 msgid "packfile name '%s' does not end with '.pack'"
5103 #: builtin/index-pack.c:1582
5104 msgid "--verify with no packfile name given"
5107 #: builtin/init-db.c:35
5109 msgid "Could not make %s writable by group"
5112 #: builtin/init-db.c:62
5114 msgid "insanely long template name %s"
5117 #: builtin/init-db.c:67
5119 msgid "cannot stat '%s'"
5122 #: builtin/init-db.c:73
5124 msgid "cannot stat template '%s'"
5127 #: builtin/init-db.c:80
5129 msgid "cannot opendir '%s'"
5132 #: builtin/init-db.c:97
5134 msgid "cannot readlink '%s'"
5137 #: builtin/init-db.c:99
5139 msgid "insanely long symlink %s"
5142 #: builtin/init-db.c:102
5144 msgid "cannot symlink '%s' '%s'"
5147 #: builtin/init-db.c:106
5149 msgid "cannot copy '%s' to '%s'"
5152 #: builtin/init-db.c:110
5154 msgid "ignoring template %s"
5157 #: builtin/init-db.c:133
5159 msgid "insanely long template path %s"
5162 #: builtin/init-db.c:141
5164 msgid "templates not found %s"
5167 #: builtin/init-db.c:154
5169 msgid "not copying templates of a wrong format version %d from '%s'"
5172 #: builtin/init-db.c:192
5174 msgid "insane git directory %s"
5177 #: builtin/init-db.c:323 builtin/init-db.c:326
5179 msgid "%s already exists"
5182 #: builtin/init-db.c:355
5184 msgid "unable to handle file type %d"
5187 #: builtin/init-db.c:358
5189 msgid "unable to move %s to %s"
5192 #: builtin/init-db.c:363
5194 msgid "Could not create git link %s"
5198 #. * TRANSLATORS: The first '%s' is either "Reinitialized
5199 #. * existing" or "Initialized empty", the second " shared" or
5200 #. * "", and the last '%s%s' is the verbatim directory name.
5202 #: builtin/init-db.c:420
5204 msgid "%s%s Git repository in %s%s\n"
5207 #: builtin/init-db.c:421
5208 msgid "Reinitialized existing"
5211 #: builtin/init-db.c:421
5212 msgid "Initialized empty"
5215 #: builtin/init-db.c:422
5219 #: builtin/init-db.c:441
5220 msgid "cannot tell cwd"
5223 #: builtin/init-db.c:467
5225 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5226 "shared[=<permissions>]] [directory]"
5229 #: builtin/init-db.c:490
5233 #: builtin/init-db.c:491
5234 msgid "specify that the git repository is to be shared amongst several users"
5237 #: builtin/init-db.c:493 builtin/prune-packed.c:77
5241 #: builtin/init-db.c:522 builtin/init-db.c:529
5243 msgid "cannot mkdir %s"
5246 #: builtin/init-db.c:533
5248 msgid "cannot chdir to %s"
5251 #: builtin/init-db.c:555
5254 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5258 #: builtin/init-db.c:579
5259 msgid "Cannot access current working directory"
5262 #: builtin/init-db.c:586
5264 msgid "Cannot access work tree '%s'"
5268 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
5272 msgid " or: git show [options] <object>..."
5275 #: builtin/log.c:102
5276 msgid "suppress diff output"
5279 #: builtin/log.c:103
5283 #: builtin/log.c:104
5284 msgid "Use mail map file"
5287 #: builtin/log.c:105
5288 msgid "decorate options"
5291 #: builtin/log.c:198
5293 msgid "Final output: %d %s\n"
5296 #: builtin/log.c:419 builtin/log.c:511
5298 msgid "Could not read object %s"
5301 #: builtin/log.c:535
5303 msgid "Unknown type: %d"
5306 #: builtin/log.c:627
5307 msgid "format.headers without value"
5310 #: builtin/log.c:701
5311 msgid "name of output directory is too long"
5314 #: builtin/log.c:717
5316 msgid "Cannot open patch file %s"
5319 #: builtin/log.c:731
5320 msgid "Need exactly one range."
5323 #: builtin/log.c:739
5324 msgid "Not a range."
5327 #: builtin/log.c:812
5328 msgid "Cover letter needs email format"
5331 #: builtin/log.c:885
5333 msgid "insane in-reply-to: %s"
5336 #: builtin/log.c:913
5337 msgid "git format-patch [options] [<since> | <revision range>]"
5340 #: builtin/log.c:958
5341 msgid "Two output directories?"
5344 #: builtin/log.c:1097
5345 msgid "use [PATCH n/m] even with a single patch"
5348 #: builtin/log.c:1100
5349 msgid "use [PATCH] even with multiple patches"
5352 #: builtin/log.c:1104
5353 msgid "print patches to standard out"
5356 #: builtin/log.c:1106
5357 msgid "generate a cover letter"
5360 #: builtin/log.c:1108
5361 msgid "use simple number sequence for output file names"
5364 #: builtin/log.c:1109
5368 #: builtin/log.c:1110
5369 msgid "use <sfx> instead of '.patch'"
5372 #: builtin/log.c:1112
5373 msgid "start numbering patches at <n> instead of 1"
5376 #: builtin/log.c:1114
5377 msgid "mark the series as Nth re-roll"
5380 #: builtin/log.c:1116
5381 msgid "Use [<prefix>] instead of [PATCH]"
5384 #: builtin/log.c:1119
5385 msgid "store resulting files in <dir>"
5388 #: builtin/log.c:1122
5389 msgid "don't strip/add [PATCH]"
5392 #: builtin/log.c:1125
5393 msgid "don't output binary diffs"
5396 #: builtin/log.c:1127
5397 msgid "don't include a patch matching a commit upstream"
5400 #: builtin/log.c:1129
5401 msgid "show patch format instead of default (patch + stat)"
5404 #: builtin/log.c:1131
5408 #: builtin/log.c:1132
5412 #: builtin/log.c:1133
5413 msgid "add email header"
5416 #: builtin/log.c:1134 builtin/log.c:1136
5420 #: builtin/log.c:1134
5421 msgid "add To: header"
5424 #: builtin/log.c:1136
5425 msgid "add Cc: header"
5428 #: builtin/log.c:1138
5432 #: builtin/log.c:1139
5433 msgid "make first mail a reply to <message-id>"
5436 #: builtin/log.c:1140 builtin/log.c:1143
5440 #: builtin/log.c:1141
5441 msgid "attach the patch"
5444 #: builtin/log.c:1144
5445 msgid "inline the patch"
5448 #: builtin/log.c:1148
5449 msgid "enable message threading, styles: shallow, deep"
5452 #: builtin/log.c:1150
5456 #: builtin/log.c:1151
5457 msgid "add a signature"
5460 #: builtin/log.c:1153
5461 msgid "don't print the patch filenames"
5464 #: builtin/log.c:1202
5466 msgid "bogus committer info %s"
5469 #: builtin/log.c:1247
5470 msgid "-n and -k are mutually exclusive."
5473 #: builtin/log.c:1249
5474 msgid "--subject-prefix and -k are mutually exclusive."
5477 #: builtin/log.c:1257
5478 msgid "--name-only does not make sense"
5481 #: builtin/log.c:1259
5482 msgid "--name-status does not make sense"
5485 #: builtin/log.c:1261
5486 msgid "--check does not make sense"
5489 #: builtin/log.c:1284
5490 msgid "standard output, or directory, which one?"
5493 #: builtin/log.c:1286
5495 msgid "Could not create directory '%s'"
5498 #: builtin/log.c:1439
5499 msgid "Failed to create output files"
5502 #: builtin/log.c:1488
5503 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5506 #: builtin/log.c:1543
5509 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
5512 #: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570
5514 msgid "Unknown commit %s"
5517 #: builtin/ls-files.c:409
5518 msgid "git ls-files [options] [<file>...]"
5521 #: builtin/ls-files.c:466
5522 msgid "identify the file status with tags"
5525 #: builtin/ls-files.c:468
5526 msgid "use lowercase letters for 'assume unchanged' files"
5529 #: builtin/ls-files.c:470
5530 msgid "show cached files in the output (default)"
5533 #: builtin/ls-files.c:472
5534 msgid "show deleted files in the output"
5537 #: builtin/ls-files.c:474
5538 msgid "show modified files in the output"
5541 #: builtin/ls-files.c:476
5542 msgid "show other files in the output"
5545 #: builtin/ls-files.c:478
5546 msgid "show ignored files in the output"
5549 #: builtin/ls-files.c:481
5550 msgid "show staged contents' object name in the output"
5553 #: builtin/ls-files.c:483
5554 msgid "show files on the filesystem that need to be removed"
5557 #: builtin/ls-files.c:485
5558 msgid "show 'other' directories' name only"
5561 #: builtin/ls-files.c:488
5562 msgid "don't show empty directories"
5565 #: builtin/ls-files.c:491
5566 msgid "show unmerged files in the output"
5569 #: builtin/ls-files.c:493
5570 msgid "show resolve-undo information"
5573 #: builtin/ls-files.c:495
5574 msgid "skip files matching pattern"
5577 #: builtin/ls-files.c:498
5578 msgid "exclude patterns are read from <file>"
5581 #: builtin/ls-files.c:501
5582 msgid "read additional per-directory exclude patterns in <file>"
5585 #: builtin/ls-files.c:503
5586 msgid "add the standard git exclusions"
5589 #: builtin/ls-files.c:506
5590 msgid "make the output relative to the project top directory"
5593 #: builtin/ls-files.c:509
5594 msgid "if any <file> is not in the index, treat this as an error"
5597 #: builtin/ls-files.c:510
5601 #: builtin/ls-files.c:511
5602 msgid "pretend that paths removed since <tree-ish> are still present"
5605 #: builtin/ls-files.c:513
5606 msgid "show debugging data"
5609 #: builtin/ls-tree.c:27
5610 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
5613 #: builtin/ls-tree.c:125
5614 msgid "only show trees"
5617 #: builtin/ls-tree.c:127
5618 msgid "recurse into subtrees"
5621 #: builtin/ls-tree.c:129
5622 msgid "show trees when recursing"
5625 #: builtin/ls-tree.c:132
5626 msgid "terminate entries with NUL byte"
5629 #: builtin/ls-tree.c:133
5630 msgid "include object size"
5633 #: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5634 msgid "list only filenames"
5637 #: builtin/ls-tree.c:140
5638 msgid "use full path names"
5641 #: builtin/ls-tree.c:142
5642 msgid "list entire tree; not just current directory (implies --full-name)"
5645 #: builtin/merge.c:43
5646 msgid "git merge [options] [<commit>...]"
5649 #: builtin/merge.c:44
5650 msgid "git merge [options] <msg> HEAD <commit>"
5653 #: builtin/merge.c:45
5654 msgid "git merge --abort"
5657 #: builtin/merge.c:90
5658 msgid "switch `m' requires a value"
5661 #: builtin/merge.c:127
5663 msgid "Could not find merge strategy '%s'.\n"
5666 #: builtin/merge.c:128
5668 msgid "Available strategies are:"
5671 #: builtin/merge.c:133
5673 msgid "Available custom strategies are:"
5676 #: builtin/merge.c:183
5677 msgid "do not show a diffstat at the end of the merge"
5680 #: builtin/merge.c:186
5681 msgid "show a diffstat at the end of the merge"
5684 #: builtin/merge.c:187
5685 msgid "(synonym to --stat)"
5688 #: builtin/merge.c:189
5689 msgid "add (at most <n>) entries from shortlog to merge commit message"
5692 #: builtin/merge.c:192
5693 msgid "create a single commit instead of doing a merge"
5696 #: builtin/merge.c:194
5697 msgid "perform a commit if the merge succeeds (default)"
5700 #: builtin/merge.c:196
5701 msgid "edit message before committing"
5704 #: builtin/merge.c:198
5705 msgid "allow fast-forward (default)"
5708 #: builtin/merge.c:200
5709 msgid "abort if fast-forward is not possible"
5712 #: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112
5716 #: builtin/merge.c:203
5717 msgid "merge strategy to use"
5720 #: builtin/merge.c:204
5721 msgid "option=value"
5724 #: builtin/merge.c:205
5725 msgid "option for selected merge strategy"
5728 #: builtin/merge.c:207
5729 msgid "merge commit message (for a non-fast-forward merge)"
5732 #: builtin/merge.c:211
5733 msgid "abort the current in-progress merge"
5736 #: builtin/merge.c:240
5737 msgid "could not run stash."
5740 #: builtin/merge.c:245
5741 msgid "stash failed"
5744 #: builtin/merge.c:250
5746 msgid "not a valid object: %s"
5749 #: builtin/merge.c:269 builtin/merge.c:286
5750 msgid "read-tree failed"
5753 #: builtin/merge.c:316
5754 msgid " (nothing to squash)"
5757 #: builtin/merge.c:329
5759 msgid "Squash commit -- not updating HEAD\n"
5762 #: builtin/merge.c:361
5763 msgid "Writing SQUASH_MSG"
5766 #: builtin/merge.c:363
5767 msgid "Finishing SQUASH_MSG"
5770 #: builtin/merge.c:386
5772 msgid "No merge message -- not updating HEAD\n"
5775 #: builtin/merge.c:436
5777 msgid "'%s' does not point to a commit"
5780 #: builtin/merge.c:535
5782 msgid "Bad branch.%s.mergeoptions string: %s"
5785 #: builtin/merge.c:628
5786 msgid "git write-tree failed to write a tree"
5789 #: builtin/merge.c:656
5790 msgid "Not handling anything other than two heads merge."
5793 #: builtin/merge.c:670
5795 msgid "Unknown option for merge-recursive: -X%s"
5798 #: builtin/merge.c:684
5800 msgid "unable to write %s"
5803 #: builtin/merge.c:773
5805 msgid "Could not read from '%s'"
5808 #: builtin/merge.c:782
5810 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
5813 #: builtin/merge.c:788
5816 "Please enter a commit message to explain why this merge is necessary,\n"
5817 "especially if it merges an updated upstream into a topic branch.\n"
5819 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
5823 #: builtin/merge.c:812
5824 msgid "Empty commit message."
5827 #: builtin/merge.c:824
5829 msgid "Wonderful.\n"
5832 #: builtin/merge.c:889
5834 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
5837 #: builtin/merge.c:905
5839 msgid "'%s' is not a commit"
5842 #: builtin/merge.c:946
5843 msgid "No current branch."
5846 #: builtin/merge.c:948
5847 msgid "No remote for the current branch."
5850 #: builtin/merge.c:950
5851 msgid "No default upstream defined for the current branch."
5854 #: builtin/merge.c:955
5856 msgid "No remote tracking branch for %s from %s"
5859 #: builtin/merge.c:1042 builtin/merge.c:1199
5861 msgid "%s - not something we can merge"
5864 #: builtin/merge.c:1110
5865 msgid "There is no merge to abort (MERGE_HEAD missing)."
5868 #: builtin/merge.c:1126 git-pull.sh:31
5870 "You have not concluded your merge (MERGE_HEAD exists).\n"
5871 "Please, commit your changes before you can merge."
5874 #: builtin/merge.c:1129 git-pull.sh:34
5875 msgid "You have not concluded your merge (MERGE_HEAD exists)."
5878 #: builtin/merge.c:1133
5880 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
5881 "Please, commit your changes before you can merge."
5884 #: builtin/merge.c:1136
5885 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
5888 #: builtin/merge.c:1145
5889 msgid "You cannot combine --squash with --no-ff."
5892 #: builtin/merge.c:1150
5893 msgid "You cannot combine --no-ff with --ff-only."
5896 #: builtin/merge.c:1157
5897 msgid "No commit specified and merge.defaultToUpstream not set."
5900 #: builtin/merge.c:1189
5901 msgid "Can merge only exactly one commit into empty head"
5904 #: builtin/merge.c:1192
5905 msgid "Squash commit into empty head not supported yet"
5908 #: builtin/merge.c:1194
5909 msgid "Non-fast-forward commit does not make sense into an empty head"
5912 #: builtin/merge.c:1310
5914 msgid "Updating %s..%s\n"
5917 #: builtin/merge.c:1349
5919 msgid "Trying really trivial in-index merge...\n"
5922 #: builtin/merge.c:1356
5927 #: builtin/merge.c:1388
5928 msgid "Not possible to fast-forward, aborting."
5931 #: builtin/merge.c:1411 builtin/merge.c:1490
5933 msgid "Rewinding the tree to pristine...\n"
5936 #: builtin/merge.c:1415
5938 msgid "Trying merge strategy %s...\n"
5941 #: builtin/merge.c:1481
5943 msgid "No merge strategy handled the merge.\n"
5946 #: builtin/merge.c:1483
5948 msgid "Merge with strategy %s failed.\n"
5951 #: builtin/merge.c:1492
5953 msgid "Using the %s to prepare resolving by hand.\n"
5956 #: builtin/merge.c:1504
5958 msgid "Automatic merge went well; stopped before committing as requested\n"
5961 #: builtin/merge-base.c:26
5962 msgid "git merge-base [-a|--all] <commit> <commit>..."
5965 #: builtin/merge-base.c:27
5966 msgid "git merge-base [-a|--all] --octopus <commit>..."
5969 #: builtin/merge-base.c:28
5970 msgid "git merge-base --independent <commit>..."
5973 #: builtin/merge-base.c:29
5974 msgid "git merge-base --is-ancestor <commit> <commit>"
5977 #: builtin/merge-base.c:98
5978 msgid "output all common ancestors"
5981 #: builtin/merge-base.c:99
5982 msgid "find ancestors for a single n-way merge"
5985 #: builtin/merge-base.c:100
5986 msgid "list revs not reachable from others"
5989 #: builtin/merge-base.c:102
5990 msgid "is the first one ancestor of the other?"
5993 #: builtin/merge-file.c:8
5995 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
5999 #: builtin/merge-file.c:33
6000 msgid "send results to standard output"
6003 #: builtin/merge-file.c:34
6004 msgid "use a diff3 based merge"
6007 #: builtin/merge-file.c:35
6008 msgid "for conflicts, use our version"
6011 #: builtin/merge-file.c:37
6012 msgid "for conflicts, use their version"
6015 #: builtin/merge-file.c:39
6016 msgid "for conflicts, use a union version"
6019 #: builtin/merge-file.c:42
6020 msgid "for conflicts, use this marker size"
6023 #: builtin/merge-file.c:43
6024 msgid "do not warn about conflicts"
6027 #: builtin/merge-file.c:45
6028 msgid "set labels for file1/orig_file/file2"
6031 #: builtin/mktree.c:67
6032 msgid "git mktree [-z] [--missing] [--batch]"
6035 #: builtin/mktree.c:153
6036 msgid "input is NUL terminated"
6039 #: builtin/mktree.c:154 builtin/write-tree.c:24
6040 msgid "allow missing objects"
6043 #: builtin/mktree.c:155
6044 msgid "allow creation of more than one tree"
6048 msgid "git mv [options] <source>... <destination>"
6052 msgid "force move/rename even if target exists"
6056 msgid "skip move/rename errors"
6061 msgid "Checking rename of '%s' to '%s'\n"
6069 msgid "can not move directory into itself"
6073 msgid "cannot move directory over file"
6078 msgid "Huh? %.*s is in index?"
6082 msgid "source directory is empty"
6086 msgid "not under version control"
6090 msgid "destination exists"
6095 msgid "overwriting '%s'"
6099 msgid "Cannot overwrite"
6103 msgid "multiple sources for the same target"
6108 msgid "%s, source=%s, destination=%s"
6113 msgid "Renaming %s to %s\n"
6116 #: builtin/mv.c:215 builtin/remote.c:731
6118 msgid "renaming '%s' failed"
6121 #: builtin/name-rev.c:175
6122 msgid "git name-rev [options] <commit>..."
6125 #: builtin/name-rev.c:176
6126 msgid "git name-rev [options] --all"
6129 #: builtin/name-rev.c:177
6130 msgid "git name-rev [options] --stdin"
6133 #: builtin/name-rev.c:229
6134 msgid "print only names (no SHA-1)"
6137 #: builtin/name-rev.c:230
6138 msgid "only use tags to name the commits"
6141 #: builtin/name-rev.c:232
6142 msgid "only use refs matching <pattern>"
6145 #: builtin/name-rev.c:234
6146 msgid "list all commits reachable from all refs"
6149 #: builtin/name-rev.c:235
6150 msgid "read from stdin"
6153 #: builtin/name-rev.c:236
6154 msgid "allow to print `undefined` names"
6157 #: builtin/notes.c:26
6158 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
6161 #: builtin/notes.c:27
6163 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6164 "<object>] [<object>]"
6167 #: builtin/notes.c:28
6168 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6171 #: builtin/notes.c:29
6173 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6174 "<object>] [<object>]"
6177 #: builtin/notes.c:30
6178 msgid "git notes [--ref <notes_ref>] edit [<object>]"
6181 #: builtin/notes.c:31
6182 msgid "git notes [--ref <notes_ref>] show [<object>]"
6185 #: builtin/notes.c:32
6187 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6190 #: builtin/notes.c:33
6191 msgid "git notes merge --commit [-v | -q]"
6194 #: builtin/notes.c:34
6195 msgid "git notes merge --abort [-v | -q]"
6198 #: builtin/notes.c:35
6199 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6202 #: builtin/notes.c:36
6203 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6206 #: builtin/notes.c:37
6207 msgid "git notes [--ref <notes_ref>] get-ref"
6210 #: builtin/notes.c:42
6211 msgid "git notes [list [<object>]]"
6214 #: builtin/notes.c:47
6215 msgid "git notes add [<options>] [<object>]"
6218 #: builtin/notes.c:52
6219 msgid "git notes copy [<options>] <from-object> <to-object>"
6222 #: builtin/notes.c:53
6223 msgid "git notes copy --stdin [<from-object> <to-object>]..."
6226 #: builtin/notes.c:58
6227 msgid "git notes append [<options>] [<object>]"
6230 #: builtin/notes.c:63
6231 msgid "git notes edit [<object>]"
6234 #: builtin/notes.c:68
6235 msgid "git notes show [<object>]"
6238 #: builtin/notes.c:73
6239 msgid "git notes merge [<options>] <notes_ref>"
6242 #: builtin/notes.c:74
6243 msgid "git notes merge --commit [<options>]"
6246 #: builtin/notes.c:75
6247 msgid "git notes merge --abort [<options>]"
6250 #: builtin/notes.c:80
6251 msgid "git notes remove [<object>]"
6254 #: builtin/notes.c:85
6255 msgid "git notes prune [<options>]"
6258 #: builtin/notes.c:90
6259 msgid "git notes get-ref"
6262 #: builtin/notes.c:139
6264 msgid "unable to start 'show' for object '%s'"
6267 #: builtin/notes.c:143
6268 msgid "could not read 'show' output"
6271 #: builtin/notes.c:151
6273 msgid "failed to finish 'show' for object '%s'"
6276 #: builtin/notes.c:169 builtin/tag.c:341
6278 msgid "could not create file '%s'"
6281 #: builtin/notes.c:188
6282 msgid "Please supply the note contents using either -m or -F option"
6285 #: builtin/notes.c:209 builtin/notes.c:972
6287 msgid "Removing note for object %s\n"
6290 #: builtin/notes.c:214
6291 msgid "unable to write note object"
6294 #: builtin/notes.c:216
6296 msgid "The note contents has been left in %s"
6299 #: builtin/notes.c:250 builtin/tag.c:540
6301 msgid "cannot read '%s'"
6304 #: builtin/notes.c:252 builtin/tag.c:543
6306 msgid "could not open or read '%s'"
6309 #: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446
6310 #: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643
6311 #: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765
6312 #: builtin/notes.c:967 builtin/tag.c:556
6314 msgid "Failed to resolve '%s' as a valid ref."
6317 #: builtin/notes.c:274
6319 msgid "Failed to read object '%s'."
6322 #: builtin/notes.c:298
6323 msgid "Cannot commit uninitialized/unreferenced notes tree"
6326 #: builtin/notes.c:339
6328 msgid "Bad notes.rewriteMode value: '%s'"
6331 #: builtin/notes.c:349
6333 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6336 #. TRANSLATORS: The first %s is the name of the
6337 #. environment variable, the second %s is its value
6338 #: builtin/notes.c:376
6340 msgid "Bad %s value: '%s'"
6343 #: builtin/notes.c:440
6345 msgid "Malformed input line: '%s'."
6348 #: builtin/notes.c:455
6350 msgid "Failed to copy notes from '%s' to '%s'"
6353 #: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626
6354 #: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758
6355 #: builtin/notes.c:1032
6356 msgid "too many parameters"
6359 #: builtin/notes.c:512 builtin/notes.c:771
6361 msgid "No note found for object %s."
6364 #: builtin/notes.c:534 builtin/notes.c:691
6365 msgid "note contents as a string"
6368 #: builtin/notes.c:537 builtin/notes.c:694
6369 msgid "note contents in a file"
6372 #: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696
6373 #: builtin/notes.c:699 builtin/tag.c:474
6377 #: builtin/notes.c:540 builtin/notes.c:697
6378 msgid "reuse and edit specified note object"
6381 #: builtin/notes.c:543 builtin/notes.c:700
6382 msgid "reuse specified note object"
6385 #: builtin/notes.c:545 builtin/notes.c:613
6386 msgid "replace existing notes"
6389 #: builtin/notes.c:579
6392 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6396 #: builtin/notes.c:584 builtin/notes.c:661
6398 msgid "Overwriting existing notes for object %s\n"
6401 #: builtin/notes.c:614
6402 msgid "read objects from stdin"
6405 #: builtin/notes.c:616
6406 msgid "load rewriting config for <command> (implies --stdin)"
6409 #: builtin/notes.c:634
6410 msgid "too few parameters"
6413 #: builtin/notes.c:655
6416 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6420 #: builtin/notes.c:667
6422 msgid "Missing notes on source object %s. Cannot copy."
6425 #: builtin/notes.c:716
6428 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6429 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6432 #: builtin/notes.c:863
6433 msgid "General options"
6436 #: builtin/notes.c:865
6437 msgid "Merge options"
6440 #: builtin/notes.c:867
6442 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6446 #: builtin/notes.c:869
6447 msgid "Committing unmerged notes"
6450 #: builtin/notes.c:871
6451 msgid "finalize notes merge by committing unmerged notes"
6454 #: builtin/notes.c:873
6455 msgid "Aborting notes merge resolution"
6458 #: builtin/notes.c:875
6459 msgid "abort notes merge"
6462 #: builtin/notes.c:970
6464 msgid "Object %s has no note\n"
6467 #: builtin/notes.c:982
6468 msgid "attempt to remove non-existent note is not an error"
6471 #: builtin/notes.c:985
6472 msgid "read object names from the standard input"
6475 #: builtin/notes.c:1066
6479 #: builtin/notes.c:1067
6480 msgid "use notes from <notes_ref>"
6483 #: builtin/notes.c:1102 builtin/remote.c:1598
6485 msgid "Unknown subcommand: %s"
6488 #: builtin/pack-objects.c:23
6489 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
6492 #: builtin/pack-objects.c:24
6493 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
6496 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6498 msgid "deflate error (%d)"
6501 #: builtin/pack-objects.c:2397
6503 msgid "unsupported index version %s"
6506 #: builtin/pack-objects.c:2401
6508 msgid "bad index version '%s'"
6511 #: builtin/pack-objects.c:2424
6513 msgid "option %s does not accept negative form"
6516 #: builtin/pack-objects.c:2428
6518 msgid "unable to parse value '%s' for option %s"
6521 #: builtin/pack-objects.c:2447
6522 msgid "do not show progress meter"
6525 #: builtin/pack-objects.c:2449
6526 msgid "show progress meter"
6529 #: builtin/pack-objects.c:2451
6530 msgid "show progress meter during object writing phase"
6533 #: builtin/pack-objects.c:2454
6534 msgid "similar to --all-progress when progress meter is shown"
6537 #: builtin/pack-objects.c:2455
6538 msgid "version[,offset]"
6541 #: builtin/pack-objects.c:2456
6542 msgid "write the pack index file in the specified idx format version"
6545 #: builtin/pack-objects.c:2459
6546 msgid "maximum size of each output pack file"
6549 #: builtin/pack-objects.c:2461
6550 msgid "ignore borrowed objects from alternate object store"
6553 #: builtin/pack-objects.c:2463
6554 msgid "ignore packed objects"
6557 #: builtin/pack-objects.c:2465
6558 msgid "limit pack window by objects"
6561 #: builtin/pack-objects.c:2467
6562 msgid "limit pack window by memory in addition to object limit"
6565 #: builtin/pack-objects.c:2469
6566 msgid "maximum length of delta chain allowed in the resulting pack"
6569 #: builtin/pack-objects.c:2471
6570 msgid "reuse existing deltas"
6573 #: builtin/pack-objects.c:2473
6574 msgid "reuse existing objects"
6577 #: builtin/pack-objects.c:2475
6578 msgid "use OFS_DELTA objects"
6581 #: builtin/pack-objects.c:2477
6582 msgid "use threads when searching for best delta matches"
6585 #: builtin/pack-objects.c:2479
6586 msgid "do not create an empty pack output"
6589 #: builtin/pack-objects.c:2481
6590 msgid "read revision arguments from standard input"
6593 #: builtin/pack-objects.c:2483
6594 msgid "limit the objects to those that are not yet packed"
6597 #: builtin/pack-objects.c:2486
6598 msgid "include objects reachable from any reference"
6601 #: builtin/pack-objects.c:2489
6602 msgid "include objects referred by reflog entries"
6605 #: builtin/pack-objects.c:2492
6606 msgid "output pack to stdout"
6609 #: builtin/pack-objects.c:2494
6610 msgid "include tag objects that refer to objects to be packed"
6613 #: builtin/pack-objects.c:2496
6614 msgid "keep unreachable objects"
6617 #: builtin/pack-objects.c:2497 parse-options.h:141
6621 #: builtin/pack-objects.c:2498
6622 msgid "unpack unreachable objects newer than <time>"
6625 #: builtin/pack-objects.c:2501
6626 msgid "create thin packs"
6629 #: builtin/pack-objects.c:2503
6630 msgid "ignore packs that have companion .keep file"
6633 #: builtin/pack-objects.c:2505
6634 msgid "pack compression level"
6637 #: builtin/pack-objects.c:2507
6638 msgid "do not hide commits by grafts"
6641 #: builtin/pack-refs.c:6
6642 msgid "git pack-refs [options]"
6645 #: builtin/pack-refs.c:14
6646 msgid "pack everything"
6649 #: builtin/pack-refs.c:15
6650 msgid "prune loose refs (default)"
6653 #: builtin/prune-packed.c:7
6654 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
6657 #: builtin/prune.c:12
6658 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
6661 #: builtin/prune.c:132
6662 msgid "do not remove, show only"
6665 #: builtin/prune.c:133
6666 msgid "report pruned objects"
6669 #: builtin/prune.c:136
6670 msgid "expire objects older than <time>"
6673 #: builtin/push.c:14
6674 msgid "git push [<options>] [<repository> [<refspec>...]]"
6677 #: builtin/push.c:45
6678 msgid "tag shorthand without <tag>"
6681 #: builtin/push.c:64
6682 msgid "--delete only accepts plain target ref names"
6685 #: builtin/push.c:99
6688 "To choose either option permanently, see push.default in 'git help config'."
6691 #: builtin/push.c:102
6694 "The upstream branch of your current branch does not match\n"
6695 "the name of your current branch. To push to the upstream branch\n"
6696 "on the remote, use\n"
6698 " git push %s HEAD:%s\n"
6700 "To push to the branch of the same name on the remote, use\n"
6706 #: builtin/push.c:121
6709 "You are not currently on a branch.\n"
6710 "To push the history leading to the current (detached HEAD)\n"
6713 " git push %s HEAD:<name-of-remote-branch>\n"
6716 #: builtin/push.c:128
6719 "The current branch %s has no upstream branch.\n"
6720 "To push the current branch and set the remote as upstream, use\n"
6722 " git push --set-upstream %s %s\n"
6725 #: builtin/push.c:136
6727 msgid "The current branch %s has multiple upstream branches, refusing to push."
6730 #: builtin/push.c:139
6733 "You are pushing to remote '%s', which is not the upstream of\n"
6734 "your current branch '%s', without telling me what to push\n"
6735 "to update which remote branch."
6738 #: builtin/push.c:151
6740 "push.default is unset; its implicit value is changing in\n"
6741 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6742 "and maintain the current behavior after the default changes, use:\n"
6744 " git config --global push.default matching\n"
6746 "To squelch this message and adopt the new behavior now, use:\n"
6748 " git config --global push.default simple\n"
6750 "See 'git help config' and search for 'push.default' for further "
6752 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
6753 "'current' instead of 'simple' if you sometimes use older versions of Git)"
6756 #: builtin/push.c:199
6758 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
6761 #: builtin/push.c:206
6763 "Updates were rejected because the tip of your current branch is behind\n"
6764 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
6765 "before pushing again.\n"
6766 "See the 'Note about fast-forwards' in 'git push --help' for details."
6769 #: builtin/push.c:212
6771 "Updates were rejected because a pushed branch tip is behind its remote\n"
6772 "counterpart. If you did not intend to push that branch, you may want to\n"
6773 "specify branches to push or set the 'push.default' configuration variable\n"
6774 "to 'simple', 'current' or 'upstream' to push only the current branch."
6777 #: builtin/push.c:218
6779 "Updates were rejected because a pushed branch tip is behind its remote\n"
6780 "counterpart. Check out this branch and merge the remote changes\n"
6781 "(e.g. 'git pull') before pushing again.\n"
6782 "See the 'Note about fast-forwards' in 'git push --help' for details."
6785 #: builtin/push.c:224
6787 "Updates were rejected because the remote contains work that you do\n"
6788 "not have locally. This is usually caused by another repository pushing\n"
6789 "to the same ref. You may want to first merge the remote changes (e.g.,\n"
6790 "'git pull') before pushing again.\n"
6791 "See the 'Note about fast-forwards' in 'git push --help' for details."
6794 #: builtin/push.c:231
6795 msgid "Updates were rejected because the tag already exists in the remote."
6798 #: builtin/push.c:234
6800 "You cannot update a remote ref that points at a non-commit object,\n"
6801 "or update a remote ref to make it point at a non-commit object,\n"
6802 "without using the '--force' option.\n"
6805 #: builtin/push.c:294
6807 msgid "Pushing to %s\n"
6810 #: builtin/push.c:298
6812 msgid "failed to push some refs to '%s'"
6815 #: builtin/push.c:331
6817 msgid "bad repository '%s'"
6820 #: builtin/push.c:332
6822 "No configured push destination.\n"
6823 "Either specify the URL from the command-line or configure a remote "
6824 "repository using\n"
6826 " git remote add <name> <url>\n"
6828 "and then push using the remote name\n"
6830 " git push <name>\n"
6833 #: builtin/push.c:347
6834 msgid "--all and --tags are incompatible"
6837 #: builtin/push.c:348
6838 msgid "--all can't be combined with refspecs"
6841 #: builtin/push.c:353
6842 msgid "--mirror and --tags are incompatible"
6845 #: builtin/push.c:354
6846 msgid "--mirror can't be combined with refspecs"
6849 #: builtin/push.c:359
6850 msgid "--all and --mirror are incompatible"
6853 #: builtin/push.c:419
6857 #: builtin/push.c:420
6858 msgid "push all refs"
6861 #: builtin/push.c:421
6862 msgid "mirror all refs"
6865 #: builtin/push.c:423
6869 #: builtin/push.c:424
6870 msgid "push tags (can't be used with --all or --mirror)"
6873 #: builtin/push.c:427
6874 msgid "force updates"
6877 #: builtin/push.c:428
6881 #: builtin/push.c:429
6882 msgid "control recursive pushing of submodules"
6885 #: builtin/push.c:431
6886 msgid "use thin pack"
6889 #: builtin/push.c:432 builtin/push.c:433
6890 msgid "receive pack program"
6893 #: builtin/push.c:434
6894 msgid "set upstream for git pull/status"
6897 #: builtin/push.c:437
6898 msgid "prune locally removed refs"
6901 #: builtin/push.c:439
6902 msgid "bypass pre-push hook"
6905 #: builtin/push.c:448
6906 msgid "--delete is incompatible with --all, --mirror and --tags"
6909 #: builtin/push.c:450
6910 msgid "--delete doesn't make sense without any refs"
6913 #: builtin/read-tree.c:36
6915 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
6916 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
6917 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
6920 #: builtin/read-tree.c:108
6921 msgid "write resulting index to <file>"
6924 #: builtin/read-tree.c:111
6925 msgid "only empty the index"
6928 #: builtin/read-tree.c:113
6932 #: builtin/read-tree.c:115
6933 msgid "perform a merge in addition to a read"
6936 #: builtin/read-tree.c:117
6937 msgid "3-way merge if no file level merging required"
6940 #: builtin/read-tree.c:119
6941 msgid "3-way merge in presence of adds and removes"
6944 #: builtin/read-tree.c:121
6945 msgid "same as -m, but discard unmerged entries"
6948 #: builtin/read-tree.c:122
6949 msgid "<subdirectory>/"
6952 #: builtin/read-tree.c:123
6953 msgid "read the tree into the index under <subdirectory>/"
6956 #: builtin/read-tree.c:126
6957 msgid "update working tree with merge result"
6960 #: builtin/read-tree.c:128
6964 #: builtin/read-tree.c:129
6965 msgid "allow explicitly ignored files to be overwritten"
6968 #: builtin/read-tree.c:132
6969 msgid "don't check the working tree after merging"
6972 #: builtin/read-tree.c:133
6973 msgid "don't update the index or the work tree"
6976 #: builtin/read-tree.c:135
6977 msgid "skip applying sparse checkout filter"
6980 #: builtin/read-tree.c:137
6981 msgid "debug unpack-trees"
6984 #: builtin/remote.c:11
6985 msgid "git remote [-v | --verbose]"
6988 #: builtin/remote.c:12
6990 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
6991 "mirror=<fetch|push>] <name> <url>"
6994 #: builtin/remote.c:13 builtin/remote.c:32
6995 msgid "git remote rename <old> <new>"
6998 #: builtin/remote.c:14 builtin/remote.c:37
6999 msgid "git remote remove <name>"
7002 #: builtin/remote.c:15 builtin/remote.c:42
7003 msgid "git remote set-head <name> (-a | -d | <branch>)"
7006 #: builtin/remote.c:16
7007 msgid "git remote [-v | --verbose] show [-n] <name>"
7010 #: builtin/remote.c:17
7011 msgid "git remote prune [-n | --dry-run] <name>"
7014 #: builtin/remote.c:18
7016 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
7019 #: builtin/remote.c:19
7020 msgid "git remote set-branches [--add] <name> <branch>..."
7023 #: builtin/remote.c:20 builtin/remote.c:68
7024 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
7027 #: builtin/remote.c:21 builtin/remote.c:69
7028 msgid "git remote set-url --add <name> <newurl>"
7031 #: builtin/remote.c:22 builtin/remote.c:70
7032 msgid "git remote set-url --delete <name> <url>"
7035 #: builtin/remote.c:27
7036 msgid "git remote add [<options>] <name> <url>"
7039 #: builtin/remote.c:47
7040 msgid "git remote set-branches <name> <branch>..."
7043 #: builtin/remote.c:48
7044 msgid "git remote set-branches --add <name> <branch>..."
7047 #: builtin/remote.c:53
7048 msgid "git remote show [<options>] <name>"
7051 #: builtin/remote.c:58
7052 msgid "git remote prune [<options>] <name>"
7055 #: builtin/remote.c:63
7056 msgid "git remote update [<options>] [<group> | <remote>]..."
7059 #: builtin/remote.c:98
7064 #: builtin/remote.c:130
7066 "--mirror is dangerous and deprecated; please\n"
7067 "\t use --mirror=fetch or --mirror=push instead"
7070 #: builtin/remote.c:147
7072 msgid "unknown mirror argument: %s"
7075 #: builtin/remote.c:163
7076 msgid "fetch the remote branches"
7079 #: builtin/remote.c:165
7080 msgid "import all tags and associated objects when fetching"
7083 #: builtin/remote.c:168
7084 msgid "or do not fetch any tag at all (--no-tags)"
7087 #: builtin/remote.c:170
7088 msgid "branch(es) to track"
7091 #: builtin/remote.c:171
7092 msgid "master branch"
7095 #: builtin/remote.c:172
7099 #: builtin/remote.c:173
7100 msgid "set up remote as a mirror to push to or fetch from"
7103 #: builtin/remote.c:185
7104 msgid "specifying a master branch makes no sense with --mirror"
7107 #: builtin/remote.c:187
7108 msgid "specifying branches to track makes sense only with fetch mirrors"
7111 #: builtin/remote.c:195 builtin/remote.c:646
7113 msgid "remote %s already exists."
7116 #: builtin/remote.c:199 builtin/remote.c:650
7118 msgid "'%s' is not a valid remote name"
7121 #: builtin/remote.c:243
7123 msgid "Could not setup master '%s'"
7126 #: builtin/remote.c:299
7128 msgid "more than one %s"
7131 #: builtin/remote.c:339
7133 msgid "Could not get fetch map for refspec %s"
7136 #: builtin/remote.c:440 builtin/remote.c:448
7140 #: builtin/remote.c:452
7144 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
7146 msgid "Could not append '%s' to '%s'"
7149 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
7151 msgid "No such remote: %s"
7154 #: builtin/remote.c:656
7156 msgid "Could not rename config section '%s' to '%s'"
7159 #: builtin/remote.c:662 builtin/remote.c:799
7161 msgid "Could not remove config section '%s'"
7164 #: builtin/remote.c:677
7167 "Not updating non-default fetch refspec\n"
7169 "\tPlease update the configuration manually if necessary."
7172 #: builtin/remote.c:683
7174 msgid "Could not append '%s'"
7177 #: builtin/remote.c:694
7179 msgid "Could not set '%s'"
7182 #: builtin/remote.c:716
7184 msgid "deleting '%s' failed"
7187 #: builtin/remote.c:750
7189 msgid "creating '%s' failed"
7192 #: builtin/remote.c:764
7194 msgid "Could not remove branch %s"
7197 #: builtin/remote.c:834
7199 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7200 "to delete it, use:"
7202 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7203 "to delete them, use:"
7207 #: builtin/remote.c:943
7209 msgid " new (next fetch will store in remotes/%s)"
7212 #: builtin/remote.c:946
7216 #: builtin/remote.c:948
7217 msgid " stale (use 'git remote prune' to remove)"
7220 #: builtin/remote.c:950
7224 #: builtin/remote.c:991
7226 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7229 #: builtin/remote.c:998
7231 msgid "rebases onto remote %s"
7234 #: builtin/remote.c:1001
7236 msgid " merges with remote %s"
7239 #: builtin/remote.c:1002
7240 msgid " and with remote"
7243 #: builtin/remote.c:1004
7245 msgid "merges with remote %s"
7248 #: builtin/remote.c:1005
7249 msgid " and with remote"
7252 #: builtin/remote.c:1051
7256 #: builtin/remote.c:1054
7260 #: builtin/remote.c:1058
7264 #: builtin/remote.c:1061
7265 msgid "fast-forwardable"
7268 #: builtin/remote.c:1064
7269 msgid "local out of date"
7272 #: builtin/remote.c:1071
7274 msgid " %-*s forces to %-*s (%s)"
7277 #: builtin/remote.c:1074
7279 msgid " %-*s pushes to %-*s (%s)"
7282 #: builtin/remote.c:1078
7284 msgid " %-*s forces to %s"
7287 #: builtin/remote.c:1081
7289 msgid " %-*s pushes to %s"
7292 #: builtin/remote.c:1091
7293 msgid "do not query remotes"
7296 #: builtin/remote.c:1118
7301 #: builtin/remote.c:1119
7303 msgid " Fetch URL: %s"
7306 #: builtin/remote.c:1120 builtin/remote.c:1285
7310 #: builtin/remote.c:1129 builtin/remote.c:1131
7312 msgid " Push URL: %s"
7315 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
7317 msgid " HEAD branch: %s"
7320 #: builtin/remote.c:1139
7323 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
7326 #: builtin/remote.c:1151
7328 msgid " Remote branch:%s"
7329 msgid_plural " Remote branches:%s"
7333 #: builtin/remote.c:1154 builtin/remote.c:1181
7334 msgid " (status not queried)"
7337 #: builtin/remote.c:1163
7338 msgid " Local branch configured for 'git pull':"
7339 msgid_plural " Local branches configured for 'git pull':"
7343 #: builtin/remote.c:1171
7344 msgid " Local refs will be mirrored by 'git push'"
7347 #: builtin/remote.c:1178
7349 msgid " Local ref configured for 'git push'%s:"
7350 msgid_plural " Local refs configured for 'git push'%s:"
7354 #: builtin/remote.c:1199
7355 msgid "set refs/remotes/<name>/HEAD according to remote"
7358 #: builtin/remote.c:1201
7359 msgid "delete refs/remotes/<name>/HEAD"
7362 #: builtin/remote.c:1216
7363 msgid "Cannot determine remote HEAD"
7366 #: builtin/remote.c:1218
7367 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
7370 #: builtin/remote.c:1228
7372 msgid "Could not delete %s"
7375 #: builtin/remote.c:1236
7377 msgid "Not a valid ref: %s"
7380 #: builtin/remote.c:1238
7382 msgid "Could not setup %s"
7385 #: builtin/remote.c:1274
7387 msgid " %s will become dangling!"
7390 #: builtin/remote.c:1275
7392 msgid " %s has become dangling!"
7395 #: builtin/remote.c:1281
7400 #: builtin/remote.c:1282
7405 #: builtin/remote.c:1295
7407 msgid " * [would prune] %s"
7410 #: builtin/remote.c:1298
7412 msgid " * [pruned] %s"
7415 #: builtin/remote.c:1321
7416 msgid "prune remotes after fetching"
7419 #: builtin/remote.c:1387 builtin/remote.c:1461
7421 msgid "No such remote '%s'"
7424 #: builtin/remote.c:1407
7428 #: builtin/remote.c:1414
7429 msgid "no remote specified"
7432 #: builtin/remote.c:1436
7433 msgid "manipulate push URLs"
7436 #: builtin/remote.c:1438
7440 #: builtin/remote.c:1440
7444 #: builtin/remote.c:1447
7445 msgid "--add --delete doesn't make sense"
7448 #: builtin/remote.c:1487
7450 msgid "Invalid old URL pattern: %s"
7453 #: builtin/remote.c:1495
7455 msgid "No such URL found: %s"
7458 #: builtin/remote.c:1497
7459 msgid "Will not delete all non-push URLs"
7462 #: builtin/remote.c:1569
7463 msgid "be verbose; must be placed before a subcommand"
7466 #: builtin/replace.c:17
7467 msgid "git replace [-f] <object> <replacement>"
7470 #: builtin/replace.c:18
7471 msgid "git replace -d <object>..."
7474 #: builtin/replace.c:19
7475 msgid "git replace -l [<pattern>]"
7478 #: builtin/replace.c:121
7479 msgid "list replace refs"
7482 #: builtin/replace.c:122
7483 msgid "delete replace refs"
7486 #: builtin/replace.c:123
7487 msgid "replace the ref if it exists"
7490 #: builtin/rerere.c:11
7491 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
7494 #: builtin/rerere.c:56
7495 msgid "register clean resolutions in index"
7498 #: builtin/reset.c:25
7500 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
7503 #: builtin/reset.c:26
7504 msgid "git reset [-q] <tree-ish> [--] <paths>..."
7507 #: builtin/reset.c:27
7508 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
7511 #: builtin/reset.c:33
7515 #: builtin/reset.c:33
7519 #: builtin/reset.c:33
7523 #: builtin/reset.c:33
7527 #: builtin/reset.c:33
7531 #: builtin/reset.c:73
7532 msgid "You do not have a valid HEAD."
7535 #: builtin/reset.c:75
7536 msgid "Failed to find tree of HEAD."
7539 #: builtin/reset.c:81
7541 msgid "Failed to find tree of %s."
7544 #: builtin/reset.c:98
7546 msgid "HEAD is now at %s"
7549 #: builtin/reset.c:169
7551 msgid "Cannot do a %s reset in the middle of a merge."
7554 #: builtin/reset.c:248
7555 msgid "be quiet, only report errors"
7558 #: builtin/reset.c:250
7559 msgid "reset HEAD and index"
7562 #: builtin/reset.c:251
7563 msgid "reset only HEAD"
7566 #: builtin/reset.c:253 builtin/reset.c:255
7567 msgid "reset HEAD, index and working tree"
7570 #: builtin/reset.c:257
7571 msgid "reset HEAD but keep local changes"
7574 #: builtin/reset.c:275
7576 msgid "Failed to resolve '%s' as a valid revision."
7579 #: builtin/reset.c:278 builtin/reset.c:286
7581 msgid "Could not parse object '%s'."
7584 #: builtin/reset.c:283
7586 msgid "Failed to resolve '%s' as a valid tree."
7589 #: builtin/reset.c:292
7590 msgid "--patch is incompatible with --{hard,mixed,soft}"
7593 #: builtin/reset.c:301
7594 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
7597 #: builtin/reset.c:303
7599 msgid "Cannot do %s reset with paths."
7602 #: builtin/reset.c:313
7604 msgid "%s reset is not allowed in a bare repository"
7607 #: builtin/reset.c:333
7609 msgid "Could not reset index file to revision '%s'."
7612 #: builtin/reset.c:339
7613 msgid "Unstaged changes after reset:"
7616 #: builtin/reset.c:344
7617 msgid "Could not write new index file."
7620 #: builtin/rev-parse.c:339
7621 msgid "git rev-parse --parseopt [options] -- [<args>...]"
7624 #: builtin/rev-parse.c:344
7625 msgid "keep the `--` passed as an arg"
7628 #: builtin/rev-parse.c:346
7629 msgid "stop parsing after the first non-option argument"
7632 #: builtin/rev-parse.c:464
7634 "git rev-parse --parseopt [options] -- [<args>...]\n"
7635 " or: git rev-parse --sq-quote [<arg>...]\n"
7636 " or: git rev-parse [options] [<arg>...]\n"
7638 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
7641 #: builtin/revert.c:22
7642 msgid "git revert [options] <commit-ish>"
7645 #: builtin/revert.c:23
7646 msgid "git revert <subcommand>"
7649 #: builtin/revert.c:28
7650 msgid "git cherry-pick [options] <commit-ish>"
7653 #: builtin/revert.c:29
7654 msgid "git cherry-pick <subcommand>"
7657 #: builtin/revert.c:70 builtin/revert.c:92
7659 msgid "%s: %s cannot be used with %s"
7662 #: builtin/revert.c:103
7663 msgid "end revert or cherry-pick sequence"
7666 #: builtin/revert.c:104
7667 msgid "resume revert or cherry-pick sequence"
7670 #: builtin/revert.c:105
7671 msgid "cancel revert or cherry-pick sequence"
7674 #: builtin/revert.c:106
7675 msgid "don't automatically commit"
7678 #: builtin/revert.c:107
7679 msgid "edit the commit message"
7682 #: builtin/revert.c:110
7683 msgid "parent number"
7686 #: builtin/revert.c:112
7687 msgid "merge strategy"
7690 #: builtin/revert.c:113
7694 #: builtin/revert.c:114
7695 msgid "option for merge strategy"
7698 #: builtin/revert.c:125
7699 msgid "append commit name"
7702 #: builtin/revert.c:126
7703 msgid "allow fast-forward"
7706 #: builtin/revert.c:127
7707 msgid "preserve initially empty commits"
7710 #: builtin/revert.c:128
7711 msgid "allow commits with empty messages"
7714 #: builtin/revert.c:129
7715 msgid "keep redundant, empty commits"
7718 #: builtin/revert.c:133
7719 msgid "program error"
7722 #: builtin/revert.c:223
7723 msgid "revert failed"
7726 #: builtin/revert.c:238
7727 msgid "cherry-pick failed"
7731 msgid "git rm [options] [--] <file>..."
7734 #: builtin/rm.c:64 builtin/rm.c:186
7737 "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
7738 "(use 'rm -rf' if you really want to remove it including all of its history)"
7744 "'%s' has staged content different from both the file and the HEAD\n"
7745 "(use -f to force removal)"
7751 "'%s' has changes staged in the index\n"
7752 "(use --cached to keep the file, or -f to force removal)"
7758 "'%s' has local modifications\n"
7759 "(use --cached to keep the file, or -f to force removal)"
7763 msgid "do not list removed files"
7767 msgid "only remove from the index"
7771 msgid "override the up-to-date check"
7775 msgid "allow recursive removal"
7779 msgid "exit with a zero status even if nothing matched"
7784 msgid "not removing '%s' recursively without -r"
7789 msgid "git rm: unable to remove %s"
7792 #: builtin/shortlog.c:13
7793 msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
7796 #: builtin/shortlog.c:133
7798 msgid "Missing author: %s"
7801 #: builtin/shortlog.c:229
7802 msgid "sort output according to the number of commits per author"
7805 #: builtin/shortlog.c:231
7806 msgid "Suppress commit descriptions, only provides commit count"
7809 #: builtin/shortlog.c:233
7810 msgid "Show the email address of each author"
7813 #: builtin/shortlog.c:234
7817 #: builtin/shortlog.c:235
7818 msgid "Linewrap output"
7821 #: builtin/show-branch.c:9
7823 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
7824 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
7825 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
7829 #: builtin/show-branch.c:10
7830 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
7833 #: builtin/show-branch.c:651
7834 msgid "show remote-tracking and local branches"
7837 #: builtin/show-branch.c:653
7838 msgid "show remote-tracking branches"
7841 #: builtin/show-branch.c:655
7842 msgid "color '*!+-' corresponding to the branch"
7845 #: builtin/show-branch.c:657
7846 msgid "show <n> more commits after the common ancestor"
7849 #: builtin/show-branch.c:659
7850 msgid "synonym to more=-1"
7853 #: builtin/show-branch.c:660
7854 msgid "suppress naming strings"
7857 #: builtin/show-branch.c:662
7858 msgid "include the current branch"
7861 #: builtin/show-branch.c:664
7862 msgid "name commits with their object names"
7865 #: builtin/show-branch.c:666
7866 msgid "show possible merge bases"
7869 #: builtin/show-branch.c:668
7870 msgid "show refs unreachable from any other ref"
7873 #: builtin/show-branch.c:670
7874 msgid "show commits in topological order"
7877 #: builtin/show-branch.c:672
7878 msgid "show only commits not on the first branch"
7881 #: builtin/show-branch.c:674
7882 msgid "show merges reachable from only one tip"
7885 #: builtin/show-branch.c:676
7886 msgid "show commits where no parent comes before its children"
7889 #: builtin/show-branch.c:678
7890 msgid "<n>[,<base>]"
7893 #: builtin/show-branch.c:679
7894 msgid "show <n> most recent ref-log entries starting at base"
7897 #: builtin/show-ref.c:10
7899 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
7900 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
7903 #: builtin/show-ref.c:11
7904 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
7907 #: builtin/show-ref.c:165
7908 msgid "only show tags (can be combined with heads)"
7911 #: builtin/show-ref.c:166
7912 msgid "only show heads (can be combined with tags)"
7915 #: builtin/show-ref.c:167
7916 msgid "stricter reference checking, requires exact ref path"
7919 #: builtin/show-ref.c:170 builtin/show-ref.c:172
7920 msgid "show the HEAD reference"
7923 #: builtin/show-ref.c:174
7924 msgid "dereference tags into object IDs"
7927 #: builtin/show-ref.c:176
7928 msgid "only show SHA1 hash using <n> digits"
7931 #: builtin/show-ref.c:180
7932 msgid "do not print results to stdout (useful with --verify)"
7935 #: builtin/show-ref.c:182
7936 msgid "show refs from stdin that aren't in local repository"
7939 #: builtin/symbolic-ref.c:7
7940 msgid "git symbolic-ref [options] name [ref]"
7943 #: builtin/symbolic-ref.c:8
7944 msgid "git symbolic-ref -d [-q] name"
7947 #: builtin/symbolic-ref.c:40
7948 msgid "suppress error message for non-symbolic (detached) refs"
7951 #: builtin/symbolic-ref.c:41
7952 msgid "delete symbolic ref"
7955 #: builtin/symbolic-ref.c:42
7956 msgid "shorten ref output"
7959 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
7963 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
7964 msgid "reason of the update"
7969 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
7973 msgid "git tag -d <tagname>..."
7978 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
7979 "\t\t[<pattern>...]"
7983 msgid "git tag -v <tagname>..."
7988 msgid "malformed object at '%s'"
7991 #: builtin/tag.c:207
7993 msgid "tag name too long: %.*s..."
7996 #: builtin/tag.c:212
7998 msgid "tag '%s' not found."
8001 #: builtin/tag.c:227
8003 msgid "Deleted tag '%s' (was %s)\n"
8006 #: builtin/tag.c:239
8008 msgid "could not verify the tag '%s'"
8011 #: builtin/tag.c:249
8015 "Write a tag message\n"
8016 "Lines starting with '%c' will be ignored.\n"
8019 #: builtin/tag.c:253
8023 "Write a tag message\n"
8024 "Lines starting with '%c' will be kept; you may remove them yourself if you "
8028 #: builtin/tag.c:292
8029 msgid "unable to sign the tag"
8032 #: builtin/tag.c:294
8033 msgid "unable to write tag file"
8036 #: builtin/tag.c:319
8037 msgid "bad object type."
8040 #: builtin/tag.c:332
8041 msgid "tag header too big."
8044 #: builtin/tag.c:368
8045 msgid "no tag message?"
8048 #: builtin/tag.c:374
8050 msgid "The tag message has been left in %s\n"
8053 #: builtin/tag.c:423
8054 msgid "switch 'points-at' requires an object"
8057 #: builtin/tag.c:425
8059 msgid "malformed object name '%s'"
8062 #: builtin/tag.c:445
8063 msgid "list tag names"
8066 #: builtin/tag.c:447
8067 msgid "print <n> lines of each tag message"
8070 #: builtin/tag.c:449
8074 #: builtin/tag.c:450
8078 #: builtin/tag.c:452
8079 msgid "Tag creation options"
8082 #: builtin/tag.c:454
8083 msgid "annotated tag, needs a message"
8086 #: builtin/tag.c:456
8090 #: builtin/tag.c:458
8091 msgid "annotated and GPG-signed tag"
8094 #: builtin/tag.c:462
8095 msgid "use another key to sign the tag"
8098 #: builtin/tag.c:463
8099 msgid "replace the tag if exists"
8102 #: builtin/tag.c:464
8103 msgid "show tag list in columns"
8106 #: builtin/tag.c:466
8107 msgid "Tag listing options"
8110 #: builtin/tag.c:469
8111 msgid "print only tags that contain the commit"
8114 #: builtin/tag.c:475
8115 msgid "print only tags of the object"
8118 #: builtin/tag.c:504
8119 msgid "--column and -n are incompatible"
8122 #: builtin/tag.c:521
8123 msgid "-n option is only allowed with -l."
8126 #: builtin/tag.c:523
8127 msgid "--contains option is only allowed with -l."
8130 #: builtin/tag.c:525
8131 msgid "--points-at option is only allowed with -l."
8134 #: builtin/tag.c:533
8135 msgid "only one -F or -m option is allowed."
8138 #: builtin/tag.c:553
8139 msgid "too many params"
8142 #: builtin/tag.c:559
8144 msgid "'%s' is not a valid tag name."
8147 #: builtin/tag.c:564
8149 msgid "tag '%s' already exists"
8152 #: builtin/tag.c:582
8154 msgid "%s: cannot lock the ref"
8157 #: builtin/tag.c:584
8159 msgid "%s: cannot update the ref"
8162 #: builtin/tag.c:586
8164 msgid "Updated tag '%s' (was %s)\n"
8167 #: builtin/update-index.c:401
8168 msgid "git update-index [options] [--] [<file>...]"
8171 #: builtin/update-index.c:718
8172 msgid "continue refresh even when index needs update"
8175 #: builtin/update-index.c:721
8176 msgid "refresh: ignore submodules"
8179 #: builtin/update-index.c:724
8180 msgid "do not ignore new files"
8183 #: builtin/update-index.c:726
8184 msgid "let files replace directories and vice-versa"
8187 #: builtin/update-index.c:728
8188 msgid "notice files missing from worktree"
8191 #: builtin/update-index.c:730
8192 msgid "refresh even if index contains unmerged entries"
8195 #: builtin/update-index.c:733
8196 msgid "refresh stat information"
8199 #: builtin/update-index.c:737
8200 msgid "like --refresh, but ignore assume-unchanged setting"
8203 #: builtin/update-index.c:741
8204 msgid "<mode> <object> <path>"
8207 #: builtin/update-index.c:742
8208 msgid "add the specified entry to the index"
8211 #: builtin/update-index.c:746
8215 #: builtin/update-index.c:747
8216 msgid "override the executable bit of the listed files"
8219 #: builtin/update-index.c:751
8220 msgid "mark files as \"not changing\""
8223 #: builtin/update-index.c:754
8224 msgid "clear assumed-unchanged bit"
8227 #: builtin/update-index.c:757
8228 msgid "mark files as \"index-only\""
8231 #: builtin/update-index.c:760
8232 msgid "clear skip-worktree bit"
8235 #: builtin/update-index.c:763
8236 msgid "add to index only; do not add content to object database"
8239 #: builtin/update-index.c:765
8240 msgid "remove named paths even if present in worktree"
8243 #: builtin/update-index.c:767
8244 msgid "with --stdin: input lines are terminated by null bytes"
8247 #: builtin/update-index.c:769
8248 msgid "read list of paths to be updated from standard input"
8251 #: builtin/update-index.c:773
8252 msgid "add entries from standard input to the index"
8255 #: builtin/update-index.c:777
8256 msgid "repopulate stages #2 and #3 for the listed paths"
8259 #: builtin/update-index.c:781
8260 msgid "only update entries that differ from HEAD"
8263 #: builtin/update-index.c:785
8264 msgid "ignore files missing from worktree"
8267 #: builtin/update-index.c:788
8268 msgid "report actions to standard output"
8271 #: builtin/update-index.c:790
8272 msgid "(for porcelains) forget saved unresolved conflicts"
8275 #: builtin/update-index.c:794
8276 msgid "write index in this format"
8279 #: builtin/update-ref.c:7
8280 msgid "git update-ref [options] -d <refname> [<oldval>]"
8283 #: builtin/update-ref.c:8
8284 msgid "git update-ref [options] <refname> <newval> [<oldval>]"
8287 #: builtin/update-ref.c:19
8288 msgid "delete the reference"
8291 #: builtin/update-ref.c:21
8292 msgid "update <refname> not the one it points to"
8295 #: builtin/update-server-info.c:6
8296 msgid "git update-server-info [--force]"
8299 #: builtin/update-server-info.c:14
8300 msgid "update the info files from scratch"
8303 #: builtin/verify-pack.c:56
8304 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8307 #: builtin/verify-pack.c:66
8311 #: builtin/verify-pack.c:68
8312 msgid "show statistics only"
8315 #: builtin/verify-tag.c:17
8316 msgid "git verify-tag [-v|--verbose] <tag>..."
8319 #: builtin/verify-tag.c:73
8320 msgid "print tag contents"
8323 #: builtin/write-tree.c:13
8324 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
8327 #: builtin/write-tree.c:26
8331 #: builtin/write-tree.c:27
8332 msgid "write tree object for a subdirectory <prefix>"
8335 #: builtin/write-tree.c:30
8336 msgid "only useful for debugging"
8340 msgid "See 'git help <command>' for more information on a specific command."
8343 #: parse-options.h:156
8344 msgid "no-op (backward compatibility)"
8347 #: parse-options.h:232
8348 msgid "be more verbose"
8351 #: parse-options.h:234
8352 msgid "be more quiet"
8355 #: parse-options.h:240
8356 msgid "use <n> digits to display SHA-1s"
8360 msgid "Add file contents to the index"
8364 msgid "Find by binary search the change that introduced a bug"
8368 msgid "List, create, or delete branches"
8372 msgid "Checkout a branch or paths to the working tree"
8376 msgid "Clone a repository into a new directory"
8380 msgid "Record changes to the repository"
8384 msgid "Show changes between commits, commit and working tree, etc"
8388 msgid "Download objects and refs from another repository"
8392 msgid "Print lines matching a pattern"
8396 msgid "Create an empty Git repository or reinitialize an existing one"
8400 msgid "Show commit logs"
8404 msgid "Join two or more development histories together"
8408 msgid "Move or rename a file, a directory, or a symlink"
8412 msgid "Fetch from and merge with another repository or a local branch"
8416 msgid "Update remote refs along with associated objects"
8420 msgid "Forward-port local commits to the updated upstream head"
8424 msgid "Reset current HEAD to the specified state"
8428 msgid "Remove files from the working tree and from the index"
8432 msgid "Show various types of objects"
8436 msgid "Show the working tree status"
8440 msgid "Create, list, delete or verify a tag object signed with GPG"
8444 msgid "You need to set your committer info first"
8449 "You seem to have moved HEAD since the last 'am' failure.\n"
8450 "Not rewinding to ORIG_HEAD"
8456 "When you have resolved this problem, run \"$cmdline --resolved\".\n"
8457 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8458 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
8462 msgid "Cannot fall back to three-way merge."
8466 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
8470 msgid "Using index info to reconstruct a base tree..."
8475 "Did you hand edit your patch?\n"
8476 "It does not apply to blobs recorded in its index."
8480 msgid "Falling back to patching base and 3-way merge..."
8484 msgid "Failed to merge in the changes."
8488 msgid "Only one StGIT patch series can be applied at once"
8493 msgid "Patch format $patch_format is not supported."
8497 msgid "Patch format detection failed."
8502 "The -b/--binary option has been a no-op for long time, and\n"
8503 "it will be removed. Please do not use it anymore."
8508 msgid "previous rebase directory $dotest still exists but mbox given."
8512 msgid "Please make up your mind. --skip or --abort?"
8516 msgid "Resolve operation not in progress, we are not resuming."
8521 msgid "Dirty index: cannot apply patches (dirty: $files)"
8527 "Patch is empty. Was it split wrong?\n"
8528 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
8529 "To restore the original branch and stop patching run \"$cmdline --abort\"."
8533 msgid "Patch does not have a valid e-mail address."
8537 msgid "cannot be interactive without stdin connected to a terminal."
8541 msgid "Commit Body is:"
8544 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
8545 #. in your translation. The program will only accept English
8546 #. input at this point.
8548 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8553 msgid "Applying: $FIRSTLINE"
8558 "No changes - did you forget to use 'git add'?\n"
8559 "If there is nothing left to stage, chances are that something else\n"
8560 "already introduced the same changes; you might want to skip this patch."
8565 "You still have unmerged paths in your index\n"
8566 "did you forget to use 'git add'?"
8570 msgid "No changes -- Patch already applied."
8575 msgid "Patch failed at $msgnum $FIRSTLINE"
8581 "The copy of the patch that failed is found in:\n"
8586 msgid "applying to an empty history"
8590 msgid "You need to start by \"git bisect start\""
8593 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8594 #. translation. The program will only accept English input
8597 msgid "Do you want me to do it for you [Y/n]? "
8602 msgid "unrecognised option: '$arg'"
8607 msgid "'$arg' does not appear to be a valid revision"
8610 #: git-bisect.sh:117
8611 msgid "Bad HEAD - I need a HEAD"
8614 #: git-bisect.sh:130
8617 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
8620 #: git-bisect.sh:140
8621 msgid "won't bisect on seeked tree"
8624 #: git-bisect.sh:144
8625 msgid "Bad HEAD - strange symbolic ref"
8628 #: git-bisect.sh:189
8630 msgid "Bad bisect_write argument: $state"
8633 #: git-bisect.sh:218
8635 msgid "Bad rev input: $arg"
8638 #: git-bisect.sh:232
8639 msgid "Please call 'bisect_state' with at least one argument."
8642 #: git-bisect.sh:244
8644 msgid "Bad rev input: $rev"
8647 #: git-bisect.sh:250
8648 msgid "'git bisect bad' can take only one argument."
8651 #. have bad but not good. we could bisect although
8652 #. this is less optimum.
8653 #: git-bisect.sh:273
8654 msgid "Warning: bisecting only with a bad commit."
8657 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8658 #. translation. The program will only accept English input
8660 #: git-bisect.sh:279
8661 msgid "Are you sure [Y/n]? "
8664 #: git-bisect.sh:289
8666 "You need to give me at least one good and one bad revisions.\n"
8667 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8670 #: git-bisect.sh:292
8672 "You need to start by \"git bisect start\".\n"
8673 "You then need to give me at least one good and one bad revisions.\n"
8674 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8677 #: git-bisect.sh:347 git-bisect.sh:474
8678 msgid "We are not bisecting."
8681 #: git-bisect.sh:354
8683 msgid "'$invalid' is not a valid commit"
8686 #: git-bisect.sh:363
8689 "Could not check out original HEAD '$branch'.\n"
8690 "Try 'git bisect reset <commit>'."
8693 #: git-bisect.sh:390
8694 msgid "No logfile given"
8697 #: git-bisect.sh:391
8699 msgid "cannot read $file for replaying"
8702 #: git-bisect.sh:408
8703 msgid "?? what are you talking about?"
8706 #: git-bisect.sh:420
8708 msgid "running $command"
8711 #: git-bisect.sh:427
8714 "bisect run failed:\n"
8715 "exit code $res from '$command' is < 0 or >= 128"
8718 #: git-bisect.sh:453
8719 msgid "bisect run cannot continue any more"
8722 #: git-bisect.sh:459
8725 "bisect run failed:\n"
8726 "'bisect_state $state' exited with error code $res"
8729 #: git-bisect.sh:466
8730 msgid "bisect run success"
8735 "Pull is not possible because you have unmerged files.\n"
8736 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
8737 "as appropriate to mark resolution, or use 'git commit -a'."
8741 msgid "Pull is not possible because you have unmerged files."
8745 msgid "updating an unborn branch with changes added to the index"
8748 #. The fetch involved updating the current branch.
8749 #. The working tree and the index file is still based on the
8750 #. $orig_head commit, but we are merging into $curr_head.
8751 #. First update the working tree to match $curr_head.
8755 "Warning: fetch updated the current branch head.\n"
8756 "Warning: fast-forwarding your working tree from\n"
8757 "Warning: commit $orig_head."
8761 msgid "Cannot merge multiple branches into empty head"
8765 msgid "Cannot rebase onto multiple branches"
8770 "When you have resolved this problem, run \"git rebase --continue\".\n"
8771 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
8772 "To check out the original branch and stop rebasing, run \"git rebase --abort"
8776 #: git-rebase.sh:160
8777 msgid "The pre-rebase hook refused to rebase."
8780 #: git-rebase.sh:165
8781 msgid "It looks like git-am is in progress. Cannot rebase."
8784 #: git-rebase.sh:296
8785 msgid "The --exec option must be used with the --interactive option"
8788 #: git-rebase.sh:301
8789 msgid "No rebase in progress?"
8792 #: git-rebase.sh:312
8793 msgid "The --edit-todo action can only be used during interactive rebase."
8796 #: git-rebase.sh:319
8797 msgid "Cannot read HEAD"
8800 #: git-rebase.sh:322
8802 "You must edit all merge conflicts and then\n"
8803 "mark them as resolved using git add"
8806 #: git-rebase.sh:340
8808 msgid "Could not move back to $head_name"
8811 #: git-rebase.sh:359
8814 "It seems that there is already a $state_dir_base directory, and\n"
8815 "I wonder if you are in the middle of another rebase. If that is the\n"
8816 "case, please try\n"
8817 "\t$cmd_live_rebase\n"
8818 "If that is not the case, please\n"
8819 "\t$cmd_clear_stale_rebase\n"
8820 "and run me again. I am stopping in case you still have something\n"
8824 #: git-rebase.sh:404
8826 msgid "invalid upstream $upstream_name"
8829 #: git-rebase.sh:428
8831 msgid "$onto_name: there are more than one merge bases"
8834 #: git-rebase.sh:431 git-rebase.sh:435
8836 msgid "$onto_name: there is no merge base"
8839 #: git-rebase.sh:440
8841 msgid "Does not point to a valid commit: $onto_name"
8844 #: git-rebase.sh:463
8846 msgid "fatal: no such branch: $branch_name"
8849 #: git-rebase.sh:483
8850 msgid "Please commit or stash them."
8853 #: git-rebase.sh:501
8855 msgid "Current branch $branch_name is up to date."
8858 #: git-rebase.sh:504
8860 msgid "Current branch $branch_name is up to date, rebase forced."
8863 #: git-rebase.sh:515
8865 msgid "Changes from $mb to $onto:"
8868 #. Detach HEAD and reset the tree
8869 #: git-rebase.sh:524
8870 msgid "First, rewinding head to replay your work on top of it..."
8873 #: git-rebase.sh:532
8875 msgid "Fast-forwarded $branch_name to $onto_name."
8879 msgid "git stash clear with parameters is unimplemented"
8883 msgid "You do not have the initial commit yet"
8887 msgid "Cannot save the current index state"
8890 #: git-stash.sh:123 git-stash.sh:136
8891 msgid "Cannot save the current worktree state"
8895 msgid "No changes selected"
8899 msgid "Cannot remove temporary index (can't happen)"
8903 msgid "Cannot record working tree state"
8906 #. TRANSLATORS: $option is an invalid option, like
8907 #. `--blah-blah'. The 7 spaces at the beginning of the
8908 #. second line correspond to "error: ". So you should line
8909 #. up the second line with however many characters the
8910 #. translation of "error: " takes in your language. E.g. in
8913 #. $ git stash save --blah-blah 2>&1 | head -n 2
8914 #. error: unknown option for 'stash save': --blah-blah
8915 #. To provide a message, use git stash save -- '--blah-blah'
8919 "error: unknown option for 'stash save': $option\n"
8920 " To provide a message, use git stash save -- '$option'"
8924 msgid "No local changes to save"
8928 msgid "Cannot initialize stash"
8932 msgid "Cannot save the current status"
8936 msgid "Cannot remove worktree changes"
8940 msgid "No stash found."
8945 msgid "Too many revisions specified: $REV"
8950 msgid "$reference is not valid reference"
8955 msgid "'$args' is not a stash-like commit"
8960 msgid "'$args' is not a stash reference"
8964 msgid "unable to refresh index"
8968 msgid "Cannot apply a stash in the middle of a merge"
8972 msgid "Conflicts in index. Try without --index."
8976 msgid "Could not save index tree"
8980 msgid "Cannot unstage modified files"
8984 msgid "Index was not unstashed."
8989 msgid "Dropped ${REV} ($s)"
8994 msgid "${REV}: Could not drop stash entry"
8998 msgid "No branch name specified"
9002 msgid "(To restore them type \"git stash apply\")"
9005 #: git-submodule.sh:90
9007 msgid "cannot strip one component off url '$remoteurl'"
9010 #: git-submodule.sh:195
9012 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
9015 #: git-submodule.sh:238
9017 msgid "Clone of '$url' into submodule path '$sm_path' failed"
9020 #: git-submodule.sh:250
9022 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
9025 #: git-submodule.sh:343
9027 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
9030 #: git-submodule.sh:360
9032 msgid "'$sm_path' already exists in the index"
9035 #: git-submodule.sh:364
9038 "The following path is ignored by one of your .gitignore files:\n"
9040 "Use -f if you really want to add it."
9043 #: git-submodule.sh:382
9045 msgid "Adding existing repo at '$sm_path' to the index"
9048 #: git-submodule.sh:384
9050 msgid "'$sm_path' already exists and is not a valid git repo"
9053 #: git-submodule.sh:392
9055 msgid "A git directory for '$sm_name' is found locally with remote(s):"
9058 #: git-submodule.sh:394
9061 "If you want to reuse this local git directory instead of cloning again from"
9064 #: git-submodule.sh:396
9067 "use the '--force' option. If the local git directory is not the correct repo"
9070 #: git-submodule.sh:397
9073 "or you are unsure what this means choose another name with the '--name' "
9077 #: git-submodule.sh:399
9079 msgid "Reactivating local git directory for submodule '$sm_name'."
9082 #: git-submodule.sh:411
9084 msgid "Unable to checkout submodule '$sm_path'"
9087 #: git-submodule.sh:416
9089 msgid "Failed to add submodule '$sm_path'"
9092 #: git-submodule.sh:425
9094 msgid "Failed to register submodule '$sm_path'"
9097 #: git-submodule.sh:468
9099 msgid "Entering '$prefix$sm_path'"
9102 #: git-submodule.sh:482
9104 msgid "Stopping at '$sm_path'; script returned non-zero status."
9107 #: git-submodule.sh:526
9109 msgid "No url found for submodule path '$sm_path' in .gitmodules"
9112 #: git-submodule.sh:535
9114 msgid "Failed to register url for submodule path '$sm_path'"
9117 #: git-submodule.sh:537
9119 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
9122 #: git-submodule.sh:545
9124 msgid "Failed to register update mode for submodule path '$sm_path'"
9127 #: git-submodule.sh:649
9130 "Submodule path '$sm_path' not initialized\n"
9131 "Maybe you want to use 'update --init'?"
9134 #: git-submodule.sh:662
9136 msgid "Unable to find current revision in submodule path '$sm_path'"
9139 #: git-submodule.sh:671 git-submodule.sh:695
9141 msgid "Unable to fetch in submodule path '$sm_path'"
9144 #: git-submodule.sh:709
9146 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
9149 #: git-submodule.sh:710
9151 msgid "Submodule path '$sm_path': rebased into '$sha1'"
9154 #: git-submodule.sh:715
9156 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
9159 #: git-submodule.sh:716
9161 msgid "Submodule path '$sm_path': merged in '$sha1'"
9164 #: git-submodule.sh:721
9166 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
9169 #: git-submodule.sh:722
9171 msgid "Submodule path '$sm_path': checked out '$sha1'"
9174 #: git-submodule.sh:744 git-submodule.sh:1066
9176 msgid "Failed to recurse into submodule path '$sm_path'"
9179 #: git-submodule.sh:852
9180 msgid "The --cached option cannot be used with the --files option"
9184 #: git-submodule.sh:892
9186 msgid "unexpected mode $mod_dst"
9189 #: git-submodule.sh:910
9191 msgid " Warn: $name doesn't contain commit $sha1_src"
9194 #: git-submodule.sh:913
9196 msgid " Warn: $name doesn't contain commit $sha1_dst"
9199 #: git-submodule.sh:916
9201 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9204 #: git-submodule.sh:941
9208 #: git-submodule.sh:979
9209 msgid "Submodules changed but not updated:"
9212 #: git-submodule.sh:981
9213 msgid "Submodule changes to be committed:"
9216 #: git-submodule.sh:1129
9218 msgid "Synchronizing submodule url for '$prefix$sm_path'"