Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5544164bebb75bd5c4a82ea69507202764d149f0 https://github.com/phpmyadmin/phpmyadmin/commit/5544164bebb75bd5c4a82ea69507... Author: Alexander Luiz Marinho <apaetmk@allva.com.br> Date: 2012-08-30 (Thu, 30 Aug 2012) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate. Commit: 87e52884415951abcbd120cee378f155eb0ea7cf https://github.com/phpmyadmin/phpmyadmin/commit/87e52884415951abcbd120cee378... Author: Atul Pratap Singh <atulpratapsingh05@gmail.com> Date: 2012-08-30 (Thu, 30 Aug 2012) Changed paths: M js/server_status_monitor.js Log Message: ----------- Merge branch 'QA_3_5-jqplot' into QA_3_5 Commit: f11d5422ef8d678b5a70f84d7ca2b63ddca1c667 https://github.com/phpmyadmin/phpmyadmin/commit/f11d5422ef8d678b5a70f84d7ca2... Author: مترجم حرّ <metehyi@gmail.com> Date: 2012-08-30 (Thu, 30 Aug 2012) Changed paths: M po/ar.po Log Message: ----------- Translated using Weblate. Commit: 2833a60d0d11c5af849d3588108a69e303d004d8 https://github.com/phpmyadmin/phpmyadmin/commit/2833a60d0d11c5af849d3588108a... Author: Guto Rocha <grgutorocha@gmail.com> Date: 2012-08-30 (Thu, 30 Aug 2012) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate. Commit: 0c13414f2383556cfe0f214250e3f469bb4ded14 https://github.com/phpmyadmin/phpmyadmin/commit/0c13414f2383556cfe0f214250e3... Author: Weblate <noreply@weblate.org> Date: 2012-08-30 (Thu, 30 Aug 2012) Changed paths: M js/server_status_monitor.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 Commit: efafb8c156309a229c05872ce07758965f948fb0 https://github.com/phpmyadmin/phpmyadmin/commit/efafb8c156309a229c05872ce077... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2012-08-30 (Thu, 30 Aug 2012) Changed paths: M build.xml Log Message: ----------- Ignore jqplot files in CheckStyle analysis Commit: 1924f342bcd33639b00ecf851ef4cd219ac6a7e4 https://github.com/phpmyadmin/phpmyadmin/commit/1924f342bcd33639b00ecf851ef4... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2012-08-30 (Thu, 30 Aug 2012) Changed paths: M build.xml Log Message: ----------- Merge branch 'QA_3_5' Conflicts: build.xml po/ar.po po/pt_BR.po Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1226790de0ed...1924f342bcd3