From kde-i18n-doc  Sun Jul 31 00:07:53 2011
From: David Jarvie <djarvie () kde ! org>
Date: Sun, 31 Jul 2011 00:07:53 +0000
To: kde-i18n-doc
Subject: Merging message catalogs
Message-Id: <201107310108.03692.djarvie () kde ! org>
X-MARC-Message: https://marc.info/?l=kde-i18n-doc&m=131207086406006
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--nextPart3961312.7cqWkvLZXj"

--nextPart3961312.7cqWkvLZXj
Content-Type: Text/Plain;
  charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

I'd like to merge the following three catalogs together in master, without =
losing translations. The catalogs all relate to KAlarm's two Akonadi resour=
ces - one for each resource, and one for message strings common to both res=
ources. I think it would be tidier to merge them, and it would also elimina=
te a couple of strings which are duplicated. Can you please either let me k=
now what to do, or do it for me.

The catalogs concerned are:
    messages/kdepim/akonadi_kalarm_resource.pot
    messages/kdepim/akonadi_kalarm_dir_resource.pot
    messages/kdepim/akonadi_kalarm_resource_common.pot

Will the fact that there will be a different catalog structure in 4.7 branc=
h and master mean that 4.7 translations for them won't be merged into maste=
r in future, or does the translation system take care of this? If translati=
ons won't be merged in future, would it be possible to merge the catalogs i=
n 4.7 branch also?

Thanks,
=2D-=20
David Jarvie.
KDE developer.
KAlarm author -- http://www.astrojar.org.uk/kalarm

--nextPart3961312.7cqWkvLZXj
Content-Type: application/pgp-signature; name=signature.asc 
Content-Description: This is a digitally signed message part.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAk40nNkACgkQTGZ1gSTAjlMTSwCgmOzw8f+FdiaVbZ9npd8g4zKn
/Q0AnRBjDO/JDf+XzXtFpf05pmchUXJb
=FUuz
-----END PGP SIGNATURE-----

--nextPart3961312.7cqWkvLZXj--