Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4e7fbc287c0cb366b41ffecf9af667b67778cf1c https://github.com/phpmyadmin/phpmyadmin/commit/4e7fbc287c0cb366b41ffecf9af6... Author: josep constanti <jconstanti@ovi.com> Date: 2014-10-21 (Tue, 21 Oct 2014) Changed paths: M po/ca.po Log Message: ----------- Translated using Weblate (Catalan) Currently translated at 88.3% (2446 of 2768 strings) [CI skip] Commit: a5516f3b3470d94328bda52376811926d77cddef https://github.com/phpmyadmin/phpmyadmin/commit/a5516f3b3470d94328bda5237681... Author: Weblate <noreply@weblate.org> Date: 2014-10-21 (Tue, 21 Oct 2014) Changed paths: M ChangeLog M js/server_status_monitor.js M libraries/DatabaseInterface.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 Commit: e28912d49e50071cba9632047ed3704f57d4c652 https://github.com/phpmyadmin/phpmyadmin/commit/e28912d49e50071cba9632047ed3... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-10-21 (Tue, 21 Oct 2014) Changed paths: M ChangeLog M libraries/core.lib.php Log Message: ----------- bug #4557 PHP fatal error, undefined function __() Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 35b228d534a6db8d3de266c9eb22ed7706378be5 https://github.com/phpmyadmin/phpmyadmin/commit/35b228d534a6db8d3de266c9eb22... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-10-21 (Tue, 21 Oct 2014) Changed paths: M ChangeLog M libraries/core.lib.php Log Message: ----------- Merge branch 'QA_4_2' Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3334ca3ce6e7...35b228d534a6