Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: b17620c4de04f5c16cef22ad61ddaa2a1f83bb8e https://github.com/phpmyadmin/phpmyadmin/commit/b17620c4de04f5c16cef22ad61dd... Author: Huang Zhiyi hzy980512@126.com Date: 2014-07-11 (Fri, 11 Jul 2014)

Changed paths: M po/zh_CN.po

Log Message: ----------- Translated using Weblate (Simplified Chinese)

Currently translated at 87.3% (2419 of 2768)

Commit: 8505f68dc9eb29997b85cab4178253a03aed65c9 https://github.com/phpmyadmin/phpmyadmin/commit/8505f68dc9eb29997b85cab41782... Author: Weblate noreply@weblate.org Date: 2014-07-11 (Fri, 11 Jul 2014)

Changed paths: M ChangeLog M libraries/rte/rte_footer.lib.php M libraries/rte/rte_list.lib.php

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ce72213095c5...8505f68dc9eb