Georg Baum wrote: > commit 960bcc71c18b21e0444cfce3d9a5e7c10cb3172a > Author: Georg Baum <b...@lyx.org> > Date: Sat Jun 4 17:33:19 2016 +0200 > > Get rid of pseudo diffs when remerging strings > > cmake sorts the input files for lyx_pot.py internally, but autotools > use a shell pattern like *.ui on the command line, so the order may be > different on different machines. It is more robust not to require any > sorting from the caller, so lyx_pot.py sorts now internally. >
Richard, this might be interesting for the 2.2.x branch as well, depending on how you want to organize string remerging. It fixes the sorting problem we have had for years, which produces huge pseudo diffs if one remerges with autotools after a remerge was done with cmake or vice versa. Together with 9df45c383ad this should now fix all pseudo-diff problems we had with .po file generation. Georg
