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 09:26:13 +0000
Message-ID: <b1a383bb2cb2282d25b20de01cf45f8e@disroot.org>
References: <1d7299f3587eff0aeabe29b41fc2f617@disroot.org>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Return-path: <help-guix-bounces+gcggh-help-guix=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([209.51.188.92]:44725)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <znavko@disroot.org>) id 1hNwMb-0005lh-2v
	for help-guix@gnu.org; Tue, 07 May 2019 05:26:18 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <znavko@disroot.org>) id 1hNwMa-0003CE-2o
	for help-guix@gnu.org; Tue, 07 May 2019 05:26:17 -0400
Received: from knopi.disroot.org ([178.21.23.139]:60734)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <znavko@disroot.org>) id 1hNwMZ-0003Bg-T5
	for help-guix@gnu.org; Tue, 07 May 2019 05:26:16 -0400
Received: from localhost (localhost [127.0.0.1])
	by disroot.org (Postfix) with ESMTP id 230A2309D6
	for <help-guix@gnu.org>; Tue,  7 May 2019 11:26:15 +0200 (CEST)
Received: from knopi.disroot.org ([127.0.0.1])
	by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 5oJFg0oxdSPR for <help-guix@gnu.org>;
	Tue,  7 May 2019 11:26:13 +0200 (CEST)
In-Reply-To: <1d7299f3587eff0aeabe29b41fc2f617@disroot.org>
List-Id: <help-guix.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/help-guix>,
	<mailto:help-guix-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/help-guix/>
List-Post: <mailto:help-guix@gnu.org>
List-Help: <mailto:help-guix-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/help-guix>,
	<mailto:help-guix-request@gnu.org?subject=subscribe>
Errors-To: help-guix-bounces+gcggh-help-guix=m.gmane.org@gnu.org
Sender: "Help-Guix" <help-guix-bounces+gcggh-help-guix=m.gmane.org@gnu.org>
To: help-guix <help-guix@gnu.org>

Here it is my repository with both files: https://gitgud.io/znavko/guix-m=
anual-ru-exp=0A=0A=0AMay 7, 2019 9:23 AM, znavko@disroot.org wrote:=0A=0A=
> Hello! I want to merge my two files: https://gitgud.io/znavko/guix-manu=
al-ru-exp=0A> The latest is guix-manual-1.0.0-pre3.ru.po, so the lines th=
ere should rest untouched.=0A> But that file lacks some lines I had in gu=
ix-manual-1.0.0-pre3.ru_RU.po.=0A> =0A> For example the guix-manual-1.0.0=
-pre3.ru=0A> lacks translation on line 7564:=0A> 7564: #. type: Plain tex=
t=0A> #: doc/guix.texi:3402=0A> msgid "The garbage collector has a set of=
 known @dfn{roots}: any file under @file{/gnu/store}=0A> ...=0A> But guix=
-manual-1.0.0-pre3.ru_RU.po=0A> has translation of this text on line 1069=
8:=0A> 10698: #. type: Plain text=0A> #: doc/guix.texi:3389 doc/guix.texi=
:3402=0A> msgid ""=0A> "The garbage collector has a set of known @dfn{roo=
ts}: any file under @file{/"=0A> ...=0A> Those two files differ with endl=
ine symbols. My old guix-manual-1.0.0-pre3.ru_RU.po has many lines=0A> in=
 each message, but the new file guix-manual-1.0.0-pre3.ru has msgid texts=
 in one long line.=0A> =0A> The simple 'msgcat *.po > new.po' is not corr=
ect, cause the line numbering breaks in a new file.=0A> Please, how to tr=
ansfer translated strings from the guix-manual-1.0.0-pre3.ru_RU.po into=
=0A> guix-manual-1.0.0-pre3.ru not breaking the latter?