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

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: dced71dca5aadc338434c336cb39ff9125dcaa62
      https://github.com/phpmyadmin/phpmyadmin/commit/dced71dca5aadc338434c336cb39ff9125dcaa62
  Author: Jan Erik Zassenhaus <jan.zassenhaus at jgerman.de>
  Date:   2012-08-26 (Sun, 26 Aug 2012)

  Changed paths:
    M po/de.po

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


  Commit: e8a0a3458cdf3df5e5757fce3896fb809ee1eaaf
      https://github.com/phpmyadmin/phpmyadmin/commit/e8a0a3458cdf3df5e5757fce3896fb809ee1eaaf
  Author: Rafael Ferreira <rafael.f.f1 at gmail.com>
  Date:   2012-08-26 (Sun, 26 Aug 2012)

  Changed paths:
    M po/pt_BR.po

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


  Commit: 582c3b9e7e55cf20598cf53710cb05e865f3c710
      https://github.com/phpmyadmin/phpmyadmin/commit/582c3b9e7e55cf20598cf53710cb05e865f3c710
  Author: Domen <dbc334 at gmail.com>
  Date:   2012-08-26 (Sun, 26 Aug 2012)

  Changed paths:
    M po/sl.po

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


  Commit: 8f00010167eaa606d4a96d1d21be7a5f84efc8ca
      https://github.com/phpmyadmin/phpmyadmin/commit/8f00010167eaa606d4a96d1d21be7a5f84efc8ca
  Author: Adisorn Aeksatean <npgamer_nott at hotmail.com>
  Date:   2012-08-26 (Sun, 26 Aug 2012)

  Changed paths:
    M po/th.po

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


  Commit: 65b3541e8e72e4dcc581ece12799ea40d597e5c0
      https://github.com/phpmyadmin/phpmyadmin/commit/65b3541e8e72e4dcc581ece12799ea40d597e5c0
  Author: Weblate <noreply at weblate.org>
  Date:   2012-08-26 (Sun, 26 Aug 2012)

  Changed paths:
    M ChangeLog
    M js/makegrid.js

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


  Commit: cd1b311543ca0e869f2f27e3fc6f42cb7e05d00f
      https://github.com/phpmyadmin/phpmyadmin/commit/cd1b311543ca0e869f2f27e3fc6f42cb7e05d00f
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-08-26 (Sun, 26 Aug 2012)

  Changed paths:
    M ChangeLog
    M tbl_replace.php

  Log Message:
  -----------
  bug #3559955 [edit] current_date from function drop down fails on update


  Commit: 6160f9037706c18ec8b3b2ec7b36c981112858a4
      https://github.com/phpmyadmin/phpmyadmin/commit/6160f9037706c18ec8b3b2ec7b36c981112858a4
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-08-26 (Sun, 26 Aug 2012)

  Changed paths:
    M po/de.po
    M po/pt_BR.po
    M po/sl.po
    M po/th.po

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


  Commit: 5e13ef82953525e9154c31c62444a25be7ba9578
      https://github.com/phpmyadmin/phpmyadmin/commit/5e13ef82953525e9154c31c62444a25be7ba9578
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-08-26 (Sun, 26 Aug 2012)

  Changed paths:
    M ChangeLog
    M tbl_replace.php

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

Conflicts:
	po/de.po
	po/pt_BR.po
	po/sl.po
	po/th.po


  Commit: 47c72d900684cb13a79c032ba602fc496395543d
      https://github.com/phpmyadmin/phpmyadmin/commit/47c72d900684cb13a79c032ba602fc496395543d
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-08-26 (Sun, 26 Aug 2012)

  Changed paths:
    M po/pa.po
    M po/pt_BR.po
    M po/th.po

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0a013cc22a7d...47c72d900684