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

["pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de>]

On Tue, May 07, 2019 at 03:37:58PM +0000, znavko@disroot.org wrote:
> This is screenshot of both files http://0x0.st/zTjx.png
> the guix-manual-1.0.0-pre3.ru.po  rests untranslated after your commands on line 
> #. type: Plain text
> #: doc/guix.texi:3402
> msgid "The garbage collector has a set of known @dfn{roots}: any file under @file{/gnu/store} reachable from a root is considered @dfn{live} and cannot be deleted; any other file is considered @dfn{dead} and may be deleted.  The set of garbage collector roots (``GC roots'' for short)  includes default user profiles; by default, the symlinks under @file{/var/guix/gcroots} represent these GC roots.  New GC roots can be added with @command{guix build --root}, for example (@pxref{Invoking guix build}).  The @command{guix gc --list-roots} command lists them."
> msgstr ""
> 

This one is translated in the resulting new.po for me.  Note that
new.po contains the new file.


> and about 4k other lines (about 500 messages).
> Yes, this line has another place in the manual than guix-manual-1.0.0-pre3.ru_RU.po has, but the msgid content is the same. 
> 
> I want to merge messages that have equal content but different places in manual: 
> new file it is 'doc/guix.texi:3402'
> but the old translated file was  'doc/guix.texi:3389 doc/guix.texi:3402'
> 
>

msgmerge considers only content, line number is not relevant for
msgmerge or gettext in general.

Regards,
Florian