Erik Johansson wrote:
2007/6/19, flynd <[EMAIL PROTECTED]>:
I guess either the makefiles needs to be put back or the README.LOCALES
needs to be updated with new instructions.
Done. make merge and make clean-merge now works in qt4 branch. Even
supports installing translations :)
// Erik
Thanks, now it works.
But it gave me another problem. After making a merge on all translation
files i qt4, the files has changes so much that merging translation
updates from qt3-gui is no longer trivial.
Since I don't feel at home with the translation files. Could someone
else please handle these merges (currently r4939 and r4940 but also
future updates) or should the merge in qt4 be undone (r4959) so
qt3-changes continue to be trivial merges even though the files will not
be in qt4-format?
/Anders
