1 # SOME DESCRIPTIVE TITLE.
2 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3 # This file is distributed under the same license as the PACKAGE package.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11 "POT-Creation-Date: 2012-10-16 08:38+0800\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
17 "Content-Type: text/plain; charset=CHARSET\n"
18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
27 #. * Message used both when 'git commit' fails and when
28 #. * other commands doing a merge do.
32 "Fix them up in the work tree,\n"
33 "and then use 'git add/rm <file>' as\n"
34 "appropriate to mark resolution and make a commit,\n"
35 "or use 'git commit -a'."
39 msgid "git archive [options] <tree-ish> [<path>...]"
43 msgid "git archive --list"
48 "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
52 msgid "git archive --remote <repo> [--exec <cmd>] --list"
60 msgid "archive format"
63 #: archive.c:323 builtin/log.c:1079
68 msgid "prepend prefix to each pathname in the archive"
71 #: archive.c:325 builtin/archive.c:91 builtin/blame.c:2389
72 #: builtin/blame.c:2390 builtin/config.c:56 builtin/fast-export.c:642
73 #: builtin/fast-export.c:644 builtin/grep.c:801 builtin/hash-object.c:77
74 #: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540
75 #: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149
79 #: archive.c:326 builtin/archive.c:92
80 msgid "write the archive to this file"
84 msgid "read .gitattributes in working directory"
88 msgid "report archived files on stderr"
96 msgid "compress faster"
100 msgid "compress better"
104 msgid "list supported archive formats"
107 #: archive.c:344 builtin/archive.c:93 builtin/clone.c:85
111 #: archive.c:345 builtin/archive.c:94
112 msgid "retrieve the archive from remote repository <repo>"
115 #: archive.c:346 builtin/archive.c:95 builtin/notes.c:619
119 #: archive.c:347 builtin/archive.c:96
120 msgid "path to the remote git-upload-archive command"
125 msgid "'%s' does not look like a v2 bundle file"
130 msgid "unrecognized header: %s%s (%d)"
133 #: bundle.c:89 builtin/commit.c:672
135 msgid "could not open '%s'"
139 msgid "Repository lacks these prerequisite commits:"
142 #: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290
143 #: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347
144 #: builtin/shortlog.c:181
145 msgid "revision walk setup failed"
150 msgid "The bundle contains %d ref"
151 msgid_plural "The bundle contains %d refs"
156 msgid "The bundle records a complete history."
161 msgid "The bundle requires this ref"
162 msgid_plural "The bundle requires these %d refs"
167 msgid "rev-list died"
170 #: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284
172 msgid "unrecognized argument: %s"
177 msgid "ref '%s' is excluded by the rev-list options"
181 msgid "Refusing to create empty bundle."
185 msgid "Could not spawn pack-objects"
189 msgid "pack-objects died"
194 msgid "cannot create '%s'"
198 msgid "index-pack died"
203 msgid "could not parse %s"
208 msgid "%s %s is not a commit!"
211 #: compat/obstack.c:406 compat/obstack.c:408
212 msgid "memory exhausted"
216 msgid "Could not run 'git rev-list'"
221 msgid "failed write to rev-list: %s"
226 msgid "failed to close rev-list's stdin: %s"
230 msgid "in the future"
235 msgid "%lu second ago"
236 msgid_plural "%lu seconds ago"
242 msgid "%lu minute ago"
243 msgid_plural "%lu minutes ago"
250 msgid_plural "%lu hours ago"
257 msgid_plural "%lu days ago"
264 msgid_plural "%lu weeks ago"
270 msgid "%lu month ago"
271 msgid_plural "%lu months ago"
278 msgid_plural "%lu years"
284 msgid "%s, %lu month ago"
285 msgid_plural "%s, %lu months ago"
289 #: date.c:154 date.c:159
292 msgid_plural "%lu years ago"
298 msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
303 msgid " Unknown dirstat parameter '%.*s'\n"
309 "Found errors in 'diff.dirstat' config variable:\n"
316 "Failed to parse --dirstat/-X option parameter:\n"
320 #: gpg-interface.c:59
321 msgid "could not run gpg."
324 #: gpg-interface.c:71
325 msgid "gpg did not accept the data"
328 #: gpg-interface.c:82
329 msgid "gpg failed to sign the data"
334 msgid "'%s': unable to read %s"
344 msgid "'%s': short read %s"
349 msgid "available git commands in '%s'"
353 msgid "git commands available from elsewhere on your $PATH"
359 "'%s' appears to be a git command, but we were not\n"
360 "able to execute it. Maybe git-%s is broken?"
364 msgid "Uh oh. Your system reports no Git commands at all."
370 "WARNING: You called a Git command named '%s', which does not exist.\n"
371 "Continuing under the assumption that you meant '%s'"
376 msgid "in %0.1f seconds automatically..."
381 msgid "git: '%s' is not a git command. See 'git --help'."
390 "Did you mean one of these?"
394 #: merge-recursive.c:190
396 msgid "(bad commit)\n"
399 #: merge-recursive.c:206
401 msgid "addinfo_cache failed for path '%s'"
404 #: merge-recursive.c:268
405 msgid "error building trees"
408 #: merge-recursive.c:672
410 msgid "failed to create path '%s'%s"
413 #: merge-recursive.c:683
415 msgid "Removing %s to make room for subdirectory\n"
418 #. something else exists
419 #. .. but not some other error (who really cares what?)
420 #: merge-recursive.c:697 merge-recursive.c:718
421 msgid ": perhaps a D/F conflict?"
424 #: merge-recursive.c:708
426 msgid "refusing to lose untracked file at '%s'"
429 #: merge-recursive.c:748
431 msgid "cannot read object %s '%s'"
434 #: merge-recursive.c:750
436 msgid "blob expected for %s '%s'"
439 #: merge-recursive.c:773 builtin/clone.c:302
441 msgid "failed to open '%s'"
444 #: merge-recursive.c:781
446 msgid "failed to symlink '%s'"
449 #: merge-recursive.c:784
451 msgid "do not know what to do with %06o %s '%s'"
454 #: merge-recursive.c:922
455 msgid "Failed to execute internal merge"
458 #: merge-recursive.c:926
460 msgid "Unable to add %s to database"
463 #: merge-recursive.c:942
464 msgid "unsupported object type in the tree"
467 #: merge-recursive.c:1021 merge-recursive.c:1035
470 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
474 #: merge-recursive.c:1027 merge-recursive.c:1040
477 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
481 #: merge-recursive.c:1081
485 #: merge-recursive.c:1081
489 #: merge-recursive.c:1137
491 msgid "%s is a directory in %s adding as %s instead"
494 #: merge-recursive.c:1159
497 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
498 "\"->\"%s\" in \"%s\"%s"
501 #: merge-recursive.c:1164
502 msgid " (left unresolved)"
505 #: merge-recursive.c:1218
507 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
510 #: merge-recursive.c:1248
512 msgid "Renaming %s to %s and %s to %s instead"
515 #: merge-recursive.c:1447
517 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
520 #: merge-recursive.c:1457
522 msgid "Adding merged %s"
525 #: merge-recursive.c:1462 merge-recursive.c:1660
527 msgid "Adding as %s instead"
530 #: merge-recursive.c:1513
532 msgid "cannot read object %s"
535 #: merge-recursive.c:1516
537 msgid "object %s is not a blob"
540 #: merge-recursive.c:1564
544 #: merge-recursive.c:1564
548 #: merge-recursive.c:1574
552 #: merge-recursive.c:1581
556 #: merge-recursive.c:1615
558 msgid "Skipped %s (merged same as existing)"
561 #: merge-recursive.c:1629
563 msgid "Auto-merging %s"
566 #: merge-recursive.c:1633 git-submodule.sh:869
570 #: merge-recursive.c:1634
572 msgid "CONFLICT (%s): Merge conflict in %s"
575 #: merge-recursive.c:1724
580 #: merge-recursive.c:1749
581 msgid "file/directory"
584 #: merge-recursive.c:1755
585 msgid "directory/file"
588 #: merge-recursive.c:1760
590 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
593 #: merge-recursive.c:1770
598 #: merge-recursive.c:1787
599 msgid "Fatal merge failure, shouldn't happen."
602 #: merge-recursive.c:1806
603 msgid "Already up-to-date!"
606 #: merge-recursive.c:1815
608 msgid "merging of trees %s and %s failed"
611 #: merge-recursive.c:1845
613 msgid "Unprocessed path??? %s"
616 #: merge-recursive.c:1890
620 #: merge-recursive.c:1903
622 msgid "found %u common ancestor:"
623 msgid_plural "found %u common ancestors:"
627 #: merge-recursive.c:1940
628 msgid "merge returned no commit"
631 #: merge-recursive.c:1997
633 msgid "Could not parse object '%s'"
636 #: merge-recursive.c:2009 builtin/merge.c:696
637 msgid "Unable to write index."
640 #: parse-options.c:494
644 #: parse-options.c:512
649 #. TRANSLATORS: the colon here should align with the
650 #. one in "usage: %s" translation
651 #: parse-options.c:516
656 #: parse-options.c:519
663 msgid "Your branch is ahead of '%s' by %d commit.\n"
664 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
670 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
672 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
679 "Your branch and '%s' have diverged,\n"
680 "and have %d and %d different commit each, respectively.\n"
682 "Your branch and '%s' have diverged,\n"
683 "and have %d and %d different commits each, respectively.\n"
687 #: sequencer.c:123 builtin/merge.c:864 builtin/merge.c:977
688 #: builtin/merge.c:1087 builtin/merge.c:1097
690 msgid "Could not open '%s' for writing"
693 #: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:867
694 #: builtin/merge.c:1089 builtin/merge.c:1102
696 msgid "Could not write to '%s'"
701 "after resolving the conflicts, mark the corrected paths\n"
702 "with 'git add <paths>' or 'git rm <paths>'"
707 "after resolving the conflicts, mark the corrected paths\n"
708 "with 'git add <paths>' or 'git rm <paths>'\n"
709 "and commit the result with 'git commit'"
712 #: sequencer.c:162 sequencer.c:770 sequencer.c:853
714 msgid "Could not write to %s"
719 msgid "Error wrapping up %s"
723 msgid "Your local changes would be overwritten by cherry-pick."
727 msgid "Your local changes would be overwritten by revert."
731 msgid "Commit your changes or stash them to proceed."
734 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
737 msgid "%s: Unable to write new index file"
741 msgid "Could not resolve HEAD commit\n"
745 msgid "Unable to update cache tree\n"
750 msgid "Could not parse commit %s\n"
755 msgid "Could not parse parent commit %s\n"
759 msgid "Your index file is unmerged."
763 msgid "You do not have a valid HEAD"
768 msgid "Commit %s is a merge but no -m option was given."
773 msgid "Commit %s does not have parent %d"
778 msgid "Mainline was specified but commit %s is not a merge."
781 #. TRANSLATORS: The first %s will be "revert" or
782 #. "cherry-pick", the second %s a SHA1
785 msgid "%s: cannot parse parent commit %s"
790 msgid "Cannot get commit message for %s"
795 msgid "could not revert %s... %s"
800 msgid "could not apply %s... %s"
804 msgid "empty commit set passed"
809 msgid "git %s: failed to read the index"
814 msgid "git %s: failed to refresh the index"
819 msgid "Cannot %s during a %s"
824 msgid "Could not parse line %d."
828 msgid "No commits parsed."
833 msgid "Could not open %s"
838 msgid "Could not read %s."
843 msgid "Unusable instruction sheet: %s"
848 msgid "Invalid key: %s"
853 msgid "Invalid value for %s: %s"
858 msgid "Malformed options sheet: %s"
862 msgid "a cherry-pick or revert is already in progress"
866 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
871 msgid "Could not create sequencer directory %s"
874 #: sequencer.c:772 sequencer.c:857
876 msgid "Error wrapping up %s."
879 #: sequencer.c:791 sequencer.c:925
880 msgid "no cherry-pick or revert in progress"
884 msgid "cannot resolve HEAD"
888 msgid "cannot abort from a branch yet to be born"
891 #: sequencer.c:817 builtin/apply.c:4005
893 msgid "cannot open %s: %s"
898 msgid "cannot read %s: %s"
902 msgid "unexpected end of file"
907 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
912 msgid "Could not format %s."
916 msgid "Can't revert as initial commit"
920 msgid "Can't cherry-pick into empty head"
924 msgid "HEAD does not point to a branch"
929 msgid "No such branch: '%s'"
934 msgid "No upstream configured for branch '%s'"
939 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
944 msgid "unable to access '%s': %s"
949 msgid "unable to look up current user in the passwd file: %s"
957 msgid "Unmerged paths:"
960 #: wt-status.c:167 wt-status.c:194
962 msgid " (use \"git reset %s <file>...\" to unstage)"
965 #: wt-status.c:169 wt-status.c:196
966 msgid " (use \"git rm --cached <file>...\" to unstage)"
970 msgid " (use \"git add <file>...\" to mark resolution)"
973 #: wt-status.c:175 wt-status.c:179
974 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
978 msgid " (use \"git rm <file>...\" to mark resolution)"
982 msgid "Changes to be committed:"
986 msgid "Changes not staged for commit:"
990 msgid " (use \"git add <file>...\" to update what will be committed)"
994 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
999 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1003 msgid " (commit or discard the untracked or modified content in submodules)"
1008 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1016 msgid "both deleted:"
1020 msgid "added by us:"
1024 msgid "deleted by them:"
1028 msgid "added by them:"
1032 msgid "deleted by us:"
1040 msgid "both modified:"
1044 msgid "new commits, "
1048 msgid "modified content, "
1052 msgid "untracked content, "
1057 msgid "new file: %s"
1062 msgid "copied: %s -> %s"
1072 msgid "modified: %s"
1077 msgid "renamed: %s -> %s"
1082 msgid "typechange: %s"
1092 msgid "unmerged: %s"
1097 msgid "bug: unhandled diff status %c"
1101 msgid "You have unmerged paths."
1104 #: wt-status.c:788 wt-status.c:912
1105 msgid " (fix conflicts and run \"git commit\")"
1109 msgid "All conflicts fixed but you are still merging."
1113 msgid " (use \"git commit\" to conclude merge)"
1117 msgid "You are in the middle of an am session."
1121 msgid "The current patch is empty."
1125 msgid " (fix conflicts and then run \"git am --resolved\")"
1129 msgid " (use \"git am --skip\" to skip this patch)"
1133 msgid " (use \"git am --abort\" to restore the original branch)"
1136 #: wt-status.c:873 wt-status.c:883
1137 msgid "You are currently rebasing."
1141 msgid " (fix conflicts and then run \"git rebase --continue\")"
1145 msgid " (use \"git rebase --skip\" to skip this patch)"
1149 msgid " (use \"git rebase --abort\" to check out the original branch)"
1153 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1157 msgid "You are currently splitting a commit during a rebase."
1161 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1165 msgid "You are currently editing a commit during a rebase."
1169 msgid " (use \"git commit --amend\" to amend the current commit)"
1174 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1178 msgid "You are currently cherry-picking."
1182 msgid " (all conflicts fixed: run \"git commit\")"
1186 msgid "You are currently bisecting."
1190 msgid " (use \"git bisect reset\" to get back to the original branch)"
1198 msgid "Not currently on any branch."
1202 msgid "Initial commit"
1206 msgid "Untracked files"
1210 msgid "Ignored files"
1215 msgid "Untracked files not listed%s"
1219 msgid " (use -u option to show untracked files)"
1228 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1233 msgid "no changes added to commit\n"
1239 "nothing added to commit but untracked files present (use \"git add\" to "
1245 msgid "nothing added to commit but untracked files present\n"
1250 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1253 #: wt-status.c:1043 wt-status.c:1048
1255 msgid "nothing to commit\n"
1260 msgid "nothing to commit (use -u to show untracked files)\n"
1265 msgid "nothing to commit, working directory clean\n"
1269 msgid "HEAD (no branch)"
1273 msgid "Initial commit on "
1280 #: wt-status.c:1182 wt-status.c:1185
1288 #: compat/precompose_utf8.c:58 builtin/clone.c:341
1290 msgid "failed to unlink '%s'"
1294 msgid "git add [options] [--] <filepattern>..."
1299 msgid "unexpected diff status %c"
1302 #: builtin/add.c:67 builtin/commit.c:230
1303 msgid "updating files failed"
1308 msgid "remove '%s'\n"
1311 #: builtin/add.c:176
1313 msgid "Path '%s' is in submodule '%.*s'"
1316 #: builtin/add.c:192
1317 msgid "Unstaged changes after refreshing the index:"
1320 #: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186
1322 msgid "pathspec '%s' did not match any files"
1325 #: builtin/add.c:209
1327 msgid "'%s' is beyond a symbolic link"
1330 #: builtin/add.c:276
1331 msgid "Could not read the index"
1334 #: builtin/add.c:286
1336 msgid "Could not open '%s' for writing."
1339 #: builtin/add.c:290
1340 msgid "Could not write patch"
1343 #: builtin/add.c:295
1345 msgid "Could not stat '%s'"
1348 #: builtin/add.c:297
1349 msgid "Empty patch. Aborted."
1352 #: builtin/add.c:303
1354 msgid "Could not apply '%s'"
1357 #: builtin/add.c:313
1358 msgid "The following paths are ignored by one of your .gitignore files:\n"
1361 #: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63
1362 #: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253
1367 #: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1154
1368 #: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477
1369 #: builtin/mv.c:62 builtin/read-tree.c:112
1373 #: builtin/add.c:322
1374 msgid "interactive picking"
1377 #: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248
1378 msgid "select hunks interactively"
1381 #: builtin/add.c:324
1382 msgid "edit current diff and apply"
1385 #: builtin/add.c:325
1386 msgid "allow adding otherwise ignored files"
1389 #: builtin/add.c:326
1390 msgid "update tracked files"
1393 #: builtin/add.c:327
1394 msgid "record only the fact that the path will be added later"
1397 #: builtin/add.c:328
1398 msgid "add changes from all tracked and untracked files"
1401 #: builtin/add.c:329
1402 msgid "don't add, only refresh the index"
1405 #: builtin/add.c:330
1406 msgid "just skip files which cannot be added because of errors"
1409 #: builtin/add.c:331
1410 msgid "check if - even missing - files are ignored in dry run"
1413 #: builtin/add.c:353
1415 msgid "Use -f if you really want to add them.\n"
1418 #: builtin/add.c:354
1419 msgid "no files added"
1422 #: builtin/add.c:360
1423 msgid "adding files failed"
1426 #: builtin/add.c:392
1427 msgid "-A and -u are mutually incompatible"
1430 #: builtin/add.c:394
1431 msgid "Option --ignore-missing can only be used together with --dry-run"
1434 #: builtin/add.c:414
1436 msgid "Nothing specified, nothing added.\n"
1439 #: builtin/add.c:415
1441 msgid "Maybe you wanted to say 'git add .'?\n"
1444 #: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:290 builtin/mv.c:82
1446 msgid "index file corrupt"
1449 #: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260
1450 msgid "Unable to write new index file"
1453 #: builtin/apply.c:57
1454 msgid "git apply [options] [<patch>...]"
1457 #: builtin/apply.c:110
1459 msgid "unrecognized whitespace option '%s'"
1462 #: builtin/apply.c:125
1464 msgid "unrecognized whitespace ignore option '%s'"
1467 #: builtin/apply.c:823
1469 msgid "Cannot prepare timestamp regexp %s"
1472 #: builtin/apply.c:832
1474 msgid "regexec returned %d for input: %s"
1477 #: builtin/apply.c:913
1479 msgid "unable to find filename in patch at line %d"
1482 #: builtin/apply.c:945
1484 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1487 #: builtin/apply.c:949
1489 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1492 #: builtin/apply.c:950
1494 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1497 #: builtin/apply.c:957
1499 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1502 #: builtin/apply.c:1420
1504 msgid "recount: unexpected line: %.*s"
1507 #: builtin/apply.c:1477
1509 msgid "patch fragment without header at line %d: %.*s"
1512 #: builtin/apply.c:1494
1515 "git diff header lacks filename information when removing %d leading pathname "
1516 "component (line %d)"
1518 "git diff header lacks filename information when removing %d leading pathname "
1519 "components (line %d)"
1523 #: builtin/apply.c:1654
1524 msgid "new file depends on old contents"
1527 #: builtin/apply.c:1656
1528 msgid "deleted file still has contents"
1531 #: builtin/apply.c:1682
1533 msgid "corrupt patch at line %d"
1536 #: builtin/apply.c:1718
1538 msgid "new file %s depends on old contents"
1541 #: builtin/apply.c:1720
1543 msgid "deleted file %s still has contents"
1546 #: builtin/apply.c:1723
1548 msgid "** warning: file %s becomes empty but is not deleted"
1551 #: builtin/apply.c:1869
1553 msgid "corrupt binary patch at line %d: %.*s"
1556 #. there has to be one hunk (forward hunk)
1557 #: builtin/apply.c:1898
1559 msgid "unrecognized binary patch at line %d"
1562 #: builtin/apply.c:1984
1564 msgid "patch with only garbage at line %d"
1567 #: builtin/apply.c:2074
1569 msgid "unable to read symlink %s"
1572 #: builtin/apply.c:2078
1574 msgid "unable to open or read %s"
1577 #: builtin/apply.c:2149
1581 #: builtin/apply.c:2671
1583 msgid "invalid start of line: '%c'"
1586 #: builtin/apply.c:2789
1588 msgid "Hunk #%d succeeded at %d (offset %d line)."
1589 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1593 #: builtin/apply.c:2801
1595 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1598 #: builtin/apply.c:2807
1601 "while searching for:\n"
1605 #: builtin/apply.c:2826
1607 msgid "missing binary patch data for '%s'"
1610 #: builtin/apply.c:2929
1612 msgid "binary patch does not apply to '%s'"
1615 #: builtin/apply.c:2935
1617 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1620 #: builtin/apply.c:2956
1622 msgid "patch failed: %s:%ld"
1625 #: builtin/apply.c:3078
1627 msgid "cannot checkout %s"
1630 #: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176
1632 msgid "read of %s failed"
1635 #: builtin/apply.c:3156 builtin/apply.c:3378
1637 msgid "path %s has been renamed/deleted"
1640 #: builtin/apply.c:3237 builtin/apply.c:3392
1642 msgid "%s: does not exist in index"
1645 #: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406
1650 #: builtin/apply.c:3246 builtin/apply.c:3400
1652 msgid "%s: does not match index"
1655 #: builtin/apply.c:3348
1656 msgid "removal patch leaves file contents"
1659 #: builtin/apply.c:3417
1661 msgid "%s: wrong type"
1664 #: builtin/apply.c:3419
1666 msgid "%s has type %o, expected %o"
1669 #: builtin/apply.c:3520
1671 msgid "%s: already exists in index"
1674 #: builtin/apply.c:3523
1676 msgid "%s: already exists in working directory"
1679 #: builtin/apply.c:3543
1681 msgid "new mode (%o) of %s does not match old mode (%o)"
1684 #: builtin/apply.c:3548
1686 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1689 #: builtin/apply.c:3556
1691 msgid "%s: patch does not apply"
1694 #: builtin/apply.c:3569
1696 msgid "Checking patch %s..."
1699 #: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158
1701 msgid "make_cache_entry failed for path '%s'"
1704 #: builtin/apply.c:3767
1706 msgid "unable to remove %s from index"
1709 #: builtin/apply.c:3795
1711 msgid "corrupt patch for subproject %s"
1714 #: builtin/apply.c:3799
1716 msgid "unable to stat newly created file '%s'"
1719 #: builtin/apply.c:3804
1721 msgid "unable to create backing store for newly created file %s"
1724 #: builtin/apply.c:3807 builtin/apply.c:3915
1726 msgid "unable to add cache entry for %s"
1729 #: builtin/apply.c:3840
1731 msgid "closing file '%s'"
1734 #: builtin/apply.c:3889
1736 msgid "unable to write file '%s' mode %o"
1739 #: builtin/apply.c:3976
1741 msgid "Applied patch %s cleanly."
1744 #: builtin/apply.c:3984
1745 msgid "internal error"
1748 #. Say this even without --verbose
1749 #: builtin/apply.c:3987
1751 msgid "Applying patch %%s with %d reject..."
1752 msgid_plural "Applying patch %%s with %d rejects..."
1756 #: builtin/apply.c:3997
1758 msgid "truncating .rej filename to %.*s.rej"
1761 #: builtin/apply.c:4018
1763 msgid "Hunk #%d applied cleanly."
1766 #: builtin/apply.c:4021
1768 msgid "Rejected hunk #%d."
1771 #: builtin/apply.c:4171
1772 msgid "unrecognized input"
1775 #: builtin/apply.c:4182
1776 msgid "unable to read index file"
1779 #: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91
1780 #: builtin/fetch.c:63
1784 #: builtin/apply.c:4302
1785 msgid "don't apply changes matching the given path"
1788 #: builtin/apply.c:4305
1789 msgid "apply changes matching the given path"
1792 #: builtin/apply.c:4307
1796 #: builtin/apply.c:4308
1797 msgid "remove <num> leading slashes from traditional diff paths"
1800 #: builtin/apply.c:4311
1801 msgid "ignore additions made by the patch"
1804 #: builtin/apply.c:4313
1805 msgid "instead of applying the patch, output diffstat for the input"
1808 #: builtin/apply.c:4317
1809 msgid "show number of added and deleted lines in decimal notation"
1812 #: builtin/apply.c:4319
1813 msgid "instead of applying the patch, output a summary for the input"
1816 #: builtin/apply.c:4321
1817 msgid "instead of applying the patch, see if the patch is applicable"
1820 #: builtin/apply.c:4323
1821 msgid "make sure the patch is applicable to the current index"
1824 #: builtin/apply.c:4325
1825 msgid "apply a patch without touching the working tree"
1828 #: builtin/apply.c:4327
1829 msgid "also apply the patch (use with --stat/--summary/--check)"
1832 #: builtin/apply.c:4329
1833 msgid "attempt three-way merge if a patch does not apply"
1836 #: builtin/apply.c:4331
1837 msgid "build a temporary index based on embedded index information"
1840 #: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460
1841 msgid "paths are separated with NUL character"
1844 #: builtin/apply.c:4336
1845 msgid "ensure at least <n> lines of context match"
1848 #: builtin/apply.c:4337
1852 #: builtin/apply.c:4338
1853 msgid "detect new or modified lines that have whitespace errors"
1856 #: builtin/apply.c:4341 builtin/apply.c:4344
1857 msgid "ignore changes in whitespace when finding context"
1860 #: builtin/apply.c:4347
1861 msgid "apply the patch in reverse"
1864 #: builtin/apply.c:4349
1865 msgid "don't expect at least one line of context"
1868 #: builtin/apply.c:4351
1869 msgid "leave the rejected hunks in corresponding *.rej files"
1872 #: builtin/apply.c:4353
1873 msgid "allow overlapping hunks"
1876 #: builtin/apply.c:4356
1877 msgid "tolerate incorrectly detected missing new-line at the end of file"
1880 #: builtin/apply.c:4359
1881 msgid "do not trust the line counts in the hunk headers"
1884 #: builtin/apply.c:4361
1888 #: builtin/apply.c:4362
1889 msgid "prepend <root> to all filenames"
1892 #: builtin/apply.c:4384
1893 msgid "--3way outside a repository"
1896 #: builtin/apply.c:4392
1897 msgid "--index outside a repository"
1900 #: builtin/apply.c:4395
1901 msgid "--cached outside a repository"
1904 #: builtin/apply.c:4411
1906 msgid "can't open patch '%s'"
1909 #: builtin/apply.c:4425
1911 msgid "squelched %d whitespace error"
1912 msgid_plural "squelched %d whitespace errors"
1916 #: builtin/apply.c:4431 builtin/apply.c:4441
1918 msgid "%d line adds whitespace errors."
1919 msgid_plural "%d lines add whitespace errors."
1923 #: builtin/archive.c:17
1925 msgid "could not create archive file '%s'"
1928 #: builtin/archive.c:20
1929 msgid "could not redirect output"
1932 #: builtin/archive.c:37
1933 msgid "git archive: Remote with no URL"
1936 #: builtin/archive.c:58
1937 msgid "git archive: expected ACK/NAK, got EOF"
1940 #: builtin/archive.c:63
1942 msgid "git archive: NACK %s"
1945 #: builtin/archive.c:65
1947 msgid "remote error: %s"
1950 #: builtin/archive.c:66
1951 msgid "git archive: protocol error"
1954 #: builtin/archive.c:71
1955 msgid "git archive: expected a flush"
1958 #: builtin/bisect--helper.c:7
1959 msgid "git bisect--helper --next-all [--no-checkout]"
1962 #: builtin/bisect--helper.c:17
1963 msgid "perform 'git bisect next'"
1966 #: builtin/bisect--helper.c:19
1967 msgid "update BISECT_HEAD instead of checking out the current commit"
1970 #: builtin/blame.c:25
1971 msgid "git blame [options] [rev-opts] [rev] [--] file"
1974 #: builtin/blame.c:30 builtin/shortlog.c:15
1975 msgid "[rev-opts] are documented in git-rev-list(1)"
1978 #: builtin/blame.c:2373
1979 msgid "Show blame entries as we find them, incrementally"
1982 #: builtin/blame.c:2374
1983 msgid "Show blank SHA-1 for boundary commits (Default: off)"
1986 #: builtin/blame.c:2375
1987 msgid "Do not treat root commits as boundaries (Default: off)"
1990 #: builtin/blame.c:2376
1991 msgid "Show work cost statistics"
1994 #: builtin/blame.c:2377
1995 msgid "Show output score for blame entries"
1998 #: builtin/blame.c:2378
1999 msgid "Show original filename (Default: auto)"
2002 #: builtin/blame.c:2379
2003 msgid "Show original linenumber (Default: off)"
2006 #: builtin/blame.c:2380
2007 msgid "Show in a format designed for machine consumption"
2010 #: builtin/blame.c:2381
2011 msgid "Show porcelain format with per-line commit information"
2014 #: builtin/blame.c:2382
2015 msgid "Use the same output mode as git-annotate (Default: off)"
2018 #: builtin/blame.c:2383
2019 msgid "Show raw timestamp (Default: off)"
2022 #: builtin/blame.c:2384
2023 msgid "Show long commit SHA1 (Default: off)"
2026 #: builtin/blame.c:2385
2027 msgid "Suppress author name and timestamp (Default: off)"
2030 #: builtin/blame.c:2386
2031 msgid "Show author email instead of name (Default: off)"
2034 #: builtin/blame.c:2387
2035 msgid "Ignore whitespace differences"
2038 #: builtin/blame.c:2388
2039 msgid "Spend extra cycles to find better match"
2042 #: builtin/blame.c:2389
2043 msgid "Use revisions from <file> instead of calling git-rev-list"
2046 #: builtin/blame.c:2390
2047 msgid "Use <file>'s contents as the final image"
2050 #: builtin/blame.c:2391 builtin/blame.c:2392
2054 #: builtin/blame.c:2391
2055 msgid "Find line copies within and across files"
2058 #: builtin/blame.c:2392
2059 msgid "Find line movements within and across files"
2062 #: builtin/blame.c:2393
2066 #: builtin/blame.c:2393
2067 msgid "Process only line range n,m, counting from 1"
2070 #: builtin/branch.c:23
2071 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2074 #: builtin/branch.c:24
2075 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2078 #: builtin/branch.c:25
2079 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2082 #: builtin/branch.c:26
2083 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2086 #: builtin/branch.c:145
2089 "deleting branch '%s' that has been merged to\n"
2090 " '%s', but not yet merged to HEAD."
2093 #: builtin/branch.c:149
2096 "not deleting branch '%s' that is not yet merged to\n"
2097 " '%s', even though it is merged to HEAD."
2100 #: builtin/branch.c:181
2101 msgid "cannot use -a with -d"
2104 #: builtin/branch.c:187
2105 msgid "Couldn't look up commit object for HEAD"
2108 #: builtin/branch.c:192
2110 msgid "Cannot delete the branch '%s' which you are currently on."
2113 #: builtin/branch.c:203
2115 msgid "remote branch '%s' not found."
2118 #: builtin/branch.c:204
2120 msgid "branch '%s' not found."
2123 #: builtin/branch.c:211
2125 msgid "Couldn't look up commit object for '%s'"
2128 #: builtin/branch.c:217
2131 "The branch '%s' is not fully merged.\n"
2132 "If you are sure you want to delete it, run 'git branch -D %s'."
2135 #: builtin/branch.c:226
2137 msgid "Error deleting remote branch '%s'"
2140 #: builtin/branch.c:227
2142 msgid "Error deleting branch '%s'"
2145 #: builtin/branch.c:234
2147 msgid "Deleted remote branch %s (was %s).\n"
2150 #: builtin/branch.c:235
2152 msgid "Deleted branch %s (was %s).\n"
2155 #: builtin/branch.c:240
2156 msgid "Update of config-file failed"
2159 #: builtin/branch.c:338
2161 msgid "branch '%s' does not point at a commit"
2164 #: builtin/branch.c:410
2166 msgid "[%s: behind %d]"
2169 #: builtin/branch.c:412
2174 #: builtin/branch.c:416
2176 msgid "[%s: ahead %d]"
2179 #: builtin/branch.c:418
2184 #: builtin/branch.c:421
2186 msgid "[%s: ahead %d, behind %d]"
2189 #: builtin/branch.c:424
2191 msgid "[ahead %d, behind %d]"
2194 #: builtin/branch.c:537
2198 #: builtin/branch.c:602
2199 msgid "some refs could not be read"
2202 #: builtin/branch.c:615
2203 msgid "cannot rename the current branch while not on any."
2206 #: builtin/branch.c:625
2208 msgid "Invalid branch name: '%s'"
2211 #: builtin/branch.c:640
2212 msgid "Branch rename failed"
2215 #: builtin/branch.c:644
2217 msgid "Renamed a misnamed branch '%s' away"
2220 #: builtin/branch.c:648
2222 msgid "Branch renamed to %s, but HEAD is not updated!"
2225 #: builtin/branch.c:655
2226 msgid "Branch is renamed, but update of config-file failed"
2229 #: builtin/branch.c:670
2231 msgid "malformed object name %s"
2234 #: builtin/branch.c:694
2236 msgid "could not write branch description template: %s"
2239 #: builtin/branch.c:724
2240 msgid "Generic options"
2243 #: builtin/branch.c:726
2244 msgid "show hash and subject, give twice for upstream branch"
2247 #: builtin/branch.c:727
2248 msgid "suppress informational messages"
2251 #: builtin/branch.c:728
2252 msgid "set up tracking mode (see git-pull(1))"
2255 #: builtin/branch.c:730
2256 msgid "change upstream info"
2259 #: builtin/branch.c:734
2260 msgid "use colored output"
2263 #: builtin/branch.c:735
2264 msgid "act on remote-tracking branches"
2267 #: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765
2268 #: builtin/branch.c:771 builtin/commit.c:1362 builtin/commit.c:1363
2269 #: builtin/commit.c:1364 builtin/commit.c:1365 builtin/tag.c:470
2273 #: builtin/branch.c:739 builtin/branch.c:745
2274 msgid "print only branches that contain the commit"
2277 #: builtin/branch.c:751
2278 msgid "Specific git-branch actions:"
2281 #: builtin/branch.c:752
2282 msgid "list both remote-tracking and local branches"
2285 #: builtin/branch.c:754
2286 msgid "delete fully merged branch"
2289 #: builtin/branch.c:755
2290 msgid "delete branch (even if not merged)"
2293 #: builtin/branch.c:756
2294 msgid "move/rename a branch and its reflog"
2297 #: builtin/branch.c:757
2298 msgid "move/rename a branch, even if target exists"
2301 #: builtin/branch.c:758
2302 msgid "list branch names"
2305 #: builtin/branch.c:759
2306 msgid "create the branch's reflog"
2309 #: builtin/branch.c:761
2310 msgid "edit the description for the branch"
2313 #: builtin/branch.c:762
2314 msgid "force creation (when already exists)"
2317 #: builtin/branch.c:765
2318 msgid "print only not merged branches"
2321 #: builtin/branch.c:771
2322 msgid "print only merged branches"
2325 #: builtin/branch.c:775
2326 msgid "list branches in columns"
2329 #: builtin/branch.c:788
2330 msgid "Failed to resolve HEAD as a valid ref."
2333 #: builtin/branch.c:793 builtin/clone.c:561
2334 msgid "HEAD not found below refs/heads!"
2337 #: builtin/branch.c:813
2338 msgid "--column and --verbose are incompatible"
2341 #: builtin/branch.c:864
2343 msgid "branch '%s' does not exist"
2346 #: builtin/branch.c:876
2348 msgid "Branch '%s' has no upstream information"
2351 #: builtin/branch.c:891
2352 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2355 #: builtin/branch.c:894
2358 "The --set-upstream flag is deprecated and will be removed. Consider using --"
2359 "track or --set-upstream-to\n"
2362 #: builtin/branch.c:911
2366 "If you wanted to make '%s' track '%s', do this:\n"
2370 #: builtin/branch.c:912
2372 msgid " git branch -d %s\n"
2375 #: builtin/branch.c:913
2377 msgid " git branch --set-upstream-to %s\n"
2380 #: builtin/bundle.c:47
2382 msgid "%s is okay\n"
2385 #: builtin/bundle.c:56
2386 msgid "Need a repository to create a bundle."
2389 #: builtin/bundle.c:60
2390 msgid "Need a repository to unbundle."
2393 #: builtin/cat-file.c:247
2394 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2397 #: builtin/cat-file.c:248
2398 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2401 #: builtin/cat-file.c:266
2402 msgid "<type> can be one of: blob, tree, commit, tag"
2405 #: builtin/cat-file.c:267
2406 msgid "show object type"
2409 #: builtin/cat-file.c:268
2410 msgid "show object size"
2413 #: builtin/cat-file.c:270
2414 msgid "exit with zero when there's no error"
2417 #: builtin/cat-file.c:271
2418 msgid "pretty-print object's content"
2421 #: builtin/cat-file.c:273
2422 msgid "for blob objects, run textconv on object's content"
2425 #: builtin/cat-file.c:275
2426 msgid "show info and content of objects fed from the standard input"
2429 #: builtin/cat-file.c:278
2430 msgid "show info about objects fed from the standard input"
2433 #: builtin/check-attr.c:11
2434 msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2437 #: builtin/check-attr.c:12
2438 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2441 #: builtin/check-attr.c:19
2442 msgid "report all attributes set on file"
2445 #: builtin/check-attr.c:20
2446 msgid "use .gitattributes only from the index"
2449 #: builtin/check-attr.c:21 builtin/hash-object.c:75
2450 msgid "read file names from stdin"
2453 #: builtin/check-attr.c:23
2454 msgid "input paths are terminated by a null character"
2457 #: builtin/checkout-index.c:126
2458 msgid "git checkout-index [options] [--] [<file>...]"
2461 #: builtin/checkout-index.c:187
2462 msgid "check out all files in the index"
2465 #: builtin/checkout-index.c:188
2466 msgid "force overwrite of existing files"
2469 #: builtin/checkout-index.c:190
2470 msgid "no warning for existing files and files not in index"
2473 #: builtin/checkout-index.c:192
2474 msgid "don't checkout new files"
2477 #: builtin/checkout-index.c:194
2478 msgid "update stat information in the index file"
2481 #: builtin/checkout-index.c:200
2482 msgid "read list of paths from the standard input"
2485 #: builtin/checkout-index.c:202
2486 msgid "write the content to temporary files"
2489 #: builtin/checkout-index.c:203 builtin/column.c:30
2493 #: builtin/checkout-index.c:204
2494 msgid "when creating files, prepend <string>"
2497 #: builtin/checkout-index.c:207
2498 msgid "copy out the files from named stage"
2501 #: builtin/checkout.c:25
2502 msgid "git checkout [options] <branch>"
2505 #: builtin/checkout.c:26
2506 msgid "git checkout [options] [<branch>] -- <file>..."
2509 #: builtin/checkout.c:116 builtin/checkout.c:149
2511 msgid "path '%s' does not have our version"
2514 #: builtin/checkout.c:118 builtin/checkout.c:151
2516 msgid "path '%s' does not have their version"
2519 #: builtin/checkout.c:134
2521 msgid "path '%s' does not have all necessary versions"
2524 #: builtin/checkout.c:178
2526 msgid "path '%s' does not have necessary versions"
2529 #: builtin/checkout.c:195
2531 msgid "path '%s': cannot merge"
2534 #: builtin/checkout.c:212
2536 msgid "Unable to add merge result for '%s'"
2539 #: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
2540 #: builtin/checkout.c:245
2542 msgid "'%s' cannot be used with updating paths"
2545 #: builtin/checkout.c:248 builtin/checkout.c:251
2547 msgid "'%s' cannot be used with %s"
2550 #: builtin/checkout.c:254
2552 msgid "Cannot update paths and switch to branch '%s' at the same time."
2555 #: builtin/checkout.c:265 builtin/checkout.c:426
2556 msgid "corrupt index file"
2559 #: builtin/checkout.c:295 builtin/checkout.c:302
2561 msgid "path '%s' is unmerged"
2564 #: builtin/checkout.c:333 builtin/checkout.c:534 builtin/clone.c:586
2565 #: builtin/merge.c:811
2566 msgid "unable to write new index file"
2569 #: builtin/checkout.c:448
2570 msgid "you need to resolve your current index first"
2573 #: builtin/checkout.c:569
2575 msgid "Can not do reflog for '%s'\n"
2578 #: builtin/checkout.c:602
2579 msgid "HEAD is now at"
2582 #: builtin/checkout.c:609
2584 msgid "Reset branch '%s'\n"
2587 #: builtin/checkout.c:612
2589 msgid "Already on '%s'\n"
2592 #: builtin/checkout.c:616
2594 msgid "Switched to and reset branch '%s'\n"
2597 #: builtin/checkout.c:618
2599 msgid "Switched to a new branch '%s'\n"
2602 #: builtin/checkout.c:620
2604 msgid "Switched to branch '%s'\n"
2607 #: builtin/checkout.c:676
2609 msgid " ... and %d more.\n"
2612 #. The singular version
2613 #: builtin/checkout.c:682
2616 "Warning: you are leaving %d commit behind, not connected to\n"
2617 "any of your branches:\n"
2621 "Warning: you are leaving %d commits behind, not connected to\n"
2622 "any of your branches:\n"
2628 #: builtin/checkout.c:700
2631 "If you want to keep them by creating a new branch, this may be a good time\n"
2634 " git branch new_branch_name %s\n"
2638 #: builtin/checkout.c:730
2639 msgid "internal error in revision walk"
2642 #: builtin/checkout.c:734
2643 msgid "Previous HEAD position was"
2646 #: builtin/checkout.c:761 builtin/checkout.c:950
2647 msgid "You are on a branch yet to be born"
2651 #: builtin/checkout.c:886
2653 msgid "invalid reference: %s"
2656 #. case (1): want a tree
2657 #: builtin/checkout.c:925
2659 msgid "reference is not a tree: %s"
2662 #: builtin/checkout.c:961
2663 msgid "paths cannot be used with switching branches"
2666 #: builtin/checkout.c:964 builtin/checkout.c:968
2668 msgid "'%s' cannot be used with switching branches"
2671 #: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980
2672 #: builtin/checkout.c:983
2674 msgid "'%s' cannot be used with '%s'"
2677 #: builtin/checkout.c:988
2679 msgid "Cannot switch branch to a non-commit '%s'"
2682 #: builtin/checkout.c:1009 builtin/gc.c:177
2683 msgid "suppress progress reporting"
2686 #: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89
2687 #: builtin/remote.c:169 builtin/remote.c:171
2691 #: builtin/checkout.c:1011
2692 msgid "create and checkout a new branch"
2695 #: builtin/checkout.c:1013
2696 msgid "create/reset and checkout a branch"
2699 #: builtin/checkout.c:1014
2700 msgid "create reflog for new branch"
2703 #: builtin/checkout.c:1015
2704 msgid "detach the HEAD at named commit"
2707 #: builtin/checkout.c:1016
2708 msgid "set upstream info for new branch"
2711 #: builtin/checkout.c:1018
2715 #: builtin/checkout.c:1018
2716 msgid "new unparented branch"
2719 #: builtin/checkout.c:1019
2720 msgid "checkout our version for unmerged files"
2723 #: builtin/checkout.c:1021
2724 msgid "checkout their version for unmerged files"
2727 #: builtin/checkout.c:1023
2728 msgid "force checkout (throw away local modifications)"
2731 #: builtin/checkout.c:1024
2732 msgid "perform a 3-way merge with the new branch"
2735 #: builtin/checkout.c:1025 builtin/merge.c:215
2736 msgid "update ignored files (default)"
2739 #: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241
2743 #: builtin/checkout.c:1027
2744 msgid "conflict style (merge or diff3)"
2747 #: builtin/checkout.c:1030
2748 msgid "second guess 'git checkout no-such-branch'"
2751 #: builtin/checkout.c:1054
2752 msgid "-b, -B and --orphan are mutually exclusive"
2755 #: builtin/checkout.c:1071
2756 msgid "--track needs a branch name"
2759 #: builtin/checkout.c:1078
2760 msgid "Missing branch name; try -b"
2763 #: builtin/checkout.c:1113
2764 msgid "invalid path specification"
2767 #: builtin/checkout.c:1120
2770 "Cannot update paths and switch to branch '%s' at the same time.\n"
2771 "Did you intend to checkout '%s' which can not be resolved as commit?"
2774 #: builtin/checkout.c:1125
2776 msgid "git checkout: --detach does not take a path argument '%s'"
2779 #: builtin/checkout.c:1129
2781 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
2782 "checking out of the index."
2785 #: builtin/clean.c:19
2786 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
2789 #: builtin/clean.c:51
2790 msgid "do not print names of files removed"
2793 #: builtin/clean.c:53
2797 #: builtin/clean.c:55
2798 msgid "remove whole directories"
2801 #: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:803
2802 #: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199
2806 #: builtin/clean.c:57
2807 msgid "add <pattern> to ignore rules"
2810 #: builtin/clean.c:58
2811 msgid "remove ignored files, too"
2814 #: builtin/clean.c:60
2815 msgid "remove only ignored files"
2818 #: builtin/clean.c:78
2819 msgid "-x and -X cannot be used together"
2822 #: builtin/clean.c:82
2824 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
2827 #: builtin/clean.c:85
2829 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
2833 #: builtin/clean.c:155 builtin/clean.c:176
2835 msgid "Would remove %s\n"
2838 #: builtin/clean.c:159 builtin/clean.c:179
2840 msgid "Removing %s\n"
2843 #: builtin/clean.c:162 builtin/clean.c:182
2845 msgid "failed to remove %s"
2848 #: builtin/clean.c:166
2850 msgid "Would not remove %s\n"
2853 #: builtin/clean.c:168
2855 msgid "Not removing %s\n"
2858 #: builtin/clone.c:36
2859 msgid "git clone [options] [--] <repo> [<dir>]"
2862 #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
2863 #: builtin/push.c:399
2864 msgid "force progress reporting"
2867 #: builtin/clone.c:66
2868 msgid "don't create a checkout"
2871 #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
2872 msgid "create a bare repository"
2875 #: builtin/clone.c:72
2876 msgid "create a mirror repository (implies bare)"
2879 #: builtin/clone.c:74
2880 msgid "to clone from a local repository"
2883 #: builtin/clone.c:76
2884 msgid "don't use local hardlinks, always copy"
2887 #: builtin/clone.c:78
2888 msgid "setup as shared repository"
2891 #: builtin/clone.c:80 builtin/clone.c:82
2892 msgid "initialize submodules in the clone"
2895 #: builtin/clone.c:83 builtin/init-db.c:485
2896 msgid "template-directory"
2899 #: builtin/clone.c:84 builtin/init-db.c:486
2900 msgid "directory from which templates will be used"
2903 #: builtin/clone.c:86
2904 msgid "reference repository"
2907 #: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
2911 #: builtin/clone.c:88
2912 msgid "use <name> instead of 'origin' to track upstream"
2915 #: builtin/clone.c:90
2916 msgid "checkout <branch> instead of the remote's HEAD"
2919 #: builtin/clone.c:92
2920 msgid "path to git-upload-pack on the remote"
2923 #: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:748
2927 #: builtin/clone.c:94
2928 msgid "create a shallow clone of that depth"
2931 #: builtin/clone.c:96
2932 msgid "clone only one branch, HEAD or --branch"
2935 #: builtin/clone.c:97 builtin/init-db.c:494
2939 #: builtin/clone.c:98 builtin/init-db.c:495
2940 msgid "separate git dir from working tree"
2943 #: builtin/clone.c:99
2947 #: builtin/clone.c:100
2948 msgid "set config inside the new repository"
2951 #: builtin/clone.c:243
2953 msgid "reference repository '%s' is not a local directory."
2956 #: builtin/clone.c:306
2958 msgid "failed to create directory '%s'"
2961 #: builtin/clone.c:308 builtin/diff.c:77
2963 msgid "failed to stat '%s'"
2966 #: builtin/clone.c:310
2968 msgid "%s exists and is not a directory"
2971 #: builtin/clone.c:324
2973 msgid "failed to stat %s\n"
2976 #: builtin/clone.c:346
2978 msgid "failed to create link '%s'"
2981 #: builtin/clone.c:350
2983 msgid "failed to copy file to '%s'"
2986 #: builtin/clone.c:373
2991 #: builtin/clone.c:443
2993 msgid "Could not find remote branch %s to clone."
2996 #: builtin/clone.c:552
2997 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3000 #: builtin/clone.c:690
3001 msgid "Too many arguments."
3004 #: builtin/clone.c:694
3005 msgid "You must specify a repository to clone."
3008 #: builtin/clone.c:705
3010 msgid "--bare and --origin %s options are incompatible."
3013 #: builtin/clone.c:719
3015 msgid "repository '%s' does not exist"
3018 #: builtin/clone.c:724
3019 msgid "--depth is ignored in local clones; use file:// instead."
3022 #: builtin/clone.c:734
3024 msgid "destination path '%s' already exists and is not an empty directory."
3027 #: builtin/clone.c:744
3029 msgid "working tree '%s' already exists."
3032 #: builtin/clone.c:757 builtin/clone.c:771
3034 msgid "could not create leading directories of '%s'"
3037 #: builtin/clone.c:760
3039 msgid "could not create work tree dir '%s'."
3042 #: builtin/clone.c:779
3044 msgid "Cloning into bare repository '%s'...\n"
3047 #: builtin/clone.c:781
3049 msgid "Cloning into '%s'...\n"
3052 #: builtin/clone.c:823
3054 msgid "Don't know how to clone %s"
3057 #: builtin/clone.c:872
3059 msgid "Remote branch %s not found in upstream %s"
3062 #: builtin/clone.c:879
3063 msgid "You appear to have cloned an empty repository."
3066 #: builtin/column.c:9
3067 msgid "git column [options]"
3070 #: builtin/column.c:26
3071 msgid "lookup config vars"
3074 #: builtin/column.c:27 builtin/column.c:28
3075 msgid "layout to use"
3078 #: builtin/column.c:29
3079 msgid "Maximum width"
3082 #: builtin/column.c:30
3083 msgid "Padding space on left border"
3086 #: builtin/column.c:31
3087 msgid "Padding space on right border"
3090 #: builtin/column.c:32
3091 msgid "Padding space between columns"
3094 #: builtin/column.c:51
3095 msgid "--command must be the first argument"
3098 #: builtin/commit.c:34
3099 msgid "git commit [options] [--] <filepattern>..."
3102 #: builtin/commit.c:39
3103 msgid "git status [options] [--] <filepattern>..."
3106 #: builtin/commit.c:44
3108 "Your name and email address were configured automatically based\n"
3109 "on your username and hostname. Please check that they are accurate.\n"
3110 "You can suppress this message by setting them explicitly:\n"
3112 " git config --global user.name \"Your Name\"\n"
3113 " git config --global user.email you@example.com\n"
3115 "After doing this, you may fix the identity used for this commit with:\n"
3117 " git commit --amend --reset-author\n"
3120 #: builtin/commit.c:56
3122 "You asked to amend the most recent commit, but doing so would make\n"
3123 "it empty. You can repeat your command with --allow-empty, or you can\n"
3124 "remove the commit entirely with \"git reset HEAD^\".\n"
3127 #: builtin/commit.c:61
3129 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3130 "If you wish to commit it anyway, use:\n"
3132 " git commit --allow-empty\n"
3134 "Otherwise, please use 'git reset'\n"
3137 #: builtin/commit.c:257
3138 msgid "failed to unpack HEAD tree object"
3141 #: builtin/commit.c:299
3142 msgid "unable to create temporary index"
3145 #: builtin/commit.c:305
3146 msgid "interactive add failed"
3149 #: builtin/commit.c:338 builtin/commit.c:359 builtin/commit.c:409
3150 msgid "unable to write new_index file"
3153 #: builtin/commit.c:390
3154 msgid "cannot do a partial commit during a merge."
3157 #: builtin/commit.c:392
3158 msgid "cannot do a partial commit during a cherry-pick."
3161 #: builtin/commit.c:402
3162 msgid "cannot read the index"
3165 #: builtin/commit.c:422
3166 msgid "unable to write temporary index file"
3169 #: builtin/commit.c:509 builtin/commit.c:515
3171 msgid "invalid commit: %s"
3174 #: builtin/commit.c:538
3175 msgid "malformed --author parameter"
3178 #: builtin/commit.c:558
3180 msgid "Malformed ident string: '%s'"
3183 #: builtin/commit.c:596 builtin/commit.c:629 builtin/commit.c:952
3185 msgid "could not lookup commit %s"
3188 #: builtin/commit.c:608 builtin/shortlog.c:296
3190 msgid "(reading log message from standard input)\n"
3193 #: builtin/commit.c:610
3194 msgid "could not read log from standard input"
3197 #: builtin/commit.c:614
3199 msgid "could not read log file '%s'"
3202 #: builtin/commit.c:620
3203 msgid "commit has empty message"
3206 #: builtin/commit.c:636
3207 msgid "could not read MERGE_MSG"
3210 #: builtin/commit.c:640
3211 msgid "could not read SQUASH_MSG"
3214 #: builtin/commit.c:644
3216 msgid "could not read '%s'"
3219 #: builtin/commit.c:705
3220 msgid "could not write commit template"
3223 #: builtin/commit.c:716
3227 "It looks like you may be committing a merge.\n"
3228 "If this is not correct, please remove the file\n"
3233 #: builtin/commit.c:721
3237 "It looks like you may be committing a cherry-pick.\n"
3238 "If this is not correct, please remove the file\n"
3243 #: builtin/commit.c:733
3245 "Please enter the commit message for your changes. Lines starting\n"
3246 "with '#' will be ignored, and an empty message aborts the commit.\n"
3249 #: builtin/commit.c:738
3251 "Please enter the commit message for your changes. Lines starting\n"
3252 "with '#' will be kept; you may remove them yourself if you want to.\n"
3253 "An empty message aborts the commit.\n"
3256 #: builtin/commit.c:751
3258 msgid "%sAuthor: %s"
3261 #: builtin/commit.c:758
3263 msgid "%sCommitter: %s"
3266 #: builtin/commit.c:778
3267 msgid "Cannot read index"
3270 #: builtin/commit.c:815
3271 msgid "Error building trees"
3274 #: builtin/commit.c:830 builtin/tag.c:361
3276 msgid "Please supply the message using either -m or -F option.\n"
3279 #: builtin/commit.c:927
3281 msgid "No existing author found with '%s'"
3284 #: builtin/commit.c:942 builtin/commit.c:1142
3286 msgid "Invalid untracked files mode '%s'"
3289 #: builtin/commit.c:982
3290 msgid "Using both --reset-author and --author does not make sense"
3293 #: builtin/commit.c:993
3294 msgid "You have nothing to amend."
3297 #: builtin/commit.c:996
3298 msgid "You are in the middle of a merge -- cannot amend."
3301 #: builtin/commit.c:998
3302 msgid "You are in the middle of a cherry-pick -- cannot amend."
3305 #: builtin/commit.c:1001
3306 msgid "Options --squash and --fixup cannot be used together"
3309 #: builtin/commit.c:1011
3310 msgid "Only one of -c/-C/-F/--fixup can be used."
3313 #: builtin/commit.c:1013
3314 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3317 #: builtin/commit.c:1021
3318 msgid "--reset-author can be used only with -C, -c or --amend."
3321 #: builtin/commit.c:1038
3322 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3325 #: builtin/commit.c:1040
3326 msgid "No paths with --include/--only does not make sense."
3329 #: builtin/commit.c:1042
3330 msgid "Clever... amending the last one with dirty index."
3333 #: builtin/commit.c:1044
3334 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3337 #: builtin/commit.c:1054 builtin/tag.c:577
3339 msgid "Invalid cleanup mode %s"
3342 #: builtin/commit.c:1059
3343 msgid "Paths with -a does not make sense."
3346 #: builtin/commit.c:1156 builtin/commit.c:1384
3347 msgid "show status concisely"
3350 #: builtin/commit.c:1158 builtin/commit.c:1386
3351 msgid "show branch information"
3354 #: builtin/commit.c:1160 builtin/commit.c:1388 builtin/push.c:389
3355 msgid "machine-readable output"
3358 #: builtin/commit.c:1163 builtin/commit.c:1390
3359 msgid "terminate entries with NUL"
3362 #: builtin/commit.c:1165 builtin/commit.c:1393 builtin/fast-export.c:636
3363 #: builtin/fast-export.c:639 builtin/tag.c:461
3367 #: builtin/commit.c:1166 builtin/commit.c:1393
3368 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3371 #: builtin/commit.c:1169
3372 msgid "show ignored files"
3375 #: builtin/commit.c:1170 parse-options.h:151
3379 #: builtin/commit.c:1171
3381 "ignore changes to submodules, optional when: all, dirty, untracked. "
3385 #: builtin/commit.c:1173
3386 msgid "list untracked files in columns"
3389 #: builtin/commit.c:1242
3390 msgid "couldn't look up newly created commit"
3393 #: builtin/commit.c:1244
3394 msgid "could not parse newly created commit"
3397 #: builtin/commit.c:1285
3398 msgid "detached HEAD"
3401 #: builtin/commit.c:1287
3402 msgid " (root-commit)"
3405 #: builtin/commit.c:1354
3406 msgid "suppress summary after successful commit"
3409 #: builtin/commit.c:1355
3410 msgid "show diff in commit message template"
3413 #: builtin/commit.c:1357
3414 msgid "Commit message options"
3417 #: builtin/commit.c:1358 builtin/tag.c:459
3418 msgid "read message from file"
3421 #: builtin/commit.c:1359
3425 #: builtin/commit.c:1359
3426 msgid "override author for commit"
3429 #: builtin/commit.c:1360 builtin/gc.c:178
3433 #: builtin/commit.c:1360
3434 msgid "override date for commit"
3437 #: builtin/commit.c:1361 builtin/merge.c:206 builtin/notes.c:537
3438 #: builtin/notes.c:694 builtin/tag.c:457
3442 #: builtin/commit.c:1361
3443 msgid "commit message"
3446 #: builtin/commit.c:1362
3447 msgid "reuse and edit message from specified commit"
3450 #: builtin/commit.c:1363
3451 msgid "reuse message from specified commit"
3454 #: builtin/commit.c:1364
3455 msgid "use autosquash formatted message to fixup specified commit"
3458 #: builtin/commit.c:1365
3459 msgid "use autosquash formatted message to squash specified commit"
3462 #: builtin/commit.c:1366
3463 msgid "the commit is authored by me now (used with -C/-c/--amend)"
3466 #: builtin/commit.c:1367 builtin/log.c:1068 builtin/revert.c:109
3467 msgid "add Signed-off-by:"
3470 #: builtin/commit.c:1368
3471 msgid "use specified template file"
3474 #: builtin/commit.c:1369
3475 msgid "force edit of commit"
3478 #: builtin/commit.c:1370
3482 #: builtin/commit.c:1370 builtin/tag.c:462
3483 msgid "how to strip spaces and #comments from message"
3486 #: builtin/commit.c:1371
3487 msgid "include status in commit message template"
3490 #: builtin/commit.c:1372 builtin/merge.c:213 builtin/tag.c:463
3494 #: builtin/commit.c:1373 builtin/merge.c:214
3495 msgid "GPG sign commit"
3498 #. end commit message options
3499 #: builtin/commit.c:1376
3500 msgid "Commit contents options"
3503 #: builtin/commit.c:1377
3504 msgid "commit all changed files"
3507 #: builtin/commit.c:1378
3508 msgid "add specified files to index for commit"
3511 #: builtin/commit.c:1379
3512 msgid "interactively add files"
3515 #: builtin/commit.c:1380
3516 msgid "interactively add changes"
3519 #: builtin/commit.c:1381
3520 msgid "commit only specified files"
3523 #: builtin/commit.c:1382
3524 msgid "bypass pre-commit hook"
3527 #: builtin/commit.c:1383
3528 msgid "show what would be committed"
3531 #: builtin/commit.c:1391
3532 msgid "amend previous commit"
3535 #: builtin/commit.c:1392
3536 msgid "bypass post-rewrite hook"
3539 #: builtin/commit.c:1397
3540 msgid "ok to record an empty change"
3543 #: builtin/commit.c:1400
3544 msgid "ok to record a change with an empty message"
3547 #: builtin/commit.c:1432
3548 msgid "could not parse HEAD commit"
3551 #: builtin/commit.c:1470 builtin/merge.c:508
3553 msgid "could not open '%s' for reading"
3556 #: builtin/commit.c:1477
3558 msgid "Corrupt MERGE_HEAD file (%s)"
3561 #: builtin/commit.c:1484
3562 msgid "could not read MERGE_MODE"
3565 #: builtin/commit.c:1503
3567 msgid "could not read commit message: %s"
3570 #: builtin/commit.c:1517
3572 msgid "Aborting commit; you did not edit the message.\n"
3575 #: builtin/commit.c:1522
3577 msgid "Aborting commit due to empty commit message.\n"
3580 #: builtin/commit.c:1537 builtin/merge.c:935 builtin/merge.c:960
3581 msgid "failed to write commit object"
3584 #: builtin/commit.c:1558
3585 msgid "cannot lock HEAD ref"
3588 #: builtin/commit.c:1562
3589 msgid "cannot update HEAD ref"
3592 #: builtin/commit.c:1573
3594 "Repository has been updated, but unable to write\n"
3595 "new_index file. Check that disk is not full or quota is\n"
3596 "not exceeded, and then \"git reset HEAD\" to recover."
3599 #: builtin/config.c:7
3600 msgid "git config [options]"
3603 #: builtin/config.c:52
3604 msgid "Config file location"
3607 #: builtin/config.c:53
3608 msgid "use global config file"
3611 #: builtin/config.c:54
3612 msgid "use system config file"
3615 #: builtin/config.c:55
3616 msgid "use repository config file"
3619 #: builtin/config.c:56
3620 msgid "use given config file"
3623 #: builtin/config.c:57
3627 #: builtin/config.c:58
3628 msgid "get value: name [value-regex]"
3631 #: builtin/config.c:59
3632 msgid "get all values: key [value-regex]"
3635 #: builtin/config.c:60
3636 msgid "get values for regexp: name-regex [value-regex]"
3639 #: builtin/config.c:61
3640 msgid "replace all matching variables: name value [value_regex]"
3643 #: builtin/config.c:62
3644 msgid "add a new variable: name value"
3647 #: builtin/config.c:63
3648 msgid "remove a variable: name [value-regex]"
3651 #: builtin/config.c:64
3652 msgid "remove all matches: name [value-regex]"
3655 #: builtin/config.c:65
3656 msgid "rename section: old-name new-name"
3659 #: builtin/config.c:66
3660 msgid "remove a section: name"
3663 #: builtin/config.c:67
3667 #: builtin/config.c:68
3668 msgid "open an editor"
3671 #: builtin/config.c:69 builtin/config.c:70
3675 #: builtin/config.c:69
3676 msgid "find the color configured: [default]"
3679 #: builtin/config.c:70
3680 msgid "find the color setting: [stdout-is-tty]"
3683 #: builtin/config.c:71
3687 #: builtin/config.c:72
3688 msgid "value is \"true\" or \"false\""
3691 #: builtin/config.c:73
3692 msgid "value is decimal number"
3695 #: builtin/config.c:74
3696 msgid "value is --bool or --int"
3699 #: builtin/config.c:75
3700 msgid "value is a path (file or directory name)"
3703 #: builtin/config.c:76
3707 #: builtin/config.c:77
3708 msgid "terminate values with NUL byte"
3711 #: builtin/config.c:78
3712 msgid "respect include directives on lookup"
3715 #: builtin/count-objects.c:69
3716 msgid "git count-objects [-v]"
3719 #: builtin/describe.c:15
3720 msgid "git describe [options] <committish>*"
3723 #: builtin/describe.c:16
3724 msgid "git describe [options] --dirty"
3727 #: builtin/describe.c:234
3729 msgid "annotated tag %s not available"
3732 #: builtin/describe.c:238
3734 msgid "annotated tag %s has no embedded name"
3737 #: builtin/describe.c:240
3739 msgid "tag '%s' is really '%s' here"
3742 #: builtin/describe.c:267
3744 msgid "Not a valid object name %s"
3747 #: builtin/describe.c:270
3749 msgid "%s is not a valid '%s' object"
3752 #: builtin/describe.c:287
3754 msgid "no tag exactly matches '%s'"
3757 #: builtin/describe.c:289
3759 msgid "searching to describe %s\n"
3762 #: builtin/describe.c:329
3764 msgid "finished search at %s\n"
3767 #: builtin/describe.c:353
3770 "No annotated tags can describe '%s'.\n"
3771 "However, there were unannotated tags: try --tags."
3774 #: builtin/describe.c:357
3777 "No tags can describe '%s'.\n"
3778 "Try --always, or create some tags."
3781 #: builtin/describe.c:378
3783 msgid "traversed %lu commits\n"
3786 #: builtin/describe.c:381
3789 "more than %i tags found; listed %i most recent\n"
3790 "gave up search at %s\n"
3793 #: builtin/describe.c:403
3794 msgid "find the tag that comes after the commit"
3797 #: builtin/describe.c:404
3798 msgid "debug search strategy on stderr"
3801 #: builtin/describe.c:405
3802 msgid "use any ref in .git/refs"
3805 #: builtin/describe.c:406
3806 msgid "use any tag in .git/refs/tags"
3809 #: builtin/describe.c:407
3810 msgid "always use long format"
3813 #: builtin/describe.c:410
3814 msgid "only output exact matches"
3817 #: builtin/describe.c:412
3818 msgid "consider <n> most recent tags (default: 10)"
3821 #: builtin/describe.c:414
3822 msgid "only consider tags matching <pattern>"
3825 #: builtin/describe.c:416 builtin/name-rev.c:238
3826 msgid "show abbreviated commit object as fallback"
3829 #: builtin/describe.c:417
3833 #: builtin/describe.c:418
3834 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
3837 #: builtin/describe.c:436
3838 msgid "--long is incompatible with --abbrev=0"
3841 #: builtin/describe.c:462
3842 msgid "No names found, cannot describe anything."
3845 #: builtin/describe.c:482
3846 msgid "--dirty is incompatible with committishes"
3849 #: builtin/diff.c:79
3851 msgid "'%s': not a regular file or symlink"
3854 #: builtin/diff.c:224
3856 msgid "invalid option: %s"
3859 #: builtin/diff.c:301
3860 msgid "Not a git repository"
3863 #: builtin/diff.c:344
3865 msgid "invalid object '%s' given."
3868 #: builtin/diff.c:349
3870 msgid "more than %d trees given: '%s'"
3873 #: builtin/diff.c:359
3875 msgid "more than two blobs given: '%s'"
3878 #: builtin/diff.c:367
3880 msgid "unhandled object '%s' given."
3883 #: builtin/fast-export.c:22
3884 msgid "git fast-export [rev-list-opts]"
3887 #: builtin/fast-export.c:635
3888 msgid "show progress after <n> objects"
3891 #: builtin/fast-export.c:637
3892 msgid "select handling of signed tags"
3895 #: builtin/fast-export.c:640
3896 msgid "select handling of tags that tag filtered objects"
3899 #: builtin/fast-export.c:643
3900 msgid "Dump marks to this file"
3903 #: builtin/fast-export.c:645
3904 msgid "Import marks from this file"
3907 #: builtin/fast-export.c:647
3908 msgid "Fake a tagger when tags lack one"
3911 #: builtin/fast-export.c:649
3912 msgid "Output full tree for each commit"
3915 #: builtin/fast-export.c:651
3916 msgid "Use the done feature to terminate the stream"
3919 #: builtin/fast-export.c:652
3920 msgid "Skip output of blob data"
3923 #: builtin/fetch.c:20
3924 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
3927 #: builtin/fetch.c:21
3928 msgid "git fetch [<options>] <group>"
3931 #: builtin/fetch.c:22
3932 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
3935 #: builtin/fetch.c:23
3936 msgid "git fetch --all [<options>]"
3939 #: builtin/fetch.c:60
3940 msgid "fetch from all remotes"
3943 #: builtin/fetch.c:62
3944 msgid "append to .git/FETCH_HEAD instead of overwriting"
3947 #: builtin/fetch.c:64
3948 msgid "path to upload pack on remote end"
3951 #: builtin/fetch.c:65
3952 msgid "force overwrite of local branch"
3955 #: builtin/fetch.c:67
3956 msgid "fetch from multiple remotes"
3959 #: builtin/fetch.c:69
3960 msgid "fetch all tags and associated objects"
3963 #: builtin/fetch.c:71
3964 msgid "do not fetch all tags (--no-tags)"
3967 #: builtin/fetch.c:73
3968 msgid "prune remote-tracking branches no longer on remote"
3971 #: builtin/fetch.c:74
3975 #: builtin/fetch.c:75
3976 msgid "control recursive fetching of submodules"
3979 #: builtin/fetch.c:79
3980 msgid "keep downloaded pack"
3983 #: builtin/fetch.c:81
3984 msgid "allow updating of HEAD ref"
3987 #: builtin/fetch.c:84
3988 msgid "deepen history of shallow clone"
3991 #: builtin/fetch.c:85 builtin/log.c:1083
3995 #: builtin/fetch.c:86
3996 msgid "prepend this to submodule path output"
3999 #: builtin/fetch.c:89
4000 msgid "default mode for recursion"
4003 #: builtin/fetch.c:201
4004 msgid "Couldn't find remote ref HEAD"
4007 #: builtin/fetch.c:254
4009 msgid "object %s not found"
4012 #: builtin/fetch.c:259
4013 msgid "[up to date]"
4016 #: builtin/fetch.c:273
4018 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4021 #: builtin/fetch.c:274 builtin/fetch.c:360
4025 #: builtin/fetch.c:285
4026 msgid "[tag update]"
4029 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
4030 msgid " (unable to update local ref)"
4033 #: builtin/fetch.c:305
4037 #: builtin/fetch.c:308
4038 msgid "[new branch]"
4041 #: builtin/fetch.c:311
4045 #: builtin/fetch.c:356
4046 msgid "unable to update local ref"
4049 #: builtin/fetch.c:356
4050 msgid "forced update"
4053 #: builtin/fetch.c:362
4054 msgid "(non-fast-forward)"
4057 #: builtin/fetch.c:393 builtin/fetch.c:685
4059 msgid "cannot open %s: %s\n"
4062 #: builtin/fetch.c:402
4064 msgid "%s did not send all necessary objects\n"
4067 #: builtin/fetch.c:488
4072 #: builtin/fetch.c:499
4075 "some local refs could not be updated; try running\n"
4076 " 'git remote prune %s' to remove any old, conflicting branches"
4079 #: builtin/fetch.c:549
4081 msgid " (%s will become dangling)"
4084 #: builtin/fetch.c:550
4086 msgid " (%s has become dangling)"
4089 #: builtin/fetch.c:557
4093 #: builtin/fetch.c:558 builtin/remote.c:1055
4097 #: builtin/fetch.c:675
4099 msgid "Refusing to fetch into current branch %s of non-bare repository"
4102 #: builtin/fetch.c:709
4104 msgid "Don't know how to fetch from %s"
4107 #: builtin/fetch.c:786
4109 msgid "Option \"%s\" value \"%s\" is not valid for %s"
4112 #: builtin/fetch.c:789
4114 msgid "Option \"%s\" is ignored for %s\n"
4117 #: builtin/fetch.c:891
4119 msgid "Fetching %s\n"
4122 #: builtin/fetch.c:893 builtin/remote.c:100
4124 msgid "Could not fetch %s"
4127 #: builtin/fetch.c:912
4129 "No remote repository specified. Please, specify either a URL or a\n"
4130 "remote name from which new revisions should be fetched."
4133 #: builtin/fetch.c:932
4134 msgid "You need to specify a tag name."
4137 #: builtin/fetch.c:984
4138 msgid "fetch --all does not take a repository argument"
4141 #: builtin/fetch.c:986
4142 msgid "fetch --all does not make sense with refspecs"
4145 #: builtin/fetch.c:997
4147 msgid "No such remote or remote group: %s"
4150 #: builtin/fetch.c:1005
4151 msgid "Fetching a group and specifying refspecs does not make sense"
4154 #: builtin/fmt-merge-msg.c:13
4155 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4158 #: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:787
4159 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192
4160 #: builtin/tag.c:448 parse-options.h:133 parse-options.h:235
4164 #: builtin/fmt-merge-msg.c:654
4165 msgid "populate log with at most <n> entries from shortlog"
4168 #: builtin/fmt-merge-msg.c:657
4169 msgid "alias for --log (deprecated)"
4172 #: builtin/fmt-merge-msg.c:660
4176 #: builtin/fmt-merge-msg.c:661
4177 msgid "use <text> as start of message"
4180 #: builtin/fmt-merge-msg.c:662
4181 msgid "file to read from"
4184 #: builtin/for-each-ref.c:979
4185 msgid "git for-each-ref [options] [<pattern>]"
4188 #: builtin/for-each-ref.c:994
4189 msgid "quote placeholders suitably for shells"
4192 #: builtin/for-each-ref.c:996
4193 msgid "quote placeholders suitably for perl"
4196 #: builtin/for-each-ref.c:998
4197 msgid "quote placeholders suitably for python"
4200 #: builtin/for-each-ref.c:1000
4201 msgid "quote placeholders suitably for tcl"
4204 #: builtin/for-each-ref.c:1003
4205 msgid "show only <n> matched refs"
4208 #: builtin/for-each-ref.c:1004
4212 #: builtin/for-each-ref.c:1004
4213 msgid "format to use for the output"
4216 #: builtin/for-each-ref.c:1005
4220 #: builtin/for-each-ref.c:1006
4221 msgid "field name to sort on"
4224 #: builtin/fsck.c:608
4225 msgid "git fsck [options] [<object>...]"
4228 #: builtin/fsck.c:614
4229 msgid "show unreachable objects"
4232 #: builtin/fsck.c:615
4233 msgid "show dangling objects"
4236 #: builtin/fsck.c:616
4240 #: builtin/fsck.c:617
4241 msgid "report root nodes"
4244 #: builtin/fsck.c:618
4245 msgid "make index objects head nodes"
4248 #: builtin/fsck.c:619
4249 msgid "make reflogs head nodes (default)"
4252 #: builtin/fsck.c:620
4253 msgid "also consider packs and alternate objects"
4256 #: builtin/fsck.c:621
4257 msgid "enable more strict checking"
4260 #: builtin/fsck.c:623
4261 msgid "write dangling objects in .git/lost-found"
4264 #: builtin/fsck.c:624 builtin/prune.c:134
4265 msgid "show progress"
4269 msgid "git gc [options]"
4274 msgid "Invalid %s: '%s'"
4279 msgid "insanely long object directory %.*s"
4283 msgid "prune unreferenced objects"
4287 msgid "be more thorough (increased runtime)"
4291 msgid "enable auto-gc mode"
4297 "Auto packing the repository for optimum performance. You may also\n"
4298 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
4303 "There are too many unreachable loose objects; run 'git prune' to remove them."
4306 #: builtin/grep.c:22
4307 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4310 #: builtin/grep.c:217
4312 msgid "grep: failed to create thread: %s"
4315 #: builtin/grep.c:455
4317 msgid "Failed to chdir: %s"
4320 #: builtin/grep.c:531 builtin/grep.c:565
4322 msgid "unable to read tree (%s)"
4325 #: builtin/grep.c:579
4327 msgid "unable to grep from object of type %s"
4330 #: builtin/grep.c:637
4332 msgid "switch `%c' expects a numerical value"
4335 #: builtin/grep.c:654
4337 msgid "cannot open '%s'"
4340 #: builtin/grep.c:729
4341 msgid "search in index instead of in the work tree"
4344 #: builtin/grep.c:731
4345 msgid "find in contents not managed by git"
4348 #: builtin/grep.c:733
4349 msgid "search in both tracked and untracked files"
4352 #: builtin/grep.c:735
4353 msgid "search also in ignored files"
4356 #: builtin/grep.c:738
4357 msgid "show non-matching lines"
4360 #: builtin/grep.c:740
4361 msgid "case insensitive matching"
4364 #: builtin/grep.c:742
4365 msgid "match patterns only at word boundaries"
4368 #: builtin/grep.c:744
4369 msgid "process binary files as text"
4372 #: builtin/grep.c:746
4373 msgid "don't match patterns in binary files"
4376 #: builtin/grep.c:749
4377 msgid "descend at most <depth> levels"
4380 #: builtin/grep.c:753
4381 msgid "use extended POSIX regular expressions"
4384 #: builtin/grep.c:756
4385 msgid "use basic POSIX regular expressions (default)"
4388 #: builtin/grep.c:759
4389 msgid "interpret patterns as fixed strings"
4392 #: builtin/grep.c:762
4393 msgid "use Perl-compatible regular expressions"
4396 #: builtin/grep.c:765
4397 msgid "show line numbers"
4400 #: builtin/grep.c:766
4401 msgid "don't show filenames"
4404 #: builtin/grep.c:767
4405 msgid "show filenames"
4408 #: builtin/grep.c:769
4409 msgid "show filenames relative to top directory"
4412 #: builtin/grep.c:771
4413 msgid "show only filenames instead of matching lines"
4416 #: builtin/grep.c:773
4417 msgid "synonym for --files-with-matches"
4420 #: builtin/grep.c:776
4421 msgid "show only the names of files without match"
4424 #: builtin/grep.c:778
4425 msgid "print NUL after filenames"
4428 #: builtin/grep.c:780
4429 msgid "show the number of matches instead of matching lines"
4432 #: builtin/grep.c:781
4433 msgid "highlight matches"
4436 #: builtin/grep.c:783
4437 msgid "print empty line between matches from different files"
4440 #: builtin/grep.c:785
4441 msgid "show filename only once above matches from same file"
4444 #: builtin/grep.c:788
4445 msgid "show <n> context lines before and after matches"
4448 #: builtin/grep.c:791
4449 msgid "show <n> context lines before matches"
4452 #: builtin/grep.c:793
4453 msgid "show <n> context lines after matches"
4456 #: builtin/grep.c:794
4457 msgid "shortcut for -C NUM"
4460 #: builtin/grep.c:797
4461 msgid "show a line with the function name before matches"
4464 #: builtin/grep.c:799
4465 msgid "show the surrounding function"
4468 #: builtin/grep.c:802
4469 msgid "read patterns from file"
4472 #: builtin/grep.c:804
4473 msgid "match <pattern>"
4476 #: builtin/grep.c:806
4477 msgid "combine patterns specified with -e"
4480 #: builtin/grep.c:818
4481 msgid "indicate hit with exit status without output"
4484 #: builtin/grep.c:820
4485 msgid "show only matches from files that match all patterns"
4488 #: builtin/grep.c:822
4489 msgid "show parse tree for grep expression"
4492 #: builtin/grep.c:826
4496 #: builtin/grep.c:826
4497 msgid "show matching files in the pager"
4500 #: builtin/grep.c:829
4501 msgid "allow calling of grep(1) (ignored by this build)"
4504 #: builtin/grep.c:830 builtin/show-ref.c:201
4508 #: builtin/grep.c:921
4509 msgid "no pattern given."
4512 #: builtin/grep.c:935
4514 msgid "bad object %s"
4517 #: builtin/grep.c:976
4518 msgid "--open-files-in-pager only works on the worktree"
4521 #: builtin/grep.c:999
4522 msgid "--cached or --untracked cannot be used with --no-index."
4525 #: builtin/grep.c:1004
4526 msgid "--no-index or --untracked cannot be used with revs."
4529 #: builtin/grep.c:1007
4530 msgid "--[no-]exclude-standard cannot be used for tracked contents."
4533 #: builtin/grep.c:1015
4534 msgid "both --cached and trees are given."
4537 #: builtin/hash-object.c:60
4539 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
4543 #: builtin/hash-object.c:61
4544 msgid "git hash-object --stdin-paths < <list-of-paths>"
4547 #: builtin/hash-object.c:72
4551 #: builtin/hash-object.c:72
4555 #: builtin/hash-object.c:73
4556 msgid "write the object into the object database"
4559 #: builtin/hash-object.c:74
4560 msgid "read the object from stdin"
4563 #: builtin/hash-object.c:76
4564 msgid "store file as is without filters"
4567 #: builtin/hash-object.c:77
4568 msgid "process file as it were from this path"
4571 #: builtin/help.c:43
4572 msgid "print all available commands"
4575 #: builtin/help.c:44
4576 msgid "show man page"
4579 #: builtin/help.c:45
4580 msgid "show manual in web browser"
4583 #: builtin/help.c:47
4584 msgid "show info page"
4587 #: builtin/help.c:53
4588 msgid "git help [--all] [--man|--web|--info] [command]"
4591 #: builtin/help.c:65
4593 msgid "unrecognized help format '%s'"
4596 #: builtin/help.c:93
4597 msgid "Failed to start emacsclient."
4600 #: builtin/help.c:106
4601 msgid "Failed to parse emacsclient version."
4604 #: builtin/help.c:114
4606 msgid "emacsclient version '%d' too old (< 22)."
4609 #: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
4611 msgid "failed to exec '%s': %s"
4614 #: builtin/help.c:217
4617 "'%s': path for unsupported man viewer.\n"
4618 "Please consider using 'man.<tool>.cmd' instead."
4621 #: builtin/help.c:229
4624 "'%s': cmd for supported man viewer.\n"
4625 "Please consider using 'man.<tool>.path' instead."
4628 #: builtin/help.c:299
4629 msgid "The most commonly used git commands are:"
4632 #: builtin/help.c:367
4634 msgid "'%s': unknown man viewer."
4637 #: builtin/help.c:384
4638 msgid "no man viewer handled the request"
4641 #: builtin/help.c:392
4642 msgid "no info viewer handled the request"
4645 #: builtin/help.c:447 builtin/help.c:454
4650 #: builtin/help.c:470
4652 msgid "`git %s' is aliased to `%s'"
4655 #: builtin/index-pack.c:170
4657 msgid "object type mismatch at %s"
4660 #: builtin/index-pack.c:190
4661 msgid "object of unexpected type"
4664 #: builtin/index-pack.c:227
4666 msgid "cannot fill %d byte"
4667 msgid_plural "cannot fill %d bytes"
4671 #: builtin/index-pack.c:237
4675 #: builtin/index-pack.c:238
4676 msgid "read error on input"
4679 #: builtin/index-pack.c:250
4680 msgid "used more bytes than were available"
4683 #: builtin/index-pack.c:257
4684 msgid "pack too large for current definition of off_t"
4687 #: builtin/index-pack.c:273
4689 msgid "unable to create '%s'"
4692 #: builtin/index-pack.c:278
4694 msgid "cannot open packfile '%s'"
4697 #: builtin/index-pack.c:292
4698 msgid "pack signature mismatch"
4701 #: builtin/index-pack.c:294
4703 msgid "pack version %<PRIu32> unsupported"
4706 #: builtin/index-pack.c:312
4708 msgid "pack has bad object at offset %lu: %s"
4711 #: builtin/index-pack.c:434
4713 msgid "inflate returned %d"
4716 #: builtin/index-pack.c:483
4717 msgid "offset value overflow for delta base object"
4720 #: builtin/index-pack.c:491
4721 msgid "delta base offset is out of bound"
4724 #: builtin/index-pack.c:499
4726 msgid "unknown object type %d"
4729 #: builtin/index-pack.c:530
4730 msgid "cannot pread pack file"
4733 #: builtin/index-pack.c:532
4735 msgid "premature end of pack file, %lu byte missing"
4736 msgid_plural "premature end of pack file, %lu bytes missing"
4740 #: builtin/index-pack.c:558
4741 msgid "serious inflate inconsistency"
4744 #: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
4745 #: builtin/index-pack.c:712 builtin/index-pack.c:721
4747 msgid "SHA1 COLLISION FOUND WITH %s !"
4750 #: builtin/index-pack.c:652 builtin/pack-objects.c:170
4751 #: builtin/pack-objects.c:262
4753 msgid "unable to read %s"
4756 #: builtin/index-pack.c:718
4758 msgid "cannot read existing object %s"
4761 #: builtin/index-pack.c:732
4763 msgid "invalid blob object %s"
4766 #: builtin/index-pack.c:747
4771 #: builtin/index-pack.c:749
4772 msgid "Error in object"
4775 #: builtin/index-pack.c:751
4777 msgid "Not all child objects of %s are reachable"
4780 #: builtin/index-pack.c:821 builtin/index-pack.c:847
4781 msgid "failed to apply delta"
4784 #: builtin/index-pack.c:986
4785 msgid "Receiving objects"
4788 #: builtin/index-pack.c:986
4789 msgid "Indexing objects"
4792 #: builtin/index-pack.c:1012
4793 msgid "pack is corrupted (SHA1 mismatch)"
4796 #: builtin/index-pack.c:1017
4797 msgid "cannot fstat packfile"
4800 #: builtin/index-pack.c:1020
4801 msgid "pack has junk at the end"
4804 #: builtin/index-pack.c:1031
4805 msgid "confusion beyond insanity in parse_pack_objects()"
4808 #: builtin/index-pack.c:1054
4809 msgid "Resolving deltas"
4812 #: builtin/index-pack.c:1064
4814 msgid "unable to create thread: %s"
4817 #: builtin/index-pack.c:1106
4818 msgid "confusion beyond insanity"
4821 #: builtin/index-pack.c:1112
4823 msgid "completed with %d local objects"
4826 #: builtin/index-pack.c:1121
4828 msgid "Unexpected tail checksum for %s (disk corruption?)"
4831 #: builtin/index-pack.c:1125
4833 msgid "pack has %d unresolved delta"
4834 msgid_plural "pack has %d unresolved deltas"
4838 #: builtin/index-pack.c:1150
4840 msgid "unable to deflate appended object (%d)"
4843 #: builtin/index-pack.c:1229
4845 msgid "local object %s is corrupt"
4848 #: builtin/index-pack.c:1253
4849 msgid "error while closing pack file"
4852 #: builtin/index-pack.c:1266
4854 msgid "cannot write keep file '%s'"
4857 #: builtin/index-pack.c:1274
4859 msgid "cannot close written keep file '%s'"
4862 #: builtin/index-pack.c:1287
4863 msgid "cannot store pack file"
4866 #: builtin/index-pack.c:1298
4867 msgid "cannot store index file"
4870 #: builtin/index-pack.c:1331
4872 msgid "bad pack.indexversion=%<PRIu32>"
4875 #: builtin/index-pack.c:1337
4877 msgid "invalid number of threads specified (%d)"
4880 #: builtin/index-pack.c:1341 builtin/index-pack.c:1514
4882 msgid "no threads support, ignoring %s"
4885 #: builtin/index-pack.c:1399
4887 msgid "Cannot open existing pack file '%s'"
4890 #: builtin/index-pack.c:1401
4892 msgid "Cannot open existing pack idx file for '%s'"
4895 #: builtin/index-pack.c:1448
4897 msgid "non delta: %d object"
4898 msgid_plural "non delta: %d objects"
4902 #: builtin/index-pack.c:1455
4904 msgid "chain length = %d: %lu object"
4905 msgid_plural "chain length = %d: %lu objects"
4909 #: builtin/index-pack.c:1482
4910 msgid "Cannot come back to cwd"
4913 #: builtin/index-pack.c:1526 builtin/index-pack.c:1529
4914 #: builtin/index-pack.c:1541 builtin/index-pack.c:1545
4919 #: builtin/index-pack.c:1559
4920 msgid "--fix-thin cannot be used without --stdin"
4923 #: builtin/index-pack.c:1563 builtin/index-pack.c:1573
4925 msgid "packfile name '%s' does not end with '.pack'"
4928 #: builtin/index-pack.c:1582
4929 msgid "--verify with no packfile name given"
4932 #: builtin/init-db.c:35
4934 msgid "Could not make %s writable by group"
4937 #: builtin/init-db.c:62
4939 msgid "insanely long template name %s"
4942 #: builtin/init-db.c:67
4944 msgid "cannot stat '%s'"
4947 #: builtin/init-db.c:73
4949 msgid "cannot stat template '%s'"
4952 #: builtin/init-db.c:80
4954 msgid "cannot opendir '%s'"
4957 #: builtin/init-db.c:97
4959 msgid "cannot readlink '%s'"
4962 #: builtin/init-db.c:99
4964 msgid "insanely long symlink %s"
4967 #: builtin/init-db.c:102
4969 msgid "cannot symlink '%s' '%s'"
4972 #: builtin/init-db.c:106
4974 msgid "cannot copy '%s' to '%s'"
4977 #: builtin/init-db.c:110
4979 msgid "ignoring template %s"
4982 #: builtin/init-db.c:133
4984 msgid "insanely long template path %s"
4987 #: builtin/init-db.c:141
4989 msgid "templates not found %s"
4992 #: builtin/init-db.c:154
4994 msgid "not copying templates of a wrong format version %d from '%s'"
4997 #: builtin/init-db.c:192
4999 msgid "insane git directory %s"
5002 #: builtin/init-db.c:323 builtin/init-db.c:326
5004 msgid "%s already exists"
5007 #: builtin/init-db.c:355
5009 msgid "unable to handle file type %d"
5012 #: builtin/init-db.c:358
5014 msgid "unable to move %s to %s"
5017 #: builtin/init-db.c:363
5019 msgid "Could not create git link %s"
5023 #. * TRANSLATORS: The first '%s' is either "Reinitialized
5024 #. * existing" or "Initialized empty", the second " shared" or
5025 #. * "", and the last '%s%s' is the verbatim directory name.
5027 #: builtin/init-db.c:420
5029 msgid "%s%s Git repository in %s%s\n"
5032 #: builtin/init-db.c:421
5033 msgid "Reinitialized existing"
5036 #: builtin/init-db.c:421
5037 msgid "Initialized empty"
5040 #: builtin/init-db.c:422
5044 #: builtin/init-db.c:441
5045 msgid "cannot tell cwd"
5048 #: builtin/init-db.c:467
5050 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"
5051 "[=<permissions>]] [directory]"
5054 #: builtin/init-db.c:490
5058 #: builtin/init-db.c:491
5059 msgid "specify that the git repository is to be shared amongst several users"
5062 #: builtin/init-db.c:493 builtin/prune-packed.c:77
5066 #: builtin/init-db.c:522 builtin/init-db.c:529
5068 msgid "cannot mkdir %s"
5071 #: builtin/init-db.c:533
5073 msgid "cannot chdir to %s"
5076 #: builtin/init-db.c:555
5079 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5083 #: builtin/init-db.c:579
5084 msgid "Cannot access current working directory"
5087 #: builtin/init-db.c:586
5089 msgid "Cannot access work tree '%s'"
5093 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
5097 msgid " or: git show [options] <object>..."
5100 #: builtin/log.c:100
5101 msgid "suppress diff output"
5104 #: builtin/log.c:101
5108 #: builtin/log.c:102
5109 msgid "decorate options"
5112 #: builtin/log.c:189
5114 msgid "Final output: %d %s\n"
5117 #: builtin/log.c:403 builtin/log.c:494
5119 msgid "Could not read object %s"
5122 #: builtin/log.c:518
5124 msgid "Unknown type: %d"
5127 #: builtin/log.c:608
5128 msgid "format.headers without value"
5131 #: builtin/log.c:682
5132 msgid "name of output directory is too long"
5135 #: builtin/log.c:693
5137 msgid "Cannot open patch file %s"
5140 #: builtin/log.c:707
5141 msgid "Need exactly one range."
5144 #: builtin/log.c:715
5145 msgid "Not a range."
5148 #: builtin/log.c:789
5149 msgid "Cover letter needs email format"
5152 #: builtin/log.c:862
5154 msgid "insane in-reply-to: %s"
5157 #: builtin/log.c:890
5158 msgid "git format-patch [options] [<since> | <revision range>]"
5161 #: builtin/log.c:935
5162 msgid "Two output directories?"
5165 #: builtin/log.c:1063
5166 msgid "use [PATCH n/m] even with a single patch"
5169 #: builtin/log.c:1066
5170 msgid "use [PATCH] even with multiple patches"
5173 #: builtin/log.c:1070
5174 msgid "print patches to standard out"
5177 #: builtin/log.c:1072
5178 msgid "generate a cover letter"
5181 #: builtin/log.c:1074
5182 msgid "use simple number sequence for output file names"
5185 #: builtin/log.c:1075
5189 #: builtin/log.c:1076
5190 msgid "use <sfx> instead of '.patch'"
5193 #: builtin/log.c:1078
5194 msgid "start numbering patches at <n> instead of 1"
5197 #: builtin/log.c:1080
5198 msgid "Use [<prefix>] instead of [PATCH]"
5201 #: builtin/log.c:1083
5202 msgid "store resulting files in <dir>"
5205 #: builtin/log.c:1086
5206 msgid "don't strip/add [PATCH]"
5209 #: builtin/log.c:1089
5210 msgid "don't output binary diffs"
5213 #: builtin/log.c:1091
5214 msgid "don't include a patch matching a commit upstream"
5217 #: builtin/log.c:1093
5218 msgid "show patch format instead of default (patch + stat)"
5221 #: builtin/log.c:1095
5225 #: builtin/log.c:1096
5229 #: builtin/log.c:1097
5230 msgid "add email header"
5233 #: builtin/log.c:1098 builtin/log.c:1100
5237 #: builtin/log.c:1098
5238 msgid "add To: header"
5241 #: builtin/log.c:1100
5242 msgid "add Cc: header"
5245 #: builtin/log.c:1102
5249 #: builtin/log.c:1103
5250 msgid "make first mail a reply to <message-id>"
5253 #: builtin/log.c:1104 builtin/log.c:1107
5257 #: builtin/log.c:1105
5258 msgid "attach the patch"
5261 #: builtin/log.c:1108
5262 msgid "inline the patch"
5265 #: builtin/log.c:1112
5266 msgid "enable message threading, styles: shallow, deep"
5269 #: builtin/log.c:1114
5273 #: builtin/log.c:1115
5274 msgid "add a signature"
5277 #: builtin/log.c:1117
5278 msgid "don't print the patch filenames"
5281 #: builtin/log.c:1157
5283 msgid "bogus committer info %s"
5286 #: builtin/log.c:1202
5287 msgid "-n and -k are mutually exclusive."
5290 #: builtin/log.c:1204
5291 msgid "--subject-prefix and -k are mutually exclusive."
5294 #: builtin/log.c:1212
5295 msgid "--name-only does not make sense"
5298 #: builtin/log.c:1214
5299 msgid "--name-status does not make sense"
5302 #: builtin/log.c:1216
5303 msgid "--check does not make sense"
5306 #: builtin/log.c:1239
5307 msgid "standard output, or directory, which one?"
5310 #: builtin/log.c:1241
5312 msgid "Could not create directory '%s'"
5315 #: builtin/log.c:1394
5316 msgid "Failed to create output files"
5319 #: builtin/log.c:1443
5320 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5323 #: builtin/log.c:1498
5326 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
5329 #: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
5331 msgid "Unknown commit %s"
5334 #: builtin/ls-files.c:408
5335 msgid "git ls-files [options] [<file>...]"
5338 #: builtin/ls-files.c:463
5339 msgid "identify the file status with tags"
5342 #: builtin/ls-files.c:465
5343 msgid "use lowercase letters for 'assume unchanged' files"
5346 #: builtin/ls-files.c:467
5347 msgid "show cached files in the output (default)"
5350 #: builtin/ls-files.c:469
5351 msgid "show deleted files in the output"
5354 #: builtin/ls-files.c:471
5355 msgid "show modified files in the output"
5358 #: builtin/ls-files.c:473
5359 msgid "show other files in the output"
5362 #: builtin/ls-files.c:475
5363 msgid "show ignored files in the output"
5366 #: builtin/ls-files.c:478
5367 msgid "show staged contents' object name in the output"
5370 #: builtin/ls-files.c:480
5371 msgid "show files on the filesystem that need to be removed"
5374 #: builtin/ls-files.c:482
5375 msgid "show 'other' directories' name only"
5378 #: builtin/ls-files.c:485
5379 msgid "don't show empty directories"
5382 #: builtin/ls-files.c:488
5383 msgid "show unmerged files in the output"
5386 #: builtin/ls-files.c:490
5387 msgid "show resolve-undo information"
5390 #: builtin/ls-files.c:492
5391 msgid "skip files matching pattern"
5394 #: builtin/ls-files.c:495
5395 msgid "exclude patterns are read from <file>"
5398 #: builtin/ls-files.c:498
5399 msgid "read additional per-directory exclude patterns in <file>"
5402 #: builtin/ls-files.c:500
5403 msgid "add the standard git exclusions"
5406 #: builtin/ls-files.c:503
5407 msgid "make the output relative to the project top directory"
5410 #: builtin/ls-files.c:506
5411 msgid "if any <file> is not in the index, treat this as an error"
5414 #: builtin/ls-files.c:507
5418 #: builtin/ls-files.c:508
5419 msgid "pretend that paths removed since <tree-ish> are still present"
5422 #: builtin/ls-files.c:510
5423 msgid "show debugging data"
5426 #: builtin/ls-tree.c:27
5427 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
5430 #: builtin/ls-tree.c:125
5431 msgid "only show trees"
5434 #: builtin/ls-tree.c:127
5435 msgid "recurse into subtrees"
5438 #: builtin/ls-tree.c:129
5439 msgid "show trees when recursing"
5442 #: builtin/ls-tree.c:132
5443 msgid "terminate entries with NUL byte"
5446 #: builtin/ls-tree.c:133
5447 msgid "include object size"
5450 #: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5451 msgid "list only filenames"
5454 #: builtin/ls-tree.c:140
5455 msgid "use full path names"
5458 #: builtin/ls-tree.c:142
5459 msgid "list entire tree; not just current directory (implies --full-name)"
5462 #: builtin/merge.c:43
5463 msgid "git merge [options] [<commit>...]"
5466 #: builtin/merge.c:44
5467 msgid "git merge [options] <msg> HEAD <commit>"
5470 #: builtin/merge.c:45
5471 msgid "git merge --abort"
5474 #: builtin/merge.c:90
5475 msgid "switch `m' requires a value"
5478 #: builtin/merge.c:127
5480 msgid "Could not find merge strategy '%s'.\n"
5483 #: builtin/merge.c:128
5485 msgid "Available strategies are:"
5488 #: builtin/merge.c:133
5490 msgid "Available custom strategies are:"
5493 #: builtin/merge.c:183
5494 msgid "do not show a diffstat at the end of the merge"
5497 #: builtin/merge.c:186
5498 msgid "show a diffstat at the end of the merge"
5501 #: builtin/merge.c:187
5502 msgid "(synonym to --stat)"
5505 #: builtin/merge.c:189
5506 msgid "add (at most <n>) entries from shortlog to merge commit message"
5509 #: builtin/merge.c:192
5510 msgid "create a single commit instead of doing a merge"
5513 #: builtin/merge.c:194
5514 msgid "perform a commit if the merge succeeds (default)"
5517 #: builtin/merge.c:196
5518 msgid "edit message before committing"
5521 #: builtin/merge.c:198
5522 msgid "allow fast-forward (default)"
5525 #: builtin/merge.c:200
5526 msgid "abort if fast-forward is not possible"
5529 #: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112
5533 #: builtin/merge.c:203
5534 msgid "merge strategy to use"
5537 #: builtin/merge.c:204
5538 msgid "option=value"
5541 #: builtin/merge.c:205
5542 msgid "option for selected merge strategy"
5545 #: builtin/merge.c:207
5546 msgid "merge commit message (for a non-fast-forward merge)"
5549 #: builtin/merge.c:211
5550 msgid "abort the current in-progress merge"
5553 #: builtin/merge.c:240
5554 msgid "could not run stash."
5557 #: builtin/merge.c:245
5558 msgid "stash failed"
5561 #: builtin/merge.c:250
5563 msgid "not a valid object: %s"
5566 #: builtin/merge.c:269 builtin/merge.c:286
5567 msgid "read-tree failed"
5570 #: builtin/merge.c:316
5571 msgid " (nothing to squash)"
5574 #: builtin/merge.c:329
5576 msgid "Squash commit -- not updating HEAD\n"
5579 #: builtin/merge.c:361
5580 msgid "Writing SQUASH_MSG"
5583 #: builtin/merge.c:363
5584 msgid "Finishing SQUASH_MSG"
5587 #: builtin/merge.c:386
5589 msgid "No merge message -- not updating HEAD\n"
5592 #: builtin/merge.c:436
5594 msgid "'%s' does not point to a commit"
5597 #: builtin/merge.c:535
5599 msgid "Bad branch.%s.mergeoptions string: %s"
5602 #: builtin/merge.c:628
5603 msgid "git write-tree failed to write a tree"
5606 #: builtin/merge.c:678
5607 msgid "failed to read the cache"
5610 #: builtin/merge.c:709
5611 msgid "Not handling anything other than two heads merge."
5614 #: builtin/merge.c:723
5616 msgid "Unknown option for merge-recursive: -X%s"
5619 #: builtin/merge.c:737
5621 msgid "unable to write %s"
5624 #: builtin/merge.c:876
5626 msgid "Could not read from '%s'"
5629 #: builtin/merge.c:885
5631 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
5634 #: builtin/merge.c:891
5636 "Please enter a commit message to explain why this merge is necessary,\n"
5637 "especially if it merges an updated upstream into a topic branch.\n"
5639 "Lines starting with '#' will be ignored, and an empty message aborts\n"
5643 #: builtin/merge.c:915
5644 msgid "Empty commit message."
5647 #: builtin/merge.c:927
5649 msgid "Wonderful.\n"
5652 #: builtin/merge.c:992
5654 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
5657 #: builtin/merge.c:1008
5659 msgid "'%s' is not a commit"
5662 #: builtin/merge.c:1049
5663 msgid "No current branch."
5666 #: builtin/merge.c:1051
5667 msgid "No remote for the current branch."
5670 #: builtin/merge.c:1053
5671 msgid "No default upstream defined for the current branch."
5674 #: builtin/merge.c:1058
5676 msgid "No remote tracking branch for %s from %s"
5679 #: builtin/merge.c:1145 builtin/merge.c:1302
5681 msgid "%s - not something we can merge"
5684 #: builtin/merge.c:1213
5685 msgid "There is no merge to abort (MERGE_HEAD missing)."
5688 #: builtin/merge.c:1229 git-pull.sh:31
5690 "You have not concluded your merge (MERGE_HEAD exists).\n"
5691 "Please, commit your changes before you can merge."
5694 #: builtin/merge.c:1232 git-pull.sh:34
5695 msgid "You have not concluded your merge (MERGE_HEAD exists)."
5698 #: builtin/merge.c:1236
5700 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
5701 "Please, commit your changes before you can merge."
5704 #: builtin/merge.c:1239
5705 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
5708 #: builtin/merge.c:1248
5709 msgid "You cannot combine --squash with --no-ff."
5712 #: builtin/merge.c:1253
5713 msgid "You cannot combine --no-ff with --ff-only."
5716 #: builtin/merge.c:1260
5717 msgid "No commit specified and merge.defaultToUpstream not set."
5720 #: builtin/merge.c:1292
5721 msgid "Can merge only exactly one commit into empty head"
5724 #: builtin/merge.c:1295
5725 msgid "Squash commit into empty head not supported yet"
5728 #: builtin/merge.c:1297
5729 msgid "Non-fast-forward commit does not make sense into an empty head"
5732 #: builtin/merge.c:1412
5734 msgid "Updating %s..%s\n"
5737 #: builtin/merge.c:1450
5739 msgid "Trying really trivial in-index merge...\n"
5742 #: builtin/merge.c:1457
5747 #: builtin/merge.c:1489
5748 msgid "Not possible to fast-forward, aborting."
5751 #: builtin/merge.c:1512 builtin/merge.c:1591
5753 msgid "Rewinding the tree to pristine...\n"
5756 #: builtin/merge.c:1516
5758 msgid "Trying merge strategy %s...\n"
5761 #: builtin/merge.c:1582
5763 msgid "No merge strategy handled the merge.\n"
5766 #: builtin/merge.c:1584
5768 msgid "Merge with strategy %s failed.\n"
5771 #: builtin/merge.c:1593
5773 msgid "Using the %s to prepare resolving by hand.\n"
5776 #: builtin/merge.c:1605
5778 msgid "Automatic merge went well; stopped before committing as requested\n"
5781 #: builtin/merge-base.c:26
5782 msgid "git merge-base [-a|--all] <commit> <commit>..."
5785 #: builtin/merge-base.c:27
5786 msgid "git merge-base [-a|--all] --octopus <commit>..."
5789 #: builtin/merge-base.c:28
5790 msgid "git merge-base --independent <commit>..."
5793 #: builtin/merge-base.c:29
5794 msgid "git merge-base --is-ancestor <commit> <commit>"
5797 #: builtin/merge-base.c:98
5798 msgid "output all common ancestors"
5801 #: builtin/merge-base.c:99
5802 msgid "find ancestors for a single n-way merge"
5805 #: builtin/merge-base.c:100
5806 msgid "list revs not reachable from others"
5809 #: builtin/merge-base.c:102
5810 msgid "is the first one ancestor of the other?"
5813 #: builtin/merge-file.c:8
5815 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
5819 #: builtin/merge-file.c:33
5820 msgid "send results to standard output"
5823 #: builtin/merge-file.c:34
5824 msgid "use a diff3 based merge"
5827 #: builtin/merge-file.c:35
5828 msgid "for conflicts, use our version"
5831 #: builtin/merge-file.c:37
5832 msgid "for conflicts, use their version"
5835 #: builtin/merge-file.c:39
5836 msgid "for conflicts, use a union version"
5839 #: builtin/merge-file.c:42
5840 msgid "for conflicts, use this marker size"
5843 #: builtin/merge-file.c:43
5844 msgid "do not warn about conflicts"
5847 #: builtin/merge-file.c:45
5848 msgid "set labels for file1/orig_file/file2"
5851 #: builtin/mktree.c:67
5852 msgid "git mktree [-z] [--missing] [--batch]"
5855 #: builtin/mktree.c:153
5856 msgid "input is NUL terminated"
5859 #: builtin/mktree.c:154 builtin/write-tree.c:24
5860 msgid "allow missing objects"
5863 #: builtin/mktree.c:155
5864 msgid "allow creation of more than one tree"
5868 msgid "git mv [options] <source>... <destination>"
5872 msgid "force move/rename even if target exists"
5876 msgid "skip move/rename errors"
5881 msgid "Checking rename of '%s' to '%s'\n"
5889 msgid "can not move directory into itself"
5893 msgid "cannot move directory over file"
5898 msgid "Huh? %.*s is in index?"
5902 msgid "source directory is empty"
5906 msgid "not under version control"
5910 msgid "destination exists"
5915 msgid "overwriting '%s'"
5919 msgid "Cannot overwrite"
5923 msgid "multiple sources for the same target"
5928 msgid "%s, source=%s, destination=%s"
5933 msgid "Renaming %s to %s\n"
5936 #: builtin/mv.c:215 builtin/remote.c:731
5938 msgid "renaming '%s' failed"
5941 #: builtin/name-rev.c:175
5942 msgid "git name-rev [options] <commit>..."
5945 #: builtin/name-rev.c:176
5946 msgid "git name-rev [options] --all"
5949 #: builtin/name-rev.c:177
5950 msgid "git name-rev [options] --stdin"
5953 #: builtin/name-rev.c:229
5954 msgid "print only names (no SHA-1)"
5957 #: builtin/name-rev.c:230
5958 msgid "only use tags to name the commits"
5961 #: builtin/name-rev.c:232
5962 msgid "only use refs matching <pattern>"
5965 #: builtin/name-rev.c:234
5966 msgid "list all commits reachable from all refs"
5969 #: builtin/name-rev.c:235
5970 msgid "read from stdin"
5973 #: builtin/name-rev.c:236
5974 msgid "allow to print `undefined` names"
5977 #: builtin/notes.c:26
5978 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
5981 #: builtin/notes.c:27
5983 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
5984 "<object>] [<object>]"
5987 #: builtin/notes.c:28
5988 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
5991 #: builtin/notes.c:29
5993 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
5994 "<object>] [<object>]"
5997 #: builtin/notes.c:30
5998 msgid "git notes [--ref <notes_ref>] edit [<object>]"
6001 #: builtin/notes.c:31
6002 msgid "git notes [--ref <notes_ref>] show [<object>]"
6005 #: builtin/notes.c:32
6007 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6010 #: builtin/notes.c:33
6011 msgid "git notes merge --commit [-v | -q]"
6014 #: builtin/notes.c:34
6015 msgid "git notes merge --abort [-v | -q]"
6018 #: builtin/notes.c:35
6019 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6022 #: builtin/notes.c:36
6023 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6026 #: builtin/notes.c:37
6027 msgid "git notes [--ref <notes_ref>] get-ref"
6030 #: builtin/notes.c:42
6031 msgid "git notes [list [<object>]]"
6034 #: builtin/notes.c:47
6035 msgid "git notes add [<options>] [<object>]"
6038 #: builtin/notes.c:52
6039 msgid "git notes copy [<options>] <from-object> <to-object>"
6042 #: builtin/notes.c:53
6043 msgid "git notes copy --stdin [<from-object> <to-object>]..."
6046 #: builtin/notes.c:58
6047 msgid "git notes append [<options>] [<object>]"
6050 #: builtin/notes.c:63
6051 msgid "git notes edit [<object>]"
6054 #: builtin/notes.c:68
6055 msgid "git notes show [<object>]"
6058 #: builtin/notes.c:73
6059 msgid "git notes merge [<options>] <notes_ref>"
6062 #: builtin/notes.c:74
6063 msgid "git notes merge --commit [<options>]"
6066 #: builtin/notes.c:75
6067 msgid "git notes merge --abort [<options>]"
6070 #: builtin/notes.c:80
6071 msgid "git notes remove [<object>]"
6074 #: builtin/notes.c:85
6075 msgid "git notes prune [<options>]"
6078 #: builtin/notes.c:90
6079 msgid "git notes get-ref"
6082 #: builtin/notes.c:142
6084 msgid "unable to start 'show' for object '%s'"
6087 #: builtin/notes.c:148
6088 msgid "can't fdopen 'show' output fd"
6091 #: builtin/notes.c:158
6093 msgid "failed to close pipe to 'show' for object '%s'"
6096 #: builtin/notes.c:161
6098 msgid "failed to finish 'show' for object '%s'"
6101 #: builtin/notes.c:178 builtin/tag.c:347
6103 msgid "could not create file '%s'"
6106 #: builtin/notes.c:192
6107 msgid "Please supply the note contents using either -m or -F option"
6110 #: builtin/notes.c:213 builtin/notes.c:976
6112 msgid "Removing note for object %s\n"
6115 #: builtin/notes.c:218
6116 msgid "unable to write note object"
6119 #: builtin/notes.c:220
6121 msgid "The note contents has been left in %s"
6124 #: builtin/notes.c:254 builtin/tag.c:542
6126 msgid "cannot read '%s'"
6129 #: builtin/notes.c:256 builtin/tag.c:545
6131 msgid "could not open or read '%s'"
6134 #: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450
6135 #: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647
6136 #: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769
6137 #: builtin/notes.c:971 builtin/reset.c:293 builtin/tag.c:558
6139 msgid "Failed to resolve '%s' as a valid ref."
6142 #: builtin/notes.c:278
6144 msgid "Failed to read object '%s'."
6147 #: builtin/notes.c:302
6148 msgid "Cannot commit uninitialized/unreferenced notes tree"
6151 #: builtin/notes.c:343
6153 msgid "Bad notes.rewriteMode value: '%s'"
6156 #: builtin/notes.c:353
6158 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6161 #. TRANSLATORS: The first %s is the name of the
6162 #. environment variable, the second %s is its value
6163 #: builtin/notes.c:380
6165 msgid "Bad %s value: '%s'"
6168 #: builtin/notes.c:444
6170 msgid "Malformed input line: '%s'."
6173 #: builtin/notes.c:459
6175 msgid "Failed to copy notes from '%s' to '%s'"
6178 #: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630
6179 #: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762
6180 #: builtin/notes.c:1036
6181 msgid "too many parameters"
6184 #: builtin/notes.c:516 builtin/notes.c:775
6186 msgid "No note found for object %s."
6189 #: builtin/notes.c:538 builtin/notes.c:695
6190 msgid "note contents as a string"
6193 #: builtin/notes.c:541 builtin/notes.c:698
6194 msgid "note contents in a file"
6197 #: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700
6198 #: builtin/notes.c:703 builtin/tag.c:476
6202 #: builtin/notes.c:544 builtin/notes.c:701
6203 msgid "reuse and edit specified note object"
6206 #: builtin/notes.c:547 builtin/notes.c:704
6207 msgid "reuse specified note object"
6210 #: builtin/notes.c:549 builtin/notes.c:617
6211 msgid "replace existing notes"
6214 #: builtin/notes.c:583
6217 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6221 #: builtin/notes.c:588 builtin/notes.c:665
6223 msgid "Overwriting existing notes for object %s\n"
6226 #: builtin/notes.c:618
6227 msgid "read objects from stdin"
6230 #: builtin/notes.c:620
6231 msgid "load rewriting config for <command> (implies --stdin)"
6234 #: builtin/notes.c:638
6235 msgid "too few parameters"
6238 #: builtin/notes.c:659
6241 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6245 #: builtin/notes.c:671
6247 msgid "Missing notes on source object %s. Cannot copy."
6250 #: builtin/notes.c:720
6253 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6254 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6257 #: builtin/notes.c:867
6258 msgid "General options"
6261 #: builtin/notes.c:869
6262 msgid "Merge options"
6265 #: builtin/notes.c:871
6267 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6271 #: builtin/notes.c:873
6272 msgid "Committing unmerged notes"
6275 #: builtin/notes.c:875
6276 msgid "finalize notes merge by committing unmerged notes"
6279 #: builtin/notes.c:877
6280 msgid "Aborting notes merge resolution"
6283 #: builtin/notes.c:879
6284 msgid "abort notes merge"
6287 #: builtin/notes.c:974
6289 msgid "Object %s has no note\n"
6292 #: builtin/notes.c:986
6293 msgid "attempt to remove non-existent note is not an error"
6296 #: builtin/notes.c:989
6297 msgid "read object names from the standard input"
6300 #: builtin/notes.c:1070
6304 #: builtin/notes.c:1071
6305 msgid "use notes from <notes_ref>"
6308 #: builtin/notes.c:1106 builtin/remote.c:1598
6310 msgid "Unknown subcommand: %s"
6313 #: builtin/pack-objects.c:23
6314 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
6317 #: builtin/pack-objects.c:24
6318 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
6321 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6323 msgid "deflate error (%d)"
6326 #: builtin/pack-objects.c:2398
6328 msgid "unsupported index version %s"
6331 #: builtin/pack-objects.c:2402
6333 msgid "bad index version '%s'"
6336 #: builtin/pack-objects.c:2425
6338 msgid "option %s does not accept negative form"
6341 #: builtin/pack-objects.c:2429
6343 msgid "unable to parse value '%s' for option %s"
6346 #: builtin/pack-objects.c:2448
6347 msgid "do not show progress meter"
6350 #: builtin/pack-objects.c:2450
6351 msgid "show progress meter"
6354 #: builtin/pack-objects.c:2452
6355 msgid "show progress meter during object writing phase"
6358 #: builtin/pack-objects.c:2455
6359 msgid "similar to --all-progress when progress meter is shown"
6362 #: builtin/pack-objects.c:2456
6363 msgid "version[,offset]"
6366 #: builtin/pack-objects.c:2457
6367 msgid "write the pack index file in the specified idx format version"
6370 #: builtin/pack-objects.c:2460
6371 msgid "maximum size of each output pack file"
6374 #: builtin/pack-objects.c:2462
6375 msgid "ignore borrowed objects from alternate object store"
6378 #: builtin/pack-objects.c:2464
6379 msgid "ignore packed objects"
6382 #: builtin/pack-objects.c:2466
6383 msgid "limit pack window by objects"
6386 #: builtin/pack-objects.c:2468
6387 msgid "limit pack window by memory in addition to object limit"
6390 #: builtin/pack-objects.c:2470
6391 msgid "maximum length of delta chain allowed in the resulting pack"
6394 #: builtin/pack-objects.c:2472
6395 msgid "reuse existing deltas"
6398 #: builtin/pack-objects.c:2474
6399 msgid "reuse existing objects"
6402 #: builtin/pack-objects.c:2476
6403 msgid "use OFS_DELTA objects"
6406 #: builtin/pack-objects.c:2478
6407 msgid "use threads when searching for best delta matches"
6410 #: builtin/pack-objects.c:2480
6411 msgid "do not create an empty pack output"
6414 #: builtin/pack-objects.c:2482
6415 msgid "read revision arguments from standard input"
6418 #: builtin/pack-objects.c:2484
6419 msgid "limit the objects to those that are not yet packed"
6422 #: builtin/pack-objects.c:2487
6423 msgid "include objects reachable from any reference"
6426 #: builtin/pack-objects.c:2490
6427 msgid "include objects referred by reflog entries"
6430 #: builtin/pack-objects.c:2493
6431 msgid "output pack to stdout"
6434 #: builtin/pack-objects.c:2495
6435 msgid "include tag objects that refer to objects to be packed"
6438 #: builtin/pack-objects.c:2497
6439 msgid "keep unreachable objects"
6442 #: builtin/pack-objects.c:2498 parse-options.h:141
6446 #: builtin/pack-objects.c:2499
6447 msgid "unpack unreachable objects newer than <time>"
6450 #: builtin/pack-objects.c:2502
6451 msgid "create thin packs"
6454 #: builtin/pack-objects.c:2504
6455 msgid "ignore packs that have companion .keep file"
6458 #: builtin/pack-objects.c:2506
6459 msgid "pack compression level"
6462 #: builtin/pack-objects.c:2508
6463 msgid "do not hide commits by grafts"
6466 #: builtin/pack-refs.c:6
6467 msgid "git pack-refs [options]"
6470 #: builtin/pack-refs.c:14
6471 msgid "pack everything"
6474 #: builtin/pack-refs.c:15
6475 msgid "prune loose refs (default)"
6478 #: builtin/prune-packed.c:7
6479 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
6482 #: builtin/prune.c:12
6483 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
6486 #: builtin/prune.c:132
6487 msgid "do not remove, show only"
6490 #: builtin/prune.c:133
6491 msgid "report pruned objects"
6494 #: builtin/prune.c:136
6495 msgid "expire objects older than <time>"
6498 #: builtin/push.c:14
6499 msgid "git push [<options>] [<repository> [<refspec>...]]"
6502 #: builtin/push.c:45
6503 msgid "tag shorthand without <tag>"
6506 #: builtin/push.c:64
6507 msgid "--delete only accepts plain target ref names"
6510 #: builtin/push.c:99
6513 "To choose either option permanently, see push.default in 'git help config'."
6516 #: builtin/push.c:102
6519 "The upstream branch of your current branch does not match\n"
6520 "the name of your current branch. To push to the upstream branch\n"
6521 "on the remote, use\n"
6523 " git push %s HEAD:%s\n"
6525 "To push to the branch of the same name on the remote, use\n"
6531 #: builtin/push.c:121
6534 "You are not currently on a branch.\n"
6535 "To push the history leading to the current (detached HEAD)\n"
6538 " git push %s HEAD:<name-of-remote-branch>\n"
6541 #: builtin/push.c:128
6544 "The current branch %s has no upstream branch.\n"
6545 "To push the current branch and set the remote as upstream, use\n"
6547 " git push --set-upstream %s %s\n"
6550 #: builtin/push.c:136
6552 msgid "The current branch %s has multiple upstream branches, refusing to push."
6555 #: builtin/push.c:139
6558 "You are pushing to remote '%s', which is not the upstream of\n"
6559 "your current branch '%s', without telling me what to push\n"
6560 "to update which remote branch."
6563 #: builtin/push.c:151
6565 "push.default is unset; its implicit value is changing in\n"
6566 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6567 "and maintain the current behavior after the default changes, use:\n"
6569 " git config --global push.default matching\n"
6571 "To squelch this message and adopt the new behavior now, use:\n"
6573 " git config --global push.default simple\n"
6575 "See 'git help config' and search for 'push.default' for further "
6577 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
6578 "'current' instead of 'simple' if you sometimes use older versions of Git)"
6581 #: builtin/push.c:199
6583 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
6586 #: builtin/push.c:206
6588 "Updates were rejected because the tip of your current branch is behind\n"
6589 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
6590 "before pushing again.\n"
6591 "See the 'Note about fast-forwards' in 'git push --help' for details."
6594 #: builtin/push.c:212
6596 "Updates were rejected because a pushed branch tip is behind its remote\n"
6597 "counterpart. If you did not intend to push that branch, you may want to\n"
6598 "specify branches to push or set the 'push.default' configuration variable\n"
6599 "to 'simple', 'current' or 'upstream' to push only the current branch."
6602 #: builtin/push.c:218
6604 "Updates were rejected because a pushed branch tip is behind its remote\n"
6605 "counterpart. Check out this branch and merge the remote changes\n"
6606 "(e.g. 'git pull') before pushing again.\n"
6607 "See the 'Note about fast-forwards' in 'git push --help' for details."
6610 #: builtin/push.c:258
6612 msgid "Pushing to %s\n"
6615 #: builtin/push.c:262
6617 msgid "failed to push some refs to '%s'"
6620 #: builtin/push.c:294
6622 msgid "bad repository '%s'"
6625 #: builtin/push.c:295
6627 "No configured push destination.\n"
6628 "Either specify the URL from the command-line or configure a remote "
6629 "repository using\n"
6631 " git remote add <name> <url>\n"
6633 "and then push using the remote name\n"
6635 " git push <name>\n"
6638 #: builtin/push.c:310
6639 msgid "--all and --tags are incompatible"
6642 #: builtin/push.c:311
6643 msgid "--all can't be combined with refspecs"
6646 #: builtin/push.c:316
6647 msgid "--mirror and --tags are incompatible"
6650 #: builtin/push.c:317
6651 msgid "--mirror can't be combined with refspecs"
6654 #: builtin/push.c:322
6655 msgid "--all and --mirror are incompatible"
6658 #: builtin/push.c:382
6662 #: builtin/push.c:383
6663 msgid "push all refs"
6666 #: builtin/push.c:384
6667 msgid "mirror all refs"
6670 #: builtin/push.c:386
6674 #: builtin/push.c:387
6675 msgid "push tags (can't be used with --all or --mirror)"
6678 #: builtin/push.c:390
6679 msgid "force updates"
6682 #: builtin/push.c:391
6686 #: builtin/push.c:392
6687 msgid "control recursive pushing of submodules"
6690 #: builtin/push.c:394
6691 msgid "use thin pack"
6694 #: builtin/push.c:395 builtin/push.c:396
6695 msgid "receive pack program"
6698 #: builtin/push.c:397
6699 msgid "set upstream for git pull/status"
6702 #: builtin/push.c:400
6703 msgid "prune locally removed refs"
6706 #: builtin/push.c:410
6707 msgid "--delete is incompatible with --all, --mirror and --tags"
6710 #: builtin/push.c:412
6711 msgid "--delete doesn't make sense without any refs"
6714 #: builtin/read-tree.c:36
6716 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
6717 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
6718 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
6721 #: builtin/read-tree.c:108
6722 msgid "write resulting index to <file>"
6725 #: builtin/read-tree.c:111
6726 msgid "only empty the index"
6729 #: builtin/read-tree.c:113
6733 #: builtin/read-tree.c:115
6734 msgid "perform a merge in addition to a read"
6737 #: builtin/read-tree.c:117
6738 msgid "3-way merge if no file level merging required"
6741 #: builtin/read-tree.c:119
6742 msgid "3-way merge in presence of adds and removes"
6745 #: builtin/read-tree.c:121
6746 msgid "same as -m, but discard unmerged entries"
6749 #: builtin/read-tree.c:122
6750 msgid "<subdirectory>/"
6753 #: builtin/read-tree.c:123
6754 msgid "read the tree into the index under <subdirectory>/"
6757 #: builtin/read-tree.c:126
6758 msgid "update working tree with merge result"
6761 #: builtin/read-tree.c:128
6765 #: builtin/read-tree.c:129
6766 msgid "allow explicitly ignored files to be overwritten"
6769 #: builtin/read-tree.c:132
6770 msgid "don't check the working tree after merging"
6773 #: builtin/read-tree.c:133
6774 msgid "don't update the index or the work tree"
6777 #: builtin/read-tree.c:135
6778 msgid "skip applying sparse checkout filter"
6781 #: builtin/read-tree.c:137
6782 msgid "debug unpack-trees"
6785 #: builtin/remote.c:11
6786 msgid "git remote [-v | --verbose]"
6789 #: builtin/remote.c:12
6791 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
6792 "mirror=<fetch|push>] <name> <url>"
6795 #: builtin/remote.c:13 builtin/remote.c:32
6796 msgid "git remote rename <old> <new>"
6799 #: builtin/remote.c:14 builtin/remote.c:37
6800 msgid "git remote remove <name>"
6803 #: builtin/remote.c:15
6804 msgid "git remote set-head <name> (-a | -d | <branch>)"
6807 #: builtin/remote.c:16
6808 msgid "git remote [-v | --verbose] show [-n] <name>"
6811 #: builtin/remote.c:17
6812 msgid "git remote prune [-n | --dry-run] <name>"
6815 #: builtin/remote.c:18
6817 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
6820 #: builtin/remote.c:19
6821 msgid "git remote set-branches [--add] <name> <branch>..."
6824 #: builtin/remote.c:20 builtin/remote.c:68
6825 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
6828 #: builtin/remote.c:21 builtin/remote.c:69
6829 msgid "git remote set-url --add <name> <newurl>"
6832 #: builtin/remote.c:22 builtin/remote.c:70
6833 msgid "git remote set-url --delete <name> <url>"
6836 #: builtin/remote.c:27
6837 msgid "git remote add [<options>] <name> <url>"
6840 #: builtin/remote.c:42
6841 msgid "git remote set-head <name> (-a | -d | <branch>])"
6844 #: builtin/remote.c:47
6845 msgid "git remote set-branches <name> <branch>..."
6848 #: builtin/remote.c:48
6849 msgid "git remote set-branches --add <name> <branch>..."
6852 #: builtin/remote.c:53
6853 msgid "git remote show [<options>] <name>"
6856 #: builtin/remote.c:58
6857 msgid "git remote prune [<options>] <name>"
6860 #: builtin/remote.c:63
6861 msgid "git remote update [<options>] [<group> | <remote>]..."
6864 #: builtin/remote.c:98
6869 #: builtin/remote.c:130
6871 "--mirror is dangerous and deprecated; please\n"
6872 "\t use --mirror=fetch or --mirror=push instead"
6875 #: builtin/remote.c:147
6877 msgid "unknown mirror argument: %s"
6880 #: builtin/remote.c:163
6881 msgid "fetch the remote branches"
6884 #: builtin/remote.c:165
6885 msgid "import all tags and associated objects when fetching"
6888 #: builtin/remote.c:168
6889 msgid "or do not fetch any tag at all (--no-tags)"
6892 #: builtin/remote.c:170
6893 msgid "branch(es) to track"
6896 #: builtin/remote.c:171
6897 msgid "master branch"
6900 #: builtin/remote.c:172
6904 #: builtin/remote.c:173
6905 msgid "set up remote as a mirror to push to or fetch from"
6908 #: builtin/remote.c:185
6909 msgid "specifying a master branch makes no sense with --mirror"
6912 #: builtin/remote.c:187
6913 msgid "specifying branches to track makes sense only with fetch mirrors"
6916 #: builtin/remote.c:195 builtin/remote.c:646
6918 msgid "remote %s already exists."
6921 #: builtin/remote.c:199 builtin/remote.c:650
6923 msgid "'%s' is not a valid remote name"
6926 #: builtin/remote.c:243
6928 msgid "Could not setup master '%s'"
6931 #: builtin/remote.c:299
6933 msgid "more than one %s"
6936 #: builtin/remote.c:339
6938 msgid "Could not get fetch map for refspec %s"
6941 #: builtin/remote.c:440 builtin/remote.c:448
6945 #: builtin/remote.c:452
6949 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
6951 msgid "Could not append '%s' to '%s'"
6954 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
6956 msgid "No such remote: %s"
6959 #: builtin/remote.c:656
6961 msgid "Could not rename config section '%s' to '%s'"
6964 #: builtin/remote.c:662 builtin/remote.c:799
6966 msgid "Could not remove config section '%s'"
6969 #: builtin/remote.c:677
6972 "Not updating non-default fetch refspec\n"
6974 "\tPlease update the configuration manually if necessary."
6977 #: builtin/remote.c:683
6979 msgid "Could not append '%s'"
6982 #: builtin/remote.c:694
6984 msgid "Could not set '%s'"
6987 #: builtin/remote.c:716
6989 msgid "deleting '%s' failed"
6992 #: builtin/remote.c:750
6994 msgid "creating '%s' failed"
6997 #: builtin/remote.c:764
6999 msgid "Could not remove branch %s"
7002 #: builtin/remote.c:834
7004 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7005 "to delete it, use:"
7007 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7008 "to delete them, use:"
7012 #: builtin/remote.c:943
7014 msgid " new (next fetch will store in remotes/%s)"
7017 #: builtin/remote.c:946
7021 #: builtin/remote.c:948
7022 msgid " stale (use 'git remote prune' to remove)"
7025 #: builtin/remote.c:950
7029 #: builtin/remote.c:991
7031 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7034 #: builtin/remote.c:998
7036 msgid "rebases onto remote %s"
7039 #: builtin/remote.c:1001
7041 msgid " merges with remote %s"
7044 #: builtin/remote.c:1002
7045 msgid " and with remote"
7048 #: builtin/remote.c:1004
7050 msgid "merges with remote %s"
7053 #: builtin/remote.c:1005
7054 msgid " and with remote"
7057 #: builtin/remote.c:1051
7061 #: builtin/remote.c:1054
7065 #: builtin/remote.c:1058
7069 #: builtin/remote.c:1061
7070 msgid "fast-forwardable"
7073 #: builtin/remote.c:1064
7074 msgid "local out of date"
7077 #: builtin/remote.c:1071
7079 msgid " %-*s forces to %-*s (%s)"
7082 #: builtin/remote.c:1074
7084 msgid " %-*s pushes to %-*s (%s)"
7087 #: builtin/remote.c:1078
7089 msgid " %-*s forces to %s"
7092 #: builtin/remote.c:1081
7094 msgid " %-*s pushes to %s"
7097 #: builtin/remote.c:1091
7098 msgid "do not query remotes"
7101 #: builtin/remote.c:1118
7106 #: builtin/remote.c:1119
7108 msgid " Fetch URL: %s"
7111 #: builtin/remote.c:1120 builtin/remote.c:1285
7115 #: builtin/remote.c:1129 builtin/remote.c:1131
7117 msgid " Push URL: %s"
7120 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
7122 msgid " HEAD branch: %s"
7125 #: builtin/remote.c:1139
7128 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
7131 #: builtin/remote.c:1151
7133 msgid " Remote branch:%s"
7134 msgid_plural " Remote branches:%s"
7138 #: builtin/remote.c:1154 builtin/remote.c:1181
7139 msgid " (status not queried)"
7142 #: builtin/remote.c:1163
7143 msgid " Local branch configured for 'git pull':"
7144 msgid_plural " Local branches configured for 'git pull':"
7148 #: builtin/remote.c:1171
7149 msgid " Local refs will be mirrored by 'git push'"
7152 #: builtin/remote.c:1178
7154 msgid " Local ref configured for 'git push'%s:"
7155 msgid_plural " Local refs configured for 'git push'%s:"
7159 #: builtin/remote.c:1199
7160 msgid "set refs/remotes/<name>/HEAD according to remote"
7163 #: builtin/remote.c:1201
7164 msgid "delete refs/remotes/<name>/HEAD"
7167 #: builtin/remote.c:1216
7168 msgid "Cannot determine remote HEAD"
7171 #: builtin/remote.c:1218
7172 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
7175 #: builtin/remote.c:1228
7177 msgid "Could not delete %s"
7180 #: builtin/remote.c:1236
7182 msgid "Not a valid ref: %s"
7185 #: builtin/remote.c:1238
7187 msgid "Could not setup %s"
7190 #: builtin/remote.c:1274
7192 msgid " %s will become dangling!"
7195 #: builtin/remote.c:1275
7197 msgid " %s has become dangling!"
7200 #: builtin/remote.c:1281
7205 #: builtin/remote.c:1282
7210 #: builtin/remote.c:1295
7212 msgid " * [would prune] %s"
7215 #: builtin/remote.c:1298
7217 msgid " * [pruned] %s"
7220 #: builtin/remote.c:1321
7221 msgid "prune remotes after fetching"
7224 #: builtin/remote.c:1387 builtin/remote.c:1461
7226 msgid "No such remote '%s'"
7229 #: builtin/remote.c:1407
7233 #: builtin/remote.c:1414
7234 msgid "no remote specified"
7237 #: builtin/remote.c:1436
7238 msgid "manipulate push URLs"
7241 #: builtin/remote.c:1438
7245 #: builtin/remote.c:1440
7249 #: builtin/remote.c:1447
7250 msgid "--add --delete doesn't make sense"
7253 #: builtin/remote.c:1487
7255 msgid "Invalid old URL pattern: %s"
7258 #: builtin/remote.c:1495
7260 msgid "No such URL found: %s"
7263 #: builtin/remote.c:1497
7264 msgid "Will not delete all non-push URLs"
7267 #: builtin/remote.c:1569
7268 msgid "be verbose; must be placed before a subcommand"
7271 #: builtin/replace.c:17
7272 msgid "git replace [-f] <object> <replacement>"
7275 #: builtin/replace.c:18
7276 msgid "git replace -d <object>..."
7279 #: builtin/replace.c:19
7280 msgid "git replace -l [<pattern>]"
7283 #: builtin/replace.c:118
7284 msgid "list replace refs"
7287 #: builtin/replace.c:119
7288 msgid "delete replace refs"
7291 #: builtin/replace.c:120
7292 msgid "replace the ref if it exists"
7295 #: builtin/rerere.c:11
7296 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
7299 #: builtin/rerere.c:56
7300 msgid "register clean resolutions in index"
7303 #: builtin/reset.c:25
7305 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
7308 #: builtin/reset.c:26
7309 msgid "git reset [-q] <commit> [--] <paths>..."
7312 #: builtin/reset.c:27
7313 msgid "git reset --patch [<commit>] [--] [<paths>...]"
7316 #: builtin/reset.c:33
7320 #: builtin/reset.c:33
7324 #: builtin/reset.c:33
7328 #: builtin/reset.c:33
7332 #: builtin/reset.c:33
7336 #: builtin/reset.c:77
7337 msgid "You do not have a valid HEAD."
7340 #: builtin/reset.c:79
7341 msgid "Failed to find tree of HEAD."
7344 #: builtin/reset.c:85
7346 msgid "Failed to find tree of %s."
7349 #: builtin/reset.c:96
7350 msgid "Could not write new index file."
7353 #: builtin/reset.c:106
7355 msgid "HEAD is now at %s"
7358 #: builtin/reset.c:130
7359 msgid "Could not read index"
7362 #: builtin/reset.c:133
7363 msgid "Unstaged changes after reset:"
7366 #: builtin/reset.c:223
7368 msgid "Cannot do a %s reset in the middle of a merge."
7371 #: builtin/reset.c:238
7372 msgid "be quiet, only report errors"
7375 #: builtin/reset.c:240
7376 msgid "reset HEAD and index"
7379 #: builtin/reset.c:241
7380 msgid "reset only HEAD"
7383 #: builtin/reset.c:243 builtin/reset.c:245
7384 msgid "reset HEAD, index and working tree"
7387 #: builtin/reset.c:247
7388 msgid "reset HEAD but keep local changes"
7391 #: builtin/reset.c:303
7393 msgid "Could not parse object '%s'."
7396 #: builtin/reset.c:308
7397 msgid "--patch is incompatible with --{hard,mixed,soft}"
7400 #: builtin/reset.c:317
7401 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
7404 #: builtin/reset.c:319
7406 msgid "Cannot do %s reset with paths."
7409 #: builtin/reset.c:331
7411 msgid "%s reset is not allowed in a bare repository"
7414 #: builtin/reset.c:347
7416 msgid "Could not reset index file to revision '%s'."
7419 #: builtin/rev-parse.c:339
7420 msgid "git rev-parse --parseopt [options] -- [<args>...]"
7423 #: builtin/rev-parse.c:344
7424 msgid "keep the `--` passed as an arg"
7427 #: builtin/rev-parse.c:346
7428 msgid "stop parsing after the first non-option argument"
7431 #: builtin/rev-parse.c:464
7433 "git rev-parse --parseopt [options] -- [<args>...]\n"
7434 " or: git rev-parse --sq-quote [<arg>...]\n"
7435 " or: git rev-parse [options] [<arg>...]\n"
7437 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
7440 #: builtin/revert.c:22
7441 msgid "git revert [options] <commit-ish>"
7444 #: builtin/revert.c:23
7445 msgid "git revert <subcommand>"
7448 #: builtin/revert.c:28
7449 msgid "git cherry-pick [options] <commit-ish>"
7452 #: builtin/revert.c:29
7453 msgid "git cherry-pick <subcommand>"
7456 #: builtin/revert.c:70 builtin/revert.c:92
7458 msgid "%s: %s cannot be used with %s"
7461 #: builtin/revert.c:103
7462 msgid "end revert or cherry-pick sequence"
7465 #: builtin/revert.c:104
7466 msgid "resume revert or cherry-pick sequence"
7469 #: builtin/revert.c:105
7470 msgid "cancel revert or cherry-pick sequence"
7473 #: builtin/revert.c:106
7474 msgid "don't automatically commit"
7477 #: builtin/revert.c:107
7478 msgid "edit the commit message"
7481 #: builtin/revert.c:110
7482 msgid "parent number"
7485 #: builtin/revert.c:112
7486 msgid "merge strategy"
7489 #: builtin/revert.c:113
7493 #: builtin/revert.c:114
7494 msgid "option for merge strategy"
7497 #: builtin/revert.c:125
7498 msgid "append commit name"
7501 #: builtin/revert.c:126
7502 msgid "allow fast-forward"
7505 #: builtin/revert.c:127
7506 msgid "preserve initially empty commits"
7509 #: builtin/revert.c:128
7510 msgid "allow commits with empty messages"
7513 #: builtin/revert.c:129
7514 msgid "keep redundant, empty commits"
7517 #: builtin/revert.c:133
7518 msgid "program error"
7521 #: builtin/revert.c:223
7522 msgid "revert failed"
7525 #: builtin/revert.c:238
7526 msgid "cherry-pick failed"
7530 msgid "git rm [options] [--] <file>..."
7536 "'%s' has staged content different from both the file and the HEAD\n"
7537 "(use -f to force removal)"
7543 "'%s' has changes staged in the index\n"
7544 "(use --cached to keep the file, or -f to force removal)"
7550 "'%s' has local modifications\n"
7551 "(use --cached to keep the file, or -f to force removal)"
7555 msgid "do not list removed files"
7559 msgid "only remove from the index"
7563 msgid "override the up-to-date check"
7567 msgid "allow recursive removal"
7571 msgid "exit with a zero status even if nothing matched"
7576 msgid "not removing '%s' recursively without -r"
7581 msgid "git rm: unable to remove %s"
7584 #: builtin/shortlog.c:13
7585 msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
7588 #: builtin/shortlog.c:157
7590 msgid "Missing author: %s"
7593 #: builtin/shortlog.c:253
7594 msgid "sort output according to the number of commits per author"
7597 #: builtin/shortlog.c:255
7598 msgid "Suppress commit descriptions, only provides commit count"
7601 #: builtin/shortlog.c:257
7602 msgid "Show the email address of each author"
7605 #: builtin/shortlog.c:258
7609 #: builtin/shortlog.c:259
7610 msgid "Linewrap output"
7613 #: builtin/show-branch.c:9
7615 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
7616 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
7617 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
7621 #: builtin/show-branch.c:10
7622 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
7625 #: builtin/show-branch.c:651
7626 msgid "show remote-tracking and local branches"
7629 #: builtin/show-branch.c:653
7630 msgid "show remote-tracking branches"
7633 #: builtin/show-branch.c:655
7634 msgid "color '*!+-' corresponding to the branch"
7637 #: builtin/show-branch.c:657
7638 msgid "show <n> more commits after the common ancestor"
7641 #: builtin/show-branch.c:659
7642 msgid "synonym to more=-1"
7645 #: builtin/show-branch.c:660
7646 msgid "suppress naming strings"
7649 #: builtin/show-branch.c:662
7650 msgid "include the current branch"
7653 #: builtin/show-branch.c:664
7654 msgid "name commits with their object names"
7657 #: builtin/show-branch.c:666
7658 msgid "show possible merge bases"
7661 #: builtin/show-branch.c:668
7662 msgid "show refs unreachable from any other ref"
7665 #: builtin/show-branch.c:670
7666 msgid "show commits in topological order"
7669 #: builtin/show-branch.c:672
7670 msgid "show only commits not on the first branch"
7673 #: builtin/show-branch.c:674
7674 msgid "show merges reachable from only one tip"
7677 #: builtin/show-branch.c:676
7678 msgid "show commits where no parent comes before its children"
7681 #: builtin/show-branch.c:678
7682 msgid "<n>[,<base>]"
7685 #: builtin/show-branch.c:679
7686 msgid "show <n> most recent ref-log entries starting at base"
7689 #: builtin/show-ref.c:10
7691 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"
7692 "[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
7695 #: builtin/show-ref.c:11
7696 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
7699 #: builtin/show-ref.c:182
7700 msgid "only show tags (can be combined with heads)"
7703 #: builtin/show-ref.c:183
7704 msgid "only show heads (can be combined with tags)"
7707 #: builtin/show-ref.c:184
7708 msgid "stricter reference checking, requires exact ref path"
7711 #: builtin/show-ref.c:187 builtin/show-ref.c:189
7712 msgid "show the HEAD reference"
7715 #: builtin/show-ref.c:191
7716 msgid "dereference tags into object IDs"
7719 #: builtin/show-ref.c:193
7720 msgid "only show SHA1 hash using <n> digits"
7723 #: builtin/show-ref.c:197
7724 msgid "do not print results to stdout (useful with --verify)"
7727 #: builtin/show-ref.c:199
7728 msgid "show refs from stdin that aren't in local repository"
7731 #: builtin/symbolic-ref.c:7
7732 msgid "git symbolic-ref [options] name [ref]"
7735 #: builtin/symbolic-ref.c:38
7736 msgid "suppress error message for non-symbolic (detached) refs"
7739 #: builtin/symbolic-ref.c:39
7740 msgid "shorten ref output"
7743 #: builtin/symbolic-ref.c:40 builtin/update-ref.c:18
7747 #: builtin/symbolic-ref.c:40 builtin/update-ref.c:18
7748 msgid "reason of the update"
7753 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
7757 msgid "git tag -d <tagname>..."
7762 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
7763 "\t\t[<pattern>...]"
7767 msgid "git tag -v <tagname>..."
7772 msgid "malformed object at '%s'"
7775 #: builtin/tag.c:207
7777 msgid "tag name too long: %.*s..."
7780 #: builtin/tag.c:212
7782 msgid "tag '%s' not found."
7785 #: builtin/tag.c:227
7787 msgid "Deleted tag '%s' (was %s)\n"
7790 #: builtin/tag.c:239
7792 msgid "could not verify the tag '%s'"
7795 #: builtin/tag.c:249
7799 "# Write a tag message\n"
7800 "# Lines starting with '#' will be ignored.\n"
7804 #: builtin/tag.c:256
7808 "# Write a tag message\n"
7809 "# Lines starting with '#' will be kept; you may remove them yourself if you "
7814 #: builtin/tag.c:298
7815 msgid "unable to sign the tag"
7818 #: builtin/tag.c:300
7819 msgid "unable to write tag file"
7822 #: builtin/tag.c:325
7823 msgid "bad object type."
7826 #: builtin/tag.c:338
7827 msgid "tag header too big."
7830 #: builtin/tag.c:370
7831 msgid "no tag message?"
7834 #: builtin/tag.c:376
7836 msgid "The tag message has been left in %s\n"
7839 #: builtin/tag.c:425
7840 msgid "switch 'points-at' requires an object"
7843 #: builtin/tag.c:427
7845 msgid "malformed object name '%s'"
7848 #: builtin/tag.c:447
7849 msgid "list tag names"
7852 #: builtin/tag.c:449
7853 msgid "print <n> lines of each tag message"
7856 #: builtin/tag.c:451
7860 #: builtin/tag.c:452
7864 #: builtin/tag.c:454
7865 msgid "Tag creation options"
7868 #: builtin/tag.c:456
7869 msgid "annotated tag, needs a message"
7872 #: builtin/tag.c:458
7876 #: builtin/tag.c:460
7877 msgid "annotated and GPG-signed tag"
7880 #: builtin/tag.c:464
7881 msgid "use another key to sign the tag"
7884 #: builtin/tag.c:465
7885 msgid "replace the tag if exists"
7888 #: builtin/tag.c:466
7889 msgid "show tag list in columns"
7892 #: builtin/tag.c:468
7893 msgid "Tag listing options"
7896 #: builtin/tag.c:471
7897 msgid "print only tags that contain the commit"
7900 #: builtin/tag.c:477
7901 msgid "print only tags of the object"
7904 #: builtin/tag.c:506
7905 msgid "--column and -n are incompatible"
7908 #: builtin/tag.c:523
7909 msgid "-n option is only allowed with -l."
7912 #: builtin/tag.c:525
7913 msgid "--contains option is only allowed with -l."
7916 #: builtin/tag.c:527
7917 msgid "--points-at option is only allowed with -l."
7920 #: builtin/tag.c:535
7921 msgid "only one -F or -m option is allowed."
7924 #: builtin/tag.c:555
7925 msgid "too many params"
7928 #: builtin/tag.c:561
7930 msgid "'%s' is not a valid tag name."
7933 #: builtin/tag.c:566
7935 msgid "tag '%s' already exists"
7938 #: builtin/tag.c:584
7940 msgid "%s: cannot lock the ref"
7943 #: builtin/tag.c:586
7945 msgid "%s: cannot update the ref"
7948 #: builtin/tag.c:588
7950 msgid "Updated tag '%s' (was %s)\n"
7953 #: builtin/update-index.c:401
7954 msgid "git update-index [options] [--] [<file>...]"
7957 #: builtin/update-index.c:717
7958 msgid "continue refresh even when index needs update"
7961 #: builtin/update-index.c:720
7962 msgid "refresh: ignore submodules"
7965 #: builtin/update-index.c:723
7966 msgid "do not ignore new files"
7969 #: builtin/update-index.c:725
7970 msgid "let files replace directories and vice-versa"
7973 #: builtin/update-index.c:727
7974 msgid "notice files missing from worktree"
7977 #: builtin/update-index.c:729
7978 msgid "refresh even if index contains unmerged entries"
7981 #: builtin/update-index.c:732
7982 msgid "refresh stat information"
7985 #: builtin/update-index.c:736
7986 msgid "like --refresh, but ignore assume-unchanged setting"
7989 #: builtin/update-index.c:740
7990 msgid "<mode> <object> <path>"
7993 #: builtin/update-index.c:741
7994 msgid "add the specified entry to the index"
7997 #: builtin/update-index.c:745
8001 #: builtin/update-index.c:746
8002 msgid "override the executable bit of the listed files"
8005 #: builtin/update-index.c:750
8006 msgid "mark files as \"not changing\""
8009 #: builtin/update-index.c:753
8010 msgid "clear assumed-unchanged bit"
8013 #: builtin/update-index.c:756
8014 msgid "mark files as \"index-only\""
8017 #: builtin/update-index.c:759
8018 msgid "clear skip-worktree bit"
8021 #: builtin/update-index.c:762
8022 msgid "add to index only; do not add content to object database"
8025 #: builtin/update-index.c:764
8026 msgid "remove named paths even if present in worktree"
8029 #: builtin/update-index.c:766
8030 msgid "with --stdin: input lines are terminated by null bytes"
8033 #: builtin/update-index.c:768
8034 msgid "read list of paths to be updated from standard input"
8037 #: builtin/update-index.c:772
8038 msgid "add entries from standard input to the index"
8041 #: builtin/update-index.c:776
8042 msgid "repopulate stages #2 and #3 for the listed paths"
8045 #: builtin/update-index.c:780
8046 msgid "only update entries that differ from HEAD"
8049 #: builtin/update-index.c:784
8050 msgid "ignore files missing from worktree"
8053 #: builtin/update-index.c:787
8054 msgid "report actions to standard output"
8057 #: builtin/update-index.c:789
8058 msgid "(for porcelains) forget saved unresolved conflicts"
8061 #: builtin/update-index.c:793
8062 msgid "write index in this format"
8065 #: builtin/update-ref.c:7
8066 msgid "git update-ref [options] -d <refname> [<oldval>]"
8069 #: builtin/update-ref.c:8
8070 msgid "git update-ref [options] <refname> <newval> [<oldval>]"
8073 #: builtin/update-ref.c:19
8074 msgid "delete the reference"
8077 #: builtin/update-ref.c:21
8078 msgid "update <refname> not the one it points to"
8081 #: builtin/update-server-info.c:6
8082 msgid "git update-server-info [--force]"
8085 #: builtin/update-server-info.c:14
8086 msgid "update the info files from scratch"
8089 #: builtin/verify-pack.c:56
8090 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8093 #: builtin/verify-pack.c:66
8097 #: builtin/verify-pack.c:68
8098 msgid "show statistics only"
8101 #: builtin/verify-tag.c:17
8102 msgid "git verify-tag [-v|--verbose] <tag>..."
8105 #: builtin/verify-tag.c:73
8106 msgid "print tag contents"
8109 #: builtin/write-tree.c:13
8110 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
8113 #: builtin/write-tree.c:26
8117 #: builtin/write-tree.c:27
8118 msgid "write tree object for a subdirectory <prefix>"
8121 #: builtin/write-tree.c:30
8122 msgid "only useful for debugging"
8126 msgid "See 'git help <command>' for more information on a specific command."
8129 #: parse-options.h:156
8130 msgid "no-op (backward compatibility)"
8133 #: parse-options.h:228
8134 msgid "be more verbose"
8137 #: parse-options.h:230
8138 msgid "be more quiet"
8141 #: parse-options.h:236
8142 msgid "use <n> digits to display SHA-1s"
8146 msgid "Add file contents to the index"
8150 msgid "Find by binary search the change that introduced a bug"
8154 msgid "List, create, or delete branches"
8158 msgid "Checkout a branch or paths to the working tree"
8162 msgid "Clone a repository into a new directory"
8166 msgid "Record changes to the repository"
8170 msgid "Show changes between commits, commit and working tree, etc"
8174 msgid "Download objects and refs from another repository"
8178 msgid "Print lines matching a pattern"
8182 msgid "Create an empty git repository or reinitialize an existing one"
8186 msgid "Show commit logs"
8190 msgid "Join two or more development histories together"
8194 msgid "Move or rename a file, a directory, or a symlink"
8198 msgid "Fetch from and merge with another repository or a local branch"
8202 msgid "Update remote refs along with associated objects"
8206 msgid "Forward-port local commits to the updated upstream head"
8210 msgid "Reset current HEAD to the specified state"
8214 msgid "Remove files from the working tree and from the index"
8218 msgid "Show various types of objects"
8222 msgid "Show the working tree status"
8226 msgid "Create, list, delete or verify a tag object signed with GPG"
8230 msgid "You need to set your committer info first"
8235 "You seem to have moved HEAD since the last 'am' failure.\n"
8236 "Not rewinding to ORIG_HEAD"
8242 "When you have resolved this problem, run \"$cmdline --resolved\".\n"
8243 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8244 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
8248 msgid "Cannot fall back to three-way merge."
8252 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
8256 msgid "Using index info to reconstruct a base tree..."
8261 "Did you hand edit your patch?\n"
8262 "It does not apply to blobs recorded in its index."
8266 msgid "Falling back to patching base and 3-way merge..."
8270 msgid "Failed to merge in the changes."
8274 msgid "Only one StGIT patch series can be applied at once"
8279 msgid "Patch format $patch_format is not supported."
8283 msgid "Patch format detection failed."
8288 "The -b/--binary option has been a no-op for long time, and\n"
8289 "it will be removed. Please do not use it anymore."
8294 msgid "previous rebase directory $dotest still exists but mbox given."
8298 msgid "Please make up your mind. --skip or --abort?"
8302 msgid "Resolve operation not in progress, we are not resuming."
8307 msgid "Dirty index: cannot apply patches (dirty: $files)"
8313 "Patch is empty. Was it split wrong?\n"
8314 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
8315 "To restore the original branch and stop patching run \"$cmdline --abort\"."
8319 msgid "Patch does not have a valid e-mail address."
8323 msgid "cannot be interactive without stdin connected to a terminal."
8327 msgid "Commit Body is:"
8330 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
8331 #. in your translation. The program will only accept English
8332 #. input at this point.
8334 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8339 msgid "Applying: $FIRSTLINE"
8344 "No changes - did you forget to use 'git add'?\n"
8345 "If there is nothing left to stage, chances are that something else\n"
8346 "already introduced the same changes; you might want to skip this patch."
8351 "You still have unmerged paths in your index\n"
8352 "did you forget to use 'git add'?"
8356 msgid "No changes -- Patch already applied."
8361 msgid "Patch failed at $msgnum $FIRSTLINE"
8367 "The copy of the patch that failed is found in:\n"
8372 msgid "applying to an empty history"
8376 msgid "You need to start by \"git bisect start\""
8379 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8380 #. translation. The program will only accept English input
8383 msgid "Do you want me to do it for you [Y/n]? "
8388 msgid "unrecognised option: '$arg'"
8393 msgid "'$arg' does not appear to be a valid revision"
8396 #: git-bisect.sh:117
8397 msgid "Bad HEAD - I need a HEAD"
8400 #: git-bisect.sh:130
8403 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
8406 #: git-bisect.sh:140
8407 msgid "won't bisect on seeked tree"
8410 #: git-bisect.sh:144
8411 msgid "Bad HEAD - strange symbolic ref"
8414 #: git-bisect.sh:189
8416 msgid "Bad bisect_write argument: $state"
8419 #: git-bisect.sh:218
8421 msgid "Bad rev input: $arg"
8424 #: git-bisect.sh:232
8425 msgid "Please call 'bisect_state' with at least one argument."
8428 #: git-bisect.sh:244
8430 msgid "Bad rev input: $rev"
8433 #: git-bisect.sh:250
8434 msgid "'git bisect bad' can take only one argument."
8437 #. have bad but not good. we could bisect although
8438 #. this is less optimum.
8439 #: git-bisect.sh:273
8440 msgid "Warning: bisecting only with a bad commit."
8443 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8444 #. translation. The program will only accept English input
8446 #: git-bisect.sh:279
8447 msgid "Are you sure [Y/n]? "
8450 #: git-bisect.sh:289
8452 "You need to give me at least one good and one bad revisions.\n"
8453 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8456 #: git-bisect.sh:292
8458 "You need to start by \"git bisect start\".\n"
8459 "You then need to give me at least one good and one bad revisions.\n"
8460 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8463 #: git-bisect.sh:347 git-bisect.sh:474
8464 msgid "We are not bisecting."
8467 #: git-bisect.sh:354
8469 msgid "'$invalid' is not a valid commit"
8472 #: git-bisect.sh:363
8475 "Could not check out original HEAD '$branch'.\n"
8476 "Try 'git bisect reset <commit>'."
8479 #: git-bisect.sh:390
8480 msgid "No logfile given"
8483 #: git-bisect.sh:391
8485 msgid "cannot read $file for replaying"
8488 #: git-bisect.sh:408
8489 msgid "?? what are you talking about?"
8492 #: git-bisect.sh:420
8494 msgid "running $command"
8497 #: git-bisect.sh:427
8500 "bisect run failed:\n"
8501 "exit code $res from '$command' is < 0 or >= 128"
8504 #: git-bisect.sh:453
8505 msgid "bisect run cannot continue any more"
8508 #: git-bisect.sh:459
8511 "bisect run failed:\n"
8512 "'bisect_state $state' exited with error code $res"
8515 #: git-bisect.sh:466
8516 msgid "bisect run success"
8521 "Pull is not possible because you have unmerged files.\n"
8522 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
8523 "as appropriate to mark resolution, or use 'git commit -a'."
8527 msgid "Pull is not possible because you have unmerged files."
8531 msgid "updating an unborn branch with changes added to the index"
8534 #. The fetch involved updating the current branch.
8535 #. The working tree and the index file is still based on the
8536 #. $orig_head commit, but we are merging into $curr_head.
8537 #. First update the working tree to match $curr_head.
8541 "Warning: fetch updated the current branch head.\n"
8542 "Warning: fast-forwarding your working tree from\n"
8543 "Warning: commit $orig_head."
8547 msgid "Cannot merge multiple branches into empty head"
8551 msgid "Cannot rebase onto multiple branches"
8556 "When you have resolved this problem, run \"git rebase --continue\".\n"
8557 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
8558 "To check out the original branch and stop rebasing, run \"git rebase --abort"
8562 #: git-rebase.sh:160
8563 msgid "The pre-rebase hook refused to rebase."
8566 #: git-rebase.sh:165
8567 msgid "It looks like git-am is in progress. Cannot rebase."
8570 #: git-rebase.sh:296
8571 msgid "The --exec option must be used with the --interactive option"
8574 #: git-rebase.sh:301
8575 msgid "No rebase in progress?"
8578 #: git-rebase.sh:312
8579 msgid "The --edit-todo action can only be used during interactive rebase."
8582 #: git-rebase.sh:319
8583 msgid "Cannot read HEAD"
8586 #: git-rebase.sh:322
8588 "You must edit all merge conflicts and then\n"
8589 "mark them as resolved using git add"
8592 #: git-rebase.sh:340
8594 msgid "Could not move back to $head_name"
8597 #: git-rebase.sh:359
8600 "It seems that there is already a $state_dir_base directory, and\n"
8601 "I wonder if you are in the middle of another rebase. If that is the\n"
8602 "case, please try\n"
8603 "\t$cmd_live_rebase\n"
8604 "If that is not the case, please\n"
8605 "\t$cmd_clear_stale_rebase\n"
8606 "and run me again. I am stopping in case you still have something\n"
8610 #: git-rebase.sh:404
8612 msgid "invalid upstream $upstream_name"
8615 #: git-rebase.sh:428
8617 msgid "$onto_name: there are more than one merge bases"
8620 #: git-rebase.sh:431 git-rebase.sh:435
8622 msgid "$onto_name: there is no merge base"
8625 #: git-rebase.sh:440
8627 msgid "Does not point to a valid commit: $onto_name"
8630 #: git-rebase.sh:463
8632 msgid "fatal: no such branch: $branch_name"
8635 #: git-rebase.sh:483
8636 msgid "Please commit or stash them."
8639 #: git-rebase.sh:501
8641 msgid "Current branch $branch_name is up to date."
8644 #: git-rebase.sh:504
8646 msgid "Current branch $branch_name is up to date, rebase forced."
8649 #: git-rebase.sh:515
8651 msgid "Changes from $mb to $onto:"
8654 #. Detach HEAD and reset the tree
8655 #: git-rebase.sh:524
8656 msgid "First, rewinding head to replay your work on top of it..."
8659 #: git-rebase.sh:532
8661 msgid "Fast-forwarded $branch_name to $onto_name."
8665 msgid "git stash clear with parameters is unimplemented"
8669 msgid "You do not have the initial commit yet"
8673 msgid "Cannot save the current index state"
8676 #: git-stash.sh:123 git-stash.sh:136
8677 msgid "Cannot save the current worktree state"
8681 msgid "No changes selected"
8685 msgid "Cannot remove temporary index (can't happen)"
8689 msgid "Cannot record working tree state"
8692 #. TRANSLATORS: $option is an invalid option, like
8693 #. `--blah-blah'. The 7 spaces at the beginning of the
8694 #. second line correspond to "error: ". So you should line
8695 #. up the second line with however many characters the
8696 #. translation of "error: " takes in your language. E.g. in
8699 #. $ git stash save --blah-blah 2>&1 | head -n 2
8700 #. error: unknown option for 'stash save': --blah-blah
8701 #. To provide a message, use git stash save -- '--blah-blah'
8705 "error: unknown option for 'stash save': $option\n"
8706 " To provide a message, use git stash save -- '$option'"
8710 msgid "No local changes to save"
8714 msgid "Cannot initialize stash"
8718 msgid "Cannot save the current status"
8722 msgid "Cannot remove worktree changes"
8726 msgid "No stash found."
8731 msgid "Too many revisions specified: $REV"
8736 msgid "$reference is not valid reference"
8741 msgid "'$args' is not a stash-like commit"
8746 msgid "'$args' is not a stash reference"
8750 msgid "unable to refresh index"
8754 msgid "Cannot apply a stash in the middle of a merge"
8758 msgid "Conflicts in index. Try without --index."
8762 msgid "Could not save index tree"
8766 msgid "Cannot unstage modified files"
8770 msgid "Index was not unstashed."
8775 msgid "Dropped ${REV} ($s)"
8780 msgid "${REV}: Could not drop stash entry"
8784 msgid "No branch name specified"
8788 msgid "(To restore them type \"git stash apply\")"
8791 #: git-submodule.sh:88
8793 msgid "cannot strip one component off url '$remoteurl'"
8796 #: git-submodule.sh:167
8798 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
8801 #: git-submodule.sh:211
8803 msgid "Clone of '$url' into submodule path '$sm_path' failed"
8806 #: git-submodule.sh:223
8808 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
8811 #: git-submodule.sh:312
8813 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
8816 #: git-submodule.sh:329
8818 msgid "'$sm_path' already exists in the index"
8821 #: git-submodule.sh:333
8824 "The following path is ignored by one of your .gitignore files:\n"
8826 "Use -f if you really want to add it."
8829 #: git-submodule.sh:344
8831 msgid "Adding existing repo at '$sm_path' to the index"
8834 #: git-submodule.sh:346
8836 msgid "'$sm_path' already exists and is not a valid git repo"
8839 #: git-submodule.sh:360
8841 msgid "Unable to checkout submodule '$sm_path'"
8844 #: git-submodule.sh:365
8846 msgid "Failed to add submodule '$sm_path'"
8849 #: git-submodule.sh:370
8851 msgid "Failed to register submodule '$sm_path'"
8854 #: git-submodule.sh:413
8856 msgid "Entering '$prefix$sm_path'"
8859 #: git-submodule.sh:427
8861 msgid "Stopping at '$sm_path'; script returned non-zero status."
8864 #: git-submodule.sh:471
8866 msgid "No url found for submodule path '$sm_path' in .gitmodules"
8869 #: git-submodule.sh:480
8871 msgid "Failed to register url for submodule path '$sm_path'"
8874 #: git-submodule.sh:482
8876 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
8879 #: git-submodule.sh:490
8881 msgid "Failed to register update mode for submodule path '$sm_path'"
8884 #: git-submodule.sh:590
8887 "Submodule path '$sm_path' not initialized\n"
8888 "Maybe you want to use 'update --init'?"
8891 #: git-submodule.sh:603
8893 msgid "Unable to find current revision in submodule path '$sm_path'"
8896 #: git-submodule.sh:622
8898 msgid "Unable to fetch in submodule path '$sm_path'"
8901 #: git-submodule.sh:636
8903 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
8906 #: git-submodule.sh:637
8908 msgid "Submodule path '$sm_path': rebased into '$sha1'"
8911 #: git-submodule.sh:642
8913 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
8916 #: git-submodule.sh:643
8918 msgid "Submodule path '$sm_path': merged in '$sha1'"
8921 #: git-submodule.sh:648
8923 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
8926 #: git-submodule.sh:649
8928 msgid "Submodule path '$sm_path': checked out '$sha1'"
8931 #: git-submodule.sh:671 git-submodule.sh:995
8933 msgid "Failed to recurse into submodule path '$sm_path'"
8936 #: git-submodule.sh:779
8937 msgid "The --cached option cannot be used with the --files option"
8941 #: git-submodule.sh:819
8943 msgid "unexpected mode $mod_dst"
8946 #: git-submodule.sh:837
8948 msgid " Warn: $name doesn't contain commit $sha1_src"
8951 #: git-submodule.sh:840
8953 msgid " Warn: $name doesn't contain commit $sha1_dst"
8956 #: git-submodule.sh:843
8958 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
8961 #: git-submodule.sh:868
8965 #: git-submodule.sh:906
8966 msgid "# Submodules changed but not updated:"
8969 #: git-submodule.sh:908
8970 msgid "# Submodule changes to be committed:"
8973 #: git-submodule.sh:1054
8975 msgid "Synchronizing submodule url for '$name'"