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-08-06 23:47+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'."
40 msgid "'%s' does not look like a v2 bundle file"
45 msgid "unrecognized header: %s%s (%d)"
48 #: bundle.c:89 builtin/commit.c:699
50 msgid "could not open '%s'"
54 msgid "Repository lacks these prerequisite commits:"
57 #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
58 #: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347
59 #: builtin/shortlog.c:181
60 msgid "revision walk setup failed"
65 msgid "The bundle contains %d ref"
66 msgid_plural "The bundle contains %d refs"
71 msgid "The bundle records a complete history."
76 msgid "The bundle requires this ref"
77 msgid_plural "The bundle requires these %d refs"
85 #: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284
87 msgid "unrecognized argument: %s"
92 msgid "ref '%s' is excluded by the rev-list options"
96 msgid "Refusing to create empty bundle."
100 msgid "Could not spawn pack-objects"
104 msgid "pack-objects died"
109 msgid "cannot create '%s'"
113 msgid "index-pack died"
118 msgid "could not parse %s"
123 msgid "%s %s is not a commit!"
126 #: compat/obstack.c:406 compat/obstack.c:408
127 msgid "memory exhausted"
131 msgid "Could not run 'git rev-list'"
136 msgid "failed write to rev-list: %s"
141 msgid "failed to close rev-list's stdin: %s"
145 msgid "in the future"
150 msgid "%lu second ago"
151 msgid_plural "%lu seconds ago"
157 msgid "%lu minute ago"
158 msgid_plural "%lu minutes ago"
165 msgid_plural "%lu hours ago"
172 msgid_plural "%lu days ago"
179 msgid_plural "%lu weeks ago"
185 msgid "%lu month ago"
186 msgid_plural "%lu months ago"
193 msgid_plural "%lu years"
199 msgid "%s, %lu month ago"
200 msgid_plural "%s, %lu months ago"
204 #: date.c:154 date.c:159
207 msgid_plural "%lu years ago"
213 msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
218 msgid " Unknown dirstat parameter '%.*s'\n"
224 "Found errors in 'diff.dirstat' config variable:\n"
229 msgid " 0 files changed"
234 msgid " %d file changed"
235 msgid_plural " %d files changed"
241 msgid ", %d insertion(+)"
242 msgid_plural ", %d insertions(+)"
248 msgid ", %d deletion(-)"
249 msgid_plural ", %d deletions(-)"
256 "Failed to parse --dirstat/-X option parameter:\n"
260 #: gpg-interface.c:59
261 msgid "could not run gpg."
264 #: gpg-interface.c:71
265 msgid "gpg did not accept the data"
268 #: gpg-interface.c:82
269 msgid "gpg failed to sign the data"
274 msgid "'%s': unable to read %s"
284 msgid "'%s': short read %s"
289 msgid "available git commands in '%s'"
293 msgid "git commands available from elsewhere on your $PATH"
299 "'%s' appears to be a git command, but we were not\n"
300 "able to execute it. Maybe git-%s is broken?"
304 msgid "Uh oh. Your system reports no Git commands at all."
310 "WARNING: You called a Git command named '%s', which does not exist.\n"
311 "Continuing under the assumption that you meant '%s'"
316 msgid "in %0.1f seconds automatically..."
321 msgid "git: '%s' is not a git command. See 'git --help'."
330 "Did you mean one of these?"
334 #: merge-recursive.c:190
336 msgid "(bad commit)\n"
339 #: merge-recursive.c:206
341 msgid "addinfo_cache failed for path '%s'"
344 #: merge-recursive.c:268
345 msgid "error building trees"
348 #: merge-recursive.c:497
349 msgid "diff setup failed"
352 #: merge-recursive.c:627
353 msgid "merge-recursive: disk full?"
356 #: merge-recursive.c:690
358 msgid "failed to create path '%s'%s"
361 #: merge-recursive.c:701
363 msgid "Removing %s to make room for subdirectory\n"
366 #. something else exists
367 #. .. but not some other error (who really cares what?)
368 #: merge-recursive.c:715 merge-recursive.c:736
369 msgid ": perhaps a D/F conflict?"
372 #: merge-recursive.c:726
374 msgid "refusing to lose untracked file at '%s'"
377 #: merge-recursive.c:766
379 msgid "cannot read object %s '%s'"
382 #: merge-recursive.c:768
384 msgid "blob expected for %s '%s'"
387 #: merge-recursive.c:791 builtin/clone.c:302
389 msgid "failed to open '%s'"
392 #: merge-recursive.c:799
394 msgid "failed to symlink '%s'"
397 #: merge-recursive.c:802
399 msgid "do not know what to do with %06o %s '%s'"
402 #: merge-recursive.c:939
403 msgid "Failed to execute internal merge"
406 #: merge-recursive.c:943
408 msgid "Unable to add %s to database"
411 #: merge-recursive.c:959
412 msgid "unsupported object type in the tree"
415 #: merge-recursive.c:1038 merge-recursive.c:1052
418 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
422 #: merge-recursive.c:1044 merge-recursive.c:1057
425 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
429 #: merge-recursive.c:1098
433 #: merge-recursive.c:1098
437 #: merge-recursive.c:1154
439 msgid "%s is a directory in %s adding as %s instead"
442 #: merge-recursive.c:1176
445 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
446 "\"->\"%s\" in \"%s\"%s"
449 #: merge-recursive.c:1181
450 msgid " (left unresolved)"
453 #: merge-recursive.c:1235
455 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
458 #: merge-recursive.c:1265
460 msgid "Renaming %s to %s and %s to %s instead"
463 #: merge-recursive.c:1464
465 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
468 #: merge-recursive.c:1474
470 msgid "Adding merged %s"
473 #: merge-recursive.c:1479 merge-recursive.c:1677
475 msgid "Adding as %s instead"
478 #: merge-recursive.c:1530
480 msgid "cannot read object %s"
483 #: merge-recursive.c:1533
485 msgid "object %s is not a blob"
488 #: merge-recursive.c:1581
492 #: merge-recursive.c:1581
496 #: merge-recursive.c:1591
500 #: merge-recursive.c:1598
504 #: merge-recursive.c:1632
506 msgid "Skipped %s (merged same as existing)"
509 #: merge-recursive.c:1646
511 msgid "Auto-merging %s"
514 #: merge-recursive.c:1650 git-submodule.sh:844
518 #: merge-recursive.c:1651
520 msgid "CONFLICT (%s): Merge conflict in %s"
523 #: merge-recursive.c:1741
528 #: merge-recursive.c:1766
529 msgid "file/directory"
532 #: merge-recursive.c:1772
533 msgid "directory/file"
536 #: merge-recursive.c:1777
538 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
541 #: merge-recursive.c:1787
546 #: merge-recursive.c:1804
547 msgid "Fatal merge failure, shouldn't happen."
550 #: merge-recursive.c:1823
551 msgid "Already up-to-date!"
554 #: merge-recursive.c:1832
556 msgid "merging of trees %s and %s failed"
559 #: merge-recursive.c:1862
561 msgid "Unprocessed path??? %s"
564 #: merge-recursive.c:1907
568 #: merge-recursive.c:1920
570 msgid "found %u common ancestor:"
571 msgid_plural "found %u common ancestors:"
575 #: merge-recursive.c:1957
576 msgid "merge returned no commit"
579 #: merge-recursive.c:2014
581 msgid "Could not parse object '%s'"
584 #: merge-recursive.c:2026 builtin/merge.c:697
585 msgid "Unable to write index."
588 #: parse-options.c:494
592 #: parse-options.c:512
597 #. TRANSLATORS: the colon here should align with the
598 #. one in "usage: %s" translation
599 #: parse-options.c:516
604 #: parse-options.c:519
611 msgid "Your branch is ahead of '%s' by %d commit.\n"
612 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
618 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
620 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
627 "Your branch and '%s' have diverged,\n"
628 "and have %d and %d different commit each, respectively.\n"
630 "Your branch and '%s' have diverged,\n"
631 "and have %d and %d different commits each, respectively.\n"
635 #: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
636 #: builtin/merge.c:1088 builtin/merge.c:1098
638 msgid "Could not open '%s' for writing"
641 #: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
642 #: builtin/merge.c:1090 builtin/merge.c:1103
644 msgid "Could not write to '%s'"
649 "after resolving the conflicts, mark the corrected paths\n"
650 "with 'git add <paths>' or 'git rm <paths>'"
655 "after resolving the conflicts, mark the corrected paths\n"
656 "with 'git add <paths>' or 'git rm <paths>'\n"
657 "and commit the result with 'git commit'"
660 #: sequencer.c:160 sequencer.c:758 sequencer.c:841
662 msgid "Could not write to %s"
667 msgid "Error wrapping up %s"
671 msgid "Your local changes would be overwritten by cherry-pick."
675 msgid "Your local changes would be overwritten by revert."
679 msgid "Commit your changes or stash them to proceed."
682 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
685 msgid "%s: Unable to write new index file"
689 msgid "Could not resolve HEAD commit\n"
693 msgid "Unable to update cache tree\n"
698 msgid "Could not parse commit %s\n"
703 msgid "Could not parse parent commit %s\n"
707 msgid "Your index file is unmerged."
711 msgid "You do not have a valid HEAD"
716 msgid "Commit %s is a merge but no -m option was given."
721 msgid "Commit %s does not have parent %d"
726 msgid "Mainline was specified but commit %s is not a merge."
729 #. TRANSLATORS: The first %s will be "revert" or
730 #. "cherry-pick", the second %s a SHA1
733 msgid "%s: cannot parse parent commit %s"
738 msgid "Cannot get commit message for %s"
743 msgid "could not revert %s... %s"
748 msgid "could not apply %s... %s"
752 msgid "empty commit set passed"
757 msgid "git %s: failed to read the index"
762 msgid "git %s: failed to refresh the index"
767 msgid "Cannot %s during a %s"
772 msgid "Could not parse line %d."
776 msgid "No commits parsed."
781 msgid "Could not open %s"
786 msgid "Could not read %s."
791 msgid "Unusable instruction sheet: %s"
796 msgid "Invalid key: %s"
801 msgid "Invalid value for %s: %s"
806 msgid "Malformed options sheet: %s"
810 msgid "a cherry-pick or revert is already in progress"
814 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
819 msgid "Could not create sequencer directory %s"
822 #: sequencer.c:760 sequencer.c:845
824 msgid "Error wrapping up %s."
827 #: sequencer.c:779 sequencer.c:913
828 msgid "no cherry-pick or revert in progress"
832 msgid "cannot resolve HEAD"
836 msgid "cannot abort from a branch yet to be born"
839 #: sequencer.c:805 builtin/apply.c:3988
841 msgid "cannot open %s: %s"
846 msgid "cannot read %s: %s"
850 msgid "unexpected end of file"
855 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
860 msgid "Could not format %s."
864 msgid "Can't revert as initial commit"
868 msgid "Can't cherry-pick into empty head"
872 msgid "HEAD does not point to a branch"
877 msgid "No such branch: '%s'"
882 msgid "No upstream configured for branch '%s'"
887 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
892 msgid "unable to look up current user in the passwd file: %s"
900 msgid "Unmerged paths:"
903 #: wt-status.c:167 wt-status.c:194
905 msgid " (use \"git reset %s <file>...\" to unstage)"
908 #: wt-status.c:169 wt-status.c:196
909 msgid " (use \"git rm --cached <file>...\" to unstage)"
913 msgid " (use \"git add <file>...\" to mark resolution)"
916 #: wt-status.c:175 wt-status.c:179
917 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
921 msgid " (use \"git rm <file>...\" to mark resolution)"
925 msgid "Changes to be committed:"
929 msgid "Changes not staged for commit:"
933 msgid " (use \"git add <file>...\" to update what will be committed)"
937 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
942 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
946 msgid " (commit or discard the untracked or modified content in submodules)"
956 msgid " (use \"git %s <file>...\" to include in what will be committed)"
964 msgid "both deleted:"
972 msgid "deleted by them:"
976 msgid "added by them:"
980 msgid "deleted by us:"
988 msgid "both modified:"
992 msgid "new commits, "
996 msgid "modified content, "
1000 msgid "untracked content, "
1005 msgid "new file: %s"
1010 msgid "copied: %s -> %s"
1020 msgid "modified: %s"
1025 msgid "renamed: %s -> %s"
1030 msgid "typechange: %s"
1040 msgid "unmerged: %s"
1045 msgid "bug: unhandled diff status %c"
1049 msgid "You have unmerged paths."
1052 #: wt-status.c:788 wt-status.c:912
1053 msgid " (fix conflicts and run \"git commit\")"
1057 msgid "All conflicts fixed but you are still merging."
1061 msgid " (use \"git commit\" to conclude merge)"
1065 msgid "You are in the middle of an am session."
1069 msgid "The current patch is empty."
1073 msgid " (fix conflicts and then run \"git am --resolved\")"
1077 msgid " (use \"git am --skip\" to skip this patch)"
1081 msgid " (use \"git am --abort\" to restore the original branch)"
1084 #: wt-status.c:873 wt-status.c:883
1085 msgid "You are currently rebasing."
1089 msgid " (fix conflicts and then run \"git rebase --continue\")"
1093 msgid " (use \"git rebase --skip\" to skip this patch)"
1097 msgid " (use \"git rebase --abort\" to check out the original branch)"
1101 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1105 msgid "You are currently splitting a commit during a rebase."
1109 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1113 msgid "You are currently editing a commit during a rebase."
1117 msgid " (use \"git commit --amend\" to amend the current commit)"
1122 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1126 msgid "You are currently cherry-picking."
1130 msgid " (all conflicts fixed: run \"git commit\")"
1134 msgid "You are currently bisecting."
1138 msgid " (use \"git bisect reset\" to get back to the original branch)"
1146 msgid "Not currently on any branch."
1150 msgid "Initial commit"
1163 msgid "Untracked files not listed%s"
1167 msgid " (use -u option to show untracked files)"
1176 msgid "no changes added to commit%s\n"
1180 msgid " (use \"git add\" and/or \"git commit -a\")"
1185 msgid "nothing added to commit but untracked files present%s\n"
1189 msgid " (use \"git add\" to track)"
1192 #: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041
1194 msgid "nothing to commit%s\n"
1198 msgid " (create/copy files and use \"git add\" to track)"
1202 msgid " (use -u to show untracked files)"
1206 msgid " (working directory clean)"
1210 msgid "HEAD (no branch)"
1214 msgid "Initial commit on "
1221 #: wt-status.c:1174 wt-status.c:1177
1231 msgid "unexpected diff status %c"
1234 #: builtin/add.c:67 builtin/commit.c:229
1235 msgid "updating files failed"
1240 msgid "remove '%s'\n"
1243 #: builtin/add.c:176
1245 msgid "Path '%s' is in submodule '%.*s'"
1248 #: builtin/add.c:192
1249 msgid "Unstaged changes after refreshing the index:"
1252 #: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
1254 msgid "pathspec '%s' did not match any files"
1257 #: builtin/add.c:209
1259 msgid "'%s' is beyond a symbolic link"
1262 #: builtin/add.c:276
1263 msgid "Could not read the index"
1266 #: builtin/add.c:286
1268 msgid "Could not open '%s' for writing."
1271 #: builtin/add.c:290
1272 msgid "Could not write patch"
1275 #: builtin/add.c:295
1277 msgid "Could not stat '%s'"
1280 #: builtin/add.c:297
1281 msgid "Empty patch. Aborted."
1284 #: builtin/add.c:303
1286 msgid "Could not apply '%s'"
1289 #: builtin/add.c:312
1290 msgid "The following paths are ignored by one of your .gitignore files:\n"
1293 #: builtin/add.c:352
1295 msgid "Use -f if you really want to add them.\n"
1298 #: builtin/add.c:353
1299 msgid "no files added"
1302 #: builtin/add.c:359
1303 msgid "adding files failed"
1306 #: builtin/add.c:391
1307 msgid "-A and -u are mutually incompatible"
1310 #: builtin/add.c:393
1311 msgid "Option --ignore-missing can only be used together with --dry-run"
1314 #: builtin/add.c:413
1316 msgid "Nothing specified, nothing added.\n"
1319 #: builtin/add.c:414
1321 msgid "Maybe you wanted to say 'git add .'?\n"
1324 #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82
1326 msgid "index file corrupt"
1329 #: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260
1330 msgid "Unable to write new index file"
1333 #: builtin/apply.c:57
1334 msgid "git apply [options] [<patch>...]"
1337 #: builtin/apply.c:110
1339 msgid "unrecognized whitespace option '%s'"
1342 #: builtin/apply.c:125
1344 msgid "unrecognized whitespace ignore option '%s'"
1347 #: builtin/apply.c:824
1349 msgid "Cannot prepare timestamp regexp %s"
1352 #: builtin/apply.c:833
1354 msgid "regexec returned %d for input: %s"
1357 #: builtin/apply.c:914
1359 msgid "unable to find filename in patch at line %d"
1362 #: builtin/apply.c:946
1364 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1367 #: builtin/apply.c:950
1369 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1372 #: builtin/apply.c:951
1374 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1377 #: builtin/apply.c:958
1379 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1382 #: builtin/apply.c:1403
1384 msgid "recount: unexpected line: %.*s"
1387 #: builtin/apply.c:1460
1389 msgid "patch fragment without header at line %d: %.*s"
1392 #: builtin/apply.c:1477
1395 "git diff header lacks filename information when removing %d leading pathname "
1396 "component (line %d)"
1398 "git diff header lacks filename information when removing %d leading pathname "
1399 "components (line %d)"
1403 #: builtin/apply.c:1637
1404 msgid "new file depends on old contents"
1407 #: builtin/apply.c:1639
1408 msgid "deleted file still has contents"
1411 #: builtin/apply.c:1665
1413 msgid "corrupt patch at line %d"
1416 #: builtin/apply.c:1701
1418 msgid "new file %s depends on old contents"
1421 #: builtin/apply.c:1703
1423 msgid "deleted file %s still has contents"
1426 #: builtin/apply.c:1706
1428 msgid "** warning: file %s becomes empty but is not deleted"
1431 #: builtin/apply.c:1852
1433 msgid "corrupt binary patch at line %d: %.*s"
1436 #. there has to be one hunk (forward hunk)
1437 #: builtin/apply.c:1881
1439 msgid "unrecognized binary patch at line %d"
1442 #: builtin/apply.c:1967
1444 msgid "patch with only garbage at line %d"
1447 #: builtin/apply.c:2057
1449 msgid "unable to read symlink %s"
1452 #: builtin/apply.c:2061
1454 msgid "unable to open or read %s"
1457 #: builtin/apply.c:2132
1461 #: builtin/apply.c:2654
1463 msgid "invalid start of line: '%c'"
1466 #: builtin/apply.c:2772
1468 msgid "Hunk #%d succeeded at %d (offset %d line)."
1469 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1473 #: builtin/apply.c:2784
1475 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1478 #: builtin/apply.c:2790
1481 "while searching for:\n"
1485 #: builtin/apply.c:2809
1487 msgid "missing binary patch data for '%s'"
1490 #: builtin/apply.c:2912
1492 msgid "binary patch does not apply to '%s'"
1495 #: builtin/apply.c:2918
1497 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1500 #: builtin/apply.c:2939
1502 msgid "patch failed: %s:%ld"
1505 #: builtin/apply.c:3061
1507 msgid "cannot checkout %s"
1510 #: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159
1512 msgid "read of %s failed"
1515 #: builtin/apply.c:3139 builtin/apply.c:3361
1517 msgid "path %s has been renamed/deleted"
1520 #: builtin/apply.c:3220 builtin/apply.c:3375
1522 msgid "%s: does not exist in index"
1525 #: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389
1530 #: builtin/apply.c:3229 builtin/apply.c:3383
1532 msgid "%s: does not match index"
1535 #: builtin/apply.c:3331
1536 msgid "removal patch leaves file contents"
1539 #: builtin/apply.c:3400
1541 msgid "%s: wrong type"
1544 #: builtin/apply.c:3402
1546 msgid "%s has type %o, expected %o"
1549 #: builtin/apply.c:3503
1551 msgid "%s: already exists in index"
1554 #: builtin/apply.c:3506
1556 msgid "%s: already exists in working directory"
1559 #: builtin/apply.c:3526
1561 msgid "new mode (%o) of %s does not match old mode (%o)"
1564 #: builtin/apply.c:3531
1566 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1569 #: builtin/apply.c:3539
1571 msgid "%s: patch does not apply"
1574 #: builtin/apply.c:3552
1576 msgid "Checking patch %s..."
1579 #: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158
1581 msgid "make_cache_entry failed for path '%s'"
1584 #: builtin/apply.c:3750
1586 msgid "unable to remove %s from index"
1589 #: builtin/apply.c:3778
1591 msgid "corrupt patch for subproject %s"
1594 #: builtin/apply.c:3782
1596 msgid "unable to stat newly created file '%s'"
1599 #: builtin/apply.c:3787
1601 msgid "unable to create backing store for newly created file %s"
1604 #: builtin/apply.c:3790 builtin/apply.c:3898
1606 msgid "unable to add cache entry for %s"
1609 #: builtin/apply.c:3823
1611 msgid "closing file '%s'"
1614 #: builtin/apply.c:3872
1616 msgid "unable to write file '%s' mode %o"
1619 #: builtin/apply.c:3959
1621 msgid "Applied patch %s cleanly."
1624 #: builtin/apply.c:3967
1625 msgid "internal error"
1628 #. Say this even without --verbose
1629 #: builtin/apply.c:3970
1631 msgid "Applying patch %%s with %d reject..."
1632 msgid_plural "Applying patch %%s with %d rejects..."
1636 #: builtin/apply.c:3980
1638 msgid "truncating .rej filename to %.*s.rej"
1641 #: builtin/apply.c:4001
1643 msgid "Hunk #%d applied cleanly."
1646 #: builtin/apply.c:4004
1648 msgid "Rejected hunk #%d."
1651 #: builtin/apply.c:4154
1652 msgid "unrecognized input"
1655 #: builtin/apply.c:4165
1656 msgid "unable to read index file"
1659 #: builtin/apply.c:4284 builtin/apply.c:4287
1663 #: builtin/apply.c:4285
1664 msgid "don't apply changes matching the given path"
1667 #: builtin/apply.c:4288
1668 msgid "apply changes matching the given path"
1671 #: builtin/apply.c:4290
1675 #: builtin/apply.c:4291
1676 msgid "remove <num> leading slashes from traditional diff paths"
1679 #: builtin/apply.c:4294
1680 msgid "ignore additions made by the patch"
1683 #: builtin/apply.c:4296
1684 msgid "instead of applying the patch, output diffstat for the input"
1687 #: builtin/apply.c:4300
1688 msgid "shows number of added and deleted lines in decimal notation"
1691 #: builtin/apply.c:4302
1692 msgid "instead of applying the patch, output a summary for the input"
1695 #: builtin/apply.c:4304
1696 msgid "instead of applying the patch, see if the patch is applicable"
1699 #: builtin/apply.c:4306
1700 msgid "make sure the patch is applicable to the current index"
1703 #: builtin/apply.c:4308
1704 msgid "apply a patch without touching the working tree"
1707 #: builtin/apply.c:4310
1708 msgid "also apply the patch (use with --stat/--summary/--check)"
1711 #: builtin/apply.c:4312
1712 msgid "attempt three-way merge if a patch does not apply"
1715 #: builtin/apply.c:4314
1716 msgid "build a temporary index based on embedded index information"
1719 #: builtin/apply.c:4316
1720 msgid "paths are separated with NUL character"
1723 #: builtin/apply.c:4319
1724 msgid "ensure at least <n> lines of context match"
1727 #: builtin/apply.c:4320
1731 #: builtin/apply.c:4321
1732 msgid "detect new or modified lines that have whitespace errors"
1735 #: builtin/apply.c:4324 builtin/apply.c:4327
1736 msgid "ignore changes in whitespace when finding context"
1739 #: builtin/apply.c:4330
1740 msgid "apply the patch in reverse"
1743 #: builtin/apply.c:4332
1744 msgid "don't expect at least one line of context"
1747 #: builtin/apply.c:4334
1748 msgid "leave the rejected hunks in corresponding *.rej files"
1751 #: builtin/apply.c:4336
1752 msgid "allow overlapping hunks"
1755 #: builtin/apply.c:4337
1759 #: builtin/apply.c:4339
1760 msgid "tolerate incorrectly detected missing new-line at the end of file"
1763 #: builtin/apply.c:4342
1764 msgid "do not trust the line counts in the hunk headers"
1767 #: builtin/apply.c:4344
1771 #: builtin/apply.c:4345
1772 msgid "prepend <root> to all filenames"
1775 #: builtin/apply.c:4367
1776 msgid "--3way outside a repository"
1779 #: builtin/apply.c:4375
1780 msgid "--index outside a repository"
1783 #: builtin/apply.c:4378
1784 msgid "--cached outside a repository"
1787 #: builtin/apply.c:4394
1789 msgid "can't open patch '%s'"
1792 #: builtin/apply.c:4408
1794 msgid "squelched %d whitespace error"
1795 msgid_plural "squelched %d whitespace errors"
1799 #: builtin/apply.c:4414 builtin/apply.c:4424
1801 msgid "%d line adds whitespace errors."
1802 msgid_plural "%d lines add whitespace errors."
1806 #: builtin/archive.c:17
1808 msgid "could not create archive file '%s'"
1811 #: builtin/archive.c:20
1812 msgid "could not redirect output"
1815 #: builtin/archive.c:37
1816 msgid "git archive: Remote with no URL"
1819 #: builtin/archive.c:58
1820 msgid "git archive: expected ACK/NAK, got EOF"
1823 #: builtin/archive.c:63
1825 msgid "git archive: NACK %s"
1828 #: builtin/archive.c:65
1830 msgid "remote error: %s"
1833 #: builtin/archive.c:66
1834 msgid "git archive: protocol error"
1837 #: builtin/archive.c:71
1838 msgid "git archive: expected a flush"
1841 #: builtin/branch.c:144
1844 "deleting branch '%s' that has been merged to\n"
1845 " '%s', but not yet merged to HEAD."
1848 #: builtin/branch.c:148
1851 "not deleting branch '%s' that is not yet merged to\n"
1852 " '%s', even though it is merged to HEAD."
1855 #: builtin/branch.c:180
1856 msgid "cannot use -a with -d"
1859 #: builtin/branch.c:186
1860 msgid "Couldn't look up commit object for HEAD"
1863 #: builtin/branch.c:191
1865 msgid "Cannot delete the branch '%s' which you are currently on."
1868 #: builtin/branch.c:202
1870 msgid "remote branch '%s' not found."
1873 #: builtin/branch.c:203
1875 msgid "branch '%s' not found."
1878 #: builtin/branch.c:210
1880 msgid "Couldn't look up commit object for '%s'"
1883 #: builtin/branch.c:216
1886 "The branch '%s' is not fully merged.\n"
1887 "If you are sure you want to delete it, run 'git branch -D %s'."
1890 #: builtin/branch.c:225
1892 msgid "Error deleting remote branch '%s'"
1895 #: builtin/branch.c:226
1897 msgid "Error deleting branch '%s'"
1900 #: builtin/branch.c:233
1902 msgid "Deleted remote branch %s (was %s).\n"
1905 #: builtin/branch.c:234
1907 msgid "Deleted branch %s (was %s).\n"
1910 #: builtin/branch.c:239
1911 msgid "Update of config-file failed"
1914 #: builtin/branch.c:337
1916 msgid "branch '%s' does not point at a commit"
1919 #: builtin/branch.c:409
1921 msgid "[%s: behind %d]"
1924 #: builtin/branch.c:411
1929 #: builtin/branch.c:415
1931 msgid "[%s: ahead %d]"
1934 #: builtin/branch.c:417
1939 #: builtin/branch.c:420
1941 msgid "[%s: ahead %d, behind %d]"
1944 #: builtin/branch.c:423
1946 msgid "[ahead %d, behind %d]"
1949 #: builtin/branch.c:535
1953 #: builtin/branch.c:600
1954 msgid "some refs could not be read"
1957 #: builtin/branch.c:613
1958 msgid "cannot rename the current branch while not on any."
1961 #: builtin/branch.c:623
1963 msgid "Invalid branch name: '%s'"
1966 #: builtin/branch.c:638
1967 msgid "Branch rename failed"
1970 #: builtin/branch.c:642
1972 msgid "Renamed a misnamed branch '%s' away"
1975 #: builtin/branch.c:646
1977 msgid "Branch renamed to %s, but HEAD is not updated!"
1980 #: builtin/branch.c:653
1981 msgid "Branch is renamed, but update of config-file failed"
1984 #: builtin/branch.c:668
1986 msgid "malformed object name %s"
1989 #: builtin/branch.c:692
1991 msgid "could not write branch description template: %s"
1994 #: builtin/branch.c:783
1995 msgid "Failed to resolve HEAD as a valid ref."
1998 #: builtin/branch.c:788 builtin/clone.c:561
1999 msgid "HEAD not found below refs/heads!"
2002 #: builtin/branch.c:808
2003 msgid "--column and --verbose are incompatible"
2006 #: builtin/branch.c:857
2007 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2010 #: builtin/bundle.c:47
2012 msgid "%s is okay\n"
2015 #: builtin/bundle.c:56
2016 msgid "Need a repository to create a bundle."
2019 #: builtin/bundle.c:60
2020 msgid "Need a repository to unbundle."
2023 #: builtin/checkout.c:114 builtin/checkout.c:147
2025 msgid "path '%s' does not have our version"
2028 #: builtin/checkout.c:116 builtin/checkout.c:149
2030 msgid "path '%s' does not have their version"
2033 #: builtin/checkout.c:132
2035 msgid "path '%s' does not have all necessary versions"
2038 #: builtin/checkout.c:176
2040 msgid "path '%s' does not have necessary versions"
2043 #: builtin/checkout.c:193
2045 msgid "path '%s': cannot merge"
2048 #: builtin/checkout.c:210
2050 msgid "Unable to add merge result for '%s'"
2053 #: builtin/checkout.c:235 builtin/checkout.c:393
2054 msgid "corrupt index file"
2057 #: builtin/checkout.c:265 builtin/checkout.c:272
2059 msgid "path '%s' is unmerged"
2062 #: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586
2063 #: builtin/merge.c:812
2064 msgid "unable to write new index file"
2067 #: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408
2068 msgid "diff_setup_done failed"
2071 #: builtin/checkout.c:415
2072 msgid "you need to resolve your current index first"
2075 #: builtin/checkout.c:534
2077 msgid "Can not do reflog for '%s'\n"
2080 #: builtin/checkout.c:567
2081 msgid "HEAD is now at"
2084 #: builtin/checkout.c:574
2086 msgid "Reset branch '%s'\n"
2089 #: builtin/checkout.c:577
2091 msgid "Already on '%s'\n"
2094 #: builtin/checkout.c:581
2096 msgid "Switched to and reset branch '%s'\n"
2099 #: builtin/checkout.c:583
2101 msgid "Switched to a new branch '%s'\n"
2104 #: builtin/checkout.c:585
2106 msgid "Switched to branch '%s'\n"
2109 #: builtin/checkout.c:641
2111 msgid " ... and %d more.\n"
2114 #. The singular version
2115 #: builtin/checkout.c:647
2118 "Warning: you are leaving %d commit behind, not connected to\n"
2119 "any of your branches:\n"
2123 "Warning: you are leaving %d commits behind, not connected to\n"
2124 "any of your branches:\n"
2130 #: builtin/checkout.c:665
2133 "If you want to keep them by creating a new branch, this may be a good time\n"
2136 " git branch new_branch_name %s\n"
2140 #: builtin/checkout.c:695
2141 msgid "internal error in revision walk"
2144 #: builtin/checkout.c:699
2145 msgid "Previous HEAD position was"
2148 #: builtin/checkout.c:725 builtin/checkout.c:920
2149 msgid "You are on a branch yet to be born"
2153 #: builtin/checkout.c:856
2155 msgid "invalid reference: %s"
2158 #. case (1): want a tree
2159 #: builtin/checkout.c:895
2161 msgid "reference is not a tree: %s"
2164 #: builtin/checkout.c:977
2165 msgid "-B cannot be used with -b"
2168 #: builtin/checkout.c:986
2169 msgid "--patch is incompatible with all other options"
2172 #: builtin/checkout.c:989
2173 msgid "--detach cannot be used with -b/-B/--orphan"
2176 #: builtin/checkout.c:991
2177 msgid "--detach cannot be used with -t"
2180 #: builtin/checkout.c:997
2181 msgid "--track needs a branch name"
2184 #: builtin/checkout.c:1004
2185 msgid "Missing branch name; try -b"
2188 #: builtin/checkout.c:1010
2189 msgid "--orphan and -b|-B are mutually exclusive"
2192 #: builtin/checkout.c:1012
2193 msgid "--orphan cannot be used with -t"
2196 #: builtin/checkout.c:1022
2197 msgid "git checkout: -f and -m are incompatible"
2200 #: builtin/checkout.c:1056
2201 msgid "invalid path specification"
2204 #: builtin/checkout.c:1064
2207 "git checkout: updating paths is incompatible with switching branches.\n"
2208 "Did you intend to checkout '%s' which can not be resolved as commit?"
2211 #: builtin/checkout.c:1066
2212 msgid "git checkout: updating paths is incompatible with switching branches."
2215 #: builtin/checkout.c:1071
2216 msgid "git checkout: --detach does not take a path argument"
2219 #: builtin/checkout.c:1074
2221 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
2222 "checking out of the index."
2225 #: builtin/checkout.c:1093
2226 msgid "Cannot switch branch to a non-commit."
2229 #: builtin/checkout.c:1096
2230 msgid "--ours/--theirs is incompatible with switching branches."
2233 #: builtin/clean.c:78
2234 msgid "-x and -X cannot be used together"
2237 #: builtin/clean.c:82
2239 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
2242 #: builtin/clean.c:85
2244 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
2248 #: builtin/clean.c:155 builtin/clean.c:176
2250 msgid "Would remove %s\n"
2253 #: builtin/clean.c:159 builtin/clean.c:179
2255 msgid "Removing %s\n"
2258 #: builtin/clean.c:162 builtin/clean.c:182
2260 msgid "failed to remove %s"
2263 #: builtin/clean.c:166
2265 msgid "Would not remove %s\n"
2268 #: builtin/clean.c:168
2270 msgid "Not removing %s\n"
2273 #: builtin/clone.c:243
2275 msgid "reference repository '%s' is not a local directory."
2278 #: builtin/clone.c:306
2280 msgid "failed to create directory '%s'"
2283 #: builtin/clone.c:308 builtin/diff.c:75
2285 msgid "failed to stat '%s'"
2288 #: builtin/clone.c:310
2290 msgid "%s exists and is not a directory"
2293 #: builtin/clone.c:324
2295 msgid "failed to stat %s\n"
2298 #: builtin/clone.c:341
2300 msgid "failed to unlink '%s'"
2303 #: builtin/clone.c:346
2305 msgid "failed to create link '%s'"
2308 #: builtin/clone.c:350
2310 msgid "failed to copy file to '%s'"
2313 #: builtin/clone.c:373
2318 #: builtin/clone.c:443
2320 msgid "Could not find remote branch %s to clone."
2323 #: builtin/clone.c:552
2324 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
2327 #: builtin/clone.c:642
2328 msgid "Too many arguments."
2331 #: builtin/clone.c:646
2332 msgid "You must specify a repository to clone."
2335 #: builtin/clone.c:657
2337 msgid "--bare and --origin %s options are incompatible."
2340 #: builtin/clone.c:671
2342 msgid "repository '%s' does not exist"
2345 #: builtin/clone.c:676
2346 msgid "--depth is ignored in local clones; use file:// instead."
2349 #: builtin/clone.c:686
2351 msgid "destination path '%s' already exists and is not an empty directory."
2354 #: builtin/clone.c:696
2356 msgid "working tree '%s' already exists."
2359 #: builtin/clone.c:709 builtin/clone.c:723
2361 msgid "could not create leading directories of '%s'"
2364 #: builtin/clone.c:712
2366 msgid "could not create work tree dir '%s'."
2369 #: builtin/clone.c:731
2371 msgid "Cloning into bare repository '%s'...\n"
2374 #: builtin/clone.c:733
2376 msgid "Cloning into '%s'...\n"
2379 #: builtin/clone.c:789
2381 msgid "Don't know how to clone %s"
2384 #: builtin/clone.c:838
2386 msgid "Remote branch %s not found in upstream %s"
2389 #: builtin/clone.c:845
2390 msgid "You appear to have cloned an empty repository."
2393 #: builtin/column.c:51
2394 msgid "--command must be the first argument"
2397 #: builtin/commit.c:43
2399 "Your name and email address were configured automatically based\n"
2400 "on your username and hostname. Please check that they are accurate.\n"
2401 "You can suppress this message by setting them explicitly:\n"
2403 " git config --global user.name \"Your Name\"\n"
2404 " git config --global user.email you@example.com\n"
2406 "After doing this, you may fix the identity used for this commit with:\n"
2408 " git commit --amend --reset-author\n"
2411 #: builtin/commit.c:55
2413 "You asked to amend the most recent commit, but doing so would make\n"
2414 "it empty. You can repeat your command with --allow-empty, or you can\n"
2415 "remove the commit entirely with \"git reset HEAD^\".\n"
2418 #: builtin/commit.c:60
2420 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
2421 "If you wish to commit it anyway, use:\n"
2423 " git commit --allow-empty\n"
2425 "Otherwise, please use 'git reset'\n"
2428 #: builtin/commit.c:256
2429 msgid "failed to unpack HEAD tree object"
2432 #: builtin/commit.c:298
2433 msgid "unable to create temporary index"
2436 #: builtin/commit.c:304
2437 msgid "interactive add failed"
2440 #: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408
2441 msgid "unable to write new_index file"
2444 #: builtin/commit.c:389
2445 msgid "cannot do a partial commit during a merge."
2448 #: builtin/commit.c:391
2449 msgid "cannot do a partial commit during a cherry-pick."
2452 #: builtin/commit.c:401
2453 msgid "cannot read the index"
2456 #: builtin/commit.c:421
2457 msgid "unable to write temporary index file"
2460 #: builtin/commit.c:496 builtin/commit.c:502
2462 msgid "invalid commit: %s"
2465 #: builtin/commit.c:525
2466 msgid "malformed --author parameter"
2469 #: builtin/commit.c:585
2471 msgid "Malformed ident string: '%s'"
2474 #: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970
2476 msgid "could not lookup commit %s"
2479 #: builtin/commit.c:635 builtin/shortlog.c:296
2481 msgid "(reading log message from standard input)\n"
2484 #: builtin/commit.c:637
2485 msgid "could not read log from standard input"
2488 #: builtin/commit.c:641
2490 msgid "could not read log file '%s'"
2493 #: builtin/commit.c:647
2494 msgid "commit has empty message"
2497 #: builtin/commit.c:663
2498 msgid "could not read MERGE_MSG"
2501 #: builtin/commit.c:667
2502 msgid "could not read SQUASH_MSG"
2505 #: builtin/commit.c:671
2507 msgid "could not read '%s'"
2510 #: builtin/commit.c:723
2511 msgid "could not write commit template"
2514 #: builtin/commit.c:734
2518 "It looks like you may be committing a merge.\n"
2519 "If this is not correct, please remove the file\n"
2524 #: builtin/commit.c:739
2528 "It looks like you may be committing a cherry-pick.\n"
2529 "If this is not correct, please remove the file\n"
2534 #: builtin/commit.c:751
2536 "Please enter the commit message for your changes. Lines starting\n"
2537 "with '#' will be ignored, and an empty message aborts the commit.\n"
2540 #: builtin/commit.c:756
2542 "Please enter the commit message for your changes. Lines starting\n"
2543 "with '#' will be kept; you may remove them yourself if you want to.\n"
2544 "An empty message aborts the commit.\n"
2547 #: builtin/commit.c:769
2549 msgid "%sAuthor: %s"
2552 #: builtin/commit.c:776
2554 msgid "%sCommitter: %s"
2557 #: builtin/commit.c:796
2558 msgid "Cannot read index"
2561 #: builtin/commit.c:833
2562 msgid "Error building trees"
2565 #: builtin/commit.c:848 builtin/tag.c:361
2567 msgid "Please supply the message using either -m or -F option.\n"
2570 #: builtin/commit.c:945
2572 msgid "No existing author found with '%s'"
2575 #: builtin/commit.c:960 builtin/commit.c:1160
2577 msgid "Invalid untracked files mode '%s'"
2580 #: builtin/commit.c:1000
2581 msgid "Using both --reset-author and --author does not make sense"
2584 #: builtin/commit.c:1011
2585 msgid "You have nothing to amend."
2588 #: builtin/commit.c:1014
2589 msgid "You are in the middle of a merge -- cannot amend."
2592 #: builtin/commit.c:1016
2593 msgid "You are in the middle of a cherry-pick -- cannot amend."
2596 #: builtin/commit.c:1019
2597 msgid "Options --squash and --fixup cannot be used together"
2600 #: builtin/commit.c:1029
2601 msgid "Only one of -c/-C/-F/--fixup can be used."
2604 #: builtin/commit.c:1031
2605 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
2608 #: builtin/commit.c:1039
2609 msgid "--reset-author can be used only with -C, -c or --amend."
2612 #: builtin/commit.c:1056
2613 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
2616 #: builtin/commit.c:1058
2617 msgid "No paths with --include/--only does not make sense."
2620 #: builtin/commit.c:1060
2621 msgid "Clever... amending the last one with dirty index."
2624 #: builtin/commit.c:1062
2625 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
2628 #: builtin/commit.c:1072 builtin/tag.c:577
2630 msgid "Invalid cleanup mode %s"
2633 #: builtin/commit.c:1077
2634 msgid "Paths with -a does not make sense."
2637 #: builtin/commit.c:1260
2638 msgid "couldn't look up newly created commit"
2641 #: builtin/commit.c:1262
2642 msgid "could not parse newly created commit"
2645 #: builtin/commit.c:1303
2646 msgid "detached HEAD"
2649 #: builtin/commit.c:1305
2650 msgid " (root-commit)"
2653 #: builtin/commit.c:1449
2654 msgid "could not parse HEAD commit"
2657 #: builtin/commit.c:1487 builtin/merge.c:509
2659 msgid "could not open '%s' for reading"
2662 #: builtin/commit.c:1494
2664 msgid "Corrupt MERGE_HEAD file (%s)"
2667 #: builtin/commit.c:1501
2668 msgid "could not read MERGE_MODE"
2671 #: builtin/commit.c:1520
2673 msgid "could not read commit message: %s"
2676 #: builtin/commit.c:1534
2678 msgid "Aborting commit; you did not edit the message.\n"
2681 #: builtin/commit.c:1539
2683 msgid "Aborting commit due to empty commit message.\n"
2686 #: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
2687 msgid "failed to write commit object"
2690 #: builtin/commit.c:1575
2691 msgid "cannot lock HEAD ref"
2694 #: builtin/commit.c:1579
2695 msgid "cannot update HEAD ref"
2698 #: builtin/commit.c:1590
2700 "Repository has been updated, but unable to write\n"
2701 "new_index file. Check that disk is not full or quota is\n"
2702 "not exceeded, and then \"git reset HEAD\" to recover."
2705 #: builtin/describe.c:234
2707 msgid "annotated tag %s not available"
2710 #: builtin/describe.c:238
2712 msgid "annotated tag %s has no embedded name"
2715 #: builtin/describe.c:240
2717 msgid "tag '%s' is really '%s' here"
2720 #: builtin/describe.c:267
2722 msgid "Not a valid object name %s"
2725 #: builtin/describe.c:270
2727 msgid "%s is not a valid '%s' object"
2730 #: builtin/describe.c:287
2732 msgid "no tag exactly matches '%s'"
2735 #: builtin/describe.c:289
2737 msgid "searching to describe %s\n"
2740 #: builtin/describe.c:329
2742 msgid "finished search at %s\n"
2745 #: builtin/describe.c:353
2748 "No annotated tags can describe '%s'.\n"
2749 "However, there were unannotated tags: try --tags."
2752 #: builtin/describe.c:357
2755 "No tags can describe '%s'.\n"
2756 "Try --always, or create some tags."
2759 #: builtin/describe.c:378
2761 msgid "traversed %lu commits\n"
2764 #: builtin/describe.c:381
2767 "more than %i tags found; listed %i most recent\n"
2768 "gave up search at %s\n"
2771 #: builtin/describe.c:436
2772 msgid "--long is incompatible with --abbrev=0"
2775 #: builtin/describe.c:462
2776 msgid "No names found, cannot describe anything."
2779 #: builtin/describe.c:482
2780 msgid "--dirty is incompatible with committishes"
2783 #: builtin/diff.c:77
2785 msgid "'%s': not a regular file or symlink"
2788 #: builtin/diff.c:220
2790 msgid "invalid option: %s"
2793 #: builtin/diff.c:297
2794 msgid "Not a git repository"
2797 #: builtin/diff.c:341
2799 msgid "invalid object '%s' given."
2802 #: builtin/diff.c:346
2804 msgid "more than %d trees given: '%s'"
2807 #: builtin/diff.c:356
2809 msgid "more than two blobs given: '%s'"
2812 #: builtin/diff.c:364
2814 msgid "unhandled object '%s' given."
2817 #: builtin/fetch.c:200
2818 msgid "Couldn't find remote ref HEAD"
2821 #: builtin/fetch.c:253
2823 msgid "object %s not found"
2826 #: builtin/fetch.c:259
2827 msgid "[up to date]"
2830 #: builtin/fetch.c:273
2832 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
2835 #: builtin/fetch.c:274 builtin/fetch.c:360
2839 #: builtin/fetch.c:285
2840 msgid "[tag update]"
2843 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
2844 msgid " (unable to update local ref)"
2847 #: builtin/fetch.c:305
2851 #: builtin/fetch.c:308
2852 msgid "[new branch]"
2855 #: builtin/fetch.c:311
2859 #: builtin/fetch.c:356
2860 msgid "unable to update local ref"
2863 #: builtin/fetch.c:356
2864 msgid "forced update"
2867 #: builtin/fetch.c:362
2868 msgid "(non-fast-forward)"
2871 #: builtin/fetch.c:393 builtin/fetch.c:685
2873 msgid "cannot open %s: %s\n"
2876 #: builtin/fetch.c:402
2878 msgid "%s did not send all necessary objects\n"
2881 #: builtin/fetch.c:488
2886 #: builtin/fetch.c:499
2889 "some local refs could not be updated; try running\n"
2890 " 'git remote prune %s' to remove any old, conflicting branches"
2893 #: builtin/fetch.c:549
2895 msgid " (%s will become dangling)"
2898 #: builtin/fetch.c:550
2900 msgid " (%s has become dangling)"
2903 #: builtin/fetch.c:557
2907 #: builtin/fetch.c:558 builtin/remote.c:1055
2911 #: builtin/fetch.c:675
2913 msgid "Refusing to fetch into current branch %s of non-bare repository"
2916 #: builtin/fetch.c:709
2918 msgid "Don't know how to fetch from %s"
2921 #: builtin/fetch.c:786
2923 msgid "Option \"%s\" value \"%s\" is not valid for %s"
2926 #: builtin/fetch.c:789
2928 msgid "Option \"%s\" is ignored for %s\n"
2931 #: builtin/fetch.c:888
2933 msgid "Fetching %s\n"
2936 #: builtin/fetch.c:890 builtin/remote.c:100
2938 msgid "Could not fetch %s"
2941 #: builtin/fetch.c:907
2943 "No remote repository specified. Please, specify either a URL or a\n"
2944 "remote name from which new revisions should be fetched."
2947 #: builtin/fetch.c:927
2948 msgid "You need to specify a tag name."
2951 #: builtin/fetch.c:979
2952 msgid "fetch --all does not take a repository argument"
2955 #: builtin/fetch.c:981
2956 msgid "fetch --all does not make sense with refspecs"
2959 #: builtin/fetch.c:992
2961 msgid "No such remote or remote group: %s"
2964 #: builtin/fetch.c:1000
2965 msgid "Fetching a group and specifying refspecs does not make sense"
2970 msgid "Invalid %s: '%s'"
2975 msgid "insanely long object directory %.*s"
2980 msgid "Auto packing the repository for optimum performance.\n"
2986 "Auto packing the repository for optimum performance. You may also\n"
2987 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
2992 "There are too many unreachable loose objects; run 'git prune' to remove them."
2995 #: builtin/grep.c:216
2997 msgid "grep: failed to create thread: %s"
3000 #: builtin/grep.c:402
3002 msgid "Failed to chdir: %s"
3005 #: builtin/grep.c:478 builtin/grep.c:512
3007 msgid "unable to read tree (%s)"
3010 #: builtin/grep.c:526
3012 msgid "unable to grep from object of type %s"
3015 #: builtin/grep.c:584
3017 msgid "switch `%c' expects a numerical value"
3020 #: builtin/grep.c:601
3022 msgid "cannot open '%s'"
3025 #: builtin/grep.c:885
3026 msgid "no pattern given."
3029 #: builtin/grep.c:899
3031 msgid "bad object %s"
3034 #: builtin/grep.c:940
3035 msgid "--open-files-in-pager only works on the worktree"
3038 #: builtin/grep.c:963
3039 msgid "--cached or --untracked cannot be used with --no-index."
3042 #: builtin/grep.c:968
3043 msgid "--no-index or --untracked cannot be used with revs."
3046 #: builtin/grep.c:971
3047 msgid "--[no-]exclude-standard cannot be used for tracked contents."
3050 #: builtin/grep.c:979
3051 msgid "both --cached and trees are given."
3054 #: builtin/help.c:65
3056 msgid "unrecognized help format '%s'"
3059 #: builtin/help.c:93
3060 msgid "Failed to start emacsclient."
3063 #: builtin/help.c:106
3064 msgid "Failed to parse emacsclient version."
3067 #: builtin/help.c:114
3069 msgid "emacsclient version '%d' too old (< 22)."
3072 #: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
3074 msgid "failed to exec '%s': %s"
3077 #: builtin/help.c:217
3080 "'%s': path for unsupported man viewer.\n"
3081 "Please consider using 'man.<tool>.cmd' instead."
3084 #: builtin/help.c:229
3087 "'%s': cmd for supported man viewer.\n"
3088 "Please consider using 'man.<tool>.path' instead."
3091 #: builtin/help.c:299
3092 msgid "The most commonly used git commands are:"
3095 #: builtin/help.c:367
3097 msgid "'%s': unknown man viewer."
3100 #: builtin/help.c:384
3101 msgid "no man viewer handled the request"
3104 #: builtin/help.c:392
3105 msgid "no info viewer handled the request"
3108 #: builtin/help.c:447 builtin/help.c:454
3113 #: builtin/help.c:470
3115 msgid "`git %s' is aliased to `%s'"
3118 #: builtin/index-pack.c:170
3120 msgid "object type mismatch at %s"
3123 #: builtin/index-pack.c:190
3124 msgid "object of unexpected type"
3127 #: builtin/index-pack.c:227
3129 msgid "cannot fill %d byte"
3130 msgid_plural "cannot fill %d bytes"
3134 #: builtin/index-pack.c:237
3138 #: builtin/index-pack.c:238
3139 msgid "read error on input"
3142 #: builtin/index-pack.c:250
3143 msgid "used more bytes than were available"
3146 #: builtin/index-pack.c:257
3147 msgid "pack too large for current definition of off_t"
3150 #: builtin/index-pack.c:273
3152 msgid "unable to create '%s'"
3155 #: builtin/index-pack.c:278
3157 msgid "cannot open packfile '%s'"
3160 #: builtin/index-pack.c:292
3161 msgid "pack signature mismatch"
3164 #: builtin/index-pack.c:312
3166 msgid "pack has bad object at offset %lu: %s"
3169 #: builtin/index-pack.c:434
3171 msgid "inflate returned %d"
3174 #: builtin/index-pack.c:483
3175 msgid "offset value overflow for delta base object"
3178 #: builtin/index-pack.c:491
3179 msgid "delta base offset is out of bound"
3182 #: builtin/index-pack.c:499
3184 msgid "unknown object type %d"
3187 #: builtin/index-pack.c:530
3188 msgid "cannot pread pack file"
3191 #: builtin/index-pack.c:532
3193 msgid "premature end of pack file, %lu byte missing"
3194 msgid_plural "premature end of pack file, %lu bytes missing"
3198 #: builtin/index-pack.c:558
3199 msgid "serious inflate inconsistency"
3202 #: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
3203 #: builtin/index-pack.c:712 builtin/index-pack.c:721
3205 msgid "SHA1 COLLISION FOUND WITH %s !"
3208 #: builtin/index-pack.c:652 builtin/pack-objects.c:170
3209 #: builtin/pack-objects.c:262
3211 msgid "unable to read %s"
3214 #: builtin/index-pack.c:718
3216 msgid "cannot read existing object %s"
3219 #: builtin/index-pack.c:732
3221 msgid "invalid blob object %s"
3224 #: builtin/index-pack.c:747
3229 #: builtin/index-pack.c:749
3230 msgid "Error in object"
3233 #: builtin/index-pack.c:751
3235 msgid "Not all child objects of %s are reachable"
3238 #: builtin/index-pack.c:821 builtin/index-pack.c:847
3239 msgid "failed to apply delta"
3242 #: builtin/index-pack.c:986
3243 msgid "Receiving objects"
3246 #: builtin/index-pack.c:986
3247 msgid "Indexing objects"
3250 #: builtin/index-pack.c:1012
3251 msgid "pack is corrupted (SHA1 mismatch)"
3254 #: builtin/index-pack.c:1017
3255 msgid "cannot fstat packfile"
3258 #: builtin/index-pack.c:1020
3259 msgid "pack has junk at the end"
3262 #: builtin/index-pack.c:1031
3263 msgid "confusion beyond insanity in parse_pack_objects()"
3266 #: builtin/index-pack.c:1054
3267 msgid "Resolving deltas"
3270 #: builtin/index-pack.c:1105
3271 msgid "confusion beyond insanity"
3274 #: builtin/index-pack.c:1124
3276 msgid "pack has %d unresolved delta"
3277 msgid_plural "pack has %d unresolved deltas"
3281 #: builtin/index-pack.c:1149
3283 msgid "unable to deflate appended object (%d)"
3286 #: builtin/index-pack.c:1228
3288 msgid "local object %s is corrupt"
3291 #: builtin/index-pack.c:1252
3292 msgid "error while closing pack file"
3295 #: builtin/index-pack.c:1265
3297 msgid "cannot write keep file '%s'"
3300 #: builtin/index-pack.c:1273
3302 msgid "cannot close written keep file '%s'"
3305 #: builtin/index-pack.c:1286
3306 msgid "cannot store pack file"
3309 #: builtin/index-pack.c:1297
3310 msgid "cannot store index file"
3313 #: builtin/index-pack.c:1398
3315 msgid "Cannot open existing pack file '%s'"
3318 #: builtin/index-pack.c:1400
3320 msgid "Cannot open existing pack idx file for '%s'"
3323 #: builtin/index-pack.c:1447
3325 msgid "non delta: %d object"
3326 msgid_plural "non delta: %d objects"
3330 #: builtin/index-pack.c:1454
3332 msgid "chain length = %d: %lu object"
3333 msgid_plural "chain length = %d: %lu objects"
3337 #: builtin/index-pack.c:1481
3338 msgid "Cannot come back to cwd"
3341 #: builtin/index-pack.c:1525 builtin/index-pack.c:1528
3342 #: builtin/index-pack.c:1540 builtin/index-pack.c:1544
3347 #: builtin/index-pack.c:1558
3348 msgid "--fix-thin cannot be used without --stdin"
3351 #: builtin/index-pack.c:1562 builtin/index-pack.c:1572
3353 msgid "packfile name '%s' does not end with '.pack'"
3356 #: builtin/index-pack.c:1581
3357 msgid "--verify with no packfile name given"
3360 #: builtin/init-db.c:35
3362 msgid "Could not make %s writable by group"
3365 #: builtin/init-db.c:62
3367 msgid "insanely long template name %s"
3370 #: builtin/init-db.c:67
3372 msgid "cannot stat '%s'"
3375 #: builtin/init-db.c:73
3377 msgid "cannot stat template '%s'"
3380 #: builtin/init-db.c:80
3382 msgid "cannot opendir '%s'"
3385 #: builtin/init-db.c:97
3387 msgid "cannot readlink '%s'"
3390 #: builtin/init-db.c:99
3392 msgid "insanely long symlink %s"
3395 #: builtin/init-db.c:102
3397 msgid "cannot symlink '%s' '%s'"
3400 #: builtin/init-db.c:106
3402 msgid "cannot copy '%s' to '%s'"
3405 #: builtin/init-db.c:110
3407 msgid "ignoring template %s"
3410 #: builtin/init-db.c:133
3412 msgid "insanely long template path %s"
3415 #: builtin/init-db.c:141
3417 msgid "templates not found %s"
3420 #: builtin/init-db.c:154
3422 msgid "not copying templates of a wrong format version %d from '%s'"
3425 #: builtin/init-db.c:192
3427 msgid "insane git directory %s"
3430 #: builtin/init-db.c:323 builtin/init-db.c:326
3432 msgid "%s already exists"
3435 #: builtin/init-db.c:355
3437 msgid "unable to handle file type %d"
3440 #: builtin/init-db.c:358
3442 msgid "unable to move %s to %s"
3445 #: builtin/init-db.c:363
3447 msgid "Could not create git link %s"
3451 #. * TRANSLATORS: The first '%s' is either "Reinitialized
3452 #. * existing" or "Initialized empty", the second " shared" or
3453 #. * "", and the last '%s%s' is the verbatim directory name.
3455 #: builtin/init-db.c:420
3457 msgid "%s%s Git repository in %s%s\n"
3460 #: builtin/init-db.c:421
3461 msgid "Reinitialized existing"
3464 #: builtin/init-db.c:421
3465 msgid "Initialized empty"
3468 #: builtin/init-db.c:422
3472 #: builtin/init-db.c:441
3473 msgid "cannot tell cwd"
3476 #: builtin/init-db.c:522 builtin/init-db.c:529
3478 msgid "cannot mkdir %s"
3481 #: builtin/init-db.c:533
3483 msgid "cannot chdir to %s"
3486 #: builtin/init-db.c:555
3489 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
3493 #: builtin/init-db.c:579
3494 msgid "Cannot access current working directory"
3497 #: builtin/init-db.c:586
3499 msgid "Cannot access work tree '%s'"
3502 #: builtin/log.c:189
3504 msgid "Final output: %d %s\n"
3507 #: builtin/log.c:403 builtin/log.c:494
3509 msgid "Could not read object %s"
3512 #: builtin/log.c:518
3514 msgid "Unknown type: %d"
3517 #: builtin/log.c:608
3518 msgid "format.headers without value"
3521 #: builtin/log.c:682
3522 msgid "name of output directory is too long"
3525 #: builtin/log.c:693
3527 msgid "Cannot open patch file %s"
3530 #: builtin/log.c:707
3531 msgid "Need exactly one range."
3534 #: builtin/log.c:715
3535 msgid "Not a range."
3538 #: builtin/log.c:792
3539 msgid "Cover letter needs email format"
3542 #: builtin/log.c:865
3544 msgid "insane in-reply-to: %s"
3547 #: builtin/log.c:938
3548 msgid "Two output directories?"
3551 #: builtin/log.c:1160
3553 msgid "bogus committer info %s"
3556 #: builtin/log.c:1205
3557 msgid "-n and -k are mutually exclusive."
3560 #: builtin/log.c:1207
3561 msgid "--subject-prefix and -k are mutually exclusive."
3564 #: builtin/log.c:1215
3565 msgid "--name-only does not make sense"
3568 #: builtin/log.c:1217
3569 msgid "--name-status does not make sense"
3572 #: builtin/log.c:1219
3573 msgid "--check does not make sense"
3576 #: builtin/log.c:1242
3577 msgid "standard output, or directory, which one?"
3580 #: builtin/log.c:1244
3582 msgid "Could not create directory '%s'"
3585 #: builtin/log.c:1397
3586 msgid "Failed to create output files"
3589 #: builtin/log.c:1501
3592 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3595 #: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
3597 msgid "Unknown commit %s"
3600 #: builtin/merge.c:90
3601 msgid "switch `m' requires a value"
3604 #: builtin/merge.c:127
3606 msgid "Could not find merge strategy '%s'.\n"
3609 #: builtin/merge.c:128
3611 msgid "Available strategies are:"
3614 #: builtin/merge.c:133
3616 msgid "Available custom strategies are:"
3619 #: builtin/merge.c:240
3620 msgid "could not run stash."
3623 #: builtin/merge.c:245
3624 msgid "stash failed"
3627 #: builtin/merge.c:250
3629 msgid "not a valid object: %s"
3632 #: builtin/merge.c:269 builtin/merge.c:286
3633 msgid "read-tree failed"
3636 #: builtin/merge.c:316
3637 msgid " (nothing to squash)"
3640 #: builtin/merge.c:329
3642 msgid "Squash commit -- not updating HEAD\n"
3645 #: builtin/merge.c:361
3646 msgid "Writing SQUASH_MSG"
3649 #: builtin/merge.c:363
3650 msgid "Finishing SQUASH_MSG"
3653 #: builtin/merge.c:386
3655 msgid "No merge message -- not updating HEAD\n"
3658 #: builtin/merge.c:437
3660 msgid "'%s' does not point to a commit"
3663 #: builtin/merge.c:536
3665 msgid "Bad branch.%s.mergeoptions string: %s"
3668 #: builtin/merge.c:629
3669 msgid "git write-tree failed to write a tree"
3672 #: builtin/merge.c:679
3673 msgid "failed to read the cache"
3676 #: builtin/merge.c:710
3677 msgid "Not handling anything other than two heads merge."
3680 #: builtin/merge.c:724
3682 msgid "Unknown option for merge-recursive: -X%s"
3685 #: builtin/merge.c:738
3687 msgid "unable to write %s"
3690 #: builtin/merge.c:877
3692 msgid "Could not read from '%s'"
3695 #: builtin/merge.c:886
3697 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
3700 #: builtin/merge.c:892
3702 "Please enter a commit message to explain why this merge is necessary,\n"
3703 "especially if it merges an updated upstream into a topic branch.\n"
3705 "Lines starting with '#' will be ignored, and an empty message aborts\n"
3709 #: builtin/merge.c:916
3710 msgid "Empty commit message."
3713 #: builtin/merge.c:928
3715 msgid "Wonderful.\n"
3718 #: builtin/merge.c:993
3720 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
3723 #: builtin/merge.c:1009
3725 msgid "'%s' is not a commit"
3728 #: builtin/merge.c:1050
3729 msgid "No current branch."
3732 #: builtin/merge.c:1052
3733 msgid "No remote for the current branch."
3736 #: builtin/merge.c:1054
3737 msgid "No default upstream defined for the current branch."
3740 #: builtin/merge.c:1059
3742 msgid "No remote tracking branch for %s from %s"
3745 #: builtin/merge.c:1146 builtin/merge.c:1303
3747 msgid "%s - not something we can merge"
3750 #: builtin/merge.c:1214
3751 msgid "There is no merge to abort (MERGE_HEAD missing)."
3754 #: builtin/merge.c:1230 git-pull.sh:31
3756 "You have not concluded your merge (MERGE_HEAD exists).\n"
3757 "Please, commit your changes before you can merge."
3760 #: builtin/merge.c:1233 git-pull.sh:34
3761 msgid "You have not concluded your merge (MERGE_HEAD exists)."
3764 #: builtin/merge.c:1237
3766 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
3767 "Please, commit your changes before you can merge."
3770 #: builtin/merge.c:1240
3771 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
3774 #: builtin/merge.c:1249
3775 msgid "You cannot combine --squash with --no-ff."
3778 #: builtin/merge.c:1254
3779 msgid "You cannot combine --no-ff with --ff-only."
3782 #: builtin/merge.c:1261
3783 msgid "No commit specified and merge.defaultToUpstream not set."
3786 #: builtin/merge.c:1293
3787 msgid "Can merge only exactly one commit into empty head"
3790 #: builtin/merge.c:1296
3791 msgid "Squash commit into empty head not supported yet"
3794 #: builtin/merge.c:1298
3795 msgid "Non-fast-forward commit does not make sense into an empty head"
3798 #: builtin/merge.c:1413
3800 msgid "Updating %s..%s\n"
3803 #: builtin/merge.c:1451
3805 msgid "Trying really trivial in-index merge...\n"
3808 #: builtin/merge.c:1458
3813 #: builtin/merge.c:1490
3814 msgid "Not possible to fast-forward, aborting."
3817 #: builtin/merge.c:1513 builtin/merge.c:1592
3819 msgid "Rewinding the tree to pristine...\n"
3822 #: builtin/merge.c:1517
3824 msgid "Trying merge strategy %s...\n"
3827 #: builtin/merge.c:1583
3829 msgid "No merge strategy handled the merge.\n"
3832 #: builtin/merge.c:1585
3834 msgid "Merge with strategy %s failed.\n"
3837 #: builtin/merge.c:1594
3839 msgid "Using the %s to prepare resolving by hand.\n"
3842 #: builtin/merge.c:1606
3844 msgid "Automatic merge went well; stopped before committing as requested\n"
3849 msgid "Checking rename of '%s' to '%s'\n"
3857 msgid "can not move directory into itself"
3861 msgid "cannot move directory over file"
3866 msgid "Huh? %.*s is in index?"
3870 msgid "source directory is empty"
3874 msgid "not under version control"
3878 msgid "destination exists"
3883 msgid "overwriting '%s'"
3887 msgid "Cannot overwrite"
3891 msgid "multiple sources for the same target"
3896 msgid "%s, source=%s, destination=%s"
3901 msgid "Renaming %s to %s\n"
3904 #: builtin/mv.c:215 builtin/remote.c:731
3906 msgid "renaming '%s' failed"
3909 #: builtin/notes.c:139
3911 msgid "unable to start 'show' for object '%s'"
3914 #: builtin/notes.c:145
3915 msgid "can't fdopen 'show' output fd"
3918 #: builtin/notes.c:155
3920 msgid "failed to close pipe to 'show' for object '%s'"
3923 #: builtin/notes.c:158
3925 msgid "failed to finish 'show' for object '%s'"
3928 #: builtin/notes.c:175 builtin/tag.c:347
3930 msgid "could not create file '%s'"
3933 #: builtin/notes.c:189
3934 msgid "Please supply the note contents using either -m or -F option"
3937 #: builtin/notes.c:210 builtin/notes.c:973
3939 msgid "Removing note for object %s\n"
3942 #: builtin/notes.c:215
3943 msgid "unable to write note object"
3946 #: builtin/notes.c:217
3948 msgid "The note contents has been left in %s"
3951 #: builtin/notes.c:251 builtin/tag.c:542
3953 msgid "cannot read '%s'"
3956 #: builtin/notes.c:253 builtin/tag.c:545
3958 msgid "could not open or read '%s'"
3961 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
3962 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
3963 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
3964 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
3966 msgid "Failed to resolve '%s' as a valid ref."
3969 #: builtin/notes.c:275
3971 msgid "Failed to read object '%s'."
3974 #: builtin/notes.c:299
3975 msgid "Cannot commit uninitialized/unreferenced notes tree"
3978 #: builtin/notes.c:340
3980 msgid "Bad notes.rewriteMode value: '%s'"
3983 #: builtin/notes.c:350
3985 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
3988 #. TRANSLATORS: The first %s is the name of the
3989 #. environment variable, the second %s is its value
3990 #: builtin/notes.c:377
3992 msgid "Bad %s value: '%s'"
3995 #: builtin/notes.c:441
3997 msgid "Malformed input line: '%s'."
4000 #: builtin/notes.c:456
4002 msgid "Failed to copy notes from '%s' to '%s'"
4005 #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
4006 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
4007 #: builtin/notes.c:1033
4008 msgid "too many parameters"
4011 #: builtin/notes.c:513 builtin/notes.c:772
4013 msgid "No note found for object %s."
4016 #: builtin/notes.c:580
4019 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
4023 #: builtin/notes.c:585 builtin/notes.c:662
4025 msgid "Overwriting existing notes for object %s\n"
4028 #: builtin/notes.c:635
4029 msgid "too few parameters"
4032 #: builtin/notes.c:656
4035 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
4039 #: builtin/notes.c:668
4041 msgid "Missing notes on source object %s. Cannot copy."
4044 #: builtin/notes.c:717
4047 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
4048 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
4051 #: builtin/notes.c:971
4053 msgid "Object %s has no note\n"
4056 #: builtin/notes.c:1103 builtin/remote.c:1598
4058 msgid "Unknown subcommand: %s"
4061 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
4063 msgid "deflate error (%d)"
4066 #: builtin/pack-objects.c:2398
4068 msgid "unsupported index version %s"
4071 #: builtin/pack-objects.c:2402
4073 msgid "bad index version '%s'"
4076 #: builtin/pack-objects.c:2425
4078 msgid "option %s does not accept negative form"
4081 #: builtin/pack-objects.c:2429
4083 msgid "unable to parse value '%s' for option %s"
4086 #: builtin/push.c:45
4087 msgid "tag shorthand without <tag>"
4090 #: builtin/push.c:64
4091 msgid "--delete only accepts plain target ref names"
4094 #: builtin/push.c:99
4097 "To choose either option permanently, see push.default in 'git help config'."
4100 #: builtin/push.c:102
4103 "The upstream branch of your current branch does not match\n"
4104 "the name of your current branch. To push to the upstream branch\n"
4105 "on the remote, use\n"
4107 " git push %s HEAD:%s\n"
4109 "To push to the branch of the same name on the remote, use\n"
4115 #: builtin/push.c:121
4118 "You are not currently on a branch.\n"
4119 "To push the history leading to the current (detached HEAD)\n"
4122 " git push %s HEAD:<name-of-remote-branch>\n"
4125 #: builtin/push.c:128
4128 "The current branch %s has no upstream branch.\n"
4129 "To push the current branch and set the remote as upstream, use\n"
4131 " git push --set-upstream %s %s\n"
4134 #: builtin/push.c:136
4136 msgid "The current branch %s has multiple upstream branches, refusing to push."
4139 #: builtin/push.c:139
4142 "You are pushing to remote '%s', which is not the upstream of\n"
4143 "your current branch '%s', without telling me what to push\n"
4144 "to update which remote branch."
4147 #: builtin/push.c:174
4149 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
4152 #: builtin/push.c:181
4154 "Updates were rejected because the tip of your current branch is behind\n"
4155 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
4156 "before pushing again.\n"
4157 "See the 'Note about fast-forwards' in 'git push --help' for details."
4160 #: builtin/push.c:187
4162 "Updates were rejected because a pushed branch tip is behind its remote\n"
4163 "counterpart. If you did not intend to push that branch, you may want to\n"
4164 "specify branches to push or set the 'push.default' configuration\n"
4165 "variable to 'current' or 'upstream' to push only the current branch."
4168 #: builtin/push.c:193
4170 "Updates were rejected because a pushed branch tip is behind its remote\n"
4171 "counterpart. Check out this branch and merge the remote changes\n"
4172 "(e.g. 'git pull') before pushing again.\n"
4173 "See the 'Note about fast-forwards' in 'git push --help' for details."
4176 #: builtin/push.c:233
4178 msgid "Pushing to %s\n"
4181 #: builtin/push.c:237
4183 msgid "failed to push some refs to '%s'"
4186 #: builtin/push.c:269
4188 msgid "bad repository '%s'"
4191 #: builtin/push.c:270
4193 "No configured push destination.\n"
4194 "Either specify the URL from the command-line or configure a remote "
4195 "repository using\n"
4197 " git remote add <name> <url>\n"
4199 "and then push using the remote name\n"
4201 " git push <name>\n"
4204 #: builtin/push.c:285
4205 msgid "--all and --tags are incompatible"
4208 #: builtin/push.c:286
4209 msgid "--all can't be combined with refspecs"
4212 #: builtin/push.c:291
4213 msgid "--mirror and --tags are incompatible"
4216 #: builtin/push.c:292
4217 msgid "--mirror can't be combined with refspecs"
4220 #: builtin/push.c:297
4221 msgid "--all and --mirror are incompatible"
4224 #: builtin/push.c:385
4225 msgid "--delete is incompatible with --all, --mirror and --tags"
4228 #: builtin/push.c:387
4229 msgid "--delete doesn't make sense without any refs"
4232 #: builtin/remote.c:98
4237 #: builtin/remote.c:130
4239 "--mirror is dangerous and deprecated; please\n"
4240 "\t use --mirror=fetch or --mirror=push instead"
4243 #: builtin/remote.c:147
4245 msgid "unknown mirror argument: %s"
4248 #: builtin/remote.c:185
4249 msgid "specifying a master branch makes no sense with --mirror"
4252 #: builtin/remote.c:187
4253 msgid "specifying branches to track makes sense only with fetch mirrors"
4256 #: builtin/remote.c:195 builtin/remote.c:646
4258 msgid "remote %s already exists."
4261 #: builtin/remote.c:199 builtin/remote.c:650
4263 msgid "'%s' is not a valid remote name"
4266 #: builtin/remote.c:243
4268 msgid "Could not setup master '%s'"
4271 #: builtin/remote.c:299
4273 msgid "more than one %s"
4276 #: builtin/remote.c:339
4278 msgid "Could not get fetch map for refspec %s"
4281 #: builtin/remote.c:440 builtin/remote.c:448
4285 #: builtin/remote.c:452
4289 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
4291 msgid "Could not append '%s' to '%s'"
4294 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
4296 msgid "No such remote: %s"
4299 #: builtin/remote.c:656
4301 msgid "Could not rename config section '%s' to '%s'"
4304 #: builtin/remote.c:662 builtin/remote.c:799
4306 msgid "Could not remove config section '%s'"
4309 #: builtin/remote.c:677
4312 "Not updating non-default fetch refspec\n"
4314 "\tPlease update the configuration manually if necessary."
4317 #: builtin/remote.c:683
4319 msgid "Could not append '%s'"
4322 #: builtin/remote.c:694
4324 msgid "Could not set '%s'"
4327 #: builtin/remote.c:716
4329 msgid "deleting '%s' failed"
4332 #: builtin/remote.c:750
4334 msgid "creating '%s' failed"
4337 #: builtin/remote.c:764
4339 msgid "Could not remove branch %s"
4342 #: builtin/remote.c:834
4344 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
4345 "to delete it, use:"
4347 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
4348 "to delete them, use:"
4352 #: builtin/remote.c:943
4354 msgid " new (next fetch will store in remotes/%s)"
4357 #: builtin/remote.c:946
4361 #: builtin/remote.c:948
4362 msgid " stale (use 'git remote prune' to remove)"
4365 #: builtin/remote.c:950
4369 #: builtin/remote.c:991
4371 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
4374 #: builtin/remote.c:998
4376 msgid "rebases onto remote %s"
4379 #: builtin/remote.c:1001
4381 msgid " merges with remote %s"
4384 #: builtin/remote.c:1002
4385 msgid " and with remote"
4388 #: builtin/remote.c:1004
4390 msgid "merges with remote %s"
4393 #: builtin/remote.c:1005
4394 msgid " and with remote"
4397 #: builtin/remote.c:1051
4401 #: builtin/remote.c:1054
4405 #: builtin/remote.c:1058
4409 #: builtin/remote.c:1061
4410 msgid "fast-forwardable"
4413 #: builtin/remote.c:1064
4414 msgid "local out of date"
4417 #: builtin/remote.c:1071
4419 msgid " %-*s forces to %-*s (%s)"
4422 #: builtin/remote.c:1074
4424 msgid " %-*s pushes to %-*s (%s)"
4427 #: builtin/remote.c:1078
4429 msgid " %-*s forces to %s"
4432 #: builtin/remote.c:1081
4434 msgid " %-*s pushes to %s"
4437 #: builtin/remote.c:1118
4442 #: builtin/remote.c:1119
4444 msgid " Fetch URL: %s"
4447 #: builtin/remote.c:1120 builtin/remote.c:1285
4451 #: builtin/remote.c:1129 builtin/remote.c:1131
4453 msgid " Push URL: %s"
4456 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
4458 msgid " HEAD branch: %s"
4461 #: builtin/remote.c:1139
4464 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
4467 #: builtin/remote.c:1151
4469 msgid " Remote branch:%s"
4470 msgid_plural " Remote branches:%s"
4474 #: builtin/remote.c:1154 builtin/remote.c:1181
4475 msgid " (status not queried)"
4478 #: builtin/remote.c:1163
4479 msgid " Local branch configured for 'git pull':"
4480 msgid_plural " Local branches configured for 'git pull':"
4484 #: builtin/remote.c:1171
4485 msgid " Local refs will be mirrored by 'git push'"
4488 #: builtin/remote.c:1178
4490 msgid " Local ref configured for 'git push'%s:"
4491 msgid_plural " Local refs configured for 'git push'%s:"
4495 #: builtin/remote.c:1216
4496 msgid "Cannot determine remote HEAD"
4499 #: builtin/remote.c:1218
4500 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
4503 #: builtin/remote.c:1228
4505 msgid "Could not delete %s"
4508 #: builtin/remote.c:1236
4510 msgid "Not a valid ref: %s"
4513 #: builtin/remote.c:1238
4515 msgid "Could not setup %s"
4518 #: builtin/remote.c:1274
4520 msgid " %s will become dangling!"
4523 #: builtin/remote.c:1275
4525 msgid " %s has become dangling!"
4528 #: builtin/remote.c:1281
4533 #: builtin/remote.c:1282
4538 #: builtin/remote.c:1295
4540 msgid " * [would prune] %s"
4543 #: builtin/remote.c:1298
4545 msgid " * [pruned] %s"
4548 #: builtin/remote.c:1387 builtin/remote.c:1461
4550 msgid "No such remote '%s'"
4553 #: builtin/remote.c:1414
4554 msgid "no remote specified"
4557 #: builtin/remote.c:1447
4558 msgid "--add --delete doesn't make sense"
4561 #: builtin/remote.c:1487
4563 msgid "Invalid old URL pattern: %s"
4566 #: builtin/remote.c:1495
4568 msgid "No such URL found: %s"
4571 #: builtin/remote.c:1497
4572 msgid "Will not delete all non-push URLs"
4575 #: builtin/reset.c:33
4579 #: builtin/reset.c:33
4583 #: builtin/reset.c:33
4587 #: builtin/reset.c:33
4591 #: builtin/reset.c:33
4595 #: builtin/reset.c:77
4596 msgid "You do not have a valid HEAD."
4599 #: builtin/reset.c:79
4600 msgid "Failed to find tree of HEAD."
4603 #: builtin/reset.c:85
4605 msgid "Failed to find tree of %s."
4608 #: builtin/reset.c:96
4609 msgid "Could not write new index file."
4612 #: builtin/reset.c:106
4614 msgid "HEAD is now at %s"
4617 #: builtin/reset.c:130
4618 msgid "Could not read index"
4621 #: builtin/reset.c:133
4622 msgid "Unstaged changes after reset:"
4625 #: builtin/reset.c:223
4627 msgid "Cannot do a %s reset in the middle of a merge."
4630 #: builtin/reset.c:303
4632 msgid "Could not parse object '%s'."
4635 #: builtin/reset.c:308
4636 msgid "--patch is incompatible with --{hard,mixed,soft}"
4639 #: builtin/reset.c:317
4640 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
4643 #: builtin/reset.c:319
4645 msgid "Cannot do %s reset with paths."
4648 #: builtin/reset.c:331
4650 msgid "%s reset is not allowed in a bare repository"
4653 #: builtin/reset.c:347
4655 msgid "Could not reset index file to revision '%s'."
4658 #: builtin/revert.c:70 builtin/revert.c:92
4660 msgid "%s: %s cannot be used with %s"
4663 #: builtin/revert.c:131
4664 msgid "program error"
4667 #: builtin/revert.c:221
4668 msgid "revert failed"
4671 #: builtin/revert.c:236
4672 msgid "cherry-pick failed"
4678 "'%s' has staged content different from both the file and the HEAD\n"
4679 "(use -f to force removal)"
4685 "'%s' has changes staged in the index\n"
4686 "(use --cached to keep the file, or -f to force removal)"
4692 "'%s' has local modifications\n"
4693 "(use --cached to keep the file, or -f to force removal)"
4698 msgid "not removing '%s' recursively without -r"
4703 msgid "git rm: unable to remove %s"
4706 #: builtin/shortlog.c:157
4708 msgid "Missing author: %s"
4713 msgid "malformed object at '%s'"
4716 #: builtin/tag.c:207
4718 msgid "tag name too long: %.*s..."
4721 #: builtin/tag.c:212
4723 msgid "tag '%s' not found."
4726 #: builtin/tag.c:227
4728 msgid "Deleted tag '%s' (was %s)\n"
4731 #: builtin/tag.c:239
4733 msgid "could not verify the tag '%s'"
4736 #: builtin/tag.c:249
4740 "# Write a tag message\n"
4741 "# Lines starting with '#' will be ignored.\n"
4745 #: builtin/tag.c:256
4749 "# Write a tag message\n"
4750 "# Lines starting with '#' will be kept; you may remove them yourself if you "
4755 #: builtin/tag.c:298
4756 msgid "unable to sign the tag"
4759 #: builtin/tag.c:300
4760 msgid "unable to write tag file"
4763 #: builtin/tag.c:325
4764 msgid "bad object type."
4767 #: builtin/tag.c:338
4768 msgid "tag header too big."
4771 #: builtin/tag.c:370
4772 msgid "no tag message?"
4775 #: builtin/tag.c:376
4777 msgid "The tag message has been left in %s\n"
4780 #: builtin/tag.c:425
4781 msgid "switch 'points-at' requires an object"
4784 #: builtin/tag.c:427
4786 msgid "malformed object name '%s'"
4789 #: builtin/tag.c:506
4790 msgid "--column and -n are incompatible"
4793 #: builtin/tag.c:523
4794 msgid "-n option is only allowed with -l."
4797 #: builtin/tag.c:525
4798 msgid "--contains option is only allowed with -l."
4801 #: builtin/tag.c:527
4802 msgid "--points-at option is only allowed with -l."
4805 #: builtin/tag.c:535
4806 msgid "only one -F or -m option is allowed."
4809 #: builtin/tag.c:555
4810 msgid "too many params"
4813 #: builtin/tag.c:561
4815 msgid "'%s' is not a valid tag name."
4818 #: builtin/tag.c:566
4820 msgid "tag '%s' already exists"
4823 #: builtin/tag.c:584
4825 msgid "%s: cannot lock the ref"
4828 #: builtin/tag.c:586
4830 msgid "%s: cannot update the ref"
4833 #: builtin/tag.c:588
4835 msgid "Updated tag '%s' (was %s)\n"
4839 msgid "See 'git help <command>' for more information on a specific command."
4842 #: parse-options.h:133 parse-options.h:235
4846 #: parse-options.h:141
4850 #: parse-options.h:149
4854 #: parse-options.h:151
4858 #: parse-options.h:156
4859 msgid "no-op (backward compatibility)"
4862 #: parse-options.h:228
4863 msgid "be more verbose"
4866 #: parse-options.h:230
4867 msgid "be more quiet"
4870 #: parse-options.h:236
4871 msgid "use <n> digits to display SHA-1s"
4875 msgid "Add file contents to the index"
4879 msgid "Find by binary search the change that introduced a bug"
4883 msgid "List, create, or delete branches"
4887 msgid "Checkout a branch or paths to the working tree"
4891 msgid "Clone a repository into a new directory"
4895 msgid "Record changes to the repository"
4899 msgid "Show changes between commits, commit and working tree, etc"
4903 msgid "Download objects and refs from another repository"
4907 msgid "Print lines matching a pattern"
4911 msgid "Create an empty git repository or reinitialize an existing one"
4915 msgid "Show commit logs"
4919 msgid "Join two or more development histories together"
4923 msgid "Move or rename a file, a directory, or a symlink"
4927 msgid "Fetch from and merge with another repository or a local branch"
4931 msgid "Update remote refs along with associated objects"
4935 msgid "Forward-port local commits to the updated upstream head"
4939 msgid "Reset current HEAD to the specified state"
4943 msgid "Remove files from the working tree and from the index"
4947 msgid "Show various types of objects"
4951 msgid "Show the working tree status"
4955 msgid "Create, list, delete or verify a tag object signed with GPG"
4959 msgid "You need to set your committer info first"
4964 "You seem to have moved HEAD since the last 'am' failure.\n"
4965 "Not rewinding to ORIG_HEAD"
4971 "When you have resolved this problem, run \"$cmdline --resolved\".\n"
4972 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
4973 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
4977 msgid "Cannot fall back to three-way merge."
4981 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4985 msgid "Using index info to reconstruct a base tree..."
4990 "Did you hand edit your patch?\n"
4991 "It does not apply to blobs recorded in its index."
4995 msgid "Falling back to patching base and 3-way merge..."
4999 msgid "Failed to merge in the changes."
5003 msgid "Only one StGIT patch series can be applied at once"
5008 msgid "Patch format $patch_format is not supported."
5012 msgid "Patch format detection failed."
5017 "The -b/--binary option has been a no-op for long time, and\n"
5018 "it will be removed. Please do not use it anymore."
5023 msgid "previous rebase directory $dotest still exists but mbox given."
5027 msgid "Please make up your mind. --skip or --abort?"
5031 msgid "Resolve operation not in progress, we are not resuming."
5036 msgid "Dirty index: cannot apply patches (dirty: $files)"
5042 "Patch is empty. Was it split wrong?\n"
5043 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
5044 "To restore the original branch and stop patching run \"$cmdline --abort\"."
5048 msgid "Patch does not have a valid e-mail address."
5052 msgid "cannot be interactive without stdin connected to a terminal."
5056 msgid "Commit Body is:"
5059 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
5060 #. in your translation. The program will only accept English
5061 #. input at this point.
5063 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
5068 msgid "Applying: $FIRSTLINE"
5073 "No changes - did you forget to use 'git add'?\n"
5074 "If there is nothing left to stage, chances are that something else\n"
5075 "already introduced the same changes; you might want to skip this patch."
5080 "You still have unmerged paths in your index\n"
5081 "did you forget to use 'git add'?"
5085 msgid "No changes -- Patch already applied."
5090 msgid "Patch failed at $msgnum $FIRSTLINE"
5094 msgid "applying to an empty history"
5098 msgid "You need to start by \"git bisect start\""
5101 #. TRANSLATORS: Make sure to include [Y] and [n] in your
5102 #. translation. The program will only accept English input
5105 msgid "Do you want me to do it for you [Y/n]? "
5110 msgid "unrecognised option: '$arg'"
5115 msgid "'$arg' does not appear to be a valid revision"
5118 #: git-bisect.sh:117
5119 msgid "Bad HEAD - I need a HEAD"
5122 #: git-bisect.sh:130
5125 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
5128 #: git-bisect.sh:140
5129 msgid "won't bisect on seeked tree"
5132 #: git-bisect.sh:144
5133 msgid "Bad HEAD - strange symbolic ref"
5136 #: git-bisect.sh:189
5138 msgid "Bad bisect_write argument: $state"
5141 #: git-bisect.sh:218
5143 msgid "Bad rev input: $arg"
5146 #: git-bisect.sh:232
5147 msgid "Please call 'bisect_state' with at least one argument."
5150 #: git-bisect.sh:244
5152 msgid "Bad rev input: $rev"
5155 #: git-bisect.sh:250
5156 msgid "'git bisect bad' can take only one argument."
5159 #. have bad but not good. we could bisect although
5160 #. this is less optimum.
5161 #: git-bisect.sh:273
5162 msgid "Warning: bisecting only with a bad commit."
5165 #. TRANSLATORS: Make sure to include [Y] and [n] in your
5166 #. translation. The program will only accept English input
5168 #: git-bisect.sh:279
5169 msgid "Are you sure [Y/n]? "
5172 #: git-bisect.sh:289
5174 "You need to give me at least one good and one bad revisions.\n"
5175 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
5178 #: git-bisect.sh:292
5180 "You need to start by \"git bisect start\".\n"
5181 "You then need to give me at least one good and one bad revisions.\n"
5182 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
5185 #: git-bisect.sh:347 git-bisect.sh:474
5186 msgid "We are not bisecting."
5189 #: git-bisect.sh:354
5191 msgid "'$invalid' is not a valid commit"
5194 #: git-bisect.sh:363
5197 "Could not check out original HEAD '$branch'.\n"
5198 "Try 'git bisect reset <commit>'."
5201 #: git-bisect.sh:390
5202 msgid "No logfile given"
5205 #: git-bisect.sh:391
5207 msgid "cannot read $file for replaying"
5210 #: git-bisect.sh:408
5211 msgid "?? what are you talking about?"
5214 #: git-bisect.sh:420
5216 msgid "running $command"
5219 #: git-bisect.sh:427
5222 "bisect run failed:\n"
5223 "exit code $res from '$command' is < 0 or >= 128"
5226 #: git-bisect.sh:453
5227 msgid "bisect run cannot continue any more"
5230 #: git-bisect.sh:459
5233 "bisect run failed:\n"
5234 "'bisect_state $state' exited with error code $res"
5237 #: git-bisect.sh:466
5238 msgid "bisect run success"
5243 "Pull is not possible because you have unmerged files.\n"
5244 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
5245 "as appropriate to mark resolution, or use 'git commit -a'."
5249 msgid "Pull is not possible because you have unmerged files."
5253 msgid "updating an unborn branch with changes added to the index"
5256 #. The fetch involved updating the current branch.
5257 #. The working tree and the index file is still based on the
5258 #. $orig_head commit, but we are merging into $curr_head.
5259 #. First update the working tree to match $curr_head.
5263 "Warning: fetch updated the current branch head.\n"
5264 "Warning: fast-forwarding your working tree from\n"
5265 "Warning: commit $orig_head."
5269 msgid "Cannot merge multiple branches into empty head"
5273 msgid "Cannot rebase onto multiple branches"
5278 "When you have resolved this problem, run \"git rebase --continue\".\n"
5279 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
5280 "To check out the original branch and stop rebasing, run \"git rebase --abort"
5284 #: git-rebase.sh:159
5285 msgid "The pre-rebase hook refused to rebase."
5288 #: git-rebase.sh:164
5289 msgid "It looks like git-am is in progress. Cannot rebase."
5292 #: git-rebase.sh:295
5293 msgid "The --exec option must be used with the --interactive option"
5296 #: git-rebase.sh:300
5297 msgid "No rebase in progress?"
5300 #: git-rebase.sh:313
5301 msgid "Cannot read HEAD"
5304 #: git-rebase.sh:316
5306 "You must edit all merge conflicts and then\n"
5307 "mark them as resolved using git add"
5310 #: git-rebase.sh:334
5312 msgid "Could not move back to $head_name"
5315 #: git-rebase.sh:350
5318 "It seems that there is already a $state_dir_base directory, and\n"
5319 "I wonder if you are in the middle of another rebase. If that is the\n"
5320 "case, please try\n"
5321 "\t$cmd_live_rebase\n"
5322 "If that is not the case, please\n"
5323 "\t$cmd_clear_stale_rebase\n"
5324 "and run me again. I am stopping in case you still have something\n"
5328 #: git-rebase.sh:395
5330 msgid "invalid upstream $upstream_name"
5333 #: git-rebase.sh:419
5335 msgid "$onto_name: there are more than one merge bases"
5338 #: git-rebase.sh:422 git-rebase.sh:426
5340 msgid "$onto_name: there is no merge base"
5343 #: git-rebase.sh:431
5345 msgid "Does not point to a valid commit: $onto_name"
5348 #: git-rebase.sh:454
5350 msgid "fatal: no such branch: $branch_name"
5353 #: git-rebase.sh:474
5354 msgid "Please commit or stash them."
5357 #: git-rebase.sh:492
5359 msgid "Current branch $branch_name is up to date."
5362 #: git-rebase.sh:495
5364 msgid "Current branch $branch_name is up to date, rebase forced."
5367 #: git-rebase.sh:506
5369 msgid "Changes from $mb to $onto:"
5372 #. Detach HEAD and reset the tree
5373 #: git-rebase.sh:515
5374 msgid "First, rewinding head to replay your work on top of it..."
5377 #: git-rebase.sh:523
5379 msgid "Fast-forwarded $branch_name to $onto_name."
5383 msgid "git stash clear with parameters is unimplemented"
5387 msgid "You do not have the initial commit yet"
5391 msgid "Cannot save the current index state"
5394 #: git-stash.sh:123 git-stash.sh:136
5395 msgid "Cannot save the current worktree state"
5399 msgid "No changes selected"
5403 msgid "Cannot remove temporary index (can't happen)"
5407 msgid "Cannot record working tree state"
5410 #. TRANSLATORS: $option is an invalid option, like
5411 #. `--blah-blah'. The 7 spaces at the beginning of the
5412 #. second line correspond to "error: ". So you should line
5413 #. up the second line with however many characters the
5414 #. translation of "error: " takes in your language. E.g. in
5417 #. $ git stash save --blah-blah 2>&1 | head -n 2
5418 #. error: unknown option for 'stash save': --blah-blah
5419 #. To provide a message, use git stash save -- '--blah-blah'
5423 "error: unknown option for 'stash save': $option\n"
5424 " To provide a message, use git stash save -- '$option'"
5428 msgid "No local changes to save"
5432 msgid "Cannot initialize stash"
5436 msgid "Cannot save the current status"
5440 msgid "Cannot remove worktree changes"
5444 msgid "No stash found."
5449 msgid "Too many revisions specified: $REV"
5454 msgid "$reference is not valid reference"
5459 msgid "'$args' is not a stash-like commit"
5464 msgid "'$args' is not a stash reference"
5468 msgid "unable to refresh index"
5472 msgid "Cannot apply a stash in the middle of a merge"
5476 msgid "Conflicts in index. Try without --index."
5480 msgid "Could not save index tree"
5484 msgid "Cannot unstage modified files"
5488 msgid "Index was not unstashed."
5493 msgid "Dropped ${REV} ($s)"
5498 msgid "${REV}: Could not drop stash entry"
5502 msgid "No branch name specified"
5506 msgid "(To restore them type \"git stash apply\")"
5509 #: git-submodule.sh:88
5511 msgid "cannot strip one component off url '$remoteurl'"
5514 #: git-submodule.sh:145
5516 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5519 #: git-submodule.sh:189
5521 msgid "Clone of '$url' into submodule path '$sm_path' failed"
5524 #: git-submodule.sh:201
5526 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5529 #: git-submodule.sh:290
5531 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5534 #: git-submodule.sh:307
5536 msgid "'$sm_path' already exists in the index"
5539 #: git-submodule.sh:311
5542 "The following path is ignored by one of your .gitignore files:\n"
5544 "Use -f if you really want to add it."
5547 #: git-submodule.sh:322
5549 msgid "Adding existing repo at '$sm_path' to the index"
5552 #: git-submodule.sh:324
5554 msgid "'$sm_path' already exists and is not a valid git repo"
5557 #: git-submodule.sh:338
5559 msgid "Unable to checkout submodule '$sm_path'"
5562 #: git-submodule.sh:343
5564 msgid "Failed to add submodule '$sm_path'"
5567 #: git-submodule.sh:348
5569 msgid "Failed to register submodule '$sm_path'"
5572 #: git-submodule.sh:390
5574 msgid "Entering '$prefix$sm_path'"
5577 #: git-submodule.sh:404
5579 msgid "Stopping at '$sm_path'; script returned non-zero status."
5582 #: git-submodule.sh:447
5584 msgid "No url found for submodule path '$sm_path' in .gitmodules"
5587 #: git-submodule.sh:456
5589 msgid "Failed to register url for submodule path '$sm_path'"
5592 #: git-submodule.sh:458
5594 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5597 #: git-submodule.sh:466
5599 msgid "Failed to register update mode for submodule path '$sm_path'"
5602 #: git-submodule.sh:565
5605 "Submodule path '$sm_path' not initialized\n"
5606 "Maybe you want to use 'update --init'?"
5609 #: git-submodule.sh:578
5611 msgid "Unable to find current revision in submodule path '$sm_path'"
5614 #: git-submodule.sh:597
5616 msgid "Unable to fetch in submodule path '$sm_path'"
5619 #: git-submodule.sh:611
5621 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5624 #: git-submodule.sh:612
5626 msgid "Submodule path '$sm_path': rebased into '$sha1'"
5629 #: git-submodule.sh:617
5631 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5634 #: git-submodule.sh:618
5636 msgid "Submodule path '$sm_path': merged in '$sha1'"
5639 #: git-submodule.sh:623
5641 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5644 #: git-submodule.sh:624
5646 msgid "Submodule path '$sm_path': checked out '$sha1'"
5649 #: git-submodule.sh:646 git-submodule.sh:969
5651 msgid "Failed to recurse into submodule path '$sm_path'"
5654 #: git-submodule.sh:754
5655 msgid "The --cached option cannot be used with the --files option"
5659 #: git-submodule.sh:794
5661 msgid "unexpected mode $mod_dst"
5664 #: git-submodule.sh:812
5666 msgid " Warn: $name doesn't contain commit $sha1_src"
5669 #: git-submodule.sh:815
5671 msgid " Warn: $name doesn't contain commit $sha1_dst"
5674 #: git-submodule.sh:818
5676 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5679 #: git-submodule.sh:843
5683 #: git-submodule.sh:881
5684 msgid "# Submodules changed but not updated:"
5687 #: git-submodule.sh:883
5688 msgid "# Submodule changes to be committed:"
5691 #: git-submodule.sh:1027
5693 msgid "Synchronizing submodule url for '$name'"