diff options
Diffstat (limited to 'po')
| -rw-r--r-- | po/git.pot | 684 |
1 files changed, 345 insertions, 339 deletions
diff --git a/po/git.pot b/po/git.pot index 5c586d6007..6915b02153 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-08-06 23:47+0800\n" +"POT-Creation-Date: 2012-09-05 06:20+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" @@ -55,7 +55,7 @@ msgid "Repository lacks these prerequisite commits:" msgstr "" #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290 -#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347 +#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 #: builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "" @@ -82,7 +82,7 @@ msgstr[1] "" msgid "rev-list died" msgstr "" -#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -225,32 +225,32 @@ msgid "" "%s" msgstr "" -#: diff.c:1400 +#: diff.c:1401 msgid " 0 files changed" msgstr "" -#: diff.c:1404 +#: diff.c:1405 #, c-format msgid " %d file changed" msgid_plural " %d files changed" msgstr[0] "" msgstr[1] "" -#: diff.c:1421 +#: diff.c:1422 #, c-format msgid ", %d insertion(+)" msgid_plural ", %d insertions(+)" msgstr[0] "" msgstr[1] "" -#: diff.c:1432 +#: diff.c:1433 #, c-format msgid ", %d deletion(-)" msgid_plural ", %d deletions(-)" msgstr[0] "" msgstr[1] "" -#: diff.c:3461 +#: diff.c:3460 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -345,243 +345,235 @@ msgstr "" msgid "error building trees" msgstr "" -#: merge-recursive.c:497 -msgid "diff setup failed" -msgstr "" - -#: merge-recursive.c:627 -msgid "merge-recursive: disk full?" -msgstr "" - -#: merge-recursive.c:690 +#: merge-recursive.c:672 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:701 +#: merge-recursive.c:683 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" #. something else exists #. .. but not some other error (who really cares what?) -#: merge-recursive.c:715 merge-recursive.c:736 +#: merge-recursive.c:697 merge-recursive.c:718 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:726 +#: merge-recursive.c:708 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:766 +#: merge-recursive.c:748 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:768 +#: merge-recursive.c:750 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:791 builtin/clone.c:302 +#: merge-recursive.c:773 builtin/clone.c:302 #, c-format msgid "failed to open '%s'" msgstr "" -#: merge-recursive.c:799 +#: merge-recursive.c:781 #, c-format msgid "failed to symlink '%s'" msgstr "" -#: merge-recursive.c:802 +#: merge-recursive.c:784 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:939 +#: merge-recursive.c:921 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:943 +#: merge-recursive.c:925 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:959 +#: merge-recursive.c:941 msgid "unsupported object type in the tree" msgstr "" -#: merge-recursive.c:1038 merge-recursive.c:1052 +#: merge-recursive.c:1020 merge-recursive.c:1034 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -#: merge-recursive.c:1044 merge-recursive.c:1057 +#: merge-recursive.c:1026 merge-recursive.c:1039 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -#: merge-recursive.c:1098 +#: merge-recursive.c:1080 msgid "rename" msgstr "" -#: merge-recursive.c:1098 +#: merge-recursive.c:1080 msgid "renamed" msgstr "" -#: merge-recursive.c:1154 +#: merge-recursive.c:1136 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1176 +#: merge-recursive.c:1158 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1181 +#: merge-recursive.c:1163 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1235 +#: merge-recursive.c:1217 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1265 +#: merge-recursive.c:1247 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1464 +#: merge-recursive.c:1446 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1474 +#: merge-recursive.c:1456 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1479 merge-recursive.c:1677 +#: merge-recursive.c:1461 merge-recursive.c:1659 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1530 +#: merge-recursive.c:1512 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1533 +#: merge-recursive.c:1515 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1581 +#: merge-recursive.c:1563 msgid "modify" msgstr "" -#: merge-recursive.c:1581 +#: merge-recursive.c:1563 msgid "modified" msgstr "" -#: merge-recursive.c:1591 +#: merge-recursive.c:1573 msgid "content" msgstr "" -#: merge-recursive.c:1598 +#: merge-recursive.c:1580 msgid "add/add" msgstr "" -#: merge-recursive.c:1632 +#: merge-recursive.c:1614 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1646 +#: merge-recursive.c:1628 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1650 git-submodule.sh:844 +#: merge-recursive.c:1632 git-submodule.sh:869 msgid "submodule" msgstr "" -#: merge-recursive.c:1651 +#: merge-recursive.c:1633 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1741 +#: merge-recursive.c:1723 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1766 +#: merge-recursive.c:1748 msgid "file/directory" msgstr "" -#: merge-recursive.c:1772 +#: merge-recursive.c:1754 msgid "directory/file" msgstr "" -#: merge-recursive.c:1777 +#: merge-recursive.c:1759 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1787 +#: merge-recursive.c:1769 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1804 +#: merge-recursive.c:1786 msgid "Fatal merge failure, shouldn't happen." msgstr "" -#: merge-recursive.c:1823 +#: merge-recursive.c:1805 msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:1832 +#: merge-recursive.c:1814 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:1862 +#: merge-recursive.c:1844 #, c-format msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:1907 +#: merge-recursive.c:1889 msgid "Merging:" msgstr "" -#: merge-recursive.c:1920 +#: merge-recursive.c:1902 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:1957 +#: merge-recursive.c:1939 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2014 +#: merge-recursive.c:1996 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2026 builtin/merge.c:697 +#: merge-recursive.c:2008 builtin/merge.c:696 msgid "Unable to write index." msgstr "" @@ -632,14 +624,14 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978 -#: builtin/merge.c:1088 builtin/merge.c:1098 +#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977 +#: builtin/merge.c:1087 builtin/merge.c:1097 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868 -#: builtin/merge.c:1090 builtin/merge.c:1103 +#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867 +#: builtin/merge.c:1089 builtin/merge.c:1102 #, c-format msgid "Could not write to '%s'" msgstr "" @@ -836,7 +828,7 @@ msgstr "" msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:805 builtin/apply.c:3988 +#: sequencer.c:805 builtin/apply.c:3987 #, c-format msgid "cannot open %s: %s" msgstr "" @@ -1226,6 +1218,11 @@ msgstr "" msgid ", behind " msgstr "" +#: compat/precompose_utf8.c:58 builtin/clone.c:341 +#, c-format +msgid "failed to unlink '%s'" +msgstr "" + #: builtin/add.c:62 #, c-format msgid "unexpected diff status %c" @@ -1326,7 +1323,7 @@ msgstr "" msgid "index file corrupt" msgstr "" -#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "" @@ -1344,52 +1341,52 @@ msgstr "" msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: builtin/apply.c:824 +#: builtin/apply.c:823 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: builtin/apply.c:833 +#: builtin/apply.c:832 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: builtin/apply.c:914 +#: builtin/apply.c:913 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: builtin/apply.c:946 +#: builtin/apply.c:945 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: builtin/apply.c:950 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: builtin/apply.c:951 +#: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: builtin/apply.c:958 +#: builtin/apply.c:957 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1403 +#: builtin/apply.c:1402 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1460 +#: builtin/apply.c:1459 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1477 +#: builtin/apply.c:1476 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1400,403 +1397,403 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1637 +#: builtin/apply.c:1636 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1639 +#: builtin/apply.c:1638 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1665 +#: builtin/apply.c:1664 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1701 +#: builtin/apply.c:1700 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1703 +#: builtin/apply.c:1702 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1706 +#: builtin/apply.c:1705 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1852 +#: builtin/apply.c:1851 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1881 +#: builtin/apply.c:1880 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:1967 +#: builtin/apply.c:1966 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2057 +#: builtin/apply.c:2056 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2061 +#: builtin/apply.c:2060 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2132 +#: builtin/apply.c:2131 msgid "oops" msgstr "" -#: builtin/apply.c:2654 +#: builtin/apply.c:2653 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2772 +#: builtin/apply.c:2771 #, 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:2784 +#: builtin/apply.c:2783 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2790 +#: builtin/apply.c:2789 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2809 +#: builtin/apply.c:2808 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:2912 +#: builtin/apply.c:2911 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:2918 +#: builtin/apply.c:2917 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:2939 +#: builtin/apply.c:2938 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3061 +#: builtin/apply.c:3060 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159 +#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3139 builtin/apply.c:3361 +#: builtin/apply.c:3138 builtin/apply.c:3360 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3220 builtin/apply.c:3375 +#: builtin/apply.c:3219 builtin/apply.c:3374 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389 +#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3229 builtin/apply.c:3383 +#: builtin/apply.c:3228 builtin/apply.c:3382 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3331 +#: builtin/apply.c:3330 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3400 +#: builtin/apply.c:3399 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3402 +#: builtin/apply.c:3401 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3503 +#: builtin/apply.c:3502 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3506 +#: builtin/apply.c:3505 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3526 +#: builtin/apply.c:3525 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3531 +#: builtin/apply.c:3530 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3539 +#: builtin/apply.c:3538 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3552 +#: builtin/apply.c:3551 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158 +#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:3750 +#: builtin/apply.c:3749 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3778 +#: builtin/apply.c:3777 #, c-format msgid "corrupt patch for subproject %s" msgstr "" -#: builtin/apply.c:3782 +#: builtin/apply.c:3781 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3787 +#: builtin/apply.c:3786 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3790 builtin/apply.c:3898 +#: builtin/apply.c:3789 builtin/apply.c:3897 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3823 +#: builtin/apply.c:3822 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:3872 +#: builtin/apply.c:3871 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:3959 +#: builtin/apply.c:3958 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:3967 +#: builtin/apply.c:3966 msgid "internal error" msgstr "" #. Say this even without --verbose -#: builtin/apply.c:3970 +#: builtin/apply.c:3969 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:3980 +#: builtin/apply.c:3979 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4001 +#: builtin/apply.c:4000 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4004 +#: builtin/apply.c:4003 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4154 +#: builtin/apply.c:4153 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4165 +#: builtin/apply.c:4164 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4284 builtin/apply.c:4287 +#: builtin/apply.c:4283 builtin/apply.c:4286 msgid "path" msgstr "" -#: builtin/apply.c:4285 +#: builtin/apply.c:4284 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4288 +#: builtin/apply.c:4287 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4290 +#: builtin/apply.c:4289 msgid "num" msgstr "" -#: builtin/apply.c:4291 +#: builtin/apply.c:4290 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4294 +#: builtin/apply.c:4293 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4296 +#: builtin/apply.c:4295 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4300 +#: builtin/apply.c:4299 msgid "shows number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4302 +#: builtin/apply.c:4301 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4304 +#: builtin/apply.c:4303 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4306 +#: builtin/apply.c:4305 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4308 +#: builtin/apply.c:4307 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4310 +#: builtin/apply.c:4309 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4312 +#: builtin/apply.c:4311 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4314 +#: builtin/apply.c:4313 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4316 +#: builtin/apply.c:4315 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4319 +#: builtin/apply.c:4318 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4320 +#: builtin/apply.c:4319 msgid "action" msgstr "" -#: builtin/apply.c:4321 +#: builtin/apply.c:4320 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4324 builtin/apply.c:4327 +#: builtin/apply.c:4323 builtin/apply.c:4326 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4330 +#: builtin/apply.c:4329 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4332 +#: builtin/apply.c:4331 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4334 +#: builtin/apply.c:4333 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4336 +#: builtin/apply.c:4335 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4337 +#: builtin/apply.c:4336 msgid "be verbose" msgstr "" -#: builtin/apply.c:4339 +#: builtin/apply.c:4338 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4342 +#: builtin/apply.c:4341 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4344 +#: builtin/apply.c:4343 msgid "root" msgstr "" -#: builtin/apply.c:4345 +#: builtin/apply.c:4344 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4367 +#: builtin/apply.c:4366 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4375 +#: builtin/apply.c:4374 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4378 +#: builtin/apply.c:4377 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4394 +#: builtin/apply.c:4393 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4408 +#: builtin/apply.c:4407 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4414 builtin/apply.c:4424 +#: builtin/apply.c:4413 builtin/apply.c:4423 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2050,7 +2047,7 @@ msgstr "" msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:235 builtin/checkout.c:393 +#: builtin/checkout.c:235 builtin/checkout.c:392 msgid "corrupt index file" msgstr "" @@ -2059,60 +2056,56 @@ msgstr "" msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586 -#: builtin/merge.c:812 +#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586 +#: builtin/merge.c:811 msgid "unable to write new index file" msgstr "" -#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408 -msgid "diff_setup_done failed" -msgstr "" - -#: builtin/checkout.c:415 +#: builtin/checkout.c:414 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:534 +#: builtin/checkout.c:533 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "" -#: builtin/checkout.c:567 +#: builtin/checkout.c:566 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:574 +#: builtin/checkout.c:573 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:577 +#: builtin/checkout.c:576 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:581 +#: builtin/checkout.c:580 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:583 +#: builtin/checkout.c:582 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:585 +#: builtin/checkout.c:584 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:641 +#: builtin/checkout.c:640 #, c-format msgid " ... and %d more.\n" msgstr "" #. The singular version -#: builtin/checkout.c:647 +#: builtin/checkout.c:646 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -2127,7 +2120,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:665 +#: builtin/checkout.c:664 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -2137,96 +2130,96 @@ msgid "" "\n" msgstr "" -#: builtin/checkout.c:695 +#: builtin/checkout.c:694 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:699 +#: builtin/checkout.c:698 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:725 builtin/checkout.c:920 +#: builtin/checkout.c:724 builtin/checkout.c:919 msgid "You are on a branch yet to be born" msgstr "" #. case (1) -#: builtin/checkout.c:856 +#: builtin/checkout.c:855 #, c-format msgid "invalid reference: %s" msgstr "" #. case (1): want a tree -#: builtin/checkout.c:895 +#: builtin/checkout.c:894 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:977 +#: builtin/checkout.c:976 msgid "-B cannot be used with -b" msgstr "" -#: builtin/checkout.c:986 +#: builtin/checkout.c:985 msgid "--patch is incompatible with all other options" msgstr "" -#: builtin/checkout.c:989 +#: builtin/checkout.c:988 msgid "--detach cannot be used with -b/-B/--orphan" msgstr "" -#: builtin/checkout.c:991 +#: builtin/checkout.c:990 msgid "--detach cannot be used with -t" msgstr "" -#: builtin/checkout.c:997 +#: builtin/checkout.c:996 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:1003 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1010 +#: builtin/checkout.c:1009 msgid "--orphan and -b|-B are mutually exclusive" msgstr "" -#: builtin/checkout.c:1012 +#: builtin/checkout.c:1011 msgid "--orphan cannot be used with -t" msgstr "" -#: builtin/checkout.c:1022 +#: builtin/checkout.c:1021 msgid "git checkout: -f and -m are incompatible" msgstr "" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1055 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1064 +#: builtin/checkout.c:1063 #, 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:1066 +#: builtin/checkout.c:1065 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "" -#: builtin/checkout.c:1071 +#: builtin/checkout.c:1070 msgid "git checkout: --detach does not take a path argument" msgstr "" -#: builtin/checkout.c:1074 +#: builtin/checkout.c:1073 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1092 msgid "Cannot switch branch to a non-commit." msgstr "" -#: builtin/checkout.c:1096 +#: builtin/checkout.c:1095 msgid "--ours/--theirs is incompatible with switching branches." msgstr "" @@ -2280,7 +2273,7 @@ msgstr "" msgid "failed to create directory '%s'" msgstr "" -#: builtin/clone.c:308 builtin/diff.c:75 +#: builtin/clone.c:308 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" msgstr "" @@ -2295,11 +2288,6 @@ msgstr "" msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:341 -#, c-format -msgid "failed to unlink '%s'" -msgstr "" - #: builtin/clone.c:346 #, c-format msgid "failed to create link '%s'" @@ -2654,7 +2642,7 @@ msgstr "" msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1487 builtin/merge.c:509 +#: builtin/commit.c:1487 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" msgstr "" @@ -2683,7 +2671,7 @@ msgstr "" 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:1554 builtin/merge.c:935 builtin/merge.c:960 msgid "failed to write commit object" msgstr "" @@ -2780,36 +2768,36 @@ msgstr "" msgid "--dirty is incompatible with committishes" msgstr "" -#: builtin/diff.c:77 +#: builtin/diff.c:79 #, c-format msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:220 +#: builtin/diff.c:224 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:297 +#: builtin/diff.c:301 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:341 +#: builtin/diff.c:344 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:346 +#: builtin/diff.c:349 #, c-format msgid "more than %d trees given: '%s'" msgstr "" -#: builtin/diff.c:356 +#: builtin/diff.c:359 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:364 +#: builtin/diff.c:367 #, c-format msgid "unhandled object '%s' given." msgstr "" @@ -2997,57 +2985,57 @@ msgstr "" msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/grep.c:402 +#: builtin/grep.c:454 #, c-format msgid "Failed to chdir: %s" msgstr "" -#: builtin/grep.c:478 builtin/grep.c:512 +#: builtin/grep.c:530 builtin/grep.c:564 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:526 +#: builtin/grep.c:578 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:584 +#: builtin/grep.c:636 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:601 +#: builtin/grep.c:653 #, c-format msgid "cannot open '%s'" msgstr "" -#: builtin/grep.c:885 +#: builtin/grep.c:917 msgid "no pattern given." msgstr "" -#: builtin/grep.c:899 +#: builtin/grep.c:931 #, c-format msgid "bad object %s" msgstr "" -#: builtin/grep.c:940 +#: builtin/grep.c:972 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:963 +#: builtin/grep.c:995 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:968 +#: builtin/grep.c:1000 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:971 +#: builtin/grep.c:1003 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:979 +#: builtin/grep.c:1011 msgid "both --cached and trees are given." msgstr "" @@ -3535,64 +3523,64 @@ msgstr "" msgid "Not a range." msgstr "" -#: builtin/log.c:792 +#: builtin/log.c:789 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:865 +#: builtin/log.c:862 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:938 +#: builtin/log.c:935 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1160 +#: builtin/log.c:1157 #, c-format msgid "bogus committer info %s" msgstr "" -#: builtin/log.c:1205 +#: builtin/log.c:1202 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1207 +#: builtin/log.c:1204 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1215 +#: builtin/log.c:1212 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1217 +#: builtin/log.c:1214 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1219 +#: builtin/log.c:1216 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1242 +#: builtin/log.c:1239 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1244 +#: builtin/log.c:1241 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1397 +#: builtin/log.c:1394 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1501 +#: builtin/log.c:1498 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531 +#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 #, c-format msgid "Unknown commit %s" msgstr "" @@ -3655,49 +3643,49 @@ msgstr "" msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:437 +#: builtin/merge.c:436 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:536 +#: builtin/merge.c:535 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:629 +#: builtin/merge.c:628 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/merge.c:679 +#: builtin/merge.c:678 msgid "failed to read the cache" msgstr "" -#: builtin/merge.c:710 +#: builtin/merge.c:709 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:724 +#: builtin/merge.c:723 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:738 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:877 +#: builtin/merge.c:876 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:886 +#: builtin/merge.c:885 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:892 +#: builtin/merge.c:891 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -3706,140 +3694,140 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:916 +#: builtin/merge.c:915 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:928 +#: builtin/merge.c:927 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:993 +#: builtin/merge.c:992 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:1009 +#: builtin/merge.c:1008 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:1050 +#: builtin/merge.c:1049 msgid "No current branch." msgstr "" -#: builtin/merge.c:1052 +#: builtin/merge.c:1051 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:1054 +#: builtin/merge.c:1053 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:1059 +#: builtin/merge.c:1058 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1146 builtin/merge.c:1303 +#: builtin/merge.c:1145 builtin/merge.c:1302 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1214 +#: builtin/merge.c:1213 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1230 git-pull.sh:31 +#: builtin/merge.c:1229 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -#: builtin/merge.c:1233 git-pull.sh:34 +#: builtin/merge.c:1232 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: builtin/merge.c:1237 +#: builtin/merge.c:1236 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -#: builtin/merge.c:1240 +#: builtin/merge.c:1239 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1249 +#: builtin/merge.c:1248 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1254 +#: builtin/merge.c:1253 msgid "You cannot combine --no-ff with --ff-only." msgstr "" -#: builtin/merge.c:1261 +#: builtin/merge.c:1260 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1293 +#: builtin/merge.c:1292 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1296 +#: builtin/merge.c:1295 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1298 +#: builtin/merge.c:1297 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1413 +#: builtin/merge.c:1412 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1451 +#: builtin/merge.c:1450 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1458 +#: builtin/merge.c:1457 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1490 +#: builtin/merge.c:1489 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1513 builtin/merge.c:1592 +#: builtin/merge.c:1512 builtin/merge.c:1591 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1517 +#: builtin/merge.c:1516 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1583 +#: builtin/merge.c:1582 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1585 +#: builtin/merge.c:1584 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1594 +#: builtin/merge.c:1593 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1606 +#: builtin/merge.c:1605 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -4144,12 +4132,30 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:174 +#: builtin/push.c:151 +msgid "" +"push.default is unset; its implicit value is changing in\n" +"Git 2.0 from 'matching' to 'simple'. To squelch this message\n" +"and maintain the current behavior after the default changes, use:\n" +"\n" +" git config --global push.default matching\n" +"\n" +"To squelch this message and adopt the new behavior now, use:\n" +"\n" +" git config --global push.default simple\n" +"\n" +"See 'git help config' and search for 'push.default' for further " +"information.\n" +"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" +"'current' instead of 'simple' if you sometimes use older versions of Git)" +msgstr "" + +#: builtin/push.c:199 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:181 +#: builtin/push.c:206 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" @@ -4157,15 +4163,15 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:187 +#: builtin/push.c:212 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" -"specify branches to push or set the 'push.default' configuration\n" -"variable to 'current' or 'upstream' to push only the current branch." +"specify branches to push or set the 'push.default' configuration variable\n" +"to 'simple', 'current' or 'upstream' to push only the current branch." msgstr "" -#: builtin/push.c:193 +#: builtin/push.c:218 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and merge the remote changes\n" @@ -4173,22 +4179,22 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:233 +#: builtin/push.c:258 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:237 +#: builtin/push.c:262 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:269 +#: builtin/push.c:294 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:270 +#: builtin/push.c:295 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -4201,31 +4207,31 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:285 +#: builtin/push.c:310 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:286 +#: builtin/push.c:311 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:291 +#: builtin/push.c:316 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:292 +#: builtin/push.c:317 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:297 +#: builtin/push.c:322 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:385 +#: builtin/push.c:410 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:387 +#: builtin/push.c:412 msgid "--delete doesn't make sense without any refs" msgstr "" @@ -5511,32 +5517,32 @@ msgstr "" msgid "cannot strip one component off url '$remoteurl'" msgstr "" -#: git-submodule.sh:145 +#: git-submodule.sh:167 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "" -#: git-submodule.sh:189 +#: git-submodule.sh:211 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "" -#: git-submodule.sh:201 +#: git-submodule.sh:223 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "" -#: git-submodule.sh:290 +#: git-submodule.sh:312 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:307 +#: git-submodule.sh:329 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:311 +#: git-submodule.sh:333 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -5544,151 +5550,151 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:322 +#: git-submodule.sh:344 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:324 +#: git-submodule.sh:346 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:338 +#: git-submodule.sh:360 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:343 +#: git-submodule.sh:365 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:348 +#: git-submodule.sh:370 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:390 +#: git-submodule.sh:413 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:404 +#: git-submodule.sh:427 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "" -#: git-submodule.sh:447 +#: git-submodule.sh:471 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "" -#: git-submodule.sh:456 +#: git-submodule.sh:480 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:458 +#: git-submodule.sh:482 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "" -#: git-submodule.sh:466 +#: git-submodule.sh:490 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:565 +#: git-submodule.sh:590 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -#: git-submodule.sh:578 +#: git-submodule.sh:603 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:597 +#: git-submodule.sh:622 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:611 +#: git-submodule.sh:636 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:612 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:617 +#: git-submodule.sh:642 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:618 +#: git-submodule.sh:643 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "" -#: git-submodule.sh:623 +#: git-submodule.sh:648 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:624 +#: git-submodule.sh:649 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "" -#: git-submodule.sh:646 git-submodule.sh:969 +#: git-submodule.sh:671 git-submodule.sh:995 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:754 +#: git-submodule.sh:779 msgid "The --cached option cannot be used with the --files option" msgstr "" #. unexpected type -#: git-submodule.sh:794 +#: git-submodule.sh:819 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:812 +#: git-submodule.sh:837 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:815 +#: git-submodule.sh:840 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:818 +#: git-submodule.sh:843 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:843 +#: git-submodule.sh:868 msgid "blob" msgstr "" -#: git-submodule.sh:881 +#: git-submodule.sh:906 msgid "# Submodules changed but not updated:" msgstr "" -#: git-submodule.sh:883 +#: git-submodule.sh:908 msgid "# Submodule changes to be committed:" msgstr "" -#: git-submodule.sh:1027 +#: git-submodule.sh:1054 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "" |