diff options
Diffstat (limited to 'po')
| -rw-r--r-- | po/git.pot | 472 |
1 files changed, 246 insertions, 226 deletions
diff --git a/po/git.pot b/po/git.pot index 33a605275..decd3d59e 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-05-08 16:06+0800\n" +"POT-Creation-Date: 2012-05-15 06:42+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -45,7 +45,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:89 builtin/commit.c:753 +#: bundle.c:89 builtin/commit.c:697 #, c-format msgid "could not open '%s'" msgstr "" @@ -557,7 +557,7 @@ msgstr "" msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:788 builtin/apply.c:3682 +#: sequencer.c:788 builtin/apply.c:3689 #, c-format msgid "cannot open %s: %s" msgstr "" @@ -842,7 +842,7 @@ msgstr "" msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:67 builtin/commit.c:282 +#: builtin/add.c:67 builtin/commit.c:226 msgid "updating files failed" msgstr "" @@ -932,12 +932,12 @@ msgstr "" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:342 builtin/mv.c:82 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82 #: builtin/rm.c:162 msgid "index file corrupt" msgstr "" -#: builtin/add.c:476 builtin/apply.c:4093 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:476 builtin/apply.c:4100 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "" @@ -966,32 +966,37 @@ msgstr "" msgid "unable to find filename in patch at line %d" msgstr "" -#: builtin/apply.c:934 +#: builtin/apply.c:937 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: builtin/apply.c:937 +#: builtin/apply.c:941 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "" + +#: builtin/apply.c:942 #, c-format -msgid "git apply: bad git-diff - inconsistent %s filename on line %d" +msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: builtin/apply.c:944 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1387 +#: builtin/apply.c:1394 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1444 +#: builtin/apply.c:1451 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1461 +#: builtin/apply.c:1468 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1002,278 +1007,278 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1621 +#: builtin/apply.c:1628 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1623 +#: builtin/apply.c:1630 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1649 +#: builtin/apply.c:1656 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1685 +#: builtin/apply.c:1692 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1687 +#: builtin/apply.c:1694 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1690 +#: builtin/apply.c:1697 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1836 +#: builtin/apply.c:1843 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1865 +#: builtin/apply.c:1872 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:1951 +#: builtin/apply.c:1958 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2041 +#: builtin/apply.c:2048 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2045 +#: builtin/apply.c:2052 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2116 +#: builtin/apply.c:2123 msgid "oops" msgstr "" -#: builtin/apply.c:2638 +#: builtin/apply.c:2645 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2756 +#: builtin/apply.c:2763 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:2768 +#: builtin/apply.c:2775 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2774 +#: builtin/apply.c:2781 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2793 +#: builtin/apply.c:2800 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:2896 +#: builtin/apply.c:2903 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:2902 +#: builtin/apply.c:2909 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:2923 +#: builtin/apply.c:2930 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3038 +#: builtin/apply.c:3045 #, c-format msgid "patch %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3045 builtin/apply.c:3062 +#: builtin/apply.c:3052 builtin/apply.c:3069 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3077 +#: builtin/apply.c:3084 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3098 +#: builtin/apply.c:3105 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3136 +#: builtin/apply.c:3143 #, c-format msgid "%s: has been deleted/renamed" msgstr "" -#: builtin/apply.c:3141 builtin/apply.c:3172 +#: builtin/apply.c:3148 builtin/apply.c:3179 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3152 +#: builtin/apply.c:3159 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3166 +#: builtin/apply.c:3173 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3183 +#: builtin/apply.c:3190 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3185 +#: builtin/apply.c:3192 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3240 +#: builtin/apply.c:3247 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3259 +#: builtin/apply.c:3266 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)%s%s" msgstr "" -#: builtin/apply.c:3265 +#: builtin/apply.c:3272 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3278 +#: builtin/apply.c:3285 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3333 builtin/checkout.c:212 builtin/reset.c:158 +#: builtin/apply.c:3340 builtin/checkout.c:212 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:3476 +#: builtin/apply.c:3483 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3503 +#: builtin/apply.c:3510 #, c-format msgid "corrupt patch for subproject %s" msgstr "" -#: builtin/apply.c:3507 +#: builtin/apply.c:3514 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3512 +#: builtin/apply.c:3519 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3515 +#: builtin/apply.c:3522 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3548 +#: builtin/apply.c:3555 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:3597 +#: builtin/apply.c:3604 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:3653 +#: builtin/apply.c:3660 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:3661 +#: builtin/apply.c:3668 msgid "internal error" msgstr "" #. Say this even without --verbose -#: builtin/apply.c:3664 +#: builtin/apply.c:3671 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:3674 +#: builtin/apply.c:3681 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:3695 +#: builtin/apply.c:3702 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:3698 +#: builtin/apply.c:3705 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:3829 +#: builtin/apply.c:3836 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:3840 +#: builtin/apply.c:3847 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4035 +#: builtin/apply.c:4042 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4038 +#: builtin/apply.c:4045 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4054 +#: builtin/apply.c:4061 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4068 +#: builtin/apply.c:4075 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4074 builtin/apply.c:4084 +#: builtin/apply.c:4081 builtin/apply.c:4091 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1395,77 +1400,92 @@ msgstr "" #: builtin/branch.c:409 #, c-format -msgid "behind %d] " +msgid "[%s: behind %d]" msgstr "" #: builtin/branch.c:411 #, c-format -msgid "ahead %d] " +msgid "[behind %d]" +msgstr "" + +#: builtin/branch.c:415 +#, c-format +msgid "[%s: ahead %d]" +msgstr "" + +#: builtin/branch.c:417 +#, c-format +msgid "[ahead %d]" msgstr "" -#: builtin/branch.c:413 +#: builtin/branch.c:420 #, c-format -msgid "ahead %d, behind %d] " +msgid "[%s: ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:521 +#: builtin/branch.c:423 +#, c-format +msgid "[ahead %d, behind %d]" +msgstr "" + +#: builtin/branch.c:535 msgid "(no branch)" msgstr "" -#: builtin/branch.c:586 +#: builtin/branch.c:600 msgid "some refs could not be read" msgstr "" -#: builtin/branch.c:599 +#: builtin/branch.c:613 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:609 +#: builtin/branch.c:623 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:624 +#: builtin/branch.c:638 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:628 +#: builtin/branch.c:642 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:632 +#: builtin/branch.c:646 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:639 +#: builtin/branch.c:653 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:654 +#: builtin/branch.c:668 #, c-format msgid "malformed object name %s" msgstr "" -#: builtin/branch.c:678 +#: builtin/branch.c:692 #, c-format msgid "could not write branch description template: %s" msgstr "" -#: builtin/branch.c:769 +#: builtin/branch.c:783 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:774 builtin/clone.c:558 +#: builtin/branch.c:788 builtin/clone.c:558 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:794 +#: builtin/branch.c:808 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:843 +#: builtin/branch.c:857 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" @@ -1599,96 +1619,96 @@ msgid "" "\n" msgstr "" -#: builtin/checkout.c:693 +#: builtin/checkout.c:694 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:697 +#: builtin/checkout.c:698 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:723 +#: builtin/checkout.c:724 msgid "You are on a branch yet to be born" msgstr "" #. case (1) -#: builtin/checkout.c:854 +#: builtin/checkout.c:855 #, c-format msgid "invalid reference: %s" msgstr "" #. case (1): want a tree -#: builtin/checkout.c:893 +#: builtin/checkout.c:894 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:973 +#: builtin/checkout.c:974 msgid "-B cannot be used with -b" msgstr "" -#: builtin/checkout.c:982 +#: builtin/checkout.c:983 msgid "--patch is incompatible with all other options" msgstr "" -#: builtin/checkout.c:985 +#: builtin/checkout.c:986 msgid "--detach cannot be used with -b/-B/--orphan" msgstr "" -#: builtin/checkout.c:987 +#: builtin/checkout.c:988 msgid "--detach cannot be used with -t" msgstr "" -#: builtin/checkout.c:993 +#: builtin/checkout.c:994 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1000 +#: builtin/checkout.c:1001 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1006 +#: builtin/checkout.c:1007 msgid "--orphan and -b|-B are mutually exclusive" msgstr "" -#: builtin/checkout.c:1008 +#: builtin/checkout.c:1009 msgid "--orphan cannot be used with -t" msgstr "" -#: builtin/checkout.c:1018 +#: builtin/checkout.c:1019 msgid "git checkout: -f and -m are incompatible" msgstr "" -#: builtin/checkout.c:1052 +#: builtin/checkout.c:1053 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1060 +#: builtin/checkout.c:1061 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1063 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "" -#: builtin/checkout.c:1067 +#: builtin/checkout.c:1068 msgid "git checkout: --detach does not take a path argument" msgstr "" -#: builtin/checkout.c:1070 +#: builtin/checkout.c:1071 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/checkout.c:1089 +#: builtin/checkout.c:1090 msgid "Cannot switch branch to a non-commit." msgstr "" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1093 msgid "--ours/--theirs is incompatible with switching branches." msgstr "" @@ -1892,93 +1912,93 @@ msgid "" "Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:309 +#: builtin/commit.c:253 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:351 +#: builtin/commit.c:295 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:357 +#: builtin/commit.c:301 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:390 builtin/commit.c:411 builtin/commit.c:461 +#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:442 +#: builtin/commit.c:386 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:444 +#: builtin/commit.c:388 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:454 +#: builtin/commit.c:398 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:474 +#: builtin/commit.c:418 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:549 builtin/commit.c:555 +#: builtin/commit.c:493 builtin/commit.c:499 #, c-format msgid "invalid commit: %s" msgstr "" -#: builtin/commit.c:578 +#: builtin/commit.c:522 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:639 +#: builtin/commit.c:583 #, c-format msgid "Malformed ident string: '%s'" msgstr "" -#: builtin/commit.c:677 builtin/commit.c:710 builtin/commit.c:1024 +#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:968 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:689 builtin/shortlog.c:296 +#: builtin/commit.c:633 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:691 +#: builtin/commit.c:635 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:695 +#: builtin/commit.c:639 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:701 +#: builtin/commit.c:645 msgid "commit has empty message" msgstr "" -#: builtin/commit.c:717 +#: builtin/commit.c:661 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:721 +#: builtin/commit.c:665 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:725 +#: builtin/commit.c:669 #, c-format msgid "could not read '%s'" msgstr "" -#: builtin/commit.c:777 +#: builtin/commit.c:721 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:788 +#: builtin/commit.c:732 #, c-format msgid "" "\n" @@ -1988,7 +2008,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:793 +#: builtin/commit.c:737 #, c-format msgid "" "\n" @@ -1998,171 +2018,171 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:805 +#: builtin/commit.c:749 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:810 +#: builtin/commit.c:754 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:823 +#: builtin/commit.c:767 #, c-format msgid "%sAuthor: %s" msgstr "" -#: builtin/commit.c:830 +#: builtin/commit.c:774 #, c-format msgid "%sCommitter: %s" msgstr "" -#: builtin/commit.c:850 +#: builtin/commit.c:794 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:887 +#: builtin/commit.c:831 msgid "Error building trees" msgstr "" -#: builtin/commit.c:902 builtin/tag.c:361 +#: builtin/commit.c:846 builtin/tag.c:361 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:999 +#: builtin/commit.c:943 #, c-format msgid "No existing author found with '%s'" msgstr "" -#: builtin/commit.c:1014 builtin/commit.c:1214 +#: builtin/commit.c:958 builtin/commit.c:1158 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1054 +#: builtin/commit.c:998 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1065 +#: builtin/commit.c:1009 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1068 +#: builtin/commit.c:1012 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1070 +#: builtin/commit.c:1014 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1073 +#: builtin/commit.c:1017 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1083 +#: builtin/commit.c:1027 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1085 +#: builtin/commit.c:1029 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1093 +#: builtin/commit.c:1037 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1110 +#: builtin/commit.c:1054 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1112 +#: builtin/commit.c:1056 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1114 +#: builtin/commit.c:1058 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1116 +#: builtin/commit.c:1060 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1126 builtin/tag.c:577 +#: builtin/commit.c:1070 builtin/tag.c:577 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1131 +#: builtin/commit.c:1075 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1315 +#: builtin/commit.c:1258 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1317 +#: builtin/commit.c:1260 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1358 +#: builtin/commit.c:1301 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1360 +#: builtin/commit.c:1303 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1450 +#: builtin/commit.c:1447 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1487 builtin/merge.c:509 +#: builtin/commit.c:1485 builtin/merge.c:509 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1494 +#: builtin/commit.c:1492 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1501 +#: builtin/commit.c:1499 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1520 +#: builtin/commit.c:1518 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1534 +#: builtin/commit.c:1532 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1539 +#: builtin/commit.c:1537 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961 +#: builtin/commit.c:1552 builtin/merge.c:936 builtin/merge.c:961 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1575 +#: builtin/commit.c:1573 msgid "cannot lock HEAD ref" msgstr "" -#: builtin/commit.c:1579 +#: builtin/commit.c:1577 msgid "cannot update HEAD ref" msgstr "" -#: builtin/commit.c:1590 +#: builtin/commit.c:1588 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -2587,237 +2607,237 @@ msgstr "" msgid "`git %s' is aliased to `%s'" msgstr "" -#: builtin/index-pack.c:84 +#: builtin/index-pack.c:169 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:104 +#: builtin/index-pack.c:189 msgid "object of unexpected type" msgstr "" -#: builtin/index-pack.c:141 +#: builtin/index-pack.c:226 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:151 +#: builtin/index-pack.c:236 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:152 +#: builtin/index-pack.c:237 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:164 +#: builtin/index-pack.c:249 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:171 +#: builtin/index-pack.c:256 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:187 +#: builtin/index-pack.c:272 #, c-format msgid "unable to create '%s'" msgstr "" -#: builtin/index-pack.c:192 +#: builtin/index-pack.c:277 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:206 +#: builtin/index-pack.c:291 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:226 +#: builtin/index-pack.c:311 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "" -#: builtin/index-pack.c:300 +#: builtin/index-pack.c:405 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:345 +#: builtin/index-pack.c:450 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:353 +#: builtin/index-pack.c:458 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:361 +#: builtin/index-pack.c:466 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:390 +#: builtin/index-pack.c:495 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:392 +#: builtin/index-pack.c:497 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:405 +#: builtin/index-pack.c:510 msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:476 +#: builtin/index-pack.c:583 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:479 +#: builtin/index-pack.c:586 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:488 +#: builtin/index-pack.c:598 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:500 +#: builtin/index-pack.c:610 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:502 +#: builtin/index-pack.c:612 msgid "Error in object" msgstr "" -#: builtin/index-pack.c:504 +#: builtin/index-pack.c:614 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:576 builtin/index-pack.c:602 +#: builtin/index-pack.c:687 builtin/index-pack.c:713 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:706 +#: builtin/index-pack.c:850 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:706 +#: builtin/index-pack.c:850 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:728 +#: builtin/index-pack.c:872 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:733 +#: builtin/index-pack.c:877 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:736 +#: builtin/index-pack.c:880 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:754 +#: builtin/index-pack.c:903 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:787 +#: builtin/index-pack.c:954 +msgid "confusion beyond insanity" +msgstr "" + +#: builtin/index-pack.c:973 +#, c-format +msgid "pack has %d unresolved delta" +msgid_plural "pack has %d unresolved deltas" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:998 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:866 +#: builtin/index-pack.c:1077 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:890 +#: builtin/index-pack.c:1101 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:903 +#: builtin/index-pack.c:1114 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:911 +#: builtin/index-pack.c:1122 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:924 +#: builtin/index-pack.c:1135 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:935 +#: builtin/index-pack.c:1146 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1024 +#: builtin/index-pack.c:1247 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1026 +#: builtin/index-pack.c:1249 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1073 +#: builtin/index-pack.c:1296 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1080 +#: builtin/index-pack.c:1303 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1107 +#: builtin/index-pack.c:1330 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1140 builtin/index-pack.c:1143 -#: builtin/index-pack.c:1155 builtin/index-pack.c:1159 +#: builtin/index-pack.c:1374 builtin/index-pack.c:1377 +#: builtin/index-pack.c:1389 builtin/index-pack.c:1393 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1173 +#: builtin/index-pack.c:1407 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1177 builtin/index-pack.c:1187 +#: builtin/index-pack.c:1411 builtin/index-pack.c:1421 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1430 msgid "--verify with no packfile name given" msgstr "" -#: builtin/index-pack.c:1220 -msgid "confusion beyond insanity" -msgstr "" - -#: builtin/index-pack.c:1239 -#, c-format -msgid "pack has %d unresolved delta" -msgid_plural "pack has %d unresolved deltas" -msgstr[0] "" -msgstr[1] "" - #: builtin/init-db.c:35 #, c-format msgid "Could not make %s writable by group" |