Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e0a340f107993920d9c83949ff3c99fd1608f437 https://github.com/phpmyadmin/phpmyadmin/commit/e0a340f107993920d9c83949ff3c... Author: Krisztián Patai pataikrisztian@gmail.com Date: 2016-03-31 (Thu, 31 Mar 2016)
Changed paths: M po/hu.po
Log Message: ----------- Translated using Weblate (Hungarian)
Currently translated at 95.1% (3056 of 3212 strings)
[CI skip]
Commit: 863d2fb4c397b80f345f127bf68b656cc0205c1e https://github.com/phpmyadmin/phpmyadmin/commit/863d2fb4c397b80f345f127bf68b... Author: Eshin Kunishima ek@esh.ink Date: 2016-03-31 (Thu, 31 Mar 2016)
Changed paths: M po/ja.po
Log Message: ----------- Translated using Weblate (Japanese)
Currently translated at 67.6% (2173 of 3211 strings)
[CI skip]
Commit: 33e32daf17441473b7d17d281b98d973c3ef4bda https://github.com/phpmyadmin/phpmyadmin/commit/33e32daf17441473b7d17d281b98... Author: Weblate noreply@weblate.org Date: 2016-03-31 (Thu, 31 Mar 2016)
Changed paths: M ChangeLog M js/sql.js
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: a65a4213d7ab94172d0b2d23d0b1c43295ad1d2a https://github.com/phpmyadmin/phpmyadmin/commit/a65a4213d7ab94172d0b2d23d0b1... Author: Michal Čihař michal@cihar.com Date: 2016-04-05 (Tue, 05 Apr 2016)
Changed paths: M ChangeLog M libraries/common.inc.php
Log Message: ----------- Load gettext before autoloader
This fixes possible PHP error in SQL parser as it tries to define __() if it's not existing. Later loading of gettext just breaks this.
Fixes #12154
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 440e2f215b037ecd9d40340676443bd3a5358b32 https://github.com/phpmyadmin/phpmyadmin/commit/440e2f215b037ecd9d4034067644... Author: Michal Čihař michal@cihar.com Date: 2016-04-05 (Tue, 05 Apr 2016)
Changed paths: M ChangeLog M po/hu.po M po/ja.po
Log Message: ----------- Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/36f744e71fb0...440e2f215b03
-
Michal Čihař