Kornel Benko wrote: > Am Sonntag, 4. Juni 2017 um 10:33:02, schrieb Scott Kostyshak > <skost...@lyx.org> >> On Sun, Jun 04, 2017 at 12:17:27PM +0200, Kornel Benko wrote: >> >> > > Unless someone has a different idea, I will replace the Windows >> > > linebreaks with non-Windows linebreaks, update the strings on master, >> > > and try the mergepo.py call above again.
If there are windows line breaks again someone uses a misconfigured git client or does stuff behind the back of git. The settings in the .gitattributes file ensure that .po files are always stored using unix line ends in git, and using native OS line ends in working directories. >> > I made a perl-script for this purpose (created and used for commit >> > 52eee8e). Should I add it to repo? >> >> For the purpose of fixing the linebreaks > > This one. I would suggest to use git correctly instead of fixing broken line ends again and again, producing huge nonsense diffs. We had this discussion several times in the past. Georg
