From mboxrd@z Thu Jan 1 00:00:00 1970 From: znavko@disroot.org Subject: Re: How to merge two po files from different versions? Date: Tue, 07 May 2019 15:55:54 +0000 Message-ID: References: <20190507154954.plfrzaqqsypun5bo@pelzflorian.localdomain> <20190507151503.5qu3hray523jf5u2@pelzflorian.localdomain> <20190507141934.2qk46pvltonazaiv@pelzflorian.localdomain> <1d7299f3587eff0aeabe29b41fc2f617@disroot.org> <0fce510690b8612ac9738522aec90c96@disroot.org> <17433f68f270548e85ef445eb51d0372@disroot.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([209.51.188.92]:40034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hO2Ri-0001F7-Pa for help-guix@gnu.org; Tue, 07 May 2019 11:55:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hO2Rh-00058O-N8 for help-guix@gnu.org; Tue, 07 May 2019 11:55:58 -0400 Received: from knopi.disroot.org ([178.21.23.139]:41602) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hO2Rh-00057q-HP for help-guix@gnu.org; Tue, 07 May 2019 11:55:57 -0400 In-Reply-To: <20190507154954.plfrzaqqsypun5bo@pelzflorian.localdomain> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-guix-bounces+gcggh-help-guix=m.gmane.org@gnu.org Sender: "Help-Guix" To: "pelzflorian (Florian Pelz)" Cc: help-guix Thank you for your comments. I'll continue to translate the new.po renami= ng it as necessary. =0AHope, TP will accept it with no problems.=0A=0A=0A= May 7, 2019 3:50 PM, "pelzflorian (Florian Pelz)" wrote:=0A=0A> On Tue, May 07, 2019 at 03:37:58PM +0000, znavko@disr= oot.org wrote:=0A> =0A>> This is screenshot of both files http://0x0.st/z= Tjx.png=0A>> the guix-manual-1.0.0-pre3.ru.po rests untranslated after yo= ur commands on line=0A>> #. type: Plain text=0A>> #: doc/guix.texi:3402= =0A>> msgid "The garbage collector has a set of known @dfn{roots}: any fi= le under @file{/gnu/store}=0A>> reachable from a root is considered @dfn{= live} and cannot be deleted; any other file is considered=0A>> @dfn{dead}= and may be deleted. The set of garbage collector roots (``GC roots'' for= short) includes=0A>> default user profiles; by default, the symlinks und= er @file{/var/guix/gcroots} represent these GC=0A>> roots. New GC roots c= an be added with @command{guix build --root}, for example (@pxref{Invokin= g=0A>> guix build}). The @command{guix gc --list-roots} command lists the= m."=0A>> msgstr ""=0A> =0A> This one is translated in the resulting new.p= o for me. Note that=0A> new.po contains the new file.=0A> =0A>> and about= 4k other lines (about 500 messages).=0A>> Yes, this line has another pla= ce in the manual than guix-manual-1.0.0-pre3.ru_RU.po has, but the=0A>> m= sgid content is the same.=0A>> =0A>> I want to merge messages that have e= qual content but different places in manual:=0A>> new file it is 'doc/gui= x.texi:3402'=0A>> but the old translated file was 'doc/guix.texi:3389 doc= /guix.texi:3402'=0A> =0A> msgmerge considers only content, line number is= not relevant for=0A> msgmerge or gettext in general.=0A> =0A> Regards,= =0A> Florian