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

[Dieter Adriaenssens]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 1b399f958afedd6fb9381ca84db5482aee4a36bb
      https://github.com/phpmyadmin/phpmyadmin/commit/1b399f958afedd6fb9381ca84db5482aee4a36bb
  Author: Victor Volkov <hanut at php-myadmin.ru>
  Date:   2012-09-29 (Sat, 29 Sep 2012)

  Changed paths:
    M po/ru.po

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


  Commit: cfd688d2512df9827a8ecc0412fc264fc5bcb186
      https://github.com/phpmyadmin/phpmyadmin/commit/cfd688d2512df9827a8ecc0412fc264fc5bcb186
  Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
  Date:   2012-10-03 (Wed, 03 Oct 2012)

  Changed paths:
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_routines.lib.php
    M libraries/rte/rte_triggers.lib.php

  Log Message:
  -----------
  triggers, routines, events : escape sql queries in error messages


  Commit: b27785affbf325ce96d247a644c44520e34396f9
      https://github.com/phpmyadmin/phpmyadmin/commit/b27785affbf325ce96d247a644c44520e34396f9
  Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
  Date:   2012-10-03 (Wed, 03 Oct 2012)

  Changed paths:
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_routines.lib.php
    M libraries/rte/rte_triggers.lib.php

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


  Commit: 97f8db70860bc65a794dd735896bb7dca1f7e53b
      https://github.com/phpmyadmin/phpmyadmin/commit/97f8db70860bc65a794dd735896bb7dca1f7e53b
  Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
  Date:   2012-10-03 (Wed, 03 Oct 2012)

  Changed paths:
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_routines.lib.php
    M libraries/rte/rte_triggers.lib.php

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

Conflicts:
	libraries/rte/rte_events.lib.php
	libraries/rte/rte_routines.lib.php
	libraries/rte/rte_triggers.lib.php
	po/ru.po


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2ec2ba304c5b...97f8db70860b