Re: Problems merging stable to gui-release

[John W. Eaton]

On 01/25/2014 09:40 PM, fgnievinski wrote:
> I'd suggest the following:
> - delete the gui-release .ts files
> - copy the ts from stable into gui-release
> - run lupdate, which will:
>      - keep existing translations,
>      - insert missing source strings, and
>      - update location line numbers.
> The only requirement is to halt
> translation contributions to gui-release
> until a string freeze is eventually announced.

Independent changes have been made on the gui-release branch and the 
stable branch.  That's why we have conflicts.  So it seems to me that 
replacing the .ts files from stable and updating line info will lose 
some changes.

Or maybe you meant to say that we should avoid changing gui-release 
strings while stable is also changing?  I don't see how we can enforce that.

I did the merge by hand over all 11 .ts files.  If I got something 
wrong, I guess someone else will have to fix it because I have no clue 
what the proper translations are or how to manipulate these files.

jwe