1 # SOME DESCRIPTIVE TITLE.
2 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3 # This file is distributed under the same license as the PACKAGE package.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11 "POT-Creation-Date: 2012-08-02 09:26+0800\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
17 "Content-Type: text/plain; charset=CHARSET\n"
18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
27 #. * Message used both when 'git commit' fails and when
28 #. * other commands doing a merge do.
32 "Fix them up in the work tree,\n"
33 "and then use 'git add/rm <file>' as\n"
34 "appropriate to mark resolution and make a commit,\n"
35 "or use 'git commit -a'."
40 msgid "'%s' does not look like a v2 bundle file"
45 msgid "unrecognized header: %s%s (%d)"
48 #: bundle.c:89 builtin/commit.c:699
50 msgid "could not open '%s'"
54 msgid "Repository lacks these prerequisite commits:"
57 #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
58 #: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347
59 #: builtin/shortlog.c:181
60 msgid "revision walk setup failed"
65 msgid "The bundle contains %d ref"
66 msgid_plural "The bundle contains %d refs"
71 msgid "The bundle records a complete history."
76 msgid "The bundle requires this ref"
77 msgid_plural "The bundle requires these %d refs"
85 #: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284
87 msgid "unrecognized argument: %s"
92 msgid "ref '%s' is excluded by the rev-list options"
96 msgid "Refusing to create empty bundle."
100 msgid "Could not spawn pack-objects"
104 msgid "pack-objects died"
109 msgid "cannot create '%s'"
113 msgid "index-pack died"
118 msgid "could not parse %s"
123 msgid "%s %s is not a commit!"
126 #: compat/obstack.c:406 compat/obstack.c:408
127 msgid "memory exhausted"
131 msgid "Could not run 'git rev-list'"
136 msgid "failed write to rev-list: %s"
141 msgid "failed to close rev-list's stdin: %s"
145 msgid "in the future"
150 msgid "%lu second ago"
151 msgid_plural "%lu seconds ago"
157 msgid "%lu minute ago"
158 msgid_plural "%lu minutes ago"
165 msgid_plural "%lu hours ago"
172 msgid_plural "%lu days ago"
179 msgid_plural "%lu weeks ago"
185 msgid "%lu month ago"
186 msgid_plural "%lu months ago"
193 msgid_plural "%lu years"
199 msgid "%s, %lu month ago"
200 msgid_plural "%s, %lu months ago"
204 #: date.c:154 date.c:159
207 msgid_plural "%lu years ago"
213 msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
218 msgid " Unknown dirstat parameter '%.*s'\n"
224 "Found errors in 'diff.dirstat' config variable:\n"
229 msgid " 0 files changed"
234 msgid " %d file changed"
235 msgid_plural " %d files changed"
241 msgid ", %d insertion(+)"
242 msgid_plural ", %d insertions(+)"
248 msgid ", %d deletion(-)"
249 msgid_plural ", %d deletions(-)"
256 "Failed to parse --dirstat/-X option parameter:\n"
260 #: gpg-interface.c:59
261 msgid "could not run gpg."
264 #: gpg-interface.c:71
265 msgid "gpg did not accept the data"
268 #: gpg-interface.c:82
269 msgid "gpg failed to sign the data"
274 msgid "'%s': unable to read %s"
284 msgid "'%s': short read %s"
289 msgid "available git commands in '%s'"
293 msgid "git commands available from elsewhere on your $PATH"
299 "'%s' appears to be a git command, but we were not\n"
300 "able to execute it. Maybe git-%s is broken?"
304 msgid "Uh oh. Your system reports no Git commands at all."
310 "WARNING: You called a Git command named '%s', which does not exist.\n"
311 "Continuing under the assumption that you meant '%s'"
316 msgid "in %0.1f seconds automatically..."
321 msgid "git: '%s' is not a git command. See 'git --help'."
330 "Did you mean one of these?"
334 #: merge-recursive.c:190
336 msgid "(bad commit)\n"
339 #: merge-recursive.c:206
341 msgid "addinfo_cache failed for path '%s'"
344 #: merge-recursive.c:268
345 msgid "error building trees"
348 #: merge-recursive.c:497
349 msgid "diff setup failed"
352 #: merge-recursive.c:627
353 msgid "merge-recursive: disk full?"
356 #: merge-recursive.c:690
358 msgid "failed to create path '%s'%s"
361 #: merge-recursive.c:701
363 msgid "Removing %s to make room for subdirectory\n"
366 #. something else exists
367 #. .. but not some other error (who really cares what?)
368 #: merge-recursive.c:715 merge-recursive.c:736
369 msgid ": perhaps a D/F conflict?"
372 #: merge-recursive.c:726
374 msgid "refusing to lose untracked file at '%s'"
377 #: merge-recursive.c:766
379 msgid "cannot read object %s '%s'"
382 #: merge-recursive.c:768
384 msgid "blob expected for %s '%s'"
387 #: merge-recursive.c:791 builtin/clone.c:302
389 msgid "failed to open '%s'"
392 #: merge-recursive.c:799
394 msgid "failed to symlink '%s'"
397 #: merge-recursive.c:802
399 msgid "do not know what to do with %06o %s '%s'"
402 #: merge-recursive.c:939
403 msgid "Failed to execute internal merge"
406 #: merge-recursive.c:943
408 msgid "Unable to add %s to database"
411 #: merge-recursive.c:959
412 msgid "unsupported object type in the tree"
415 #: merge-recursive.c:1038 merge-recursive.c:1052
418 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
422 #: merge-recursive.c:1044 merge-recursive.c:1057
425 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
429 #: merge-recursive.c:1098
433 #: merge-recursive.c:1098
437 #: merge-recursive.c:1154
439 msgid "%s is a directory in %s adding as %s instead"
442 #: merge-recursive.c:1176
445 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
446 "\"->\"%s\" in \"%s\"%s"
449 #: merge-recursive.c:1181
450 msgid " (left unresolved)"
453 #: merge-recursive.c:1235
455 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
458 #: merge-recursive.c:1265
460 msgid "Renaming %s to %s and %s to %s instead"
463 #: merge-recursive.c:1464
465 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
468 #: merge-recursive.c:1474
470 msgid "Adding merged %s"
473 #: merge-recursive.c:1479 merge-recursive.c:1677
475 msgid "Adding as %s instead"
478 #: merge-recursive.c:1530
480 msgid "cannot read object %s"
483 #: merge-recursive.c:1533
485 msgid "object %s is not a blob"
488 #: merge-recursive.c:1581
492 #: merge-recursive.c:1581
496 #: merge-recursive.c:1591
500 #: merge-recursive.c:1598
504 #: merge-recursive.c:1632
506 msgid "Skipped %s (merged same as existing)"
509 #: merge-recursive.c:1646
511 msgid "Auto-merging %s"
514 #: merge-recursive.c:1650 git-submodule.sh:844
518 #: merge-recursive.c:1651
520 msgid "CONFLICT (%s): Merge conflict in %s"
523 #: merge-recursive.c:1741
528 #: merge-recursive.c:1766
529 msgid "file/directory"
532 #: merge-recursive.c:1772
533 msgid "directory/file"
536 #: merge-recursive.c:1777
538 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
541 #: merge-recursive.c:1787
546 #: merge-recursive.c:1804
547 msgid "Fatal merge failure, shouldn't happen."
550 #: merge-recursive.c:1823
551 msgid "Already up-to-date!"
554 #: merge-recursive.c:1832
556 msgid "merging of trees %s and %s failed"
559 #: merge-recursive.c:1862
561 msgid "Unprocessed path??? %s"
564 #: merge-recursive.c:1907
568 #: merge-recursive.c:1918
570 msgid "found %u common ancestor(s):"
573 #: merge-recursive.c:1954
574 msgid "merge returned no commit"
577 #: merge-recursive.c:2011
579 msgid "Could not parse object '%s'"
582 #: merge-recursive.c:2023 builtin/merge.c:697
583 msgid "Unable to write index."
586 #: parse-options.c:494
590 #: parse-options.c:512
595 #. TRANSLATORS: the colon here should align with the
596 #. one in "usage: %s" translation
597 #: parse-options.c:516
602 #: parse-options.c:519
609 msgid "Your branch is ahead of '%s' by %d commit.\n"
610 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
616 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
618 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
625 "Your branch and '%s' have diverged,\n"
626 "and have %d and %d different commit each, respectively.\n"
628 "Your branch and '%s' have diverged,\n"
629 "and have %d and %d different commits each, respectively.\n"
633 #: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
634 #: builtin/merge.c:1088 builtin/merge.c:1098
636 msgid "Could not open '%s' for writing"
639 #: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
640 #: builtin/merge.c:1090 builtin/merge.c:1103
642 msgid "Could not write to '%s'"
647 "after resolving the conflicts, mark the corrected paths\n"
648 "with 'git add <paths>' or 'git rm <paths>'"
653 "after resolving the conflicts, mark the corrected paths\n"
654 "with 'git add <paths>' or 'git rm <paths>'\n"
655 "and commit the result with 'git commit'"
658 #: sequencer.c:160 sequencer.c:758 sequencer.c:841
660 msgid "Could not write to %s"
665 msgid "Error wrapping up %s"
669 msgid "Your local changes would be overwritten by cherry-pick."
673 msgid "Your local changes would be overwritten by revert."
677 msgid "Commit your changes or stash them to proceed."
680 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
683 msgid "%s: Unable to write new index file"
687 msgid "Could not resolve HEAD commit\n"
691 msgid "Unable to update cache tree\n"
696 msgid "Could not parse commit %s\n"
701 msgid "Could not parse parent commit %s\n"
705 msgid "Your index file is unmerged."
709 msgid "You do not have a valid HEAD"
714 msgid "Commit %s is a merge but no -m option was given."
719 msgid "Commit %s does not have parent %d"
724 msgid "Mainline was specified but commit %s is not a merge."
727 #. TRANSLATORS: The first %s will be "revert" or
728 #. "cherry-pick", the second %s a SHA1
731 msgid "%s: cannot parse parent commit %s"
736 msgid "Cannot get commit message for %s"
741 msgid "could not revert %s... %s"
746 msgid "could not apply %s... %s"
750 msgid "empty commit set passed"
755 msgid "git %s: failed to read the index"
760 msgid "git %s: failed to refresh the index"
765 msgid "Cannot %s during a %s"
770 msgid "Could not parse line %d."
774 msgid "No commits parsed."
779 msgid "Could not open %s"
784 msgid "Could not read %s."
789 msgid "Unusable instruction sheet: %s"
794 msgid "Invalid key: %s"
799 msgid "Invalid value for %s: %s"
804 msgid "Malformed options sheet: %s"
808 msgid "a cherry-pick or revert is already in progress"
812 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
817 msgid "Could not create sequencer directory %s"
820 #: sequencer.c:760 sequencer.c:845
822 msgid "Error wrapping up %s."
825 #: sequencer.c:779 sequencer.c:913
826 msgid "no cherry-pick or revert in progress"
830 msgid "cannot resolve HEAD"
834 msgid "cannot abort from a branch yet to be born"
837 #: sequencer.c:805 builtin/apply.c:3988
839 msgid "cannot open %s: %s"
844 msgid "cannot read %s: %s"
848 msgid "unexpected end of file"
853 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
858 msgid "Could not format %s."
862 msgid "Can't revert as initial commit"
866 msgid "Can't cherry-pick into empty head"
870 msgid "HEAD does not point to a branch"
875 msgid "No such branch: '%s'"
880 msgid "No upstream configured for branch '%s'"
885 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
890 msgid "unable to look up current user in the passwd file: %s"
898 msgid "Unmerged paths:"
901 #: wt-status.c:167 wt-status.c:194
903 msgid " (use \"git reset %s <file>...\" to unstage)"
906 #: wt-status.c:169 wt-status.c:196
907 msgid " (use \"git rm --cached <file>...\" to unstage)"
911 msgid " (use \"git add <file>...\" to mark resolution)"
914 #: wt-status.c:175 wt-status.c:179
915 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
919 msgid " (use \"git rm <file>...\" to mark resolution)"
923 msgid "Changes to be committed:"
927 msgid "Changes not staged for commit:"
931 msgid " (use \"git add <file>...\" to update what will be committed)"
935 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
940 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
944 msgid " (commit or discard the untracked or modified content in submodules)"
954 msgid " (use \"git %s <file>...\" to include in what will be committed)"
962 msgid "both deleted:"
970 msgid "deleted by them:"
974 msgid "added by them:"
978 msgid "deleted by us:"
986 msgid "both modified:"
990 msgid "new commits, "
994 msgid "modified content, "
998 msgid "untracked content, "
1003 msgid "new file: %s"
1008 msgid "copied: %s -> %s"
1018 msgid "modified: %s"
1023 msgid "renamed: %s -> %s"
1028 msgid "typechange: %s"
1038 msgid "unmerged: %s"
1043 msgid "bug: unhandled diff status %c"
1047 msgid "You have unmerged paths."
1050 #: wt-status.c:788 wt-status.c:912
1051 msgid " (fix conflicts and run \"git commit\")"
1055 msgid "All conflicts fixed but you are still merging."
1059 msgid " (use \"git commit\" to conclude merge)"
1063 msgid "You are in the middle of an am session."
1067 msgid "The current patch is empty."
1071 msgid " (fix conflicts and then run \"git am --resolved\")"
1075 msgid " (use \"git am --skip\" to skip this patch)"
1079 msgid " (use \"git am --abort\" to restore the original branch)"
1082 #: wt-status.c:873 wt-status.c:883
1083 msgid "You are currently rebasing."
1087 msgid " (fix conflicts and then run \"git rebase --continue\")"
1091 msgid " (use \"git rebase --skip\" to skip this patch)"
1095 msgid " (use \"git rebase --abort\" to check out the original branch)"
1099 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1103 msgid "You are currently splitting a commit during a rebase."
1107 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1111 msgid "You are currently editing a commit during a rebase."
1115 msgid " (use \"git commit --amend\" to amend the current commit)"
1120 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1124 msgid "You are currently cherry-picking."
1128 msgid " (all conflicts fixed: run \"git commit\")"
1132 msgid "You are currently bisecting."
1136 msgid " (use \"git bisect reset\" to get back to the original branch)"
1144 msgid "Not currently on any branch."
1148 msgid "Initial commit"
1161 msgid "Untracked files not listed%s"
1165 msgid " (use -u option to show untracked files)"
1174 msgid "no changes added to commit%s\n"
1178 msgid " (use \"git add\" and/or \"git commit -a\")"
1183 msgid "nothing added to commit but untracked files present%s\n"
1187 msgid " (use \"git add\" to track)"
1190 #: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041
1192 msgid "nothing to commit%s\n"
1196 msgid " (create/copy files and use \"git add\" to track)"
1200 msgid " (use -u to show untracked files)"
1204 msgid " (working directory clean)"
1208 msgid "HEAD (no branch)"
1212 msgid "Initial commit on "
1219 #: wt-status.c:1174 wt-status.c:1177
1229 msgid "unexpected diff status %c"
1232 #: builtin/add.c:67 builtin/commit.c:229
1233 msgid "updating files failed"
1238 msgid "remove '%s'\n"
1241 #: builtin/add.c:176
1243 msgid "Path '%s' is in submodule '%.*s'"
1246 #: builtin/add.c:192
1247 msgid "Unstaged changes after refreshing the index:"
1250 #: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
1252 msgid "pathspec '%s' did not match any files"
1255 #: builtin/add.c:209
1257 msgid "'%s' is beyond a symbolic link"
1260 #: builtin/add.c:276
1261 msgid "Could not read the index"
1264 #: builtin/add.c:286
1266 msgid "Could not open '%s' for writing."
1269 #: builtin/add.c:290
1270 msgid "Could not write patch"
1273 #: builtin/add.c:295
1275 msgid "Could not stat '%s'"
1278 #: builtin/add.c:297
1279 msgid "Empty patch. Aborted."
1282 #: builtin/add.c:303
1284 msgid "Could not apply '%s'"
1287 #: builtin/add.c:312
1288 msgid "The following paths are ignored by one of your .gitignore files:\n"
1291 #: builtin/add.c:352
1293 msgid "Use -f if you really want to add them.\n"
1296 #: builtin/add.c:353
1297 msgid "no files added"
1300 #: builtin/add.c:359
1301 msgid "adding files failed"
1304 #: builtin/add.c:391
1305 msgid "-A and -u are mutually incompatible"
1308 #: builtin/add.c:393
1309 msgid "Option --ignore-missing can only be used together with --dry-run"
1312 #: builtin/add.c:413
1314 msgid "Nothing specified, nothing added.\n"
1317 #: builtin/add.c:414
1319 msgid "Maybe you wanted to say 'git add .'?\n"
1322 #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82
1324 msgid "index file corrupt"
1327 #: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260
1328 msgid "Unable to write new index file"
1331 #: builtin/apply.c:57
1332 msgid "git apply [options] [<patch>...]"
1335 #: builtin/apply.c:110
1337 msgid "unrecognized whitespace option '%s'"
1340 #: builtin/apply.c:125
1342 msgid "unrecognized whitespace ignore option '%s'"
1345 #: builtin/apply.c:824
1347 msgid "Cannot prepare timestamp regexp %s"
1350 #: builtin/apply.c:833
1352 msgid "regexec returned %d for input: %s"
1355 #: builtin/apply.c:914
1357 msgid "unable to find filename in patch at line %d"
1360 #: builtin/apply.c:946
1362 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1365 #: builtin/apply.c:950
1367 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1370 #: builtin/apply.c:951
1372 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1375 #: builtin/apply.c:958
1377 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1380 #: builtin/apply.c:1403
1382 msgid "recount: unexpected line: %.*s"
1385 #: builtin/apply.c:1460
1387 msgid "patch fragment without header at line %d: %.*s"
1390 #: builtin/apply.c:1477
1393 "git diff header lacks filename information when removing %d leading pathname "
1394 "component (line %d)"
1396 "git diff header lacks filename information when removing %d leading pathname "
1397 "components (line %d)"
1401 #: builtin/apply.c:1637
1402 msgid "new file depends on old contents"
1405 #: builtin/apply.c:1639
1406 msgid "deleted file still has contents"
1409 #: builtin/apply.c:1665
1411 msgid "corrupt patch at line %d"
1414 #: builtin/apply.c:1701
1416 msgid "new file %s depends on old contents"
1419 #: builtin/apply.c:1703
1421 msgid "deleted file %s still has contents"
1424 #: builtin/apply.c:1706
1426 msgid "** warning: file %s becomes empty but is not deleted"
1429 #: builtin/apply.c:1852
1431 msgid "corrupt binary patch at line %d: %.*s"
1434 #. there has to be one hunk (forward hunk)
1435 #: builtin/apply.c:1881
1437 msgid "unrecognized binary patch at line %d"
1440 #: builtin/apply.c:1967
1442 msgid "patch with only garbage at line %d"
1445 #: builtin/apply.c:2057
1447 msgid "unable to read symlink %s"
1450 #: builtin/apply.c:2061
1452 msgid "unable to open or read %s"
1455 #: builtin/apply.c:2132
1459 #: builtin/apply.c:2654
1461 msgid "invalid start of line: '%c'"
1464 #: builtin/apply.c:2772
1466 msgid "Hunk #%d succeeded at %d (offset %d line)."
1467 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1471 #: builtin/apply.c:2784
1473 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1476 #: builtin/apply.c:2790
1479 "while searching for:\n"
1483 #: builtin/apply.c:2809
1485 msgid "missing binary patch data for '%s'"
1488 #: builtin/apply.c:2912
1490 msgid "binary patch does not apply to '%s'"
1493 #: builtin/apply.c:2918
1495 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1498 #: builtin/apply.c:2939
1500 msgid "patch failed: %s:%ld"
1503 #: builtin/apply.c:3061
1505 msgid "cannot checkout %s"
1508 #: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159
1510 msgid "read of %s failed"
1513 #: builtin/apply.c:3139 builtin/apply.c:3361
1515 msgid "path %s has been renamed/deleted"
1518 #: builtin/apply.c:3220 builtin/apply.c:3375
1520 msgid "%s: does not exist in index"
1523 #: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389
1528 #: builtin/apply.c:3229 builtin/apply.c:3383
1530 msgid "%s: does not match index"
1533 #: builtin/apply.c:3331
1534 msgid "removal patch leaves file contents"
1537 #: builtin/apply.c:3400
1539 msgid "%s: wrong type"
1542 #: builtin/apply.c:3402
1544 msgid "%s has type %o, expected %o"
1547 #: builtin/apply.c:3503
1549 msgid "%s: already exists in index"
1552 #: builtin/apply.c:3506
1554 msgid "%s: already exists in working directory"
1557 #: builtin/apply.c:3526
1559 msgid "new mode (%o) of %s does not match old mode (%o)"
1562 #: builtin/apply.c:3531
1564 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1567 #: builtin/apply.c:3539
1569 msgid "%s: patch does not apply"
1572 #: builtin/apply.c:3552
1574 msgid "Checking patch %s..."
1577 #: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158
1579 msgid "make_cache_entry failed for path '%s'"
1582 #: builtin/apply.c:3750
1584 msgid "unable to remove %s from index"
1587 #: builtin/apply.c:3778
1589 msgid "corrupt patch for subproject %s"
1592 #: builtin/apply.c:3782
1594 msgid "unable to stat newly created file '%s'"
1597 #: builtin/apply.c:3787
1599 msgid "unable to create backing store for newly created file %s"
1602 #: builtin/apply.c:3790 builtin/apply.c:3898
1604 msgid "unable to add cache entry for %s"
1607 #: builtin/apply.c:3823
1609 msgid "closing file '%s'"
1612 #: builtin/apply.c:3872
1614 msgid "unable to write file '%s' mode %o"
1617 #: builtin/apply.c:3959
1619 msgid "Applied patch %s cleanly."
1622 #: builtin/apply.c:3967
1623 msgid "internal error"
1626 #. Say this even without --verbose
1627 #: builtin/apply.c:3970
1629 msgid "Applying patch %%s with %d reject..."
1630 msgid_plural "Applying patch %%s with %d rejects..."
1634 #: builtin/apply.c:3980
1636 msgid "truncating .rej filename to %.*s.rej"
1639 #: builtin/apply.c:4001
1641 msgid "Hunk #%d applied cleanly."
1644 #: builtin/apply.c:4004
1646 msgid "Rejected hunk #%d."
1649 #: builtin/apply.c:4154
1650 msgid "unrecognized input"
1653 #: builtin/apply.c:4165
1654 msgid "unable to read index file"
1657 #: builtin/apply.c:4284 builtin/apply.c:4287
1661 #: builtin/apply.c:4285
1662 msgid "don't apply changes matching the given path"
1665 #: builtin/apply.c:4288
1666 msgid "apply changes matching the given path"
1669 #: builtin/apply.c:4290
1673 #: builtin/apply.c:4291
1674 msgid "remove <num> leading slashes from traditional diff paths"
1677 #: builtin/apply.c:4294
1678 msgid "ignore additions made by the patch"
1681 #: builtin/apply.c:4296
1682 msgid "instead of applying the patch, output diffstat for the input"
1685 #: builtin/apply.c:4300
1686 msgid "shows number of added and deleted lines in decimal notation"
1689 #: builtin/apply.c:4302
1690 msgid "instead of applying the patch, output a summary for the input"
1693 #: builtin/apply.c:4304
1694 msgid "instead of applying the patch, see if the patch is applicable"
1697 #: builtin/apply.c:4306
1698 msgid "make sure the patch is applicable to the current index"
1701 #: builtin/apply.c:4308
1702 msgid "apply a patch without touching the working tree"
1705 #: builtin/apply.c:4310
1706 msgid "also apply the patch (use with --stat/--summary/--check)"
1709 #: builtin/apply.c:4312
1710 msgid "attempt three-way merge if a patch does not apply"
1713 #: builtin/apply.c:4314
1714 msgid "build a temporary index based on embedded index information"
1717 #: builtin/apply.c:4316
1718 msgid "paths are separated with NUL character"
1721 #: builtin/apply.c:4319
1722 msgid "ensure at least <n> lines of context match"
1725 #: builtin/apply.c:4320
1729 #: builtin/apply.c:4321
1730 msgid "detect new or modified lines that have whitespace errors"
1733 #: builtin/apply.c:4324 builtin/apply.c:4327
1734 msgid "ignore changes in whitespace when finding context"
1737 #: builtin/apply.c:4330
1738 msgid "apply the patch in reverse"
1741 #: builtin/apply.c:4332
1742 msgid "don't expect at least one line of context"
1745 #: builtin/apply.c:4334
1746 msgid "leave the rejected hunks in corresponding *.rej files"
1749 #: builtin/apply.c:4336
1750 msgid "allow overlapping hunks"
1753 #: builtin/apply.c:4337
1757 #: builtin/apply.c:4339
1758 msgid "tolerate incorrectly detected missing new-line at the end of file"
1761 #: builtin/apply.c:4342
1762 msgid "do not trust the line counts in the hunk headers"
1765 #: builtin/apply.c:4344
1769 #: builtin/apply.c:4345
1770 msgid "prepend <root> to all filenames"
1773 #: builtin/apply.c:4367
1774 msgid "--3way outside a repository"
1777 #: builtin/apply.c:4375
1778 msgid "--index outside a repository"
1781 #: builtin/apply.c:4378
1782 msgid "--cached outside a repository"
1785 #: builtin/apply.c:4394
1787 msgid "can't open patch '%s'"
1790 #: builtin/apply.c:4408
1792 msgid "squelched %d whitespace error"
1793 msgid_plural "squelched %d whitespace errors"
1797 #: builtin/apply.c:4414 builtin/apply.c:4424
1799 msgid "%d line adds whitespace errors."
1800 msgid_plural "%d lines add whitespace errors."
1804 #: builtin/archive.c:17
1806 msgid "could not create archive file '%s'"
1809 #: builtin/archive.c:20
1810 msgid "could not redirect output"
1813 #: builtin/archive.c:37
1814 msgid "git archive: Remote with no URL"
1817 #: builtin/archive.c:58
1818 msgid "git archive: expected ACK/NAK, got EOF"
1821 #: builtin/archive.c:63
1823 msgid "git archive: NACK %s"
1826 #: builtin/archive.c:65
1828 msgid "remote error: %s"
1831 #: builtin/archive.c:66
1832 msgid "git archive: protocol error"
1835 #: builtin/archive.c:71
1836 msgid "git archive: expected a flush"
1839 #: builtin/branch.c:144
1842 "deleting branch '%s' that has been merged to\n"
1843 " '%s', but not yet merged to HEAD."
1846 #: builtin/branch.c:148
1849 "not deleting branch '%s' that is not yet merged to\n"
1850 " '%s', even though it is merged to HEAD."
1853 #: builtin/branch.c:180
1854 msgid "cannot use -a with -d"
1857 #: builtin/branch.c:186
1858 msgid "Couldn't look up commit object for HEAD"
1861 #: builtin/branch.c:191
1863 msgid "Cannot delete the branch '%s' which you are currently on."
1866 #: builtin/branch.c:202
1868 msgid "remote branch '%s' not found."
1871 #: builtin/branch.c:203
1873 msgid "branch '%s' not found."
1876 #: builtin/branch.c:210
1878 msgid "Couldn't look up commit object for '%s'"
1881 #: builtin/branch.c:216
1884 "The branch '%s' is not fully merged.\n"
1885 "If you are sure you want to delete it, run 'git branch -D %s'."
1888 #: builtin/branch.c:225
1890 msgid "Error deleting remote branch '%s'"
1893 #: builtin/branch.c:226
1895 msgid "Error deleting branch '%s'"
1898 #: builtin/branch.c:233
1900 msgid "Deleted remote branch %s (was %s).\n"
1903 #: builtin/branch.c:234
1905 msgid "Deleted branch %s (was %s).\n"
1908 #: builtin/branch.c:239
1909 msgid "Update of config-file failed"
1912 #: builtin/branch.c:337
1914 msgid "branch '%s' does not point at a commit"
1917 #: builtin/branch.c:409
1919 msgid "[%s: behind %d]"
1922 #: builtin/branch.c:411
1927 #: builtin/branch.c:415
1929 msgid "[%s: ahead %d]"
1932 #: builtin/branch.c:417
1937 #: builtin/branch.c:420
1939 msgid "[%s: ahead %d, behind %d]"
1942 #: builtin/branch.c:423
1944 msgid "[ahead %d, behind %d]"
1947 #: builtin/branch.c:535
1951 #: builtin/branch.c:600
1952 msgid "some refs could not be read"
1955 #: builtin/branch.c:613
1956 msgid "cannot rename the current branch while not on any."
1959 #: builtin/branch.c:623
1961 msgid "Invalid branch name: '%s'"
1964 #: builtin/branch.c:638
1965 msgid "Branch rename failed"
1968 #: builtin/branch.c:642
1970 msgid "Renamed a misnamed branch '%s' away"
1973 #: builtin/branch.c:646
1975 msgid "Branch renamed to %s, but HEAD is not updated!"
1978 #: builtin/branch.c:653
1979 msgid "Branch is renamed, but update of config-file failed"
1982 #: builtin/branch.c:668
1984 msgid "malformed object name %s"
1987 #: builtin/branch.c:692
1989 msgid "could not write branch description template: %s"
1992 #: builtin/branch.c:783
1993 msgid "Failed to resolve HEAD as a valid ref."
1996 #: builtin/branch.c:788 builtin/clone.c:561
1997 msgid "HEAD not found below refs/heads!"
2000 #: builtin/branch.c:808
2001 msgid "--column and --verbose are incompatible"
2004 #: builtin/branch.c:857
2005 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2008 #: builtin/bundle.c:47
2010 msgid "%s is okay\n"
2013 #: builtin/bundle.c:56
2014 msgid "Need a repository to create a bundle."
2017 #: builtin/bundle.c:60
2018 msgid "Need a repository to unbundle."
2021 #: builtin/checkout.c:114 builtin/checkout.c:147
2023 msgid "path '%s' does not have our version"
2026 #: builtin/checkout.c:116 builtin/checkout.c:149
2028 msgid "path '%s' does not have their version"
2031 #: builtin/checkout.c:132
2033 msgid "path '%s' does not have all necessary versions"
2036 #: builtin/checkout.c:176
2038 msgid "path '%s' does not have necessary versions"
2041 #: builtin/checkout.c:193
2043 msgid "path '%s': cannot merge"
2046 #: builtin/checkout.c:210
2048 msgid "Unable to add merge result for '%s'"
2051 #: builtin/checkout.c:235 builtin/checkout.c:393
2052 msgid "corrupt index file"
2055 #: builtin/checkout.c:265 builtin/checkout.c:272
2057 msgid "path '%s' is unmerged"
2060 #: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586
2061 #: builtin/merge.c:812
2062 msgid "unable to write new index file"
2065 #: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408
2066 msgid "diff_setup_done failed"
2069 #: builtin/checkout.c:415
2070 msgid "you need to resolve your current index first"
2073 #: builtin/checkout.c:534
2075 msgid "Can not do reflog for '%s'\n"
2078 #: builtin/checkout.c:567
2079 msgid "HEAD is now at"
2082 #: builtin/checkout.c:574
2084 msgid "Reset branch '%s'\n"
2087 #: builtin/checkout.c:577
2089 msgid "Already on '%s'\n"
2092 #: builtin/checkout.c:581
2094 msgid "Switched to and reset branch '%s'\n"
2097 #: builtin/checkout.c:583
2099 msgid "Switched to a new branch '%s'\n"
2102 #: builtin/checkout.c:585
2104 msgid "Switched to branch '%s'\n"
2107 #: builtin/checkout.c:641
2109 msgid " ... and %d more.\n"
2112 #. The singular version
2113 #: builtin/checkout.c:647
2116 "Warning: you are leaving %d commit behind, not connected to\n"
2117 "any of your branches:\n"
2121 "Warning: you are leaving %d commits behind, not connected to\n"
2122 "any of your branches:\n"
2128 #: builtin/checkout.c:665
2131 "If you want to keep them by creating a new branch, this may be a good time\n"
2134 " git branch new_branch_name %s\n"
2138 #: builtin/checkout.c:695
2139 msgid "internal error in revision walk"
2142 #: builtin/checkout.c:699
2143 msgid "Previous HEAD position was"
2146 #: builtin/checkout.c:725 builtin/checkout.c:920
2147 msgid "You are on a branch yet to be born"
2151 #: builtin/checkout.c:856
2153 msgid "invalid reference: %s"
2156 #. case (1): want a tree
2157 #: builtin/checkout.c:895
2159 msgid "reference is not a tree: %s"
2162 #: builtin/checkout.c:977
2163 msgid "-B cannot be used with -b"
2166 #: builtin/checkout.c:986
2167 msgid "--patch is incompatible with all other options"
2170 #: builtin/checkout.c:989
2171 msgid "--detach cannot be used with -b/-B/--orphan"
2174 #: builtin/checkout.c:991
2175 msgid "--detach cannot be used with -t"
2178 #: builtin/checkout.c:997
2179 msgid "--track needs a branch name"
2182 #: builtin/checkout.c:1004
2183 msgid "Missing branch name; try -b"
2186 #: builtin/checkout.c:1010
2187 msgid "--orphan and -b|-B are mutually exclusive"
2190 #: builtin/checkout.c:1012
2191 msgid "--orphan cannot be used with -t"
2194 #: builtin/checkout.c:1022
2195 msgid "git checkout: -f and -m are incompatible"
2198 #: builtin/checkout.c:1056
2199 msgid "invalid path specification"
2202 #: builtin/checkout.c:1064
2205 "git checkout: updating paths is incompatible with switching branches.\n"
2206 "Did you intend to checkout '%s' which can not be resolved as commit?"
2209 #: builtin/checkout.c:1066
2210 msgid "git checkout: updating paths is incompatible with switching branches."
2213 #: builtin/checkout.c:1071
2214 msgid "git checkout: --detach does not take a path argument"
2217 #: builtin/checkout.c:1074
2219 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
2220 "checking out of the index."
2223 #: builtin/checkout.c:1093
2224 msgid "Cannot switch branch to a non-commit."
2227 #: builtin/checkout.c:1096
2228 msgid "--ours/--theirs is incompatible with switching branches."
2231 #: builtin/clean.c:78
2232 msgid "-x and -X cannot be used together"
2235 #: builtin/clean.c:82
2237 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
2240 #: builtin/clean.c:85
2242 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
2246 #: builtin/clean.c:155 builtin/clean.c:176
2248 msgid "Would remove %s\n"
2251 #: builtin/clean.c:159 builtin/clean.c:179
2253 msgid "Removing %s\n"
2256 #: builtin/clean.c:162 builtin/clean.c:182
2258 msgid "failed to remove %s"
2261 #: builtin/clean.c:166
2263 msgid "Would not remove %s\n"
2266 #: builtin/clean.c:168
2268 msgid "Not removing %s\n"
2271 #: builtin/clone.c:243
2273 msgid "reference repository '%s' is not a local directory."
2276 #: builtin/clone.c:306
2278 msgid "failed to create directory '%s'"
2281 #: builtin/clone.c:308 builtin/diff.c:75
2283 msgid "failed to stat '%s'"
2286 #: builtin/clone.c:310
2288 msgid "%s exists and is not a directory"
2291 #: builtin/clone.c:324
2293 msgid "failed to stat %s\n"
2296 #: builtin/clone.c:341
2298 msgid "failed to unlink '%s'"
2301 #: builtin/clone.c:346
2303 msgid "failed to create link '%s'"
2306 #: builtin/clone.c:350
2308 msgid "failed to copy file to '%s'"
2311 #: builtin/clone.c:373
2316 #: builtin/clone.c:443
2318 msgid "Could not find remote branch %s to clone."
2321 #: builtin/clone.c:552
2322 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
2325 #: builtin/clone.c:642
2326 msgid "Too many arguments."
2329 #: builtin/clone.c:646
2330 msgid "You must specify a repository to clone."
2333 #: builtin/clone.c:657
2335 msgid "--bare and --origin %s options are incompatible."
2338 #: builtin/clone.c:671
2340 msgid "repository '%s' does not exist"
2343 #: builtin/clone.c:676
2344 msgid "--depth is ignored in local clones; use file:// instead."
2347 #: builtin/clone.c:686
2349 msgid "destination path '%s' already exists and is not an empty directory."
2352 #: builtin/clone.c:696
2354 msgid "working tree '%s' already exists."
2357 #: builtin/clone.c:709 builtin/clone.c:723
2359 msgid "could not create leading directories of '%s'"
2362 #: builtin/clone.c:712
2364 msgid "could not create work tree dir '%s'."
2367 #: builtin/clone.c:731
2369 msgid "Cloning into bare repository '%s'...\n"
2372 #: builtin/clone.c:733
2374 msgid "Cloning into '%s'...\n"
2377 #: builtin/clone.c:789
2379 msgid "Don't know how to clone %s"
2382 #: builtin/clone.c:838
2384 msgid "Remote branch %s not found in upstream %s"
2387 #: builtin/clone.c:845
2388 msgid "You appear to have cloned an empty repository."
2391 #: builtin/column.c:51
2392 msgid "--command must be the first argument"
2395 #: builtin/commit.c:43
2397 "Your name and email address were configured automatically based\n"
2398 "on your username and hostname. Please check that they are accurate.\n"
2399 "You can suppress this message by setting them explicitly:\n"
2401 " git config --global user.name \"Your Name\"\n"
2402 " git config --global user.email you@example.com\n"
2404 "After doing this, you may fix the identity used for this commit with:\n"
2406 " git commit --amend --reset-author\n"
2409 #: builtin/commit.c:55
2411 "You asked to amend the most recent commit, but doing so would make\n"
2412 "it empty. You can repeat your command with --allow-empty, or you can\n"
2413 "remove the commit entirely with \"git reset HEAD^\".\n"
2416 #: builtin/commit.c:60
2418 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
2419 "If you wish to commit it anyway, use:\n"
2421 " git commit --allow-empty\n"
2423 "Otherwise, please use 'git reset'\n"
2426 #: builtin/commit.c:256
2427 msgid "failed to unpack HEAD tree object"
2430 #: builtin/commit.c:298
2431 msgid "unable to create temporary index"
2434 #: builtin/commit.c:304
2435 msgid "interactive add failed"
2438 #: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408
2439 msgid "unable to write new_index file"
2442 #: builtin/commit.c:389
2443 msgid "cannot do a partial commit during a merge."
2446 #: builtin/commit.c:391
2447 msgid "cannot do a partial commit during a cherry-pick."
2450 #: builtin/commit.c:401
2451 msgid "cannot read the index"
2454 #: builtin/commit.c:421
2455 msgid "unable to write temporary index file"
2458 #: builtin/commit.c:496 builtin/commit.c:502
2460 msgid "invalid commit: %s"
2463 #: builtin/commit.c:525
2464 msgid "malformed --author parameter"
2467 #: builtin/commit.c:585
2469 msgid "Malformed ident string: '%s'"
2472 #: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970
2474 msgid "could not lookup commit %s"
2477 #: builtin/commit.c:635 builtin/shortlog.c:296
2479 msgid "(reading log message from standard input)\n"
2482 #: builtin/commit.c:637
2483 msgid "could not read log from standard input"
2486 #: builtin/commit.c:641
2488 msgid "could not read log file '%s'"
2491 #: builtin/commit.c:647
2492 msgid "commit has empty message"
2495 #: builtin/commit.c:663
2496 msgid "could not read MERGE_MSG"
2499 #: builtin/commit.c:667
2500 msgid "could not read SQUASH_MSG"
2503 #: builtin/commit.c:671
2505 msgid "could not read '%s'"
2508 #: builtin/commit.c:723
2509 msgid "could not write commit template"
2512 #: builtin/commit.c:734
2516 "It looks like you may be committing a merge.\n"
2517 "If this is not correct, please remove the file\n"
2522 #: builtin/commit.c:739
2526 "It looks like you may be committing a cherry-pick.\n"
2527 "If this is not correct, please remove the file\n"
2532 #: builtin/commit.c:751
2534 "Please enter the commit message for your changes. Lines starting\n"
2535 "with '#' will be ignored, and an empty message aborts the commit.\n"
2538 #: builtin/commit.c:756
2540 "Please enter the commit message for your changes. Lines starting\n"
2541 "with '#' will be kept; you may remove them yourself if you want to.\n"
2542 "An empty message aborts the commit.\n"
2545 #: builtin/commit.c:769
2547 msgid "%sAuthor: %s"
2550 #: builtin/commit.c:776
2552 msgid "%sCommitter: %s"
2555 #: builtin/commit.c:796
2556 msgid "Cannot read index"
2559 #: builtin/commit.c:833
2560 msgid "Error building trees"
2563 #: builtin/commit.c:848 builtin/tag.c:361
2565 msgid "Please supply the message using either -m or -F option.\n"
2568 #: builtin/commit.c:945
2570 msgid "No existing author found with '%s'"
2573 #: builtin/commit.c:960 builtin/commit.c:1160
2575 msgid "Invalid untracked files mode '%s'"
2578 #: builtin/commit.c:1000
2579 msgid "Using both --reset-author and --author does not make sense"
2582 #: builtin/commit.c:1011
2583 msgid "You have nothing to amend."
2586 #: builtin/commit.c:1014
2587 msgid "You are in the middle of a merge -- cannot amend."
2590 #: builtin/commit.c:1016
2591 msgid "You are in the middle of a cherry-pick -- cannot amend."
2594 #: builtin/commit.c:1019
2595 msgid "Options --squash and --fixup cannot be used together"
2598 #: builtin/commit.c:1029
2599 msgid "Only one of -c/-C/-F/--fixup can be used."
2602 #: builtin/commit.c:1031
2603 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
2606 #: builtin/commit.c:1039
2607 msgid "--reset-author can be used only with -C, -c or --amend."
2610 #: builtin/commit.c:1056
2611 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
2614 #: builtin/commit.c:1058
2615 msgid "No paths with --include/--only does not make sense."
2618 #: builtin/commit.c:1060
2619 msgid "Clever... amending the last one with dirty index."
2622 #: builtin/commit.c:1062
2623 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
2626 #: builtin/commit.c:1072 builtin/tag.c:577
2628 msgid "Invalid cleanup mode %s"
2631 #: builtin/commit.c:1077
2632 msgid "Paths with -a does not make sense."
2635 #: builtin/commit.c:1260
2636 msgid "couldn't look up newly created commit"
2639 #: builtin/commit.c:1262
2640 msgid "could not parse newly created commit"
2643 #: builtin/commit.c:1303
2644 msgid "detached HEAD"
2647 #: builtin/commit.c:1305
2648 msgid " (root-commit)"
2651 #: builtin/commit.c:1449
2652 msgid "could not parse HEAD commit"
2655 #: builtin/commit.c:1487 builtin/merge.c:509
2657 msgid "could not open '%s' for reading"
2660 #: builtin/commit.c:1494
2662 msgid "Corrupt MERGE_HEAD file (%s)"
2665 #: builtin/commit.c:1501
2666 msgid "could not read MERGE_MODE"
2669 #: builtin/commit.c:1520
2671 msgid "could not read commit message: %s"
2674 #: builtin/commit.c:1534
2676 msgid "Aborting commit; you did not edit the message.\n"
2679 #: builtin/commit.c:1539
2681 msgid "Aborting commit due to empty commit message.\n"
2684 #: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
2685 msgid "failed to write commit object"
2688 #: builtin/commit.c:1575
2689 msgid "cannot lock HEAD ref"
2692 #: builtin/commit.c:1579
2693 msgid "cannot update HEAD ref"
2696 #: builtin/commit.c:1590
2698 "Repository has been updated, but unable to write\n"
2699 "new_index file. Check that disk is not full or quota is\n"
2700 "not exceeded, and then \"git reset HEAD\" to recover."
2703 #: builtin/describe.c:234
2705 msgid "annotated tag %s not available"
2708 #: builtin/describe.c:238
2710 msgid "annotated tag %s has no embedded name"
2713 #: builtin/describe.c:240
2715 msgid "tag '%s' is really '%s' here"
2718 #: builtin/describe.c:267
2720 msgid "Not a valid object name %s"
2723 #: builtin/describe.c:270
2725 msgid "%s is not a valid '%s' object"
2728 #: builtin/describe.c:287
2730 msgid "no tag exactly matches '%s'"
2733 #: builtin/describe.c:289
2735 msgid "searching to describe %s\n"
2738 #: builtin/describe.c:329
2740 msgid "finished search at %s\n"
2743 #: builtin/describe.c:353
2746 "No annotated tags can describe '%s'.\n"
2747 "However, there were unannotated tags: try --tags."
2750 #: builtin/describe.c:357
2753 "No tags can describe '%s'.\n"
2754 "Try --always, or create some tags."
2757 #: builtin/describe.c:378
2759 msgid "traversed %lu commits\n"
2762 #: builtin/describe.c:381
2765 "more than %i tags found; listed %i most recent\n"
2766 "gave up search at %s\n"
2769 #: builtin/describe.c:436
2770 msgid "--long is incompatible with --abbrev=0"
2773 #: builtin/describe.c:462
2774 msgid "No names found, cannot describe anything."
2777 #: builtin/describe.c:482
2778 msgid "--dirty is incompatible with committishes"
2781 #: builtin/diff.c:77
2783 msgid "'%s': not a regular file or symlink"
2786 #: builtin/diff.c:220
2788 msgid "invalid option: %s"
2791 #: builtin/diff.c:297
2792 msgid "Not a git repository"
2795 #: builtin/diff.c:341
2797 msgid "invalid object '%s' given."
2800 #: builtin/diff.c:346
2802 msgid "more than %d trees given: '%s'"
2805 #: builtin/diff.c:356
2807 msgid "more than two blobs given: '%s'"
2810 #: builtin/diff.c:364
2812 msgid "unhandled object '%s' given."
2815 #: builtin/fetch.c:200
2816 msgid "Couldn't find remote ref HEAD"
2819 #: builtin/fetch.c:253
2821 msgid "object %s not found"
2824 #: builtin/fetch.c:259
2825 msgid "[up to date]"
2828 #: builtin/fetch.c:273
2830 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
2833 #: builtin/fetch.c:274 builtin/fetch.c:360
2837 #: builtin/fetch.c:285
2838 msgid "[tag update]"
2841 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
2842 msgid " (unable to update local ref)"
2845 #: builtin/fetch.c:305
2849 #: builtin/fetch.c:308
2850 msgid "[new branch]"
2853 #: builtin/fetch.c:311
2857 #: builtin/fetch.c:356
2858 msgid "unable to update local ref"
2861 #: builtin/fetch.c:356
2862 msgid "forced update"
2865 #: builtin/fetch.c:362
2866 msgid "(non-fast-forward)"
2869 #: builtin/fetch.c:393 builtin/fetch.c:685
2871 msgid "cannot open %s: %s\n"
2874 #: builtin/fetch.c:402
2876 msgid "%s did not send all necessary objects\n"
2879 #: builtin/fetch.c:488
2884 #: builtin/fetch.c:499
2887 "some local refs could not be updated; try running\n"
2888 " 'git remote prune %s' to remove any old, conflicting branches"
2891 #: builtin/fetch.c:549
2893 msgid " (%s will become dangling)"
2896 #: builtin/fetch.c:550
2898 msgid " (%s has become dangling)"
2901 #: builtin/fetch.c:557
2905 #: builtin/fetch.c:558 builtin/remote.c:1055
2909 #: builtin/fetch.c:675
2911 msgid "Refusing to fetch into current branch %s of non-bare repository"
2914 #: builtin/fetch.c:709
2916 msgid "Don't know how to fetch from %s"
2919 #: builtin/fetch.c:786
2921 msgid "Option \"%s\" value \"%s\" is not valid for %s"
2924 #: builtin/fetch.c:789
2926 msgid "Option \"%s\" is ignored for %s\n"
2929 #: builtin/fetch.c:888
2931 msgid "Fetching %s\n"
2934 #: builtin/fetch.c:890 builtin/remote.c:100
2936 msgid "Could not fetch %s"
2939 #: builtin/fetch.c:907
2941 "No remote repository specified. Please, specify either a URL or a\n"
2942 "remote name from which new revisions should be fetched."
2945 #: builtin/fetch.c:927
2946 msgid "You need to specify a tag name."
2949 #: builtin/fetch.c:979
2950 msgid "fetch --all does not take a repository argument"
2953 #: builtin/fetch.c:981
2954 msgid "fetch --all does not make sense with refspecs"
2957 #: builtin/fetch.c:992
2959 msgid "No such remote or remote group: %s"
2962 #: builtin/fetch.c:1000
2963 msgid "Fetching a group and specifying refspecs does not make sense"
2968 msgid "Invalid %s: '%s'"
2973 msgid "insanely long object directory %.*s"
2978 msgid "Auto packing the repository for optimum performance.\n"
2984 "Auto packing the repository for optimum performance. You may also\n"
2985 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
2990 "There are too many unreachable loose objects; run 'git prune' to remove them."
2993 #: builtin/grep.c:216
2995 msgid "grep: failed to create thread: %s"
2998 #: builtin/grep.c:402
3000 msgid "Failed to chdir: %s"
3003 #: builtin/grep.c:478 builtin/grep.c:512
3005 msgid "unable to read tree (%s)"
3008 #: builtin/grep.c:526
3010 msgid "unable to grep from object of type %s"
3013 #: builtin/grep.c:584
3015 msgid "switch `%c' expects a numerical value"
3018 #: builtin/grep.c:601
3020 msgid "cannot open '%s'"
3023 #: builtin/grep.c:885
3024 msgid "no pattern given."
3027 #: builtin/grep.c:899
3029 msgid "bad object %s"
3032 #: builtin/grep.c:940
3033 msgid "--open-files-in-pager only works on the worktree"
3036 #: builtin/grep.c:963
3037 msgid "--cached or --untracked cannot be used with --no-index."
3040 #: builtin/grep.c:968
3041 msgid "--no-index or --untracked cannot be used with revs."
3044 #: builtin/grep.c:971
3045 msgid "--[no-]exclude-standard cannot be used for tracked contents."
3048 #: builtin/grep.c:979
3049 msgid "both --cached and trees are given."
3052 #: builtin/help.c:65
3054 msgid "unrecognized help format '%s'"
3057 #: builtin/help.c:93
3058 msgid "Failed to start emacsclient."
3061 #: builtin/help.c:106
3062 msgid "Failed to parse emacsclient version."
3065 #: builtin/help.c:114
3067 msgid "emacsclient version '%d' too old (< 22)."
3070 #: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
3072 msgid "failed to exec '%s': %s"
3075 #: builtin/help.c:217
3078 "'%s': path for unsupported man viewer.\n"
3079 "Please consider using 'man.<tool>.cmd' instead."
3082 #: builtin/help.c:229
3085 "'%s': cmd for supported man viewer.\n"
3086 "Please consider using 'man.<tool>.path' instead."
3089 #: builtin/help.c:299
3090 msgid "The most commonly used git commands are:"
3093 #: builtin/help.c:367
3095 msgid "'%s': unknown man viewer."
3098 #: builtin/help.c:384
3099 msgid "no man viewer handled the request"
3102 #: builtin/help.c:392
3103 msgid "no info viewer handled the request"
3106 #: builtin/help.c:447 builtin/help.c:454
3111 #: builtin/help.c:470
3113 msgid "`git %s' is aliased to `%s'"
3116 #: builtin/index-pack.c:170
3118 msgid "object type mismatch at %s"
3121 #: builtin/index-pack.c:190
3122 msgid "object of unexpected type"
3125 #: builtin/index-pack.c:227
3127 msgid "cannot fill %d byte"
3128 msgid_plural "cannot fill %d bytes"
3132 #: builtin/index-pack.c:237
3136 #: builtin/index-pack.c:238
3137 msgid "read error on input"
3140 #: builtin/index-pack.c:250
3141 msgid "used more bytes than were available"
3144 #: builtin/index-pack.c:257
3145 msgid "pack too large for current definition of off_t"
3148 #: builtin/index-pack.c:273
3150 msgid "unable to create '%s'"
3153 #: builtin/index-pack.c:278
3155 msgid "cannot open packfile '%s'"
3158 #: builtin/index-pack.c:292
3159 msgid "pack signature mismatch"
3162 #: builtin/index-pack.c:312
3164 msgid "pack has bad object at offset %lu: %s"
3167 #: builtin/index-pack.c:434
3169 msgid "inflate returned %d"
3172 #: builtin/index-pack.c:483
3173 msgid "offset value overflow for delta base object"
3176 #: builtin/index-pack.c:491
3177 msgid "delta base offset is out of bound"
3180 #: builtin/index-pack.c:499
3182 msgid "unknown object type %d"
3185 #: builtin/index-pack.c:530
3186 msgid "cannot pread pack file"
3189 #: builtin/index-pack.c:532
3191 msgid "premature end of pack file, %lu byte missing"
3192 msgid_plural "premature end of pack file, %lu bytes missing"
3196 #: builtin/index-pack.c:558
3197 msgid "serious inflate inconsistency"
3200 #: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
3201 #: builtin/index-pack.c:712 builtin/index-pack.c:721
3203 msgid "SHA1 COLLISION FOUND WITH %s !"
3206 #: builtin/index-pack.c:652 builtin/pack-objects.c:170
3207 #: builtin/pack-objects.c:262
3209 msgid "unable to read %s"
3212 #: builtin/index-pack.c:718
3214 msgid "cannot read existing object %s"
3217 #: builtin/index-pack.c:732
3219 msgid "invalid blob object %s"
3222 #: builtin/index-pack.c:747
3227 #: builtin/index-pack.c:749
3228 msgid "Error in object"
3231 #: builtin/index-pack.c:751
3233 msgid "Not all child objects of %s are reachable"
3236 #: builtin/index-pack.c:821 builtin/index-pack.c:847
3237 msgid "failed to apply delta"
3240 #: builtin/index-pack.c:986
3241 msgid "Receiving objects"
3244 #: builtin/index-pack.c:986
3245 msgid "Indexing objects"
3248 #: builtin/index-pack.c:1012
3249 msgid "pack is corrupted (SHA1 mismatch)"
3252 #: builtin/index-pack.c:1017
3253 msgid "cannot fstat packfile"
3256 #: builtin/index-pack.c:1020
3257 msgid "pack has junk at the end"
3260 #: builtin/index-pack.c:1031
3261 msgid "confusion beyond insanity in parse_pack_objects()"
3264 #: builtin/index-pack.c:1054
3265 msgid "Resolving deltas"
3268 #: builtin/index-pack.c:1105
3269 msgid "confusion beyond insanity"
3272 #: builtin/index-pack.c:1124
3274 msgid "pack has %d unresolved delta"
3275 msgid_plural "pack has %d unresolved deltas"
3279 #: builtin/index-pack.c:1149
3281 msgid "unable to deflate appended object (%d)"
3284 #: builtin/index-pack.c:1228
3286 msgid "local object %s is corrupt"
3289 #: builtin/index-pack.c:1252
3290 msgid "error while closing pack file"
3293 #: builtin/index-pack.c:1265
3295 msgid "cannot write keep file '%s'"
3298 #: builtin/index-pack.c:1273
3300 msgid "cannot close written keep file '%s'"
3303 #: builtin/index-pack.c:1286
3304 msgid "cannot store pack file"
3307 #: builtin/index-pack.c:1297
3308 msgid "cannot store index file"
3311 #: builtin/index-pack.c:1398
3313 msgid "Cannot open existing pack file '%s'"
3316 #: builtin/index-pack.c:1400
3318 msgid "Cannot open existing pack idx file for '%s'"
3321 #: builtin/index-pack.c:1447
3323 msgid "non delta: %d object"
3324 msgid_plural "non delta: %d objects"
3328 #: builtin/index-pack.c:1454
3330 msgid "chain length = %d: %lu object"
3331 msgid_plural "chain length = %d: %lu objects"
3335 #: builtin/index-pack.c:1481
3336 msgid "Cannot come back to cwd"
3339 #: builtin/index-pack.c:1525 builtin/index-pack.c:1528
3340 #: builtin/index-pack.c:1540 builtin/index-pack.c:1544
3345 #: builtin/index-pack.c:1558
3346 msgid "--fix-thin cannot be used without --stdin"
3349 #: builtin/index-pack.c:1562 builtin/index-pack.c:1572
3351 msgid "packfile name '%s' does not end with '.pack'"
3354 #: builtin/index-pack.c:1581
3355 msgid "--verify with no packfile name given"
3358 #: builtin/init-db.c:35
3360 msgid "Could not make %s writable by group"
3363 #: builtin/init-db.c:62
3365 msgid "insanely long template name %s"
3368 #: builtin/init-db.c:67
3370 msgid "cannot stat '%s'"
3373 #: builtin/init-db.c:73
3375 msgid "cannot stat template '%s'"
3378 #: builtin/init-db.c:80
3380 msgid "cannot opendir '%s'"
3383 #: builtin/init-db.c:97
3385 msgid "cannot readlink '%s'"
3388 #: builtin/init-db.c:99
3390 msgid "insanely long symlink %s"
3393 #: builtin/init-db.c:102
3395 msgid "cannot symlink '%s' '%s'"
3398 #: builtin/init-db.c:106
3400 msgid "cannot copy '%s' to '%s'"
3403 #: builtin/init-db.c:110
3405 msgid "ignoring template %s"
3408 #: builtin/init-db.c:133
3410 msgid "insanely long template path %s"
3413 #: builtin/init-db.c:141
3415 msgid "templates not found %s"
3418 #: builtin/init-db.c:154
3420 msgid "not copying templates of a wrong format version %d from '%s'"
3423 #: builtin/init-db.c:192
3425 msgid "insane git directory %s"
3428 #: builtin/init-db.c:323 builtin/init-db.c:326
3430 msgid "%s already exists"
3433 #: builtin/init-db.c:355
3435 msgid "unable to handle file type %d"
3438 #: builtin/init-db.c:358
3440 msgid "unable to move %s to %s"
3443 #: builtin/init-db.c:363
3445 msgid "Could not create git link %s"
3449 #. * TRANSLATORS: The first '%s' is either "Reinitialized
3450 #. * existing" or "Initialized empty", the second " shared" or
3451 #. * "", and the last '%s%s' is the verbatim directory name.
3453 #: builtin/init-db.c:420
3455 msgid "%s%s Git repository in %s%s\n"
3458 #: builtin/init-db.c:421
3459 msgid "Reinitialized existing"
3462 #: builtin/init-db.c:421
3463 msgid "Initialized empty"
3466 #: builtin/init-db.c:422
3470 #: builtin/init-db.c:441
3471 msgid "cannot tell cwd"
3474 #: builtin/init-db.c:522 builtin/init-db.c:529
3476 msgid "cannot mkdir %s"
3479 #: builtin/init-db.c:533
3481 msgid "cannot chdir to %s"
3484 #: builtin/init-db.c:555
3487 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
3491 #: builtin/init-db.c:579
3492 msgid "Cannot access current working directory"
3495 #: builtin/init-db.c:586
3497 msgid "Cannot access work tree '%s'"
3500 #: builtin/log.c:189
3502 msgid "Final output: %d %s\n"
3505 #: builtin/log.c:403 builtin/log.c:494
3507 msgid "Could not read object %s"
3510 #: builtin/log.c:518
3512 msgid "Unknown type: %d"
3515 #: builtin/log.c:608
3516 msgid "format.headers without value"
3519 #: builtin/log.c:682
3520 msgid "name of output directory is too long"
3523 #: builtin/log.c:693
3525 msgid "Cannot open patch file %s"
3528 #: builtin/log.c:707
3529 msgid "Need exactly one range."
3532 #: builtin/log.c:715
3533 msgid "Not a range."
3536 #: builtin/log.c:792
3537 msgid "Cover letter needs email format"
3540 #: builtin/log.c:865
3542 msgid "insane in-reply-to: %s"
3545 #: builtin/log.c:938
3546 msgid "Two output directories?"
3549 #: builtin/log.c:1160
3551 msgid "bogus committer info %s"
3554 #: builtin/log.c:1205
3555 msgid "-n and -k are mutually exclusive."
3558 #: builtin/log.c:1207
3559 msgid "--subject-prefix and -k are mutually exclusive."
3562 #: builtin/log.c:1215
3563 msgid "--name-only does not make sense"
3566 #: builtin/log.c:1217
3567 msgid "--name-status does not make sense"
3570 #: builtin/log.c:1219
3571 msgid "--check does not make sense"
3574 #: builtin/log.c:1242
3575 msgid "standard output, or directory, which one?"
3578 #: builtin/log.c:1244
3580 msgid "Could not create directory '%s'"
3583 #: builtin/log.c:1397
3584 msgid "Failed to create output files"
3587 #: builtin/log.c:1501
3590 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3593 #: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
3595 msgid "Unknown commit %s"
3598 #: builtin/merge.c:90
3599 msgid "switch `m' requires a value"
3602 #: builtin/merge.c:127
3604 msgid "Could not find merge strategy '%s'.\n"
3607 #: builtin/merge.c:128
3609 msgid "Available strategies are:"
3612 #: builtin/merge.c:133
3614 msgid "Available custom strategies are:"
3617 #: builtin/merge.c:240
3618 msgid "could not run stash."
3621 #: builtin/merge.c:245
3622 msgid "stash failed"
3625 #: builtin/merge.c:250
3627 msgid "not a valid object: %s"
3630 #: builtin/merge.c:269 builtin/merge.c:286
3631 msgid "read-tree failed"
3634 #: builtin/merge.c:316
3635 msgid " (nothing to squash)"
3638 #: builtin/merge.c:329
3640 msgid "Squash commit -- not updating HEAD\n"
3643 #: builtin/merge.c:361
3644 msgid "Writing SQUASH_MSG"
3647 #: builtin/merge.c:363
3648 msgid "Finishing SQUASH_MSG"
3651 #: builtin/merge.c:386
3653 msgid "No merge message -- not updating HEAD\n"
3656 #: builtin/merge.c:437
3658 msgid "'%s' does not point to a commit"
3661 #: builtin/merge.c:536
3663 msgid "Bad branch.%s.mergeoptions string: %s"
3666 #: builtin/merge.c:629
3667 msgid "git write-tree failed to write a tree"
3670 #: builtin/merge.c:679
3671 msgid "failed to read the cache"
3674 #: builtin/merge.c:710
3675 msgid "Not handling anything other than two heads merge."
3678 #: builtin/merge.c:724
3680 msgid "Unknown option for merge-recursive: -X%s"
3683 #: builtin/merge.c:738
3685 msgid "unable to write %s"
3688 #: builtin/merge.c:877
3690 msgid "Could not read from '%s'"
3693 #: builtin/merge.c:886
3695 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
3698 #: builtin/merge.c:892
3700 "Please enter a commit message to explain why this merge is necessary,\n"
3701 "especially if it merges an updated upstream into a topic branch.\n"
3703 "Lines starting with '#' will be ignored, and an empty message aborts\n"
3707 #: builtin/merge.c:916
3708 msgid "Empty commit message."
3711 #: builtin/merge.c:928
3713 msgid "Wonderful.\n"
3716 #: builtin/merge.c:993
3718 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
3721 #: builtin/merge.c:1009
3723 msgid "'%s' is not a commit"
3726 #: builtin/merge.c:1050
3727 msgid "No current branch."
3730 #: builtin/merge.c:1052
3731 msgid "No remote for the current branch."
3734 #: builtin/merge.c:1054
3735 msgid "No default upstream defined for the current branch."
3738 #: builtin/merge.c:1059
3740 msgid "No remote tracking branch for %s from %s"
3743 #: builtin/merge.c:1146 builtin/merge.c:1303
3745 msgid "%s - not something we can merge"
3748 #: builtin/merge.c:1214
3749 msgid "There is no merge to abort (MERGE_HEAD missing)."
3752 #: builtin/merge.c:1230 git-pull.sh:31
3754 "You have not concluded your merge (MERGE_HEAD exists).\n"
3755 "Please, commit your changes before you can merge."
3758 #: builtin/merge.c:1233 git-pull.sh:34
3759 msgid "You have not concluded your merge (MERGE_HEAD exists)."
3762 #: builtin/merge.c:1237
3764 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
3765 "Please, commit your changes before you can merge."
3768 #: builtin/merge.c:1240
3769 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
3772 #: builtin/merge.c:1249
3773 msgid "You cannot combine --squash with --no-ff."
3776 #: builtin/merge.c:1254
3777 msgid "You cannot combine --no-ff with --ff-only."
3780 #: builtin/merge.c:1261
3781 msgid "No commit specified and merge.defaultToUpstream not set."
3784 #: builtin/merge.c:1293
3785 msgid "Can merge only exactly one commit into empty head"
3788 #: builtin/merge.c:1296
3789 msgid "Squash commit into empty head not supported yet"
3792 #: builtin/merge.c:1298
3793 msgid "Non-fast-forward commit does not make sense into an empty head"
3796 #: builtin/merge.c:1413
3798 msgid "Updating %s..%s\n"
3801 #: builtin/merge.c:1451
3803 msgid "Trying really trivial in-index merge...\n"
3806 #: builtin/merge.c:1458
3811 #: builtin/merge.c:1490
3812 msgid "Not possible to fast-forward, aborting."
3815 #: builtin/merge.c:1513 builtin/merge.c:1592
3817 msgid "Rewinding the tree to pristine...\n"
3820 #: builtin/merge.c:1517
3822 msgid "Trying merge strategy %s...\n"
3825 #: builtin/merge.c:1583
3827 msgid "No merge strategy handled the merge.\n"
3830 #: builtin/merge.c:1585
3832 msgid "Merge with strategy %s failed.\n"
3835 #: builtin/merge.c:1594
3837 msgid "Using the %s to prepare resolving by hand.\n"
3840 #: builtin/merge.c:1606
3842 msgid "Automatic merge went well; stopped before committing as requested\n"
3847 msgid "Checking rename of '%s' to '%s'\n"
3855 msgid "can not move directory into itself"
3859 msgid "cannot move directory over file"
3864 msgid "Huh? %.*s is in index?"
3868 msgid "source directory is empty"
3872 msgid "not under version control"
3876 msgid "destination exists"
3881 msgid "overwriting '%s'"
3885 msgid "Cannot overwrite"
3889 msgid "multiple sources for the same target"
3894 msgid "%s, source=%s, destination=%s"
3899 msgid "Renaming %s to %s\n"
3902 #: builtin/mv.c:215 builtin/remote.c:731
3904 msgid "renaming '%s' failed"
3907 #: builtin/notes.c:139
3909 msgid "unable to start 'show' for object '%s'"
3912 #: builtin/notes.c:145
3913 msgid "can't fdopen 'show' output fd"
3916 #: builtin/notes.c:155
3918 msgid "failed to close pipe to 'show' for object '%s'"
3921 #: builtin/notes.c:158
3923 msgid "failed to finish 'show' for object '%s'"
3926 #: builtin/notes.c:175 builtin/tag.c:347
3928 msgid "could not create file '%s'"
3931 #: builtin/notes.c:189
3932 msgid "Please supply the note contents using either -m or -F option"
3935 #: builtin/notes.c:210 builtin/notes.c:973
3937 msgid "Removing note for object %s\n"
3940 #: builtin/notes.c:215
3941 msgid "unable to write note object"
3944 #: builtin/notes.c:217
3946 msgid "The note contents has been left in %s"
3949 #: builtin/notes.c:251 builtin/tag.c:542
3951 msgid "cannot read '%s'"
3954 #: builtin/notes.c:253 builtin/tag.c:545
3956 msgid "could not open or read '%s'"
3959 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
3960 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
3961 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
3962 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
3964 msgid "Failed to resolve '%s' as a valid ref."
3967 #: builtin/notes.c:275
3969 msgid "Failed to read object '%s'."
3972 #: builtin/notes.c:299
3973 msgid "Cannot commit uninitialized/unreferenced notes tree"
3976 #: builtin/notes.c:340
3978 msgid "Bad notes.rewriteMode value: '%s'"
3981 #: builtin/notes.c:350
3983 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
3986 #. TRANSLATORS: The first %s is the name of the
3987 #. environment variable, the second %s is its value
3988 #: builtin/notes.c:377
3990 msgid "Bad %s value: '%s'"
3993 #: builtin/notes.c:441
3995 msgid "Malformed input line: '%s'."
3998 #: builtin/notes.c:456
4000 msgid "Failed to copy notes from '%s' to '%s'"
4003 #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
4004 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
4005 #: builtin/notes.c:1033
4006 msgid "too many parameters"
4009 #: builtin/notes.c:513 builtin/notes.c:772
4011 msgid "No note found for object %s."
4014 #: builtin/notes.c:580
4017 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
4021 #: builtin/notes.c:585 builtin/notes.c:662
4023 msgid "Overwriting existing notes for object %s\n"
4026 #: builtin/notes.c:635
4027 msgid "too few parameters"
4030 #: builtin/notes.c:656
4033 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
4037 #: builtin/notes.c:668
4039 msgid "Missing notes on source object %s. Cannot copy."
4042 #: builtin/notes.c:717
4045 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
4046 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
4049 #: builtin/notes.c:971
4051 msgid "Object %s has no note\n"
4054 #: builtin/notes.c:1103 builtin/remote.c:1598
4056 msgid "Unknown subcommand: %s"
4059 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
4061 msgid "deflate error (%d)"
4064 #: builtin/pack-objects.c:2398
4066 msgid "unsupported index version %s"
4069 #: builtin/pack-objects.c:2402
4071 msgid "bad index version '%s'"
4074 #: builtin/pack-objects.c:2425
4076 msgid "option %s does not accept negative form"
4079 #: builtin/pack-objects.c:2429
4081 msgid "unable to parse value '%s' for option %s"
4084 #: builtin/push.c:45
4085 msgid "tag shorthand without <tag>"
4088 #: builtin/push.c:64
4089 msgid "--delete only accepts plain target ref names"
4092 #: builtin/push.c:99
4095 "To choose either option permanently, see push.default in 'git help config'."
4098 #: builtin/push.c:102
4101 "The upstream branch of your current branch does not match\n"
4102 "the name of your current branch. To push to the upstream branch\n"
4103 "on the remote, use\n"
4105 " git push %s HEAD:%s\n"
4107 "To push to the branch of the same name on the remote, use\n"
4113 #: builtin/push.c:121
4116 "You are not currently on a branch.\n"
4117 "To push the history leading to the current (detached HEAD)\n"
4120 " git push %s HEAD:<name-of-remote-branch>\n"
4123 #: builtin/push.c:128
4126 "The current branch %s has no upstream branch.\n"
4127 "To push the current branch and set the remote as upstream, use\n"
4129 " git push --set-upstream %s %s\n"
4132 #: builtin/push.c:136
4134 msgid "The current branch %s has multiple upstream branches, refusing to push."
4137 #: builtin/push.c:139
4140 "You are pushing to remote '%s', which is not the upstream of\n"
4141 "your current branch '%s', without telling me what to push\n"
4142 "to update which remote branch."
4145 #: builtin/push.c:174
4147 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
4150 #: builtin/push.c:181
4152 "Updates were rejected because the tip of your current branch is behind\n"
4153 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
4154 "before pushing again.\n"
4155 "See the 'Note about fast-forwards' in 'git push --help' for details."
4158 #: builtin/push.c:187
4160 "Updates were rejected because a pushed branch tip is behind its remote\n"
4161 "counterpart. If you did not intend to push that branch, you may want to\n"
4162 "specify branches to push or set the 'push.default' configuration\n"
4163 "variable to 'current' or 'upstream' to push only the current branch."
4166 #: builtin/push.c:193
4168 "Updates were rejected because a pushed branch tip is behind its remote\n"
4169 "counterpart. Check out this branch and merge the remote changes\n"
4170 "(e.g. 'git pull') before pushing again.\n"
4171 "See the 'Note about fast-forwards' in 'git push --help' for details."
4174 #: builtin/push.c:233
4176 msgid "Pushing to %s\n"
4179 #: builtin/push.c:237
4181 msgid "failed to push some refs to '%s'"
4184 #: builtin/push.c:269
4186 msgid "bad repository '%s'"
4189 #: builtin/push.c:270
4191 "No configured push destination.\n"
4192 "Either specify the URL from the command-line or configure a remote "
4193 "repository using\n"
4195 " git remote add <name> <url>\n"
4197 "and then push using the remote name\n"
4199 " git push <name>\n"
4202 #: builtin/push.c:285
4203 msgid "--all and --tags are incompatible"
4206 #: builtin/push.c:286
4207 msgid "--all can't be combined with refspecs"
4210 #: builtin/push.c:291
4211 msgid "--mirror and --tags are incompatible"
4214 #: builtin/push.c:292
4215 msgid "--mirror can't be combined with refspecs"
4218 #: builtin/push.c:297
4219 msgid "--all and --mirror are incompatible"
4222 #: builtin/push.c:385
4223 msgid "--delete is incompatible with --all, --mirror and --tags"
4226 #: builtin/push.c:387
4227 msgid "--delete doesn't make sense without any refs"
4230 #: builtin/remote.c:98
4235 #: builtin/remote.c:130
4237 "--mirror is dangerous and deprecated; please\n"
4238 "\t use --mirror=fetch or --mirror=push instead"
4241 #: builtin/remote.c:147
4243 msgid "unknown mirror argument: %s"
4246 #: builtin/remote.c:185
4247 msgid "specifying a master branch makes no sense with --mirror"
4250 #: builtin/remote.c:187
4251 msgid "specifying branches to track makes sense only with fetch mirrors"
4254 #: builtin/remote.c:195 builtin/remote.c:646
4256 msgid "remote %s already exists."
4259 #: builtin/remote.c:199 builtin/remote.c:650
4261 msgid "'%s' is not a valid remote name"
4264 #: builtin/remote.c:243
4266 msgid "Could not setup master '%s'"
4269 #: builtin/remote.c:299
4271 msgid "more than one %s"
4274 #: builtin/remote.c:339
4276 msgid "Could not get fetch map for refspec %s"
4279 #: builtin/remote.c:440 builtin/remote.c:448
4283 #: builtin/remote.c:452
4287 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
4289 msgid "Could not append '%s' to '%s'"
4292 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
4294 msgid "No such remote: %s"
4297 #: builtin/remote.c:656
4299 msgid "Could not rename config section '%s' to '%s'"
4302 #: builtin/remote.c:662 builtin/remote.c:799
4304 msgid "Could not remove config section '%s'"
4307 #: builtin/remote.c:677
4310 "Not updating non-default fetch refspec\n"
4312 "\tPlease update the configuration manually if necessary."
4315 #: builtin/remote.c:683
4317 msgid "Could not append '%s'"
4320 #: builtin/remote.c:694
4322 msgid "Could not set '%s'"
4325 #: builtin/remote.c:716
4327 msgid "deleting '%s' failed"
4330 #: builtin/remote.c:750
4332 msgid "creating '%s' failed"
4335 #: builtin/remote.c:764
4337 msgid "Could not remove branch %s"
4340 #: builtin/remote.c:834
4342 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
4343 "to delete it, use:"
4345 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
4346 "to delete them, use:"
4350 #: builtin/remote.c:943
4352 msgid " new (next fetch will store in remotes/%s)"
4355 #: builtin/remote.c:946
4359 #: builtin/remote.c:948
4360 msgid " stale (use 'git remote prune' to remove)"
4363 #: builtin/remote.c:950
4367 #: builtin/remote.c:991
4369 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
4372 #: builtin/remote.c:998
4374 msgid "rebases onto remote %s"
4377 #: builtin/remote.c:1001
4379 msgid " merges with remote %s"
4382 #: builtin/remote.c:1002
4383 msgid " and with remote"
4386 #: builtin/remote.c:1004
4388 msgid "merges with remote %s"
4391 #: builtin/remote.c:1005
4392 msgid " and with remote"
4395 #: builtin/remote.c:1051
4399 #: builtin/remote.c:1054
4403 #: builtin/remote.c:1058
4407 #: builtin/remote.c:1061
4408 msgid "fast-forwardable"
4411 #: builtin/remote.c:1064
4412 msgid "local out of date"
4415 #: builtin/remote.c:1071
4417 msgid " %-*s forces to %-*s (%s)"
4420 #: builtin/remote.c:1074
4422 msgid " %-*s pushes to %-*s (%s)"
4425 #: builtin/remote.c:1078
4427 msgid " %-*s forces to %s"
4430 #: builtin/remote.c:1081
4432 msgid " %-*s pushes to %s"
4435 #: builtin/remote.c:1118
4440 #: builtin/remote.c:1119
4442 msgid " Fetch URL: %s"
4445 #: builtin/remote.c:1120 builtin/remote.c:1285
4449 #: builtin/remote.c:1129 builtin/remote.c:1131
4451 msgid " Push URL: %s"
4454 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
4456 msgid " HEAD branch: %s"
4459 #: builtin/remote.c:1139
4462 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
4465 #: builtin/remote.c:1151
4467 msgid " Remote branch:%s"
4468 msgid_plural " Remote branches:%s"
4472 #: builtin/remote.c:1154 builtin/remote.c:1181
4473 msgid " (status not queried)"
4476 #: builtin/remote.c:1163
4477 msgid " Local branch configured for 'git pull':"
4478 msgid_plural " Local branches configured for 'git pull':"
4482 #: builtin/remote.c:1171
4483 msgid " Local refs will be mirrored by 'git push'"
4486 #: builtin/remote.c:1178
4488 msgid " Local ref configured for 'git push'%s:"
4489 msgid_plural " Local refs configured for 'git push'%s:"
4493 #: builtin/remote.c:1216
4494 msgid "Cannot determine remote HEAD"
4497 #: builtin/remote.c:1218
4498 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
4501 #: builtin/remote.c:1228
4503 msgid "Could not delete %s"
4506 #: builtin/remote.c:1236
4508 msgid "Not a valid ref: %s"
4511 #: builtin/remote.c:1238
4513 msgid "Could not setup %s"
4516 #: builtin/remote.c:1274
4518 msgid " %s will become dangling!"
4521 #: builtin/remote.c:1275
4523 msgid " %s has become dangling!"
4526 #: builtin/remote.c:1281
4531 #: builtin/remote.c:1282
4536 #: builtin/remote.c:1295
4538 msgid " * [would prune] %s"
4541 #: builtin/remote.c:1298
4543 msgid " * [pruned] %s"
4546 #: builtin/remote.c:1387 builtin/remote.c:1461
4548 msgid "No such remote '%s'"
4551 #: builtin/remote.c:1414
4552 msgid "no remote specified"
4555 #: builtin/remote.c:1447
4556 msgid "--add --delete doesn't make sense"
4559 #: builtin/remote.c:1487
4561 msgid "Invalid old URL pattern: %s"
4564 #: builtin/remote.c:1495
4566 msgid "No such URL found: %s"
4569 #: builtin/remote.c:1497
4570 msgid "Will not delete all non-push URLs"
4573 #: builtin/reset.c:33
4577 #: builtin/reset.c:33
4581 #: builtin/reset.c:33
4585 #: builtin/reset.c:33
4589 #: builtin/reset.c:33
4593 #: builtin/reset.c:77
4594 msgid "You do not have a valid HEAD."
4597 #: builtin/reset.c:79
4598 msgid "Failed to find tree of HEAD."
4601 #: builtin/reset.c:85
4603 msgid "Failed to find tree of %s."
4606 #: builtin/reset.c:96
4607 msgid "Could not write new index file."
4610 #: builtin/reset.c:106
4612 msgid "HEAD is now at %s"
4615 #: builtin/reset.c:130
4616 msgid "Could not read index"
4619 #: builtin/reset.c:133
4620 msgid "Unstaged changes after reset:"
4623 #: builtin/reset.c:223
4625 msgid "Cannot do a %s reset in the middle of a merge."
4628 #: builtin/reset.c:303
4630 msgid "Could not parse object '%s'."
4633 #: builtin/reset.c:308
4634 msgid "--patch is incompatible with --{hard,mixed,soft}"
4637 #: builtin/reset.c:317
4638 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
4641 #: builtin/reset.c:319
4643 msgid "Cannot do %s reset with paths."
4646 #: builtin/reset.c:331
4648 msgid "%s reset is not allowed in a bare repository"
4651 #: builtin/reset.c:347
4653 msgid "Could not reset index file to revision '%s'."
4656 #: builtin/revert.c:70 builtin/revert.c:92
4658 msgid "%s: %s cannot be used with %s"
4661 #: builtin/revert.c:131
4662 msgid "program error"
4665 #: builtin/revert.c:221
4666 msgid "revert failed"
4669 #: builtin/revert.c:236
4670 msgid "cherry-pick failed"
4676 "'%s' has staged content different from both the file and the HEAD\n"
4677 "(use -f to force removal)"
4683 "'%s' has changes staged in the index\n"
4684 "(use --cached to keep the file, or -f to force removal)"
4690 "'%s' has local modifications\n"
4691 "(use --cached to keep the file, or -f to force removal)"
4696 msgid "not removing '%s' recursively without -r"
4701 msgid "git rm: unable to remove %s"
4704 #: builtin/shortlog.c:157
4706 msgid "Missing author: %s"
4711 msgid "malformed object at '%s'"
4714 #: builtin/tag.c:207
4716 msgid "tag name too long: %.*s..."
4719 #: builtin/tag.c:212
4721 msgid "tag '%s' not found."
4724 #: builtin/tag.c:227
4726 msgid "Deleted tag '%s' (was %s)\n"
4729 #: builtin/tag.c:239
4731 msgid "could not verify the tag '%s'"
4734 #: builtin/tag.c:249
4738 "# Write a tag message\n"
4739 "# Lines starting with '#' will be ignored.\n"
4743 #: builtin/tag.c:256
4747 "# Write a tag message\n"
4748 "# Lines starting with '#' will be kept; you may remove them yourself if you "
4753 #: builtin/tag.c:298
4754 msgid "unable to sign the tag"
4757 #: builtin/tag.c:300
4758 msgid "unable to write tag file"
4761 #: builtin/tag.c:325
4762 msgid "bad object type."
4765 #: builtin/tag.c:338
4766 msgid "tag header too big."
4769 #: builtin/tag.c:370
4770 msgid "no tag message?"
4773 #: builtin/tag.c:376
4775 msgid "The tag message has been left in %s\n"
4778 #: builtin/tag.c:425
4779 msgid "switch 'points-at' requires an object"
4782 #: builtin/tag.c:427
4784 msgid "malformed object name '%s'"
4787 #: builtin/tag.c:506
4788 msgid "--column and -n are incompatible"
4791 #: builtin/tag.c:523
4792 msgid "-n option is only allowed with -l."
4795 #: builtin/tag.c:525
4796 msgid "--contains option is only allowed with -l."
4799 #: builtin/tag.c:527
4800 msgid "--points-at option is only allowed with -l."
4803 #: builtin/tag.c:535
4804 msgid "only one -F or -m option is allowed."
4807 #: builtin/tag.c:555
4808 msgid "too many params"
4811 #: builtin/tag.c:561
4813 msgid "'%s' is not a valid tag name."
4816 #: builtin/tag.c:566
4818 msgid "tag '%s' already exists"
4821 #: builtin/tag.c:584
4823 msgid "%s: cannot lock the ref"
4826 #: builtin/tag.c:586
4828 msgid "%s: cannot update the ref"
4831 #: builtin/tag.c:588
4833 msgid "Updated tag '%s' (was %s)\n"
4837 msgid "See 'git help <command>' for more information on a specific command."
4840 #: parse-options.h:133 parse-options.h:235
4844 #: parse-options.h:141
4848 #: parse-options.h:149
4852 #: parse-options.h:151
4856 #: parse-options.h:156
4857 msgid "no-op (backward compatibility)"
4860 #: parse-options.h:228
4861 msgid "be more verbose"
4864 #: parse-options.h:230
4865 msgid "be more quiet"
4868 #: parse-options.h:236
4869 msgid "use <n> digits to display SHA-1s"
4873 msgid "Add file contents to the index"
4877 msgid "Find by binary search the change that introduced a bug"
4881 msgid "List, create, or delete branches"
4885 msgid "Checkout a branch or paths to the working tree"
4889 msgid "Clone a repository into a new directory"
4893 msgid "Record changes to the repository"
4897 msgid "Show changes between commits, commit and working tree, etc"
4901 msgid "Download objects and refs from another repository"
4905 msgid "Print lines matching a pattern"
4909 msgid "Create an empty git repository or reinitialize an existing one"
4913 msgid "Show commit logs"
4917 msgid "Join two or more development histories together"
4921 msgid "Move or rename a file, a directory, or a symlink"
4925 msgid "Fetch from and merge with another repository or a local branch"
4929 msgid "Update remote refs along with associated objects"
4933 msgid "Forward-port local commits to the updated upstream head"
4937 msgid "Reset current HEAD to the specified state"
4941 msgid "Remove files from the working tree and from the index"
4945 msgid "Show various types of objects"
4949 msgid "Show the working tree status"
4953 msgid "Create, list, delete or verify a tag object signed with GPG"
4957 msgid "You need to set your committer info first"
4962 "You seem to have moved HEAD since the last 'am' failure.\n"
4963 "Not rewinding to ORIG_HEAD"
4969 "When you have resolved this problem, run \"$cmdline --resolved\".\n"
4970 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
4971 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
4975 msgid "Cannot fall back to three-way merge."
4979 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4983 msgid "Using index info to reconstruct a base tree..."
4988 "Did you hand edit your patch?\n"
4989 "It does not apply to blobs recorded in its index."
4993 msgid "Falling back to patching base and 3-way merge..."
4997 msgid "Failed to merge in the changes."
5001 msgid "Only one StGIT patch series can be applied at once"
5006 msgid "Patch format $patch_format is not supported."
5010 msgid "Patch format detection failed."
5015 "The -b/--binary option has been a no-op for long time, and\n"
5016 "it will be removed. Please do not use it anymore."
5021 msgid "previous rebase directory $dotest still exists but mbox given."
5025 msgid "Please make up your mind. --skip or --abort?"
5029 msgid "Resolve operation not in progress, we are not resuming."
5034 msgid "Dirty index: cannot apply patches (dirty: $files)"
5040 "Patch is empty. Was it split wrong?\n"
5041 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
5042 "To restore the original branch and stop patching run \"$cmdline --abort\"."
5046 msgid "Patch does not have a valid e-mail address."
5050 msgid "cannot be interactive without stdin connected to a terminal."
5054 msgid "Commit Body is:"
5057 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
5058 #. in your translation. The program will only accept English
5059 #. input at this point.
5061 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
5066 msgid "Applying: $FIRSTLINE"
5071 "No changes - did you forget to use 'git add'?\n"
5072 "If there is nothing left to stage, chances are that something else\n"
5073 "already introduced the same changes; you might want to skip this patch."
5078 "You still have unmerged paths in your index\n"
5079 "did you forget to use 'git add'?"
5083 msgid "No changes -- Patch already applied."
5088 msgid "Patch failed at $msgnum $FIRSTLINE"
5092 msgid "applying to an empty history"
5096 msgid "You need to start by \"git bisect start\""
5099 #. TRANSLATORS: Make sure to include [Y] and [n] in your
5100 #. translation. The program will only accept English input
5103 msgid "Do you want me to do it for you [Y/n]? "
5108 msgid "unrecognised option: '$arg'"
5113 msgid "'$arg' does not appear to be a valid revision"
5116 #: git-bisect.sh:117
5117 msgid "Bad HEAD - I need a HEAD"
5120 #: git-bisect.sh:130
5123 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
5126 #: git-bisect.sh:140
5127 msgid "won't bisect on seeked tree"
5130 #: git-bisect.sh:144
5131 msgid "Bad HEAD - strange symbolic ref"
5134 #: git-bisect.sh:189
5136 msgid "Bad bisect_write argument: $state"
5139 #: git-bisect.sh:218
5141 msgid "Bad rev input: $arg"
5144 #: git-bisect.sh:232
5145 msgid "Please call 'bisect_state' with at least one argument."
5148 #: git-bisect.sh:244
5150 msgid "Bad rev input: $rev"
5153 #: git-bisect.sh:250
5154 msgid "'git bisect bad' can take only one argument."
5157 #. have bad but not good. we could bisect although
5158 #. this is less optimum.
5159 #: git-bisect.sh:273
5160 msgid "Warning: bisecting only with a bad commit."
5163 #. TRANSLATORS: Make sure to include [Y] and [n] in your
5164 #. translation. The program will only accept English input
5166 #: git-bisect.sh:279
5167 msgid "Are you sure [Y/n]? "
5170 #: git-bisect.sh:289
5172 "You need to give me at least one good and one bad revisions.\n"
5173 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
5176 #: git-bisect.sh:292
5178 "You need to start by \"git bisect start\".\n"
5179 "You then need to give me at least one good and one bad revisions.\n"
5180 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
5183 #: git-bisect.sh:347 git-bisect.sh:474
5184 msgid "We are not bisecting."
5187 #: git-bisect.sh:354
5189 msgid "'$invalid' is not a valid commit"
5192 #: git-bisect.sh:363
5195 "Could not check out original HEAD '$branch'.\n"
5196 "Try 'git bisect reset <commit>'."
5199 #: git-bisect.sh:390
5200 msgid "No logfile given"
5203 #: git-bisect.sh:391
5205 msgid "cannot read $file for replaying"
5208 #: git-bisect.sh:408
5209 msgid "?? what are you talking about?"
5212 #: git-bisect.sh:420
5214 msgid "running $command"
5217 #: git-bisect.sh:427
5220 "bisect run failed:\n"
5221 "exit code $res from '$command' is < 0 or >= 128"
5224 #: git-bisect.sh:453
5225 msgid "bisect run cannot continue any more"
5228 #: git-bisect.sh:459
5231 "bisect run failed:\n"
5232 "'bisect_state $state' exited with error code $res"
5235 #: git-bisect.sh:466
5236 msgid "bisect run success"
5241 "Pull is not possible because you have unmerged files.\n"
5242 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
5243 "as appropriate to mark resolution, or use 'git commit -a'."
5247 msgid "Pull is not possible because you have unmerged files."
5251 msgid "updating an unborn branch with changes added to the index"
5254 #. The fetch involved updating the current branch.
5255 #. The working tree and the index file is still based on the
5256 #. $orig_head commit, but we are merging into $curr_head.
5257 #. First update the working tree to match $curr_head.
5261 "Warning: fetch updated the current branch head.\n"
5262 "Warning: fast-forwarding your working tree from\n"
5263 "Warning: commit $orig_head."
5267 msgid "Cannot merge multiple branches into empty head"
5271 msgid "Cannot rebase onto multiple branches"
5276 "When you have resolved this problem, run \"git rebase --continue\".\n"
5277 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
5278 "To check out the original branch and stop rebasing, run \"git rebase --abort"
5282 #: git-rebase.sh:159
5283 msgid "The pre-rebase hook refused to rebase."
5286 #: git-rebase.sh:164
5287 msgid "It looks like git-am is in progress. Cannot rebase."
5290 #: git-rebase.sh:295
5291 msgid "The --exec option must be used with the --interactive option"
5294 #: git-rebase.sh:300
5295 msgid "No rebase in progress?"
5298 #: git-rebase.sh:313
5299 msgid "Cannot read HEAD"
5302 #: git-rebase.sh:316
5304 "You must edit all merge conflicts and then\n"
5305 "mark them as resolved using git add"
5308 #: git-rebase.sh:334
5310 msgid "Could not move back to $head_name"
5313 #: git-rebase.sh:350
5316 "It seems that there is already a $state_dir_base directory, and\n"
5317 "I wonder if you are in the middle of another rebase. If that is the\n"
5318 "case, please try\n"
5319 "\t$cmd_live_rebase\n"
5320 "If that is not the case, please\n"
5321 "\t$cmd_clear_stale_rebase\n"
5322 "and run me again. I am stopping in case you still have something\n"
5326 #: git-rebase.sh:395
5328 msgid "invalid upstream $upstream_name"
5331 #: git-rebase.sh:419
5333 msgid "$onto_name: there are more than one merge bases"
5336 #: git-rebase.sh:422 git-rebase.sh:426
5338 msgid "$onto_name: there is no merge base"
5341 #: git-rebase.sh:431
5343 msgid "Does not point to a valid commit: $onto_name"
5346 #: git-rebase.sh:454
5348 msgid "fatal: no such branch: $branch_name"
5351 #: git-rebase.sh:474
5352 msgid "Please commit or stash them."
5355 #: git-rebase.sh:492
5357 msgid "Current branch $branch_name is up to date."
5360 #: git-rebase.sh:495
5362 msgid "Current branch $branch_name is up to date, rebase forced."
5365 #: git-rebase.sh:506
5367 msgid "Changes from $mb to $onto:"
5370 #. Detach HEAD and reset the tree
5371 #: git-rebase.sh:515
5372 msgid "First, rewinding head to replay your work on top of it..."
5375 #: git-rebase.sh:523
5377 msgid "Fast-forwarded $branch_name to $onto_name."
5381 msgid "git stash clear with parameters is unimplemented"
5385 msgid "You do not have the initial commit yet"
5389 msgid "Cannot save the current index state"
5392 #: git-stash.sh:123 git-stash.sh:136
5393 msgid "Cannot save the current worktree state"
5397 msgid "No changes selected"
5401 msgid "Cannot remove temporary index (can't happen)"
5405 msgid "Cannot record working tree state"
5408 #. TRANSLATORS: $option is an invalid option, like
5409 #. `--blah-blah'. The 7 spaces at the beginning of the
5410 #. second line correspond to "error: ". So you should line
5411 #. up the second line with however many characters the
5412 #. translation of "error: " takes in your language. E.g. in
5415 #. $ git stash save --blah-blah 2>&1 | head -n 2
5416 #. error: unknown option for 'stash save': --blah-blah
5417 #. To provide a message, use git stash save -- '--blah-blah'
5421 "error: unknown option for 'stash save': $option\n"
5422 " To provide a message, use git stash save -- '$option'"
5426 msgid "No local changes to save"
5430 msgid "Cannot initialize stash"
5434 msgid "Cannot save the current status"
5438 msgid "Cannot remove worktree changes"
5442 msgid "No stash found."
5447 msgid "Too many revisions specified: $REV"
5452 msgid "$reference is not valid reference"
5457 msgid "'$args' is not a stash-like commit"
5462 msgid "'$args' is not a stash reference"
5466 msgid "unable to refresh index"
5470 msgid "Cannot apply a stash in the middle of a merge"
5474 msgid "Conflicts in index. Try without --index."
5478 msgid "Could not save index tree"
5482 msgid "Cannot unstage modified files"
5486 msgid "Index was not unstashed."
5491 msgid "Dropped ${REV} ($s)"
5496 msgid "${REV}: Could not drop stash entry"
5500 msgid "No branch name specified"
5504 msgid "(To restore them type \"git stash apply\")"
5507 #: git-submodule.sh:88
5509 msgid "cannot strip one component off url '$remoteurl'"
5512 #: git-submodule.sh:145
5514 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5517 #: git-submodule.sh:189
5519 msgid "Clone of '$url' into submodule path '$sm_path' failed"
5522 #: git-submodule.sh:201
5524 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5527 #: git-submodule.sh:290
5529 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5532 #: git-submodule.sh:307
5534 msgid "'$sm_path' already exists in the index"
5537 #: git-submodule.sh:311
5540 "The following path is ignored by one of your .gitignore files:\n"
5542 "Use -f if you really want to add it."
5545 #: git-submodule.sh:322
5547 msgid "Adding existing repo at '$sm_path' to the index"
5550 #: git-submodule.sh:324
5552 msgid "'$sm_path' already exists and is not a valid git repo"
5555 #: git-submodule.sh:338
5557 msgid "Unable to checkout submodule '$sm_path'"
5560 #: git-submodule.sh:343
5562 msgid "Failed to add submodule '$sm_path'"
5565 #: git-submodule.sh:348
5567 msgid "Failed to register submodule '$sm_path'"
5570 #: git-submodule.sh:390
5572 msgid "Entering '$prefix$sm_path'"
5575 #: git-submodule.sh:404
5577 msgid "Stopping at '$sm_path'; script returned non-zero status."
5580 #: git-submodule.sh:447
5582 msgid "No url found for submodule path '$sm_path' in .gitmodules"
5585 #: git-submodule.sh:456
5587 msgid "Failed to register url for submodule path '$sm_path'"
5590 #: git-submodule.sh:458
5592 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5595 #: git-submodule.sh:466
5597 msgid "Failed to register update mode for submodule path '$sm_path'"
5600 #: git-submodule.sh:565
5603 "Submodule path '$sm_path' not initialized\n"
5604 "Maybe you want to use 'update --init'?"
5607 #: git-submodule.sh:578
5609 msgid "Unable to find current revision in submodule path '$sm_path'"
5612 #: git-submodule.sh:597
5614 msgid "Unable to fetch in submodule path '$sm_path'"
5617 #: git-submodule.sh:611
5619 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5622 #: git-submodule.sh:612
5624 msgid "Submodule path '$sm_path': rebased into '$sha1'"
5627 #: git-submodule.sh:617
5629 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5632 #: git-submodule.sh:618
5634 msgid "Submodule path '$sm_path': merged in '$sha1'"
5637 #: git-submodule.sh:623
5639 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5642 #: git-submodule.sh:624
5644 msgid "Submodule path '$sm_path': checked out '$sha1'"
5647 #: git-submodule.sh:646 git-submodule.sh:969
5649 msgid "Failed to recurse into submodule path '$sm_path'"
5652 #: git-submodule.sh:754
5653 msgid "The --cached option cannot be used with the --files option"
5657 #: git-submodule.sh:794
5659 msgid "unexpected mode $mod_dst"
5662 #: git-submodule.sh:812
5664 msgid " Warn: $name doesn't contain commit $sha1_src"
5667 #: git-submodule.sh:815
5669 msgid " Warn: $name doesn't contain commit $sha1_dst"
5672 #: git-submodule.sh:818
5674 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5677 #: git-submodule.sh:843
5681 #: git-submodule.sh:881
5682 msgid "# Submodules changed but not updated:"
5685 #: git-submodule.sh:883
5686 msgid "# Submodule changes to be committed:"
5689 #: git-submodule.sh:1027
5691 msgid "Synchronizing submodule url for '$name'"