[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5ff687: Translated using Weblate (Spanish)

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5ff68783cba57915945fcfad71b46cd008b628c7
      https://github.com/phpmyadmin/phpmyadmin/commit/5ff68783cba57915945fcfad71b46cd008b628c7
  Author: Matías Bellone <matiasbellone+weblate at gmail.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M po/es.po

  Log Message:
  -----------
  Translated using Weblate (Spanish)

Currently translated at 99.7% (2699 of 2708)


  Commit: e8d465618db01215ccdad644c474d3600a7d2909
      https://github.com/phpmyadmin/phpmyadmin/commit/e8d465618db01215ccdad644c474d3600a7d2909
  Author: Matías Bellone <matiasbellone+weblate at gmail.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M po/es.po

  Log Message:
  -----------
  Translated using Weblate (Spanish)

Currently translated at 100.0% (2708.0 of 2708)


  Commit: 8ead0163eca7b2597e96bf4ff1be46e171d9d09f
      https://github.com/phpmyadmin/phpmyadmin/commit/8ead0163eca7b2597e96bf4ff1be46e171d9d09f
  Author: Rodrigo Souza <rodrigo.chrome at outlook.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M po/pt_BR.po

  Log Message:
  -----------
  Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.0% (2679 of 2707)


  Commit: 1ad632c6dfaaac88dedae8bd4b79bd2ad5c444c0
      https://github.com/phpmyadmin/phpmyadmin/commit/1ad632c6dfaaac88dedae8bd4b79bd2ad5c444c0
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M po/es.po
    M po/pt_BR.po

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/36a22d282b2c...1ad632c6dfaa