From mboxrd@z Thu Jan 1 00:00:00 1970 From: "pelzflorian (Florian Pelz)" Subject: Re: How to merge two po files from different versions? Date: Tue, 7 May 2019 17:49:54 +0200 Message-ID: <20190507154954.plfrzaqqsypun5bo@pelzflorian.localdomain> References: <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=us-ascii Return-path: Received: from eggs.gnu.org ([209.51.188.92]:38472) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hO2M8-0004cM-WF for help-guix@gnu.org; Tue, 07 May 2019 11:50:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hO2M7-0000vz-Ub for help-guix@gnu.org; Tue, 07 May 2019 11:50:12 -0400 Received: from pelzflorian.de ([5.45.111.108]:59270 helo=mail.pelzflorian.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hO2M7-0000uI-CD for help-guix@gnu.org; Tue, 07 May 2019 11:50:11 -0400 Content-Disposition: inline In-Reply-To: <17433f68f270548e85ef445eb51d0372@disroot.org> 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: znavko@disroot.org Cc: help-guix 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