From 949bd599dcde04871e5bd6dd496dd29ba6d8563f Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Mon, 8 Aug 2011 17:01:52 +0300 Subject: [PATCH] Merge l10n string --- js/messages.php | 3 --- js/server_status.js | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/js/messages.php b/js/messages.php index 63af8c72bc..5f1c646705 100644 --- a/js/messages.php +++ b/js/messages.php @@ -61,10 +61,7 @@ $js_messages['strRemovingSelectedUsers'] = __('Removing Selected Users'); $js_messages['strClose'] = __('Close'); /* for server_status.js */ -$js_messages['strClickToSort'] = __('Click to sort'); - $js_messages['strEdit'] = __('Edit'); - $js_messages['strLiveTrafficChart'] = __('Live traffic chart'); $js_messages['strLiveConnChart'] = __('Live conn./process chart'); $js_messages['strLiveQueryChart'] = __('Live query chart'); diff --git a/js/server_status.js b/js/server_status.js index 6d319ad24a..546f1eac67 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -82,7 +82,7 @@ $(function() { var tabChart = new Object(); /*** Table sort tooltip ***/ - PMA_createqTip($('table.sortable thead th'), PMA_messages['strClickToSort']); + PMA_createqTip($('table.sortable thead th'), PMA_messages['strSortHint']); // Tell highcarts not to use UTC dates (global setting) Highcharts.setOptions({