Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: baaa6c63be5a55bfad2868ed0b40f71be3593102 https://github.com/phpmyadmin/phpmyadmin/commit/baaa6c63be5a55bfad2868ed0b40... Author: Jocelyn Flament <jocelyn.flament@gmail.com> Date: 2016-06-12 (Sun, 12 Jun 2016) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 99.8% (3203 of 3209 strings) [CI skip] Commit: c8823e24e7c1a37f78f45fd1ab24d310014e6f19 https://github.com/phpmyadmin/phpmyadmin/commit/c8823e24e7c1a37f78f45fd1ab24... Author: Xavier Navarro <xvnavarro@gmail.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M po/ca.po Log Message: ----------- Translated using Weblate (Catalan) Currently translated at 100.0% (3209 of 3209 strings) [CI skip] Commit: 2d7d2d2e8b084e4410b5c9c7a9947b3fcdcffc5e https://github.com/phpmyadmin/phpmyadmin/commit/2d7d2d2e8b084e4410b5c9c7a994... Author: Bruno Henrique <bruno.henrique@ceepcascavel.com.br> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate (Portuguese (Brazil)) Currently translated at 93.3% (2996 of 3209 strings) [CI skip] Commit: 0caecf5fc894db9d904fe1e62d05888edd664038 https://github.com/phpmyadmin/phpmyadmin/commit/0caecf5fc894db9d904fe1e62d05... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M js/server_variables.js Log Message: ----------- Correct error handling when editing variable fails Issue #12317 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: b5faeb3c27c05b0ab3349272e51cfe053913e5e9 https://github.com/phpmyadmin/phpmyadmin/commit/b5faeb3c27c05b0ab3349272e51c... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M ChangeLog M js/server_variables.js M templates/server/variables/variable_row.phtml Log Message: ----------- Fixed editing of server variable We now store verbatim variable name in HTML to avoid need to do some magical transformations when parsing it. Fixes #12317 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: eaba32e55d8e88afed190d1a88eaa6921d41efe1 https://github.com/phpmyadmin/phpmyadmin/commit/eaba32e55d8e88afed190d1a88ea... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' Commit: 8a0e39228fcb4deba8ddb7ba1b1d6bd951e67a43 https://github.com/phpmyadmin/phpmyadmin/commit/8a0e39228fcb4deba8ddb7ba1b1d... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M ChangeLog M js/server_variables.js M templates/server/variables/variable_row.phtml Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/317ad3208cbd...8a0e39228fcb