diff options
| -rw-r--r-- | po/git.pot | 125 |
1 files changed, 111 insertions, 14 deletions
diff --git a/po/git.pot b/po/git.pot index deec6d4ab..68cc9d662 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: 2016-02-28 20:31+0800\n" +"POT-Creation-Date: 2016-03-12 22:05+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" @@ -1080,6 +1080,16 @@ msgstr "" msgid "unrecognized format: %%(%s)" msgstr "" +#: ref-filter.c:77 +#, c-format +msgid "%%(body) does not take arguments" +msgstr "" + +#: ref-filter.c:84 +#, c-format +msgid "%%(subject) does not take arguments" +msgstr "" + #: ref-filter.c:101 #, c-format msgid "positive value expected contents:lines=%s" @@ -1120,16 +1130,65 @@ msgstr "" msgid "positive width expected with the %%(align) atom" msgstr "" +#: ref-filter.c:244 +#, c-format +msgid "malformed field name: %.*s" +msgstr "" + +#: ref-filter.c:270 +#, c-format +msgid "unknown field name: %.*s" +msgstr "" + #: ref-filter.c:372 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" +#: ref-filter.c:424 +#, c-format +msgid "malformed format string %s" +msgstr "" + +#: ref-filter.c:878 +msgid ":strip= requires a positive integer argument" +msgstr "" + +#: ref-filter.c:883 +#, c-format +msgid "ref '%s' does not have %ld components to :strip" +msgstr "" + +#: ref-filter.c:1046 +#, c-format +msgid "unknown %.*s format %s" +msgstr "" + +#: ref-filter.c:1066 ref-filter.c:1097 +#, c-format +msgid "missing object %s for %s" +msgstr "" + +#: ref-filter.c:1069 ref-filter.c:1100 +#, c-format +msgid "parse_object_buffer failed on %s for %s" +msgstr "" + #: ref-filter.c:1311 #, c-format msgid "malformed object at '%s'" msgstr "" +#: ref-filter.c:1373 +#, c-format +msgid "ignoring ref with broken name %s" +msgstr "" + +#: ref-filter.c:1378 +#, c-format +msgid "ignoring broken ref %s" +msgstr "" + #: ref-filter.c:1651 #, c-format msgid "format: %%(end) atom missing" @@ -1528,6 +1587,20 @@ msgstr "" msgid "failed to read %s" msgstr "" +#: sha1_file.c:1080 +msgid "offset before end of packfile (broken .idx?)" +msgstr "" + +#: sha1_file.c:2459 +#, c-format +msgid "offset before start of pack index for %s (corrupt index?)" +msgstr "" + +#: sha1_file.c:2463 +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" +msgstr "" + #: sha1_name.c:462 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" @@ -1564,6 +1637,11 @@ msgstr "" msgid "staging updated .gitmodules failed" msgstr "" +#: trailer.c:237 +#, c-format +msgid "running trailer command '%s' failed" +msgstr "" + #: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558 #: trailer.c:562 #, c-format @@ -3977,6 +4055,10 @@ msgstr "" msgid "HEAD is now at" msgstr "" +#: builtin/checkout.c:665 builtin/clone.c:659 +msgid "unable to update HEAD" +msgstr "" + #: builtin/checkout.c:669 #, c-format msgid "Reset branch '%s'\n" @@ -4458,6 +4540,12 @@ msgstr "" msgid "use IPv6 addresses only" msgstr "" +#: builtin/clone.c:239 +msgid "" +"No directory name could be guessed.\n" +"Please specify a directory on the command line" +msgstr "" + #: builtin/clone.c:305 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." @@ -4529,6 +4617,11 @@ msgstr "" msgid "remote did not send all necessary objects" msgstr "" +#: builtin/clone.c:647 +#, c-format +msgid "unable to update %s" +msgstr "" + #: builtin/clone.c:696 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" @@ -4537,6 +4630,10 @@ msgstr "" msgid "unable to checkout working tree" msgstr "" +#: builtin/clone.c:753 +msgid "unable to write parameters to config file" +msgstr "" + #: builtin/clone.c:816 msgid "cannot repack to clean up" msgstr "" @@ -6670,55 +6767,55 @@ msgstr "" msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1663 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/index-pack.c:1537 +#: builtin/index-pack.c:1538 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1539 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1586 +#: builtin/index-pack.c:1587 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1594 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1623 +#: builtin/index-pack.c:1624 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1675 builtin/index-pack.c:1678 -#: builtin/index-pack.c:1690 builtin/index-pack.c:1694 +#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 +#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1708 +#: builtin/index-pack.c:1709 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1712 builtin/index-pack.c:1721 +#: builtin/index-pack.c:1713 builtin/index-pack.c:1722 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1729 +#: builtin/index-pack.c:1730 msgid "--verify with no packfile name given" msgstr "" @@ -10679,7 +10776,7 @@ msgid "" "to read about a specific subcommand or concept." msgstr "" -#: http.c:320 +#: http.c:321 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" @@ -10764,7 +10861,7 @@ msgid "Update remote refs along with associated objects" msgstr "" #: common-cmds.h:32 -msgid "Forward-port local commits to the updated upstream head" +msgid "Reapply commits on top of another base tip" msgstr "" #: common-cmds.h:33 |