Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
l10n: git.pot: v2.16.0 round 2 (8 new, 4 removed)
author
Jiang Xin
<worldhello.net@gmail.com>
Sat, 6 Jan 2018 23:50:31 +0000
(07:50 +0800)
committer
Jiang Xin
<worldhello.net@gmail.com>
Sat, 6 Jan 2018 23:50:31 +0000
(07:50 +0800)
Generate po/git.pot from v2.16.0-rc1 for git v2.16.0 l10n round 2.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
po/git.pot
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
7398243
)
diff --git
a/po/git.pot
b/po/git.pot
index 5d0b2354dcd063f4b19d924d8d646dca90e397a0..e36d187970974ddf7aafecd708d32e97d15dae39 100644
(file)
--- 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"
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 201
7-12-31 10:45
+0800\n"
+"POT-Creation-Date: 201
8-01-07 07:50
+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"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@
-572,7
+572,7
@@
msgstr[1] ""
msgid "Unable to write new index file"
msgstr ""
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:4921 apply.c:4924 builtin/am.c:22
57 builtin/am.c:2260
+#: apply.c:4921 apply.c:4924 builtin/am.c:22
20 builtin/am.c:2223
#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
@@
-589,7
+589,7
@@
msgstr ""
msgid "apply changes matching the given path"
msgstr ""
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4927 builtin/am.c:22
66
+#: apply.c:4927 builtin/am.c:22
29
msgid "num"
msgstr ""
msgid "num"
msgstr ""
@@
-649,7
+649,7
@@
msgstr ""
msgid "ensure at least <n> lines of context match"
msgstr ""
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:4959 builtin/am.c:22
45
builtin/interpret-trailers.c:95
+#: apply.c:4959 builtin/am.c:22
08
builtin/interpret-trailers.c:95
#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
#: builtin/pack-objects.c:3009
msgid "action"
#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
#: builtin/pack-objects.c:3009
msgid "action"
@@
-693,7
+693,7
@@
msgstr ""
msgid "do not trust the line counts in the hunk headers"
msgstr ""
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:4983 builtin/am.c:22
54
+#: apply.c:4983 builtin/am.c:22
17
msgid "root"
msgstr ""
msgid "root"
msgstr ""
@@
-942,8
+942,8
@@
msgstr ""
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:117
9
-#: sequencer.c:23
67
builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
+#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:117
7
+#: sequencer.c:23
70
builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
#: builtin/shortlog.c:191
msgid "revision walk setup failed"
#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
#: builtin/shortlog.c:191
msgid "revision walk setup failed"
@@
-1098,8
+1098,8
@@
msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:88 sequencer.c:13
57 sequencer.c:1804 sequencer.c:2631
-#: sequencer.c:26
57 sequencer.c:2748 sequencer.c:2850
builtin/commit.c:782
+#: bundle.c:88 sequencer.c:13
60 sequencer.c:1807 sequencer.c:2637
+#: sequencer.c:26
63 sequencer.c:2754 sequencer.c:2856
builtin/commit.c:782
#, c-format
msgid "could not open '%s'"
msgstr ""
#, c-format
msgid "could not open '%s'"
msgstr ""
@@
-1166,8
+1166,8
@@
msgstr ""
msgid "invalid color value: %.*s"
msgstr ""
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:41 sequencer.c:161
1
builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:14
71 builtin/am.c:2106
+#: commit.c:41 sequencer.c:161
4
builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:14
34 builtin/am.c:2069
#, c-format
msgid "could not parse %s"
msgstr ""
#, c-format
msgid "could not parse %s"
msgstr ""
@@
-1938,11
+1938,11
@@
msgstr ""
msgid "Unable to create '%s.lock': %s"
msgstr ""
msgid "Unable to create '%s.lock': %s"
msgstr ""
-#: merge.c:
41
+#: merge.c:
74
msgid "failed to read the cache"
msgstr ""
msgid "failed to read the cache"
msgstr ""
-#: merge.c:
95 builtin/am.c:1980 builtin/am.c:2014
builtin/checkout.c:379
+#: merge.c:
128 builtin/am.c:1943 builtin/am.c:1977
builtin/checkout.c:379
#: builtin/checkout.c:600 builtin/clone.c:754
msgid "unable to write new index file"
msgstr ""
#: builtin/checkout.c:600 builtin/clone.c:754
msgid "unable to write new index file"
msgstr ""
@@
-2158,36
+2158,41
@@
msgstr ""
msgid "Adding %s"
msgstr ""
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:1955
+#: merge-recursive.c:1958
+#, c-format
+msgid "Dirty index: cannot merge (dirty: %s)"
+msgstr ""
+
+#: merge-recursive.c:1962
msgid "Already up to date!"
msgstr ""
msgid "Already up to date!"
msgstr ""
-#: merge-recursive.c:19
64
+#: merge-recursive.c:19
71
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:206
1
+#: merge-recursive.c:206
8
msgid "Merging:"
msgstr ""
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:20
74
+#: merge-recursive.c:20
81
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:21
13
+#: merge-recursive.c:21
20
msgid "merge returned no commit"
msgstr ""
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:21
76
+#: merge-recursive.c:21
83
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:219
0
builtin/merge.c:656 builtin/merge.c:815
+#: merge-recursive.c:219
7
builtin/merge.c:656 builtin/merge.c:815
msgid "Unable to write index."
msgstr ""
msgid "Unable to write index."
msgstr ""
@@
-2371,12
+2376,12
@@
msgid ""
"Using version %i"
msgstr ""
"Using version %i"
msgstr ""
-#: read-cache.c:2370 sequencer.c:27
25
wrapper.c:658 builtin/merge.c:1048
+#: read-cache.c:2370 sequencer.c:27
31
wrapper.c:658 builtin/merge.c:1048
#, c-format
msgid "could not close '%s'"
msgstr ""
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: read-cache.c:2442 sequencer.c:136
6 sequencer.c:2093
+#: read-cache.c:2442 sequencer.c:136
9 sequencer.c:2096
#, c-format
msgid "could not stat '%s'"
msgstr ""
#, c-format
msgid "could not stat '%s'"
msgstr ""
@@
-2782,35
+2787,35
@@
msgid ""
"You can disable this warning with `git config advice.ignoredHook false`."
msgstr ""
"You can disable this warning with `git config advice.ignoredHook false`."
msgstr ""
-#: send-pack.c:1
5
1
+#: send-pack.c:1
4
1
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr ""
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr ""
-#: send-pack.c:1
5
3
+#: send-pack.c:1
4
3
#, c-format
msgid "remote unpack failed: %s"
msgstr ""
#, c-format
msgid "remote unpack failed: %s"
msgstr ""
-#: send-pack.c:3
1
6
+#: send-pack.c:3
0
6
msgid "failed to sign the push certificate"
msgstr ""
msgid "failed to sign the push certificate"
msgstr ""
-#: send-pack.c:4
2
9
+#: send-pack.c:4
1
9
msgid "the receiving end does not support --signed push"
msgstr ""
msgid "the receiving end does not support --signed push"
msgstr ""
-#: send-pack.c:4
3
1
+#: send-pack.c:4
2
1
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
-#: send-pack.c:4
4
3
+#: send-pack.c:4
3
3
msgid "the receiving end does not support --atomic push"
msgstr ""
msgid "the receiving end does not support --atomic push"
msgstr ""
-#: send-pack.c:4
4
8
+#: send-pack.c:4
3
8
msgid "the receiving end does not support push options"
msgstr ""
msgid "the receiving end does not support push options"
msgstr ""
@@
-2844,13
+2849,13
@@
msgid ""
"and commit the result with 'git commit'"
msgstr ""
"and commit the result with 'git commit'"
msgstr ""
-#: sequencer.c:297 sequencer.c:171
5
+#: sequencer.c:297 sequencer.c:171
8
#, c-format
msgid "could not lock '%s'"
msgstr ""
#, c-format
msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:300 sequencer.c:159
2 sequencer.c:1720 sequencer.c:1734
-#: sequencer.c:272
3 sequencer.c:2794
wrapper.c:656
+#: sequencer.c:300 sequencer.c:159
5 sequencer.c:1723 sequencer.c:1737
+#: sequencer.c:272
9 sequencer.c:2800
wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr ""
#, c-format
msgid "could not write to '%s'"
msgstr ""
@@
-2860,12
+2865,12
@@
msgstr ""
msgid "could not write eol to '%s'"
msgstr ""
msgid "could not write eol to '%s'"
msgstr ""
-#: sequencer.c:308 sequencer.c:1
597 sequencer.c:1722
+#: sequencer.c:308 sequencer.c:1
600 sequencer.c:1725
#, c-format
msgid "failed to finalize '%s'."
msgstr ""
#, c-format
msgid "failed to finalize '%s'."
msgstr ""
-#: sequencer.c:332 sequencer.c:829 sequencer.c:16
18
builtin/am.c:259
+#: sequencer.c:332 sequencer.c:829 sequencer.c:16
21
builtin/am.c:259
#: builtin/commit.c:754 builtin/merge.c:1046
#, c-format
msgid "could not read '%s'"
#: builtin/commit.c:754 builtin/merge.c:1046
#, c-format
msgid "could not read '%s'"
@@
-2894,11
+2899,11
@@
msgid "%s: Unable to write new index file"
msgstr ""
#: sequencer.c:496
msgstr ""
#: sequencer.c:496
-msgid "could not resolve HEAD commit
\n
"
+msgid "could not resolve HEAD commit"
msgstr ""
#: sequencer.c:516
msgstr ""
#: sequencer.c:516
-msgid "unable to update cache tree
\n
"
+msgid "unable to update cache tree"
msgstr ""
#: sequencer.c:600
msgstr ""
#: sequencer.c:600
@@
-2920,12
+2925,12
@@
msgstr ""
#: sequencer.c:702
#, c-format
#: sequencer.c:702
#, c-format
-msgid "could not parse commit %s
\n
"
+msgid "could not parse commit %s"
msgstr ""
#: sequencer.c:707
#, c-format
msgstr ""
#: sequencer.c:707
#, c-format
-msgid "could not parse parent commit %s
\n
"
+msgid "could not parse parent commit %s"
msgstr ""
#: sequencer.c:836
msgstr ""
#: sequencer.c:836
@@
-2949,7
+2954,7
@@
msgstr ""
msgid "This is a combination of %d commits."
msgstr ""
msgid "This is a combination of %d commits."
msgstr ""
-#: sequencer.c:857 sequencer.c:274
2
+#: sequencer.c:857 sequencer.c:274
8
msgid "need a HEAD to fixup"
msgstr ""
msgid "need a HEAD to fixup"
msgstr ""
@@
-3016,158
+3021,168
@@
msgstr ""
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:102
5
+#: sequencer.c:102
3
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:108
8 sequencer.c:1864
+#: sequencer.c:108
6 sequencer.c:1867
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sequencer.c:113
9
+#: sequencer.c:113
7
#, c-format
msgid "could not revert %s... %s"
msgstr ""
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:11
40
+#: sequencer.c:11
38
#, c-format
msgid "could not apply %s... %s"
msgstr ""
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:118
2
+#: sequencer.c:118
0
msgid "empty commit set passed"
msgstr ""
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:119
2
+#: sequencer.c:119
0
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:119
8
+#: sequencer.c:119
6
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:1319
+#: sequencer.c:1270
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr ""
+
+#: sequencer.c:1279
+#, c-format
+msgid "missing arguments for %s"
+msgstr ""
+
+#: sequencer.c:1322
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:13
27
+#: sequencer.c:13
30
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:136
0 sequencer.c:2522 sequencer.c:2557 sequencer.c:2636
-#: sequencer.c:266
2 sequencer.c:2752 sequencer.c:2853
+#: sequencer.c:136
3 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
+#: sequencer.c:266
8 sequencer.c:2758 sequencer.c:2859
#, c-format
msgid "could not read '%s'."
msgstr ""
#, c-format
msgid "could not read '%s'."
msgstr ""
-#: sequencer.c:137
2
+#: sequencer.c:137
5
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:137
4
+#: sequencer.c:137
7
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:13
79
+#: sequencer.c:13
82
msgid "no commits parsed."
msgstr ""
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:139
0
+#: sequencer.c:139
3
msgid "cannot cherry-pick during a revert."
msgstr ""
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:139
2
+#: sequencer.c:139
5
msgid "cannot revert during a cherry-pick."
msgstr ""
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:14
59
+#: sequencer.c:14
62
#, c-format
msgid "invalid key: %s"
msgstr ""
#, c-format
msgid "invalid key: %s"
msgstr ""
-#: sequencer.c:146
2
+#: sequencer.c:146
5
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:15
28
+#: sequencer.c:15
31
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:156
6
+#: sequencer.c:156
9
msgid "a cherry-pick or revert is already in progress"
msgstr ""
msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sequencer.c:15
67
+#: sequencer.c:15
70
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sequencer.c:157
0
+#: sequencer.c:157
3
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:158
5
+#: sequencer.c:158
8
msgid "could not lock HEAD"
msgstr ""
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:164
3 sequencer.c:2227
+#: sequencer.c:164
6 sequencer.c:2230
msgid "no cherry-pick or revert in progress"
msgstr ""
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:164
5
+#: sequencer.c:164
8
msgid "cannot resolve HEAD"
msgstr ""
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:16
47 sequencer.c:1682
+#: sequencer.c:16
50 sequencer.c:1685
msgid "cannot abort from a branch yet to be born"
msgstr ""
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:16
68
builtin/grep.c:713
+#: sequencer.c:16
71
builtin/grep.c:713
#, c-format
msgid "cannot open '%s'"
msgstr ""
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:167
0
+#: sequencer.c:167
3
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:167
1
+#: sequencer.c:167
4
msgid "unexpected end of file"
msgstr ""
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:16
77
+#: sequencer.c:16
80
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:16
88
+#: sequencer.c:16
91
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:18
29 sequencer.c:2125
+#: sequencer.c:18
32 sequencer.c:2128
msgid "cannot read HEAD"
msgstr ""
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:18
69
builtin/difftool.c:639
+#: sequencer.c:18
72
builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:18
88
+#: sequencer.c:18
91
msgid "could not read index"
msgstr ""
msgid "could not read index"
msgstr ""
-#: sequencer.c:189
3
+#: sequencer.c:189
6
#, c-format
msgid ""
"execution failed: %s\n"
#, c-format
msgid ""
"execution failed: %s\n"
@@
-3177,11
+3192,11
@@
msgid ""
"\n"
msgstr ""
"\n"
msgstr ""
-#: sequencer.c:1
899
+#: sequencer.c:1
902
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:190
5
+#: sequencer.c:190
8
#, c-format
msgid ""
"execution succeeded: %s\n"
#, c-format
msgid ""
"execution succeeded: %s\n"
@@
-3192,17
+3207,17
@@
msgid ""
"\n"
msgstr ""
"\n"
msgstr ""
-#: sequencer.c:196
4
+#: sequencer.c:196
7
#, c-format
msgid "Applied autostash.\n"
msgstr ""
#, c-format
msgid "Applied autostash.\n"
msgstr ""
-#: sequencer.c:197
6
+#: sequencer.c:197
9
#, c-format
msgid "cannot store %s"
msgstr ""
#, c-format
msgid "cannot store %s"
msgstr ""
-#: sequencer.c:19
79
git-rebase.sh:175
+#: sequencer.c:19
82
git-rebase.sh:175
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@
-3210,108
+3225,108
@@
msgid ""
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: sequencer.c:206
1
+#: sequencer.c:206
4
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: sequencer.c:210
3
+#: sequencer.c:210
6
#, c-format
msgid "unknown command %d"
msgstr ""
#, c-format
msgid "unknown command %d"
msgstr ""
-#: sequencer.c:213
3
+#: sequencer.c:213
6
msgid "could not read orig-head"
msgstr ""
msgid "could not read orig-head"
msgstr ""
-#: sequencer.c:21
38 sequencer.c:2739
+#: sequencer.c:21
41 sequencer.c:2745
msgid "could not read 'onto'"
msgstr ""
msgid "could not read 'onto'"
msgstr ""
-#: sequencer.c:214
5
+#: sequencer.c:214
8
#, c-format
msgid "could not update %s"
msgstr ""
#, c-format
msgid "could not update %s"
msgstr ""
-#: sequencer.c:215
2
+#: sequencer.c:215
5
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
-#: sequencer.c:223
6
+#: sequencer.c:223
9
msgid "cannot rebase: You have unstaged changes."
msgstr ""
msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:224
1
+#: sequencer.c:224
4
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: sequencer.c:225
0
+#: sequencer.c:225
3
msgid "cannot amend non-existing commit"
msgstr ""
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:225
2
+#: sequencer.c:225
5
#, c-format
msgid "invalid file: '%s'"
msgstr ""
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:225
4
+#: sequencer.c:225
7
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:22
57
+#: sequencer.c:22
60
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: sequencer.c:22
67
+#: sequencer.c:22
70
msgid "could not commit staged changes."
msgstr ""
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:23
47
+#: sequencer.c:23
50
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:235
1
+#: sequencer.c:235
4
#, c-format
msgid "%s: bad revision"
msgstr ""
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:238
4
+#: sequencer.c:238
7
msgid "can't revert as initial commit"
msgstr ""
msgid "can't revert as initial commit"
msgstr ""
-#: sequencer.c:24
89
+#: sequencer.c:24
92
msgid "make_script: unhandled options"
msgstr ""
msgid "make_script: unhandled options"
msgstr ""
-#: sequencer.c:249
2
+#: sequencer.c:249
5
msgid "make_script: error preparing revisions"
msgstr ""
msgid "make_script: error preparing revisions"
msgstr ""
-#: sequencer.c:252
6 sequencer.c:2561
+#: sequencer.c:252
9 sequencer.c:2564
#, c-format
msgid "unusable todo list: '%s'"
msgstr ""
#, c-format
msgid "unusable todo list: '%s'"
msgstr ""
-#: sequencer.c:26
09
+#: sequencer.c:26
15
#, c-format
msgid ""
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
#, c-format
msgid ""
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
-#: sequencer.c:26
89
+#: sequencer.c:26
95
#, c-format
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):\n"
msgstr ""
#, c-format
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):\n"
msgstr ""
-#: sequencer.c:2
696
+#: sequencer.c:2
702
#, c-format
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
#, c-format
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@
-3322,7
+3337,7
@@
msgid ""
"\n"
msgstr ""
"\n"
msgstr ""
-#: sequencer.c:27
08
+#: sequencer.c:27
14
#, c-format
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
#, c-format
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
@@
-3330,18
+3345,18
@@
msgid ""
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
-#: sequencer.c:272
1 sequencer.c:2788
wrapper.c:225 wrapper.c:395
+#: sequencer.c:272
7 sequencer.c:2794
wrapper.c:225 wrapper.c:395
#: builtin/am.c:779
#, c-format
msgid "could not open '%s' for writing"
msgstr ""
#: builtin/am.c:779
#, c-format
msgid "could not open '%s' for writing"
msgstr ""
-#: sequencer.c:27
69
+#: sequencer.c:27
75
#, c-format
msgid "could not parse commit '%s'"
msgstr ""
#, c-format
msgid "could not parse commit '%s'"
msgstr ""
-#: sequencer.c:289
1
+#: sequencer.c:289
7
msgid "the script was already rearranged."
msgstr ""
msgid "the script was already rearranged."
msgstr ""
@@
-4627,80
+4642,80
@@
msgstr ""
msgid "unable to write index file"
msgstr ""
msgid "unable to write index file"
msgstr ""
-#: builtin/am.c:11
97
+#: builtin/am.c:11
60
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/am.c:11
98
+#: builtin/am.c:11
61
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/am.c:11
99
+#: builtin/am.c:11
62
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/am.c:1
306
+#: builtin/am.c:1
269
msgid "Patch is empty."
msgstr ""
msgid "Patch is empty."
msgstr ""
-#: builtin/am.c:13
72
+#: builtin/am.c:13
35
#, c-format
msgid "invalid ident line: %.*s"
msgstr ""
#, c-format
msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/am.c:13
94
+#: builtin/am.c:13
57
#, c-format
msgid "unable to parse commit %s"
msgstr ""
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: builtin/am.c:15
87
+#: builtin/am.c:15
50
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/am.c:15
89
+#: builtin/am.c:15
52
msgid "Using index info to reconstruct a base tree..."
msgstr ""
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/am.c:1
608
+#: builtin/am.c:1
571
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/am.c:1
614
+#: builtin/am.c:1
577
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/am.c:16
39
+#: builtin/am.c:16
02
msgid "Failed to merge in the changes."
msgstr ""
msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/am.c:16
63
builtin/merge.c:642
+#: builtin/am.c:16
26
builtin/merge.c:642
msgid "git write-tree failed to write a tree"
msgstr ""
msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/am.c:16
70
+#: builtin/am.c:16
33
msgid "applying to an empty history"
msgstr ""
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:16
83
builtin/commit.c:1798 builtin/merge.c:825
+#: builtin/am.c:16
46
builtin/commit.c:1798 builtin/merge.c:825
#: builtin/merge.c:850
msgid "failed to write commit object"
msgstr ""
#: builtin/merge.c:850
msgid "failed to write commit object"
msgstr ""
-#: builtin/am.c:1
716 builtin/am.c:1720
+#: builtin/am.c:1
679 builtin/am.c:1683
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1
736
+#: builtin/am.c:1
699
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/am.c:17
41
+#: builtin/am.c:17
04
msgid "Commit Body is:"
msgstr ""
msgid "Commit Body is:"
msgstr ""
@@
-4708,42
+4723,42
@@
msgstr ""
#. in your translation. The program will only accept English
#. input at this point.
#.
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:17
51
+#: builtin/am.c:17
14
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1
801
+#: builtin/am.c:1
764
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:18
41 builtin/am.c:1913
+#: builtin/am.c:18
04 builtin/am.c:1876
#, c-format
msgid "Applying: %.*s"
msgstr ""
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:18
57
+#: builtin/am.c:18
20
msgid "No changes -- Patch already applied."
msgstr ""
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:18
65
+#: builtin/am.c:18
28
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:18
71
+#: builtin/am.c:18
34
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr ""
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr ""
-#: builtin/am.c:1
916
+#: builtin/am.c:1
879
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
-#: builtin/am.c:1
923
+#: builtin/am.c:1
886
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@
-4751,91
+4766,91
@@
msgid ""
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-#: builtin/am.c:
2030 builtin/am.c:2034 builtin/am.c:2046
builtin/reset.c:332
+#: builtin/am.c:
1993 builtin/am.c:1997 builtin/am.c:2009
builtin/reset.c:332
#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:20
82
+#: builtin/am.c:20
45
msgid "failed to clean index"
msgstr ""
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2
117
+#: builtin/am.c:2
080
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/am.c:21
80
+#: builtin/am.c:21
43
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2
213
+#: builtin/am.c:2
176
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/am.c:2
214
+#: builtin/am.c:2
177
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2
220
+#: builtin/am.c:2
183
msgid "run interactively"
msgstr ""
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2
222
+#: builtin/am.c:2
185
msgid "historical option -- no-op"
msgstr ""
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2
224
+#: builtin/am.c:2
187
msgid "allow fall back on 3way merging if needed"
msgstr ""
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2
225
builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2
188
builtin/init-db.c:484 builtin/prune-packed.c:57
#: builtin/repack.c:180
msgid "be quiet"
msgstr ""
#: builtin/repack.c:180
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2
227
+#: builtin/am.c:2
190
msgid "add a Signed-off-by line to the commit message"
msgstr ""
msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/am.c:2
230
+#: builtin/am.c:2
193
msgid "recode into utf8 (default)"
msgstr ""
msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/am.c:2
232
+#: builtin/am.c:2
195
msgid "pass -k flag to git-mailinfo"
msgstr ""
msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2
234
+#: builtin/am.c:2
197
msgid "pass -b flag to git-mailinfo"
msgstr ""
msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2
236
+#: builtin/am.c:2
199
msgid "pass -m flag to git-mailinfo"
msgstr ""
msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:22
38
+#: builtin/am.c:22
01
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/am.c:22
41
+#: builtin/am.c:22
04
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/am.c:22
44
+#: builtin/am.c:22
07
msgid "strip everything before a scissors line"
msgstr ""
msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/am.c:22
46 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:22
58 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:22
73
+#: builtin/am.c:22
09 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:22
21 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
+#: builtin/am.c:22
36
msgid "pass it through git-apply"
msgstr ""
msgid "pass it through git-apply"
msgstr ""
-#: builtin/am.c:22
63
builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/am.c:22
26
builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
@@
-4843,79
+4858,79
@@
msgstr ""
msgid "n"
msgstr ""
msgid "n"
msgstr ""
-#: builtin/am.c:22
69
builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/am.c:22
32
builtin/branch.c:629 builtin/for-each-ref.c:38
#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr ""
#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr ""
-#: builtin/am.c:22
70
+#: builtin/am.c:22
33
msgid "format the patch(es) are in"
msgstr ""
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:22
76
+#: builtin/am.c:22
39
msgid "override error message when patch failure occurs"
msgstr ""
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:22
78
+#: builtin/am.c:22
41
msgid "continue applying patches after resolving a conflict"
msgstr ""
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:22
81
+#: builtin/am.c:22
44
msgid "synonyms for --continue"
msgstr ""
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:22
84
+#: builtin/am.c:22
47
msgid "skip the current patch"
msgstr ""
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:22
87
+#: builtin/am.c:22
50
msgid "restore the original branch and abort the patching operation."
msgstr ""
msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/am.c:22
91
+#: builtin/am.c:22
54
msgid "lie about committer date"
msgstr ""
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:22
93
+#: builtin/am.c:22
56
msgid "use current timestamp for author date"
msgstr ""
msgid "use current timestamp for author date"
msgstr ""
-#: builtin/am.c:22
95
builtin/commit.c:1636 builtin/merge.c:236
+#: builtin/am.c:22
58
builtin/commit.c:1636 builtin/merge.c:236
#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr ""
#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr ""
-#: builtin/am.c:22
96
+#: builtin/am.c:22
59
msgid "GPG-sign commits"
msgstr ""
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:22
99
+#: builtin/am.c:22
62
msgid "(internal use for git-rebase)"
msgstr ""
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2
317
+#: builtin/am.c:2
280
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
-#: builtin/am.c:2
324
+#: builtin/am.c:2
287
msgid "failed to read the index"
msgstr ""
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:23
39
+#: builtin/am.c:23
02
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:23
63
+#: builtin/am.c:23
26
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:23
69
+#: builtin/am.c:23
32
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
@@
-14661,7
+14676,7
@@
msgid ""
"\n"
msgstr ""
"\n"
msgstr ""
-#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:99
4
+#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:99
5
msgid "Could not execute editor"
msgstr ""
msgid "Could not execute editor"
msgstr ""
@@
-14687,21
+14702,25
@@
msgstr ""
msgid "Could not init rewritten commits"
msgstr ""
msgid "Could not init rewritten commits"
msgstr ""
-#: git-rebase--interactive.sh:972
+#: git-rebase--interactive.sh:897
+msgid "Could not generate todo list"
+msgstr ""
+
+#: git-rebase--interactive.sh:973
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] ""
msgstr[1] ""
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] ""
msgstr[1] ""
-#: git-rebase--interactive.sh:97
7
+#: git-rebase--interactive.sh:97
8
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
-#: git-rebase--interactive.sh:98
4
+#: git-rebase--interactive.sh:98
5
msgid "Note that empty commits are commented out"
msgstr ""
msgid "Note that empty commits are commented out"
msgstr ""