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-06-08 10: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:696
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:289
58 #: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 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"
72 msgid "The bundle requires this ref"
73 msgid_plural "The bundle requires these %d refs"
81 #: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284
83 msgid "unrecognized argument: %s"
88 msgid "ref '%s' is excluded by the rev-list options"
92 msgid "Refusing to create empty bundle."
96 msgid "Could not spawn pack-objects"
100 msgid "pack-objects died"
105 msgid "cannot create '%s'"
109 msgid "index-pack died"
114 msgid "could not parse %s"
119 msgid "%s %s is not a commit!"
122 #: compat/obstack.c:406 compat/obstack.c:408
123 msgid "memory exhausted"
127 msgid "Could not run 'git rev-list'"
132 msgid "failed write to rev-list: %s"
137 msgid "failed to close rev-list's stdin: %s"
141 msgid "in the future"
146 msgid "%lu second ago"
147 msgid_plural "%lu seconds ago"
153 msgid "%lu minute ago"
154 msgid_plural "%lu minutes ago"
161 msgid_plural "%lu hours ago"
168 msgid_plural "%lu days ago"
175 msgid_plural "%lu weeks ago"
181 msgid "%lu month ago"
182 msgid_plural "%lu months ago"
189 msgid_plural "%lu years"
195 msgid "%s, %lu month ago"
196 msgid_plural "%s, %lu months ago"
200 #: date.c:154 date.c:159
203 msgid_plural "%lu years ago"
209 msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
214 msgid " Unknown dirstat parameter '%.*s'\n"
220 "Found errors in 'diff.dirstat' config variable:\n"
225 msgid " 0 files changed\n"
230 msgid " %d file changed"
231 msgid_plural " %d files changed"
237 msgid ", %d insertion(+)"
238 msgid_plural ", %d insertions(+)"
244 msgid ", %d deletion(-)"
245 msgid_plural ", %d deletions(-)"
252 "Failed to parse --dirstat/-X option parameter:\n"
256 #: gpg-interface.c:59
257 msgid "could not run gpg."
260 #: gpg-interface.c:71
261 msgid "gpg did not accept the data"
264 #: gpg-interface.c:82
265 msgid "gpg failed to sign the data"
270 msgid "'%s': unable to read %s"
280 msgid "'%s': short read %s"
285 msgid "available git commands in '%s'"
289 msgid "git commands available from elsewhere on your $PATH"
295 "'%s' appears to be a git command, but we were not\n"
296 "able to execute it. Maybe git-%s is broken?"
300 msgid "Uh oh. Your system reports no Git commands at all."
306 "WARNING: You called a Git command named '%s', which does not exist.\n"
307 "Continuing under the assumption that you meant '%s'"
312 msgid "in %0.1f seconds automatically..."
317 msgid "git: '%s' is not a git command. See 'git --help'."
326 "Did you mean one of these?"
330 #: parse-options.c:493
334 #: parse-options.c:511
339 #. TRANSLATORS: the colon here should align with the
340 #. one in "usage: %s" translation
341 #: parse-options.c:515
346 #: parse-options.c:518
353 msgid "Your branch is ahead of '%s' by %d commit.\n"
354 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
360 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
362 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
369 "Your branch and '%s' have diverged,\n"
370 "and have %d and %d different commit each, respectively.\n"
372 "Your branch and '%s' have diverged,\n"
373 "and have %d and %d different commits each, respectively.\n"
377 #: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
378 #: builtin/merge.c:1088 builtin/merge.c:1098
380 msgid "Could not open '%s' for writing"
383 #: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
384 #: builtin/merge.c:1090 builtin/merge.c:1103
386 msgid "Could not write to '%s'"
391 "after resolving the conflicts, mark the corrected paths\n"
392 "with 'git add <paths>' or 'git rm <paths>'"
397 "after resolving the conflicts, mark the corrected paths\n"
398 "with 'git add <paths>' or 'git rm <paths>'\n"
399 "and commit the result with 'git commit'"
402 #: sequencer.c:160 sequencer.c:758 sequencer.c:841
404 msgid "Could not write to %s"
409 msgid "Error wrapping up %s"
413 msgid "Your local changes would be overwritten by cherry-pick."
417 msgid "Your local changes would be overwritten by revert."
421 msgid "Commit your changes or stash them to proceed."
424 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
427 msgid "%s: Unable to write new index file"
431 msgid "Could not resolve HEAD commit\n"
435 msgid "Unable to update cache tree\n"
440 msgid "Could not parse commit %s\n"
445 msgid "Could not parse parent commit %s\n"
449 msgid "Your index file is unmerged."
453 msgid "You do not have a valid HEAD"
458 msgid "Commit %s is a merge but no -m option was given."
463 msgid "Commit %s does not have parent %d"
468 msgid "Mainline was specified but commit %s is not a merge."
471 #. TRANSLATORS: The first %s will be "revert" or
472 #. "cherry-pick", the second %s a SHA1
475 msgid "%s: cannot parse parent commit %s"
480 msgid "Cannot get commit message for %s"
485 msgid "could not revert %s... %s"
490 msgid "could not apply %s... %s"
494 msgid "empty commit set passed"
499 msgid "git %s: failed to read the index"
504 msgid "git %s: failed to refresh the index"
509 msgid "Cannot %s during a %s"
514 msgid "Could not parse line %d."
518 msgid "No commits parsed."
523 msgid "Could not open %s"
528 msgid "Could not read %s."
533 msgid "Unusable instruction sheet: %s"
538 msgid "Invalid key: %s"
543 msgid "Invalid value for %s: %s"
548 msgid "Malformed options sheet: %s"
552 msgid "a cherry-pick or revert is already in progress"
556 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
561 msgid "Could not create sequencer directory %s"
564 #: sequencer.c:760 sequencer.c:845
566 msgid "Error wrapping up %s."
569 #: sequencer.c:779 sequencer.c:913
570 msgid "no cherry-pick or revert in progress"
574 msgid "cannot resolve HEAD"
578 msgid "cannot abort from a branch yet to be born"
581 #: sequencer.c:805 builtin/apply.c:3697
583 msgid "cannot open %s: %s"
588 msgid "cannot read %s: %s"
592 msgid "unexpected end of file"
597 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
602 msgid "Could not format %s."
606 msgid "Can't revert as initial commit"
610 msgid "Can't cherry-pick into empty head"
614 msgid "HEAD does not point to a branch"
619 msgid "No such branch: '%s'"
624 msgid "No upstream configured for branch '%s'"
629 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
634 msgid "unable to look up current user in the passwd file: %s"
642 msgid "Unmerged paths:"
645 #: wt-status.c:141 wt-status.c:158
647 msgid " (use \"git reset %s <file>...\" to unstage)"
650 #: wt-status.c:143 wt-status.c:160
651 msgid " (use \"git rm --cached <file>...\" to unstage)"
655 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
659 msgid "Changes to be committed:"
663 msgid "Changes not staged for commit:"
667 msgid " (use \"git add <file>...\" to update what will be committed)"
671 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
676 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
680 msgid " (commit or discard the untracked or modified content in submodules)"
690 msgid " (use \"git %s <file>...\" to include in what will be committed)"
698 msgid "both deleted:"
706 msgid "deleted by them:"
710 msgid "added by them:"
714 msgid "deleted by us:"
722 msgid "both modified:"
726 msgid "new commits, "
730 msgid "modified content, "
734 msgid "untracked content, "
744 msgid "copied: %s -> %s"
759 msgid "renamed: %s -> %s"
764 msgid "typechange: %s"
779 msgid "bug: unhandled diff status %c"
787 msgid "Not currently on any branch."
791 msgid "Initial commit"
804 msgid "Untracked files not listed%s"
808 msgid " (use -u option to show untracked files)"
817 msgid "no changes added to commit%s\n"
821 msgid " (use \"git add\" and/or \"git commit -a\")"
826 msgid "nothing added to commit but untracked files present%s\n"
830 msgid " (use \"git add\" to track)"
833 #: wt-status.c:793 wt-status.c:796 wt-status.c:799
835 msgid "nothing to commit%s\n"
839 msgid " (create/copy files and use \"git add\" to track)"
843 msgid " (use -u to show untracked files)"
847 msgid " (working directory clean)"
851 msgid "HEAD (no branch)"
855 msgid "Initial commit on "
862 #: wt-status.c:932 wt-status.c:935
872 msgid "unexpected diff status %c"
875 #: builtin/add.c:67 builtin/commit.c:226
876 msgid "updating files failed"
881 msgid "remove '%s'\n"
886 msgid "Path '%s' is in submodule '%.*s'"
890 msgid "Unstaged changes after refreshing the index:"
893 #: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
895 msgid "pathspec '%s' did not match any files"
900 msgid "'%s' is beyond a symbolic link"
904 msgid "Could not read the index"
909 msgid "Could not open '%s' for writing."
913 msgid "Could not write patch"
918 msgid "Could not stat '%s'"
922 msgid "Empty patch. Aborted."
927 msgid "Could not apply '%s'"
931 msgid "The following paths are ignored by one of your .gitignore files:\n"
936 msgid "Use -f if you really want to add them.\n"
940 msgid "no files added"
944 msgid "adding files failed"
948 msgid "-A and -u are mutually incompatible"
952 msgid "Option --ignore-missing can only be used together with --dry-run"
957 msgid "Nothing specified, nothing added.\n"
962 msgid "Maybe you wanted to say 'git add .'?\n"
965 #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
967 msgid "index file corrupt"
970 #: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
971 msgid "Unable to write new index file"
974 #: builtin/apply.c:53
975 msgid "git apply [options] [<patch>...]"
978 #: builtin/apply.c:106
980 msgid "unrecognized whitespace option '%s'"
983 #: builtin/apply.c:121
985 msgid "unrecognized whitespace ignore option '%s'"
988 #: builtin/apply.c:815
990 msgid "Cannot prepare timestamp regexp %s"
993 #: builtin/apply.c:824
995 msgid "regexec returned %d for input: %s"
998 #: builtin/apply.c:905
1000 msgid "unable to find filename in patch at line %d"
1003 #: builtin/apply.c:937
1005 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1008 #: builtin/apply.c:941
1010 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1013 #: builtin/apply.c:942
1015 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1018 #: builtin/apply.c:949
1020 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1023 #: builtin/apply.c:1394
1025 msgid "recount: unexpected line: %.*s"
1028 #: builtin/apply.c:1451
1030 msgid "patch fragment without header at line %d: %.*s"
1033 #: builtin/apply.c:1468
1036 "git diff header lacks filename information when removing %d leading pathname "
1037 "component (line %d)"
1039 "git diff header lacks filename information when removing %d leading pathname "
1040 "components (line %d)"
1044 #: builtin/apply.c:1628
1045 msgid "new file depends on old contents"
1048 #: builtin/apply.c:1630
1049 msgid "deleted file still has contents"
1052 #: builtin/apply.c:1656
1054 msgid "corrupt patch at line %d"
1057 #: builtin/apply.c:1692
1059 msgid "new file %s depends on old contents"
1062 #: builtin/apply.c:1694
1064 msgid "deleted file %s still has contents"
1067 #: builtin/apply.c:1697
1069 msgid "** warning: file %s becomes empty but is not deleted"
1072 #: builtin/apply.c:1843
1074 msgid "corrupt binary patch at line %d: %.*s"
1077 #. there has to be one hunk (forward hunk)
1078 #: builtin/apply.c:1872
1080 msgid "unrecognized binary patch at line %d"
1083 #: builtin/apply.c:1958
1085 msgid "patch with only garbage at line %d"
1088 #: builtin/apply.c:2048
1090 msgid "unable to read symlink %s"
1093 #: builtin/apply.c:2052
1095 msgid "unable to open or read %s"
1098 #: builtin/apply.c:2123
1102 #: builtin/apply.c:2645
1104 msgid "invalid start of line: '%c'"
1107 #: builtin/apply.c:2763
1109 msgid "Hunk #%d succeeded at %d (offset %d line)."
1110 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1114 #: builtin/apply.c:2775
1116 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1119 #: builtin/apply.c:2781
1122 "while searching for:\n"
1126 #: builtin/apply.c:2800
1128 msgid "missing binary patch data for '%s'"
1131 #: builtin/apply.c:2903
1133 msgid "binary patch does not apply to '%s'"
1136 #: builtin/apply.c:2909
1138 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1141 #: builtin/apply.c:2930
1143 msgid "patch failed: %s:%ld"
1146 #: builtin/apply.c:3045
1148 msgid "patch %s has been renamed/deleted"
1151 #: builtin/apply.c:3052 builtin/apply.c:3069
1153 msgid "read of %s failed"
1156 #: builtin/apply.c:3084
1157 msgid "removal patch leaves file contents"
1160 #: builtin/apply.c:3105
1162 msgid "%s: already exists in working directory"
1165 #: builtin/apply.c:3143
1167 msgid "%s: has been deleted/renamed"
1170 #: builtin/apply.c:3148 builtin/apply.c:3179
1175 #: builtin/apply.c:3159
1177 msgid "%s: does not exist in index"
1180 #: builtin/apply.c:3173
1182 msgid "%s: does not match index"
1185 #: builtin/apply.c:3190
1187 msgid "%s: wrong type"
1190 #: builtin/apply.c:3192
1192 msgid "%s has type %o, expected %o"
1195 #: builtin/apply.c:3247
1197 msgid "%s: already exists in index"
1200 #: builtin/apply.c:3267
1202 msgid "new mode (%o) of %s does not match old mode (%o)"
1205 #: builtin/apply.c:3272
1207 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1210 #: builtin/apply.c:3280
1212 msgid "%s: patch does not apply"
1215 #: builtin/apply.c:3293
1217 msgid "Checking patch %s..."
1220 #: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158
1222 msgid "make_cache_entry failed for path '%s'"
1225 #: builtin/apply.c:3491
1227 msgid "unable to remove %s from index"
1230 #: builtin/apply.c:3518
1232 msgid "corrupt patch for subproject %s"
1235 #: builtin/apply.c:3522
1237 msgid "unable to stat newly created file '%s'"
1240 #: builtin/apply.c:3527
1242 msgid "unable to create backing store for newly created file %s"
1245 #: builtin/apply.c:3530
1247 msgid "unable to add cache entry for %s"
1250 #: builtin/apply.c:3563
1252 msgid "closing file '%s'"
1255 #: builtin/apply.c:3612
1257 msgid "unable to write file '%s' mode %o"
1260 #: builtin/apply.c:3668
1262 msgid "Applied patch %s cleanly."
1265 #: builtin/apply.c:3676
1266 msgid "internal error"
1269 #. Say this even without --verbose
1270 #: builtin/apply.c:3679
1272 msgid "Applying patch %%s with %d reject..."
1273 msgid_plural "Applying patch %%s with %d rejects..."
1277 #: builtin/apply.c:3689
1279 msgid "truncating .rej filename to %.*s.rej"
1282 #: builtin/apply.c:3710
1284 msgid "Hunk #%d applied cleanly."
1287 #: builtin/apply.c:3713
1289 msgid "Rejected hunk #%d."
1292 #: builtin/apply.c:3844
1293 msgid "unrecognized input"
1296 #: builtin/apply.c:3855
1297 msgid "unable to read index file"
1300 #: builtin/apply.c:3970 builtin/apply.c:3973
1304 #: builtin/apply.c:3971
1305 msgid "don't apply changes matching the given path"
1308 #: builtin/apply.c:3974
1309 msgid "apply changes matching the given path"
1312 #: builtin/apply.c:3976
1316 #: builtin/apply.c:3977
1317 msgid "remove <num> leading slashes from traditional diff paths"
1320 #: builtin/apply.c:3980
1321 msgid "ignore additions made by the patch"
1324 #: builtin/apply.c:3982
1325 msgid "instead of applying the patch, output diffstat for the input"
1328 #: builtin/apply.c:3986
1329 msgid "shows number of added and deleted lines in decimal notation"
1332 #: builtin/apply.c:3988
1333 msgid "instead of applying the patch, output a summary for the input"
1336 #: builtin/apply.c:3990
1337 msgid "instead of applying the patch, see if the patch is applicable"
1340 #: builtin/apply.c:3992
1341 msgid "make sure the patch is applicable to the current index"
1344 #: builtin/apply.c:3994
1345 msgid "apply a patch without touching the working tree"
1348 #: builtin/apply.c:3996
1349 msgid "also apply the patch (use with --stat/--summary/--check)"
1352 #: builtin/apply.c:3998
1353 msgid "build a temporary index based on embedded index information"
1356 #: builtin/apply.c:4000
1357 msgid "paths are separated with NUL character"
1360 #: builtin/apply.c:4003
1361 msgid "ensure at least <n> lines of context match"
1364 #: builtin/apply.c:4004
1368 #: builtin/apply.c:4005
1369 msgid "detect new or modified lines that have whitespace errors"
1372 #: builtin/apply.c:4008 builtin/apply.c:4011
1373 msgid "ignore changes in whitespace when finding context"
1376 #: builtin/apply.c:4014
1377 msgid "apply the patch in reverse"
1380 #: builtin/apply.c:4016
1381 msgid "don't expect at least one line of context"
1384 #: builtin/apply.c:4018
1385 msgid "leave the rejected hunks in corresponding *.rej files"
1388 #: builtin/apply.c:4020
1389 msgid "allow overlapping hunks"
1392 #: builtin/apply.c:4021
1396 #: builtin/apply.c:4023
1397 msgid "tolerate incorrectly detected missing new-line at the end of file"
1400 #: builtin/apply.c:4026
1401 msgid "do not trust the line counts in the hunk headers"
1404 #: builtin/apply.c:4028
1408 #: builtin/apply.c:4029
1409 msgid "prepend <root> to all filenames"
1412 #: builtin/apply.c:4050
1413 msgid "--index outside a repository"
1416 #: builtin/apply.c:4053
1417 msgid "--cached outside a repository"
1420 #: builtin/apply.c:4069
1422 msgid "can't open patch '%s'"
1425 #: builtin/apply.c:4083
1427 msgid "squelched %d whitespace error"
1428 msgid_plural "squelched %d whitespace errors"
1432 #: builtin/apply.c:4089 builtin/apply.c:4099
1434 msgid "%d line adds whitespace errors."
1435 msgid_plural "%d lines add whitespace errors."
1439 #: builtin/archive.c:17
1441 msgid "could not create archive file '%s'"
1444 #: builtin/archive.c:20
1445 msgid "could not redirect output"
1448 #: builtin/archive.c:37
1449 msgid "git archive: Remote with no URL"
1452 #: builtin/archive.c:58
1453 msgid "git archive: expected ACK/NAK, got EOF"
1456 #: builtin/archive.c:63
1458 msgid "git archive: NACK %s"
1461 #: builtin/archive.c:65
1463 msgid "remote error: %s"
1466 #: builtin/archive.c:66
1467 msgid "git archive: protocol error"
1470 #: builtin/archive.c:71
1471 msgid "git archive: expected a flush"
1474 #: builtin/branch.c:144
1477 "deleting branch '%s' that has been merged to\n"
1478 " '%s', but not yet merged to HEAD."
1481 #: builtin/branch.c:148
1484 "not deleting branch '%s' that is not yet merged to\n"
1485 " '%s', even though it is merged to HEAD."
1488 #: builtin/branch.c:180
1489 msgid "cannot use -a with -d"
1492 #: builtin/branch.c:186
1493 msgid "Couldn't look up commit object for HEAD"
1496 #: builtin/branch.c:191
1498 msgid "Cannot delete the branch '%s' which you are currently on."
1501 #: builtin/branch.c:202
1503 msgid "remote branch '%s' not found."
1506 #: builtin/branch.c:203
1508 msgid "branch '%s' not found."
1511 #: builtin/branch.c:210
1513 msgid "Couldn't look up commit object for '%s'"
1516 #: builtin/branch.c:216
1519 "The branch '%s' is not fully merged.\n"
1520 "If you are sure you want to delete it, run 'git branch -D %s'."
1523 #: builtin/branch.c:225
1525 msgid "Error deleting remote branch '%s'"
1528 #: builtin/branch.c:226
1530 msgid "Error deleting branch '%s'"
1533 #: builtin/branch.c:233
1535 msgid "Deleted remote branch %s (was %s).\n"
1538 #: builtin/branch.c:234
1540 msgid "Deleted branch %s (was %s).\n"
1543 #: builtin/branch.c:239
1544 msgid "Update of config-file failed"
1547 #: builtin/branch.c:337
1549 msgid "branch '%s' does not point at a commit"
1552 #: builtin/branch.c:409
1554 msgid "[%s: behind %d]"
1557 #: builtin/branch.c:411
1562 #: builtin/branch.c:415
1564 msgid "[%s: ahead %d]"
1567 #: builtin/branch.c:417
1572 #: builtin/branch.c:420
1574 msgid "[%s: ahead %d, behind %d]"
1577 #: builtin/branch.c:423
1579 msgid "[ahead %d, behind %d]"
1582 #: builtin/branch.c:535
1586 #: builtin/branch.c:600
1587 msgid "some refs could not be read"
1590 #: builtin/branch.c:613
1591 msgid "cannot rename the current branch while not on any."
1594 #: builtin/branch.c:623
1596 msgid "Invalid branch name: '%s'"
1599 #: builtin/branch.c:638
1600 msgid "Branch rename failed"
1603 #: builtin/branch.c:642
1605 msgid "Renamed a misnamed branch '%s' away"
1608 #: builtin/branch.c:646
1610 msgid "Branch renamed to %s, but HEAD is not updated!"
1613 #: builtin/branch.c:653
1614 msgid "Branch is renamed, but update of config-file failed"
1617 #: builtin/branch.c:668
1619 msgid "malformed object name %s"
1622 #: builtin/branch.c:692
1624 msgid "could not write branch description template: %s"
1627 #: builtin/branch.c:783
1628 msgid "Failed to resolve HEAD as a valid ref."
1631 #: builtin/branch.c:788 builtin/clone.c:558
1632 msgid "HEAD not found below refs/heads!"
1635 #: builtin/branch.c:808
1636 msgid "--column and --verbose are incompatible"
1639 #: builtin/branch.c:857
1640 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
1643 #: builtin/bundle.c:47
1645 msgid "%s is okay\n"
1648 #: builtin/bundle.c:56
1649 msgid "Need a repository to create a bundle."
1652 #: builtin/bundle.c:60
1653 msgid "Need a repository to unbundle."
1656 #: builtin/checkout.c:113 builtin/checkout.c:146
1658 msgid "path '%s' does not have our version"
1661 #: builtin/checkout.c:115 builtin/checkout.c:148
1663 msgid "path '%s' does not have their version"
1666 #: builtin/checkout.c:131
1668 msgid "path '%s' does not have all necessary versions"
1671 #: builtin/checkout.c:175
1673 msgid "path '%s' does not have necessary versions"
1676 #: builtin/checkout.c:192
1678 msgid "path '%s': cannot merge"
1681 #: builtin/checkout.c:209
1683 msgid "Unable to add merge result for '%s'"
1686 #: builtin/checkout.c:234 builtin/checkout.c:392
1687 msgid "corrupt index file"
1690 #: builtin/checkout.c:264 builtin/checkout.c:271
1692 msgid "path '%s' is unmerged"
1695 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
1696 #: builtin/merge.c:812
1697 msgid "unable to write new index file"
1700 #: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
1701 msgid "diff_setup_done failed"
1704 #: builtin/checkout.c:414
1705 msgid "you need to resolve your current index first"
1708 #: builtin/checkout.c:533
1710 msgid "Can not do reflog for '%s'\n"
1713 #: builtin/checkout.c:566
1714 msgid "HEAD is now at"
1717 #: builtin/checkout.c:573
1719 msgid "Reset branch '%s'\n"
1722 #: builtin/checkout.c:576
1724 msgid "Already on '%s'\n"
1727 #: builtin/checkout.c:580
1729 msgid "Switched to and reset branch '%s'\n"
1732 #: builtin/checkout.c:582
1734 msgid "Switched to a new branch '%s'\n"
1737 #: builtin/checkout.c:584
1739 msgid "Switched to branch '%s'\n"
1742 #: builtin/checkout.c:640
1744 msgid " ... and %d more.\n"
1747 #. The singular version
1748 #: builtin/checkout.c:646
1751 "Warning: you are leaving %d commit behind, not connected to\n"
1752 "any of your branches:\n"
1756 "Warning: you are leaving %d commits behind, not connected to\n"
1757 "any of your branches:\n"
1763 #: builtin/checkout.c:664
1766 "If you want to keep them by creating a new branch, this may be a good time\n"
1769 " git branch new_branch_name %s\n"
1773 #: builtin/checkout.c:694
1774 msgid "internal error in revision walk"
1777 #: builtin/checkout.c:698
1778 msgid "Previous HEAD position was"
1781 #: builtin/checkout.c:724
1782 msgid "You are on a branch yet to be born"
1786 #: builtin/checkout.c:855
1788 msgid "invalid reference: %s"
1791 #. case (1): want a tree
1792 #: builtin/checkout.c:894
1794 msgid "reference is not a tree: %s"
1797 #: builtin/checkout.c:974
1798 msgid "-B cannot be used with -b"
1801 #: builtin/checkout.c:983
1802 msgid "--patch is incompatible with all other options"
1805 #: builtin/checkout.c:986
1806 msgid "--detach cannot be used with -b/-B/--orphan"
1809 #: builtin/checkout.c:988
1810 msgid "--detach cannot be used with -t"
1813 #: builtin/checkout.c:994
1814 msgid "--track needs a branch name"
1817 #: builtin/checkout.c:1001
1818 msgid "Missing branch name; try -b"
1821 #: builtin/checkout.c:1007
1822 msgid "--orphan and -b|-B are mutually exclusive"
1825 #: builtin/checkout.c:1009
1826 msgid "--orphan cannot be used with -t"
1829 #: builtin/checkout.c:1019
1830 msgid "git checkout: -f and -m are incompatible"
1833 #: builtin/checkout.c:1053
1834 msgid "invalid path specification"
1837 #: builtin/checkout.c:1061
1840 "git checkout: updating paths is incompatible with switching branches.\n"
1841 "Did you intend to checkout '%s' which can not be resolved as commit?"
1844 #: builtin/checkout.c:1063
1845 msgid "git checkout: updating paths is incompatible with switching branches."
1848 #: builtin/checkout.c:1068
1849 msgid "git checkout: --detach does not take a path argument"
1852 #: builtin/checkout.c:1071
1854 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1855 "checking out of the index."
1858 #: builtin/checkout.c:1090
1859 msgid "Cannot switch branch to a non-commit."
1862 #: builtin/checkout.c:1093
1863 msgid "--ours/--theirs is incompatible with switching branches."
1866 #: builtin/clean.c:78
1867 msgid "-x and -X cannot be used together"
1870 #: builtin/clean.c:82
1872 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
1875 #: builtin/clean.c:85
1877 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
1881 #: builtin/clean.c:155 builtin/clean.c:176
1883 msgid "Would remove %s\n"
1886 #: builtin/clean.c:159 builtin/clean.c:179
1888 msgid "Removing %s\n"
1891 #: builtin/clean.c:162 builtin/clean.c:182
1893 msgid "failed to remove %s"
1896 #: builtin/clean.c:166
1898 msgid "Would not remove %s\n"
1901 #: builtin/clean.c:168
1903 msgid "Not removing %s\n"
1906 #: builtin/clone.c:243
1908 msgid "reference repository '%s' is not a local directory."
1911 #: builtin/clone.c:302
1913 msgid "failed to open '%s'"
1916 #: builtin/clone.c:306
1918 msgid "failed to create directory '%s'"
1921 #: builtin/clone.c:308 builtin/diff.c:75
1923 msgid "failed to stat '%s'"
1926 #: builtin/clone.c:310
1928 msgid "%s exists and is not a directory"
1931 #: builtin/clone.c:324
1933 msgid "failed to stat %s\n"
1936 #: builtin/clone.c:341
1938 msgid "failed to unlink '%s'"
1941 #: builtin/clone.c:346
1943 msgid "failed to create link '%s'"
1946 #: builtin/clone.c:350
1948 msgid "failed to copy file to '%s'"
1951 #: builtin/clone.c:373
1956 #: builtin/clone.c:440
1958 msgid "Could not find remote branch %s to clone."
1961 #: builtin/clone.c:549
1962 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
1965 #: builtin/clone.c:639
1966 msgid "Too many arguments."
1969 #: builtin/clone.c:643
1970 msgid "You must specify a repository to clone."
1973 #: builtin/clone.c:654
1975 msgid "--bare and --origin %s options are incompatible."
1978 #: builtin/clone.c:668
1980 msgid "repository '%s' does not exist"
1983 #: builtin/clone.c:673
1984 msgid "--depth is ignored in local clones; use file:// instead."
1987 #: builtin/clone.c:683
1989 msgid "destination path '%s' already exists and is not an empty directory."
1992 #: builtin/clone.c:693
1994 msgid "working tree '%s' already exists."
1997 #: builtin/clone.c:706 builtin/clone.c:720
1999 msgid "could not create leading directories of '%s'"
2002 #: builtin/clone.c:709
2004 msgid "could not create work tree dir '%s'."
2007 #: builtin/clone.c:728
2009 msgid "Cloning into bare repository '%s'...\n"
2012 #: builtin/clone.c:730
2014 msgid "Cloning into '%s'...\n"
2017 #: builtin/clone.c:786
2019 msgid "Don't know how to clone %s"
2022 #: builtin/clone.c:835
2024 msgid "Remote branch %s not found in upstream %s"
2027 #: builtin/clone.c:842
2028 msgid "You appear to have cloned an empty repository."
2031 #: builtin/column.c:51
2032 msgid "--command must be the first argument"
2035 #: builtin/commit.c:43
2037 "Your name and email address were configured automatically based\n"
2038 "on your username and hostname. Please check that they are accurate.\n"
2039 "You can suppress this message by setting them explicitly:\n"
2041 " git config --global user.name \"Your Name\"\n"
2042 " git config --global user.email you@example.com\n"
2044 "After doing this, you may fix the identity used for this commit with:\n"
2046 " git commit --amend --reset-author\n"
2049 #: builtin/commit.c:55
2051 "You asked to amend the most recent commit, but doing so would make\n"
2052 "it empty. You can repeat your command with --allow-empty, or you can\n"
2053 "remove the commit entirely with \"git reset HEAD^\".\n"
2056 #: builtin/commit.c:60
2058 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
2059 "If you wish to commit it anyway, use:\n"
2061 " git commit --allow-empty\n"
2063 "Otherwise, please use 'git reset'\n"
2066 #: builtin/commit.c:253
2067 msgid "failed to unpack HEAD tree object"
2070 #: builtin/commit.c:295
2071 msgid "unable to create temporary index"
2074 #: builtin/commit.c:301
2075 msgid "interactive add failed"
2078 #: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405
2079 msgid "unable to write new_index file"
2082 #: builtin/commit.c:386
2083 msgid "cannot do a partial commit during a merge."
2086 #: builtin/commit.c:388
2087 msgid "cannot do a partial commit during a cherry-pick."
2090 #: builtin/commit.c:398
2091 msgid "cannot read the index"
2094 #: builtin/commit.c:418
2095 msgid "unable to write temporary index file"
2098 #: builtin/commit.c:493 builtin/commit.c:499
2100 msgid "invalid commit: %s"
2103 #: builtin/commit.c:522
2104 msgid "malformed --author parameter"
2107 #: builtin/commit.c:582
2109 msgid "Malformed ident string: '%s'"
2112 #: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967
2114 msgid "could not lookup commit %s"
2117 #: builtin/commit.c:632 builtin/shortlog.c:296
2119 msgid "(reading log message from standard input)\n"
2122 #: builtin/commit.c:634
2123 msgid "could not read log from standard input"
2126 #: builtin/commit.c:638
2128 msgid "could not read log file '%s'"
2131 #: builtin/commit.c:644
2132 msgid "commit has empty message"
2135 #: builtin/commit.c:660
2136 msgid "could not read MERGE_MSG"
2139 #: builtin/commit.c:664
2140 msgid "could not read SQUASH_MSG"
2143 #: builtin/commit.c:668
2145 msgid "could not read '%s'"
2148 #: builtin/commit.c:720
2149 msgid "could not write commit template"
2152 #: builtin/commit.c:731
2156 "It looks like you may be committing a merge.\n"
2157 "If this is not correct, please remove the file\n"
2162 #: builtin/commit.c:736
2166 "It looks like you may be committing a cherry-pick.\n"
2167 "If this is not correct, please remove the file\n"
2172 #: builtin/commit.c:748
2174 "Please enter the commit message for your changes. Lines starting\n"
2175 "with '#' will be ignored, and an empty message aborts the commit.\n"
2178 #: builtin/commit.c:753
2180 "Please enter the commit message for your changes. Lines starting\n"
2181 "with '#' will be kept; you may remove them yourself if you want to.\n"
2182 "An empty message aborts the commit.\n"
2185 #: builtin/commit.c:766
2187 msgid "%sAuthor: %s"
2190 #: builtin/commit.c:773
2192 msgid "%sCommitter: %s"
2195 #: builtin/commit.c:793
2196 msgid "Cannot read index"
2199 #: builtin/commit.c:830
2200 msgid "Error building trees"
2203 #: builtin/commit.c:845 builtin/tag.c:361
2205 msgid "Please supply the message using either -m or -F option.\n"
2208 #: builtin/commit.c:942
2210 msgid "No existing author found with '%s'"
2213 #: builtin/commit.c:957 builtin/commit.c:1157
2215 msgid "Invalid untracked files mode '%s'"
2218 #: builtin/commit.c:997
2219 msgid "Using both --reset-author and --author does not make sense"
2222 #: builtin/commit.c:1008
2223 msgid "You have nothing to amend."
2226 #: builtin/commit.c:1011
2227 msgid "You are in the middle of a merge -- cannot amend."
2230 #: builtin/commit.c:1013
2231 msgid "You are in the middle of a cherry-pick -- cannot amend."
2234 #: builtin/commit.c:1016
2235 msgid "Options --squash and --fixup cannot be used together"
2238 #: builtin/commit.c:1026
2239 msgid "Only one of -c/-C/-F/--fixup can be used."
2242 #: builtin/commit.c:1028
2243 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
2246 #: builtin/commit.c:1036
2247 msgid "--reset-author can be used only with -C, -c or --amend."
2250 #: builtin/commit.c:1053
2251 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
2254 #: builtin/commit.c:1055
2255 msgid "No paths with --include/--only does not make sense."
2258 #: builtin/commit.c:1057
2259 msgid "Clever... amending the last one with dirty index."
2262 #: builtin/commit.c:1059
2263 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
2266 #: builtin/commit.c:1069 builtin/tag.c:577
2268 msgid "Invalid cleanup mode %s"
2271 #: builtin/commit.c:1074
2272 msgid "Paths with -a does not make sense."
2275 #: builtin/commit.c:1257
2276 msgid "couldn't look up newly created commit"
2279 #: builtin/commit.c:1259
2280 msgid "could not parse newly created commit"
2283 #: builtin/commit.c:1300
2284 msgid "detached HEAD"
2287 #: builtin/commit.c:1302
2288 msgid " (root-commit)"
2291 #: builtin/commit.c:1446
2292 msgid "could not parse HEAD commit"
2295 #: builtin/commit.c:1484 builtin/merge.c:509
2297 msgid "could not open '%s' for reading"
2300 #: builtin/commit.c:1491
2302 msgid "Corrupt MERGE_HEAD file (%s)"
2305 #: builtin/commit.c:1498
2306 msgid "could not read MERGE_MODE"
2309 #: builtin/commit.c:1517
2311 msgid "could not read commit message: %s"
2314 #: builtin/commit.c:1531
2316 msgid "Aborting commit; you did not edit the message.\n"
2319 #: builtin/commit.c:1536
2321 msgid "Aborting commit due to empty commit message.\n"
2324 #: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961
2325 msgid "failed to write commit object"
2328 #: builtin/commit.c:1572
2329 msgid "cannot lock HEAD ref"
2332 #: builtin/commit.c:1576
2333 msgid "cannot update HEAD ref"
2336 #: builtin/commit.c:1587
2338 "Repository has been updated, but unable to write\n"
2339 "new_index file. Check that disk is not full or quota is\n"
2340 "not exceeded, and then \"git reset HEAD\" to recover."
2343 #: builtin/describe.c:234
2345 msgid "annotated tag %s not available"
2348 #: builtin/describe.c:238
2350 msgid "annotated tag %s has no embedded name"
2353 #: builtin/describe.c:240
2355 msgid "tag '%s' is really '%s' here"
2358 #: builtin/describe.c:267
2360 msgid "Not a valid object name %s"
2363 #: builtin/describe.c:270
2365 msgid "%s is not a valid '%s' object"
2368 #: builtin/describe.c:287
2370 msgid "no tag exactly matches '%s'"
2373 #: builtin/describe.c:289
2375 msgid "searching to describe %s\n"
2378 #: builtin/describe.c:329
2380 msgid "finished search at %s\n"
2383 #: builtin/describe.c:353
2386 "No annotated tags can describe '%s'.\n"
2387 "However, there were unannotated tags: try --tags."
2390 #: builtin/describe.c:357
2393 "No tags can describe '%s'.\n"
2394 "Try --always, or create some tags."
2397 #: builtin/describe.c:378
2399 msgid "traversed %lu commits\n"
2402 #: builtin/describe.c:381
2405 "more than %i tags found; listed %i most recent\n"
2406 "gave up search at %s\n"
2409 #: builtin/describe.c:436
2410 msgid "--long is incompatible with --abbrev=0"
2413 #: builtin/describe.c:462
2414 msgid "No names found, cannot describe anything."
2417 #: builtin/describe.c:482
2418 msgid "--dirty is incompatible with committishes"
2421 #: builtin/diff.c:77
2423 msgid "'%s': not a regular file or symlink"
2426 #: builtin/diff.c:220
2428 msgid "invalid option: %s"
2431 #: builtin/diff.c:297
2432 msgid "Not a git repository"
2435 #: builtin/diff.c:347
2437 msgid "invalid object '%s' given."
2440 #: builtin/diff.c:352
2442 msgid "more than %d trees given: '%s'"
2445 #: builtin/diff.c:362
2447 msgid "more than two blobs given: '%s'"
2450 #: builtin/diff.c:370
2452 msgid "unhandled object '%s' given."
2455 #: builtin/fetch.c:200
2456 msgid "Couldn't find remote ref HEAD"
2459 #: builtin/fetch.c:253
2461 msgid "object %s not found"
2464 #: builtin/fetch.c:259
2465 msgid "[up to date]"
2468 #: builtin/fetch.c:273
2470 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
2473 #: builtin/fetch.c:274 builtin/fetch.c:360
2477 #: builtin/fetch.c:285
2478 msgid "[tag update]"
2481 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
2482 msgid " (unable to update local ref)"
2485 #: builtin/fetch.c:305
2489 #: builtin/fetch.c:308
2490 msgid "[new branch]"
2493 #: builtin/fetch.c:311
2497 #: builtin/fetch.c:356
2498 msgid "unable to update local ref"
2501 #: builtin/fetch.c:356
2502 msgid "forced update"
2505 #: builtin/fetch.c:362
2506 msgid "(non-fast-forward)"
2509 #: builtin/fetch.c:393 builtin/fetch.c:685
2511 msgid "cannot open %s: %s\n"
2514 #: builtin/fetch.c:402
2516 msgid "%s did not send all necessary objects\n"
2519 #: builtin/fetch.c:488
2524 #: builtin/fetch.c:499
2527 "some local refs could not be updated; try running\n"
2528 " 'git remote prune %s' to remove any old, conflicting branches"
2531 #: builtin/fetch.c:549
2533 msgid " (%s will become dangling)"
2536 #: builtin/fetch.c:550
2538 msgid " (%s has become dangling)"
2541 #: builtin/fetch.c:557
2545 #: builtin/fetch.c:558 builtin/remote.c:1055
2549 #: builtin/fetch.c:675
2551 msgid "Refusing to fetch into current branch %s of non-bare repository"
2554 #: builtin/fetch.c:709
2556 msgid "Don't know how to fetch from %s"
2559 #: builtin/fetch.c:786
2561 msgid "Option \"%s\" value \"%s\" is not valid for %s"
2564 #: builtin/fetch.c:789
2566 msgid "Option \"%s\" is ignored for %s\n"
2569 #: builtin/fetch.c:888
2571 msgid "Fetching %s\n"
2574 #: builtin/fetch.c:890 builtin/remote.c:100
2576 msgid "Could not fetch %s"
2579 #: builtin/fetch.c:907
2581 "No remote repository specified. Please, specify either a URL or a\n"
2582 "remote name from which new revisions should be fetched."
2585 #: builtin/fetch.c:927
2586 msgid "You need to specify a tag name."
2589 #: builtin/fetch.c:979
2590 msgid "fetch --all does not take a repository argument"
2593 #: builtin/fetch.c:981
2594 msgid "fetch --all does not make sense with refspecs"
2597 #: builtin/fetch.c:992
2599 msgid "No such remote or remote group: %s"
2602 #: builtin/fetch.c:1000
2603 msgid "Fetching a group and specifying refspecs does not make sense"
2608 msgid "Invalid %s: '%s'"
2613 msgid "insanely long object directory %.*s"
2618 msgid "Auto packing the repository for optimum performance.\n"
2624 "Auto packing the repository for optimum performance. You may also\n"
2625 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
2630 "There are too many unreachable loose objects; run 'git prune' to remove them."
2633 #: builtin/grep.c:216
2635 msgid "grep: failed to create thread: %s"
2638 #: builtin/grep.c:402
2640 msgid "Failed to chdir: %s"
2643 #: builtin/grep.c:478 builtin/grep.c:512
2645 msgid "unable to read tree (%s)"
2648 #: builtin/grep.c:526
2650 msgid "unable to grep from object of type %s"
2653 #: builtin/grep.c:584
2655 msgid "switch `%c' expects a numerical value"
2658 #: builtin/grep.c:601
2660 msgid "cannot open '%s'"
2663 #: builtin/grep.c:885
2664 msgid "no pattern given."
2667 #: builtin/grep.c:899
2669 msgid "bad object %s"
2672 #: builtin/grep.c:940
2673 msgid "--open-files-in-pager only works on the worktree"
2676 #: builtin/grep.c:963
2677 msgid "--cached or --untracked cannot be used with --no-index."
2680 #: builtin/grep.c:968
2681 msgid "--no-index or --untracked cannot be used with revs."
2684 #: builtin/grep.c:971
2685 msgid "--[no-]exclude-standard cannot be used for tracked contents."
2688 #: builtin/grep.c:979
2689 msgid "both --cached and trees are given."
2692 #: builtin/help.c:59
2694 msgid "unrecognized help format '%s'"
2697 #: builtin/help.c:87
2698 msgid "Failed to start emacsclient."
2701 #: builtin/help.c:100
2702 msgid "Failed to parse emacsclient version."
2705 #: builtin/help.c:108
2707 msgid "emacsclient version '%d' too old (< 22)."
2710 #: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
2712 msgid "failed to exec '%s': %s"
2715 #: builtin/help.c:211
2718 "'%s': path for unsupported man viewer.\n"
2719 "Please consider using 'man.<tool>.cmd' instead."
2722 #: builtin/help.c:223
2725 "'%s': cmd for supported man viewer.\n"
2726 "Please consider using 'man.<tool>.path' instead."
2729 #: builtin/help.c:287
2730 msgid "The most commonly used git commands are:"
2733 #: builtin/help.c:355
2735 msgid "'%s': unknown man viewer."
2738 #: builtin/help.c:372
2739 msgid "no man viewer handled the request"
2742 #: builtin/help.c:380
2743 msgid "no info viewer handled the request"
2746 #: builtin/help.c:391
2748 msgid "'%s': not a documentation directory."
2751 #: builtin/help.c:432 builtin/help.c:439
2756 #: builtin/help.c:453
2758 msgid "`git %s' is aliased to `%s'"
2761 #: builtin/index-pack.c:169
2763 msgid "object type mismatch at %s"
2766 #: builtin/index-pack.c:189
2767 msgid "object of unexpected type"
2770 #: builtin/index-pack.c:226
2772 msgid "cannot fill %d byte"
2773 msgid_plural "cannot fill %d bytes"
2777 #: builtin/index-pack.c:236
2781 #: builtin/index-pack.c:237
2782 msgid "read error on input"
2785 #: builtin/index-pack.c:249
2786 msgid "used more bytes than were available"
2789 #: builtin/index-pack.c:256
2790 msgid "pack too large for current definition of off_t"
2793 #: builtin/index-pack.c:272
2795 msgid "unable to create '%s'"
2798 #: builtin/index-pack.c:277
2800 msgid "cannot open packfile '%s'"
2803 #: builtin/index-pack.c:291
2804 msgid "pack signature mismatch"
2807 #: builtin/index-pack.c:311
2809 msgid "pack has bad object at offset %lu: %s"
2812 #: builtin/index-pack.c:405
2814 msgid "inflate returned %d"
2817 #: builtin/index-pack.c:450
2818 msgid "offset value overflow for delta base object"
2821 #: builtin/index-pack.c:458
2822 msgid "delta base offset is out of bound"
2825 #: builtin/index-pack.c:466
2827 msgid "unknown object type %d"
2830 #: builtin/index-pack.c:495
2831 msgid "cannot pread pack file"
2834 #: builtin/index-pack.c:497
2836 msgid "premature end of pack file, %lu byte missing"
2837 msgid_plural "premature end of pack file, %lu bytes missing"
2841 #: builtin/index-pack.c:510
2842 msgid "serious inflate inconsistency"
2845 #: builtin/index-pack.c:583
2847 msgid "cannot read existing object %s"
2850 #: builtin/index-pack.c:586
2852 msgid "SHA1 COLLISION FOUND WITH %s !"
2855 #: builtin/index-pack.c:598
2857 msgid "invalid blob object %s"
2860 #: builtin/index-pack.c:610
2865 #: builtin/index-pack.c:612
2866 msgid "Error in object"
2869 #: builtin/index-pack.c:614
2871 msgid "Not all child objects of %s are reachable"
2874 #: builtin/index-pack.c:687 builtin/index-pack.c:713
2875 msgid "failed to apply delta"
2878 #: builtin/index-pack.c:850
2879 msgid "Receiving objects"
2882 #: builtin/index-pack.c:850
2883 msgid "Indexing objects"
2886 #: builtin/index-pack.c:872
2887 msgid "pack is corrupted (SHA1 mismatch)"
2890 #: builtin/index-pack.c:877
2891 msgid "cannot fstat packfile"
2894 #: builtin/index-pack.c:880
2895 msgid "pack has junk at the end"
2898 #: builtin/index-pack.c:903
2899 msgid "Resolving deltas"
2902 #: builtin/index-pack.c:954
2903 msgid "confusion beyond insanity"
2906 #: builtin/index-pack.c:973
2908 msgid "pack has %d unresolved delta"
2909 msgid_plural "pack has %d unresolved deltas"
2913 #: builtin/index-pack.c:998
2915 msgid "unable to deflate appended object (%d)"
2918 #: builtin/index-pack.c:1077
2920 msgid "local object %s is corrupt"
2923 #: builtin/index-pack.c:1101
2924 msgid "error while closing pack file"
2927 #: builtin/index-pack.c:1114
2929 msgid "cannot write keep file '%s'"
2932 #: builtin/index-pack.c:1122
2934 msgid "cannot close written keep file '%s'"
2937 #: builtin/index-pack.c:1135
2938 msgid "cannot store pack file"
2941 #: builtin/index-pack.c:1146
2942 msgid "cannot store index file"
2945 #: builtin/index-pack.c:1247
2947 msgid "Cannot open existing pack file '%s'"
2950 #: builtin/index-pack.c:1249
2952 msgid "Cannot open existing pack idx file for '%s'"
2955 #: builtin/index-pack.c:1296
2957 msgid "non delta: %d object"
2958 msgid_plural "non delta: %d objects"
2962 #: builtin/index-pack.c:1303
2964 msgid "chain length = %d: %lu object"
2965 msgid_plural "chain length = %d: %lu objects"
2969 #: builtin/index-pack.c:1330
2970 msgid "Cannot come back to cwd"
2973 #: builtin/index-pack.c:1374 builtin/index-pack.c:1377
2974 #: builtin/index-pack.c:1389 builtin/index-pack.c:1393
2979 #: builtin/index-pack.c:1407
2980 msgid "--fix-thin cannot be used without --stdin"
2983 #: builtin/index-pack.c:1411 builtin/index-pack.c:1421
2985 msgid "packfile name '%s' does not end with '.pack'"
2988 #: builtin/index-pack.c:1430
2989 msgid "--verify with no packfile name given"
2992 #: builtin/init-db.c:35
2994 msgid "Could not make %s writable by group"
2997 #: builtin/init-db.c:62
2999 msgid "insanely long template name %s"
3002 #: builtin/init-db.c:67
3004 msgid "cannot stat '%s'"
3007 #: builtin/init-db.c:73
3009 msgid "cannot stat template '%s'"
3012 #: builtin/init-db.c:80
3014 msgid "cannot opendir '%s'"
3017 #: builtin/init-db.c:97
3019 msgid "cannot readlink '%s'"
3022 #: builtin/init-db.c:99
3024 msgid "insanely long symlink %s"
3027 #: builtin/init-db.c:102
3029 msgid "cannot symlink '%s' '%s'"
3032 #: builtin/init-db.c:106
3034 msgid "cannot copy '%s' to '%s'"
3037 #: builtin/init-db.c:110
3039 msgid "ignoring template %s"
3042 #: builtin/init-db.c:133
3044 msgid "insanely long template path %s"
3047 #: builtin/init-db.c:141
3049 msgid "templates not found %s"
3052 #: builtin/init-db.c:154
3054 msgid "not copying templates of a wrong format version %d from '%s'"
3057 #: builtin/init-db.c:192
3059 msgid "insane git directory %s"
3062 #: builtin/init-db.c:322 builtin/init-db.c:325
3064 msgid "%s already exists"
3067 #: builtin/init-db.c:354
3069 msgid "unable to handle file type %d"
3072 #: builtin/init-db.c:357
3074 msgid "unable to move %s to %s"
3077 #: builtin/init-db.c:362
3079 msgid "Could not create git link %s"
3083 #. * TRANSLATORS: The first '%s' is either "Reinitialized
3084 #. * existing" or "Initialized empty", the second " shared" or
3085 #. * "", and the last '%s%s' is the verbatim directory name.
3087 #: builtin/init-db.c:419
3089 msgid "%s%s Git repository in %s%s\n"
3092 #: builtin/init-db.c:420
3093 msgid "Reinitialized existing"
3096 #: builtin/init-db.c:420
3097 msgid "Initialized empty"
3100 #: builtin/init-db.c:421
3104 #: builtin/init-db.c:440
3105 msgid "cannot tell cwd"
3108 #: builtin/init-db.c:521 builtin/init-db.c:528
3110 msgid "cannot mkdir %s"
3113 #: builtin/init-db.c:532
3115 msgid "cannot chdir to %s"
3118 #: builtin/init-db.c:554
3121 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
3125 #: builtin/init-db.c:578
3126 msgid "Cannot access current working directory"
3129 #: builtin/init-db.c:585
3131 msgid "Cannot access work tree '%s'"
3134 #: builtin/log.c:188
3136 msgid "Final output: %d %s\n"
3139 #: builtin/log.c:401 builtin/log.c:489
3141 msgid "Could not read object %s"
3144 #: builtin/log.c:513
3146 msgid "Unknown type: %d"
3149 #: builtin/log.c:602
3150 msgid "format.headers without value"
3153 #: builtin/log.c:676
3154 msgid "name of output directory is too long"
3157 #: builtin/log.c:687
3159 msgid "Cannot open patch file %s"
3162 #: builtin/log.c:701
3163 msgid "Need exactly one range."
3166 #: builtin/log.c:709
3167 msgid "Not a range."
3170 #: builtin/log.c:786
3171 msgid "Cover letter needs email format"
3174 #: builtin/log.c:859
3176 msgid "insane in-reply-to: %s"
3179 #: builtin/log.c:932
3180 msgid "Two output directories?"
3183 #: builtin/log.c:1153
3185 msgid "bogus committer info %s"
3188 #: builtin/log.c:1198
3189 msgid "-n and -k are mutually exclusive."
3192 #: builtin/log.c:1200
3193 msgid "--subject-prefix and -k are mutually exclusive."
3196 #: builtin/log.c:1208
3197 msgid "--name-only does not make sense"
3200 #: builtin/log.c:1210
3201 msgid "--name-status does not make sense"
3204 #: builtin/log.c:1212
3205 msgid "--check does not make sense"
3208 #: builtin/log.c:1235
3209 msgid "standard output, or directory, which one?"
3212 #: builtin/log.c:1237
3214 msgid "Could not create directory '%s'"
3217 #: builtin/log.c:1390
3218 msgid "Failed to create output files"
3221 #: builtin/log.c:1494
3224 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3227 #: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524
3229 msgid "Unknown commit %s"
3232 #: builtin/merge.c:90
3233 msgid "switch `m' requires a value"
3236 #: builtin/merge.c:127
3238 msgid "Could not find merge strategy '%s'.\n"
3241 #: builtin/merge.c:128
3243 msgid "Available strategies are:"
3246 #: builtin/merge.c:133
3248 msgid "Available custom strategies are:"
3251 #: builtin/merge.c:240
3252 msgid "could not run stash."
3255 #: builtin/merge.c:245
3256 msgid "stash failed"
3259 #: builtin/merge.c:250
3261 msgid "not a valid object: %s"
3264 #: builtin/merge.c:269 builtin/merge.c:286
3265 msgid "read-tree failed"
3268 #: builtin/merge.c:316
3269 msgid " (nothing to squash)"
3272 #: builtin/merge.c:329
3274 msgid "Squash commit -- not updating HEAD\n"
3277 #: builtin/merge.c:361
3278 msgid "Writing SQUASH_MSG"
3281 #: builtin/merge.c:363
3282 msgid "Finishing SQUASH_MSG"
3285 #: builtin/merge.c:386
3287 msgid "No merge message -- not updating HEAD\n"
3290 #: builtin/merge.c:437
3292 msgid "'%s' does not point to a commit"
3295 #: builtin/merge.c:536
3297 msgid "Bad branch.%s.mergeoptions string: %s"
3300 #: builtin/merge.c:629
3301 msgid "git write-tree failed to write a tree"
3304 #: builtin/merge.c:679
3305 msgid "failed to read the cache"
3308 #: builtin/merge.c:697
3309 msgid "Unable to write index."
3312 #: builtin/merge.c:710
3313 msgid "Not handling anything other than two heads merge."
3316 #: builtin/merge.c:724
3318 msgid "Unknown option for merge-recursive: -X%s"
3321 #: builtin/merge.c:738
3323 msgid "unable to write %s"
3326 #: builtin/merge.c:877
3328 msgid "Could not read from '%s'"
3331 #: builtin/merge.c:886
3333 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
3336 #: builtin/merge.c:892
3338 "Please enter a commit message to explain why this merge is necessary,\n"
3339 "especially if it merges an updated upstream into a topic branch.\n"
3341 "Lines starting with '#' will be ignored, and an empty message aborts\n"
3345 #: builtin/merge.c:916
3346 msgid "Empty commit message."
3349 #: builtin/merge.c:928
3351 msgid "Wonderful.\n"
3354 #: builtin/merge.c:993
3356 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
3359 #: builtin/merge.c:1009
3361 msgid "'%s' is not a commit"
3364 #: builtin/merge.c:1050
3365 msgid "No current branch."
3368 #: builtin/merge.c:1052
3369 msgid "No remote for the current branch."
3372 #: builtin/merge.c:1054
3373 msgid "No default upstream defined for the current branch."
3376 #: builtin/merge.c:1059
3378 msgid "No remote tracking branch for %s from %s"
3381 #: builtin/merge.c:1146 builtin/merge.c:1303
3383 msgid "%s - not something we can merge"
3386 #: builtin/merge.c:1214
3387 msgid "There is no merge to abort (MERGE_HEAD missing)."
3390 #: builtin/merge.c:1230 git-pull.sh:31
3392 "You have not concluded your merge (MERGE_HEAD exists).\n"
3393 "Please, commit your changes before you can merge."
3396 #: builtin/merge.c:1233 git-pull.sh:34
3397 msgid "You have not concluded your merge (MERGE_HEAD exists)."
3400 #: builtin/merge.c:1237
3402 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
3403 "Please, commit your changes before you can merge."
3406 #: builtin/merge.c:1240
3407 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
3410 #: builtin/merge.c:1249
3411 msgid "You cannot combine --squash with --no-ff."
3414 #: builtin/merge.c:1254
3415 msgid "You cannot combine --no-ff with --ff-only."
3418 #: builtin/merge.c:1261
3419 msgid "No commit specified and merge.defaultToUpstream not set."
3422 #: builtin/merge.c:1293
3423 msgid "Can merge only exactly one commit into empty head"
3426 #: builtin/merge.c:1296
3427 msgid "Squash commit into empty head not supported yet"
3430 #: builtin/merge.c:1298
3431 msgid "Non-fast-forward commit does not make sense into an empty head"
3434 #: builtin/merge.c:1413
3436 msgid "Updating %s..%s\n"
3439 #: builtin/merge.c:1451
3441 msgid "Trying really trivial in-index merge...\n"
3444 #: builtin/merge.c:1458
3449 #: builtin/merge.c:1490
3450 msgid "Not possible to fast-forward, aborting."
3453 #: builtin/merge.c:1513 builtin/merge.c:1592
3455 msgid "Rewinding the tree to pristine...\n"
3458 #: builtin/merge.c:1517
3460 msgid "Trying merge strategy %s...\n"
3463 #: builtin/merge.c:1583
3465 msgid "No merge strategy handled the merge.\n"
3468 #: builtin/merge.c:1585
3470 msgid "Merge with strategy %s failed.\n"
3473 #: builtin/merge.c:1594
3475 msgid "Using the %s to prepare resolving by hand.\n"
3478 #: builtin/merge.c:1606
3480 msgid "Automatic merge went well; stopped before committing as requested\n"
3485 msgid "Checking rename of '%s' to '%s'\n"
3493 msgid "can not move directory into itself"
3497 msgid "cannot move directory over file"
3502 msgid "Huh? %.*s is in index?"
3506 msgid "source directory is empty"
3510 msgid "not under version control"
3514 msgid "destination exists"
3519 msgid "overwriting '%s'"
3523 msgid "Cannot overwrite"
3527 msgid "multiple sources for the same target"
3532 msgid "%s, source=%s, destination=%s"
3537 msgid "Renaming %s to %s\n"
3540 #: builtin/mv.c:215 builtin/remote.c:731
3542 msgid "renaming '%s' failed"
3545 #: builtin/notes.c:139
3547 msgid "unable to start 'show' for object '%s'"
3550 #: builtin/notes.c:145
3551 msgid "can't fdopen 'show' output fd"
3554 #: builtin/notes.c:155
3556 msgid "failed to close pipe to 'show' for object '%s'"
3559 #: builtin/notes.c:158
3561 msgid "failed to finish 'show' for object '%s'"
3564 #: builtin/notes.c:175 builtin/tag.c:347
3566 msgid "could not create file '%s'"
3569 #: builtin/notes.c:189
3570 msgid "Please supply the note contents using either -m or -F option"
3573 #: builtin/notes.c:210 builtin/notes.c:973
3575 msgid "Removing note for object %s\n"
3578 #: builtin/notes.c:215
3579 msgid "unable to write note object"
3582 #: builtin/notes.c:217
3584 msgid "The note contents has been left in %s"
3587 #: builtin/notes.c:251 builtin/tag.c:542
3589 msgid "cannot read '%s'"
3592 #: builtin/notes.c:253 builtin/tag.c:545
3594 msgid "could not open or read '%s'"
3597 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
3598 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
3599 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
3600 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
3602 msgid "Failed to resolve '%s' as a valid ref."
3605 #: builtin/notes.c:275
3607 msgid "Failed to read object '%s'."
3610 #: builtin/notes.c:299
3611 msgid "Cannot commit uninitialized/unreferenced notes tree"
3614 #: builtin/notes.c:340
3616 msgid "Bad notes.rewriteMode value: '%s'"
3619 #: builtin/notes.c:350
3621 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
3624 #. TRANSLATORS: The first %s is the name of the
3625 #. environment variable, the second %s is its value
3626 #: builtin/notes.c:377
3628 msgid "Bad %s value: '%s'"
3631 #: builtin/notes.c:441
3633 msgid "Malformed input line: '%s'."
3636 #: builtin/notes.c:456
3638 msgid "Failed to copy notes from '%s' to '%s'"
3641 #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
3642 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
3643 #: builtin/notes.c:1033
3644 msgid "too many parameters"
3647 #: builtin/notes.c:513 builtin/notes.c:772
3649 msgid "No note found for object %s."
3652 #: builtin/notes.c:580
3655 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
3659 #: builtin/notes.c:585 builtin/notes.c:662
3661 msgid "Overwriting existing notes for object %s\n"
3664 #: builtin/notes.c:635
3665 msgid "too few parameters"
3668 #: builtin/notes.c:656
3671 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
3675 #: builtin/notes.c:668
3677 msgid "Missing notes on source object %s. Cannot copy."
3680 #: builtin/notes.c:717
3683 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
3684 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
3687 #: builtin/notes.c:971
3689 msgid "Object %s has no note\n"
3692 #: builtin/notes.c:1103 builtin/remote.c:1598
3694 msgid "Unknown subcommand: %s"
3697 #: builtin/pack-objects.c:2337
3699 msgid "unsupported index version %s"
3702 #: builtin/pack-objects.c:2341
3704 msgid "bad index version '%s'"
3707 #: builtin/pack-objects.c:2364
3709 msgid "option %s does not accept negative form"
3712 #: builtin/pack-objects.c:2368
3714 msgid "unable to parse value '%s' for option %s"
3717 #: builtin/push.c:45
3718 msgid "tag shorthand without <tag>"
3721 #: builtin/push.c:64
3722 msgid "--delete only accepts plain target ref names"
3725 #: builtin/push.c:99
3728 "To choose either option permanently, see push.default in 'git help config'."
3731 #: builtin/push.c:102
3734 "The upstream branch of your current branch does not match\n"
3735 "the name of your current branch. To push to the upstream branch\n"
3736 "on the remote, use\n"
3738 " git push %s HEAD:%s\n"
3740 "To push to the branch of the same name on the remote, use\n"
3746 #: builtin/push.c:121
3749 "You are not currently on a branch.\n"
3750 "To push the history leading to the current (detached HEAD)\n"
3753 " git push %s HEAD:<name-of-remote-branch>\n"
3756 #: builtin/push.c:128
3759 "The current branch %s has no upstream branch.\n"
3760 "To push the current branch and set the remote as upstream, use\n"
3762 " git push --set-upstream %s %s\n"
3765 #: builtin/push.c:136
3767 msgid "The current branch %s has multiple upstream branches, refusing to push."
3770 #: builtin/push.c:139
3773 "You are pushing to remote '%s', which is not the upstream of\n"
3774 "your current branch '%s', without telling me what to push\n"
3775 "to update which remote branch."
3778 #: builtin/push.c:174
3780 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
3783 #: builtin/push.c:181
3785 "Updates were rejected because the tip of your current branch is behind\n"
3786 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
3787 "before pushing again.\n"
3788 "See the 'Note about fast-forwards' in 'git push --help' for details."
3791 #: builtin/push.c:187
3793 "Updates were rejected because a pushed branch tip is behind its remote\n"
3794 "counterpart. If you did not intend to push that branch, you may want to\n"
3795 "specify branches to push or set the 'push.default' configuration\n"
3796 "variable to 'current' or 'upstream' to push only the current branch."
3799 #: builtin/push.c:193
3801 "Updates were rejected because a pushed branch tip is behind its remote\n"
3802 "counterpart. Check out this branch and merge the remote changes\n"
3803 "(e.g. 'git pull') before pushing again.\n"
3804 "See the 'Note about fast-forwards' in 'git push --help' for details."
3807 #: builtin/push.c:233
3809 msgid "Pushing to %s\n"
3812 #: builtin/push.c:237
3814 msgid "failed to push some refs to '%s'"
3817 #: builtin/push.c:269
3819 msgid "bad repository '%s'"
3822 #: builtin/push.c:270
3824 "No configured push destination.\n"
3825 "Either specify the URL from the command-line or configure a remote "
3826 "repository using\n"
3828 " git remote add <name> <url>\n"
3830 "and then push using the remote name\n"
3832 " git push <name>\n"
3835 #: builtin/push.c:285
3836 msgid "--all and --tags are incompatible"
3839 #: builtin/push.c:286
3840 msgid "--all can't be combined with refspecs"
3843 #: builtin/push.c:291
3844 msgid "--mirror and --tags are incompatible"
3847 #: builtin/push.c:292
3848 msgid "--mirror can't be combined with refspecs"
3851 #: builtin/push.c:297
3852 msgid "--all and --mirror are incompatible"
3855 #: builtin/push.c:385
3856 msgid "--delete is incompatible with --all, --mirror and --tags"
3859 #: builtin/push.c:387
3860 msgid "--delete doesn't make sense without any refs"
3863 #: builtin/remote.c:98
3868 #: builtin/remote.c:130
3870 "--mirror is dangerous and deprecated; please\n"
3871 "\t use --mirror=fetch or --mirror=push instead"
3874 #: builtin/remote.c:147
3876 msgid "unknown mirror argument: %s"
3879 #: builtin/remote.c:185
3880 msgid "specifying a master branch makes no sense with --mirror"
3883 #: builtin/remote.c:187
3884 msgid "specifying branches to track makes sense only with fetch mirrors"
3887 #: builtin/remote.c:195 builtin/remote.c:646
3889 msgid "remote %s already exists."
3892 #: builtin/remote.c:199 builtin/remote.c:650
3894 msgid "'%s' is not a valid remote name"
3897 #: builtin/remote.c:243
3899 msgid "Could not setup master '%s'"
3902 #: builtin/remote.c:299
3904 msgid "more than one %s"
3907 #: builtin/remote.c:339
3909 msgid "Could not get fetch map for refspec %s"
3912 #: builtin/remote.c:440 builtin/remote.c:448
3916 #: builtin/remote.c:452
3920 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
3922 msgid "Could not append '%s' to '%s'"
3925 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
3927 msgid "No such remote: %s"
3930 #: builtin/remote.c:656
3932 msgid "Could not rename config section '%s' to '%s'"
3935 #: builtin/remote.c:662 builtin/remote.c:799
3937 msgid "Could not remove config section '%s'"
3940 #: builtin/remote.c:677
3943 "Not updating non-default fetch refspec\n"
3945 "\tPlease update the configuration manually if necessary."
3948 #: builtin/remote.c:683
3950 msgid "Could not append '%s'"
3953 #: builtin/remote.c:694
3955 msgid "Could not set '%s'"
3958 #: builtin/remote.c:716
3960 msgid "deleting '%s' failed"
3963 #: builtin/remote.c:750
3965 msgid "creating '%s' failed"
3968 #: builtin/remote.c:764
3970 msgid "Could not remove branch %s"
3973 #: builtin/remote.c:834
3975 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
3976 "to delete it, use:"
3978 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
3979 "to delete them, use:"
3983 #: builtin/remote.c:943
3985 msgid " new (next fetch will store in remotes/%s)"
3988 #: builtin/remote.c:946
3992 #: builtin/remote.c:948
3993 msgid " stale (use 'git remote prune' to remove)"
3996 #: builtin/remote.c:950
4000 #: builtin/remote.c:991
4002 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
4005 #: builtin/remote.c:998
4007 msgid "rebases onto remote %s"
4010 #: builtin/remote.c:1001
4012 msgid " merges with remote %s"
4015 #: builtin/remote.c:1002
4016 msgid " and with remote"
4019 #: builtin/remote.c:1004
4021 msgid "merges with remote %s"
4024 #: builtin/remote.c:1005
4025 msgid " and with remote"
4028 #: builtin/remote.c:1051
4032 #: builtin/remote.c:1054
4036 #: builtin/remote.c:1058
4040 #: builtin/remote.c:1061
4041 msgid "fast-forwardable"
4044 #: builtin/remote.c:1064
4045 msgid "local out of date"
4048 #: builtin/remote.c:1071
4050 msgid " %-*s forces to %-*s (%s)"
4053 #: builtin/remote.c:1074
4055 msgid " %-*s pushes to %-*s (%s)"
4058 #: builtin/remote.c:1078
4060 msgid " %-*s forces to %s"
4063 #: builtin/remote.c:1081
4065 msgid " %-*s pushes to %s"
4068 #: builtin/remote.c:1118
4073 #: builtin/remote.c:1119
4075 msgid " Fetch URL: %s"
4078 #: builtin/remote.c:1120 builtin/remote.c:1285
4082 #: builtin/remote.c:1129 builtin/remote.c:1131
4084 msgid " Push URL: %s"
4087 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
4089 msgid " HEAD branch: %s"
4092 #: builtin/remote.c:1139
4095 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
4098 #: builtin/remote.c:1151
4100 msgid " Remote branch:%s"
4101 msgid_plural " Remote branches:%s"
4105 #: builtin/remote.c:1154 builtin/remote.c:1181
4106 msgid " (status not queried)"
4109 #: builtin/remote.c:1163
4110 msgid " Local branch configured for 'git pull':"
4111 msgid_plural " Local branches configured for 'git pull':"
4115 #: builtin/remote.c:1171
4116 msgid " Local refs will be mirrored by 'git push'"
4119 #: builtin/remote.c:1178
4121 msgid " Local ref configured for 'git push'%s:"
4122 msgid_plural " Local refs configured for 'git push'%s:"
4126 #: builtin/remote.c:1216
4127 msgid "Cannot determine remote HEAD"
4130 #: builtin/remote.c:1218
4131 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
4134 #: builtin/remote.c:1228
4136 msgid "Could not delete %s"
4139 #: builtin/remote.c:1236
4141 msgid "Not a valid ref: %s"
4144 #: builtin/remote.c:1238
4146 msgid "Could not setup %s"
4149 #: builtin/remote.c:1274
4151 msgid " %s will become dangling!"
4154 #: builtin/remote.c:1275
4156 msgid " %s has become dangling!"
4159 #: builtin/remote.c:1281
4164 #: builtin/remote.c:1282
4169 #: builtin/remote.c:1295
4171 msgid " * [would prune] %s"
4174 #: builtin/remote.c:1298
4176 msgid " * [pruned] %s"
4179 #: builtin/remote.c:1387 builtin/remote.c:1461
4181 msgid "No such remote '%s'"
4184 #: builtin/remote.c:1414
4185 msgid "no remote specified"
4188 #: builtin/remote.c:1447
4189 msgid "--add --delete doesn't make sense"
4192 #: builtin/remote.c:1487
4194 msgid "Invalid old URL pattern: %s"
4197 #: builtin/remote.c:1495
4199 msgid "No such URL found: %s"
4202 #: builtin/remote.c:1497
4203 msgid "Will not delete all non-push URLs"
4206 #: builtin/reset.c:33
4210 #: builtin/reset.c:33
4214 #: builtin/reset.c:33
4218 #: builtin/reset.c:33
4222 #: builtin/reset.c:33
4226 #: builtin/reset.c:77
4227 msgid "You do not have a valid HEAD."
4230 #: builtin/reset.c:79
4231 msgid "Failed to find tree of HEAD."
4234 #: builtin/reset.c:85
4236 msgid "Failed to find tree of %s."
4239 #: builtin/reset.c:96
4240 msgid "Could not write new index file."
4243 #: builtin/reset.c:106
4245 msgid "HEAD is now at %s"
4248 #: builtin/reset.c:130
4249 msgid "Could not read index"
4252 #: builtin/reset.c:133
4253 msgid "Unstaged changes after reset:"
4256 #: builtin/reset.c:223
4258 msgid "Cannot do a %s reset in the middle of a merge."
4261 #: builtin/reset.c:297
4263 msgid "Could not parse object '%s'."
4266 #: builtin/reset.c:302
4267 msgid "--patch is incompatible with --{hard,mixed,soft}"
4270 #: builtin/reset.c:311
4271 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
4274 #: builtin/reset.c:313
4276 msgid "Cannot do %s reset with paths."
4279 #: builtin/reset.c:325
4281 msgid "%s reset is not allowed in a bare repository"
4284 #: builtin/reset.c:341
4286 msgid "Could not reset index file to revision '%s'."
4289 #: builtin/revert.c:70 builtin/revert.c:92
4291 msgid "%s: %s cannot be used with %s"
4294 #: builtin/revert.c:131
4295 msgid "program error"
4298 #: builtin/revert.c:221
4299 msgid "revert failed"
4302 #: builtin/revert.c:236
4303 msgid "cherry-pick failed"
4309 "'%s' has staged content different from both the file and the HEAD\n"
4310 "(use -f to force removal)"
4316 "'%s' has changes staged in the index\n"
4317 "(use --cached to keep the file, or -f to force removal)"
4323 "'%s' has local modifications\n"
4324 "(use --cached to keep the file, or -f to force removal)"
4329 msgid "not removing '%s' recursively without -r"
4334 msgid "git rm: unable to remove %s"
4337 #: builtin/shortlog.c:157
4339 msgid "Missing author: %s"
4344 msgid "malformed object at '%s'"
4347 #: builtin/tag.c:207
4349 msgid "tag name too long: %.*s..."
4352 #: builtin/tag.c:212
4354 msgid "tag '%s' not found."
4357 #: builtin/tag.c:227
4359 msgid "Deleted tag '%s' (was %s)\n"
4362 #: builtin/tag.c:239
4364 msgid "could not verify the tag '%s'"
4367 #: builtin/tag.c:249
4371 "# Write a tag message\n"
4372 "# Lines starting with '#' will be ignored.\n"
4376 #: builtin/tag.c:256
4380 "# Write a tag message\n"
4381 "# Lines starting with '#' will be kept; you may remove them yourself if you "
4386 #: builtin/tag.c:298
4387 msgid "unable to sign the tag"
4390 #: builtin/tag.c:300
4391 msgid "unable to write tag file"
4394 #: builtin/tag.c:325
4395 msgid "bad object type."
4398 #: builtin/tag.c:338
4399 msgid "tag header too big."
4402 #: builtin/tag.c:370
4403 msgid "no tag message?"
4406 #: builtin/tag.c:376
4408 msgid "The tag message has been left in %s\n"
4411 #: builtin/tag.c:425
4412 msgid "switch 'points-at' requires an object"
4415 #: builtin/tag.c:427
4417 msgid "malformed object name '%s'"
4420 #: builtin/tag.c:506
4421 msgid "--column and -n are incompatible"
4424 #: builtin/tag.c:523
4425 msgid "-n option is only allowed with -l."
4428 #: builtin/tag.c:525
4429 msgid "--contains option is only allowed with -l."
4432 #: builtin/tag.c:527
4433 msgid "--points-at option is only allowed with -l."
4436 #: builtin/tag.c:535
4437 msgid "only one -F or -m option is allowed."
4440 #: builtin/tag.c:555
4441 msgid "too many params"
4444 #: builtin/tag.c:561
4446 msgid "'%s' is not a valid tag name."
4449 #: builtin/tag.c:566
4451 msgid "tag '%s' already exists"
4454 #: builtin/tag.c:584
4456 msgid "%s: cannot lock the ref"
4459 #: builtin/tag.c:586
4461 msgid "%s: cannot update the ref"
4464 #: builtin/tag.c:588
4466 msgid "Updated tag '%s' (was %s)\n"
4470 msgid "See 'git help <command>' for more information on a specific command."
4473 #: parse-options.h:133 parse-options.h:235
4477 #: parse-options.h:141
4481 #: parse-options.h:149
4485 #: parse-options.h:151
4489 #: parse-options.h:156
4490 msgid "no-op (backward compatibility)"
4493 #: parse-options.h:228
4494 msgid "be more verbose"
4497 #: parse-options.h:230
4498 msgid "be more quiet"
4501 #: parse-options.h:236
4502 msgid "use <n> digits to display SHA-1s"
4506 msgid "Add file contents to the index"
4510 msgid "Find by binary search the change that introduced a bug"
4514 msgid "List, create, or delete branches"
4518 msgid "Checkout a branch or paths to the working tree"
4522 msgid "Clone a repository into a new directory"
4526 msgid "Record changes to the repository"
4530 msgid "Show changes between commits, commit and working tree, etc"
4534 msgid "Download objects and refs from another repository"
4538 msgid "Print lines matching a pattern"
4542 msgid "Create an empty git repository or reinitialize an existing one"
4546 msgid "Show commit logs"
4550 msgid "Join two or more development histories together"
4554 msgid "Move or rename a file, a directory, or a symlink"
4558 msgid "Fetch from and merge with another repository or a local branch"
4562 msgid "Update remote refs along with associated objects"
4566 msgid "Forward-port local commits to the updated upstream head"
4570 msgid "Reset current HEAD to the specified state"
4574 msgid "Remove files from the working tree and from the index"
4578 msgid "Show various types of objects"
4582 msgid "Show the working tree status"
4586 msgid "Create, list, delete or verify a tag object signed with GPG"
4590 msgid "You need to set your committer info first"
4595 "You seem to have moved HEAD since the last 'am' failure.\n"
4596 "Not rewinding to ORIG_HEAD"
4602 "When you have resolved this problem run \"$cmdline --resolved\".\n"
4603 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
4604 "To restore the original branch and stop patching run \"$cmdline --abort\"."
4608 msgid "Cannot fall back to three-way merge."
4612 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4617 "Did you hand edit your patch?\n"
4618 "It does not apply to blobs recorded in its index."
4622 msgid "Falling back to patching base and 3-way merge..."
4626 msgid "Only one StGIT patch series can be applied at once"
4631 msgid "Patch format $patch_format is not supported."
4635 msgid "Patch format detection failed."
4639 msgid "-d option is no longer supported. Do not use."
4644 msgid "previous rebase directory $dotest still exists but mbox given."
4648 msgid "Please make up your mind. --skip or --abort?"
4652 msgid "Resolve operation not in progress, we are not resuming."
4657 msgid "Dirty index: cannot apply patches (dirty: $files)"
4663 "Patch is empty. Was it split wrong?\n"
4664 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
4665 "To restore the original branch and stop patching run \"$cmdline --abort\"."
4669 msgid "Patch does not have a valid e-mail address."
4673 msgid "cannot be interactive without stdin connected to a terminal."
4677 msgid "Commit Body is:"
4680 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
4681 #. in your translation. The program will only accept English
4682 #. input at this point.
4684 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
4689 msgid "Applying: $FIRSTLINE"
4694 "No changes - did you forget to use 'git add'?\n"
4695 "If there is nothing left to stage, chances are that something else\n"
4696 "already introduced the same changes; you might want to skip this patch."
4701 "You still have unmerged paths in your index\n"
4702 "did you forget to use 'git add'?"
4706 msgid "No changes -- Patch already applied."
4711 msgid "Patch failed at $msgnum $FIRSTLINE"
4715 msgid "applying to an empty history"
4719 msgid "You need to start by \"git bisect start\""
4722 #. TRANSLATORS: Make sure to include [Y] and [n] in your
4723 #. translation. The program will only accept English input
4726 msgid "Do you want me to do it for you [Y/n]? "
4731 msgid "unrecognised option: '$arg'"
4736 msgid "'$arg' does not appear to be a valid revision"
4739 #: git-bisect.sh:117
4740 msgid "Bad HEAD - I need a HEAD"
4743 #: git-bisect.sh:130
4746 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
4749 #: git-bisect.sh:140
4750 msgid "won't bisect on seeked tree"
4753 #: git-bisect.sh:144
4754 msgid "Bad HEAD - strange symbolic ref"
4757 #: git-bisect.sh:189
4759 msgid "Bad bisect_write argument: $state"
4762 #: git-bisect.sh:218
4764 msgid "Bad rev input: $arg"
4767 #: git-bisect.sh:232
4768 msgid "Please call 'bisect_state' with at least one argument."
4771 #: git-bisect.sh:244
4773 msgid "Bad rev input: $rev"
4776 #: git-bisect.sh:250
4777 msgid "'git bisect bad' can take only one argument."
4780 #. have bad but not good. we could bisect although
4781 #. this is less optimum.
4782 #: git-bisect.sh:273
4783 msgid "Warning: bisecting only with a bad commit."
4786 #. TRANSLATORS: Make sure to include [Y] and [n] in your
4787 #. translation. The program will only accept English input
4789 #: git-bisect.sh:279
4790 msgid "Are you sure [Y/n]? "
4793 #: git-bisect.sh:289
4795 "You need to give me at least one good and one bad revisions.\n"
4796 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
4799 #: git-bisect.sh:292
4801 "You need to start by \"git bisect start\".\n"
4802 "You then need to give me at least one good and one bad revisions.\n"
4803 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
4806 #: git-bisect.sh:347 git-bisect.sh:474
4807 msgid "We are not bisecting."
4810 #: git-bisect.sh:354
4812 msgid "'$invalid' is not a valid commit"
4815 #: git-bisect.sh:363
4818 "Could not check out original HEAD '$branch'.\n"
4819 "Try 'git bisect reset <commit>'."
4822 #: git-bisect.sh:390
4823 msgid "No logfile given"
4826 #: git-bisect.sh:391
4828 msgid "cannot read $file for replaying"
4831 #: git-bisect.sh:408
4832 msgid "?? what are you talking about?"
4835 #: git-bisect.sh:420
4837 msgid "running $command"
4840 #: git-bisect.sh:427
4843 "bisect run failed:\n"
4844 "exit code $res from '$command' is < 0 or >= 128"
4847 #: git-bisect.sh:453
4848 msgid "bisect run cannot continue any more"
4851 #: git-bisect.sh:459
4854 "bisect run failed:\n"
4855 "'bisect_state $state' exited with error code $res"
4858 #: git-bisect.sh:466
4859 msgid "bisect run success"
4864 "Pull is not possible because you have unmerged files.\n"
4865 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
4866 "as appropriate to mark resolution, or use 'git commit -a'."
4870 msgid "Pull is not possible because you have unmerged files."
4874 msgid "updating an unborn branch with changes added to the index"
4877 #. The fetch involved updating the current branch.
4878 #. The working tree and the index file is still based on the
4879 #. $orig_head commit, but we are merging into $curr_head.
4880 #. First update the working tree to match $curr_head.
4884 "Warning: fetch updated the current branch head.\n"
4885 "Warning: fast-forwarding your working tree from\n"
4886 "Warning: commit $orig_head."
4890 msgid "Cannot merge multiple branches into empty head"
4894 msgid "Cannot rebase onto multiple branches"
4898 msgid "git stash clear with parameters is unimplemented"
4902 msgid "You do not have the initial commit yet"
4906 msgid "Cannot save the current index state"
4909 #: git-stash.sh:123 git-stash.sh:136
4910 msgid "Cannot save the current worktree state"
4914 msgid "No changes selected"
4918 msgid "Cannot remove temporary index (can't happen)"
4922 msgid "Cannot record working tree state"
4925 #. TRANSLATORS: $option is an invalid option, like
4926 #. `--blah-blah'. The 7 spaces at the beginning of the
4927 #. second line correspond to "error: ". So you should line
4928 #. up the second line with however many characters the
4929 #. translation of "error: " takes in your language. E.g. in
4932 #. $ git stash save --blah-blah 2>&1 | head -n 2
4933 #. error: unknown option for 'stash save': --blah-blah
4934 #. To provide a message, use git stash save -- '--blah-blah'
4938 "error: unknown option for 'stash save': $option\n"
4939 " To provide a message, use git stash save -- '$option'"
4943 msgid "No local changes to save"
4947 msgid "Cannot initialize stash"
4951 msgid "Cannot save the current status"
4955 msgid "Cannot remove worktree changes"
4959 msgid "No stash found."
4964 msgid "Too many revisions specified: $REV"
4969 msgid "$reference is not valid reference"
4974 msgid "'$args' is not a stash-like commit"
4979 msgid "'$args' is not a stash reference"
4983 msgid "unable to refresh index"
4987 msgid "Cannot apply a stash in the middle of a merge"
4991 msgid "Conflicts in index. Try without --index."
4995 msgid "Could not save index tree"
4999 msgid "Cannot unstage modified files"
5003 msgid "Index was not unstashed."
5008 msgid "Dropped ${REV} ($s)"
5013 msgid "${REV}: Could not drop stash entry"
5017 msgid "No branch name specified"
5021 msgid "(To restore them type \"git stash apply\")"
5024 #: git-submodule.sh:56
5026 msgid "cannot strip one component off url '$remoteurl'"
5029 #: git-submodule.sh:109
5031 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5034 #: git-submodule.sh:150
5036 msgid "Clone of '$url' into submodule path '$sm_path' failed"
5039 #: git-submodule.sh:160
5041 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5044 #: git-submodule.sh:249
5046 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5049 #: git-submodule.sh:266
5051 msgid "'$sm_path' already exists in the index"
5054 #: git-submodule.sh:270
5057 "The following path is ignored by one of your .gitignore files:\n"
5059 "Use -f if you really want to add it."
5062 #: git-submodule.sh:281
5064 msgid "Adding existing repo at '$sm_path' to the index"
5067 #: git-submodule.sh:283
5069 msgid "'$sm_path' already exists and is not a valid git repo"
5072 #: git-submodule.sh:297
5074 msgid "Unable to checkout submodule '$sm_path'"
5077 #: git-submodule.sh:302
5079 msgid "Failed to add submodule '$sm_path'"
5082 #: git-submodule.sh:307
5084 msgid "Failed to register submodule '$sm_path'"
5087 #: git-submodule.sh:349
5089 msgid "Entering '$prefix$sm_path'"
5092 #: git-submodule.sh:363
5094 msgid "Stopping at '$sm_path'; script returned non-zero status."
5097 #: git-submodule.sh:406
5099 msgid "No url found for submodule path '$sm_path' in .gitmodules"
5102 #: git-submodule.sh:415
5104 msgid "Failed to register url for submodule path '$sm_path'"
5107 #: git-submodule.sh:417
5109 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5112 #: git-submodule.sh:425
5114 msgid "Failed to register update mode for submodule path '$sm_path'"
5117 #: git-submodule.sh:524
5120 "Submodule path '$sm_path' not initialized\n"
5121 "Maybe you want to use 'update --init'?"
5124 #: git-submodule.sh:537
5126 msgid "Unable to find current revision in submodule path '$sm_path'"
5129 #: git-submodule.sh:556
5131 msgid "Unable to fetch in submodule path '$sm_path'"
5134 #: git-submodule.sh:570
5136 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5139 #: git-submodule.sh:571
5141 msgid "Submodule path '$sm_path': rebased into '$sha1'"
5144 #: git-submodule.sh:576
5146 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5149 #: git-submodule.sh:577
5151 msgid "Submodule path '$sm_path': merged in '$sha1'"
5154 #: git-submodule.sh:582
5156 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5159 #: git-submodule.sh:583
5161 msgid "Submodule path '$sm_path': checked out '$sha1'"
5164 #: git-submodule.sh:605 git-submodule.sh:928
5166 msgid "Failed to recurse into submodule path '$sm_path'"
5169 #: git-submodule.sh:713
5170 msgid "--cached cannot be used with --files"
5174 #: git-submodule.sh:753
5176 msgid "unexpected mode $mod_dst"
5179 #: git-submodule.sh:771
5181 msgid " Warn: $name doesn't contain commit $sha1_src"
5184 #: git-submodule.sh:774
5186 msgid " Warn: $name doesn't contain commit $sha1_dst"
5189 #: git-submodule.sh:777
5191 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5194 #: git-submodule.sh:802
5198 #: git-submodule.sh:803
5202 #: git-submodule.sh:840
5203 msgid "# Submodules changed but not updated:"
5206 #: git-submodule.sh:842
5207 msgid "# Submodule changes to be committed:"
5210 #: git-submodule.sh:974
5212 msgid "Synchronizing submodule url for '$name'"