David Kastrup <d...@gnu.org> writes: > David Kastrup <d...@gnu.org> writes: > >> If it is ok with people, I'd propose the following course in order to >> get the ball rolling again: >> >> I'll merge stable/2.16 into translation. That should be unproblematic. >> Then I'll merge translation into staging. This will require a bit of >> cleanup and conflict resolution. > > Ok, I got the merge here done. The only changes outside of > Documentation/xx strictly are now in > > # modified: > Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-2.ly > # modified: po/eo.po > # modified: po/es.po > # modified: po/it.po > > The first has \consists "something" instead of \consists something and > is definitely correct. The history shows the following, making it > likely that this change might get backed out again by automatisms.
I'll back this one out of the merge since there is no point in reinstating it, then letting it get overwritten again. This needs to be done through Documentation/snippets/new to stay. So that leaves the po files. Should I merge them over from translation or not? Francisco, any idea? -- David Kastrup _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
