| Re: [translations] Merging translations with master |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: translations@xxxxxxxxxxx
- Subject: Re: [translations] Merging translations with master
- From: Francisco Vila <paconet.org@xxxxxxxxx>
- Date: Mon, 2 Mar 2020 19:27:18 +0100
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=TwHEcWIk9ie4ZPbmM1+RwcJyauxOkwgF4Doavhirex0=; b=CAvmsq427ofXyWTmdhCgbW1etjIA1sACBmvUMcHqHlQmVdUKrr+6bjfrZ9KKUU0xow ZhDOj7Spoui3lyqHJph7ntqw/Ixq0OzU6tn1CQnC68l8cGqsFVcybzf6QHsLYCDprEAn ydKAdI9VlEKxkD+5XSBFJam9hALckjaenr/8GRIZiFM5PVlYPlPI0kypya/JpRADWMCb 8wQjuUWfmQe6xR6HABjw9aa9OFO93mzYM5ueBV53SMnkO4UN+XlpnPv0ofoMRsaaaVJi 1/VnEc3yMP0vYm4BmJrbzCT96VAeFdG6qL/AX5l3XlU2ina57D+u2N1Ma7vFPXfGUQaX +OnA==
El 2/3/20 a las 14:54, David Kastrup escribió:
Hi, I would want to merge translations with master now so that the
latest translations are integrated into master. What does that mean for
translators?
Translation is usually merged onto staging. Whether it is master or
staging who receives the merge, is not relevant for our work.
Master should also be merged onto translations regularly.
If you still want to do polish-up work on 2.20 (after all, it is fairly
certain that some fixup releases like 2.20.1 will happen eventually),
then those need to _no_ longer be done on the translations branch but
either directly on stable/2.20 or, if you want a bit of a safety buffer,
on a branch we create for that purpose.
Yes, I'd vote for that
Looking through our current branches, I see
commit 66f9cbcfe348419cf09597f0f00c748e8849a6b9 (origin/translation-staging)
Merge: 55cabbf805 5cd599b0e7
Author: John Mandereau <john.mandereau@xxxxxxxxx>
Date: Tue Oct 2 10:15:22 2012 +0200
Merge branch 'translation' into stable/2.16
commit 5cd599b0e77c21dbad132fc948692bbbe4c7ddeb
Merge: 41839ed739 16bf0d2978
Author: Till Paala <till.rettig@xxxxxx>
Date: Mon Oct 1 00:26:40 2012 +0300
Merge branch 'translation' of ssh://git.sv.gnu.org/srv/git/lilypond into translation
commit 41839ed7390861d2a3f3fa31c5fc93a28599d99e
Author: Till Paala <till.rettig@xxxxxx>
Date: Sun Sep 30 23:55:39 2012 +0300
Doc-de: update to notation manual 5
And seeing that this branch's last action was merging into stable/2.16,
it would appear that its purpose may have been for the sake of merging
into stable branches in the prerelease, something which we haven't done
this time round.
We could use this branch generally for merging into stable branches pre-
and postrelease (implying that once we are branching off stable/2.22, we
will stop adding translation material to stable/2.20).
I could set it up for continued use with stable/2.20 and then merge
translations over to master.
To staging, you mean?
How does that sound to people?
SGTM
--
Francisco Vila, Ph.D. - Badajoz (Spain)
paconet.org , lilypond.es