[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 35ad38: Translated using Weblate (Portuguese (Brazil))

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 35ad381cdd1c015e7ea232887cff8ff61a3d1b4d https://github.com/phpmyadmin/phpmyadmin/commit/35ad381cdd1c015e7ea232887cf… Author: Helder Santana <helder.bs.santana(a)gmail.com> Date: 2013-10-01 (Tue, 01 Oct 2013) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (2611 of 2611) Commit: 63c87b82ee35b04cfa6f9651cd4f3588ddd39448 https://github.com/phpmyadmin/phpmyadmin/commit/63c87b82ee35b04cfa6f9651cd4… Author: Weblate <noreply(a)weblate.org> Date: 2013-10-01 (Tue, 01 Oct 2013) Changed paths: M ChangeLog M js/tbl_change.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 Commit: 385e3274be655a2523f74e20e3c0337b637c50a5 https://github.com/phpmyadmin/phpmyadmin/commit/385e3274be655a2523f74e20e3c… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-10-02 (Wed, 02 Oct 2013) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.0.9-dev Commit: c91e9b1b4fd0afc7deca1d760066b9d061c42431 https://github.com/phpmyadmin/phpmyadmin/commit/c91e9b1b4fd0afc7deca1d76006… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-10-02 (Wed, 02 Oct 2013) Log Message: ----------- Merge branch 'QA_4_0' Commit: 3c49b201e98514f81b7d97d733fe25007950e22b https://github.com/phpmyadmin/phpmyadmin/commit/3c49b201e98514f81b7d97d733f… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-10-02 (Wed, 02 Oct 2013) Changed paths: M ChangeLog Log Message: ----------- Fix merge conflict Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a2235b67c5d2...3c49b201e985