[Phpmyadmin-devel] Broken po files in Ninad's tree

[Michal Čihař]

Hi

it looks like Ninad's tree has broken locales, the problem is in not
cleaned up merge[0].

The root cause is that po files are quite often changing content and
doing changes in both gsoc branch and master will lead to conflicts. So
please follow instructions on wiki [1] and do not update po files in
your private branches, this will be done once the code is merged
(anyway the translations won't be sent out to translators or to
translation server, so nobody will do the translation work anyway).

[0]:http://repo.or.cz/w/phpmyadmin/ninadsp.git/commit/47142291a1983f2a541a947b50a6f1dba29f48d0
[1]:http://wiki.phpmyadmin.net/pma/Devel:Gettext_for_developers#Updating_.po_files

-- 
	Michal Čihař | http://cihar.com | http://blog.cihar.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.phpmyadmin.net/pipermail/developers/attachments/20100707/56fabc4c/attachment.sig>