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-09-05 06:20+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:727 builtin/log.c:1313 builtin/log.c:1529 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:1209 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:672
350 msgid "failed to create path '%s'%s"
353 #: merge-recursive.c:683
355 msgid "Removing %s to make room for subdirectory\n"
358 #. something else exists
359 #. .. but not some other error (who really cares what?)
360 #: merge-recursive.c:697 merge-recursive.c:718
361 msgid ": perhaps a D/F conflict?"
364 #: merge-recursive.c:708
366 msgid "refusing to lose untracked file at '%s'"
369 #: merge-recursive.c:748
371 msgid "cannot read object %s '%s'"
374 #: merge-recursive.c:750
376 msgid "blob expected for %s '%s'"
379 #: merge-recursive.c:773 builtin/clone.c:302
381 msgid "failed to open '%s'"
384 #: merge-recursive.c:781
386 msgid "failed to symlink '%s'"
389 #: merge-recursive.c:784
391 msgid "do not know what to do with %06o %s '%s'"
394 #: merge-recursive.c:921
395 msgid "Failed to execute internal merge"
398 #: merge-recursive.c:925
400 msgid "Unable to add %s to database"
403 #: merge-recursive.c:941
404 msgid "unsupported object type in the tree"
407 #: merge-recursive.c:1020 merge-recursive.c:1034
410 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
414 #: merge-recursive.c:1026 merge-recursive.c:1039
417 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
421 #: merge-recursive.c:1080
425 #: merge-recursive.c:1080
429 #: merge-recursive.c:1136
431 msgid "%s is a directory in %s adding as %s instead"
434 #: merge-recursive.c:1158
437 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
438 "\"->\"%s\" in \"%s\"%s"
441 #: merge-recursive.c:1163
442 msgid " (left unresolved)"
445 #: merge-recursive.c:1217
447 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
450 #: merge-recursive.c:1247
452 msgid "Renaming %s to %s and %s to %s instead"
455 #: merge-recursive.c:1446
457 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
460 #: merge-recursive.c:1456
462 msgid "Adding merged %s"
465 #: merge-recursive.c:1461 merge-recursive.c:1659
467 msgid "Adding as %s instead"
470 #: merge-recursive.c:1512
472 msgid "cannot read object %s"
475 #: merge-recursive.c:1515
477 msgid "object %s is not a blob"
480 #: merge-recursive.c:1563
484 #: merge-recursive.c:1563
488 #: merge-recursive.c:1573
492 #: merge-recursive.c:1580
496 #: merge-recursive.c:1614
498 msgid "Skipped %s (merged same as existing)"
501 #: merge-recursive.c:1628
503 msgid "Auto-merging %s"
506 #: merge-recursive.c:1632 git-submodule.sh:869
510 #: merge-recursive.c:1633
512 msgid "CONFLICT (%s): Merge conflict in %s"
515 #: merge-recursive.c:1723
520 #: merge-recursive.c:1748
521 msgid "file/directory"
524 #: merge-recursive.c:1754
525 msgid "directory/file"
528 #: merge-recursive.c:1759
530 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
533 #: merge-recursive.c:1769
538 #: merge-recursive.c:1786
539 msgid "Fatal merge failure, shouldn't happen."
542 #: merge-recursive.c:1805
543 msgid "Already up-to-date!"
546 #: merge-recursive.c:1814
548 msgid "merging of trees %s and %s failed"
551 #: merge-recursive.c:1844
553 msgid "Unprocessed path??? %s"
556 #: merge-recursive.c:1889
560 #: merge-recursive.c:1902
562 msgid "found %u common ancestor:"
563 msgid_plural "found %u common ancestors:"
567 #: merge-recursive.c:1939
568 msgid "merge returned no commit"
571 #: merge-recursive.c:1996
573 msgid "Could not parse object '%s'"
576 #: merge-recursive.c:2008 builtin/merge.c:696
577 msgid "Unable to write index."
580 #: parse-options.c:494
584 #: parse-options.c:512
589 #. TRANSLATORS: the colon here should align with the
590 #. one in "usage: %s" translation
591 #: parse-options.c:516
596 #: parse-options.c:519
603 msgid "Your branch is ahead of '%s' by %d commit.\n"
604 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
610 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
612 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
619 "Your branch and '%s' have diverged,\n"
620 "and have %d and %d different commit each, respectively.\n"
622 "Your branch and '%s' have diverged,\n"
623 "and have %d and %d different commits each, respectively.\n"
627 #: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977
628 #: builtin/merge.c:1087 builtin/merge.c:1097
630 msgid "Could not open '%s' for writing"
633 #: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867
634 #: builtin/merge.c:1089 builtin/merge.c:1102
636 msgid "Could not write to '%s'"
641 "after resolving the conflicts, mark the corrected paths\n"
642 "with 'git add <paths>' or 'git rm <paths>'"
647 "after resolving the conflicts, mark the corrected paths\n"
648 "with 'git add <paths>' or 'git rm <paths>'\n"
649 "and commit the result with 'git commit'"
652 #: sequencer.c:160 sequencer.c:758 sequencer.c:841
654 msgid "Could not write to %s"
659 msgid "Error wrapping up %s"
663 msgid "Your local changes would be overwritten by cherry-pick."
667 msgid "Your local changes would be overwritten by revert."
671 msgid "Commit your changes or stash them to proceed."
674 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
677 msgid "%s: Unable to write new index file"
681 msgid "Could not resolve HEAD commit\n"
685 msgid "Unable to update cache tree\n"
690 msgid "Could not parse commit %s\n"
695 msgid "Could not parse parent commit %s\n"
699 msgid "Your index file is unmerged."
703 msgid "You do not have a valid HEAD"
708 msgid "Commit %s is a merge but no -m option was given."
713 msgid "Commit %s does not have parent %d"
718 msgid "Mainline was specified but commit %s is not a merge."
721 #. TRANSLATORS: The first %s will be "revert" or
722 #. "cherry-pick", the second %s a SHA1
725 msgid "%s: cannot parse parent commit %s"
730 msgid "Cannot get commit message for %s"
735 msgid "could not revert %s... %s"
740 msgid "could not apply %s... %s"
744 msgid "empty commit set passed"
749 msgid "git %s: failed to read the index"
754 msgid "git %s: failed to refresh the index"
759 msgid "Cannot %s during a %s"
764 msgid "Could not parse line %d."
768 msgid "No commits parsed."
773 msgid "Could not open %s"
778 msgid "Could not read %s."
783 msgid "Unusable instruction sheet: %s"
788 msgid "Invalid key: %s"
793 msgid "Invalid value for %s: %s"
798 msgid "Malformed options sheet: %s"
802 msgid "a cherry-pick or revert is already in progress"
806 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
811 msgid "Could not create sequencer directory %s"
814 #: sequencer.c:760 sequencer.c:845
816 msgid "Error wrapping up %s."
819 #: sequencer.c:779 sequencer.c:913
820 msgid "no cherry-pick or revert in progress"
824 msgid "cannot resolve HEAD"
828 msgid "cannot abort from a branch yet to be born"
831 #: sequencer.c:805 builtin/apply.c:3987
833 msgid "cannot open %s: %s"
838 msgid "cannot read %s: %s"
842 msgid "unexpected end of file"
847 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
852 msgid "Could not format %s."
856 msgid "Can't revert as initial commit"
860 msgid "Can't cherry-pick into empty head"
864 msgid "HEAD does not point to a branch"
869 msgid "No such branch: '%s'"
874 msgid "No upstream configured for branch '%s'"
879 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
884 msgid "unable to look up current user in the passwd file: %s"
892 msgid "Unmerged paths:"
895 #: wt-status.c:167 wt-status.c:194
897 msgid " (use \"git reset %s <file>...\" to unstage)"
900 #: wt-status.c:169 wt-status.c:196
901 msgid " (use \"git rm --cached <file>...\" to unstage)"
905 msgid " (use \"git add <file>...\" to mark resolution)"
908 #: wt-status.c:175 wt-status.c:179
909 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
913 msgid " (use \"git rm <file>...\" to mark resolution)"
917 msgid "Changes to be committed:"
921 msgid "Changes not staged for commit:"
925 msgid " (use \"git add <file>...\" to update what will be committed)"
929 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
934 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
938 msgid " (commit or discard the untracked or modified content in submodules)"
948 msgid " (use \"git %s <file>...\" to include in what will be committed)"
956 msgid "both deleted:"
964 msgid "deleted by them:"
968 msgid "added by them:"
972 msgid "deleted by us:"
980 msgid "both modified:"
984 msgid "new commits, "
988 msgid "modified content, "
992 msgid "untracked content, "
1002 msgid "copied: %s -> %s"
1012 msgid "modified: %s"
1017 msgid "renamed: %s -> %s"
1022 msgid "typechange: %s"
1032 msgid "unmerged: %s"
1037 msgid "bug: unhandled diff status %c"
1041 msgid "You have unmerged paths."
1044 #: wt-status.c:788 wt-status.c:912
1045 msgid " (fix conflicts and run \"git commit\")"
1049 msgid "All conflicts fixed but you are still merging."
1053 msgid " (use \"git commit\" to conclude merge)"
1057 msgid "You are in the middle of an am session."
1061 msgid "The current patch is empty."
1065 msgid " (fix conflicts and then run \"git am --resolved\")"
1069 msgid " (use \"git am --skip\" to skip this patch)"
1073 msgid " (use \"git am --abort\" to restore the original branch)"
1076 #: wt-status.c:873 wt-status.c:883
1077 msgid "You are currently rebasing."
1081 msgid " (fix conflicts and then run \"git rebase --continue\")"
1085 msgid " (use \"git rebase --skip\" to skip this patch)"
1089 msgid " (use \"git rebase --abort\" to check out the original branch)"
1093 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1097 msgid "You are currently splitting a commit during a rebase."
1101 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1105 msgid "You are currently editing a commit during a rebase."
1109 msgid " (use \"git commit --amend\" to amend the current commit)"
1114 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1118 msgid "You are currently cherry-picking."
1122 msgid " (all conflicts fixed: run \"git commit\")"
1126 msgid "You are currently bisecting."
1130 msgid " (use \"git bisect reset\" to get back to the original branch)"
1138 msgid "Not currently on any branch."
1142 msgid "Initial commit"
1155 msgid "Untracked files not listed%s"
1159 msgid " (use -u option to show untracked files)"
1168 msgid "no changes added to commit%s\n"
1172 msgid " (use \"git add\" and/or \"git commit -a\")"
1177 msgid "nothing added to commit but untracked files present%s\n"
1181 msgid " (use \"git add\" to track)"
1184 #: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041
1186 msgid "nothing to commit%s\n"
1190 msgid " (create/copy files and use \"git add\" to track)"
1194 msgid " (use -u to show untracked files)"
1198 msgid " (working directory clean)"
1202 msgid "HEAD (no branch)"
1206 msgid "Initial commit on "
1213 #: wt-status.c:1174 wt-status.c:1177
1221 #: compat/precompose_utf8.c:58 builtin/clone.c:341
1223 msgid "failed to unlink '%s'"
1228 msgid "unexpected diff status %c"
1231 #: builtin/add.c:67 builtin/commit.c:229
1232 msgid "updating files failed"
1237 msgid "remove '%s'\n"
1240 #: builtin/add.c:176
1242 msgid "Path '%s' is in submodule '%.*s'"
1245 #: builtin/add.c:192
1246 msgid "Unstaged changes after refreshing the index:"
1249 #: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
1251 msgid "pathspec '%s' did not match any files"
1254 #: builtin/add.c:209
1256 msgid "'%s' is beyond a symbolic link"
1259 #: builtin/add.c:276
1260 msgid "Could not read the index"
1263 #: builtin/add.c:286
1265 msgid "Could not open '%s' for writing."
1268 #: builtin/add.c:290
1269 msgid "Could not write patch"
1272 #: builtin/add.c:295
1274 msgid "Could not stat '%s'"
1277 #: builtin/add.c:297
1278 msgid "Empty patch. Aborted."
1281 #: builtin/add.c:303
1283 msgid "Could not apply '%s'"
1286 #: builtin/add.c:312
1287 msgid "The following paths are ignored by one of your .gitignore files:\n"
1290 #: builtin/add.c:352
1292 msgid "Use -f if you really want to add them.\n"
1295 #: builtin/add.c:353
1296 msgid "no files added"
1299 #: builtin/add.c:359
1300 msgid "adding files failed"
1303 #: builtin/add.c:391
1304 msgid "-A and -u are mutually incompatible"
1307 #: builtin/add.c:393
1308 msgid "Option --ignore-missing can only be used together with --dry-run"
1311 #: builtin/add.c:413
1313 msgid "Nothing specified, nothing added.\n"
1316 #: builtin/add.c:414
1318 msgid "Maybe you wanted to say 'git add .'?\n"
1321 #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82
1323 msgid "index file corrupt"
1326 #: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260
1327 msgid "Unable to write new index file"
1330 #: builtin/apply.c:57
1331 msgid "git apply [options] [<patch>...]"
1334 #: builtin/apply.c:110
1336 msgid "unrecognized whitespace option '%s'"
1339 #: builtin/apply.c:125
1341 msgid "unrecognized whitespace ignore option '%s'"
1344 #: builtin/apply.c:823
1346 msgid "Cannot prepare timestamp regexp %s"
1349 #: builtin/apply.c:832
1351 msgid "regexec returned %d for input: %s"
1354 #: builtin/apply.c:913
1356 msgid "unable to find filename in patch at line %d"
1359 #: builtin/apply.c:945
1361 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1364 #: builtin/apply.c:949
1366 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1369 #: builtin/apply.c:950
1371 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1374 #: builtin/apply.c:957
1376 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1379 #: builtin/apply.c:1402
1381 msgid "recount: unexpected line: %.*s"
1384 #: builtin/apply.c:1459
1386 msgid "patch fragment without header at line %d: %.*s"
1389 #: builtin/apply.c:1476
1392 "git diff header lacks filename information when removing %d leading pathname "
1393 "component (line %d)"
1395 "git diff header lacks filename information when removing %d leading pathname "
1396 "components (line %d)"
1400 #: builtin/apply.c:1636
1401 msgid "new file depends on old contents"
1404 #: builtin/apply.c:1638
1405 msgid "deleted file still has contents"
1408 #: builtin/apply.c:1664
1410 msgid "corrupt patch at line %d"
1413 #: builtin/apply.c:1700
1415 msgid "new file %s depends on old contents"
1418 #: builtin/apply.c:1702
1420 msgid "deleted file %s still has contents"
1423 #: builtin/apply.c:1705
1425 msgid "** warning: file %s becomes empty but is not deleted"
1428 #: builtin/apply.c:1851
1430 msgid "corrupt binary patch at line %d: %.*s"
1433 #. there has to be one hunk (forward hunk)
1434 #: builtin/apply.c:1880
1436 msgid "unrecognized binary patch at line %d"
1439 #: builtin/apply.c:1966
1441 msgid "patch with only garbage at line %d"
1444 #: builtin/apply.c:2056
1446 msgid "unable to read symlink %s"
1449 #: builtin/apply.c:2060
1451 msgid "unable to open or read %s"
1454 #: builtin/apply.c:2131
1458 #: builtin/apply.c:2653
1460 msgid "invalid start of line: '%c'"
1463 #: builtin/apply.c:2771
1465 msgid "Hunk #%d succeeded at %d (offset %d line)."
1466 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1470 #: builtin/apply.c:2783
1472 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1475 #: builtin/apply.c:2789
1478 "while searching for:\n"
1482 #: builtin/apply.c:2808
1484 msgid "missing binary patch data for '%s'"
1487 #: builtin/apply.c:2911
1489 msgid "binary patch does not apply to '%s'"
1492 #: builtin/apply.c:2917
1494 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1497 #: builtin/apply.c:2938
1499 msgid "patch failed: %s:%ld"
1502 #: builtin/apply.c:3060
1504 msgid "cannot checkout %s"
1507 #: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158
1509 msgid "read of %s failed"
1512 #: builtin/apply.c:3138 builtin/apply.c:3360
1514 msgid "path %s has been renamed/deleted"
1517 #: builtin/apply.c:3219 builtin/apply.c:3374
1519 msgid "%s: does not exist in index"
1522 #: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388
1527 #: builtin/apply.c:3228 builtin/apply.c:3382
1529 msgid "%s: does not match index"
1532 #: builtin/apply.c:3330
1533 msgid "removal patch leaves file contents"
1536 #: builtin/apply.c:3399
1538 msgid "%s: wrong type"
1541 #: builtin/apply.c:3401
1543 msgid "%s has type %o, expected %o"
1546 #: builtin/apply.c:3502
1548 msgid "%s: already exists in index"
1551 #: builtin/apply.c:3505
1553 msgid "%s: already exists in working directory"
1556 #: builtin/apply.c:3525
1558 msgid "new mode (%o) of %s does not match old mode (%o)"
1561 #: builtin/apply.c:3530
1563 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1566 #: builtin/apply.c:3538
1568 msgid "%s: patch does not apply"
1571 #: builtin/apply.c:3551
1573 msgid "Checking patch %s..."
1576 #: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158
1578 msgid "make_cache_entry failed for path '%s'"
1581 #: builtin/apply.c:3749
1583 msgid "unable to remove %s from index"
1586 #: builtin/apply.c:3777
1588 msgid "corrupt patch for subproject %s"
1591 #: builtin/apply.c:3781
1593 msgid "unable to stat newly created file '%s'"
1596 #: builtin/apply.c:3786
1598 msgid "unable to create backing store for newly created file %s"
1601 #: builtin/apply.c:3789 builtin/apply.c:3897
1603 msgid "unable to add cache entry for %s"
1606 #: builtin/apply.c:3822
1608 msgid "closing file '%s'"
1611 #: builtin/apply.c:3871
1613 msgid "unable to write file '%s' mode %o"
1616 #: builtin/apply.c:3958
1618 msgid "Applied patch %s cleanly."
1621 #: builtin/apply.c:3966
1622 msgid "internal error"
1625 #. Say this even without --verbose
1626 #: builtin/apply.c:3969
1628 msgid "Applying patch %%s with %d reject..."
1629 msgid_plural "Applying patch %%s with %d rejects..."
1633 #: builtin/apply.c:3979
1635 msgid "truncating .rej filename to %.*s.rej"
1638 #: builtin/apply.c:4000
1640 msgid "Hunk #%d applied cleanly."
1643 #: builtin/apply.c:4003
1645 msgid "Rejected hunk #%d."
1648 #: builtin/apply.c:4153
1649 msgid "unrecognized input"
1652 #: builtin/apply.c:4164
1653 msgid "unable to read index file"
1656 #: builtin/apply.c:4283 builtin/apply.c:4286
1660 #: builtin/apply.c:4284
1661 msgid "don't apply changes matching the given path"
1664 #: builtin/apply.c:4287
1665 msgid "apply changes matching the given path"
1668 #: builtin/apply.c:4289
1672 #: builtin/apply.c:4290
1673 msgid "remove <num> leading slashes from traditional diff paths"
1676 #: builtin/apply.c:4293
1677 msgid "ignore additions made by the patch"
1680 #: builtin/apply.c:4295
1681 msgid "instead of applying the patch, output diffstat for the input"
1684 #: builtin/apply.c:4299
1685 msgid "shows number of added and deleted lines in decimal notation"
1688 #: builtin/apply.c:4301
1689 msgid "instead of applying the patch, output a summary for the input"
1692 #: builtin/apply.c:4303
1693 msgid "instead of applying the patch, see if the patch is applicable"
1696 #: builtin/apply.c:4305
1697 msgid "make sure the patch is applicable to the current index"
1700 #: builtin/apply.c:4307
1701 msgid "apply a patch without touching the working tree"
1704 #: builtin/apply.c:4309
1705 msgid "also apply the patch (use with --stat/--summary/--check)"
1708 #: builtin/apply.c:4311
1709 msgid "attempt three-way merge if a patch does not apply"
1712 #: builtin/apply.c:4313
1713 msgid "build a temporary index based on embedded index information"
1716 #: builtin/apply.c:4315
1717 msgid "paths are separated with NUL character"
1720 #: builtin/apply.c:4318
1721 msgid "ensure at least <n> lines of context match"
1724 #: builtin/apply.c:4319
1728 #: builtin/apply.c:4320
1729 msgid "detect new or modified lines that have whitespace errors"
1732 #: builtin/apply.c:4323 builtin/apply.c:4326
1733 msgid "ignore changes in whitespace when finding context"
1736 #: builtin/apply.c:4329
1737 msgid "apply the patch in reverse"
1740 #: builtin/apply.c:4331
1741 msgid "don't expect at least one line of context"
1744 #: builtin/apply.c:4333
1745 msgid "leave the rejected hunks in corresponding *.rej files"
1748 #: builtin/apply.c:4335
1749 msgid "allow overlapping hunks"
1752 #: builtin/apply.c:4336
1756 #: builtin/apply.c:4338
1757 msgid "tolerate incorrectly detected missing new-line at the end of file"
1760 #: builtin/apply.c:4341
1761 msgid "do not trust the line counts in the hunk headers"
1764 #: builtin/apply.c:4343
1768 #: builtin/apply.c:4344
1769 msgid "prepend <root> to all filenames"
1772 #: builtin/apply.c:4366
1773 msgid "--3way outside a repository"
1776 #: builtin/apply.c:4374
1777 msgid "--index outside a repository"
1780 #: builtin/apply.c:4377
1781 msgid "--cached outside a repository"
1784 #: builtin/apply.c:4393
1786 msgid "can't open patch '%s'"
1789 #: builtin/apply.c:4407
1791 msgid "squelched %d whitespace error"
1792 msgid_plural "squelched %d whitespace errors"
1796 #: builtin/apply.c:4413 builtin/apply.c:4423
1798 msgid "%d line adds whitespace errors."
1799 msgid_plural "%d lines add whitespace errors."
1803 #: builtin/archive.c:17
1805 msgid "could not create archive file '%s'"
1808 #: builtin/archive.c:20
1809 msgid "could not redirect output"
1812 #: builtin/archive.c:37
1813 msgid "git archive: Remote with no URL"
1816 #: builtin/archive.c:58
1817 msgid "git archive: expected ACK/NAK, got EOF"
1820 #: builtin/archive.c:63
1822 msgid "git archive: NACK %s"
1825 #: builtin/archive.c:65
1827 msgid "remote error: %s"
1830 #: builtin/archive.c:66
1831 msgid "git archive: protocol error"
1834 #: builtin/archive.c:71
1835 msgid "git archive: expected a flush"
1838 #: builtin/branch.c:144
1841 "deleting branch '%s' that has been merged to\n"
1842 " '%s', but not yet merged to HEAD."
1845 #: builtin/branch.c:148
1848 "not deleting branch '%s' that is not yet merged to\n"
1849 " '%s', even though it is merged to HEAD."
1852 #: builtin/branch.c:180
1853 msgid "cannot use -a with -d"
1856 #: builtin/branch.c:186
1857 msgid "Couldn't look up commit object for HEAD"
1860 #: builtin/branch.c:191
1862 msgid "Cannot delete the branch '%s' which you are currently on."
1865 #: builtin/branch.c:202
1867 msgid "remote branch '%s' not found."
1870 #: builtin/branch.c:203
1872 msgid "branch '%s' not found."
1875 #: builtin/branch.c:210
1877 msgid "Couldn't look up commit object for '%s'"
1880 #: builtin/branch.c:216
1883 "The branch '%s' is not fully merged.\n"
1884 "If you are sure you want to delete it, run 'git branch -D %s'."
1887 #: builtin/branch.c:225
1889 msgid "Error deleting remote branch '%s'"
1892 #: builtin/branch.c:226
1894 msgid "Error deleting branch '%s'"
1897 #: builtin/branch.c:233
1899 msgid "Deleted remote branch %s (was %s).\n"
1902 #: builtin/branch.c:234
1904 msgid "Deleted branch %s (was %s).\n"
1907 #: builtin/branch.c:239
1908 msgid "Update of config-file failed"
1911 #: builtin/branch.c:337
1913 msgid "branch '%s' does not point at a commit"
1916 #: builtin/branch.c:409
1918 msgid "[%s: behind %d]"
1921 #: builtin/branch.c:411
1926 #: builtin/branch.c:415
1928 msgid "[%s: ahead %d]"
1931 #: builtin/branch.c:417
1936 #: builtin/branch.c:420
1938 msgid "[%s: ahead %d, behind %d]"
1941 #: builtin/branch.c:423
1943 msgid "[ahead %d, behind %d]"
1946 #: builtin/branch.c:535
1950 #: builtin/branch.c:600
1951 msgid "some refs could not be read"
1954 #: builtin/branch.c:613
1955 msgid "cannot rename the current branch while not on any."
1958 #: builtin/branch.c:623
1960 msgid "Invalid branch name: '%s'"
1963 #: builtin/branch.c:638
1964 msgid "Branch rename failed"
1967 #: builtin/branch.c:642
1969 msgid "Renamed a misnamed branch '%s' away"
1972 #: builtin/branch.c:646
1974 msgid "Branch renamed to %s, but HEAD is not updated!"
1977 #: builtin/branch.c:653
1978 msgid "Branch is renamed, but update of config-file failed"
1981 #: builtin/branch.c:668
1983 msgid "malformed object name %s"
1986 #: builtin/branch.c:692
1988 msgid "could not write branch description template: %s"
1991 #: builtin/branch.c:783
1992 msgid "Failed to resolve HEAD as a valid ref."
1995 #: builtin/branch.c:788 builtin/clone.c:561
1996 msgid "HEAD not found below refs/heads!"
1999 #: builtin/branch.c:808
2000 msgid "--column and --verbose are incompatible"
2003 #: builtin/branch.c:857
2004 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2007 #: builtin/bundle.c:47
2009 msgid "%s is okay\n"
2012 #: builtin/bundle.c:56
2013 msgid "Need a repository to create a bundle."
2016 #: builtin/bundle.c:60
2017 msgid "Need a repository to unbundle."
2020 #: builtin/checkout.c:114 builtin/checkout.c:147
2022 msgid "path '%s' does not have our version"
2025 #: builtin/checkout.c:116 builtin/checkout.c:149
2027 msgid "path '%s' does not have their version"
2030 #: builtin/checkout.c:132
2032 msgid "path '%s' does not have all necessary versions"
2035 #: builtin/checkout.c:176
2037 msgid "path '%s' does not have necessary versions"
2040 #: builtin/checkout.c:193
2042 msgid "path '%s': cannot merge"
2045 #: builtin/checkout.c:210
2047 msgid "Unable to add merge result for '%s'"
2050 #: builtin/checkout.c:235 builtin/checkout.c:392
2051 msgid "corrupt index file"
2054 #: builtin/checkout.c:265 builtin/checkout.c:272
2056 msgid "path '%s' is unmerged"
2059 #: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586
2060 #: builtin/merge.c:811
2061 msgid "unable to write new index file"
2064 #: builtin/checkout.c:414
2065 msgid "you need to resolve your current index first"
2068 #: builtin/checkout.c:533
2070 msgid "Can not do reflog for '%s'\n"
2073 #: builtin/checkout.c:566
2074 msgid "HEAD is now at"
2077 #: builtin/checkout.c:573
2079 msgid "Reset branch '%s'\n"
2082 #: builtin/checkout.c:576
2084 msgid "Already on '%s'\n"
2087 #: builtin/checkout.c:580
2089 msgid "Switched to and reset branch '%s'\n"
2092 #: builtin/checkout.c:582
2094 msgid "Switched to a new branch '%s'\n"
2097 #: builtin/checkout.c:584
2099 msgid "Switched to branch '%s'\n"
2102 #: builtin/checkout.c:640
2104 msgid " ... and %d more.\n"
2107 #. The singular version
2108 #: builtin/checkout.c:646
2111 "Warning: you are leaving %d commit behind, not connected to\n"
2112 "any of your branches:\n"
2116 "Warning: you are leaving %d commits behind, not connected to\n"
2117 "any of your branches:\n"
2123 #: builtin/checkout.c:664
2126 "If you want to keep them by creating a new branch, this may be a good time\n"
2129 " git branch new_branch_name %s\n"
2133 #: builtin/checkout.c:694
2134 msgid "internal error in revision walk"
2137 #: builtin/checkout.c:698
2138 msgid "Previous HEAD position was"
2141 #: builtin/checkout.c:724 builtin/checkout.c:919
2142 msgid "You are on a branch yet to be born"
2146 #: builtin/checkout.c:855
2148 msgid "invalid reference: %s"
2151 #. case (1): want a tree
2152 #: builtin/checkout.c:894
2154 msgid "reference is not a tree: %s"
2157 #: builtin/checkout.c:976
2158 msgid "-B cannot be used with -b"
2161 #: builtin/checkout.c:985
2162 msgid "--patch is incompatible with all other options"
2165 #: builtin/checkout.c:988
2166 msgid "--detach cannot be used with -b/-B/--orphan"
2169 #: builtin/checkout.c:990
2170 msgid "--detach cannot be used with -t"
2173 #: builtin/checkout.c:996
2174 msgid "--track needs a branch name"
2177 #: builtin/checkout.c:1003
2178 msgid "Missing branch name; try -b"
2181 #: builtin/checkout.c:1009
2182 msgid "--orphan and -b|-B are mutually exclusive"
2185 #: builtin/checkout.c:1011
2186 msgid "--orphan cannot be used with -t"
2189 #: builtin/checkout.c:1021
2190 msgid "git checkout: -f and -m are incompatible"
2193 #: builtin/checkout.c:1055
2194 msgid "invalid path specification"
2197 #: builtin/checkout.c:1063
2200 "git checkout: updating paths is incompatible with switching branches.\n"
2201 "Did you intend to checkout '%s' which can not be resolved as commit?"
2204 #: builtin/checkout.c:1065
2205 msgid "git checkout: updating paths is incompatible with switching branches."
2208 #: builtin/checkout.c:1070
2209 msgid "git checkout: --detach does not take a path argument"
2212 #: builtin/checkout.c:1073
2214 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
2215 "checking out of the index."
2218 #: builtin/checkout.c:1092
2219 msgid "Cannot switch branch to a non-commit."
2222 #: builtin/checkout.c:1095
2223 msgid "--ours/--theirs is incompatible with switching branches."
2226 #: builtin/clean.c:78
2227 msgid "-x and -X cannot be used together"
2230 #: builtin/clean.c:82
2232 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
2235 #: builtin/clean.c:85
2237 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
2241 #: builtin/clean.c:155 builtin/clean.c:176
2243 msgid "Would remove %s\n"
2246 #: builtin/clean.c:159 builtin/clean.c:179
2248 msgid "Removing %s\n"
2251 #: builtin/clean.c:162 builtin/clean.c:182
2253 msgid "failed to remove %s"
2256 #: builtin/clean.c:166
2258 msgid "Would not remove %s\n"
2261 #: builtin/clean.c:168
2263 msgid "Not removing %s\n"
2266 #: builtin/clone.c:243
2268 msgid "reference repository '%s' is not a local directory."
2271 #: builtin/clone.c:306
2273 msgid "failed to create directory '%s'"
2276 #: builtin/clone.c:308 builtin/diff.c:77
2278 msgid "failed to stat '%s'"
2281 #: builtin/clone.c:310
2283 msgid "%s exists and is not a directory"
2286 #: builtin/clone.c:324
2288 msgid "failed to stat %s\n"
2291 #: builtin/clone.c:346
2293 msgid "failed to create link '%s'"
2296 #: builtin/clone.c:350
2298 msgid "failed to copy file to '%s'"
2301 #: builtin/clone.c:373
2306 #: builtin/clone.c:443
2308 msgid "Could not find remote branch %s to clone."
2311 #: builtin/clone.c:552
2312 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
2315 #: builtin/clone.c:642
2316 msgid "Too many arguments."
2319 #: builtin/clone.c:646
2320 msgid "You must specify a repository to clone."
2323 #: builtin/clone.c:657
2325 msgid "--bare and --origin %s options are incompatible."
2328 #: builtin/clone.c:671
2330 msgid "repository '%s' does not exist"
2333 #: builtin/clone.c:676
2334 msgid "--depth is ignored in local clones; use file:// instead."
2337 #: builtin/clone.c:686
2339 msgid "destination path '%s' already exists and is not an empty directory."
2342 #: builtin/clone.c:696
2344 msgid "working tree '%s' already exists."
2347 #: builtin/clone.c:709 builtin/clone.c:723
2349 msgid "could not create leading directories of '%s'"
2352 #: builtin/clone.c:712
2354 msgid "could not create work tree dir '%s'."
2357 #: builtin/clone.c:731
2359 msgid "Cloning into bare repository '%s'...\n"
2362 #: builtin/clone.c:733
2364 msgid "Cloning into '%s'...\n"
2367 #: builtin/clone.c:789
2369 msgid "Don't know how to clone %s"
2372 #: builtin/clone.c:838
2374 msgid "Remote branch %s not found in upstream %s"
2377 #: builtin/clone.c:845
2378 msgid "You appear to have cloned an empty repository."
2381 #: builtin/column.c:51
2382 msgid "--command must be the first argument"
2385 #: builtin/commit.c:43
2387 "Your name and email address were configured automatically based\n"
2388 "on your username and hostname. Please check that they are accurate.\n"
2389 "You can suppress this message by setting them explicitly:\n"
2391 " git config --global user.name \"Your Name\"\n"
2392 " git config --global user.email you@example.com\n"
2394 "After doing this, you may fix the identity used for this commit with:\n"
2396 " git commit --amend --reset-author\n"
2399 #: builtin/commit.c:55
2401 "You asked to amend the most recent commit, but doing so would make\n"
2402 "it empty. You can repeat your command with --allow-empty, or you can\n"
2403 "remove the commit entirely with \"git reset HEAD^\".\n"
2406 #: builtin/commit.c:60
2408 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
2409 "If you wish to commit it anyway, use:\n"
2411 " git commit --allow-empty\n"
2413 "Otherwise, please use 'git reset'\n"
2416 #: builtin/commit.c:256
2417 msgid "failed to unpack HEAD tree object"
2420 #: builtin/commit.c:298
2421 msgid "unable to create temporary index"
2424 #: builtin/commit.c:304
2425 msgid "interactive add failed"
2428 #: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408
2429 msgid "unable to write new_index file"
2432 #: builtin/commit.c:389
2433 msgid "cannot do a partial commit during a merge."
2436 #: builtin/commit.c:391
2437 msgid "cannot do a partial commit during a cherry-pick."
2440 #: builtin/commit.c:401
2441 msgid "cannot read the index"
2444 #: builtin/commit.c:421
2445 msgid "unable to write temporary index file"
2448 #: builtin/commit.c:496 builtin/commit.c:502
2450 msgid "invalid commit: %s"
2453 #: builtin/commit.c:525
2454 msgid "malformed --author parameter"
2457 #: builtin/commit.c:585
2459 msgid "Malformed ident string: '%s'"
2462 #: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970
2464 msgid "could not lookup commit %s"
2467 #: builtin/commit.c:635 builtin/shortlog.c:296
2469 msgid "(reading log message from standard input)\n"
2472 #: builtin/commit.c:637
2473 msgid "could not read log from standard input"
2476 #: builtin/commit.c:641
2478 msgid "could not read log file '%s'"
2481 #: builtin/commit.c:647
2482 msgid "commit has empty message"
2485 #: builtin/commit.c:663
2486 msgid "could not read MERGE_MSG"
2489 #: builtin/commit.c:667
2490 msgid "could not read SQUASH_MSG"
2493 #: builtin/commit.c:671
2495 msgid "could not read '%s'"
2498 #: builtin/commit.c:723
2499 msgid "could not write commit template"
2502 #: builtin/commit.c:734
2506 "It looks like you may be committing a merge.\n"
2507 "If this is not correct, please remove the file\n"
2512 #: builtin/commit.c:739
2516 "It looks like you may be committing a cherry-pick.\n"
2517 "If this is not correct, please remove the file\n"
2522 #: builtin/commit.c:751
2524 "Please enter the commit message for your changes. Lines starting\n"
2525 "with '#' will be ignored, and an empty message aborts the commit.\n"
2528 #: builtin/commit.c:756
2530 "Please enter the commit message for your changes. Lines starting\n"
2531 "with '#' will be kept; you may remove them yourself if you want to.\n"
2532 "An empty message aborts the commit.\n"
2535 #: builtin/commit.c:769
2537 msgid "%sAuthor: %s"
2540 #: builtin/commit.c:776
2542 msgid "%sCommitter: %s"
2545 #: builtin/commit.c:796
2546 msgid "Cannot read index"
2549 #: builtin/commit.c:833
2550 msgid "Error building trees"
2553 #: builtin/commit.c:848 builtin/tag.c:361
2555 msgid "Please supply the message using either -m or -F option.\n"
2558 #: builtin/commit.c:945
2560 msgid "No existing author found with '%s'"
2563 #: builtin/commit.c:960 builtin/commit.c:1160
2565 msgid "Invalid untracked files mode '%s'"
2568 #: builtin/commit.c:1000
2569 msgid "Using both --reset-author and --author does not make sense"
2572 #: builtin/commit.c:1011
2573 msgid "You have nothing to amend."
2576 #: builtin/commit.c:1014
2577 msgid "You are in the middle of a merge -- cannot amend."
2580 #: builtin/commit.c:1016
2581 msgid "You are in the middle of a cherry-pick -- cannot amend."
2584 #: builtin/commit.c:1019
2585 msgid "Options --squash and --fixup cannot be used together"
2588 #: builtin/commit.c:1029
2589 msgid "Only one of -c/-C/-F/--fixup can be used."
2592 #: builtin/commit.c:1031
2593 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
2596 #: builtin/commit.c:1039
2597 msgid "--reset-author can be used only with -C, -c or --amend."
2600 #: builtin/commit.c:1056
2601 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
2604 #: builtin/commit.c:1058
2605 msgid "No paths with --include/--only does not make sense."
2608 #: builtin/commit.c:1060
2609 msgid "Clever... amending the last one with dirty index."
2612 #: builtin/commit.c:1062
2613 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
2616 #: builtin/commit.c:1072 builtin/tag.c:577
2618 msgid "Invalid cleanup mode %s"
2621 #: builtin/commit.c:1077
2622 msgid "Paths with -a does not make sense."
2625 #: builtin/commit.c:1260
2626 msgid "couldn't look up newly created commit"
2629 #: builtin/commit.c:1262
2630 msgid "could not parse newly created commit"
2633 #: builtin/commit.c:1303
2634 msgid "detached HEAD"
2637 #: builtin/commit.c:1305
2638 msgid " (root-commit)"
2641 #: builtin/commit.c:1449
2642 msgid "could not parse HEAD commit"
2645 #: builtin/commit.c:1487 builtin/merge.c:508
2647 msgid "could not open '%s' for reading"
2650 #: builtin/commit.c:1494
2652 msgid "Corrupt MERGE_HEAD file (%s)"
2655 #: builtin/commit.c:1501
2656 msgid "could not read MERGE_MODE"
2659 #: builtin/commit.c:1520
2661 msgid "could not read commit message: %s"
2664 #: builtin/commit.c:1534
2666 msgid "Aborting commit; you did not edit the message.\n"
2669 #: builtin/commit.c:1539
2671 msgid "Aborting commit due to empty commit message.\n"
2674 #: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960
2675 msgid "failed to write commit object"
2678 #: builtin/commit.c:1575
2679 msgid "cannot lock HEAD ref"
2682 #: builtin/commit.c:1579
2683 msgid "cannot update HEAD ref"
2686 #: builtin/commit.c:1590
2688 "Repository has been updated, but unable to write\n"
2689 "new_index file. Check that disk is not full or quota is\n"
2690 "not exceeded, and then \"git reset HEAD\" to recover."
2693 #: builtin/describe.c:234
2695 msgid "annotated tag %s not available"
2698 #: builtin/describe.c:238
2700 msgid "annotated tag %s has no embedded name"
2703 #: builtin/describe.c:240
2705 msgid "tag '%s' is really '%s' here"
2708 #: builtin/describe.c:267
2710 msgid "Not a valid object name %s"
2713 #: builtin/describe.c:270
2715 msgid "%s is not a valid '%s' object"
2718 #: builtin/describe.c:287
2720 msgid "no tag exactly matches '%s'"
2723 #: builtin/describe.c:289
2725 msgid "searching to describe %s\n"
2728 #: builtin/describe.c:329
2730 msgid "finished search at %s\n"
2733 #: builtin/describe.c:353
2736 "No annotated tags can describe '%s'.\n"
2737 "However, there were unannotated tags: try --tags."
2740 #: builtin/describe.c:357
2743 "No tags can describe '%s'.\n"
2744 "Try --always, or create some tags."
2747 #: builtin/describe.c:378
2749 msgid "traversed %lu commits\n"
2752 #: builtin/describe.c:381
2755 "more than %i tags found; listed %i most recent\n"
2756 "gave up search at %s\n"
2759 #: builtin/describe.c:436
2760 msgid "--long is incompatible with --abbrev=0"
2763 #: builtin/describe.c:462
2764 msgid "No names found, cannot describe anything."
2767 #: builtin/describe.c:482
2768 msgid "--dirty is incompatible with committishes"
2771 #: builtin/diff.c:79
2773 msgid "'%s': not a regular file or symlink"
2776 #: builtin/diff.c:224
2778 msgid "invalid option: %s"
2781 #: builtin/diff.c:301
2782 msgid "Not a git repository"
2785 #: builtin/diff.c:344
2787 msgid "invalid object '%s' given."
2790 #: builtin/diff.c:349
2792 msgid "more than %d trees given: '%s'"
2795 #: builtin/diff.c:359
2797 msgid "more than two blobs given: '%s'"
2800 #: builtin/diff.c:367
2802 msgid "unhandled object '%s' given."
2805 #: builtin/fetch.c:200
2806 msgid "Couldn't find remote ref HEAD"
2809 #: builtin/fetch.c:253
2811 msgid "object %s not found"
2814 #: builtin/fetch.c:259
2815 msgid "[up to date]"
2818 #: builtin/fetch.c:273
2820 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
2823 #: builtin/fetch.c:274 builtin/fetch.c:360
2827 #: builtin/fetch.c:285
2828 msgid "[tag update]"
2831 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
2832 msgid " (unable to update local ref)"
2835 #: builtin/fetch.c:305
2839 #: builtin/fetch.c:308
2840 msgid "[new branch]"
2843 #: builtin/fetch.c:311
2847 #: builtin/fetch.c:356
2848 msgid "unable to update local ref"
2851 #: builtin/fetch.c:356
2852 msgid "forced update"
2855 #: builtin/fetch.c:362
2856 msgid "(non-fast-forward)"
2859 #: builtin/fetch.c:393 builtin/fetch.c:685
2861 msgid "cannot open %s: %s\n"
2864 #: builtin/fetch.c:402
2866 msgid "%s did not send all necessary objects\n"
2869 #: builtin/fetch.c:488
2874 #: builtin/fetch.c:499
2877 "some local refs could not be updated; try running\n"
2878 " 'git remote prune %s' to remove any old, conflicting branches"
2881 #: builtin/fetch.c:549
2883 msgid " (%s will become dangling)"
2886 #: builtin/fetch.c:550
2888 msgid " (%s has become dangling)"
2891 #: builtin/fetch.c:557
2895 #: builtin/fetch.c:558 builtin/remote.c:1055
2899 #: builtin/fetch.c:675
2901 msgid "Refusing to fetch into current branch %s of non-bare repository"
2904 #: builtin/fetch.c:709
2906 msgid "Don't know how to fetch from %s"
2909 #: builtin/fetch.c:786
2911 msgid "Option \"%s\" value \"%s\" is not valid for %s"
2914 #: builtin/fetch.c:789
2916 msgid "Option \"%s\" is ignored for %s\n"
2919 #: builtin/fetch.c:888
2921 msgid "Fetching %s\n"
2924 #: builtin/fetch.c:890 builtin/remote.c:100
2926 msgid "Could not fetch %s"
2929 #: builtin/fetch.c:907
2931 "No remote repository specified. Please, specify either a URL or a\n"
2932 "remote name from which new revisions should be fetched."
2935 #: builtin/fetch.c:927
2936 msgid "You need to specify a tag name."
2939 #: builtin/fetch.c:979
2940 msgid "fetch --all does not take a repository argument"
2943 #: builtin/fetch.c:981
2944 msgid "fetch --all does not make sense with refspecs"
2947 #: builtin/fetch.c:992
2949 msgid "No such remote or remote group: %s"
2952 #: builtin/fetch.c:1000
2953 msgid "Fetching a group and specifying refspecs does not make sense"
2958 msgid "Invalid %s: '%s'"
2963 msgid "insanely long object directory %.*s"
2968 msgid "Auto packing the repository for optimum performance.\n"
2974 "Auto packing the repository for optimum performance. You may also\n"
2975 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
2980 "There are too many unreachable loose objects; run 'git prune' to remove them."
2983 #: builtin/grep.c:216
2985 msgid "grep: failed to create thread: %s"
2988 #: builtin/grep.c:454
2990 msgid "Failed to chdir: %s"
2993 #: builtin/grep.c:530 builtin/grep.c:564
2995 msgid "unable to read tree (%s)"
2998 #: builtin/grep.c:578
3000 msgid "unable to grep from object of type %s"
3003 #: builtin/grep.c:636
3005 msgid "switch `%c' expects a numerical value"
3008 #: builtin/grep.c:653
3010 msgid "cannot open '%s'"
3013 #: builtin/grep.c:917
3014 msgid "no pattern given."
3017 #: builtin/grep.c:931
3019 msgid "bad object %s"
3022 #: builtin/grep.c:972
3023 msgid "--open-files-in-pager only works on the worktree"
3026 #: builtin/grep.c:995
3027 msgid "--cached or --untracked cannot be used with --no-index."
3030 #: builtin/grep.c:1000
3031 msgid "--no-index or --untracked cannot be used with revs."
3034 #: builtin/grep.c:1003
3035 msgid "--[no-]exclude-standard cannot be used for tracked contents."
3038 #: builtin/grep.c:1011
3039 msgid "both --cached and trees are given."
3042 #: builtin/help.c:65
3044 msgid "unrecognized help format '%s'"
3047 #: builtin/help.c:93
3048 msgid "Failed to start emacsclient."
3051 #: builtin/help.c:106
3052 msgid "Failed to parse emacsclient version."
3055 #: builtin/help.c:114
3057 msgid "emacsclient version '%d' too old (< 22)."
3060 #: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
3062 msgid "failed to exec '%s': %s"
3065 #: builtin/help.c:217
3068 "'%s': path for unsupported man viewer.\n"
3069 "Please consider using 'man.<tool>.cmd' instead."
3072 #: builtin/help.c:229
3075 "'%s': cmd for supported man viewer.\n"
3076 "Please consider using 'man.<tool>.path' instead."
3079 #: builtin/help.c:299
3080 msgid "The most commonly used git commands are:"
3083 #: builtin/help.c:367
3085 msgid "'%s': unknown man viewer."
3088 #: builtin/help.c:384
3089 msgid "no man viewer handled the request"
3092 #: builtin/help.c:392
3093 msgid "no info viewer handled the request"
3096 #: builtin/help.c:447 builtin/help.c:454
3101 #: builtin/help.c:470
3103 msgid "`git %s' is aliased to `%s'"
3106 #: builtin/index-pack.c:170
3108 msgid "object type mismatch at %s"
3111 #: builtin/index-pack.c:190
3112 msgid "object of unexpected type"
3115 #: builtin/index-pack.c:227
3117 msgid "cannot fill %d byte"
3118 msgid_plural "cannot fill %d bytes"
3122 #: builtin/index-pack.c:237
3126 #: builtin/index-pack.c:238
3127 msgid "read error on input"
3130 #: builtin/index-pack.c:250
3131 msgid "used more bytes than were available"
3134 #: builtin/index-pack.c:257
3135 msgid "pack too large for current definition of off_t"
3138 #: builtin/index-pack.c:273
3140 msgid "unable to create '%s'"
3143 #: builtin/index-pack.c:278
3145 msgid "cannot open packfile '%s'"
3148 #: builtin/index-pack.c:292
3149 msgid "pack signature mismatch"
3152 #: builtin/index-pack.c:312
3154 msgid "pack has bad object at offset %lu: %s"
3157 #: builtin/index-pack.c:434
3159 msgid "inflate returned %d"
3162 #: builtin/index-pack.c:483
3163 msgid "offset value overflow for delta base object"
3166 #: builtin/index-pack.c:491
3167 msgid "delta base offset is out of bound"
3170 #: builtin/index-pack.c:499
3172 msgid "unknown object type %d"
3175 #: builtin/index-pack.c:530
3176 msgid "cannot pread pack file"
3179 #: builtin/index-pack.c:532
3181 msgid "premature end of pack file, %lu byte missing"
3182 msgid_plural "premature end of pack file, %lu bytes missing"
3186 #: builtin/index-pack.c:558
3187 msgid "serious inflate inconsistency"
3190 #: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
3191 #: builtin/index-pack.c:712 builtin/index-pack.c:721
3193 msgid "SHA1 COLLISION FOUND WITH %s !"
3196 #: builtin/index-pack.c:652 builtin/pack-objects.c:170
3197 #: builtin/pack-objects.c:262
3199 msgid "unable to read %s"
3202 #: builtin/index-pack.c:718
3204 msgid "cannot read existing object %s"
3207 #: builtin/index-pack.c:732
3209 msgid "invalid blob object %s"
3212 #: builtin/index-pack.c:747
3217 #: builtin/index-pack.c:749
3218 msgid "Error in object"
3221 #: builtin/index-pack.c:751
3223 msgid "Not all child objects of %s are reachable"
3226 #: builtin/index-pack.c:821 builtin/index-pack.c:847
3227 msgid "failed to apply delta"
3230 #: builtin/index-pack.c:986
3231 msgid "Receiving objects"
3234 #: builtin/index-pack.c:986
3235 msgid "Indexing objects"
3238 #: builtin/index-pack.c:1012
3239 msgid "pack is corrupted (SHA1 mismatch)"
3242 #: builtin/index-pack.c:1017
3243 msgid "cannot fstat packfile"
3246 #: builtin/index-pack.c:1020
3247 msgid "pack has junk at the end"
3250 #: builtin/index-pack.c:1031
3251 msgid "confusion beyond insanity in parse_pack_objects()"
3254 #: builtin/index-pack.c:1054
3255 msgid "Resolving deltas"
3258 #: builtin/index-pack.c:1105
3259 msgid "confusion beyond insanity"
3262 #: builtin/index-pack.c:1124
3264 msgid "pack has %d unresolved delta"
3265 msgid_plural "pack has %d unresolved deltas"
3269 #: builtin/index-pack.c:1149
3271 msgid "unable to deflate appended object (%d)"
3274 #: builtin/index-pack.c:1228
3276 msgid "local object %s is corrupt"
3279 #: builtin/index-pack.c:1252
3280 msgid "error while closing pack file"
3283 #: builtin/index-pack.c:1265
3285 msgid "cannot write keep file '%s'"
3288 #: builtin/index-pack.c:1273
3290 msgid "cannot close written keep file '%s'"
3293 #: builtin/index-pack.c:1286
3294 msgid "cannot store pack file"
3297 #: builtin/index-pack.c:1297
3298 msgid "cannot store index file"
3301 #: builtin/index-pack.c:1398
3303 msgid "Cannot open existing pack file '%s'"
3306 #: builtin/index-pack.c:1400
3308 msgid "Cannot open existing pack idx file for '%s'"
3311 #: builtin/index-pack.c:1447
3313 msgid "non delta: %d object"
3314 msgid_plural "non delta: %d objects"
3318 #: builtin/index-pack.c:1454
3320 msgid "chain length = %d: %lu object"
3321 msgid_plural "chain length = %d: %lu objects"
3325 #: builtin/index-pack.c:1481
3326 msgid "Cannot come back to cwd"
3329 #: builtin/index-pack.c:1525 builtin/index-pack.c:1528
3330 #: builtin/index-pack.c:1540 builtin/index-pack.c:1544
3335 #: builtin/index-pack.c:1558
3336 msgid "--fix-thin cannot be used without --stdin"
3339 #: builtin/index-pack.c:1562 builtin/index-pack.c:1572
3341 msgid "packfile name '%s' does not end with '.pack'"
3344 #: builtin/index-pack.c:1581
3345 msgid "--verify with no packfile name given"
3348 #: builtin/init-db.c:35
3350 msgid "Could not make %s writable by group"
3353 #: builtin/init-db.c:62
3355 msgid "insanely long template name %s"
3358 #: builtin/init-db.c:67
3360 msgid "cannot stat '%s'"
3363 #: builtin/init-db.c:73
3365 msgid "cannot stat template '%s'"
3368 #: builtin/init-db.c:80
3370 msgid "cannot opendir '%s'"
3373 #: builtin/init-db.c:97
3375 msgid "cannot readlink '%s'"
3378 #: builtin/init-db.c:99
3380 msgid "insanely long symlink %s"
3383 #: builtin/init-db.c:102
3385 msgid "cannot symlink '%s' '%s'"
3388 #: builtin/init-db.c:106
3390 msgid "cannot copy '%s' to '%s'"
3393 #: builtin/init-db.c:110
3395 msgid "ignoring template %s"
3398 #: builtin/init-db.c:133
3400 msgid "insanely long template path %s"
3403 #: builtin/init-db.c:141
3405 msgid "templates not found %s"
3408 #: builtin/init-db.c:154
3410 msgid "not copying templates of a wrong format version %d from '%s'"
3413 #: builtin/init-db.c:192
3415 msgid "insane git directory %s"
3418 #: builtin/init-db.c:323 builtin/init-db.c:326
3420 msgid "%s already exists"
3423 #: builtin/init-db.c:355
3425 msgid "unable to handle file type %d"
3428 #: builtin/init-db.c:358
3430 msgid "unable to move %s to %s"
3433 #: builtin/init-db.c:363
3435 msgid "Could not create git link %s"
3439 #. * TRANSLATORS: The first '%s' is either "Reinitialized
3440 #. * existing" or "Initialized empty", the second " shared" or
3441 #. * "", and the last '%s%s' is the verbatim directory name.
3443 #: builtin/init-db.c:420
3445 msgid "%s%s Git repository in %s%s\n"
3448 #: builtin/init-db.c:421
3449 msgid "Reinitialized existing"
3452 #: builtin/init-db.c:421
3453 msgid "Initialized empty"
3456 #: builtin/init-db.c:422
3460 #: builtin/init-db.c:441
3461 msgid "cannot tell cwd"
3464 #: builtin/init-db.c:522 builtin/init-db.c:529
3466 msgid "cannot mkdir %s"
3469 #: builtin/init-db.c:533
3471 msgid "cannot chdir to %s"
3474 #: builtin/init-db.c:555
3477 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
3481 #: builtin/init-db.c:579
3482 msgid "Cannot access current working directory"
3485 #: builtin/init-db.c:586
3487 msgid "Cannot access work tree '%s'"
3490 #: builtin/log.c:189
3492 msgid "Final output: %d %s\n"
3495 #: builtin/log.c:403 builtin/log.c:494
3497 msgid "Could not read object %s"
3500 #: builtin/log.c:518
3502 msgid "Unknown type: %d"
3505 #: builtin/log.c:608
3506 msgid "format.headers without value"
3509 #: builtin/log.c:682
3510 msgid "name of output directory is too long"
3513 #: builtin/log.c:693
3515 msgid "Cannot open patch file %s"
3518 #: builtin/log.c:707
3519 msgid "Need exactly one range."
3522 #: builtin/log.c:715
3523 msgid "Not a range."
3526 #: builtin/log.c:789
3527 msgid "Cover letter needs email format"
3530 #: builtin/log.c:862
3532 msgid "insane in-reply-to: %s"
3535 #: builtin/log.c:935
3536 msgid "Two output directories?"
3539 #: builtin/log.c:1157
3541 msgid "bogus committer info %s"
3544 #: builtin/log.c:1202
3545 msgid "-n and -k are mutually exclusive."
3548 #: builtin/log.c:1204
3549 msgid "--subject-prefix and -k are mutually exclusive."
3552 #: builtin/log.c:1212
3553 msgid "--name-only does not make sense"
3556 #: builtin/log.c:1214
3557 msgid "--name-status does not make sense"
3560 #: builtin/log.c:1216
3561 msgid "--check does not make sense"
3564 #: builtin/log.c:1239
3565 msgid "standard output, or directory, which one?"
3568 #: builtin/log.c:1241
3570 msgid "Could not create directory '%s'"
3573 #: builtin/log.c:1394
3574 msgid "Failed to create output files"
3577 #: builtin/log.c:1498
3580 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3583 #: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
3585 msgid "Unknown commit %s"
3588 #: builtin/merge.c:90
3589 msgid "switch `m' requires a value"
3592 #: builtin/merge.c:127
3594 msgid "Could not find merge strategy '%s'.\n"
3597 #: builtin/merge.c:128
3599 msgid "Available strategies are:"
3602 #: builtin/merge.c:133
3604 msgid "Available custom strategies are:"
3607 #: builtin/merge.c:240
3608 msgid "could not run stash."
3611 #: builtin/merge.c:245
3612 msgid "stash failed"
3615 #: builtin/merge.c:250
3617 msgid "not a valid object: %s"
3620 #: builtin/merge.c:269 builtin/merge.c:286
3621 msgid "read-tree failed"
3624 #: builtin/merge.c:316
3625 msgid " (nothing to squash)"
3628 #: builtin/merge.c:329
3630 msgid "Squash commit -- not updating HEAD\n"
3633 #: builtin/merge.c:361
3634 msgid "Writing SQUASH_MSG"
3637 #: builtin/merge.c:363
3638 msgid "Finishing SQUASH_MSG"
3641 #: builtin/merge.c:386
3643 msgid "No merge message -- not updating HEAD\n"
3646 #: builtin/merge.c:436
3648 msgid "'%s' does not point to a commit"
3651 #: builtin/merge.c:535
3653 msgid "Bad branch.%s.mergeoptions string: %s"
3656 #: builtin/merge.c:628
3657 msgid "git write-tree failed to write a tree"
3660 #: builtin/merge.c:678
3661 msgid "failed to read the cache"
3664 #: builtin/merge.c:709
3665 msgid "Not handling anything other than two heads merge."
3668 #: builtin/merge.c:723
3670 msgid "Unknown option for merge-recursive: -X%s"
3673 #: builtin/merge.c:737
3675 msgid "unable to write %s"
3678 #: builtin/merge.c:876
3680 msgid "Could not read from '%s'"
3683 #: builtin/merge.c:885
3685 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
3688 #: builtin/merge.c:891
3690 "Please enter a commit message to explain why this merge is necessary,\n"
3691 "especially if it merges an updated upstream into a topic branch.\n"
3693 "Lines starting with '#' will be ignored, and an empty message aborts\n"
3697 #: builtin/merge.c:915
3698 msgid "Empty commit message."
3701 #: builtin/merge.c:927
3703 msgid "Wonderful.\n"
3706 #: builtin/merge.c:992
3708 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
3711 #: builtin/merge.c:1008
3713 msgid "'%s' is not a commit"
3716 #: builtin/merge.c:1049
3717 msgid "No current branch."
3720 #: builtin/merge.c:1051
3721 msgid "No remote for the current branch."
3724 #: builtin/merge.c:1053
3725 msgid "No default upstream defined for the current branch."
3728 #: builtin/merge.c:1058
3730 msgid "No remote tracking branch for %s from %s"
3733 #: builtin/merge.c:1145 builtin/merge.c:1302
3735 msgid "%s - not something we can merge"
3738 #: builtin/merge.c:1213
3739 msgid "There is no merge to abort (MERGE_HEAD missing)."
3742 #: builtin/merge.c:1229 git-pull.sh:31
3744 "You have not concluded your merge (MERGE_HEAD exists).\n"
3745 "Please, commit your changes before you can merge."
3748 #: builtin/merge.c:1232 git-pull.sh:34
3749 msgid "You have not concluded your merge (MERGE_HEAD exists)."
3752 #: builtin/merge.c:1236
3754 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
3755 "Please, commit your changes before you can merge."
3758 #: builtin/merge.c:1239
3759 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
3762 #: builtin/merge.c:1248
3763 msgid "You cannot combine --squash with --no-ff."
3766 #: builtin/merge.c:1253
3767 msgid "You cannot combine --no-ff with --ff-only."
3770 #: builtin/merge.c:1260
3771 msgid "No commit specified and merge.defaultToUpstream not set."
3774 #: builtin/merge.c:1292
3775 msgid "Can merge only exactly one commit into empty head"
3778 #: builtin/merge.c:1295
3779 msgid "Squash commit into empty head not supported yet"
3782 #: builtin/merge.c:1297
3783 msgid "Non-fast-forward commit does not make sense into an empty head"
3786 #: builtin/merge.c:1412
3788 msgid "Updating %s..%s\n"
3791 #: builtin/merge.c:1450
3793 msgid "Trying really trivial in-index merge...\n"
3796 #: builtin/merge.c:1457
3801 #: builtin/merge.c:1489
3802 msgid "Not possible to fast-forward, aborting."
3805 #: builtin/merge.c:1512 builtin/merge.c:1591
3807 msgid "Rewinding the tree to pristine...\n"
3810 #: builtin/merge.c:1516
3812 msgid "Trying merge strategy %s...\n"
3815 #: builtin/merge.c:1582
3817 msgid "No merge strategy handled the merge.\n"
3820 #: builtin/merge.c:1584
3822 msgid "Merge with strategy %s failed.\n"
3825 #: builtin/merge.c:1593
3827 msgid "Using the %s to prepare resolving by hand.\n"
3830 #: builtin/merge.c:1605
3832 msgid "Automatic merge went well; stopped before committing as requested\n"
3837 msgid "Checking rename of '%s' to '%s'\n"
3845 msgid "can not move directory into itself"
3849 msgid "cannot move directory over file"
3854 msgid "Huh? %.*s is in index?"
3858 msgid "source directory is empty"
3862 msgid "not under version control"
3866 msgid "destination exists"
3871 msgid "overwriting '%s'"
3875 msgid "Cannot overwrite"
3879 msgid "multiple sources for the same target"
3884 msgid "%s, source=%s, destination=%s"
3889 msgid "Renaming %s to %s\n"
3892 #: builtin/mv.c:215 builtin/remote.c:731
3894 msgid "renaming '%s' failed"
3897 #: builtin/notes.c:139
3899 msgid "unable to start 'show' for object '%s'"
3902 #: builtin/notes.c:145
3903 msgid "can't fdopen 'show' output fd"
3906 #: builtin/notes.c:155
3908 msgid "failed to close pipe to 'show' for object '%s'"
3911 #: builtin/notes.c:158
3913 msgid "failed to finish 'show' for object '%s'"
3916 #: builtin/notes.c:175 builtin/tag.c:347
3918 msgid "could not create file '%s'"
3921 #: builtin/notes.c:189
3922 msgid "Please supply the note contents using either -m or -F option"
3925 #: builtin/notes.c:210 builtin/notes.c:973
3927 msgid "Removing note for object %s\n"
3930 #: builtin/notes.c:215
3931 msgid "unable to write note object"
3934 #: builtin/notes.c:217
3936 msgid "The note contents has been left in %s"
3939 #: builtin/notes.c:251 builtin/tag.c:542
3941 msgid "cannot read '%s'"
3944 #: builtin/notes.c:253 builtin/tag.c:545
3946 msgid "could not open or read '%s'"
3949 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
3950 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
3951 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
3952 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
3954 msgid "Failed to resolve '%s' as a valid ref."
3957 #: builtin/notes.c:275
3959 msgid "Failed to read object '%s'."
3962 #: builtin/notes.c:299
3963 msgid "Cannot commit uninitialized/unreferenced notes tree"
3966 #: builtin/notes.c:340
3968 msgid "Bad notes.rewriteMode value: '%s'"
3971 #: builtin/notes.c:350
3973 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
3976 #. TRANSLATORS: The first %s is the name of the
3977 #. environment variable, the second %s is its value
3978 #: builtin/notes.c:377
3980 msgid "Bad %s value: '%s'"
3983 #: builtin/notes.c:441
3985 msgid "Malformed input line: '%s'."
3988 #: builtin/notes.c:456
3990 msgid "Failed to copy notes from '%s' to '%s'"
3993 #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
3994 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
3995 #: builtin/notes.c:1033
3996 msgid "too many parameters"
3999 #: builtin/notes.c:513 builtin/notes.c:772
4001 msgid "No note found for object %s."
4004 #: builtin/notes.c:580
4007 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
4011 #: builtin/notes.c:585 builtin/notes.c:662
4013 msgid "Overwriting existing notes for object %s\n"
4016 #: builtin/notes.c:635
4017 msgid "too few parameters"
4020 #: builtin/notes.c:656
4023 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
4027 #: builtin/notes.c:668
4029 msgid "Missing notes on source object %s. Cannot copy."
4032 #: builtin/notes.c:717
4035 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
4036 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
4039 #: builtin/notes.c:971
4041 msgid "Object %s has no note\n"
4044 #: builtin/notes.c:1103 builtin/remote.c:1598
4046 msgid "Unknown subcommand: %s"
4049 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
4051 msgid "deflate error (%d)"
4054 #: builtin/pack-objects.c:2398
4056 msgid "unsupported index version %s"
4059 #: builtin/pack-objects.c:2402
4061 msgid "bad index version '%s'"
4064 #: builtin/pack-objects.c:2425
4066 msgid "option %s does not accept negative form"
4069 #: builtin/pack-objects.c:2429
4071 msgid "unable to parse value '%s' for option %s"
4074 #: builtin/push.c:45
4075 msgid "tag shorthand without <tag>"
4078 #: builtin/push.c:64
4079 msgid "--delete only accepts plain target ref names"
4082 #: builtin/push.c:99
4085 "To choose either option permanently, see push.default in 'git help config'."
4088 #: builtin/push.c:102
4091 "The upstream branch of your current branch does not match\n"
4092 "the name of your current branch. To push to the upstream branch\n"
4093 "on the remote, use\n"
4095 " git push %s HEAD:%s\n"
4097 "To push to the branch of the same name on the remote, use\n"
4103 #: builtin/push.c:121
4106 "You are not currently on a branch.\n"
4107 "To push the history leading to the current (detached HEAD)\n"
4110 " git push %s HEAD:<name-of-remote-branch>\n"
4113 #: builtin/push.c:128
4116 "The current branch %s has no upstream branch.\n"
4117 "To push the current branch and set the remote as upstream, use\n"
4119 " git push --set-upstream %s %s\n"
4122 #: builtin/push.c:136
4124 msgid "The current branch %s has multiple upstream branches, refusing to push."
4127 #: builtin/push.c:139
4130 "You are pushing to remote '%s', which is not the upstream of\n"
4131 "your current branch '%s', without telling me what to push\n"
4132 "to update which remote branch."
4135 #: builtin/push.c:151
4137 "push.default is unset; its implicit value is changing in\n"
4138 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
4139 "and maintain the current behavior after the default changes, use:\n"
4141 " git config --global push.default matching\n"
4143 "To squelch this message and adopt the new behavior now, use:\n"
4145 " git config --global push.default simple\n"
4147 "See 'git help config' and search for 'push.default' for further "
4149 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
4150 "'current' instead of 'simple' if you sometimes use older versions of Git)"
4153 #: builtin/push.c:199
4155 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
4158 #: builtin/push.c:206
4160 "Updates were rejected because the tip of your current branch is behind\n"
4161 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
4162 "before pushing again.\n"
4163 "See the 'Note about fast-forwards' in 'git push --help' for details."
4166 #: builtin/push.c:212
4168 "Updates were rejected because a pushed branch tip is behind its remote\n"
4169 "counterpart. If you did not intend to push that branch, you may want to\n"
4170 "specify branches to push or set the 'push.default' configuration variable\n"
4171 "to 'simple', 'current' or 'upstream' to push only the current branch."
4174 #: builtin/push.c:218
4176 "Updates were rejected because a pushed branch tip is behind its remote\n"
4177 "counterpart. Check out this branch and merge the remote changes\n"
4178 "(e.g. 'git pull') before pushing again.\n"
4179 "See the 'Note about fast-forwards' in 'git push --help' for details."
4182 #: builtin/push.c:258
4184 msgid "Pushing to %s\n"
4187 #: builtin/push.c:262
4189 msgid "failed to push some refs to '%s'"
4192 #: builtin/push.c:294
4194 msgid "bad repository '%s'"
4197 #: builtin/push.c:295
4199 "No configured push destination.\n"
4200 "Either specify the URL from the command-line or configure a remote "
4201 "repository using\n"
4203 " git remote add <name> <url>\n"
4205 "and then push using the remote name\n"
4207 " git push <name>\n"
4210 #: builtin/push.c:310
4211 msgid "--all and --tags are incompatible"
4214 #: builtin/push.c:311
4215 msgid "--all can't be combined with refspecs"
4218 #: builtin/push.c:316
4219 msgid "--mirror and --tags are incompatible"
4222 #: builtin/push.c:317
4223 msgid "--mirror can't be combined with refspecs"
4226 #: builtin/push.c:322
4227 msgid "--all and --mirror are incompatible"
4230 #: builtin/push.c:410
4231 msgid "--delete is incompatible with --all, --mirror and --tags"
4234 #: builtin/push.c:412
4235 msgid "--delete doesn't make sense without any refs"
4238 #: builtin/remote.c:98
4243 #: builtin/remote.c:130
4245 "--mirror is dangerous and deprecated; please\n"
4246 "\t use --mirror=fetch or --mirror=push instead"
4249 #: builtin/remote.c:147
4251 msgid "unknown mirror argument: %s"
4254 #: builtin/remote.c:185
4255 msgid "specifying a master branch makes no sense with --mirror"
4258 #: builtin/remote.c:187
4259 msgid "specifying branches to track makes sense only with fetch mirrors"
4262 #: builtin/remote.c:195 builtin/remote.c:646
4264 msgid "remote %s already exists."
4267 #: builtin/remote.c:199 builtin/remote.c:650
4269 msgid "'%s' is not a valid remote name"
4272 #: builtin/remote.c:243
4274 msgid "Could not setup master '%s'"
4277 #: builtin/remote.c:299
4279 msgid "more than one %s"
4282 #: builtin/remote.c:339
4284 msgid "Could not get fetch map for refspec %s"
4287 #: builtin/remote.c:440 builtin/remote.c:448
4291 #: builtin/remote.c:452
4295 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
4297 msgid "Could not append '%s' to '%s'"
4300 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
4302 msgid "No such remote: %s"
4305 #: builtin/remote.c:656
4307 msgid "Could not rename config section '%s' to '%s'"
4310 #: builtin/remote.c:662 builtin/remote.c:799
4312 msgid "Could not remove config section '%s'"
4315 #: builtin/remote.c:677
4318 "Not updating non-default fetch refspec\n"
4320 "\tPlease update the configuration manually if necessary."
4323 #: builtin/remote.c:683
4325 msgid "Could not append '%s'"
4328 #: builtin/remote.c:694
4330 msgid "Could not set '%s'"
4333 #: builtin/remote.c:716
4335 msgid "deleting '%s' failed"
4338 #: builtin/remote.c:750
4340 msgid "creating '%s' failed"
4343 #: builtin/remote.c:764
4345 msgid "Could not remove branch %s"
4348 #: builtin/remote.c:834
4350 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
4351 "to delete it, use:"
4353 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
4354 "to delete them, use:"
4358 #: builtin/remote.c:943
4360 msgid " new (next fetch will store in remotes/%s)"
4363 #: builtin/remote.c:946
4367 #: builtin/remote.c:948
4368 msgid " stale (use 'git remote prune' to remove)"
4371 #: builtin/remote.c:950
4375 #: builtin/remote.c:991
4377 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
4380 #: builtin/remote.c:998
4382 msgid "rebases onto remote %s"
4385 #: builtin/remote.c:1001
4387 msgid " merges with remote %s"
4390 #: builtin/remote.c:1002
4391 msgid " and with remote"
4394 #: builtin/remote.c:1004
4396 msgid "merges with remote %s"
4399 #: builtin/remote.c:1005
4400 msgid " and with remote"
4403 #: builtin/remote.c:1051
4407 #: builtin/remote.c:1054
4411 #: builtin/remote.c:1058
4415 #: builtin/remote.c:1061
4416 msgid "fast-forwardable"
4419 #: builtin/remote.c:1064
4420 msgid "local out of date"
4423 #: builtin/remote.c:1071
4425 msgid " %-*s forces to %-*s (%s)"
4428 #: builtin/remote.c:1074
4430 msgid " %-*s pushes to %-*s (%s)"
4433 #: builtin/remote.c:1078
4435 msgid " %-*s forces to %s"
4438 #: builtin/remote.c:1081
4440 msgid " %-*s pushes to %s"
4443 #: builtin/remote.c:1118
4448 #: builtin/remote.c:1119
4450 msgid " Fetch URL: %s"
4453 #: builtin/remote.c:1120 builtin/remote.c:1285
4457 #: builtin/remote.c:1129 builtin/remote.c:1131
4459 msgid " Push URL: %s"
4462 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
4464 msgid " HEAD branch: %s"
4467 #: builtin/remote.c:1139
4470 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
4473 #: builtin/remote.c:1151
4475 msgid " Remote branch:%s"
4476 msgid_plural " Remote branches:%s"
4480 #: builtin/remote.c:1154 builtin/remote.c:1181
4481 msgid " (status not queried)"
4484 #: builtin/remote.c:1163
4485 msgid " Local branch configured for 'git pull':"
4486 msgid_plural " Local branches configured for 'git pull':"
4490 #: builtin/remote.c:1171
4491 msgid " Local refs will be mirrored by 'git push'"
4494 #: builtin/remote.c:1178
4496 msgid " Local ref configured for 'git push'%s:"
4497 msgid_plural " Local refs configured for 'git push'%s:"
4501 #: builtin/remote.c:1216
4502 msgid "Cannot determine remote HEAD"
4505 #: builtin/remote.c:1218
4506 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
4509 #: builtin/remote.c:1228
4511 msgid "Could not delete %s"
4514 #: builtin/remote.c:1236
4516 msgid "Not a valid ref: %s"
4519 #: builtin/remote.c:1238
4521 msgid "Could not setup %s"
4524 #: builtin/remote.c:1274
4526 msgid " %s will become dangling!"
4529 #: builtin/remote.c:1275
4531 msgid " %s has become dangling!"
4534 #: builtin/remote.c:1281
4539 #: builtin/remote.c:1282
4544 #: builtin/remote.c:1295
4546 msgid " * [would prune] %s"
4549 #: builtin/remote.c:1298
4551 msgid " * [pruned] %s"
4554 #: builtin/remote.c:1387 builtin/remote.c:1461
4556 msgid "No such remote '%s'"
4559 #: builtin/remote.c:1414
4560 msgid "no remote specified"
4563 #: builtin/remote.c:1447
4564 msgid "--add --delete doesn't make sense"
4567 #: builtin/remote.c:1487
4569 msgid "Invalid old URL pattern: %s"
4572 #: builtin/remote.c:1495
4574 msgid "No such URL found: %s"
4577 #: builtin/remote.c:1497
4578 msgid "Will not delete all non-push URLs"
4581 #: builtin/reset.c:33
4585 #: builtin/reset.c:33
4589 #: builtin/reset.c:33
4593 #: builtin/reset.c:33
4597 #: builtin/reset.c:33
4601 #: builtin/reset.c:77
4602 msgid "You do not have a valid HEAD."
4605 #: builtin/reset.c:79
4606 msgid "Failed to find tree of HEAD."
4609 #: builtin/reset.c:85
4611 msgid "Failed to find tree of %s."
4614 #: builtin/reset.c:96
4615 msgid "Could not write new index file."
4618 #: builtin/reset.c:106
4620 msgid "HEAD is now at %s"
4623 #: builtin/reset.c:130
4624 msgid "Could not read index"
4627 #: builtin/reset.c:133
4628 msgid "Unstaged changes after reset:"
4631 #: builtin/reset.c:223
4633 msgid "Cannot do a %s reset in the middle of a merge."
4636 #: builtin/reset.c:303
4638 msgid "Could not parse object '%s'."
4641 #: builtin/reset.c:308
4642 msgid "--patch is incompatible with --{hard,mixed,soft}"
4645 #: builtin/reset.c:317
4646 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
4649 #: builtin/reset.c:319
4651 msgid "Cannot do %s reset with paths."
4654 #: builtin/reset.c:331
4656 msgid "%s reset is not allowed in a bare repository"
4659 #: builtin/reset.c:347
4661 msgid "Could not reset index file to revision '%s'."
4664 #: builtin/revert.c:70 builtin/revert.c:92
4666 msgid "%s: %s cannot be used with %s"
4669 #: builtin/revert.c:131
4670 msgid "program error"
4673 #: builtin/revert.c:221
4674 msgid "revert failed"
4677 #: builtin/revert.c:236
4678 msgid "cherry-pick failed"
4684 "'%s' has staged content different from both the file and the HEAD\n"
4685 "(use -f to force removal)"
4691 "'%s' has changes staged in the index\n"
4692 "(use --cached to keep the file, or -f to force removal)"
4698 "'%s' has local modifications\n"
4699 "(use --cached to keep the file, or -f to force removal)"
4704 msgid "not removing '%s' recursively without -r"
4709 msgid "git rm: unable to remove %s"
4712 #: builtin/shortlog.c:157
4714 msgid "Missing author: %s"
4719 msgid "malformed object at '%s'"
4722 #: builtin/tag.c:207
4724 msgid "tag name too long: %.*s..."
4727 #: builtin/tag.c:212
4729 msgid "tag '%s' not found."
4732 #: builtin/tag.c:227
4734 msgid "Deleted tag '%s' (was %s)\n"
4737 #: builtin/tag.c:239
4739 msgid "could not verify the tag '%s'"
4742 #: builtin/tag.c:249
4746 "# Write a tag message\n"
4747 "# Lines starting with '#' will be ignored.\n"
4751 #: builtin/tag.c:256
4755 "# Write a tag message\n"
4756 "# Lines starting with '#' will be kept; you may remove them yourself if you "
4761 #: builtin/tag.c:298
4762 msgid "unable to sign the tag"
4765 #: builtin/tag.c:300
4766 msgid "unable to write tag file"
4769 #: builtin/tag.c:325
4770 msgid "bad object type."
4773 #: builtin/tag.c:338
4774 msgid "tag header too big."
4777 #: builtin/tag.c:370
4778 msgid "no tag message?"
4781 #: builtin/tag.c:376
4783 msgid "The tag message has been left in %s\n"
4786 #: builtin/tag.c:425
4787 msgid "switch 'points-at' requires an object"
4790 #: builtin/tag.c:427
4792 msgid "malformed object name '%s'"
4795 #: builtin/tag.c:506
4796 msgid "--column and -n are incompatible"
4799 #: builtin/tag.c:523
4800 msgid "-n option is only allowed with -l."
4803 #: builtin/tag.c:525
4804 msgid "--contains option is only allowed with -l."
4807 #: builtin/tag.c:527
4808 msgid "--points-at option is only allowed with -l."
4811 #: builtin/tag.c:535
4812 msgid "only one -F or -m option is allowed."
4815 #: builtin/tag.c:555
4816 msgid "too many params"
4819 #: builtin/tag.c:561
4821 msgid "'%s' is not a valid tag name."
4824 #: builtin/tag.c:566
4826 msgid "tag '%s' already exists"
4829 #: builtin/tag.c:584
4831 msgid "%s: cannot lock the ref"
4834 #: builtin/tag.c:586
4836 msgid "%s: cannot update the ref"
4839 #: builtin/tag.c:588
4841 msgid "Updated tag '%s' (was %s)\n"
4845 msgid "See 'git help <command>' for more information on a specific command."
4848 #: parse-options.h:133 parse-options.h:235
4852 #: parse-options.h:141
4856 #: parse-options.h:149
4860 #: parse-options.h:151
4864 #: parse-options.h:156
4865 msgid "no-op (backward compatibility)"
4868 #: parse-options.h:228
4869 msgid "be more verbose"
4872 #: parse-options.h:230
4873 msgid "be more quiet"
4876 #: parse-options.h:236
4877 msgid "use <n> digits to display SHA-1s"
4881 msgid "Add file contents to the index"
4885 msgid "Find by binary search the change that introduced a bug"
4889 msgid "List, create, or delete branches"
4893 msgid "Checkout a branch or paths to the working tree"
4897 msgid "Clone a repository into a new directory"
4901 msgid "Record changes to the repository"
4905 msgid "Show changes between commits, commit and working tree, etc"
4909 msgid "Download objects and refs from another repository"
4913 msgid "Print lines matching a pattern"
4917 msgid "Create an empty git repository or reinitialize an existing one"
4921 msgid "Show commit logs"
4925 msgid "Join two or more development histories together"
4929 msgid "Move or rename a file, a directory, or a symlink"
4933 msgid "Fetch from and merge with another repository or a local branch"
4937 msgid "Update remote refs along with associated objects"
4941 msgid "Forward-port local commits to the updated upstream head"
4945 msgid "Reset current HEAD to the specified state"
4949 msgid "Remove files from the working tree and from the index"
4953 msgid "Show various types of objects"
4957 msgid "Show the working tree status"
4961 msgid "Create, list, delete or verify a tag object signed with GPG"
4965 msgid "You need to set your committer info first"
4970 "You seem to have moved HEAD since the last 'am' failure.\n"
4971 "Not rewinding to ORIG_HEAD"
4977 "When you have resolved this problem, run \"$cmdline --resolved\".\n"
4978 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
4979 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
4983 msgid "Cannot fall back to three-way merge."
4987 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4991 msgid "Using index info to reconstruct a base tree..."
4996 "Did you hand edit your patch?\n"
4997 "It does not apply to blobs recorded in its index."
5001 msgid "Falling back to patching base and 3-way merge..."
5005 msgid "Failed to merge in the changes."
5009 msgid "Only one StGIT patch series can be applied at once"
5014 msgid "Patch format $patch_format is not supported."
5018 msgid "Patch format detection failed."
5023 "The -b/--binary option has been a no-op for long time, and\n"
5024 "it will be removed. Please do not use it anymore."
5029 msgid "previous rebase directory $dotest still exists but mbox given."
5033 msgid "Please make up your mind. --skip or --abort?"
5037 msgid "Resolve operation not in progress, we are not resuming."
5042 msgid "Dirty index: cannot apply patches (dirty: $files)"
5048 "Patch is empty. Was it split wrong?\n"
5049 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
5050 "To restore the original branch and stop patching run \"$cmdline --abort\"."
5054 msgid "Patch does not have a valid e-mail address."
5058 msgid "cannot be interactive without stdin connected to a terminal."
5062 msgid "Commit Body is:"
5065 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
5066 #. in your translation. The program will only accept English
5067 #. input at this point.
5069 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
5074 msgid "Applying: $FIRSTLINE"
5079 "No changes - did you forget to use 'git add'?\n"
5080 "If there is nothing left to stage, chances are that something else\n"
5081 "already introduced the same changes; you might want to skip this patch."
5086 "You still have unmerged paths in your index\n"
5087 "did you forget to use 'git add'?"
5091 msgid "No changes -- Patch already applied."
5096 msgid "Patch failed at $msgnum $FIRSTLINE"
5100 msgid "applying to an empty history"
5104 msgid "You need to start by \"git bisect start\""
5107 #. TRANSLATORS: Make sure to include [Y] and [n] in your
5108 #. translation. The program will only accept English input
5111 msgid "Do you want me to do it for you [Y/n]? "
5116 msgid "unrecognised option: '$arg'"
5121 msgid "'$arg' does not appear to be a valid revision"
5124 #: git-bisect.sh:117
5125 msgid "Bad HEAD - I need a HEAD"
5128 #: git-bisect.sh:130
5131 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
5134 #: git-bisect.sh:140
5135 msgid "won't bisect on seeked tree"
5138 #: git-bisect.sh:144
5139 msgid "Bad HEAD - strange symbolic ref"
5142 #: git-bisect.sh:189
5144 msgid "Bad bisect_write argument: $state"
5147 #: git-bisect.sh:218
5149 msgid "Bad rev input: $arg"
5152 #: git-bisect.sh:232
5153 msgid "Please call 'bisect_state' with at least one argument."
5156 #: git-bisect.sh:244
5158 msgid "Bad rev input: $rev"
5161 #: git-bisect.sh:250
5162 msgid "'git bisect bad' can take only one argument."
5165 #. have bad but not good. we could bisect although
5166 #. this is less optimum.
5167 #: git-bisect.sh:273
5168 msgid "Warning: bisecting only with a bad commit."
5171 #. TRANSLATORS: Make sure to include [Y] and [n] in your
5172 #. translation. The program will only accept English input
5174 #: git-bisect.sh:279
5175 msgid "Are you sure [Y/n]? "
5178 #: git-bisect.sh:289
5180 "You need to give me at least one good and one bad revisions.\n"
5181 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
5184 #: git-bisect.sh:292
5186 "You need to start by \"git bisect start\".\n"
5187 "You then need to give me at least one good and one bad revisions.\n"
5188 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
5191 #: git-bisect.sh:347 git-bisect.sh:474
5192 msgid "We are not bisecting."
5195 #: git-bisect.sh:354
5197 msgid "'$invalid' is not a valid commit"
5200 #: git-bisect.sh:363
5203 "Could not check out original HEAD '$branch'.\n"
5204 "Try 'git bisect reset <commit>'."
5207 #: git-bisect.sh:390
5208 msgid "No logfile given"
5211 #: git-bisect.sh:391
5213 msgid "cannot read $file for replaying"
5216 #: git-bisect.sh:408
5217 msgid "?? what are you talking about?"
5220 #: git-bisect.sh:420
5222 msgid "running $command"
5225 #: git-bisect.sh:427
5228 "bisect run failed:\n"
5229 "exit code $res from '$command' is < 0 or >= 128"
5232 #: git-bisect.sh:453
5233 msgid "bisect run cannot continue any more"
5236 #: git-bisect.sh:459
5239 "bisect run failed:\n"
5240 "'bisect_state $state' exited with error code $res"
5243 #: git-bisect.sh:466
5244 msgid "bisect run success"
5249 "Pull is not possible because you have unmerged files.\n"
5250 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
5251 "as appropriate to mark resolution, or use 'git commit -a'."
5255 msgid "Pull is not possible because you have unmerged files."
5259 msgid "updating an unborn branch with changes added to the index"
5262 #. The fetch involved updating the current branch.
5263 #. The working tree and the index file is still based on the
5264 #. $orig_head commit, but we are merging into $curr_head.
5265 #. First update the working tree to match $curr_head.
5269 "Warning: fetch updated the current branch head.\n"
5270 "Warning: fast-forwarding your working tree from\n"
5271 "Warning: commit $orig_head."
5275 msgid "Cannot merge multiple branches into empty head"
5279 msgid "Cannot rebase onto multiple branches"
5284 "When you have resolved this problem, run \"git rebase --continue\".\n"
5285 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
5286 "To check out the original branch and stop rebasing, run \"git rebase --abort"
5290 #: git-rebase.sh:159
5291 msgid "The pre-rebase hook refused to rebase."
5294 #: git-rebase.sh:164
5295 msgid "It looks like git-am is in progress. Cannot rebase."
5298 #: git-rebase.sh:295
5299 msgid "The --exec option must be used with the --interactive option"
5302 #: git-rebase.sh:300
5303 msgid "No rebase in progress?"
5306 #: git-rebase.sh:313
5307 msgid "Cannot read HEAD"
5310 #: git-rebase.sh:316
5312 "You must edit all merge conflicts and then\n"
5313 "mark them as resolved using git add"
5316 #: git-rebase.sh:334
5318 msgid "Could not move back to $head_name"
5321 #: git-rebase.sh:350
5324 "It seems that there is already a $state_dir_base directory, and\n"
5325 "I wonder if you are in the middle of another rebase. If that is the\n"
5326 "case, please try\n"
5327 "\t$cmd_live_rebase\n"
5328 "If that is not the case, please\n"
5329 "\t$cmd_clear_stale_rebase\n"
5330 "and run me again. I am stopping in case you still have something\n"
5334 #: git-rebase.sh:395
5336 msgid "invalid upstream $upstream_name"
5339 #: git-rebase.sh:419
5341 msgid "$onto_name: there are more than one merge bases"
5344 #: git-rebase.sh:422 git-rebase.sh:426
5346 msgid "$onto_name: there is no merge base"
5349 #: git-rebase.sh:431
5351 msgid "Does not point to a valid commit: $onto_name"
5354 #: git-rebase.sh:454
5356 msgid "fatal: no such branch: $branch_name"
5359 #: git-rebase.sh:474
5360 msgid "Please commit or stash them."
5363 #: git-rebase.sh:492
5365 msgid "Current branch $branch_name is up to date."
5368 #: git-rebase.sh:495
5370 msgid "Current branch $branch_name is up to date, rebase forced."
5373 #: git-rebase.sh:506
5375 msgid "Changes from $mb to $onto:"
5378 #. Detach HEAD and reset the tree
5379 #: git-rebase.sh:515
5380 msgid "First, rewinding head to replay your work on top of it..."
5383 #: git-rebase.sh:523
5385 msgid "Fast-forwarded $branch_name to $onto_name."
5389 msgid "git stash clear with parameters is unimplemented"
5393 msgid "You do not have the initial commit yet"
5397 msgid "Cannot save the current index state"
5400 #: git-stash.sh:123 git-stash.sh:136
5401 msgid "Cannot save the current worktree state"
5405 msgid "No changes selected"
5409 msgid "Cannot remove temporary index (can't happen)"
5413 msgid "Cannot record working tree state"
5416 #. TRANSLATORS: $option is an invalid option, like
5417 #. `--blah-blah'. The 7 spaces at the beginning of the
5418 #. second line correspond to "error: ". So you should line
5419 #. up the second line with however many characters the
5420 #. translation of "error: " takes in your language. E.g. in
5423 #. $ git stash save --blah-blah 2>&1 | head -n 2
5424 #. error: unknown option for 'stash save': --blah-blah
5425 #. To provide a message, use git stash save -- '--blah-blah'
5429 "error: unknown option for 'stash save': $option\n"
5430 " To provide a message, use git stash save -- '$option'"
5434 msgid "No local changes to save"
5438 msgid "Cannot initialize stash"
5442 msgid "Cannot save the current status"
5446 msgid "Cannot remove worktree changes"
5450 msgid "No stash found."
5455 msgid "Too many revisions specified: $REV"
5460 msgid "$reference is not valid reference"
5465 msgid "'$args' is not a stash-like commit"
5470 msgid "'$args' is not a stash reference"
5474 msgid "unable to refresh index"
5478 msgid "Cannot apply a stash in the middle of a merge"
5482 msgid "Conflicts in index. Try without --index."
5486 msgid "Could not save index tree"
5490 msgid "Cannot unstage modified files"
5494 msgid "Index was not unstashed."
5499 msgid "Dropped ${REV} ($s)"
5504 msgid "${REV}: Could not drop stash entry"
5508 msgid "No branch name specified"
5512 msgid "(To restore them type \"git stash apply\")"
5515 #: git-submodule.sh:88
5517 msgid "cannot strip one component off url '$remoteurl'"
5520 #: git-submodule.sh:167
5522 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5525 #: git-submodule.sh:211
5527 msgid "Clone of '$url' into submodule path '$sm_path' failed"
5530 #: git-submodule.sh:223
5532 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5535 #: git-submodule.sh:312
5537 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5540 #: git-submodule.sh:329
5542 msgid "'$sm_path' already exists in the index"
5545 #: git-submodule.sh:333
5548 "The following path is ignored by one of your .gitignore files:\n"
5550 "Use -f if you really want to add it."
5553 #: git-submodule.sh:344
5555 msgid "Adding existing repo at '$sm_path' to the index"
5558 #: git-submodule.sh:346
5560 msgid "'$sm_path' already exists and is not a valid git repo"
5563 #: git-submodule.sh:360
5565 msgid "Unable to checkout submodule '$sm_path'"
5568 #: git-submodule.sh:365
5570 msgid "Failed to add submodule '$sm_path'"
5573 #: git-submodule.sh:370
5575 msgid "Failed to register submodule '$sm_path'"
5578 #: git-submodule.sh:413
5580 msgid "Entering '$prefix$sm_path'"
5583 #: git-submodule.sh:427
5585 msgid "Stopping at '$sm_path'; script returned non-zero status."
5588 #: git-submodule.sh:471
5590 msgid "No url found for submodule path '$sm_path' in .gitmodules"
5593 #: git-submodule.sh:480
5595 msgid "Failed to register url for submodule path '$sm_path'"
5598 #: git-submodule.sh:482
5600 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5603 #: git-submodule.sh:490
5605 msgid "Failed to register update mode for submodule path '$sm_path'"
5608 #: git-submodule.sh:590
5611 "Submodule path '$sm_path' not initialized\n"
5612 "Maybe you want to use 'update --init'?"
5615 #: git-submodule.sh:603
5617 msgid "Unable to find current revision in submodule path '$sm_path'"
5620 #: git-submodule.sh:622
5622 msgid "Unable to fetch in submodule path '$sm_path'"
5625 #: git-submodule.sh:636
5627 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5630 #: git-submodule.sh:637
5632 msgid "Submodule path '$sm_path': rebased into '$sha1'"
5635 #: git-submodule.sh:642
5637 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5640 #: git-submodule.sh:643
5642 msgid "Submodule path '$sm_path': merged in '$sha1'"
5645 #: git-submodule.sh:648
5647 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5650 #: git-submodule.sh:649
5652 msgid "Submodule path '$sm_path': checked out '$sha1'"
5655 #: git-submodule.sh:671 git-submodule.sh:995
5657 msgid "Failed to recurse into submodule path '$sm_path'"
5660 #: git-submodule.sh:779
5661 msgid "The --cached option cannot be used with the --files option"
5665 #: git-submodule.sh:819
5667 msgid "unexpected mode $mod_dst"
5670 #: git-submodule.sh:837
5672 msgid " Warn: $name doesn't contain commit $sha1_src"
5675 #: git-submodule.sh:840
5677 msgid " Warn: $name doesn't contain commit $sha1_dst"
5680 #: git-submodule.sh:843
5682 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5685 #: git-submodule.sh:868
5689 #: git-submodule.sh:906
5690 msgid "# Submodules changed but not updated:"
5693 #: git-submodule.sh:908
5694 msgid "# Submodule changes to be committed:"
5697 #: git-submodule.sh:1054
5699 msgid "Synchronizing submodule url for '$name'"