[Pkg-shadow-devel] Re: [Pkg-shadow-commits] r233 - trunk/debian/patches

[Christian Perrier]

Quoting Martin Quinson (mquinson@costa.debian.org):
> Author: mquinson
> Date: 2005-06-10 10:36:41 +0000 (Fri, 10 Jun 2005)
> New Revision: 233
>=20
> Modified:
>    trunk/debian/patches/002_more-i18n.dpatch
> Log:
> Document the patch; cleanup by sorting *manually* the files in the po/P=
OTFILES.in, which results in more sane result and reduced patch size. Not=
e that the pot file was not updated


In my opinion, we should forget about the POT file update in this
patch.

I think we'd better first do the resync with upstream without taking
care of POT and PO files, then regenerate the POT, then do:

for i in cvs/shadow/po/*po=A0; do
file=3D`basename $i`
msgcat --use-first $i shadow-4.0.3/po/$file >$i
msgmege -U $i cvs/shadow/po/shadow.pot
done

This will give us a merge of POs in CVS and POs from Debian, with
priority given to CVS for common strings....these POs being then updated
from the msgids of the CVS POT file (generated before this).

This allows us to just forget about PO files patches transition as
long as we keep the complete Debian PO files together before doing the
switch.

The picture is indeed far less clear in my mind when it comes at 2xx
patches=A0: the man pages translations.