Re: How to merge two po files from different versions?

[znavko]

Here it is my repository with both files: 
https://gitgud.io/znavko/guix-manual-ru-exp


May 7, 2019 9:23 AM, address@hidden wrote:

> Hello! I want to merge my two files: 
> https://gitgud.io/znavko/guix-manual-ru-exp
> The latest is guix-manual-1.0.0-pre3.ru.po, so the lines there should rest 
> untouched.
> But that file lacks some lines I had in guix-manual-1.0.0-pre3.ru_RU.po.
> 
> For example the guix-manual-1.0.0-pre3.ru
> lacks translation on line 7564:
> 7564: #. type: Plain text
> #: doc/guix.texi:3402
> msgid "The garbage collector has a set of known @dfn{roots}: any file under 
> @file{/gnu/store}
> ...
> But guix-manual-1.0.0-pre3.ru_RU.po
> has translation of this text on line 10698:
> 10698: #. type: Plain text
> #: doc/guix.texi:3389 doc/guix.texi:3402
> msgid ""
> "The garbage collector has a set of known @dfn{roots}: any file under @file{/"
> ...
> Those two files differ with endline symbols. My old 
> guix-manual-1.0.0-pre3.ru_RU.po has many lines
> in each message, but the new file guix-manual-1.0.0-pre3.ru has msgid texts 
> in one long line.
> 
> The simple 'msgcat *.po > new.po' is not correct, cause the line numbering 
> breaks in a new file.
> Please, how to transfer translated strings from the 
> guix-manual-1.0.0-pre3.ru_RU.po into
> guix-manual-1.0.0-pre3.ru not breaking the latter?