The branch, master has been updated
via 8b93d84c96d2212afa7e2133d90428344341d0e9 (commit)
from 7879f8d5b09314e73965a517f5572b604ea63fdb (commit)
- Log -----------------------------------------------------------------
commit 8b93d84c96d2212afa7e2133d90428344341d0e9
Author: Yuichiro <[email protected]>
Date: Mon Jan 9 18:40:56 2012 +0900
Show units on the Monitor dialog
-----------------------------------------------------------------------
Summary of changes:
js/messages.php | 3 ++-
js/server_status_monitor.js | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/js/messages.php b/js/messages.php
index 791caca..7b10563 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -168,7 +168,8 @@ $js_messages['strCurrentSettings'] = __('Current settings');
$js_messages['strChartTitle'] = __('Chart Title');
/* l10n: As in differential values */
$js_messages['strDifferential'] = __('Differential');
-$js_messages['strDividedBy'] = __('Divided by %s:');
+$js_messages['strDividedBy'] = __('Divided by %s');
+$js_messages['strUnit'] = __('Unit');
$js_messages['strFromSlowLog'] = __('From slow log');
$js_messages['strFromGeneralLog'] = __('From general log');
diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index 9c26b31..ca19da4 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -809,6 +809,7 @@ $(function() {
var str = serie.display == 'differential' ? ', ' +
PMA_messages['strDifferential'] : '';
str += serie.valueDivisor ? (', ' +
$.sprintf(PMA_messages['strDividedBy'], serie.valueDivisor)) : '';
+ str += serie.unit ? (', ' + PMA_messages['strUnit'] + ': ' +
serie.unit) : '';
$('#seriesPreview').append('- ' + serie.name + str + '<br>');
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
