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

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: f5048f1609679a96b7e2e0d3bb62fdc0a53b3c5e
      https://github.com/phpmyadmin/phpmyadmin/commit/f5048f1609679a96b7e2e0d3bb62fdc0a53b3c5e
  Author: Matías Bellone <matiasbellone at gmail.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M po/es.po

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


  Commit: 4d0cf6ee3b63fd9f15764d6155d54290e4031197
      https://github.com/phpmyadmin/phpmyadmin/commit/4d0cf6ee3b63fd9f15764d6155d54290e4031197
  Author: Michal Čihař <weblate at l10n.cihar.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M libraries/Types.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: a941c5835f71adfd29b275380f61c00f0f87269b
      https://github.com/phpmyadmin/phpmyadmin/commit/a941c5835f71adfd29b275380f61c00f0f87269b
  Author: LiivaneLord <liivane.lord at mail.ee>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M po/et.po

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


  Commit: 13f8b4a6ec79b669760aa704bbe9f832227d379e
      https://github.com/phpmyadmin/phpmyadmin/commit/13f8b4a6ec79b669760aa704bbe9f832227d379e
  Author: Michal Čihař <michal at cihar.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'weblate/master'

Conflicts:
	po/es.po
	po/et.po


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e7077bf...13f8b4a