From mboxrd@z Thu Jan  1 00:00:00 1970
From: znavko@disroot.org
Subject: How to merge two po files from different versions?
Date: Tue, 07 May 2019 09:23:03 +0000
Message-ID: <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]:44329)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <znavko@disroot.org>) id 1hNwJY-0005Gf-JP
	for help-guix@gnu.org; Tue, 07 May 2019 05:23:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <znavko@disroot.org>) id 1hNwJX-0001fF-EW
	for help-guix@gnu.org; Tue, 07 May 2019 05:23:08 -0400
Received: from knopi.disroot.org ([178.21.23.139]:55030)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <znavko@disroot.org>) id 1hNwJX-0001ea-61
	for help-guix@gnu.org; Tue, 07 May 2019 05:23:07 -0400
Received: from localhost (localhost [127.0.0.1])
	by disroot.org (Postfix) with ESMTP id C0C36309A9
	for <help-guix@gnu.org>; Tue,  7 May 2019 11:23:05 +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 1x_J_9_FTpr1 for <help-guix@gnu.org>;
	Tue,  7 May 2019 11:23:04 +0200 (CEST)
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>

Hello! I want to merge my two files: https://gitgud.io/znavko/guix-manual=
-ru-exp=0AThe latest is guix-manual-1.0.0-pre3.ru.po, so the lines there =
should rest untouched.=0ABut that file lacks some lines I had in guix-man=
ual-1.0.0-pre3.ru_RU.po.=0A=0AFor example the guix-manual-1.0.0-pre3.ru=
=0Alacks translation on line 7564:=0A7564: #. type: Plain text=0A#: doc/g=
uix.texi:3402=0Amsgid "The garbage collector has a set of known @dfn{root=
s}: any file under @file{/gnu/store}=0A...=0ABut guix-manual-1.0.0-pre3.r=
u_RU.po=0Ahas translation of this text on line 10698:=0A10698: #. type: P=
lain text=0A#: doc/guix.texi:3389 doc/guix.texi:3402=0Amsgid ""=0A"The ga=
rbage collector has a set of known @dfn{roots}: any file under @file{/"=
=0A...=0AThose two files differ with endline symbols. My old guix-manual-=
1.0.0-pre3.ru_RU.po has many lines in each message, but the new file guix=
-manual-1.0.0-pre3.ru has msgid texts in one long line.=0A=0AThe simple '=
msgcat *.po > new.po' is not correct, cause the line numbering breaks in =
a new file.=0APlease, how to transfer translated strings from the guix-ma=
nual-1.0.0-pre3.ru_RU.po into guix-manual-1.0.0-pre3.ru not breaking the =
latter?