Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: faeffd35663b3d98215e865fcf402a04717104d1 https://github.com/phpmyadmin/phpmyadmin/commit/faeffd35663b3d98215e865fcf40... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-04-21 (Sat, 21 Apr 2012)

Changed paths: M ChangeLog M js/messages.php M js/server_status.js M js/server_status_monitor.js

Log Message: ----------- bug #3520107 [interface] Server status page: Incorrect dialog box title

Commit: e417febdc13f03460e727dd010c60de0d1d31578 https://github.com/phpmyadmin/phpmyadmin/commit/e417febdc13f03460e727dd010c6... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-04-21 (Sat, 21 Apr 2012)

Changed paths: M js/messages.php M js/server_status_monitor.js

Log Message: ----------- Make some messages translatable

Commit: d7ca655efa42a5f1ddb81dc004c50d7cb329fdd6 https://github.com/phpmyadmin/phpmyadmin/commit/d7ca655efa42a5f1ddb81dc004c5... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-04-21 (Sat, 21 Apr 2012)

Changed paths: M ChangeLog M js/pmd/ajax.js M libraries/advisory_rules.txt M libraries/common.inc.php M libraries/common.lib.php M libraries/config.default.php M libraries/tcpdf/tcpdf.php M main.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/ko.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/nl.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/zh_CN.po M po/zh_TW.po

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

Conflicts: ChangeLog

Commit: f203b456b202e3181b1a72b50590357dfb7d4940 https://github.com/phpmyadmin/phpmyadmin/commit/f203b456b202e3181b1a72b50590... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-04-21 (Sat, 21 Apr 2012)

Changed paths: M ChangeLog M js/messages.php M js/server_status.js 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/f93041f...f203b45