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

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 87773296b393aaa6127df59dff59c221eb5ec5b7
      https://github.com/phpmyadmin/phpmyadmin/commit/87773296b393aaa6127df59dff59c221eb5ec5b7
  Author: shanyan baishui <Siramizu at gmail.com>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Changed paths:
    M po/zh_CN.po

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

Currently translated at 99.2% (2589 of 2609)


  Commit: c1fbdc56481aeba37c8447a306c161efdc2d51d3
      https://github.com/phpmyadmin/phpmyadmin/commit/c1fbdc56481aeba37c8447a306c161efdc2d51d3
  Author: Weblate <noreply at weblate.org>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Changed paths:
    M doc/require.rst

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


  Commit: 76e76a09eb7a077449225b0465941bbf2448ce07
      https://github.com/phpmyadmin/phpmyadmin/commit/76e76a09eb7a077449225b0465941bbf2448ce07
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Changed paths:
    M ChangeLog
    M js/tbl_change.js

  Log Message:
  -----------
  bug #4051 Wrong tabindex when inserting rows


  Commit: 7e5071b6ba6c334f2710a900257f99b20b995cbb
      https://github.com/phpmyadmin/phpmyadmin/commit/7e5071b6ba6c334f2710a900257f99b20b995cbb
  Author: shanyan baishui <Siramizu at gmail.com>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Changed paths:
    M po/zh_CN.po

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

Currently translated at 99.2% (2589 of 2609)


  Commit: 4132bb020b5360abfe1f9b3c8f15f1d107476c71
      https://github.com/phpmyadmin/phpmyadmin/commit/4132bb020b5360abfe1f9b3c8f15f1d107476c71
  Author: Weblate <noreply at weblate.org>
  Date:   2013-08-24 (Sat, 24 Aug 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: 8cdc448484a5e31fd7c9a35567aaf2ff16e2d851
      https://github.com/phpmyadmin/phpmyadmin/commit/8cdc448484a5e31fd7c9a35567aaf2ff16e2d851
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Changed paths:
    M js/tbl_change.js
    M libraries/insert_edit.lib.php

  Log Message:
  -----------
  Other incorrect tabindex (page footer controls)


  Commit: 0f0137e187a78448a65bfb2d7d6a1bbc58db1e28
      https://github.com/phpmyadmin/phpmyadmin/commit/0f0137e187a78448a65bfb2d7d6a1bbc58db1e28
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Changed paths:
    M po/zh_CN.po

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


  Commit: af8a29f8aa8c74e625840ea6e48dfefd442bc5eb
      https://github.com/phpmyadmin/phpmyadmin/commit/af8a29f8aa8c74e625840ea6e48dfefd442bc5eb
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Log Message:
  -----------
  Merge commit 'c1fbdc5'


  Commit: 5d186d79c908a08cbdc3930d1e93aaedeeed52cd
      https://github.com/phpmyadmin/phpmyadmin/commit/5d186d79c908a08cbdc3930d1e93aaedeeed52cd
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Changed paths:
    M ChangeLog
    M js/tbl_change.js

  Log Message:
  -----------
  Fix merge conflict


  Commit: 3dd7febf9203c36aec346b59cb8029fac90720c2
      https://github.com/phpmyadmin/phpmyadmin/commit/3dd7febf9203c36aec346b59cb8029fac90720c2
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Log Message:
  -----------
  Merge commit '4132bb0'


  Commit: 85eb3fbc25e0cc31cd5a2c49abab9fddb67861da
      https://github.com/phpmyadmin/phpmyadmin/commit/85eb3fbc25e0cc31cd5a2c49abab9fddb67861da
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Changed paths:
    M js/tbl_change.js
    M libraries/insert_edit.lib.php

  Log Message:
  -----------
  Fix merge conflict


  Commit: 8786c0411c97af74a27684486c92f0d955c7bc39
      https://github.com/phpmyadmin/phpmyadmin/commit/8786c0411c97af74a27684486c92f0d955c7bc39
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Log Message:
  -----------
  Merge commit '0f0137e'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5c67a009fb7f...8786c0411c97