[Phpmyadmin-git] [phpmyadmin/phpmyadmin] cced20: Translated using Weblate.

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: cced20fb0ea2c5595ebda7482b096694c5183d50
      https://github.com/phpmyadmin/phpmyadmin/commit/cced20fb0ea2c5595ebda7482b096694c5183d50
  Author: مترجم حرّ <metehyi at gmail.com>
  Date:   2012-09-08 (Sat, 08 Sep 2012)

  Changed paths:
    M po/ar.po

  Log Message:
  -----------
  Translated using Weblate.


  Commit: 10d7183b597c3a8ab76b5586ddf69cfd13e6ad00
      https://github.com/phpmyadmin/phpmyadmin/commit/10d7183b597c3a8ab76b5586ddf69cfd13e6ad00
  Author: مترجم حرّ <metehyi at gmail.com>
  Date:   2012-09-08 (Sat, 08 Sep 2012)

  Changed paths:
    M po/de.po

  Log Message:
  -----------
  Translated using Weblate.


  Commit: 1662302398cf3d2105f6c9d23c92dada83e6454e
      https://github.com/phpmyadmin/phpmyadmin/commit/1662302398cf3d2105f6c9d23c92dada83e6454e
  Author: Weblate <noreply at weblate.org>
  Date:   2012-09-08 (Sat, 08 Sep 2012)

  Changed paths:
    M ChangeLog
    A js/jqplot/plugins/jqplot.barRenderer.js
    A js/jqplot/plugins/jqplot.categoryAxisRenderer.js
    A js/jqplot/plugins/jqplot.pointLabels.js
    M js/tbl_chart.js
    M libraries/import/xml.php
    M tbl_chart.php

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


  Commit: f24b163fd6eef9d1102caafbcd2ee4119ce24f63
      https://github.com/phpmyadmin/phpmyadmin/commit/f24b163fd6eef9d1102caafbcd2ee4119ce24f63
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-09-09 (Sun, 09 Sep 2012)

  Changed paths:
    M js/server_status.js

  Log Message:
  -----------
  These extra commas are fatal for Internet Explorer 9


  Commit: 08eb5ef035603bd9008b3f192177dacff9406f67
      https://github.com/phpmyadmin/phpmyadmin/commit/08eb5ef035603bd9008b3f192177dacff9406f67
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-09-09 (Sun, 09 Sep 2012)

  Log Message:
  -----------
  Merge branch 'QA_3_5'


  Commit: 89c60cbbeff59827003c322c0ac3a13ef1388dea
      https://github.com/phpmyadmin/phpmyadmin/commit/89c60cbbeff59827003c322c0ac3a13ef1388dea
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-09-09 (Sun, 09 Sep 2012)

  Changed paths:
    M js/server_status.js

  Log Message:
  -----------
  Fix merge conflicts


  Commit: 366477a8d39241db977b7f5a43f371f4859e582c
      https://github.com/phpmyadmin/phpmyadmin/commit/366477a8d39241db977b7f5a43f371f4859e582c
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-09-09 (Sun, 09 Sep 2012)

  Changed paths:
    M js/codemirror/lib/codemirror.js

  Log Message:
  -----------
  Fix from codemirror 2.22 for a IE problem


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/be47d23a3848...366477a8d392