|
8 | 8 | msgstr ""
|
9 | 9 | "Project-Id-Version: PACKAGE VERSION\n"
|
10 | 10 | " Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
|
11 |
| -"POT-Creation-Date: 2019-02-09 20:54+0800\n" |
| 11 | +"POT-Creation-Date: 2019-02-15 10:09+0800\n" |
12 | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
13 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
14 | 14 | " Language-Team: LANGUAGE <[email protected]>\n"
|
@@ -7690,7 +7690,8 @@ msgstr ""
|
7690 | 7690 |
|
7691 | 7691 | #: builtin/bisect--helper.c:174
|
7692 | 7692 | #, c-format
|
7693 |
| -msgid "could not check out original HEAD '%s'. Try 'git bisectreset <commit>'." |
| 7693 | +msgid "" |
| 7694 | +"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." |
7694 | 7695 | msgstr ""
|
7695 | 7696 |
|
7696 | 7697 | #: builtin/bisect--helper.c:215
|
@@ -7831,7 +7832,7 @@ msgid "update BISECT_HEAD instead of checking out the current commit"
|
7831 | 7832 | msgstr ""
|
7832 | 7833 |
|
7833 | 7834 | #: builtin/bisect--helper.c:649
|
7834 |
| -msgid "no log for BISECT_WRITE " |
| 7835 | +msgid "no log for BISECT_WRITE" |
7835 | 7836 | msgstr ""
|
7836 | 7837 |
|
7837 | 7838 | #: builtin/bisect--helper.c:666
|
@@ -10934,10 +10935,10 @@ msgstr ""
|
10934 | 10935 | msgid "Could not fetch %s"
|
10935 | 10936 | msgstr ""
|
10936 | 10937 |
|
10937 |
| -#: builtin/fetch.c:1482 builtin/fetch.c:1651 |
| 10938 | +#: builtin/fetch.c:1482 |
10938 | 10939 | msgid ""
|
10939 | 10940 | "--filter can only be used with the remote configured in extensions."
|
10940 |
| -"partialclone" |
| 10941 | +"partialClone" |
10941 | 10942 | msgstr ""
|
10942 | 10943 |
|
10943 | 10944 | #: builtin/fetch.c:1506
|
@@ -10983,6 +10984,12 @@ msgstr ""
|
10983 | 10984 | msgid "Fetching a group and specifying refspecs does not make sense"
|
10984 | 10985 | msgstr ""
|
10985 | 10986 |
|
| 10987 | +#: builtin/fetch.c:1651 |
| 10988 | +msgid "" |
| 10989 | +"--filter can only be used with the remote configured in extensions." |
| 10990 | +"partialclone" |
| 10991 | +msgstr "" |
| 10992 | + |
10986 | 10993 | #: builtin/fmt-merge-msg.c:18
|
10987 | 10994 | msgid ""
|
10988 | 10995 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
|
@@ -14814,7 +14821,7 @@ msgstr ""
|
14814 | 14821 | msgid "git rebase --continue | --abort | --skip | --edit-todo"
|
14815 | 14822 | msgstr ""
|
14816 | 14823 |
|
14817 |
| -#: builtin/rebase.c:121 |
| 14824 | +#: builtin/rebase.c:121 builtin/rebase.c:1437 |
14818 | 14825 | #, c-format
|
14819 | 14826 | msgid "%s requires an interactive rebase"
|
14820 | 14827 | msgstr ""
|
@@ -15088,10 +15095,6 @@ msgstr ""
|
15088 | 15095 | msgid "--strategy requires --merge or --interactive"
|
15089 | 15096 | msgstr ""
|
15090 | 15097 |
|
15091 |
| -#: builtin/rebase.c:1437 |
15092 |
| -msgid "--reschedule-failed-exec requires an interactive rebase" |
15093 |
| -msgstr "" |
15094 |
| - |
15095 | 15098 | #: builtin/rebase.c:1446
|
15096 | 15099 | msgid "cannot combine am options with either interactive or merge options"
|
15097 | 15100 | msgstr ""
|
|
0 commit comments