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: 2019-08-10 20:12+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"
23 msgid "%shint: %.*s%s\n"
27 msgid "Cherry-picking is not possible because you have unmerged files."
31 msgid "Committing is not possible because you have unmerged files."
35 msgid "Merging is not possible because you have unmerged files."
39 msgid "Pulling is not possible because you have unmerged files."
43 msgid "Reverting is not possible because you have unmerged files."
48 msgid "It is not possible to %s because you have unmerged files."
53 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
54 "as appropriate to mark resolution and make a commit."
58 msgid "Exiting because of an unresolved conflict."
61 #: advice.c:193 builtin/merge.c:1327
62 msgid "You have not concluded your merge (MERGE_HEAD exists)."
66 msgid "Please, commit your changes before merging."
70 msgid "Exiting because of unfinished merge."
76 "Note: switching to '%s'.\n"
78 "You are in 'detached HEAD' state. You can look around, make experimental\n"
79 "changes and commit them, and you can discard any commits you make in this\n"
80 "state without impacting any branches by switching back to a branch.\n"
82 "If you want to create a new branch to retain commits you create, you may\n"
83 "do so (now or later) by using -c with the switch command. Example:\n"
85 " git switch -c <new-branch-name>\n"
87 "Or undo this operation with:\n"
91 "Turn off this advice by setting config variable advice.detachedHead to "
97 msgid "cmdline ends with \\"
101 msgid "unclosed quote"
106 msgid "unrecognized whitespace option '%s'"
111 msgid "unrecognized whitespace ignore option '%s'"
115 msgid "--reject and --3way cannot be used together."
119 msgid "--cached and --3way cannot be used together."
123 msgid "--3way outside a repository"
127 msgid "--index outside a repository"
131 msgid "--cached outside a repository"
136 msgid "Cannot prepare timestamp regexp %s"
141 msgid "regexec returned %d for input: %s"
146 msgid "unable to find filename in patch at line %d"
151 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
156 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
161 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
166 msgid "git apply: bad git-diff - expected /dev/null on line %d"
171 msgid "invalid mode on line %d: %s"
176 msgid "inconsistent header lines %d and %d"
181 msgid "recount: unexpected line: %.*s"
186 msgid "patch fragment without header at line %d: %.*s"
192 "git diff header lacks filename information when removing %d leading pathname "
193 "component (line %d)"
195 "git diff header lacks filename information when removing %d leading pathname "
196 "components (line %d)"
202 msgid "git diff header lacks filename information (line %d)"
206 msgid "new file depends on old contents"
210 msgid "deleted file still has contents"
215 msgid "corrupt patch at line %d"
220 msgid "new file %s depends on old contents"
225 msgid "deleted file %s still has contents"
230 msgid "** warning: file %s becomes empty but is not deleted"
235 msgid "corrupt binary patch at line %d: %.*s"
240 msgid "unrecognized binary patch at line %d"
245 msgid "patch with only garbage at line %d"
250 msgid "unable to read symlink %s"
255 msgid "unable to open or read %s"
260 msgid "invalid start of line: '%c'"
265 msgid "Hunk #%d succeeded at %d (offset %d line)."
266 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
272 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
278 "while searching for:\n"
284 msgid "missing binary patch data for '%s'"
289 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
294 msgid "cannot apply binary patch to '%s' without full index line"
300 "the patch applies to '%s' (%s), which does not match the current contents."
305 msgid "the patch applies to an empty '%s' but it is not empty"
310 msgid "the necessary postimage %s for '%s' cannot be read"
315 msgid "binary patch does not apply to '%s'"
320 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
325 msgid "patch failed: %s:%ld"
330 msgid "cannot checkout %s"
333 #: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
335 msgid "failed to read %s"
340 msgid "reading from '%s' beyond a symbolic link"
343 #: apply.c:3429 apply.c:3672
345 msgid "path %s has been renamed/deleted"
348 #: apply.c:3515 apply.c:3687
350 msgid "%s: does not exist in index"
353 #: apply.c:3524 apply.c:3695
355 msgid "%s: does not match index"
359 msgid "repository lacks the necessary blob to fall back on 3-way merge."
364 msgid "Falling back to three-way merge...\n"
367 #: apply.c:3578 apply.c:3582
369 msgid "cannot read the current contents of '%s'"
374 msgid "Failed to fall back on three-way merge...\n"
379 msgid "Applied patch to '%s' with conflicts.\n"
384 msgid "Applied patch to '%s' cleanly.\n"
388 msgid "removal patch leaves file contents"
393 msgid "%s: wrong type"
398 msgid "%s has type %o, expected %o"
401 #: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
404 msgid "invalid path '%s'"
409 msgid "%s: already exists in index"
414 msgid "%s: already exists in working directory"
419 msgid "new mode (%o) of %s does not match old mode (%o)"
424 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
429 msgid "affected file '%s' is beyond a symbolic link"
434 msgid "%s: patch does not apply"
439 msgid "Checking patch %s..."
444 msgid "sha1 information is lacking or useless for submodule %s"
449 msgid "mode change for %s, which is not in current HEAD"
454 msgid "sha1 information is lacking or useless (%s)."
457 #: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
459 msgid "make_cache_entry failed for path '%s'"
464 msgid "could not add %s to temporary index"
469 msgid "could not write temporary index to %s"
474 msgid "unable to remove %s from index"
479 msgid "corrupt patch for submodule %s"
484 msgid "unable to stat newly created file '%s'"
489 msgid "unable to create backing store for newly created file %s"
492 #: apply.c:4303 apply.c:4448
494 msgid "unable to add cache entry for %s"
499 msgid "failed to write to '%s'"
504 msgid "closing file '%s'"
509 msgid "unable to write file '%s' mode %o"
514 msgid "Applied patch %s cleanly."
518 msgid "internal error"
523 msgid "Applying patch %%s with %d reject..."
524 msgid_plural "Applying patch %%s with %d rejects..."
530 msgid "truncating .rej filename to %.*s.rej"
533 #: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
535 msgid "cannot open %s"
540 msgid "Hunk #%d applied cleanly."
545 msgid "Rejected hunk #%d."
550 msgid "Skipped patch '%s'."
554 msgid "unrecognized input"
558 msgid "unable to read index file"
563 msgid "can't open patch '%s': %s"
568 msgid "squelched %d whitespace error"
569 msgid_plural "squelched %d whitespace errors"
573 #: apply.c:4892 apply.c:4907
575 msgid "%d line adds whitespace errors."
576 msgid_plural "%d lines add whitespace errors."
582 msgid "%d line applied after fixing whitespace errors."
583 msgid_plural "%d lines applied after fixing whitespace errors."
587 #: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
588 msgid "Unable to write new index file"
591 #: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
592 #: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
593 #: builtin/pull.c:208 builtin/submodule--helper.c:407
594 #: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
595 #: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
596 #: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
601 msgid "don't apply changes matching the given path"
605 msgid "apply changes matching the given path"
608 #: apply.c:4949 builtin/am.c:2217
613 msgid "remove <num> leading slashes from traditional diff paths"
617 msgid "ignore additions made by the patch"
621 msgid "instead of applying the patch, output diffstat for the input"
625 msgid "show number of added and deleted lines in decimal notation"
629 msgid "instead of applying the patch, output a summary for the input"
633 msgid "instead of applying the patch, see if the patch is applicable"
637 msgid "make sure the patch is applicable to the current index"
641 msgid "mark new files with `git add --intent-to-add`"
645 msgid "apply a patch without touching the working tree"
649 msgid "accept a patch that touches outside the working area"
653 msgid "also apply the patch (use with --stat/--summary/--check)"
657 msgid "attempt three-way merge if a patch does not apply"
661 msgid "build a temporary index based on embedded index information"
664 #: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
665 msgid "paths are separated with NUL character"
669 msgid "ensure at least <n> lines of context match"
672 #: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
673 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
674 #: builtin/pack-objects.c:3330 builtin/rebase.c:1421
679 msgid "detect new or modified lines that have whitespace errors"
682 #: apply.c:4988 apply.c:4991
683 msgid "ignore changes in whitespace when finding context"
687 msgid "apply the patch in reverse"
691 msgid "don't expect at least one line of context"
695 msgid "leave the rejected hunks in corresponding *.rej files"
699 msgid "allow overlapping hunks"
702 #: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
703 #: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
704 #: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
709 msgid "tolerate incorrectly detected missing new-line at the end of file"
713 msgid "do not trust the line counts in the hunk headers"
716 #: apply.c:5008 builtin/am.c:2205
721 msgid "prepend <root> to all filenames"
725 msgid "git archive [<options>] <tree-ish> [<path>...]"
729 msgid "git archive --list"
734 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
738 msgid "git archive --remote <repo> [--exec <cmd>] --list"
741 #: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
743 msgid "pathspec '%s' did not match any files"
748 msgid "no such ref: %.*s"
753 msgid "not a valid object name: %s"
758 msgid "not a tree object: %s"
762 msgid "current working directory is untracked"
770 msgid "archive format"
773 #: archive.c:458 builtin/log.c:1580
778 msgid "prepend prefix to each pathname in the archive"
781 #: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
782 #: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
783 #: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
784 #: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
785 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
789 #: archive.c:461 builtin/archive.c:90
790 msgid "write the archive to this file"
794 msgid "read .gitattributes in working directory"
798 msgid "report archived files on stderr"
806 msgid "compress faster"
810 msgid "compress better"
814 msgid "list supported archive formats"
817 #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
818 #: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
822 #: archive.c:480 builtin/archive.c:92
823 msgid "retrieve the archive from remote repository <repo>"
826 #: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
827 #: builtin/notes.c:498
831 #: archive.c:482 builtin/archive.c:94
832 msgid "path to the remote git-upload-archive command"
836 msgid "Unexpected option --remote"
840 msgid "Option --exec can only be used together with --remote"
844 msgid "Unexpected option --output"
849 msgid "Unknown archive format '%s'"
854 msgid "Argument not supported for format '%s': -%d"
857 #: archive-tar.c:125 archive-zip.c:345
859 msgid "cannot stream blob %s"
862 #: archive-tar.c:260 archive-zip.c:363
864 msgid "unsupported file mode: 0%o (SHA1: %s)"
867 #: archive-tar.c:287 archive-zip.c:353
869 msgid "cannot read %s"
874 msgid "unable to start '%s' filter"
878 msgid "unable to redirect descriptor"
883 msgid "'%s' filter reported error"
888 msgid "path is not valid UTF-8: %s"
893 msgid "path too long (%d chars, SHA1: %s): %s"
896 #: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
898 msgid "deflate error (%d)"
903 msgid "timestamp too large for this system: %<PRIuMAX>"
908 msgid "%.*s is not a valid attribute name"
913 msgid "%s not allowed: %s:%d"
918 "Negative patterns are ignored in git attributes\n"
919 "Use '\\!' for literal leading exclamation."
924 msgid "Badly quoted content in file '%s': %s"
929 msgid "We cannot bisect more!\n"
934 msgid "Not a valid commit name %s"
940 "The merge base %s is bad.\n"
941 "This means the bug has been fixed between %s and [%s].\n"
947 "The merge base %s is new.\n"
948 "The property has changed between %s and [%s].\n"
954 "The merge base %s is %s.\n"
955 "This means the first '%s' commit is between %s and [%s].\n"
961 "Some %s revs are not ancestors of the %s rev.\n"
962 "git bisect cannot work properly in this case.\n"
963 "Maybe you mistook %s and %s revs?\n"
969 "the merge base between %s and [%s] must be skipped.\n"
970 "So we cannot be sure the first %s commit is between %s and %s.\n"
971 "We continue anyway."
976 msgid "Bisecting: a merge base must be tested\n"
981 msgid "a %s revision is needed"
984 #: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
986 msgid "could not create file '%s'"
989 #: bisect.c:928 builtin/merge.c:148
991 msgid "could not read file '%s'"
995 msgid "reading bisect refs failed"
1000 msgid "%s was both %s and %s\n"
1006 "No testable commit found.\n"
1007 "Maybe you started with bad path parameters?\n"
1012 msgid "(roughly %d step)"
1013 msgid_plural "(roughly %d steps)"
1017 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
1018 #. steps)" translation.
1022 msgid "Bisecting: %d revision left to test after this %s\n"
1023 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1028 msgid "--contents and --reverse do not blend well."
1032 msgid "cannot use --contents with final commit object name"
1036 msgid "--reverse and --first-parent together require specified latest commit"
1039 #: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
1040 #: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
1041 #: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
1042 #: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
1043 #: builtin/shortlog.c:192
1044 msgid "revision walk setup failed"
1049 "--reverse --first-parent together require range along first-parent chain"
1054 msgid "no such path %s in %s"
1059 msgid "cannot read blob %s for path %s"
1066 "After fixing the error cause you may try to fix up\n"
1067 "the remote tracking information by invoking\n"
1068 "\"git branch --set-upstream-to=%s%s%s\"."
1073 msgid "Not setting branch %s as its own upstream."
1078 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
1083 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
1088 msgid "Branch '%s' set up to track local branch '%s' by rebasing."
1093 msgid "Branch '%s' set up to track local branch '%s'."
1098 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
1103 msgid "Branch '%s' set up to track remote ref '%s'."
1108 msgid "Branch '%s' set up to track local ref '%s' by rebasing."
1113 msgid "Branch '%s' set up to track local ref '%s'."
1117 msgid "Unable to write upstream branch configuration"
1122 msgid "Not tracking: ambiguous information for ref %s"
1127 msgid "'%s' is not a valid branch name."
1132 msgid "A branch named '%s' already exists."
1136 msgid "Cannot force update the current branch."
1141 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1146 msgid "the requested upstream branch '%s' does not exist"
1152 "If you are planning on basing your work on an upstream\n"
1153 "branch that already exists at the remote, you may need to\n"
1154 "run \"git fetch\" to retrieve it.\n"
1156 "If you are planning to push out a new local branch that\n"
1157 "will track its remote counterpart, you may want to use\n"
1158 "\"git push -u\" to set the upstream config as you push."
1163 msgid "Not a valid object name: '%s'."
1168 msgid "Ambiguous object name: '%s'."
1173 msgid "Not a valid branch point: '%s'."
1178 msgid "'%s' is already checked out at '%s'"
1183 msgid "HEAD of working tree %s is not updated"
1188 msgid "'%s' does not look like a v2 bundle file"
1193 msgid "unrecognized header: %s%s (%d)"
1196 #: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
1197 #: builtin/commit.c:791
1199 msgid "could not open '%s'"
1203 msgid "Repository lacks these prerequisite commits:"
1207 msgid "need a repository to verify a bundle"
1212 msgid "The bundle contains this ref:"
1213 msgid_plural "The bundle contains these %d refs:"
1218 msgid "The bundle records a complete history."
1223 msgid "The bundle requires this ref:"
1224 msgid_plural "The bundle requires these %d refs:"
1229 msgid "unable to dup bundle descriptor"
1233 msgid "Could not spawn pack-objects"
1237 msgid "pack-objects died"
1241 msgid "rev-list died"
1246 msgid "ref '%s' is excluded by the rev-list options"
1249 #: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
1251 msgid "unrecognized argument: %s"
1255 msgid "Refusing to create empty bundle."
1260 msgid "cannot create '%s'"
1264 msgid "index-pack died"
1269 msgid "invalid color value: %.*s"
1272 #: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
1273 #: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
1275 msgid "could not parse %s"
1280 msgid "%s %s is not a commit!"
1285 "Support for <GIT_DIR>/info/grafts is deprecated\n"
1286 "and will be removed in a future Git version.\n"
1288 "Please use \"git replace --convert-graft-file\"\n"
1289 "to convert the grafts into replace refs.\n"
1291 "Turn this message off by running\n"
1292 "\"git config advice.graftFileDeprecated false\""
1297 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
1302 msgid "Commit %s has a bad GPG signature allegedly by %s."
1307 msgid "Commit %s does not have a GPG signature."
1312 msgid "Commit %s has a good GPG signature by %s\n"
1317 "Warning: commit message did not conform to UTF-8.\n"
1318 "You may want to amend it after fixing the message, or set the config\n"
1319 "variable i18n.commitencoding to the encoding your project uses.\n"
1322 #: commit-graph.c:127
1323 msgid "commit-graph file is too small"
1326 #: commit-graph.c:192
1328 msgid "commit-graph signature %X does not match signature %X"
1331 #: commit-graph.c:199
1333 msgid "commit-graph version %X does not match version %X"
1336 #: commit-graph.c:206
1338 msgid "commit-graph hash version %X does not match version %X"
1341 #: commit-graph.c:229
1342 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
1345 #: commit-graph.c:240
1347 msgid "commit-graph improper chunk offset %08x%08x"
1350 #: commit-graph.c:283
1352 msgid "commit-graph chunk id %08x appears multiple times"
1355 #: commit-graph.c:347
1356 msgid "commit-graph has no base graphs chunk"
1359 #: commit-graph.c:357
1360 msgid "commit-graph chain does not match"
1363 #: commit-graph.c:404
1365 msgid "invalid commit-graph chain: line '%s' not a hash"
1368 #: commit-graph.c:430
1369 msgid "unable to find all commit-graph files"
1372 #: commit-graph.c:554 commit-graph.c:614
1373 msgid "invalid commit position. commit-graph is likely corrupt"
1376 #: commit-graph.c:575
1378 msgid "could not find commit %s"
1381 #: commit-graph.c:1002 builtin/pack-objects.c:2657
1383 msgid "unable to get type of object %s"
1386 #: commit-graph.c:1034
1387 msgid "Loading known commits in commit graph"
1390 #: commit-graph.c:1051
1391 msgid "Expanding reachable commits in commit graph"
1394 #: commit-graph.c:1070
1395 msgid "Clearing commit marks in commit graph"
1398 #: commit-graph.c:1089
1399 msgid "Computing commit graph generation numbers"
1402 #: commit-graph.c:1163
1404 msgid "Finding commits for commit graph in %d pack"
1405 msgid_plural "Finding commits for commit graph in %d packs"
1409 #: commit-graph.c:1176
1411 msgid "error adding pack %s"
1414 #: commit-graph.c:1180
1416 msgid "error opening index for %s"
1419 #: commit-graph.c:1204
1421 msgid "Finding commits for commit graph from %d ref"
1422 msgid_plural "Finding commits for commit graph from %d refs"
1426 #: commit-graph.c:1238
1427 msgid "Finding commits for commit graph among packed objects"
1430 #: commit-graph.c:1253
1431 msgid "Counting distinct commits in commit graph"
1434 #: commit-graph.c:1284
1435 msgid "Finding extra edges in commit graph"
1438 #: commit-graph.c:1332
1439 msgid "failed to write correct number of base graph ids"
1442 #: commit-graph.c:1365 midx.c:811
1444 msgid "unable to create leading directories of %s"
1447 #: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
1449 msgid "unable to create '%s'"
1452 #: commit-graph.c:1437
1454 msgid "Writing out commit graph in %d pass"
1455 msgid_plural "Writing out commit graph in %d passes"
1459 #: commit-graph.c:1478
1460 msgid "unable to open commit-graph chain file"
1463 #: commit-graph.c:1490
1464 msgid "failed to rename base commit-graph file"
1467 #: commit-graph.c:1510
1468 msgid "failed to rename temporary commit-graph file"
1471 #: commit-graph.c:1621
1472 msgid "Scanning merged commits"
1475 #: commit-graph.c:1632
1477 msgid "unexpected duplicate commit id %s"
1480 #: commit-graph.c:1657
1481 msgid "Merging commit-graph"
1484 #: commit-graph.c:1844
1486 msgid "the commit graph format cannot write %d commits"
1489 #: commit-graph.c:1855
1490 msgid "too many commits to write graph"
1493 #: commit-graph.c:1945
1494 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
1497 #: commit-graph.c:1955
1499 msgid "commit-graph has incorrect OID order: %s then %s"
1502 #: commit-graph.c:1965 commit-graph.c:1980
1504 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
1507 #: commit-graph.c:1972
1509 msgid "failed to parse commit %s from commit-graph"
1512 #: commit-graph.c:1989
1513 msgid "Verifying commits in commit graph"
1516 #: commit-graph.c:2002
1518 msgid "failed to parse commit %s from object database for commit-graph"
1521 #: commit-graph.c:2009
1523 msgid "root tree OID for commit %s in commit-graph is %s != %s"
1526 #: commit-graph.c:2019
1528 msgid "commit-graph parent list for commit %s is too long"
1531 #: commit-graph.c:2028
1533 msgid "commit-graph parent for %s is %s != %s"
1536 #: commit-graph.c:2041
1538 msgid "commit-graph parent list for commit %s terminates early"
1541 #: commit-graph.c:2046
1544 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
1547 #: commit-graph.c:2050
1550 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
1553 #: commit-graph.c:2065
1555 msgid "commit-graph generation for commit %s is %u != %u"
1558 #: commit-graph.c:2071
1560 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
1563 #: compat/obstack.c:406 compat/obstack.c:408
1564 msgid "memory exhausted"
1570 "exceeded maximum include depth (%d) while including\n"
1574 "This might be due to circular includes."
1579 msgid "could not expand include path '%s'"
1583 msgid "relative config includes must come from files"
1587 msgid "relative config include conditionals must come from files"
1592 msgid "key does not contain a section: %s"
1597 msgid "key does not contain variable name: %s"
1600 #: config.c:406 sequencer.c:2463
1602 msgid "invalid key: %s"
1607 msgid "invalid key (newline): %s"
1610 #: config.c:448 config.c:460
1612 msgid "bogus config parameter: %s"
1617 msgid "bogus format in %s"
1622 msgid "bad config line %d in blob %s"
1627 msgid "bad config line %d in file %s"
1632 msgid "bad config line %d in standard input"
1637 msgid "bad config line %d in submodule-blob %s"
1642 msgid "bad config line %d in command line %s"
1647 msgid "bad config line %d in %s"
1651 msgid "out of range"
1655 msgid "invalid unit"
1660 msgid "bad numeric config value '%s' for '%s': %s"
1665 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
1670 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
1675 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
1680 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
1685 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
1690 msgid "bad numeric config value '%s' for '%s' in %s: %s"
1695 msgid "failed to expand user dir in: '%s'"
1700 msgid "'%s' for '%s' is not a valid timestamp"
1705 msgid "abbrev length out of range: %d"
1708 #: config.c:1222 config.c:1233
1710 msgid "bad zlib compression level %d"
1714 msgid "core.commentChar should only be one character"
1719 msgid "invalid mode for object creation: %s"
1724 msgid "malformed value for %s"
1729 msgid "malformed value for %s: %s"
1733 msgid "must be one of nothing, matching, simple, upstream or current"
1736 #: config.c:1518 builtin/pack-objects.c:3410
1738 msgid "bad pack compression level %d"
1743 msgid "unable to load config blob object '%s'"
1748 msgid "reference '%s' does not point to a blob"
1753 msgid "unable to resolve config blob '%s'"
1758 msgid "failed to parse %s"
1762 msgid "unable to parse command-line config"
1766 msgid "unknown error occurred while reading the configuration files"
1771 msgid "Invalid %s: '%s'"
1776 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
1781 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
1786 msgid "unable to parse '%s' from command-line config"
1791 msgid "bad config variable '%s' in file '%s' at line %d"
1796 msgid "invalid section name '%s'"
1801 msgid "%s has multiple values"
1806 msgid "failed to write new configuration file %s"
1809 #: config.c:2775 config.c:3099
1811 msgid "could not lock config file %s"
1819 #: config.c:2821 builtin/config.c:328
1821 msgid "invalid pattern: %s"
1826 msgid "invalid config file %s"
1829 #: config.c:2859 config.c:3112
1831 msgid "fstat on %s failed"
1836 msgid "unable to mmap '%s'"
1839 #: config.c:2879 config.c:3117
1841 msgid "chmod on %s failed"
1844 #: config.c:2964 config.c:3214
1846 msgid "could not write config file %s"
1851 msgid "could not set '%s' to '%s'"
1854 #: config.c:3000 builtin/remote.c:782
1856 msgid "could not unset '%s'"
1861 msgid "invalid section name: %s"
1866 msgid "missing value for '%s'"
1870 msgid "the remote end hung up upon initial contact"
1875 "Could not read from remote repository.\n"
1877 "Please make sure you have the correct access rights\n"
1878 "and the repository exists."
1883 msgid "server doesn't support '%s'"
1888 msgid "server doesn't support feature '%s'"
1892 msgid "expected flush after capabilities"
1897 msgid "ignoring capabilities after first line '%s'"
1901 msgid "protocol error: unexpected capabilities^{}"
1906 msgid "protocol error: expected shallow sha-1, got '%s'"
1910 msgid "repository on the other end cannot be shallow"
1914 msgid "invalid packet"
1919 msgid "protocol error: unexpected '%s'"
1924 msgid "invalid ls-refs response: %s"
1928 msgid "expected flush after ref listing"
1933 msgid "protocol '%s' is not supported"
1937 msgid "unable to set SO_KEEPALIVE on socket"
1940 #: connect.c:635 connect.c:698
1942 msgid "Looking up %s ... "
1947 msgid "unable to look up %s (port %s) (%s)"
1950 #. TRANSLATORS: this is the end of "Looking up %s ... "
1951 #: connect.c:643 connect.c:714
1955 "Connecting to %s (port %s) ... "
1958 #: connect.c:665 connect.c:742
1961 "unable to connect to %s:\n"
1965 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
1966 #: connect.c:671 connect.c:748
1972 msgid "unable to look up %s (%s)"
1977 msgid "unknown port %s"
1980 #: connect.c:845 connect.c:1171
1982 msgid "strange hostname '%s' blocked"
1987 msgid "strange port '%s' blocked"
1992 msgid "cannot start proxy %s"
1996 msgid "no path specified; see 'git help pull' for valid url syntax"
2000 msgid "ssh variant 'simple' does not support -4"
2004 msgid "ssh variant 'simple' does not support -6"
2008 msgid "ssh variant 'simple' does not support setting port"
2013 msgid "strange pathname '%s' blocked"
2017 msgid "unable to fork"
2020 #: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
2021 msgid "Checking connectivity"
2025 msgid "Could not run 'git rev-list'"
2029 msgid "failed write to rev-list"
2033 msgid "failed to close rev-list's stdin"
2038 msgid "illegal crlf_action %d"
2043 msgid "CRLF would be replaced by LF in %s"
2049 "CRLF will be replaced by LF in %s.\n"
2050 "The file will have its original line endings in your working directory"
2055 msgid "LF would be replaced by CRLF in %s"
2061 "LF will be replaced by CRLF in %s.\n"
2062 "The file will have its original line endings in your working directory"
2067 msgid "BOM is prohibited in '%s' if encoded as %s"
2073 "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
2079 msgid "BOM is required in '%s' if encoded as %s"
2085 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
2086 "%sLE (depending on the byte order) as working-tree-encoding."
2089 #: convert.c:424 convert.c:495
2091 msgid "failed to encode '%s' from %s to %s"
2096 msgid "encoding '%s' from %s to %s and back is not the same"
2101 msgid "cannot fork to run external filter '%s'"
2106 msgid "cannot feed the input to external filter '%s'"
2111 msgid "external filter '%s' failed %d"
2114 #: convert.c:735 convert.c:738
2116 msgid "read from external filter '%s' failed"
2119 #: convert.c:741 convert.c:796
2121 msgid "external filter '%s' failed"
2125 msgid "unexpected filter type"
2129 msgid "path name too long for external filter"
2135 "external filter '%s' is not available anymore although not all paths have "
2140 msgid "true/false are no valid working-tree-encodings"
2143 #: convert.c:1398 convert.c:1432
2145 msgid "%s: clean filter '%s' failed"
2150 msgid "%s: smudge filter %s failed"
2154 msgid "in the future"
2159 msgid "%<PRIuMAX> second ago"
2160 msgid_plural "%<PRIuMAX> seconds ago"
2166 msgid "%<PRIuMAX> minute ago"
2167 msgid_plural "%<PRIuMAX> minutes ago"
2173 msgid "%<PRIuMAX> hour ago"
2174 msgid_plural "%<PRIuMAX> hours ago"
2180 msgid "%<PRIuMAX> day ago"
2181 msgid_plural "%<PRIuMAX> days ago"
2187 msgid "%<PRIuMAX> week ago"
2188 msgid_plural "%<PRIuMAX> weeks ago"
2194 msgid "%<PRIuMAX> month ago"
2195 msgid_plural "%<PRIuMAX> months ago"
2201 msgid "%<PRIuMAX> year"
2202 msgid_plural "%<PRIuMAX> years"
2206 #. TRANSLATORS: "%s" is "<n> years"
2209 msgid "%s, %<PRIuMAX> month ago"
2210 msgid_plural "%s, %<PRIuMAX> months ago"
2214 #: date.c:196 date.c:201
2216 msgid "%<PRIuMAX> year ago"
2217 msgid_plural "%<PRIuMAX> years ago"
2221 #: delta-islands.c:272
2222 msgid "Propagating island marks"
2225 #: delta-islands.c:290
2227 msgid "bad tree object %s"
2230 #: delta-islands.c:334
2232 msgid "failed to load island regex for '%s': %s"
2235 #: delta-islands.c:390
2237 msgid "island regex from config has too many capture groups (max=%d)"
2240 #: delta-islands.c:467
2242 msgid "Marked %d islands, done.\n"
2245 #: diffcore-order.c:24
2247 msgid "failed to read orderfile '%s'"
2250 #: diffcore-rename.c:544
2251 msgid "Performing inexact rename detection"
2254 #: diff-no-index.c:238
2255 msgid "git diff --no-index [<options>] <path> <path>"
2258 #: diff-no-index.c:263
2260 "Not a git repository. Use --no-index to compare two paths outside a working "
2266 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
2271 msgid " Unknown dirstat parameter '%s'\n"
2276 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
2277 "'dimmed-zebra', 'plain'"
2283 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
2284 "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
2289 "color-moved-ws: allow-indentation-change cannot be combined with other "
2295 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
2301 "Found errors in 'diff.dirstat' config variable:\n"
2307 msgid "external diff died, stopping at %s"
2311 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
2315 msgid "-G, -S and --find-object are mutually exclusive"
2319 msgid "--follow requires exactly one pathspec"
2324 msgid "invalid --stat value: %s"
2327 #: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
2328 #: parse-options.c:199 parse-options.c:203
2330 msgid "%s expects a numerical value"
2336 "Failed to parse --dirstat/-X option parameter:\n"
2342 msgid "unknown change class '%c' in --diff-filter=%s"
2347 msgid "unknown value after ws-error-highlight=%.*s"
2352 msgid "unable to resolve '%s'"
2355 #: diff.c:4899 diff.c:4905
2357 msgid "%s expects <n>/<m> form"
2362 msgid "%s expects a character, got '%s'"
2367 msgid "bad --color-moved argument: %s"
2372 msgid "invalid mode '%s' in --color-moved-ws"
2377 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
2381 #: diff.c:5033 diff.c:5053
2383 msgid "invalid argument to %s"
2388 msgid "failed to parse --submodule option parameter: '%s'"
2393 msgid "bad --word-diff argument: %s"
2397 msgid "Diff output format options"
2400 #: diff.c:5272 diff.c:5278
2401 msgid "generate patch"
2404 #: diff.c:5275 builtin/log.c:172
2405 msgid "suppress diff output"
2408 #: diff.c:5280 diff.c:5394 diff.c:5401
2412 #: diff.c:5281 diff.c:5284
2413 msgid "generate diffs with <n> lines context"
2417 msgid "generate the diff in raw format"
2421 msgid "synonym for '-p --raw'"
2425 msgid "synonym for '-p --stat'"
2429 msgid "machine friendly --stat"
2433 msgid "output only the last line of --stat"
2436 #: diff.c:5302 diff.c:5310
2437 msgid "<param1,param2>..."
2442 "output the distribution of relative amount of changes for each sub-directory"
2446 msgid "synonym for --dirstat=cumulative"
2450 msgid "synonym for --dirstat=files,param1,param2..."
2454 msgid "warn if changes introduce conflict markers or whitespace errors"
2458 msgid "condensed summary such as creations, renames and mode changes"
2462 msgid "show only names of changed files"
2466 msgid "show only names and status of changed files"
2470 msgid "<width>[,<name-width>[,<count>]]"
2474 msgid "generate diffstat"
2477 #: diff.c:5329 diff.c:5332 diff.c:5335
2482 msgid "generate diffstat with a given width"
2486 msgid "generate diffstat with a given name width"
2490 msgid "generate diffstat with a given graph width"
2498 msgid "generate diffstat with limited lines"
2502 msgid "generate compact summary in diffstat"
2506 msgid "output a binary diff that can be applied"
2510 msgid "show full pre- and post-image object names on the \"index\" lines"
2514 msgid "show colored diff"
2523 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
2529 "do not munge pathnames and use NULs as output field terminators in --raw or "
2533 #: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
2538 msgid "show the given source prefix instead of \"a/\""
2542 msgid "show the given destination prefix instead of \"b/\""
2546 msgid "prepend an additional prefix to every line of output"
2550 msgid "do not show any source or destination prefix"
2554 msgid "show context between diff hunks up to the specified number of lines"
2557 #: diff.c:5375 diff.c:5380 diff.c:5385
2562 msgid "specify the character to indicate a new line instead of '+'"
2566 msgid "specify the character to indicate an old line instead of '-'"
2570 msgid "specify the character to indicate a context instead of ' '"
2574 msgid "Diff rename options"
2582 msgid "break complete rewrite changes into pairs of delete and create"
2586 msgid "detect renames"
2590 msgid "omit the preimage for deletes"
2594 msgid "detect copies"
2598 msgid "use unmodified files as source to find copies"
2602 msgid "disable rename detection"
2606 msgid "use empty blobs as rename source"
2610 msgid "continue listing the history of a file beyond renames"
2615 "prevent rename/copy detection if the number of rename/copy targets exceeds "
2620 msgid "Diff algorithm options"
2624 msgid "produce the smallest possible diff"
2628 msgid "ignore whitespace when comparing lines"
2632 msgid "ignore changes in amount of whitespace"
2636 msgid "ignore changes in whitespace at EOL"
2640 msgid "ignore carrier-return at the end of line"
2644 msgid "ignore changes whose lines are all blank"
2648 msgid "heuristic to shift diff hunk boundaries for easy reading"
2652 msgid "generate diff using the \"patience diff\" algorithm"
2656 msgid "generate diff using the \"histogram diff\" algorithm"
2664 msgid "choose a diff algorithm"
2672 msgid "generate diff using the \"anchored diff\" algorithm"
2675 #: diff.c:5453 diff.c:5462 diff.c:5465
2680 msgid "show word diff, using <mode> to delimit changed words"
2683 #: diff.c:5456 diff.c:5459 diff.c:5504
2688 msgid "use <regex> to decide what a word is"
2692 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
2696 msgid "moved lines of code are colored differently"
2700 msgid "how white spaces are ignored in --color-moved"
2704 msgid "Other diff options"
2708 msgid "when run from subdir, exclude changes outside and show relative paths"
2712 msgid "treat all files as text"
2716 msgid "swap two inputs, reverse the diff"
2720 msgid "exit with 1 if there were differences, 0 otherwise"
2724 msgid "disable all output of the program"
2728 msgid "allow an external diff helper to be executed"
2732 msgid "run external text conversion filters when comparing binary files"
2740 msgid "ignore changes to submodules in the diff generation"
2748 msgid "specify how differences in submodules are shown"
2752 msgid "hide 'git add -N' entries from the index"
2756 msgid "treat 'git add -N' entries as real in the index"
2765 "look for differences that change the number of occurrences of the specified "
2771 "look for differences that change the number of occurrences of the specified "
2776 msgid "show all changes in the changeset with -S or -G"
2780 msgid "treat <string> in -S as extended POSIX regular expression"
2784 msgid "control the order in which files appear in the output"
2793 "look for differences that change the number of occurrences of the specified "
2798 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
2802 msgid "select files by diff type"
2810 msgid "Output to a specific file"
2814 msgid "inexact rename detection was skipped due to too many files."
2818 msgid "only found copies from modified paths due to too many files."
2824 "you may want to set your %s variable to at least %d and retry the command."
2829 msgid "pathspec '%s' did not match any file(s) known to git"
2834 msgid "cannot use %s as an exclude file"
2839 msgid "could not open directory '%s'"
2843 msgid "failed to get kernel name and information"
2847 msgid "untracked cache is disabled on this system or location"
2852 msgid "index file corrupt in repo %s"
2855 #: dir.c:3058 dir.c:3063
2857 msgid "could not create directories for %s"
2862 msgid "could not migrate git directory from '%s' to '%s'"
2867 msgid "hint: Waiting for your editor to close the file...%c"
2871 msgid "Filtering content"
2876 msgid "could not stat file '%s'"
2879 #: environment.c:150
2881 msgid "bad git namespace path \"%s\""
2884 #: environment.c:332
2886 msgid "could not set GIT_DIR to '%s'"
2891 msgid "too many args to run %s"
2894 #: fetch-object.c:17
2895 msgid "Remote with no URL"
2899 msgid "git fetch-pack: expected shallow list"
2903 msgid "git fetch-pack: expected a flush packet after shallow list"
2907 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
2912 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
2916 msgid "unable to write to remote"
2920 msgid "--stateless-rpc requires multi_ack_detailed"
2923 #: fetch-pack.c:360 fetch-pack.c:1284
2925 msgid "invalid shallow line: %s"
2928 #: fetch-pack.c:366 fetch-pack.c:1290
2930 msgid "invalid unshallow line: %s"
2933 #: fetch-pack.c:368 fetch-pack.c:1292
2935 msgid "object not found: %s"
2938 #: fetch-pack.c:371 fetch-pack.c:1295
2940 msgid "error in object: %s"
2943 #: fetch-pack.c:373 fetch-pack.c:1297
2945 msgid "no shallow found: %s"
2948 #: fetch-pack.c:376 fetch-pack.c:1301
2950 msgid "expected shallow/unshallow, got %s"
2955 msgid "got %s %d %s"
2960 msgid "invalid commit %s"
2967 #: fetch-pack.c:477 progress.c:277
2973 msgid "got %s (%d) %s"
2978 msgid "Marking %s as complete"
2983 msgid "already have %s (%s)"
2987 msgid "fetch-pack: unable to fork off sideband demultiplexer"
2991 msgid "protocol error: bad pack header"
2996 msgid "fetch-pack: unable to fork off %s"
3005 msgid "error in sideband demultiplexer"
3010 msgid "Server version is %.*s"
3013 #: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
3014 #: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
3015 #: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
3016 #: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
3018 msgid "Server supports %s"
3022 msgid "Server does not support shallow clients"
3026 msgid "Server does not support --shallow-since"
3030 msgid "Server does not support --shallow-exclude"
3034 msgid "Server does not support --deepen"
3037 #: fetch-pack.c:1001
3038 msgid "no common commits"
3041 #: fetch-pack.c:1013 fetch-pack.c:1462
3042 msgid "git fetch-pack: fetch failed."
3045 #: fetch-pack.c:1151
3046 msgid "Server does not support shallow requests"
3049 #: fetch-pack.c:1157
3050 msgid "Server supports filter"
3053 #: fetch-pack.c:1184
3054 msgid "unable to write request to remote"
3057 #: fetch-pack.c:1202
3059 msgid "error reading section header '%s'"
3062 #: fetch-pack.c:1208
3064 msgid "expected '%s', received '%s'"
3067 #: fetch-pack.c:1247
3069 msgid "unexpected acknowledgment line: '%s'"
3072 #: fetch-pack.c:1252
3074 msgid "error processing acks: %d"
3077 #: fetch-pack.c:1262
3078 msgid "expected packfile to be sent after 'ready'"
3081 #: fetch-pack.c:1264
3082 msgid "expected no other sections to be sent after no 'ready'"
3085 #: fetch-pack.c:1306
3087 msgid "error processing shallow info: %d"
3090 #: fetch-pack.c:1353
3092 msgid "expected wanted-ref, got '%s'"
3095 #: fetch-pack.c:1358
3097 msgid "unexpected wanted-ref: '%s'"
3100 #: fetch-pack.c:1363
3102 msgid "error processing wanted refs: %d"
3105 #: fetch-pack.c:1689
3106 msgid "no matching remote head"
3109 #: fetch-pack.c:1712 builtin/clone.c:686
3110 msgid "remote did not send all necessary objects"
3113 #: fetch-pack.c:1739
3115 msgid "no such remote ref %s"
3118 #: fetch-pack.c:1742
3120 msgid "Server does not allow request for unadvertised object %s"
3123 #: gpg-interface.c:321
3124 msgid "gpg failed to sign the data"
3127 #: gpg-interface.c:347
3128 msgid "could not create temporary file"
3131 #: gpg-interface.c:350
3133 msgid "failed writing detached signature to '%s'"
3138 msgid "ignore invalid color '%.*s' in log.graphColors"
3143 msgid "'%s': unable to read %s"
3146 #: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
3149 msgid "failed to stat '%s'"
3154 msgid "'%s': short read"
3158 msgid "start a working area (see also: git help tutorial)"
3162 msgid "work on the current change (see also: git help everyday)"
3166 msgid "examine the history and state (see also: git help revisions)"
3170 msgid "grow, mark and tweak your common history"
3174 msgid "collaborate (see also: git help workflows)"
3178 msgid "Main Porcelain Commands"
3182 msgid "Ancillary Commands / Manipulators"
3186 msgid "Ancillary Commands / Interrogators"
3190 msgid "Interacting with Others"
3194 msgid "Low-level Commands / Manipulators"
3198 msgid "Low-level Commands / Interrogators"
3202 msgid "Low-level Commands / Synching Repositories"
3206 msgid "Low-level Commands / Internal Helpers"
3211 msgid "available git commands in '%s'"
3215 msgid "git commands available from elsewhere on your $PATH"
3219 msgid "These are common Git commands used in various situations:"
3222 #: help.c:363 git.c:98
3224 msgid "unsupported command listing type '%s'"
3228 msgid "The common Git guides are:"
3232 msgid "See 'git help <command>' to read about a specific subcommand"
3236 msgid "External commands"
3240 msgid "Command aliases"
3246 "'%s' appears to be a git command, but we were not\n"
3247 "able to execute it. Maybe git-%s is broken?"
3251 msgid "Uh oh. Your system reports no Git commands at all."
3256 msgid "WARNING: You called a Git command named '%s', which does not exist."
3261 msgid "Continuing under the assumption that you meant '%s'."
3266 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
3271 msgid "git: '%s' is not a git command. See 'git --help'."
3277 "The most similar command is"
3280 "The most similar commands are"
3285 msgid "git version [<options>]"
3296 "Did you mean this?"
3299 "Did you mean one of these?"
3306 "*** Please tell me who you are.\n"
3310 " git config --global user.email \"you@example.com\"\n"
3311 " git config --global user.name \"Your Name\"\n"
3313 "to set your account's default identity.\n"
3314 "Omit --global to set the identity only in this repository.\n"
3319 msgid "no email was given and auto-detection is disabled"
3324 msgid "unable to auto-detect email address (got '%s')"
3328 msgid "no name was given and auto-detection is disabled"
3333 msgid "unable to auto-detect name (got '%s')"
3338 msgid "empty ident name (for <%s>) not allowed"
3343 msgid "name consists only of disallowed characters: %s"
3346 #: ident.c:436 builtin/commit.c:611
3348 msgid "invalid date format: %s"
3351 #: list-objects.c:129
3353 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
3356 #: list-objects.c:142
3358 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
3361 #: list-objects.c:378
3363 msgid "unable to load root tree for commit %s"
3366 #: list-objects-filter-options.c:36
3367 msgid "multiple filter-specs cannot be combined"
3370 #: list-objects-filter-options.c:58
3371 msgid "expected 'tree:<depth>'"
3374 #: list-objects-filter-options.c:84
3375 msgid "sparse:path filters support has been dropped"
3378 #: list-objects-filter-options.c:94
3380 msgid "invalid filter-spec '%s'"
3383 #: list-objects-filter-options.c:158
3384 msgid "cannot change partial clone promisor remote"
3390 "Unable to create '%s.lock': %s.\n"
3392 "Another git process seems to be running in this repository, e.g.\n"
3393 "an editor opened by 'git commit'. Please make sure all processes\n"
3394 "are terminated then try again. If it still fails, a git process\n"
3395 "may have crashed in this repository earlier:\n"
3396 "remove the file manually to continue."
3401 msgid "Unable to create '%s.lock': %s"
3405 msgid "failed to read the cache"
3408 #: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
3409 #: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
3410 #: builtin/stash.c:264
3411 msgid "unable to write new index file"
3414 #: merge-recursive.c:322
3415 msgid "(bad commit)\n"
3418 #: merge-recursive.c:345
3420 msgid "add_cacheinfo failed for path '%s'; merge aborting."
3423 #: merge-recursive.c:354
3425 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
3428 #: merge-recursive.c:437
3429 msgid "error building trees"
3432 #: merge-recursive.c:863
3434 msgid "failed to create path '%s'%s"
3437 #: merge-recursive.c:874
3439 msgid "Removing %s to make room for subdirectory\n"
3442 #: merge-recursive.c:888 merge-recursive.c:907
3443 msgid ": perhaps a D/F conflict?"
3446 #: merge-recursive.c:897
3448 msgid "refusing to lose untracked file at '%s'"
3451 #: merge-recursive.c:938 builtin/cat-file.c:40
3453 msgid "cannot read object %s '%s'"
3456 #: merge-recursive.c:941
3458 msgid "blob expected for %s '%s'"
3461 #: merge-recursive.c:965
3463 msgid "failed to open '%s': %s"
3466 #: merge-recursive.c:976
3468 msgid "failed to symlink '%s': %s"
3471 #: merge-recursive.c:981
3473 msgid "do not know what to do with %06o %s '%s'"
3476 #: merge-recursive.c:1177
3478 msgid "Failed to merge submodule %s (not checked out)"
3481 #: merge-recursive.c:1184
3483 msgid "Failed to merge submodule %s (commits not present)"
3486 #: merge-recursive.c:1191
3488 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
3491 #: merge-recursive.c:1199 merge-recursive.c:1211
3493 msgid "Fast-forwarding submodule %s to the following commit:"
3496 #: merge-recursive.c:1202 merge-recursive.c:1214
3498 msgid "Fast-forwarding submodule %s"
3501 #: merge-recursive.c:1237
3503 msgid "Failed to merge submodule %s (merge following commits not found)"
3506 #: merge-recursive.c:1241
3508 msgid "Failed to merge submodule %s (not fast-forward)"
3511 #: merge-recursive.c:1242
3512 msgid "Found a possible merge resolution for the submodule:\n"
3515 #: merge-recursive.c:1245
3518 "If this is correct simply add it to the index for example\n"
3521 " git update-index --cacheinfo 160000 %s \"%s\"\n"
3523 "which will accept this suggestion.\n"
3526 #: merge-recursive.c:1254
3528 msgid "Failed to merge submodule %s (multiple merges found)"
3531 #: merge-recursive.c:1327
3532 msgid "Failed to execute internal merge"
3535 #: merge-recursive.c:1332
3537 msgid "Unable to add %s to database"
3540 #: merge-recursive.c:1364
3542 msgid "Auto-merging %s"
3545 #: merge-recursive.c:1387
3547 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
3550 #: merge-recursive.c:1459
3553 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
3557 #: merge-recursive.c:1464
3560 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
3564 #: merge-recursive.c:1471
3567 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
3571 #: merge-recursive.c:1476
3574 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
3575 "left in tree at %s."
3578 #: merge-recursive.c:1511
3582 #: merge-recursive.c:1511
3586 #: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
3588 msgid "Refusing to lose dirty file at %s"
3591 #: merge-recursive.c:1601
3593 msgid "Refusing to lose untracked file at %s, even though it's in the way."
3596 #: merge-recursive.c:1659
3598 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
3601 #: merge-recursive.c:1690
3603 msgid "%s is a directory in %s adding as %s instead"
3606 #: merge-recursive.c:1695
3608 msgid "Refusing to lose untracked file at %s; adding as %s instead"
3611 #: merge-recursive.c:1714
3614 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
3615 "\"->\"%s\" in \"%s\"%s"
3618 #: merge-recursive.c:1719
3619 msgid " (left unresolved)"
3622 #: merge-recursive.c:1828
3624 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
3627 #: merge-recursive.c:2035
3630 "CONFLICT (directory rename split): Unclear where to place %s because "
3631 "directory %s was renamed to multiple other directories, with no destination "
3632 "getting a majority of the files."
3635 #: merge-recursive.c:2067
3638 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
3639 "implicit directory rename(s) putting the following path(s) there: %s."
3642 #: merge-recursive.c:2077
3645 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
3646 "implicit directory renames tried to put these paths there: %s"
3649 #: merge-recursive.c:2169
3652 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
3656 #: merge-recursive.c:2413
3659 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
3663 #: merge-recursive.c:2938
3665 msgid "cannot read object %s"
3668 #: merge-recursive.c:2941
3670 msgid "object %s is not a blob"
3673 #: merge-recursive.c:3005
3677 #: merge-recursive.c:3005
3681 #: merge-recursive.c:3017
3685 #: merge-recursive.c:3021
3689 #: merge-recursive.c:3044
3691 msgid "Skipped %s (merged same as existing)"
3694 #: merge-recursive.c:3066 git-submodule.sh:937
3698 #: merge-recursive.c:3067
3700 msgid "CONFLICT (%s): Merge conflict in %s"
3703 #: merge-recursive.c:3097
3705 msgid "Adding as %s instead"
3708 #: merge-recursive.c:3179
3711 "Path updated: %s added in %s inside a directory that was renamed in %s; "
3715 #: merge-recursive.c:3182
3718 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
3719 "in %s, suggesting it should perhaps be moved to %s."
3722 #: merge-recursive.c:3186
3725 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
3726 "%s; moving it to %s."
3729 #: merge-recursive.c:3189
3732 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
3733 "was renamed in %s, suggesting it should perhaps be moved to %s."
3736 #: merge-recursive.c:3303
3741 #: merge-recursive.c:3326
3742 msgid "file/directory"
3745 #: merge-recursive.c:3331
3746 msgid "directory/file"
3749 #: merge-recursive.c:3338
3751 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
3754 #: merge-recursive.c:3347
3759 #: merge-recursive.c:3356
3761 msgid "CONFLICT (add/add): Merge conflict in %s"
3764 #: merge-recursive.c:3394
3767 "Your local changes to the following files would be overwritten by merge:\n"
3771 #: merge-recursive.c:3405
3772 msgid "Already up to date!"
3775 #: merge-recursive.c:3414
3777 msgid "merging of trees %s and %s failed"
3780 #: merge-recursive.c:3513
3784 #: merge-recursive.c:3526
3786 msgid "found %u common ancestor:"
3787 msgid_plural "found %u common ancestors:"
3791 #: merge-recursive.c:3565
3792 msgid "merge returned no commit"
3795 #: merge-recursive.c:3631
3797 msgid "Could not parse object '%s'"
3800 #: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
3801 msgid "Unable to write index."
3806 msgid "multi-pack-index file %s is too small"
3811 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
3816 msgid "multi-pack-index version %d not recognized"
3821 msgid "hash version %u does not match"
3825 msgid "invalid chunk offset (too large)"
3829 msgid "terminating multi-pack-index chunk id appears earlier than expected"
3833 msgid "multi-pack-index missing required pack-name chunk"
3837 msgid "multi-pack-index missing required OID fanout chunk"
3841 msgid "multi-pack-index missing required OID lookup chunk"
3845 msgid "multi-pack-index missing required object offsets chunk"
3850 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
3855 msgid "bad pack-int-id: %u (%u total packs)"
3859 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
3863 msgid "error preparing packfile from multi-pack-index"
3868 msgid "failed to add packfile '%s'"
3873 msgid "failed to open pack-index '%s'"
3878 msgid "failed to locate object %d in packfile"
3883 msgid "did not see pack-file %s to drop"
3888 msgid "failed to clear multi-pack-index at %s"
3892 msgid "Looking for referenced packfiles"
3898 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
3902 msgid "Verifying OID order in MIDX"
3907 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
3911 msgid "Sorting objects by packfile"
3915 msgid "Verifying object offsets"
3920 msgid "failed to load pack entry for oid[%d] = %s"
3925 msgid "failed to load pack-index for packfile %s"
3930 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
3934 msgid "could not start pack-objects"
3938 msgid "could not finish pack-objects"
3943 msgid "unable to create lazy_dir thread: %s"
3948 msgid "unable to create lazy_name thread: %s"
3953 msgid "unable to join lazy_name thread: %s"
3956 #: notes-merge.c:277
3959 "You have not concluded your previous notes merge (%s exists).\n"
3960 "Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
3961 "commit/abort the previous merge before you start a new notes merge."
3964 #: notes-merge.c:284
3966 msgid "You have not concluded your notes merge (%s exists)."
3970 msgid "Cannot commit uninitialized/unreferenced notes tree"
3973 #: notes-utils.c:105
3975 msgid "Bad notes.rewriteMode value: '%s'"
3978 #: notes-utils.c:115
3980 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
3983 #. TRANSLATORS: The first %s is the name of
3984 #. the environment variable, the second %s is
3987 #: notes-utils.c:145
3989 msgid "Bad %s value: '%s'"
3994 msgid "invalid object type \"%s\""
3999 msgid "object %s is a %s, not a %s"
4004 msgid "object %s has unknown type id %d"
4009 msgid "unable to parse object: %s"
4012 #: object.c:267 object.c:278
4014 msgid "hash mismatch %s"
4018 msgid "offset before end of packfile (broken .idx?)"
4023 msgid "offset before start of pack index for %s (corrupt index?)"
4028 msgid "offset beyond end of pack index for %s (truncated index?)"
4031 #: parse-options.c:38
4033 msgid "%s requires a value"
4036 #: parse-options.c:73
4038 msgid "%s is incompatible with %s"
4041 #: parse-options.c:78
4043 msgid "%s : incompatible with something else"
4046 #: parse-options.c:92 parse-options.c:96 parse-options.c:319
4048 msgid "%s takes no value"
4051 #: parse-options.c:94
4053 msgid "%s isn't available"
4056 #: parse-options.c:219
4058 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
4061 #: parse-options.c:389
4063 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
4066 #: parse-options.c:423 parse-options.c:431
4068 msgid "did you mean `--%s` (with two dashes ?)"
4071 #: parse-options.c:859
4073 msgid "unknown option `%s'"
4076 #: parse-options.c:861
4078 msgid "unknown switch `%c'"
4081 #: parse-options.c:863
4083 msgid "unknown non-ascii option in string: `%s'"
4086 #: parse-options.c:887
4090 #: parse-options.c:906
4095 #. TRANSLATORS: the colon here should align with the
4096 #. one in "usage: %s" translation.
4098 #: parse-options.c:912
4103 #: parse-options.c:915
4108 #: parse-options.c:954
4112 #: parse-options.c:968
4114 msgid "alias of --%s"
4117 #: parse-options-cb.c:20 parse-options-cb.c:24
4119 msgid "option `%s' expects a numerical value"
4122 #: parse-options-cb.c:41
4124 msgid "malformed expiration date '%s'"
4127 #: parse-options-cb.c:54
4129 msgid "option `%s' expects \"always\", \"auto\", or \"never\""
4132 #: parse-options-cb.c:130 parse-options-cb.c:147
4134 msgid "malformed object name '%s'"
4139 msgid "Could not make %s writable by group"
4143 msgid "Escape character '\\' not allowed as last character in attr value"
4147 msgid "Only one 'attr:' specification is allowed."
4151 msgid "attr spec must not be empty"
4156 msgid "invalid attribute name %s"
4160 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
4165 "global 'literal' pathspec setting is incompatible with all other global "
4170 msgid "invalid parameter for pathspec magic 'prefix'"
4175 msgid "Invalid pathspec magic '%.*s' in '%s'"
4180 msgid "Missing ')' at the end of pathspec magic in '%s'"
4185 msgid "Unimplemented pathspec magic '%c' in '%s'"
4190 msgid "%s: 'literal' and 'glob' are incompatible"
4195 msgid "%s: '%s' is outside repository"
4200 msgid "'%s' (mnemonic: '%c')"
4205 msgid "%s: pathspec magic not supported by this command: %s"
4210 msgid "pathspec '%s' is beyond a symbolic link"
4214 msgid "unable to write flush packet"
4218 msgid "unable to write delim packet"
4222 msgid "flush packet write failed"
4225 #: pkt-line.c:146 pkt-line.c:232
4226 msgid "protocol error: impossibly long line"
4229 #: pkt-line.c:162 pkt-line.c:164
4230 msgid "packet write with format failed"
4234 msgid "packet write failed - data exceeds max packet size"
4237 #: pkt-line.c:203 pkt-line.c:210
4238 msgid "packet write failed"
4246 msgid "the remote end hung up unexpectedly"
4251 msgid "protocol error: bad line length character: %.4s"
4254 #: pkt-line.c:341 pkt-line.c:346
4256 msgid "protocol error: bad line length %d"
4261 msgid "remote error: %s"
4264 #: preload-index.c:119
4265 msgid "Refreshing index"
4268 #: preload-index.c:138
4270 msgid "unable to create threaded lstat: %s"
4274 msgid "unable to parse --pretty format"
4278 msgid "could not start `log`"
4282 msgid "could not read `log` output"
4285 #: range-diff.c:91 sequencer.c:5021
4287 msgid "could not parse commit '%s'"
4292 msgid "could not parse git header '%.*s'"
4296 msgid "failed to generate diff"
4299 #: range-diff.c:506 range-diff.c:508
4301 msgid "could not parse log for '%s'"
4306 msgid "will not add file alias '%s' ('%s' already exists in index)"
4310 msgid "cannot create an empty blob in the object database"
4315 msgid "%s: can only add regular files, symbolic links or git-directories"
4320 msgid "'%s' does not have a commit checked out"
4325 msgid "unable to index file '%s'"
4330 msgid "unable to add '%s' to index"
4335 msgid "unable to stat '%s'"
4338 #: read-cache.c:1314
4340 msgid "'%s' appears as both a file and as a directory"
4343 #: read-cache.c:1499
4344 msgid "Refresh index"
4347 #: read-cache.c:1613
4350 "index.version set, but the value is invalid.\n"
4354 #: read-cache.c:1623
4357 "GIT_INDEX_VERSION set, but the value is invalid.\n"
4361 #: read-cache.c:1679
4363 msgid "bad signature 0x%08x"
4366 #: read-cache.c:1682
4368 msgid "bad index version %d"
4371 #: read-cache.c:1691
4372 msgid "bad index file sha1 signature"
4375 #: read-cache.c:1721
4377 msgid "index uses %.4s extension, which we do not understand"
4380 #: read-cache.c:1723
4382 msgid "ignoring %.4s extension"
4385 #: read-cache.c:1760
4387 msgid "unknown index entry format 0x%08x"
4390 #: read-cache.c:1776
4392 msgid "malformed name field in the index, near path '%s'"
4395 #: read-cache.c:1833
4396 msgid "unordered stage entries in index"
4399 #: read-cache.c:1836
4401 msgid "multiple stage entries for merged file '%s'"
4404 #: read-cache.c:1839
4406 msgid "unordered stage entries for '%s'"
4409 #: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
4410 #: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
4411 #: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
4412 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
4413 #: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
4414 msgid "index file corrupt"
4417 #: read-cache.c:2087
4419 msgid "unable to create load_cache_entries thread: %s"
4422 #: read-cache.c:2100
4424 msgid "unable to join load_cache_entries thread: %s"
4427 #: read-cache.c:2133
4429 msgid "%s: index file open failed"
4432 #: read-cache.c:2137
4434 msgid "%s: cannot stat the open index"
4437 #: read-cache.c:2141
4439 msgid "%s: index file smaller than expected"
4442 #: read-cache.c:2145
4444 msgid "%s: unable to map index file"
4447 #: read-cache.c:2187
4449 msgid "unable to create load_index_extensions thread: %s"
4452 #: read-cache.c:2214
4454 msgid "unable to join load_index_extensions thread: %s"
4457 #: read-cache.c:2246
4459 msgid "could not freshen shared index '%s'"
4462 #: read-cache.c:2293
4464 msgid "broken index, expect %s in %s, got %s"
4467 #: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
4469 msgid "could not close '%s'"
4472 #: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
4474 msgid "could not stat '%s'"
4477 #: read-cache.c:3105
4479 msgid "unable to open git dir: %s"
4482 #: read-cache.c:3117
4484 msgid "unable to unlink: %s"
4487 #: read-cache.c:3142
4489 msgid "cannot fix permission bits on '%s'"
4492 #: read-cache.c:3291
4494 msgid "%s: cannot drop to stage #0"
4497 #: rebase-interactive.c:26
4500 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
4503 #: rebase-interactive.c:35
4507 "p, pick <commit> = use commit\n"
4508 "r, reword <commit> = use commit, but edit the commit message\n"
4509 "e, edit <commit> = use commit, but stop for amending\n"
4510 "s, squash <commit> = use commit, but meld into previous commit\n"
4511 "f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
4512 "x, exec <command> = run command (the rest of the line) using shell\n"
4513 "b, break = stop here (continue rebase later with 'git rebase --continue')\n"
4514 "d, drop <commit> = remove commit\n"
4515 "l, label <label> = label current HEAD with a name\n"
4516 "t, reset <label> = reset HEAD to a label\n"
4517 "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
4518 ". create a merge commit using the original merge commit's\n"
4519 ". message (or the oneline, if no original merge commit was\n"
4520 ". specified). Use -c <commit> to reword the commit message.\n"
4522 "These lines can be re-ordered; they are executed from top to bottom.\n"
4525 #: rebase-interactive.c:56
4527 msgid "Rebase %s onto %s (%d command)"
4528 msgid_plural "Rebase %s onto %s (%d commands)"
4532 #: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
4535 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
4538 #: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
4541 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
4544 #: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
4547 "You are editing the todo file of an ongoing interactive rebase.\n"
4548 "To continue rebase after editing, run:\n"
4549 " git rebase --continue\n"
4553 #: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
4556 "However, if you remove everything, the rebase will be aborted.\n"
4560 #: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
4561 msgid "Note that empty commits are commented out"
4564 #: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
4565 #: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
4567 msgid "could not write '%s'"
4570 #: rebase-interactive.c:108
4572 msgid "could not copy '%s' to '%s'."
4575 #: rebase-interactive.c:173
4578 "Warning: some commits may have been dropped accidentally.\n"
4579 "Dropped commits (newer to older):\n"
4582 #: rebase-interactive.c:180
4585 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
4587 "Use 'git config rebase.missingCommitsCheck' to change the level of "
4589 "The possible behaviours are: ignore, warn, error.\n"
4595 msgid "%s does not point to a valid object!"
4600 msgid "ignoring dangling symref %s"
4603 #: refs.c:669 ref-filter.c:2092
4605 msgid "ignoring broken ref %s"
4610 msgid "could not open '%s' for writing: %s"
4613 #: refs.c:814 refs.c:865
4615 msgid "could not read ref '%s'"
4620 msgid "ref '%s' already exists"
4625 msgid "unexpected object ID when writing '%s'"
4628 #: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
4629 #: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
4631 msgid "could not write to '%s'"
4634 #: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
4635 #: builtin/rebase.c:1003
4637 msgid "could not open '%s' for writing"
4642 msgid "unexpected object ID when deleting '%s'"
4647 msgid "log for ref %s has gap after %s"
4652 msgid "log for ref %s unexpectedly ended on %s"
4657 msgid "log for %s is empty"
4662 msgid "refusing to update ref with bad name '%s'"
4667 msgid "update_ref failed for ref '%s': %s"
4672 msgid "multiple updates for ref '%s' not allowed"
4676 msgid "ref updates forbidden inside quarantine environment"
4679 #: refs.c:2140 refs.c:2170
4681 msgid "'%s' exists; cannot create '%s'"
4684 #: refs.c:2146 refs.c:2181
4686 msgid "cannot process '%s' and '%s' at the same time"
4689 #: refs/files-backend.c:1234
4691 msgid "could not remove reference %s"
4694 #: refs/files-backend.c:1248 refs/packed-backend.c:1532
4695 #: refs/packed-backend.c:1542
4697 msgid "could not delete reference %s: %s"
4700 #: refs/files-backend.c:1251 refs/packed-backend.c:1545
4702 msgid "could not delete references: %s"
4707 msgid "invalid refspec '%s'"
4710 #: ref-filter.c:42 wt-status.c:1934
4726 msgid "ahead %d, behind %d"
4731 msgid "expected format: %%(color:<color>)"
4736 msgid "unrecognized color: %%(color:%s)"
4741 msgid "Integer value expected refname:lstrip=%s"
4746 msgid "Integer value expected refname:rstrip=%s"
4751 msgid "unrecognized %%(%s) argument: %s"
4756 msgid "%%(objecttype) does not take arguments"
4761 msgid "unrecognized %%(objectsize) argument: %s"
4766 msgid "%%(deltabase) does not take arguments"
4771 msgid "%%(body) does not take arguments"
4776 msgid "%%(subject) does not take arguments"
4781 msgid "unknown %%(trailers) argument: %s"
4786 msgid "positive value expected contents:lines=%s"
4791 msgid "unrecognized %%(contents) argument: %s"
4796 msgid "positive value expected objectname:short=%s"
4801 msgid "unrecognized %%(objectname) argument: %s"
4806 msgid "expected format: %%(align:<width>,<position>)"
4811 msgid "unrecognized position:%s"
4816 msgid "unrecognized width:%s"
4821 msgid "unrecognized %%(align) argument: %s"
4826 msgid "positive width expected with the %%(align) atom"
4831 msgid "unrecognized %%(if) argument: %s"
4836 msgid "malformed field name: %.*s"
4841 msgid "unknown field name: %.*s"
4847 "not a git repository, but the field '%.*s' requires access to object data"
4852 msgid "format: %%(if) atom used without a %%(then) atom"
4857 msgid "format: %%(then) atom used without an %%(if) atom"
4862 msgid "format: %%(then) atom used more than once"
4867 msgid "format: %%(then) atom used after %%(else)"
4872 msgid "format: %%(else) atom used without an %%(if) atom"
4877 msgid "format: %%(else) atom used without a %%(then) atom"
4882 msgid "format: %%(else) atom used more than once"
4887 msgid "format: %%(end) atom used without corresponding atom"
4892 msgid "malformed format string %s"
4895 #: ref-filter.c:1485
4897 msgid "no branch, rebasing %s"
4900 #: ref-filter.c:1488
4902 msgid "no branch, rebasing detached HEAD %s"
4905 #: ref-filter.c:1491
4907 msgid "no branch, bisect started on %s"
4910 #: ref-filter.c:1501
4914 #: ref-filter.c:1537 ref-filter.c:1743
4916 msgid "missing object %s for %s"
4919 #: ref-filter.c:1547
4921 msgid "parse_object_buffer failed on %s for %s"
4924 #: ref-filter.c:1998
4926 msgid "malformed object at '%s'"
4929 #: ref-filter.c:2087
4931 msgid "ignoring ref with broken name %s"
4934 #: ref-filter.c:2382
4936 msgid "format: %%(end) atom missing"
4939 #: ref-filter.c:2482
4941 msgid "option `%s' is incompatible with --merged"
4944 #: ref-filter.c:2485
4946 msgid "option `%s' is incompatible with --no-merged"
4949 #: ref-filter.c:2495
4951 msgid "malformed object name %s"
4954 #: ref-filter.c:2500
4956 msgid "option `%s' must point to a commit"
4961 msgid "config remote shorthand cannot begin with '/': %s"
4965 msgid "more than one receivepack given, using the first"
4969 msgid "more than one uploadpack given, using the first"
4974 msgid "Cannot fetch both %s and %s to %s"
4979 msgid "%s usually tracks %s, not %s"
4984 msgid "%s tracks both %s and %s"
4989 msgid "key '%s' of pattern had no '*'"
4994 msgid "value '%s' of pattern has no '*'"
4999 msgid "src refspec %s does not match any"
5004 msgid "src refspec %s matches more than one"
5007 #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
5008 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
5014 "The destination you provided is not a full refname (i.e.,\n"
5015 "starting with \"refs/\"). We tried to guess what you meant by:\n"
5017 "- Looking for a ref that matches '%s' on the remote side.\n"
5018 "- Checking if the <src> being pushed ('%s')\n"
5019 " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
5020 " refs/{heads,tags}/ prefix on the remote side.\n"
5022 "Neither worked, so we gave up. You must fully qualify the ref."
5028 "The <src> part of the refspec is a commit object.\n"
5029 "Did you mean to create a new branch by pushing to\n"
5030 "'%s:refs/heads/%s'?"
5036 "The <src> part of the refspec is a tag object.\n"
5037 "Did you mean to create a new tag by pushing to\n"
5038 "'%s:refs/tags/%s'?"
5044 "The <src> part of the refspec is a tree object.\n"
5045 "Did you mean to tag a new tree by pushing to\n"
5046 "'%s:refs/tags/%s'?"
5052 "The <src> part of the refspec is a blob object.\n"
5053 "Did you mean to tag a new blob by pushing to\n"
5054 "'%s:refs/tags/%s'?"
5059 msgid "%s cannot be resolved to branch"
5064 msgid "unable to delete '%s': remote ref does not exist"
5069 msgid "dst refspec %s matches more than one"
5074 msgid "dst ref %s receives from more than one src"
5077 #: remote.c:1624 remote.c:1725
5078 msgid "HEAD does not point to a branch"
5083 msgid "no such branch: '%s'"
5088 msgid "no upstream configured for branch '%s'"
5093 msgid "upstream branch '%s' not stored as a remote-tracking branch"
5098 msgid "push destination '%s' on remote '%s' has no local tracking branch"
5103 msgid "branch '%s' has no remote for pushing"
5108 msgid "push refspecs for '%s' do not include '%s'"
5112 msgid "push has no destination (push.default is 'nothing')"
5116 msgid "cannot resolve 'simple' push to a single destination"
5121 msgid "couldn't find remote ref %s"
5126 msgid "* Ignoring funny ref '%s' locally"
5131 msgid "Your branch is based on '%s', but the upstream is gone.\n"
5135 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
5140 msgid "Your branch is up to date with '%s'.\n"
5145 msgid "Your branch and '%s' refer to different commits.\n"
5150 msgid " (use \"%s\" for details)\n"
5155 msgid "Your branch is ahead of '%s' by %d commit.\n"
5156 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
5161 msgid " (use \"git push\" to publish your local commits)\n"
5166 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
5168 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
5173 msgid " (use \"git pull\" to update your local branch)\n"
5179 "Your branch and '%s' have diverged,\n"
5180 "and have %d and %d different commit each, respectively.\n"
5182 "Your branch and '%s' have diverged,\n"
5183 "and have %d and %d different commits each, respectively.\n"
5188 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
5193 msgid "cannot parse expected object name '%s'"
5196 #: replace-object.c:21
5198 msgid "bad replace ref name: %s"
5201 #: replace-object.c:30
5203 msgid "duplicate replace ref: %s"
5206 #: replace-object.c:73
5208 msgid "replace depth too high for object %s"
5211 #: rerere.c:217 rerere.c:226 rerere.c:229
5212 msgid "corrupt MERGE_RR"
5215 #: rerere.c:264 rerere.c:269
5216 msgid "unable to write rerere record"
5221 msgid "there were errors while writing '%s' (%s)"
5226 msgid "failed to flush '%s'"
5229 #: rerere.c:503 rerere.c:1039
5231 msgid "could not parse conflict hunks in '%s'"
5236 msgid "failed utime() on '%s'"
5241 msgid "writing '%s' failed"
5246 msgid "Staged '%s' using previous resolution."
5251 msgid "Recorded resolution for '%s'."
5256 msgid "Resolved '%s' using previous resolution."
5261 msgid "cannot unlink stray '%s'"
5266 msgid "Recorded preimage for '%s'"
5269 #: rerere.c:881 submodule.c:2023 builtin/log.c:1773
5270 #: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
5272 msgid "could not create directory '%s'"
5277 msgid "failed to update conflicted state in '%s'"
5280 #: rerere.c:1068 rerere.c:1075
5282 msgid "no remembered resolution for '%s'"
5287 msgid "cannot unlink '%s'"
5292 msgid "Updated preimage for '%s'"
5297 msgid "Forgot resolution for '%s'\n"
5301 msgid "unable to open rr-cache directory"
5305 msgid "your current branch appears to be broken"
5310 msgid "your current branch '%s' does not have any commits yet"
5314 msgid "--first-parent is incompatible with --bisect"
5318 msgid "-L does not yet support diff formats besides -p and -s"
5321 #: run-command.c:763
5322 msgid "open /dev/null failed"
5325 #: run-command.c:1269
5327 msgid "cannot create async thread: %s"
5330 #: run-command.c:1333
5333 "The '%s' hook was ignored because it's not set as executable.\n"
5334 "You can disable this warning with `git config advice.ignoredHook false`."
5338 msgid "unexpected flush packet while reading remote unpack status"
5343 msgid "unable to parse remote unpack status: %s"
5348 msgid "remote unpack failed: %s"
5352 msgid "failed to sign the push certificate"
5356 msgid "the receiving end does not support --signed push"
5361 "not sending a push certificate since the receiving end does not support --"
5366 msgid "the receiving end does not support --atomic push"
5370 msgid "the receiving end does not support push options"
5375 msgid "invalid commit message cleanup mode '%s'"
5380 msgid "could not delete '%s'"
5383 #: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
5385 msgid "could not remove '%s'"
5402 msgid "unknown action: %d"
5407 "after resolving the conflicts, mark the corrected paths\n"
5408 "with 'git add <paths>' or 'git rm <paths>'"
5413 "after resolving the conflicts, mark the corrected paths\n"
5414 "with 'git add <paths>' or 'git rm <paths>'\n"
5415 "and commit the result with 'git commit'"
5418 #: sequencer.c:401 sequencer.c:2909
5420 msgid "could not lock '%s'"
5425 msgid "could not write eol to '%s'"
5428 #: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
5431 msgid "failed to finalize '%s'"
5434 #: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
5435 #: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
5436 #: builtin/merge.c:1112 builtin/rebase.c:567
5438 msgid "could not read '%s'"
5443 msgid "your local changes would be overwritten by %s."
5447 msgid "commit your changes or stash them to proceed."
5452 msgid "%s: fast-forward"
5455 #: sequencer.c:537 builtin/tag.c:565
5457 msgid "Invalid cleanup mode %s"
5460 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
5465 msgid "%s: Unable to write new index file"
5469 msgid "unable to update cache tree"
5473 msgid "could not resolve HEAD commit"
5478 msgid "no key present in '%.*s'"
5483 msgid "unable to dequote value of '%s'"
5486 #: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
5487 #: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
5489 msgid "could not open '%s' for reading"
5493 msgid "'GIT_AUTHOR_NAME' already given"
5497 msgid "'GIT_AUTHOR_EMAIL' already given"
5501 msgid "'GIT_AUTHOR_DATE' already given"
5506 msgid "unknown variable '%s'"
5510 msgid "missing 'GIT_AUTHOR_NAME'"
5514 msgid "missing 'GIT_AUTHOR_EMAIL'"
5518 msgid "missing 'GIT_AUTHOR_DATE'"
5523 msgid "invalid date format '%s' in '%s'"
5529 "you have staged changes in your working tree\n"
5530 "If these changes are meant to be squashed into the previous commit, run:\n"
5532 " git commit --amend %s\n"
5534 "If they are meant to go into a new commit, run:\n"
5538 "In both cases, once you're done, continue with:\n"
5540 " git rebase --continue\n"
5544 msgid "writing root commit"
5548 msgid "'prepare-commit-msg' hook failed"
5553 "Your name and email address were configured automatically based\n"
5554 "on your username and hostname. Please check that they are accurate.\n"
5555 "You can suppress this message by setting them explicitly. Run the\n"
5556 "following command and follow the instructions in your editor to edit\n"
5557 "your configuration file:\n"
5559 " git config --global --edit\n"
5561 "After doing this, you may fix the identity used for this commit with:\n"
5563 " git commit --amend --reset-author\n"
5568 "Your name and email address were configured automatically based\n"
5569 "on your username and hostname. Please check that they are accurate.\n"
5570 "You can suppress this message by setting them explicitly:\n"
5572 " git config --global user.name \"Your Name\"\n"
5573 " git config --global user.email you@example.com\n"
5575 "After doing this, you may fix the identity used for this commit with:\n"
5577 " git commit --amend --reset-author\n"
5581 msgid "couldn't look up newly created commit"
5585 msgid "could not parse newly created commit"
5589 msgid "unable to resolve HEAD after creating commit"
5593 msgid "detached HEAD"
5597 msgid " (root-commit)"
5601 msgid "could not parse HEAD"
5606 msgid "HEAD %s is not a commit!"
5609 #: sequencer.c:1359 builtin/commit.c:1571
5610 msgid "could not parse HEAD commit"
5613 #: sequencer.c:1411 sequencer.c:2004
5614 msgid "unable to parse commit author"
5617 #: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
5618 msgid "git write-tree failed to write a tree"
5621 #: sequencer.c:1438 sequencer.c:1499
5623 msgid "unable to read commit message from '%s'"
5626 #: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
5627 #: builtin/merge.c:903
5628 msgid "failed to write commit object"
5633 msgid "could not parse commit %s"
5638 msgid "could not parse parent commit %s"
5641 #: sequencer.c:1605 sequencer.c:1715
5643 msgid "unknown command: %d"
5646 #: sequencer.c:1662 sequencer.c:1687
5648 msgid "This is a combination of %d commits."
5652 msgid "need a HEAD to fixup"
5655 #: sequencer.c:1674 sequencer.c:3219
5656 msgid "could not read HEAD"
5660 msgid "could not read HEAD's commit message"
5665 msgid "cannot write '%s'"
5668 #: sequencer.c:1689 git-rebase--preserve-merges.sh:496
5669 msgid "This is the 1st commit message:"
5674 msgid "could not read commit message of %s"
5679 msgid "This is the commit message #%d:"
5684 msgid "The commit message #%d will be skipped:"
5688 msgid "your index file is unmerged."
5692 msgid "cannot fixup root commit"
5697 msgid "commit %s is a merge but no -m option was given."
5700 #: sequencer.c:1832 sequencer.c:1840
5702 msgid "commit %s does not have parent %d"
5707 msgid "cannot get commit message for %s"
5710 #. TRANSLATORS: The first %s will be a "todo" command like
5711 #. "revert" or "pick", the second %s a SHA1.
5714 msgid "%s: cannot parse parent commit %s"
5719 msgid "could not rename '%s' to '%s'"
5724 msgid "could not revert %s... %s"
5729 msgid "could not apply %s... %s"
5734 msgid "git %s: failed to read the index"
5739 msgid "git %s: failed to refresh the index"
5744 msgid "%s does not accept arguments: '%s'"
5749 msgid "missing arguments for %s"
5754 msgid "could not parse '%.*s'"
5759 msgid "invalid line %d: %.*s"
5764 msgid "cannot '%s' without a previous commit"
5767 #: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
5768 #: builtin/rebase.c:204 builtin/rebase.c:229
5770 msgid "could not read '%s'."
5774 msgid "cancelling a cherry picking in progress"
5778 msgid "cancelling a revert in progress"
5782 msgid "please fix this using 'git rebase --edit-todo'."
5787 msgid "unusable instruction sheet: '%s'"
5791 msgid "no commits parsed."
5795 msgid "cannot cherry-pick during a revert."
5799 msgid "cannot revert during a cherry-pick."
5804 msgid "invalid value for %s: %s"
5808 msgid "unusable squash-onto"
5813 msgid "malformed options sheet: '%s'"
5816 #: sequencer.c:2652 sequencer.c:4351
5817 msgid "empty commit set passed"
5821 msgid "revert is already in progress"
5826 msgid "try \"git revert (--continue | %s--abort | --quit)\""
5830 msgid "cherry-pick is already in progress"
5835 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
5840 msgid "could not create sequencer directory '%s'"
5844 msgid "could not lock HEAD"
5847 #: sequencer.c:2764 sequencer.c:4103
5848 msgid "no cherry-pick or revert in progress"
5851 #: sequencer.c:2766 sequencer.c:2777
5852 msgid "cannot resolve HEAD"
5855 #: sequencer.c:2768 sequencer.c:2812
5856 msgid "cannot abort from a branch yet to be born"
5859 #: sequencer.c:2798 builtin/grep.c:734
5861 msgid "cannot open '%s'"
5866 msgid "cannot read '%s': %s"
5870 msgid "unexpected end of file"
5875 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
5879 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
5883 msgid "no revert in progress"
5887 msgid "no cherry-pick in progress"
5891 msgid "failed to skip the commit"
5895 msgid "there is nothing to skip"
5901 "have you committed already?\n"
5902 "try \"git %s --continue\""
5905 #: sequencer.c:3011 sequencer.c:4015
5907 msgid "could not update %s"
5910 #: sequencer.c:3049 sequencer.c:3995
5911 msgid "cannot read HEAD"
5916 msgid "unable to copy '%s' to '%s'"
5922 "You can amend the commit now, with\n"
5924 " git commit --amend %s\n"
5926 "Once you are satisfied with your changes, run\n"
5928 " git rebase --continue\n"
5933 msgid "Could not apply %s... %.*s"
5938 msgid "Could not merge %.*s"
5941 #: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
5943 msgid "could not copy '%s' to '%s'"
5946 #: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
5947 #: builtin/rebase.c:1953 builtin/rebase.c:2008
5948 msgid "could not read index"
5954 "execution failed: %s\n"
5955 "%sYou can fix the problem, and then run\n"
5957 " git rebase --continue\n"
5962 msgid "and made changes to the index and/or the working tree\n"
5968 "execution succeeded: %s\n"
5969 "but left changes to the index and/or the working tree\n"
5970 "Commit or stash your changes, and then run\n"