Re: 2.6.6 & 3.0.0-RC1

On Tue, 8 Feb 2022 at 14:36, Benno Lang <[email protected]> wrote:
>
> On Tue, 8 Feb 2022 at 16:38, Marko Lindqvist <[email protected]> wrote:
> >
> >  Do you want me to merge your translation updates to the later
> > branches, or do you want to do that yourself?
>
> What's the best way to do that? I'm not really familiar with the
> branch structure, but assume there's a better way than cherry-picking.

 You can't really cherry-pick po-file updates between branches, as the
files differ so much (as it has source code line numbers listed for
each string, and those constantly change). Instead, you need to use
msgmerge command to merge updates from the po-file of one branch to
the po-file of the other branch.

 http://www.freeciv.org/wiki/Localization#How_to_keep_two_branches_in_sync

 Most translations can make it a bit easier by just copying all of the
translated po-file from the release branch to later branches, and then
doing the usual refresh against code strings, but Esperanto can't do
that at the moment. I think you have some updates for later branches
(from Kristjan) in place, and won't want to lose those by overwriting
the po-files.

> I've just added another commit so if you can do it for those two,
> that'd be great

 I'll do the msgmerge from current S3_0 to later branches tonight.


 - ML