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:37:58 +0000 Message-ID: <17433f68f270548e85ef445eb51d0372@disroot.org> References: <20190507151503.5qu3hray523jf5u2@pelzflorian.localdomain> <20190507141934.2qk46pvltonazaiv@pelzflorian.localdomain> <1d7299f3587eff0aeabe29b41fc2f617@disroot.org> <0fce510690b8612ac9738522aec90c96@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]:35818) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hO2AO-0007WE-QM for help-guix@gnu.org; Tue, 07 May 2019 11:38:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hO2AN-0000gz-DS for help-guix@gnu.org; Tue, 07 May 2019 11:38:04 -0400 Received: from knopi.disroot.org ([178.21.23.139]:33368) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hO2AM-0000fO-Vu for help-guix@gnu.org; Tue, 07 May 2019 11:38:03 -0400 In-Reply-To: <20190507151503.5qu3hray523jf5u2@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 This is screenshot of both files http://0x0.st/zTjx.png=0Athe guix-manual= -1.0.0-pre3.ru.po rests untranslated after your commands on line =0A#. t= ype: Plain text=0A#: doc/guix.texi:3402=0Amsgid "The garbage collector ha= s 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 fil= e is considered @dfn{dead} and may be deleted. The set of garbage collec= tor roots (``GC roots'' for short) includes default user profiles; by de= fault, the symlinks under @file{/var/guix/gcroots} represent these GC roo= ts. New GC roots can be added with @command{guix build --root}, for exam= ple (@pxref{Invoking guix build}). The @command{guix gc --list-roots} co= mmand lists them."=0Amsgstr ""=0A=0Aand about 4k other lines (about 500 m= essages).=0AYes, this line has another place in the manual than guix-manu= al-1.0.0-pre3.ru_RU.po has, but the msgid content is the same. =0A=0AI wa= nt to merge messages that have equal content but different places in manu= al: =0Anew file it is 'doc/guix.texi:3402'=0Abut the old translated file = was 'doc/guix.texi:3389 doc/guix.texi:3402'=0A=0A=0AMay 7, 2019 3:15 PM,= "pelzflorian (Florian Pelz)" wrote:=0A=0A> = On Tue, May 07, 2019 at 02:58:41PM +0000, znavko@disroot.org wrote:=0A> = =0A>> No, sorry. Your commands not work. That msgid from line 7564 rests = untranslated, so it did not=0A>> transfered from my guix-manual-1.0.0-pre= 3.ru_RU.po.=0A>> Ooh la la!=0A> =0A> I do not see which one is missing in= new.po. I do not understand how=0A> you count line numbers. Can you tell= me the doc/guix.texi:?? line=0A> number above the msgid?