Kornel Benko wrote: > Am Donnerstag, 21. April 2016 um 22:20:53, schrieb Georg Baum > <georg.b...@post.rwth-aachen.de> >> This is unfortunately difficult: >> >> - If Uwe does a remerge we will get the broken line endings again. >> - If Jean-Pierre or I do a remerge we will get an exploded diff (32 MiB >> for all languages) because of the totally different sorting on unix >> (msguniq) vs. windows (gettext). Because of this it will also be almost >> impossible to see the real changes, e.g. if some strings have been >> deleted. > > I could. I am doing it already all the time for sk.po.
I found it out: In addition to the windows/unix differences, we have cmake/autotools differences. If I remerge with cmake, the diff is "only" 7.8 MiB. The order of the entries in the .po files is now the same, the remaining differences are the well known issue of sorting the comment lines in front of each entry. But it is not only the sorting, it also looks like on windows some strings are not found. After the remerge with cmake, I get this in the diff of de.po (the last remerge of it was on windows): -#: src/frontends/qt4/ui/BibitemUi.ui:54 src/frontends/qt4/ui/RefUi.ui:190 +#: src/frontends/qt4/ui/BibitemUi.ui:54 src/frontends/qt4/ui/LabelUi.ui:36 +#: src/frontends/qt4/ui/RefUi.ui:190 The last time LabelUi.ui has been touched was in 2010, so it is a bug that it does not appear if one does a remerge in windows. We really need to stop using two build systems. For now, I would suggest that a remerge of all languages is done using cmake ASAP. Georg
