[Phpmyadmin-git] [phpmyadmin/phpmyadmin] b17620: Translated using Weblate (Simplified Chinese)

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: b17620c4de04f5c16cef22ad61ddaa2a1f83bb8e
      https://github.com/phpmyadmin/phpmyadmin/commit/b17620c4de04f5c16cef22ad61ddaa2a1f83bb8e
  Author: Huang Zhiyi <hzy980512 at 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/8505f68dc9eb29997b85cab4178253a03aed65c9
  Author: Weblate <noreply at 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


  Commit: e2ed16d04ed86c1439e233b671ef6cd2f3c31896
      https://github.com/phpmyadmin/phpmyadmin/commit/e2ed16d04ed86c1439e233b671ef6cd2f3c31896
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

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

  Log Message:
  -----------
  Also show the Drop link in the routines list (because it's difficult to detect all privileges possibilities

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: fe160aec182dab993dd0d82dd053dca31988d950
      https://github.com/phpmyadmin/phpmyadmin/commit/fe160aec182dab993dd0d82dd053dca31988d950
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Changed paths:
    M po/zh_CN.po

  Log Message:
  -----------
  Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2


  Commit: 33f2b96a7b409d4397489e1604f78debc897a71f
      https://github.com/phpmyadmin/phpmyadmin/commit/33f2b96a7b409d4397489e1604f78debc897a71f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Log Message:
  -----------
  Merge commit '8505f68'


  Commit: a26a1dc987b2db268b7d88b38b8b5fbec3f56e7c
      https://github.com/phpmyadmin/phpmyadmin/commit/a26a1dc987b2db268b7d88b38b8b5fbec3f56e7c
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

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

  Log Message:
  -----------
  Merge commit 'e2ed16d'


  Commit: 3d9bd81961974814e74a6e710564de739c959924
      https://github.com/phpmyadmin/phpmyadmin/commit/3d9bd81961974814e74a6e710564de739c959924
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Log Message:
  -----------
  Merge commit 'fe160ae'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cd22bc28a47c...3d9bd8196197