Hi
Dne Sun, 19 May 2013 14:25:03 +0200
Mohamed Ashraf <mohamed.ashraf.213(a)gmail.com> napsal(a):
On Thu, May 9, 2013 at 8:28 AM, Michal Čihař
<michal(a)cihar.com> wrote:
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.
from what I understand you are just discarding any changes to the po
files in the qa branches right?
Yes and no. The translation changes are done in both branches by
Weblate (tool we use for translations), but the po files are quite
different, so it's not easy to merge them.
--
Michal Čihař |
http://cihar.com |
http://blog.cihar.com