Am 10.05.2016 um 01:50 schrieb Uwe Stöhr:
Am 09.05.2016 um 21:48 schrieb Georg Baum:
Therefore I asked. How do they get the .po files after a string remerge?
I don't know. Maybe from git but I know also that download them via
our TRAC websites. If it is the latter I fear they will get their
system line endings. And when they compare this with what they sent
me, they get huge diffs.
I don't know this exactly, so maybe let's just try out and we can
react if anybody has problems and help him.
OK, so if we set .po files to native line endings we will be consistent
with trac. I will do that in 2.3 and then we'll wait for a complaint;-)
You do not need to transform the file manually.
If I need to edit a file and don't be patient, I get Win-line endings.
So one needs to set up the editor properly.
Good editors (like notepad2) detect the line endings of a file and do
not change them, no configuration needed. But even if your editor needs
configuration, you only need to configure it if you want to look at
diffs (which does currently not work in most cases anyway). If you are
not interested in the diffs you can just edit the file and ignore line
endings. git will convert on commit (if needed).
Georg
