[Phpmyadmin-devel] Merging translations in git
michal at cihar.com
Thu May 9 09:46:33 CEST 2013
Dne Thu, 09 May 2013 02:35:42 -0400
Marc Delisle <marc at infomarc.info> napsal(a):
> Le 2013-05-09 02:28, Michal Čihař a écrit :
> > Hi all
> > I've just updated our wiki to include more detailed guide how to deal
> > with merging po files:
> > https://wiki.phpmyadmin.net/pma/Git#Merging_translations
> > Please use that, otherwise po files in master will get corrupted as
> > seen quite often recently. It is nearly impossible to do proper merge
> > with them as the branches diverge.
> Thanks, I'll try that next time :)
> But I'm wondering: could we permit changes just in master?
We want translation updates in future 4.0.x releases as well. Many
translators did not manage to complete in time translations for 4.0.0...
Michal Čihař | http://cihar.com | http://phpmyadmin.net
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 836 bytes
Desc: not available
More information about the Developers