Re: [LyX/master] Get rid of pseudo diffs when remerging strings

2016-06-04 Thread Richard Heck
On 06/04/2016 01:28 PM, Georg Baum wrote: > Richard Heck wrote: > >> OK, please commit to 2.2.x. (Safe enough, yes?) > Done. Yes, it is safe. And even if something went wrong you would now see it > in the diffs when sommitting .po files: The only visible diffs should now be > changed line

Re: [LyX/master] Get rid of pseudo diffs when remerging strings

2016-06-04 Thread Georg Baum
Georg Baum wrote: > commit 960bcc71c18b21e0444cfce3d9a5e7c10cb3172a > Author: Georg Baum > 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

Re: [LyX/master] Get rid of pseudo diffs when remerging strings

2016-06-04 Thread Georg Baum
Richard Heck wrote: > OK, please commit to 2.2.x. (Safe enough, yes?) Done. Yes, it is safe. And even if something went wrong you would now see it in the diffs when sommitting .po files: The only visible diffs should now be changed line numbers in source files, and of course added, changed or

Re: [LyX/master] Get rid of pseudo diffs when remerging strings

2016-06-04 Thread Pavel Sanda
Georg Baum wrote: > Together with 9df45c383ad this should now fix all pseudo-diff problems we > had with .po file generation. Nice! P

Re: [LyX/master] Get rid of pseudo diffs when remerging strings

2016-06-04 Thread Richard Heck
On 06/04/2016 11:54 AM, Georg Baum wrote: > Georg Baum wrote: > >> commit 960bcc71c18b21e0444cfce3d9a5e7c10cb3172a >> Author: Georg Baum >> Date: Sat Jun 4 17:33:19 2016 +0200 >> >> Get rid of pseudo diffs when remerging strings >> >> cmake sorts the input files for