all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: znavko@disroot.org
To: "pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de>
Cc: help-guix <help-guix@gnu.org>
Subject: Re: How to merge two po files from different versions?
Date: Tue, 07 May 2019 15:55:54 +0000	[thread overview]
Message-ID: <b4c9ff23788ac013d4163ed016fe7229@disroot.org> (raw)
In-Reply-To: <20190507154954.plfrzaqqsypun5bo@pelzflorian.localdomain>

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

  parent reply	other threads:[~2019-05-07 15:55 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-07  9:23 How to merge two po files from different versions? znavko
2019-05-07  9:26 ` znavko
2019-05-07 14:19   ` pelzflorian (Florian Pelz)
2019-05-07 14:58   ` znavko
2019-05-07 15:15     ` pelzflorian (Florian Pelz)
2019-05-07 15:37     ` znavko
2019-05-07 15:49       ` pelzflorian (Florian Pelz)
2019-05-07 15:55       ` znavko [this message]
2019-05-07 17:21         ` pelzflorian (Florian Pelz)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b4c9ff23788ac013d4163ed016fe7229@disroot.org \
    --to=znavko@disroot.org \
    --cc=help-guix@gnu.org \
    --cc=pelzflorian@pelzflorian.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.