diff options
Diffstat (limited to 'po/git.pot')
| -rw-r--r-- | po/git.pot | 95 |
1 files changed, 48 insertions, 47 deletions
diff --git a/po/git.pot b/po/git.pot index 99a5798119..d4e46e5e74 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: 2017-10-08 09:48+0800\n" +"POT-Creation-Date: 2017-10-17 09:44+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" @@ -941,7 +941,7 @@ msgstr "" msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:1797 bundle.c:169 ref-filter.c:1932 sequencer.c:1168 +#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168 #: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911 #: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369 #: builtin/shortlog.c:191 @@ -1561,7 +1561,7 @@ msgstr "" msgid "Filtering content" msgstr "" -#: entry.c:417 +#: entry.c:433 #, c-format msgid "could not stat file '%s'" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "Could not open '%s' for writing" msgstr "" -#: refs.c:1779 +#: refs.c:1792 msgid "ref updates forbidden inside quarantine environment" msgstr "" @@ -2422,157 +2422,157 @@ msgstr "" msgid "ahead %d, behind %d" msgstr "" -#: ref-filter.c:104 +#: ref-filter.c:105 #, c-format msgid "expected format: %%(color:<color>)" msgstr "" -#: ref-filter.c:106 +#: ref-filter.c:107 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "" -#: ref-filter.c:126 +#: ref-filter.c:127 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "" -#: ref-filter.c:130 +#: ref-filter.c:131 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: ref-filter.c:132 +#: ref-filter.c:133 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "" -#: ref-filter.c:172 +#: ref-filter.c:173 #, c-format msgid "%%(body) does not take arguments" msgstr "" -#: ref-filter.c:179 +#: ref-filter.c:180 #, c-format msgid "%%(subject) does not take arguments" msgstr "" -#: ref-filter.c:186 +#: ref-filter.c:198 #, c-format -msgid "%%(trailers) does not take arguments" +msgid "unknown %%(trailers) argument: %s" msgstr "" -#: ref-filter.c:205 +#: ref-filter.c:221 #, c-format msgid "positive value expected contents:lines=%s" msgstr "" -#: ref-filter.c:207 +#: ref-filter.c:223 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: ref-filter.c:220 +#: ref-filter.c:236 #, c-format msgid "positive value expected objectname:short=%s" msgstr "" -#: ref-filter.c:224 +#: ref-filter.c:240 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "" -#: ref-filter.c:251 +#: ref-filter.c:267 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "" -#: ref-filter.c:263 +#: ref-filter.c:279 #, c-format msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:267 +#: ref-filter.c:283 #, c-format msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:273 +#: ref-filter.c:289 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:277 +#: ref-filter.c:293 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:292 +#: ref-filter.c:308 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "" -#: ref-filter.c:382 +#: ref-filter.c:398 #, c-format msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:408 +#: ref-filter.c:424 #, c-format msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:520 +#: ref-filter.c:536 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:580 +#: ref-filter.c:596 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:582 +#: ref-filter.c:598 #, c-format msgid "format: %%(then) atom used more than once" msgstr "" -#: ref-filter.c:584 +#: ref-filter.c:600 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:610 +#: ref-filter.c:626 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:612 +#: ref-filter.c:628 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:614 +#: ref-filter.c:630 #, c-format msgid "format: %%(else) atom used more than once" msgstr "" -#: ref-filter.c:627 +#: ref-filter.c:643 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:682 +#: ref-filter.c:698 #, c-format msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1268 +#: ref-filter.c:1283 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: ref-filter.c:1271 +#: ref-filter.c:1286 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" @@ -2580,7 +2580,7 @@ msgstr "" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1279 +#: ref-filter.c:1294 #, c-format msgid "(HEAD detached at %s)" msgstr "" @@ -2588,46 +2588,46 @@ msgstr "" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1286 +#: ref-filter.c:1301 #, c-format msgid "(HEAD detached from %s)" msgstr "" -#: ref-filter.c:1290 +#: ref-filter.c:1305 msgid "(no branch)" msgstr "" -#: ref-filter.c:1439 ref-filter.c:1470 +#: ref-filter.c:1454 ref-filter.c:1485 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1442 ref-filter.c:1473 +#: ref-filter.c:1457 ref-filter.c:1488 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:1773 +#: ref-filter.c:1788 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:1840 +#: ref-filter.c:1855 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:1845 +#: ref-filter.c:1860 #, c-format msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:2107 +#: ref-filter.c:2122 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2201 +#: ref-filter.c:2216 #, c-format msgid "malformed object name %s" msgstr "" @@ -3285,7 +3285,8 @@ msgstr "" #: sequencer.c:2561 #, c-format -msgid "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring." +msgid "" +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" #: sequencer.c:2641 |