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-05-21 08:57+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:697
50 msgid "could not open '%s'"
54 msgid "Repository lacks these prerequisite commits:"
57 #: bundle.c:164 sequencer.c:533 sequencer.c:965 builtin/log.c:289
58 #: builtin/log.c:719 builtin/log.c:1335 builtin/log.c:1554 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:1231 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:741 sequencer.c:824
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:743 sequencer.c:828
566 msgid "Error wrapping up %s."
569 #: sequencer.c:762 sequencer.c:896
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:788 builtin/apply.c:3689
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"
633 msgid "Unmerged paths:"
636 #: wt-status.c:141 wt-status.c:158
638 msgid " (use \"git reset %s <file>...\" to unstage)"
641 #: wt-status.c:143 wt-status.c:160
642 msgid " (use \"git rm --cached <file>...\" to unstage)"
646 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
650 msgid "Changes to be committed:"
654 msgid "Changes not staged for commit:"
658 msgid " (use \"git add <file>...\" to update what will be committed)"
662 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
667 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
671 msgid " (commit or discard the untracked or modified content in submodules)"
681 msgid " (use \"git %s <file>...\" to include in what will be committed)"
689 msgid "both deleted:"
697 msgid "deleted by them:"
701 msgid "added by them:"
705 msgid "deleted by us:"
713 msgid "both modified:"
717 msgid "new commits, "
721 msgid "modified content, "
725 msgid "untracked content, "
735 msgid "copied: %s -> %s"
750 msgid "renamed: %s -> %s"
755 msgid "typechange: %s"
770 msgid "bug: unhandled diff status %c"
778 msgid "Not currently on any branch."
782 msgid "Initial commit"
795 msgid "Untracked files not listed%s"
799 msgid " (use -u option to show untracked files)"
808 msgid "no changes added to commit%s\n"
812 msgid " (use \"git add\" and/or \"git commit -a\")"
817 msgid "nothing added to commit but untracked files present%s\n"
821 msgid " (use \"git add\" to track)"
824 #: wt-status.c:793 wt-status.c:796 wt-status.c:799
826 msgid "nothing to commit%s\n"
830 msgid " (create/copy files and use \"git add\" to track)"
834 msgid " (use -u to show untracked files)"
838 msgid " (working directory clean)"
842 msgid "HEAD (no branch)"
846 msgid "Initial commit on "
853 #: wt-status.c:932 wt-status.c:935
863 msgid "unexpected diff status %c"
866 #: builtin/add.c:67 builtin/commit.c:226
867 msgid "updating files failed"
872 msgid "remove '%s'\n"
877 msgid "Path '%s' is in submodule '%.*s'"
881 msgid "Unstaged changes after refreshing the index:"
884 #: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
886 msgid "pathspec '%s' did not match any files"
891 msgid "'%s' is beyond a symbolic link"
895 msgid "Could not read the index"
900 msgid "Could not open '%s' for writing."
904 msgid "Could not write patch"
909 msgid "Could not stat '%s'"
913 msgid "Empty patch. Aborted."
918 msgid "Could not apply '%s'"
922 msgid "The following paths are ignored by one of your .gitignore files:\n"
927 msgid "Use -f if you really want to add them.\n"
931 msgid "no files added"
935 msgid "adding files failed"
939 msgid "-A and -u are mutually incompatible"
943 msgid "Option --ignore-missing can only be used together with --dry-run"
948 msgid "Nothing specified, nothing added.\n"
953 msgid "Maybe you wanted to say 'git add .'?\n"
956 #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
958 msgid "index file corrupt"
961 #: builtin/add.c:476 builtin/apply.c:4100 builtin/mv.c:229 builtin/rm.c:260
962 msgid "Unable to write new index file"
965 #: builtin/apply.c:53
966 msgid "git apply [options] [<patch>...]"
969 #: builtin/apply.c:106
971 msgid "unrecognized whitespace option '%s'"
974 #: builtin/apply.c:121
976 msgid "unrecognized whitespace ignore option '%s'"
979 #: builtin/apply.c:815
981 msgid "Cannot prepare timestamp regexp %s"
984 #: builtin/apply.c:824
986 msgid "regexec returned %d for input: %s"
989 #: builtin/apply.c:905
991 msgid "unable to find filename in patch at line %d"
994 #: builtin/apply.c:937
996 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
999 #: builtin/apply.c:941
1001 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1004 #: builtin/apply.c:942
1006 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1009 #: builtin/apply.c:949
1011 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1014 #: builtin/apply.c:1394
1016 msgid "recount: unexpected line: %.*s"
1019 #: builtin/apply.c:1451
1021 msgid "patch fragment without header at line %d: %.*s"
1024 #: builtin/apply.c:1468
1027 "git diff header lacks filename information when removing %d leading pathname "
1028 "component (line %d)"
1030 "git diff header lacks filename information when removing %d leading pathname "
1031 "components (line %d)"
1035 #: builtin/apply.c:1628
1036 msgid "new file depends on old contents"
1039 #: builtin/apply.c:1630
1040 msgid "deleted file still has contents"
1043 #: builtin/apply.c:1656
1045 msgid "corrupt patch at line %d"
1048 #: builtin/apply.c:1692
1050 msgid "new file %s depends on old contents"
1053 #: builtin/apply.c:1694
1055 msgid "deleted file %s still has contents"
1058 #: builtin/apply.c:1697
1060 msgid "** warning: file %s becomes empty but is not deleted"
1063 #: builtin/apply.c:1843
1065 msgid "corrupt binary patch at line %d: %.*s"
1068 #. there has to be one hunk (forward hunk)
1069 #: builtin/apply.c:1872
1071 msgid "unrecognized binary patch at line %d"
1074 #: builtin/apply.c:1958
1076 msgid "patch with only garbage at line %d"
1079 #: builtin/apply.c:2048
1081 msgid "unable to read symlink %s"
1084 #: builtin/apply.c:2052
1086 msgid "unable to open or read %s"
1089 #: builtin/apply.c:2123
1093 #: builtin/apply.c:2645
1095 msgid "invalid start of line: '%c'"
1098 #: builtin/apply.c:2763
1100 msgid "Hunk #%d succeeded at %d (offset %d line)."
1101 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1105 #: builtin/apply.c:2775
1107 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1110 #: builtin/apply.c:2781
1113 "while searching for:\n"
1117 #: builtin/apply.c:2800
1119 msgid "missing binary patch data for '%s'"
1122 #: builtin/apply.c:2903
1124 msgid "binary patch does not apply to '%s'"
1127 #: builtin/apply.c:2909
1129 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1132 #: builtin/apply.c:2930
1134 msgid "patch failed: %s:%ld"
1137 #: builtin/apply.c:3045
1139 msgid "patch %s has been renamed/deleted"
1142 #: builtin/apply.c:3052 builtin/apply.c:3069
1144 msgid "read of %s failed"
1147 #: builtin/apply.c:3084
1148 msgid "removal patch leaves file contents"
1151 #: builtin/apply.c:3105
1153 msgid "%s: already exists in working directory"
1156 #: builtin/apply.c:3143
1158 msgid "%s: has been deleted/renamed"
1161 #: builtin/apply.c:3148 builtin/apply.c:3179
1166 #: builtin/apply.c:3159
1168 msgid "%s: does not exist in index"
1171 #: builtin/apply.c:3173
1173 msgid "%s: does not match index"
1176 #: builtin/apply.c:3190
1178 msgid "%s: wrong type"
1181 #: builtin/apply.c:3192
1183 msgid "%s has type %o, expected %o"
1186 #: builtin/apply.c:3247
1188 msgid "%s: already exists in index"
1191 #: builtin/apply.c:3266
1193 msgid "new mode (%o) of %s does not match old mode (%o)%s%s"
1196 #: builtin/apply.c:3272
1198 msgid "%s: patch does not apply"
1201 #: builtin/apply.c:3285
1203 msgid "Checking patch %s..."
1206 #: builtin/apply.c:3340 builtin/checkout.c:212 builtin/reset.c:158
1208 msgid "make_cache_entry failed for path '%s'"
1211 #: builtin/apply.c:3483
1213 msgid "unable to remove %s from index"
1216 #: builtin/apply.c:3510
1218 msgid "corrupt patch for subproject %s"
1221 #: builtin/apply.c:3514
1223 msgid "unable to stat newly created file '%s'"
1226 #: builtin/apply.c:3519
1228 msgid "unable to create backing store for newly created file %s"
1231 #: builtin/apply.c:3522
1233 msgid "unable to add cache entry for %s"
1236 #: builtin/apply.c:3555
1238 msgid "closing file '%s'"
1241 #: builtin/apply.c:3604
1243 msgid "unable to write file '%s' mode %o"
1246 #: builtin/apply.c:3660
1248 msgid "Applied patch %s cleanly."
1251 #: builtin/apply.c:3668
1252 msgid "internal error"
1255 #. Say this even without --verbose
1256 #: builtin/apply.c:3671
1258 msgid "Applying patch %%s with %d reject..."
1259 msgid_plural "Applying patch %%s with %d rejects..."
1263 #: builtin/apply.c:3681
1265 msgid "truncating .rej filename to %.*s.rej"
1268 #: builtin/apply.c:3702
1270 msgid "Hunk #%d applied cleanly."
1273 #: builtin/apply.c:3705
1275 msgid "Rejected hunk #%d."
1278 #: builtin/apply.c:3836
1279 msgid "unrecognized input"
1282 #: builtin/apply.c:3847
1283 msgid "unable to read index file"
1286 #: builtin/apply.c:3962 builtin/apply.c:3965
1290 #: builtin/apply.c:3963
1291 msgid "don't apply changes matching the given path"
1294 #: builtin/apply.c:3966
1295 msgid "apply changes matching the given path"
1298 #: builtin/apply.c:3968
1302 #: builtin/apply.c:3969
1303 msgid "remove <num> leading slashes from traditional diff paths"
1306 #: builtin/apply.c:3972
1307 msgid "ignore additions made by the patch"
1310 #: builtin/apply.c:3974
1311 msgid "instead of applying the patch, output diffstat for the input"
1314 #: builtin/apply.c:3978
1315 msgid "shows number of added and deleted lines in decimal notation"
1318 #: builtin/apply.c:3980
1319 msgid "instead of applying the patch, output a summary for the input"
1322 #: builtin/apply.c:3982
1323 msgid "instead of applying the patch, see if the patch is applicable"
1326 #: builtin/apply.c:3984
1327 msgid "make sure the patch is applicable to the current index"
1330 #: builtin/apply.c:3986
1331 msgid "apply a patch without touching the working tree"
1334 #: builtin/apply.c:3988
1335 msgid "also apply the patch (use with --stat/--summary/--check)"
1338 #: builtin/apply.c:3990
1339 msgid "build a temporary index based on embedded index information"
1342 #: builtin/apply.c:3992
1343 msgid "paths are separated with NUL character"
1346 #: builtin/apply.c:3995
1347 msgid "ensure at least <n> lines of context match"
1350 #: builtin/apply.c:3996
1354 #: builtin/apply.c:3997
1355 msgid "detect new or modified lines that have whitespace errors"
1358 #: builtin/apply.c:4000 builtin/apply.c:4003
1359 msgid "ignore changes in whitespace when finding context"
1362 #: builtin/apply.c:4006
1363 msgid "apply the patch in reverse"
1366 #: builtin/apply.c:4008
1367 msgid "don't expect at least one line of context"
1370 #: builtin/apply.c:4010
1371 msgid "leave the rejected hunks in corresponding *.rej files"
1374 #: builtin/apply.c:4012
1375 msgid "allow overlapping hunks"
1378 #: builtin/apply.c:4013
1382 #: builtin/apply.c:4015
1383 msgid "tolerate incorrectly detected missing new-line at the end of file"
1386 #: builtin/apply.c:4018
1387 msgid "do not trust the line counts in the hunk headers"
1390 #: builtin/apply.c:4020
1394 #: builtin/apply.c:4021
1395 msgid "prepend <root> to all filenames"
1398 #: builtin/apply.c:4042
1399 msgid "--index outside a repository"
1402 #: builtin/apply.c:4045
1403 msgid "--cached outside a repository"
1406 #: builtin/apply.c:4061
1408 msgid "can't open patch '%s'"
1411 #: builtin/apply.c:4075
1413 msgid "squelched %d whitespace error"
1414 msgid_plural "squelched %d whitespace errors"
1418 #: builtin/apply.c:4081 builtin/apply.c:4091
1420 msgid "%d line adds whitespace errors."
1421 msgid_plural "%d lines add whitespace errors."
1425 #: builtin/archive.c:17
1427 msgid "could not create archive file '%s'"
1430 #: builtin/archive.c:20
1431 msgid "could not redirect output"
1434 #: builtin/archive.c:37
1435 msgid "git archive: Remote with no URL"
1438 #: builtin/archive.c:58
1439 msgid "git archive: expected ACK/NAK, got EOF"
1442 #: builtin/archive.c:63
1444 msgid "git archive: NACK %s"
1447 #: builtin/archive.c:65
1449 msgid "remote error: %s"
1452 #: builtin/archive.c:66
1453 msgid "git archive: protocol error"
1456 #: builtin/archive.c:71
1457 msgid "git archive: expected a flush"
1460 #: builtin/branch.c:144
1463 "deleting branch '%s' that has been merged to\n"
1464 " '%s', but not yet merged to HEAD."
1467 #: builtin/branch.c:148
1470 "not deleting branch '%s' that is not yet merged to\n"
1471 " '%s', even though it is merged to HEAD."
1474 #: builtin/branch.c:180
1475 msgid "cannot use -a with -d"
1478 #: builtin/branch.c:186
1479 msgid "Couldn't look up commit object for HEAD"
1482 #: builtin/branch.c:191
1484 msgid "Cannot delete the branch '%s' which you are currently on."
1487 #: builtin/branch.c:202
1489 msgid "remote branch '%s' not found."
1492 #: builtin/branch.c:203
1494 msgid "branch '%s' not found."
1497 #: builtin/branch.c:210
1499 msgid "Couldn't look up commit object for '%s'"
1502 #: builtin/branch.c:216
1505 "The branch '%s' is not fully merged.\n"
1506 "If you are sure you want to delete it, run 'git branch -D %s'."
1509 #: builtin/branch.c:225
1511 msgid "Error deleting remote branch '%s'"
1514 #: builtin/branch.c:226
1516 msgid "Error deleting branch '%s'"
1519 #: builtin/branch.c:233
1521 msgid "Deleted remote branch %s (was %s).\n"
1524 #: builtin/branch.c:234
1526 msgid "Deleted branch %s (was %s).\n"
1529 #: builtin/branch.c:239
1530 msgid "Update of config-file failed"
1533 #: builtin/branch.c:337
1535 msgid "branch '%s' does not point at a commit"
1538 #: builtin/branch.c:409
1540 msgid "[%s: behind %d]"
1543 #: builtin/branch.c:411
1548 #: builtin/branch.c:415
1550 msgid "[%s: ahead %d]"
1553 #: builtin/branch.c:417
1558 #: builtin/branch.c:420
1560 msgid "[%s: ahead %d, behind %d]"
1563 #: builtin/branch.c:423
1565 msgid "[ahead %d, behind %d]"
1568 #: builtin/branch.c:535
1572 #: builtin/branch.c:600
1573 msgid "some refs could not be read"
1576 #: builtin/branch.c:613
1577 msgid "cannot rename the current branch while not on any."
1580 #: builtin/branch.c:623
1582 msgid "Invalid branch name: '%s'"
1585 #: builtin/branch.c:638
1586 msgid "Branch rename failed"
1589 #: builtin/branch.c:642
1591 msgid "Renamed a misnamed branch '%s' away"
1594 #: builtin/branch.c:646
1596 msgid "Branch renamed to %s, but HEAD is not updated!"
1599 #: builtin/branch.c:653
1600 msgid "Branch is renamed, but update of config-file failed"
1603 #: builtin/branch.c:668
1605 msgid "malformed object name %s"
1608 #: builtin/branch.c:692
1610 msgid "could not write branch description template: %s"
1613 #: builtin/branch.c:783
1614 msgid "Failed to resolve HEAD as a valid ref."
1617 #: builtin/branch.c:788 builtin/clone.c:558
1618 msgid "HEAD not found below refs/heads!"
1621 #: builtin/branch.c:808
1622 msgid "--column and --verbose are incompatible"
1625 #: builtin/branch.c:857
1626 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
1629 #: builtin/bundle.c:47
1631 msgid "%s is okay\n"
1634 #: builtin/bundle.c:56
1635 msgid "Need a repository to create a bundle."
1638 #: builtin/bundle.c:60
1639 msgid "Need a repository to unbundle."
1642 #: builtin/checkout.c:113 builtin/checkout.c:146
1644 msgid "path '%s' does not have our version"
1647 #: builtin/checkout.c:115 builtin/checkout.c:148
1649 msgid "path '%s' does not have their version"
1652 #: builtin/checkout.c:131
1654 msgid "path '%s' does not have all necessary versions"
1657 #: builtin/checkout.c:175
1659 msgid "path '%s' does not have necessary versions"
1662 #: builtin/checkout.c:192
1664 msgid "path '%s': cannot merge"
1667 #: builtin/checkout.c:209
1669 msgid "Unable to add merge result for '%s'"
1672 #: builtin/checkout.c:234 builtin/checkout.c:392
1673 msgid "corrupt index file"
1676 #: builtin/checkout.c:264 builtin/checkout.c:271
1678 msgid "path '%s' is unmerged"
1681 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
1682 #: builtin/merge.c:812
1683 msgid "unable to write new index file"
1686 #: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
1687 msgid "diff_setup_done failed"
1690 #: builtin/checkout.c:414
1691 msgid "you need to resolve your current index first"
1694 #: builtin/checkout.c:533
1696 msgid "Can not do reflog for '%s'\n"
1699 #: builtin/checkout.c:566
1700 msgid "HEAD is now at"
1703 #: builtin/checkout.c:573
1705 msgid "Reset branch '%s'\n"
1708 #: builtin/checkout.c:576
1710 msgid "Already on '%s'\n"
1713 #: builtin/checkout.c:580
1715 msgid "Switched to and reset branch '%s'\n"
1718 #: builtin/checkout.c:582
1720 msgid "Switched to a new branch '%s'\n"
1723 #: builtin/checkout.c:584
1725 msgid "Switched to branch '%s'\n"
1728 #: builtin/checkout.c:640
1730 msgid " ... and %d more.\n"
1733 #. The singular version
1734 #: builtin/checkout.c:646
1737 "Warning: you are leaving %d commit behind, not connected to\n"
1738 "any of your branches:\n"
1742 "Warning: you are leaving %d commits behind, not connected to\n"
1743 "any of your branches:\n"
1749 #: builtin/checkout.c:664
1752 "If you want to keep them by creating a new branch, this may be a good time\n"
1755 " git branch new_branch_name %s\n"
1759 #: builtin/checkout.c:694
1760 msgid "internal error in revision walk"
1763 #: builtin/checkout.c:698
1764 msgid "Previous HEAD position was"
1767 #: builtin/checkout.c:724
1768 msgid "You are on a branch yet to be born"
1772 #: builtin/checkout.c:855
1774 msgid "invalid reference: %s"
1777 #. case (1): want a tree
1778 #: builtin/checkout.c:894
1780 msgid "reference is not a tree: %s"
1783 #: builtin/checkout.c:974
1784 msgid "-B cannot be used with -b"
1787 #: builtin/checkout.c:983
1788 msgid "--patch is incompatible with all other options"
1791 #: builtin/checkout.c:986
1792 msgid "--detach cannot be used with -b/-B/--orphan"
1795 #: builtin/checkout.c:988
1796 msgid "--detach cannot be used with -t"
1799 #: builtin/checkout.c:994
1800 msgid "--track needs a branch name"
1803 #: builtin/checkout.c:1001
1804 msgid "Missing branch name; try -b"
1807 #: builtin/checkout.c:1007
1808 msgid "--orphan and -b|-B are mutually exclusive"
1811 #: builtin/checkout.c:1009
1812 msgid "--orphan cannot be used with -t"
1815 #: builtin/checkout.c:1019
1816 msgid "git checkout: -f and -m are incompatible"
1819 #: builtin/checkout.c:1053
1820 msgid "invalid path specification"
1823 #: builtin/checkout.c:1061
1826 "git checkout: updating paths is incompatible with switching branches.\n"
1827 "Did you intend to checkout '%s' which can not be resolved as commit?"
1830 #: builtin/checkout.c:1063
1831 msgid "git checkout: updating paths is incompatible with switching branches."
1834 #: builtin/checkout.c:1068
1835 msgid "git checkout: --detach does not take a path argument"
1838 #: builtin/checkout.c:1071
1840 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1841 "checking out of the index."
1844 #: builtin/checkout.c:1090
1845 msgid "Cannot switch branch to a non-commit."
1848 #: builtin/checkout.c:1093
1849 msgid "--ours/--theirs is incompatible with switching branches."
1852 #: builtin/clean.c:78
1853 msgid "-x and -X cannot be used together"
1856 #: builtin/clean.c:82
1858 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
1861 #: builtin/clean.c:85
1863 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
1867 #: builtin/clean.c:155 builtin/clean.c:176
1869 msgid "Would remove %s\n"
1872 #: builtin/clean.c:159 builtin/clean.c:179
1874 msgid "Removing %s\n"
1877 #: builtin/clean.c:162 builtin/clean.c:182
1879 msgid "failed to remove %s"
1882 #: builtin/clean.c:166
1884 msgid "Would not remove %s\n"
1887 #: builtin/clean.c:168
1889 msgid "Not removing %s\n"
1892 #: builtin/clone.c:243
1894 msgid "reference repository '%s' is not a local directory."
1897 #: builtin/clone.c:302
1899 msgid "failed to open '%s'"
1902 #: builtin/clone.c:306
1904 msgid "failed to create directory '%s'"
1907 #: builtin/clone.c:308 builtin/diff.c:75
1909 msgid "failed to stat '%s'"
1912 #: builtin/clone.c:310
1914 msgid "%s exists and is not a directory"
1917 #: builtin/clone.c:324
1919 msgid "failed to stat %s\n"
1922 #: builtin/clone.c:341
1924 msgid "failed to unlink '%s'"
1927 #: builtin/clone.c:346
1929 msgid "failed to create link '%s'"
1932 #: builtin/clone.c:350
1934 msgid "failed to copy file to '%s'"
1937 #: builtin/clone.c:373
1942 #: builtin/clone.c:440
1944 msgid "Could not find remote branch %s to clone."
1947 #: builtin/clone.c:549
1948 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
1951 #: builtin/clone.c:639
1952 msgid "Too many arguments."
1955 #: builtin/clone.c:643
1956 msgid "You must specify a repository to clone."
1959 #: builtin/clone.c:654
1961 msgid "--bare and --origin %s options are incompatible."
1964 #: builtin/clone.c:668
1966 msgid "repository '%s' does not exist"
1969 #: builtin/clone.c:673
1970 msgid "--depth is ignored in local clones; use file:// instead."
1973 #: builtin/clone.c:683
1975 msgid "destination path '%s' already exists and is not an empty directory."
1978 #: builtin/clone.c:693
1980 msgid "working tree '%s' already exists."
1983 #: builtin/clone.c:706 builtin/clone.c:720
1985 msgid "could not create leading directories of '%s'"
1988 #: builtin/clone.c:709
1990 msgid "could not create work tree dir '%s'."
1993 #: builtin/clone.c:728
1995 msgid "Cloning into bare repository '%s'...\n"
1998 #: builtin/clone.c:730
2000 msgid "Cloning into '%s'...\n"
2003 #: builtin/clone.c:786
2005 msgid "Don't know how to clone %s"
2008 #: builtin/clone.c:835
2010 msgid "Remote branch %s not found in upstream %s"
2013 #: builtin/clone.c:842
2014 msgid "You appear to have cloned an empty repository."
2017 #: builtin/column.c:51
2018 msgid "--command must be the first argument"
2021 #: builtin/commit.c:43
2023 "Your name and email address were configured automatically based\n"
2024 "on your username and hostname. Please check that they are accurate.\n"
2025 "You can suppress this message by setting them explicitly:\n"
2027 " git config --global user.name \"Your Name\"\n"
2028 " git config --global user.email you@example.com\n"
2030 "After doing this, you may fix the identity used for this commit with:\n"
2032 " git commit --amend --reset-author\n"
2035 #: builtin/commit.c:55
2037 "You asked to amend the most recent commit, but doing so would make\n"
2038 "it empty. You can repeat your command with --allow-empty, or you can\n"
2039 "remove the commit entirely with \"git reset HEAD^\".\n"
2042 #: builtin/commit.c:60
2044 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
2045 "If you wish to commit it anyway, use:\n"
2047 " git commit --allow-empty\n"
2049 "Otherwise, please use 'git reset'\n"
2052 #: builtin/commit.c:253
2053 msgid "failed to unpack HEAD tree object"
2056 #: builtin/commit.c:295
2057 msgid "unable to create temporary index"
2060 #: builtin/commit.c:301
2061 msgid "interactive add failed"
2064 #: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405
2065 msgid "unable to write new_index file"
2068 #: builtin/commit.c:386
2069 msgid "cannot do a partial commit during a merge."
2072 #: builtin/commit.c:388
2073 msgid "cannot do a partial commit during a cherry-pick."
2076 #: builtin/commit.c:398
2077 msgid "cannot read the index"
2080 #: builtin/commit.c:418
2081 msgid "unable to write temporary index file"
2084 #: builtin/commit.c:493 builtin/commit.c:499
2086 msgid "invalid commit: %s"
2089 #: builtin/commit.c:522
2090 msgid "malformed --author parameter"
2093 #: builtin/commit.c:583
2095 msgid "Malformed ident string: '%s'"
2098 #: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:968
2100 msgid "could not lookup commit %s"
2103 #: builtin/commit.c:633 builtin/shortlog.c:296
2105 msgid "(reading log message from standard input)\n"
2108 #: builtin/commit.c:635
2109 msgid "could not read log from standard input"
2112 #: builtin/commit.c:639
2114 msgid "could not read log file '%s'"
2117 #: builtin/commit.c:645
2118 msgid "commit has empty message"
2121 #: builtin/commit.c:661
2122 msgid "could not read MERGE_MSG"
2125 #: builtin/commit.c:665
2126 msgid "could not read SQUASH_MSG"
2129 #: builtin/commit.c:669
2131 msgid "could not read '%s'"
2134 #: builtin/commit.c:721
2135 msgid "could not write commit template"
2138 #: builtin/commit.c:732
2142 "It looks like you may be committing a merge.\n"
2143 "If this is not correct, please remove the file\n"
2148 #: builtin/commit.c:737
2152 "It looks like you may be committing a cherry-pick.\n"
2153 "If this is not correct, please remove the file\n"
2158 #: builtin/commit.c:749
2160 "Please enter the commit message for your changes. Lines starting\n"
2161 "with '#' will be ignored, and an empty message aborts the commit.\n"
2164 #: builtin/commit.c:754
2166 "Please enter the commit message for your changes. Lines starting\n"
2167 "with '#' will be kept; you may remove them yourself if you want to.\n"
2168 "An empty message aborts the commit.\n"
2171 #: builtin/commit.c:767
2173 msgid "%sAuthor: %s"
2176 #: builtin/commit.c:774
2178 msgid "%sCommitter: %s"
2181 #: builtin/commit.c:794
2182 msgid "Cannot read index"
2185 #: builtin/commit.c:831
2186 msgid "Error building trees"
2189 #: builtin/commit.c:846 builtin/tag.c:361
2191 msgid "Please supply the message using either -m or -F option.\n"
2194 #: builtin/commit.c:943
2196 msgid "No existing author found with '%s'"
2199 #: builtin/commit.c:958 builtin/commit.c:1158
2201 msgid "Invalid untracked files mode '%s'"
2204 #: builtin/commit.c:998
2205 msgid "Using both --reset-author and --author does not make sense"
2208 #: builtin/commit.c:1009
2209 msgid "You have nothing to amend."
2212 #: builtin/commit.c:1012
2213 msgid "You are in the middle of a merge -- cannot amend."
2216 #: builtin/commit.c:1014
2217 msgid "You are in the middle of a cherry-pick -- cannot amend."
2220 #: builtin/commit.c:1017
2221 msgid "Options --squash and --fixup cannot be used together"
2224 #: builtin/commit.c:1027
2225 msgid "Only one of -c/-C/-F/--fixup can be used."
2228 #: builtin/commit.c:1029
2229 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
2232 #: builtin/commit.c:1037
2233 msgid "--reset-author can be used only with -C, -c or --amend."
2236 #: builtin/commit.c:1054
2237 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
2240 #: builtin/commit.c:1056
2241 msgid "No paths with --include/--only does not make sense."
2244 #: builtin/commit.c:1058
2245 msgid "Clever... amending the last one with dirty index."
2248 #: builtin/commit.c:1060
2249 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
2252 #: builtin/commit.c:1070 builtin/tag.c:577
2254 msgid "Invalid cleanup mode %s"
2257 #: builtin/commit.c:1075
2258 msgid "Paths with -a does not make sense."
2261 #: builtin/commit.c:1258
2262 msgid "couldn't look up newly created commit"
2265 #: builtin/commit.c:1260
2266 msgid "could not parse newly created commit"
2269 #: builtin/commit.c:1301
2270 msgid "detached HEAD"
2273 #: builtin/commit.c:1303
2274 msgid " (root-commit)"
2277 #: builtin/commit.c:1447
2278 msgid "could not parse HEAD commit"
2281 #: builtin/commit.c:1485 builtin/merge.c:509
2283 msgid "could not open '%s' for reading"
2286 #: builtin/commit.c:1492
2288 msgid "Corrupt MERGE_HEAD file (%s)"
2291 #: builtin/commit.c:1499
2292 msgid "could not read MERGE_MODE"
2295 #: builtin/commit.c:1518
2297 msgid "could not read commit message: %s"
2300 #: builtin/commit.c:1532
2302 msgid "Aborting commit; you did not edit the message.\n"
2305 #: builtin/commit.c:1537
2307 msgid "Aborting commit due to empty commit message.\n"
2310 #: builtin/commit.c:1552 builtin/merge.c:936 builtin/merge.c:961
2311 msgid "failed to write commit object"
2314 #: builtin/commit.c:1573
2315 msgid "cannot lock HEAD ref"
2318 #: builtin/commit.c:1577
2319 msgid "cannot update HEAD ref"
2322 #: builtin/commit.c:1588
2324 "Repository has been updated, but unable to write\n"
2325 "new_index file. Check that disk is not full or quota is\n"
2326 "not exceeded, and then \"git reset HEAD\" to recover."
2329 #: builtin/describe.c:234
2331 msgid "annotated tag %s not available"
2334 #: builtin/describe.c:238
2336 msgid "annotated tag %s has no embedded name"
2339 #: builtin/describe.c:240
2341 msgid "tag '%s' is really '%s' here"
2344 #: builtin/describe.c:267
2346 msgid "Not a valid object name %s"
2349 #: builtin/describe.c:270
2351 msgid "%s is not a valid '%s' object"
2354 #: builtin/describe.c:287
2356 msgid "no tag exactly matches '%s'"
2359 #: builtin/describe.c:289
2361 msgid "searching to describe %s\n"
2364 #: builtin/describe.c:329
2366 msgid "finished search at %s\n"
2369 #: builtin/describe.c:353
2372 "No annotated tags can describe '%s'.\n"
2373 "However, there were unannotated tags: try --tags."
2376 #: builtin/describe.c:357
2379 "No tags can describe '%s'.\n"
2380 "Try --always, or create some tags."
2383 #: builtin/describe.c:378
2385 msgid "traversed %lu commits\n"
2388 #: builtin/describe.c:381
2391 "more than %i tags found; listed %i most recent\n"
2392 "gave up search at %s\n"
2395 #: builtin/describe.c:436
2396 msgid "--long is incompatible with --abbrev=0"
2399 #: builtin/describe.c:462
2400 msgid "No names found, cannot describe anything."
2403 #: builtin/describe.c:482
2404 msgid "--dirty is incompatible with committishes"
2407 #: builtin/diff.c:77
2409 msgid "'%s': not a regular file or symlink"
2412 #: builtin/diff.c:220
2414 msgid "invalid option: %s"
2417 #: builtin/diff.c:297
2418 msgid "Not a git repository"
2421 #: builtin/diff.c:347
2423 msgid "invalid object '%s' given."
2426 #: builtin/diff.c:352
2428 msgid "more than %d trees given: '%s'"
2431 #: builtin/diff.c:362
2433 msgid "more than two blobs given: '%s'"
2436 #: builtin/diff.c:370
2438 msgid "unhandled object '%s' given."
2441 #: builtin/fetch.c:200
2442 msgid "Couldn't find remote ref HEAD"
2445 #: builtin/fetch.c:253
2447 msgid "object %s not found"
2450 #: builtin/fetch.c:259
2451 msgid "[up to date]"
2454 #: builtin/fetch.c:273
2456 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
2459 #: builtin/fetch.c:274 builtin/fetch.c:360
2463 #: builtin/fetch.c:285
2464 msgid "[tag update]"
2467 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
2468 msgid " (unable to update local ref)"
2471 #: builtin/fetch.c:305
2475 #: builtin/fetch.c:308
2476 msgid "[new branch]"
2479 #: builtin/fetch.c:311
2483 #: builtin/fetch.c:356
2484 msgid "unable to update local ref"
2487 #: builtin/fetch.c:356
2488 msgid "forced update"
2491 #: builtin/fetch.c:362
2492 msgid "(non-fast-forward)"
2495 #: builtin/fetch.c:393 builtin/fetch.c:685
2497 msgid "cannot open %s: %s\n"
2500 #: builtin/fetch.c:402
2502 msgid "%s did not send all necessary objects\n"
2505 #: builtin/fetch.c:488
2510 #: builtin/fetch.c:499
2513 "some local refs could not be updated; try running\n"
2514 " 'git remote prune %s' to remove any old, conflicting branches"
2517 #: builtin/fetch.c:549
2519 msgid " (%s will become dangling)"
2522 #: builtin/fetch.c:550
2524 msgid " (%s has become dangling)"
2527 #: builtin/fetch.c:557
2531 #: builtin/fetch.c:558 builtin/remote.c:1055
2535 #: builtin/fetch.c:675
2537 msgid "Refusing to fetch into current branch %s of non-bare repository"
2540 #: builtin/fetch.c:709
2542 msgid "Don't know how to fetch from %s"
2545 #: builtin/fetch.c:786
2547 msgid "Option \"%s\" value \"%s\" is not valid for %s"
2550 #: builtin/fetch.c:789
2552 msgid "Option \"%s\" is ignored for %s\n"
2555 #: builtin/fetch.c:888
2557 msgid "Fetching %s\n"
2560 #: builtin/fetch.c:890 builtin/remote.c:100
2562 msgid "Could not fetch %s"
2565 #: builtin/fetch.c:907
2567 "No remote repository specified. Please, specify either a URL or a\n"
2568 "remote name from which new revisions should be fetched."
2571 #: builtin/fetch.c:927
2572 msgid "You need to specify a tag name."
2575 #: builtin/fetch.c:979
2576 msgid "fetch --all does not take a repository argument"
2579 #: builtin/fetch.c:981
2580 msgid "fetch --all does not make sense with refspecs"
2583 #: builtin/fetch.c:992
2585 msgid "No such remote or remote group: %s"
2588 #: builtin/fetch.c:1000
2589 msgid "Fetching a group and specifying refspecs does not make sense"
2594 msgid "Invalid %s: '%s'"
2599 msgid "insanely long object directory %.*s"
2604 msgid "Auto packing the repository for optimum performance.\n"
2610 "Auto packing the repository for optimum performance. You may also\n"
2611 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
2616 "There are too many unreachable loose objects; run 'git prune' to remove them."
2619 #: builtin/grep.c:216
2621 msgid "grep: failed to create thread: %s"
2624 #: builtin/grep.c:402
2626 msgid "Failed to chdir: %s"
2629 #: builtin/grep.c:478 builtin/grep.c:512
2631 msgid "unable to read tree (%s)"
2634 #: builtin/grep.c:526
2636 msgid "unable to grep from object of type %s"
2639 #: builtin/grep.c:584
2641 msgid "switch `%c' expects a numerical value"
2644 #: builtin/grep.c:601
2646 msgid "cannot open '%s'"
2649 #: builtin/grep.c:888
2650 msgid "no pattern given."
2653 #: builtin/grep.c:902
2655 msgid "bad object %s"
2658 #: builtin/grep.c:943
2659 msgid "--open-files-in-pager only works on the worktree"
2662 #: builtin/grep.c:966
2663 msgid "--cached or --untracked cannot be used with --no-index."
2666 #: builtin/grep.c:971
2667 msgid "--no-index or --untracked cannot be used with revs."
2670 #: builtin/grep.c:974
2671 msgid "--[no-]exclude-standard cannot be used for tracked contents."
2674 #: builtin/grep.c:982
2675 msgid "both --cached and trees are given."
2678 #: builtin/help.c:59
2680 msgid "unrecognized help format '%s'"
2683 #: builtin/help.c:87
2684 msgid "Failed to start emacsclient."
2687 #: builtin/help.c:100
2688 msgid "Failed to parse emacsclient version."
2691 #: builtin/help.c:108
2693 msgid "emacsclient version '%d' too old (< 22)."
2696 #: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
2698 msgid "failed to exec '%s': %s"
2701 #: builtin/help.c:211
2704 "'%s': path for unsupported man viewer.\n"
2705 "Please consider using 'man.<tool>.cmd' instead."
2708 #: builtin/help.c:223
2711 "'%s': cmd for supported man viewer.\n"
2712 "Please consider using 'man.<tool>.path' instead."
2715 #: builtin/help.c:287
2716 msgid "The most commonly used git commands are:"
2719 #: builtin/help.c:355
2721 msgid "'%s': unknown man viewer."
2724 #: builtin/help.c:372
2725 msgid "no man viewer handled the request"
2728 #: builtin/help.c:380
2729 msgid "no info viewer handled the request"
2732 #: builtin/help.c:391
2734 msgid "'%s': not a documentation directory."
2737 #: builtin/help.c:432 builtin/help.c:439
2742 #: builtin/help.c:453
2744 msgid "`git %s' is aliased to `%s'"
2747 #: builtin/index-pack.c:169
2749 msgid "object type mismatch at %s"
2752 #: builtin/index-pack.c:189
2753 msgid "object of unexpected type"
2756 #: builtin/index-pack.c:226
2758 msgid "cannot fill %d byte"
2759 msgid_plural "cannot fill %d bytes"
2763 #: builtin/index-pack.c:236
2767 #: builtin/index-pack.c:237
2768 msgid "read error on input"
2771 #: builtin/index-pack.c:249
2772 msgid "used more bytes than were available"
2775 #: builtin/index-pack.c:256
2776 msgid "pack too large for current definition of off_t"
2779 #: builtin/index-pack.c:272
2781 msgid "unable to create '%s'"
2784 #: builtin/index-pack.c:277
2786 msgid "cannot open packfile '%s'"
2789 #: builtin/index-pack.c:291
2790 msgid "pack signature mismatch"
2793 #: builtin/index-pack.c:311
2795 msgid "pack has bad object at offset %lu: %s"
2798 #: builtin/index-pack.c:405
2800 msgid "inflate returned %d"
2803 #: builtin/index-pack.c:450
2804 msgid "offset value overflow for delta base object"
2807 #: builtin/index-pack.c:458
2808 msgid "delta base offset is out of bound"
2811 #: builtin/index-pack.c:466
2813 msgid "unknown object type %d"
2816 #: builtin/index-pack.c:495
2817 msgid "cannot pread pack file"
2820 #: builtin/index-pack.c:497
2822 msgid "premature end of pack file, %lu byte missing"
2823 msgid_plural "premature end of pack file, %lu bytes missing"
2827 #: builtin/index-pack.c:510
2828 msgid "serious inflate inconsistency"
2831 #: builtin/index-pack.c:583
2833 msgid "cannot read existing object %s"
2836 #: builtin/index-pack.c:586
2838 msgid "SHA1 COLLISION FOUND WITH %s !"
2841 #: builtin/index-pack.c:598
2843 msgid "invalid blob object %s"
2846 #: builtin/index-pack.c:610
2851 #: builtin/index-pack.c:612
2852 msgid "Error in object"
2855 #: builtin/index-pack.c:614
2857 msgid "Not all child objects of %s are reachable"
2860 #: builtin/index-pack.c:687 builtin/index-pack.c:713
2861 msgid "failed to apply delta"
2864 #: builtin/index-pack.c:850
2865 msgid "Receiving objects"
2868 #: builtin/index-pack.c:850
2869 msgid "Indexing objects"
2872 #: builtin/index-pack.c:872
2873 msgid "pack is corrupted (SHA1 mismatch)"
2876 #: builtin/index-pack.c:877
2877 msgid "cannot fstat packfile"
2880 #: builtin/index-pack.c:880
2881 msgid "pack has junk at the end"
2884 #: builtin/index-pack.c:903
2885 msgid "Resolving deltas"
2888 #: builtin/index-pack.c:954
2889 msgid "confusion beyond insanity"
2892 #: builtin/index-pack.c:973
2894 msgid "pack has %d unresolved delta"
2895 msgid_plural "pack has %d unresolved deltas"
2899 #: builtin/index-pack.c:998
2901 msgid "unable to deflate appended object (%d)"
2904 #: builtin/index-pack.c:1077
2906 msgid "local object %s is corrupt"
2909 #: builtin/index-pack.c:1101
2910 msgid "error while closing pack file"
2913 #: builtin/index-pack.c:1114
2915 msgid "cannot write keep file '%s'"
2918 #: builtin/index-pack.c:1122
2920 msgid "cannot close written keep file '%s'"
2923 #: builtin/index-pack.c:1135
2924 msgid "cannot store pack file"
2927 #: builtin/index-pack.c:1146
2928 msgid "cannot store index file"
2931 #: builtin/index-pack.c:1247
2933 msgid "Cannot open existing pack file '%s'"
2936 #: builtin/index-pack.c:1249
2938 msgid "Cannot open existing pack idx file for '%s'"
2941 #: builtin/index-pack.c:1296
2943 msgid "non delta: %d object"
2944 msgid_plural "non delta: %d objects"
2948 #: builtin/index-pack.c:1303
2950 msgid "chain length = %d: %lu object"
2951 msgid_plural "chain length = %d: %lu objects"
2955 #: builtin/index-pack.c:1330
2956 msgid "Cannot come back to cwd"
2959 #: builtin/index-pack.c:1374 builtin/index-pack.c:1377
2960 #: builtin/index-pack.c:1389 builtin/index-pack.c:1393
2965 #: builtin/index-pack.c:1407
2966 msgid "--fix-thin cannot be used without --stdin"
2969 #: builtin/index-pack.c:1411 builtin/index-pack.c:1421
2971 msgid "packfile name '%s' does not end with '.pack'"
2974 #: builtin/index-pack.c:1430
2975 msgid "--verify with no packfile name given"
2978 #: builtin/init-db.c:35
2980 msgid "Could not make %s writable by group"
2983 #: builtin/init-db.c:62
2985 msgid "insanely long template name %s"
2988 #: builtin/init-db.c:67
2990 msgid "cannot stat '%s'"
2993 #: builtin/init-db.c:73
2995 msgid "cannot stat template '%s'"
2998 #: builtin/init-db.c:80
3000 msgid "cannot opendir '%s'"
3003 #: builtin/init-db.c:97
3005 msgid "cannot readlink '%s'"
3008 #: builtin/init-db.c:99
3010 msgid "insanely long symlink %s"
3013 #: builtin/init-db.c:102
3015 msgid "cannot symlink '%s' '%s'"
3018 #: builtin/init-db.c:106
3020 msgid "cannot copy '%s' to '%s'"
3023 #: builtin/init-db.c:110
3025 msgid "ignoring template %s"
3028 #: builtin/init-db.c:133
3030 msgid "insanely long template path %s"
3033 #: builtin/init-db.c:141
3035 msgid "templates not found %s"
3038 #: builtin/init-db.c:154
3040 msgid "not copying templates of a wrong format version %d from '%s'"
3043 #: builtin/init-db.c:192
3045 msgid "insane git directory %s"
3048 #: builtin/init-db.c:322 builtin/init-db.c:325
3050 msgid "%s already exists"
3053 #: builtin/init-db.c:354
3055 msgid "unable to handle file type %d"
3058 #: builtin/init-db.c:357
3060 msgid "unable to move %s to %s"
3063 #: builtin/init-db.c:362
3065 msgid "Could not create git link %s"
3069 #. * TRANSLATORS: The first '%s' is either "Reinitialized
3070 #. * existing" or "Initialized empty", the second " shared" or
3071 #. * "", and the last '%s%s' is the verbatim directory name.
3073 #: builtin/init-db.c:419
3075 msgid "%s%s Git repository in %s%s\n"
3078 #: builtin/init-db.c:420
3079 msgid "Reinitialized existing"
3082 #: builtin/init-db.c:420
3083 msgid "Initialized empty"
3086 #: builtin/init-db.c:421
3090 #: builtin/init-db.c:440
3091 msgid "cannot tell cwd"
3094 #: builtin/init-db.c:521 builtin/init-db.c:528
3096 msgid "cannot mkdir %s"
3099 #: builtin/init-db.c:532
3101 msgid "cannot chdir to %s"
3104 #: builtin/init-db.c:554
3107 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
3111 #: builtin/init-db.c:578
3112 msgid "Cannot access current working directory"
3115 #: builtin/init-db.c:585
3117 msgid "Cannot access work tree '%s'"
3120 #: builtin/log.c:188
3122 msgid "Final output: %d %s\n"
3125 #: builtin/log.c:401 builtin/log.c:489
3127 msgid "Could not read object %s"
3130 #: builtin/log.c:513
3132 msgid "Unknown type: %d"
3135 #: builtin/log.c:602
3136 msgid "format.headers without value"
3139 #: builtin/log.c:675
3140 msgid "name of output directory is too long"
3143 #: builtin/log.c:686
3145 msgid "Cannot open patch file %s"
3148 #: builtin/log.c:700
3149 msgid "Need exactly one range."
3152 #: builtin/log.c:708
3153 msgid "Not a range."
3156 #: builtin/log.c:745
3157 msgid "Could not extract email from committer identity."
3160 #: builtin/log.c:791
3161 msgid "Cover letter needs email format"
3164 #: builtin/log.c:885
3166 msgid "insane in-reply-to: %s"
3169 #: builtin/log.c:958
3170 msgid "Two output directories?"
3173 #: builtin/log.c:1179
3175 msgid "bogus committer info %s"
3178 #: builtin/log.c:1224
3179 msgid "-n and -k are mutually exclusive."
3182 #: builtin/log.c:1226
3183 msgid "--subject-prefix and -k are mutually exclusive."
3186 #: builtin/log.c:1234
3187 msgid "--name-only does not make sense"
3190 #: builtin/log.c:1236
3191 msgid "--name-status does not make sense"
3194 #: builtin/log.c:1238
3195 msgid "--check does not make sense"
3198 #: builtin/log.c:1261
3199 msgid "standard output, or directory, which one?"
3202 #: builtin/log.c:1263
3204 msgid "Could not create directory '%s'"
3207 #: builtin/log.c:1416
3208 msgid "Failed to create output files"
3211 #: builtin/log.c:1520
3214 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3217 #: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550
3219 msgid "Unknown commit %s"
3222 #: builtin/merge.c:90
3223 msgid "switch `m' requires a value"
3226 #: builtin/merge.c:127
3228 msgid "Could not find merge strategy '%s'.\n"
3231 #: builtin/merge.c:128
3233 msgid "Available strategies are:"
3236 #: builtin/merge.c:133
3238 msgid "Available custom strategies are:"
3241 #: builtin/merge.c:240
3242 msgid "could not run stash."
3245 #: builtin/merge.c:245
3246 msgid "stash failed"
3249 #: builtin/merge.c:250
3251 msgid "not a valid object: %s"
3254 #: builtin/merge.c:269 builtin/merge.c:286
3255 msgid "read-tree failed"
3258 #: builtin/merge.c:316
3259 msgid " (nothing to squash)"
3262 #: builtin/merge.c:329
3264 msgid "Squash commit -- not updating HEAD\n"
3267 #: builtin/merge.c:361
3268 msgid "Writing SQUASH_MSG"
3271 #: builtin/merge.c:363
3272 msgid "Finishing SQUASH_MSG"
3275 #: builtin/merge.c:386
3277 msgid "No merge message -- not updating HEAD\n"
3280 #: builtin/merge.c:437
3282 msgid "'%s' does not point to a commit"
3285 #: builtin/merge.c:536
3287 msgid "Bad branch.%s.mergeoptions string: %s"
3290 #: builtin/merge.c:629
3291 msgid "git write-tree failed to write a tree"
3294 #: builtin/merge.c:679
3295 msgid "failed to read the cache"
3298 #: builtin/merge.c:697
3299 msgid "Unable to write index."
3302 #: builtin/merge.c:710
3303 msgid "Not handling anything other than two heads merge."
3306 #: builtin/merge.c:724
3308 msgid "Unknown option for merge-recursive: -X%s"
3311 #: builtin/merge.c:738
3313 msgid "unable to write %s"
3316 #: builtin/merge.c:877
3318 msgid "Could not read from '%s'"
3321 #: builtin/merge.c:886
3323 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
3326 #: builtin/merge.c:892
3328 "Please enter a commit message to explain why this merge is necessary,\n"
3329 "especially if it merges an updated upstream into a topic branch.\n"
3331 "Lines starting with '#' will be ignored, and an empty message aborts\n"
3335 #: builtin/merge.c:916
3336 msgid "Empty commit message."
3339 #: builtin/merge.c:928
3341 msgid "Wonderful.\n"
3344 #: builtin/merge.c:993
3346 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
3349 #: builtin/merge.c:1009
3351 msgid "'%s' is not a commit"
3354 #: builtin/merge.c:1050
3355 msgid "No current branch."
3358 #: builtin/merge.c:1052
3359 msgid "No remote for the current branch."
3362 #: builtin/merge.c:1054
3363 msgid "No default upstream defined for the current branch."
3366 #: builtin/merge.c:1059
3368 msgid "No remote tracking branch for %s from %s"
3371 #: builtin/merge.c:1146 builtin/merge.c:1303
3373 msgid "%s - not something we can merge"
3376 #: builtin/merge.c:1214
3377 msgid "There is no merge to abort (MERGE_HEAD missing)."
3380 #: builtin/merge.c:1230 git-pull.sh:31
3382 "You have not concluded your merge (MERGE_HEAD exists).\n"
3383 "Please, commit your changes before you can merge."
3386 #: builtin/merge.c:1233 git-pull.sh:34
3387 msgid "You have not concluded your merge (MERGE_HEAD exists)."
3390 #: builtin/merge.c:1237
3392 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
3393 "Please, commit your changes before you can merge."
3396 #: builtin/merge.c:1240
3397 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
3400 #: builtin/merge.c:1249
3401 msgid "You cannot combine --squash with --no-ff."
3404 #: builtin/merge.c:1254
3405 msgid "You cannot combine --no-ff with --ff-only."
3408 #: builtin/merge.c:1261
3409 msgid "No commit specified and merge.defaultToUpstream not set."
3412 #: builtin/merge.c:1293
3413 msgid "Can merge only exactly one commit into empty head"
3416 #: builtin/merge.c:1296
3417 msgid "Squash commit into empty head not supported yet"
3420 #: builtin/merge.c:1298
3421 msgid "Non-fast-forward commit does not make sense into an empty head"
3424 #: builtin/merge.c:1413
3426 msgid "Updating %s..%s\n"
3429 #: builtin/merge.c:1451
3431 msgid "Trying really trivial in-index merge...\n"
3434 #: builtin/merge.c:1458
3439 #: builtin/merge.c:1490
3440 msgid "Not possible to fast-forward, aborting."
3443 #: builtin/merge.c:1513 builtin/merge.c:1592
3445 msgid "Rewinding the tree to pristine...\n"
3448 #: builtin/merge.c:1517
3450 msgid "Trying merge strategy %s...\n"
3453 #: builtin/merge.c:1583
3455 msgid "No merge strategy handled the merge.\n"
3458 #: builtin/merge.c:1585
3460 msgid "Merge with strategy %s failed.\n"
3463 #: builtin/merge.c:1594
3465 msgid "Using the %s to prepare resolving by hand.\n"
3468 #: builtin/merge.c:1606
3470 msgid "Automatic merge went well; stopped before committing as requested\n"
3475 msgid "Checking rename of '%s' to '%s'\n"
3483 msgid "can not move directory into itself"
3487 msgid "cannot move directory over file"
3492 msgid "Huh? %.*s is in index?"
3496 msgid "source directory is empty"
3500 msgid "not under version control"
3504 msgid "destination exists"
3509 msgid "overwriting '%s'"
3513 msgid "Cannot overwrite"
3517 msgid "multiple sources for the same target"
3522 msgid "%s, source=%s, destination=%s"
3527 msgid "Renaming %s to %s\n"
3530 #: builtin/mv.c:215 builtin/remote.c:731
3532 msgid "renaming '%s' failed"
3535 #: builtin/notes.c:139
3537 msgid "unable to start 'show' for object '%s'"
3540 #: builtin/notes.c:145
3541 msgid "can't fdopen 'show' output fd"
3544 #: builtin/notes.c:155
3546 msgid "failed to close pipe to 'show' for object '%s'"
3549 #: builtin/notes.c:158
3551 msgid "failed to finish 'show' for object '%s'"
3554 #: builtin/notes.c:175 builtin/tag.c:347
3556 msgid "could not create file '%s'"
3559 #: builtin/notes.c:189
3560 msgid "Please supply the note contents using either -m or -F option"
3563 #: builtin/notes.c:210 builtin/notes.c:973
3565 msgid "Removing note for object %s\n"
3568 #: builtin/notes.c:215
3569 msgid "unable to write note object"
3572 #: builtin/notes.c:217
3574 msgid "The note contents has been left in %s"
3577 #: builtin/notes.c:251 builtin/tag.c:542
3579 msgid "cannot read '%s'"
3582 #: builtin/notes.c:253 builtin/tag.c:545
3584 msgid "could not open or read '%s'"
3587 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
3588 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
3589 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
3590 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
3592 msgid "Failed to resolve '%s' as a valid ref."
3595 #: builtin/notes.c:275
3597 msgid "Failed to read object '%s'."
3600 #: builtin/notes.c:299
3601 msgid "Cannot commit uninitialized/unreferenced notes tree"
3604 #: builtin/notes.c:340
3606 msgid "Bad notes.rewriteMode value: '%s'"
3609 #: builtin/notes.c:350
3611 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
3614 #. TRANSLATORS: The first %s is the name of the
3615 #. environment variable, the second %s is its value
3616 #: builtin/notes.c:377
3618 msgid "Bad %s value: '%s'"
3621 #: builtin/notes.c:441
3623 msgid "Malformed input line: '%s'."
3626 #: builtin/notes.c:456
3628 msgid "Failed to copy notes from '%s' to '%s'"
3631 #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
3632 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
3633 #: builtin/notes.c:1033
3634 msgid "too many parameters"
3637 #: builtin/notes.c:513 builtin/notes.c:772
3639 msgid "No note found for object %s."
3642 #: builtin/notes.c:580
3645 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
3649 #: builtin/notes.c:585 builtin/notes.c:662
3651 msgid "Overwriting existing notes for object %s\n"
3654 #: builtin/notes.c:635
3655 msgid "too few parameters"
3658 #: builtin/notes.c:656
3661 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
3665 #: builtin/notes.c:668
3667 msgid "Missing notes on source object %s. Cannot copy."
3670 #: builtin/notes.c:717
3673 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
3674 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
3677 #: builtin/notes.c:971
3679 msgid "Object %s has no note\n"
3682 #: builtin/notes.c:1103 builtin/remote.c:1598
3684 msgid "Unknown subcommand: %s"
3687 #: builtin/pack-objects.c:2315
3689 msgid "unsupported index version %s"
3692 #: builtin/pack-objects.c:2319
3694 msgid "bad index version '%s'"
3697 #: builtin/pack-objects.c:2342
3699 msgid "option %s does not accept negative form"
3702 #: builtin/pack-objects.c:2346
3704 msgid "unable to parse value '%s' for option %s"
3707 #: builtin/push.c:45
3708 msgid "tag shorthand without <tag>"
3711 #: builtin/push.c:64
3712 msgid "--delete only accepts plain target ref names"
3715 #: builtin/push.c:99
3718 "To choose either option permanently, see push.default in 'git help config'."
3721 #: builtin/push.c:102
3724 "The upstream branch of your current branch does not match\n"
3725 "the name of your current branch. To push to the upstream branch\n"
3726 "on the remote, use\n"
3728 " git push %s HEAD:%s\n"
3730 "To push to the branch of the same name on the remote, use\n"
3736 #: builtin/push.c:121
3739 "You are not currently on a branch.\n"
3740 "To push the history leading to the current (detached HEAD)\n"
3743 " git push %s HEAD:<name-of-remote-branch>\n"
3746 #: builtin/push.c:128
3749 "The current branch %s has no upstream branch.\n"
3750 "To push the current branch and set the remote as upstream, use\n"
3752 " git push --set-upstream %s %s\n"
3755 #: builtin/push.c:136
3757 msgid "The current branch %s has multiple upstream branches, refusing to push."
3760 #: builtin/push.c:139
3763 "You are pushing to remote '%s', which is not the upstream of\n"
3764 "your current branch '%s', without telling me what to push\n"
3765 "to update which remote branch."
3768 #: builtin/push.c:174
3770 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
3773 #: builtin/push.c:181
3775 "Updates were rejected because the tip of your current branch is behind\n"
3776 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
3777 "before pushing again.\n"
3778 "See the 'Note about fast-forwards' in 'git push --help' for details."
3781 #: builtin/push.c:187
3783 "Updates were rejected because a pushed branch tip is behind its remote\n"
3784 "counterpart. If you did not intend to push that branch, you may want to\n"
3785 "specify branches to push or set the 'push.default' configuration\n"
3786 "variable to 'current' or 'upstream' to push only the current branch."
3789 #: builtin/push.c:193
3791 "Updates were rejected because a pushed branch tip is behind its remote\n"
3792 "counterpart. Check out this branch and merge the remote changes\n"
3793 "(e.g. 'git pull') before pushing again.\n"
3794 "See the 'Note about fast-forwards' in 'git push --help' for details."
3797 #: builtin/push.c:233
3799 msgid "Pushing to %s\n"
3802 #: builtin/push.c:237
3804 msgid "failed to push some refs to '%s'"
3807 #: builtin/push.c:269
3809 msgid "bad repository '%s'"
3812 #: builtin/push.c:270
3814 "No configured push destination.\n"
3815 "Either specify the URL from the command-line or configure a remote "
3816 "repository using\n"
3818 " git remote add <name> <url>\n"
3820 "and then push using the remote name\n"
3822 " git push <name>\n"
3825 #: builtin/push.c:285
3826 msgid "--all and --tags are incompatible"
3829 #: builtin/push.c:286
3830 msgid "--all can't be combined with refspecs"
3833 #: builtin/push.c:291
3834 msgid "--mirror and --tags are incompatible"
3837 #: builtin/push.c:292
3838 msgid "--mirror can't be combined with refspecs"
3841 #: builtin/push.c:297
3842 msgid "--all and --mirror are incompatible"
3845 #: builtin/push.c:385
3846 msgid "--delete is incompatible with --all, --mirror and --tags"
3849 #: builtin/push.c:387
3850 msgid "--delete doesn't make sense without any refs"
3853 #: builtin/remote.c:98
3858 #: builtin/remote.c:130
3860 "--mirror is dangerous and deprecated; please\n"
3861 "\t use --mirror=fetch or --mirror=push instead"
3864 #: builtin/remote.c:147
3866 msgid "unknown mirror argument: %s"
3869 #: builtin/remote.c:185
3870 msgid "specifying a master branch makes no sense with --mirror"
3873 #: builtin/remote.c:187
3874 msgid "specifying branches to track makes sense only with fetch mirrors"
3877 #: builtin/remote.c:195 builtin/remote.c:646
3879 msgid "remote %s already exists."
3882 #: builtin/remote.c:199 builtin/remote.c:650
3884 msgid "'%s' is not a valid remote name"
3887 #: builtin/remote.c:243
3889 msgid "Could not setup master '%s'"
3892 #: builtin/remote.c:299
3894 msgid "more than one %s"
3897 #: builtin/remote.c:339
3899 msgid "Could not get fetch map for refspec %s"
3902 #: builtin/remote.c:440 builtin/remote.c:448
3906 #: builtin/remote.c:452
3910 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
3912 msgid "Could not append '%s' to '%s'"
3915 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
3917 msgid "No such remote: %s"
3920 #: builtin/remote.c:656
3922 msgid "Could not rename config section '%s' to '%s'"
3925 #: builtin/remote.c:662 builtin/remote.c:799
3927 msgid "Could not remove config section '%s'"
3930 #: builtin/remote.c:677
3933 "Not updating non-default fetch respec\n"
3935 "\tPlease update the configuration manually if necessary."
3938 #: builtin/remote.c:683
3940 msgid "Could not append '%s'"
3943 #: builtin/remote.c:694
3945 msgid "Could not set '%s'"
3948 #: builtin/remote.c:716
3950 msgid "deleting '%s' failed"
3953 #: builtin/remote.c:750
3955 msgid "creating '%s' failed"
3958 #: builtin/remote.c:764
3960 msgid "Could not remove branch %s"
3963 #: builtin/remote.c:834
3965 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
3966 "to delete it, use:"
3968 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
3969 "to delete them, use:"
3973 #: builtin/remote.c:943
3975 msgid " new (next fetch will store in remotes/%s)"
3978 #: builtin/remote.c:946
3982 #: builtin/remote.c:948
3983 msgid " stale (use 'git remote prune' to remove)"
3986 #: builtin/remote.c:950
3990 #: builtin/remote.c:991
3992 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
3995 #: builtin/remote.c:998
3997 msgid "rebases onto remote %s"
4000 #: builtin/remote.c:1001
4002 msgid " merges with remote %s"
4005 #: builtin/remote.c:1002
4006 msgid " and with remote"
4009 #: builtin/remote.c:1004
4011 msgid "merges with remote %s"
4014 #: builtin/remote.c:1005
4015 msgid " and with remote"
4018 #: builtin/remote.c:1051
4022 #: builtin/remote.c:1054
4026 #: builtin/remote.c:1058
4030 #: builtin/remote.c:1061
4031 msgid "fast-forwardable"
4034 #: builtin/remote.c:1064
4035 msgid "local out of date"
4038 #: builtin/remote.c:1071
4040 msgid " %-*s forces to %-*s (%s)"
4043 #: builtin/remote.c:1074
4045 msgid " %-*s pushes to %-*s (%s)"
4048 #: builtin/remote.c:1078
4050 msgid " %-*s forces to %s"
4053 #: builtin/remote.c:1081
4055 msgid " %-*s pushes to %s"
4058 #: builtin/remote.c:1118
4063 #: builtin/remote.c:1119
4065 msgid " Fetch URL: %s"
4068 #: builtin/remote.c:1120 builtin/remote.c:1285
4072 #: builtin/remote.c:1129 builtin/remote.c:1131
4074 msgid " Push URL: %s"
4077 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
4079 msgid " HEAD branch: %s"
4082 #: builtin/remote.c:1139
4085 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
4088 #: builtin/remote.c:1151
4090 msgid " Remote branch:%s"
4091 msgid_plural " Remote branches:%s"
4095 #: builtin/remote.c:1154 builtin/remote.c:1181
4096 msgid " (status not queried)"
4099 #: builtin/remote.c:1163
4100 msgid " Local branch configured for 'git pull':"
4101 msgid_plural " Local branches configured for 'git pull':"
4105 #: builtin/remote.c:1171
4106 msgid " Local refs will be mirrored by 'git push'"
4109 #: builtin/remote.c:1178
4111 msgid " Local ref configured for 'git push'%s:"
4112 msgid_plural " Local refs configured for 'git push'%s:"
4116 #: builtin/remote.c:1216
4117 msgid "Cannot determine remote HEAD"
4120 #: builtin/remote.c:1218
4121 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
4124 #: builtin/remote.c:1228
4126 msgid "Could not delete %s"
4129 #: builtin/remote.c:1236
4131 msgid "Not a valid ref: %s"
4134 #: builtin/remote.c:1238
4136 msgid "Could not setup %s"
4139 #: builtin/remote.c:1274
4141 msgid " %s will become dangling!"
4144 #: builtin/remote.c:1275
4146 msgid " %s has become dangling!"
4149 #: builtin/remote.c:1281
4154 #: builtin/remote.c:1282
4159 #: builtin/remote.c:1295
4161 msgid " * [would prune] %s"
4164 #: builtin/remote.c:1298
4166 msgid " * [pruned] %s"
4169 #: builtin/remote.c:1387 builtin/remote.c:1461
4171 msgid "No such remote '%s'"
4174 #: builtin/remote.c:1414
4175 msgid "no remote specified"
4178 #: builtin/remote.c:1447
4179 msgid "--add --delete doesn't make sense"
4182 #: builtin/remote.c:1487
4184 msgid "Invalid old URL pattern: %s"
4187 #: builtin/remote.c:1495
4189 msgid "No such URL found: %s"
4192 #: builtin/remote.c:1497
4193 msgid "Will not delete all non-push URLs"
4196 #: builtin/reset.c:33
4200 #: builtin/reset.c:33
4204 #: builtin/reset.c:33
4208 #: builtin/reset.c:33
4212 #: builtin/reset.c:33
4216 #: builtin/reset.c:77
4217 msgid "You do not have a valid HEAD."
4220 #: builtin/reset.c:79
4221 msgid "Failed to find tree of HEAD."
4224 #: builtin/reset.c:85
4226 msgid "Failed to find tree of %s."
4229 #: builtin/reset.c:96
4230 msgid "Could not write new index file."
4233 #: builtin/reset.c:106
4235 msgid "HEAD is now at %s"
4238 #: builtin/reset.c:130
4239 msgid "Could not read index"
4242 #: builtin/reset.c:133
4243 msgid "Unstaged changes after reset:"
4246 #: builtin/reset.c:223
4248 msgid "Cannot do a %s reset in the middle of a merge."
4251 #: builtin/reset.c:297
4253 msgid "Could not parse object '%s'."
4256 #: builtin/reset.c:302
4257 msgid "--patch is incompatible with --{hard,mixed,soft}"
4260 #: builtin/reset.c:311
4261 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
4264 #: builtin/reset.c:313
4266 msgid "Cannot do %s reset with paths."
4269 #: builtin/reset.c:325
4271 msgid "%s reset is not allowed in a bare repository"
4274 #: builtin/reset.c:341
4276 msgid "Could not reset index file to revision '%s'."
4279 #: builtin/revert.c:70 builtin/revert.c:92
4281 msgid "%s: %s cannot be used with %s"
4284 #: builtin/revert.c:131
4285 msgid "program error"
4288 #: builtin/revert.c:221
4289 msgid "revert failed"
4292 #: builtin/revert.c:236
4293 msgid "cherry-pick failed"
4299 "'%s' has staged content different from both the file and the HEAD\n"
4300 "(use -f to force removal)"
4306 "'%s' has changes staged in the index\n"
4307 "(use --cached to keep the file, or -f to force removal)"
4313 "'%s' has local modifications\n"
4314 "(use --cached to keep the file, or -f to force removal)"
4319 msgid "not removing '%s' recursively without -r"
4324 msgid "git rm: unable to remove %s"
4327 #: builtin/shortlog.c:157
4329 msgid "Missing author: %s"
4334 msgid "malformed object at '%s'"
4337 #: builtin/tag.c:207
4339 msgid "tag name too long: %.*s..."
4342 #: builtin/tag.c:212
4344 msgid "tag '%s' not found."
4347 #: builtin/tag.c:227
4349 msgid "Deleted tag '%s' (was %s)\n"
4352 #: builtin/tag.c:239
4354 msgid "could not verify the tag '%s'"
4357 #: builtin/tag.c:249
4361 "# Write a tag message\n"
4362 "# Lines starting with '#' will be ignored.\n"
4366 #: builtin/tag.c:256
4370 "# Write a tag message\n"
4371 "# Lines starting with '#' will be kept; you may remove them yourself if you "
4376 #: builtin/tag.c:298
4377 msgid "unable to sign the tag"
4380 #: builtin/tag.c:300
4381 msgid "unable to write tag file"
4384 #: builtin/tag.c:325
4385 msgid "bad object type."
4388 #: builtin/tag.c:338
4389 msgid "tag header too big."
4392 #: builtin/tag.c:370
4393 msgid "no tag message?"
4396 #: builtin/tag.c:376
4398 msgid "The tag message has been left in %s\n"
4401 #: builtin/tag.c:425
4402 msgid "switch 'points-at' requires an object"
4405 #: builtin/tag.c:427
4407 msgid "malformed object name '%s'"
4410 #: builtin/tag.c:506
4411 msgid "--column and -n are incompatible"
4414 #: builtin/tag.c:523
4415 msgid "-n option is only allowed with -l."
4418 #: builtin/tag.c:525
4419 msgid "--contains option is only allowed with -l."
4422 #: builtin/tag.c:527
4423 msgid "--points-at option is only allowed with -l."
4426 #: builtin/tag.c:535
4427 msgid "only one -F or -m option is allowed."
4430 #: builtin/tag.c:555
4431 msgid "too many params"
4434 #: builtin/tag.c:561
4436 msgid "'%s' is not a valid tag name."
4439 #: builtin/tag.c:566
4441 msgid "tag '%s' already exists"
4444 #: builtin/tag.c:584
4446 msgid "%s: cannot lock the ref"
4449 #: builtin/tag.c:586
4451 msgid "%s: cannot update the ref"
4454 #: builtin/tag.c:588
4456 msgid "Updated tag '%s' (was %s)\n"
4460 msgid "See 'git help <command>' for more information on a specific command."
4463 #: parse-options.h:133 parse-options.h:235
4467 #: parse-options.h:141
4471 #: parse-options.h:149
4475 #: parse-options.h:151
4479 #: parse-options.h:156
4480 msgid "no-op (backward compatibility)"
4483 #: parse-options.h:228
4484 msgid "be more verbose"
4487 #: parse-options.h:230
4488 msgid "be more quiet"
4491 #: parse-options.h:236
4492 msgid "use <n> digits to display SHA-1s"
4496 msgid "Add file contents to the index"
4500 msgid "Find by binary search the change that introduced a bug"
4504 msgid "List, create, or delete branches"
4508 msgid "Checkout a branch or paths to the working tree"
4512 msgid "Clone a repository into a new directory"
4516 msgid "Record changes to the repository"
4520 msgid "Show changes between commits, commit and working tree, etc"
4524 msgid "Download objects and refs from another repository"
4528 msgid "Print lines matching a pattern"
4532 msgid "Create an empty git repository or reinitialize an existing one"
4536 msgid "Show commit logs"
4540 msgid "Join two or more development histories together"
4544 msgid "Move or rename a file, a directory, or a symlink"
4548 msgid "Fetch from and merge with another repository or a local branch"
4552 msgid "Update remote refs along with associated objects"
4556 msgid "Forward-port local commits to the updated upstream head"
4560 msgid "Reset current HEAD to the specified state"
4564 msgid "Remove files from the working tree and from the index"
4568 msgid "Show various types of objects"
4572 msgid "Show the working tree status"
4576 msgid "Create, list, delete or verify a tag object signed with GPG"
4580 msgid "You need to set your committer info first"
4584 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4589 "Did you hand edit your patch?\n"
4590 "It does not apply to blobs recorded in its index."
4594 msgid "Falling back to patching base and 3-way merge..."
4598 msgid "Only one StGIT patch series can be applied at once"
4603 msgid "Patch format $patch_format is not supported."
4607 msgid "Patch format detection failed."
4611 msgid "-d option is no longer supported. Do not use."
4616 msgid "previous rebase directory $dotest still exists but mbox given."
4620 msgid "Please make up your mind. --skip or --abort?"
4624 msgid "Resolve operation not in progress, we are not resuming."
4629 msgid "Dirty index: cannot apply patches (dirty: $files)"
4633 msgid "cannot be interactive without stdin connected to a terminal."
4636 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
4637 #. in your translation. The program will only accept English
4638 #. input at this point.
4640 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
4645 msgid "Applying: $FIRSTLINE"
4649 msgid "No changes -- Patch already applied."
4653 msgid "applying to an empty history"
4656 #. TRANSLATORS: Make sure to include [Y] and [n] in your
4657 #. translation. The program will only accept English input
4660 msgid "Do you want me to do it for you [Y/n]? "
4665 msgid "unrecognised option: '$arg'"
4670 msgid "'$arg' does not appear to be a valid revision"
4673 #: git-bisect.sh:117
4674 msgid "Bad HEAD - I need a HEAD"
4677 #: git-bisect.sh:130
4680 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
4683 #: git-bisect.sh:140
4684 msgid "won't bisect on seeked tree"
4687 #: git-bisect.sh:144
4688 msgid "Bad HEAD - strange symbolic ref"
4691 #: git-bisect.sh:189
4693 msgid "Bad bisect_write argument: $state"
4696 #: git-bisect.sh:218
4698 msgid "Bad rev input: $arg"
4701 #: git-bisect.sh:232
4702 msgid "Please call 'bisect_state' with at least one argument."
4705 #: git-bisect.sh:244
4707 msgid "Bad rev input: $rev"
4710 #: git-bisect.sh:250
4711 msgid "'git bisect bad' can take only one argument."
4714 #. TRANSLATORS: Make sure to include [Y] and [n] in your
4715 #. translation. The program will only accept English input
4717 #: git-bisect.sh:279
4718 msgid "Are you sure [Y/n]? "
4721 #: git-bisect.sh:354
4723 msgid "'$invalid' is not a valid commit"
4726 #: git-bisect.sh:363
4729 "Could not check out original HEAD '$branch'.\n"
4730 "Try 'git bisect reset <commit>'."
4733 #: git-bisect.sh:390
4734 msgid "No logfile given"
4737 #: git-bisect.sh:391
4739 msgid "cannot read $file for replaying"
4742 #: git-bisect.sh:408
4743 msgid "?? what are you talking about?"
4746 #: git-bisect.sh:474
4747 msgid "We are not bisecting."
4752 "Pull is not possible because you have unmerged files.\n"
4753 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
4754 "as appropriate to mark resolution, or use 'git commit -a'."
4758 msgid "Pull is not possible because you have unmerged files."
4762 msgid "updating an unborn branch with changes added to the index"
4766 msgid "Cannot merge multiple branches into empty head"
4770 msgid "Cannot rebase onto multiple branches"
4774 msgid "git stash clear with parameters is unimplemented"
4778 msgid "You do not have the initial commit yet"
4782 msgid "Cannot save the current index state"
4785 #: git-stash.sh:123 git-stash.sh:136
4786 msgid "Cannot save the current worktree state"
4790 msgid "No changes selected"
4794 msgid "Cannot remove temporary index (can't happen)"
4798 msgid "Cannot record working tree state"
4802 msgid "No local changes to save"
4806 msgid "Cannot initialize stash"
4810 msgid "Cannot save the current status"
4814 msgid "Cannot remove worktree changes"
4818 msgid "No stash found."
4823 msgid "Too many revisions specified: $REV"
4828 msgid "$reference is not valid reference"
4833 msgid "'$args' is not a stash-like commit"
4838 msgid "'$args' is not a stash reference"
4842 msgid "unable to refresh index"
4846 msgid "Cannot apply a stash in the middle of a merge"
4850 msgid "Conflicts in index. Try without --index."
4854 msgid "Could not save index tree"
4858 msgid "Cannot unstage modified files"
4863 msgid "Dropped ${REV} ($s)"
4868 msgid "${REV}: Could not drop stash entry"
4872 msgid "No branch name specified"
4876 msgid "(To restore them type \"git stash apply\")"
4879 #: git-submodule.sh:56
4881 msgid "cannot strip one component off url '$remoteurl'"
4884 #: git-submodule.sh:109
4886 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
4889 #: git-submodule.sh:150
4891 msgid "Clone of '$url' into submodule path '$sm_path' failed"
4894 #: git-submodule.sh:160
4896 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
4899 #: git-submodule.sh:249
4901 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
4904 #: git-submodule.sh:266
4906 msgid "'$sm_path' already exists in the index"
4909 #: git-submodule.sh:283
4911 msgid "'$sm_path' already exists and is not a valid git repo"
4914 #: git-submodule.sh:297
4916 msgid "Unable to checkout submodule '$sm_path'"
4919 #: git-submodule.sh:302
4921 msgid "Failed to add submodule '$sm_path'"
4924 #: git-submodule.sh:307
4926 msgid "Failed to register submodule '$sm_path'"
4929 #: git-submodule.sh:349
4931 msgid "Entering '$prefix$sm_path'"
4934 #: git-submodule.sh:363
4936 msgid "Stopping at '$sm_path'; script returned non-zero status."
4939 #: git-submodule.sh:405
4941 msgid "No url found for submodule path '$sm_path' in .gitmodules"
4944 #: git-submodule.sh:414
4946 msgid "Failed to register url for submodule path '$sm_path'"
4949 #: git-submodule.sh:422
4951 msgid "Failed to register update mode for submodule path '$sm_path'"
4954 #: git-submodule.sh:424
4956 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
4959 #: git-submodule.sh:523
4962 "Submodule path '$sm_path' not initialized\n"
4963 "Maybe you want to use 'update --init'?"
4966 #: git-submodule.sh:536
4968 msgid "Unable to find current revision in submodule path '$sm_path'"
4971 #: git-submodule.sh:555
4973 msgid "Unable to fetch in submodule path '$sm_path'"
4976 #: git-submodule.sh:569
4978 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
4981 #: git-submodule.sh:570
4983 msgid "Submodule path '$sm_path': rebased into '$sha1'"
4986 #: git-submodule.sh:575
4988 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
4991 #: git-submodule.sh:576
4993 msgid "Submodule path '$sm_path': merged in '$sha1'"
4996 #: git-submodule.sh:581
4998 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5001 #: git-submodule.sh:582
5003 msgid "Submodule path '$sm_path': checked out '$sha1'"
5006 #: git-submodule.sh:604 git-submodule.sh:927
5008 msgid "Failed to recurse into submodule path '$sm_path'"
5011 #: git-submodule.sh:712
5015 #: git-submodule.sh:770
5017 msgid " Warn: $name doesn't contain commit $sha1_src"
5020 #: git-submodule.sh:773
5022 msgid " Warn: $name doesn't contain commit $sha1_dst"
5025 #: git-submodule.sh:776
5027 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5030 #: git-submodule.sh:801
5034 #: git-submodule.sh:802
5038 #: git-submodule.sh:973
5040 msgid "Synchronizing submodule url for '$name'"