How to merge two po files from different versions?

How to merge two po files from different versions?

[znavko]

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?

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, znavko@disroot.org 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?

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

[pelzflorian (Florian Pelz)]

On Tue, May 07, 2019 at 09:26:13AM +0000, znavko@disroot.org wrote:
> > 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?
> 

I do not understand what the issue is with line numbers.

Does this work?

msgcat --no-wrap *.po > new.po
msgmerge -U --no-wrap --previous --lang=ru new.po guix-manual-1.0.0-pre3.ru.po

Regards,
Florian

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

[znavko]

No, sorry. Your commands not work. That msgid from line 7564 rests untranslated, so it did not transfered from my guix-manual-1.0.0-pre3.ru_RU.po.
Ooh la la!

May 7, 2019 2:19 PM, "pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de> wrote:

> On Tue, May 07, 2019 at 09:26:13AM +0000, znavko@disroot.org wrote:
> 
>> 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?
> 
> I do not understand what the issue is with line numbers.
> 
> Does this work?
> 
> msgcat --no-wrap *.po > new.po
> msgmerge -U --no-wrap --previous --lang=ru new.po guix-manual-1.0.0-pre3.ru.po
> 
> Regards,
> Florian

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

[pelzflorian (Florian Pelz)]

On Tue, May 07, 2019 at 02:58:41PM +0000, znavko@disroot.org wrote:
> No, sorry. Your commands not work. That msgid from line 7564 rests untranslated, so it did not transfered from my guix-manual-1.0.0-pre3.ru_RU.po.
> Ooh la la!
>

I do not see which one is missing in new.po.  I do not understand how
you count line numbers.  Can you tell me the doc/guix.texi:?? line
number above the msgid?

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

[znavko]

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 ""

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'


May 7, 2019 3:15 PM, "pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de> wrote:

> On Tue, May 07, 2019 at 02:58:41PM +0000, znavko@disroot.org wrote:
> 
>> No, sorry. Your commands not work. That msgid from line 7564 rests untranslated, so it did not
>> transfered from my guix-manual-1.0.0-pre3.ru_RU.po.
>> Ooh la la!
> 
> I do not see which one is missing in new.po. I do not understand how
> you count line numbers. Can you tell me the doc/guix.texi:?? line
> number above the msgid?

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

[pelzflorian (Florian Pelz)]

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

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

[znavko]

Thank you for your comments. I'll continue to translate the new.po renaming it as necessary. 
Hope, TP will accept it with no problems.


May 7, 2019 3:50 PM, "pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de> wrote:

> 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

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

[pelzflorian (Florian Pelz)]

On Tue, May 07, 2019 at 03:55:54PM +0000, znavko@disroot.org wrote:
> Thank you for your comments. I'll continue to translate the new.po renaming it as necessary. 
> Hope, TP will accept it with no problems.
> 
> 

It should not cause problems with the TP.  new.po has only 28 newly
translated messages however compared to guix-manual-1.0.0-pre3.ru.po.

Regards,
Florian