[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 227644: Make button texts translatable

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 227644088cf196bc75128b9cb9cb00b95ee616a3
      https://github.com/phpmyadmin/phpmyadmin/commit/227644088cf196bc75128b9cb9cb00b95ee616a3
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-04-21 (Sat, 21 Apr 2012)

  Changed paths:
    M js/server_status_monitor.js

  Log Message:
  -----------
  Make button texts translatable


  Commit: 06f153b4b16af2969b8a83051f5c9d4275dac139
      https://github.com/phpmyadmin/phpmyadmin/commit/06f153b4b16af2969b8a83051f5c9d4275dac139
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-04-21 (Sat, 21 Apr 2012)

  Changed paths:
    M js/server_status_monitor.js

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

Conflicts:
	js/server_status_monitor.js


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f95d2fa...06f153b