On Thu, Feb 22, 2007 at 10:31:30PM +0900, John McCabe-Dansted wrote:
Hi, I just updated to latest CVS and got merge conflicts in "po/de.po"
and "po/pspp.pot".
This happens from time to time. If you haven't explicitly changed
them, then just delete them, and do cvs update.
Since I did not manually change these files, I
suspect they are automatically generated from something. Should they
really be in CVS?
po/de.po really needs to be in CVS. Arguably po/pspp.pot could be
omitted. But it's there because translators need it, and they normally
wouldn't want to build the whole program in order to get it.
J'
--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3
See http://pgp.mit.edu or any PGP keyserver for public key.
signature.asc
Description: Digital signature
_______________________________________________ pspp-dev mailing list [email protected] http://lists.gnu.org/mailman/listinfo/pspp-dev
