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

[Madhura Jayaratne]

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

  Changed paths:
    M po/ar.po

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


  Commit: 1a240889a2a2ac90534afb176b856eb3376d1fed
      https://github.com/phpmyadmin/phpmyadmin/commit/1a240889a2a2ac90534afb176b856eb3376d1fed
  Author: Weblate <noreply at weblate.org>
  Date:   2012-09-06 (Thu, 06 Sep 2012)

  Changed paths:
    M libraries/common.lib.php

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


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

  Changed paths:
    M po/de.po

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


  Commit: e41f19969a882bb514090cc0a25694884ee9ffdd
      https://github.com/phpmyadmin/phpmyadmin/commit/e41f19969a882bb514090cc0a25694884ee9ffdd
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-09-07 (Fri, 07 Sep 2012)

  Changed paths:
    M ChangeLog
    M libraries/import/xml.php

  Log Message:
  -----------
  bug #3553068 [import] Table import from XML file fails


  Commit: 2be4178527aec66c350a0749c5c2897d6c62b363
      https://github.com/phpmyadmin/phpmyadmin/commit/2be4178527aec66c350a0749c5c2897d6c62b363
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-09-07 (Fri, 07 Sep 2012)

  Changed paths:
    M ChangeLog
    M libraries/plugins/import/ImportXml.class.php

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

Conflicts:
	libraries/import/xml.php
	po/ar.po
	po/de.po


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/67bc3cd8f071...2be4178527ae