all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: znavko@disroot.org
To: help-guix <help-guix@gnu.org>
Subject: How to merge two po files from different versions?
Date: Tue, 07 May 2019 09:23:03 +0000	[thread overview]
Message-ID: <1d7299f3587eff0aeabe29b41fc2f617@disroot.org> (raw)

Hello! I want to merge my two files: https://gitgud.io/znavko/guix-manual-ru-exp
The latest is guix-manual-1.0.0-pre3.ru.po, so the lines there should rest untouched.
But that file lacks some lines I had in guix-manual-1.0.0-pre3.ru_RU.po.

For example the guix-manual-1.0.0-pre3.ru
lacks translation on line 7564:
7564: #. type: Plain text
#: doc/guix.texi:3402
msgid "The garbage collector has a set of known @dfn{roots}: any file under @file{/gnu/store}
...
But guix-manual-1.0.0-pre3.ru_RU.po
has translation of this text on line 10698:
10698: #. type: Plain text
#: doc/guix.texi:3389 doc/guix.texi:3402
msgid ""
"The garbage collector has a set of known @dfn{roots}: any file under @file{/"
...
Those 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.

The simple 'msgcat *.po > new.po' is not correct, cause the line numbering breaks in a new file.
Please, how to transfer translated strings from the guix-manual-1.0.0-pre3.ru_RU.po into guix-manual-1.0.0-pre3.ru not breaking the latter?

             reply	other threads:[~2019-05-07  9:23 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-07  9:23 znavko [this message]
2019-05-07  9:26 ` How to merge two po files from different versions? znavko
2019-05-07 14:19   ` pelzflorian (Florian Pelz)
2019-05-07 14:58   ` znavko
2019-05-07 15:15     ` pelzflorian (Florian Pelz)
2019-05-07 15:37     ` znavko
2019-05-07 15:49       ` pelzflorian (Florian Pelz)
2019-05-07 15:55       ` znavko
2019-05-07 17:21         ` pelzflorian (Florian Pelz)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1d7299f3587eff0aeabe29b41fc2f617@disroot.org \
    --to=znavko@disroot.org \
    --cc=help-guix@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.