diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index b065fc50a8..6573134f2c 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -75,22 +75,24 @@ $(function() {
         // Query cache efficiency
         'qce': {
             title: PMA_messages['strQueryCacheEfficiency'],
+            series: [ {
+                label: PMA_messages['strQueryCacheEfficiency']
+            } ],
             nodes: [ {
-                name: PMA_messages['strQueryCacheEfficiency'],
                 dataPoints: [{type: 'statusvar', name: 'Qcache_hits'}, {type: 'statusvar', name: 'Com_select'}],
-                unit: '%',
                 transformFn: 'qce'
-            } ]
+             } ]
         },
         // Query cache usage
         'qcu': {
             title: PMA_messages['strQueryCacheUsage'],
+            series: [ {
+                label: PMA_messages['strQueryCacheUsed']
+            } ],
             nodes: [ {
-                name: PMA_messages['strQueryCacheUsed'],
                 dataPoints: [{type: 'statusvar', name: 'Qcache_free_memory'}, {type: 'servervar', name: 'query_cache_size'}],
-                unit: '%',
                 transformFn: 'qcu'
-            } ]
+             } ]
         }
     };
 
@@ -100,42 +102,45 @@ $(function() {
         $.extend(presetCharts, {
             'cpu': {
                 title: PMA_messages['strSystemCPUUsage'],
+                series: [ { 
+                    label: PMA_messages['strAverageLoad']
+                } ],
                 nodes: [ {
-                    name: PMA_messages['strAverageLoad'],
-                    dataPoints: [{ type: 'cpu', name: 'loadavg'}],
-                    unit: '%'
-                } ]
+                    dataPoints: [{ type: 'cpu', name: 'loadavg'}]
+                 } ]
             },
 
             'memory': {
                 title: PMA_messages['strSystemMemory'],
-                nodes: [ {
-                    name: PMA_messages['strTotalMemory'],
-                    dataPoints: [{ type: 'memory', name: 'MemTotal' }],
-                    valueDivisor: 1024,
-                    unit: PMA_messages['strMiB']
+                series: [ {
+                    label: PMA_messages['strTotalMemory'],
+                    fill:true,
+                    stackSeries: true
                 }, {
                     dataType: 'memory',
-                      name: PMA_messages['strUsedMemory'],
-                      dataPoints: [{ type: 'memory', name: 'MemUsed' }],
-                      valueDivisor: 1024,
-                      unit: PMA_messages['strMiB']
-                } ]
+                    label: PMA_messages['strUsedMemory'],
+                    fill:true,
+                    stackSeries: true
+                } ],
+                nodes: [{ dataPoints: [{ type: 'memory', name: 'MemTotal' }], valueDivisor: 1024 },
+                        { dataPoints: [{ type: 'memory', name: 'MemUsed' }], valueDivisor: 1024 }
+                ]
             },
 
             'swap': {
                 title: PMA_messages['strSystemSwap'],
-                nodes: [ {
-                    name: PMA_messages['strTotalSwap'],
-                    dataPoints: [{ type: 'memory', name: 'SwapTotal' }],
-                    valueDivisor: 1024,
-                    unit: PMA_messages['strMiB']
+                series: [ {
+                    label: PMA_messages['strTotalSwap'],
+                    fill:true,
+                    stackSeries: true
                 }, {
-                    name: PMA_messages['strUsedSwap'],
-                    dataPoints: [{ type: 'memory', name: 'SwapUsed' }],
-                    valueDivisor: 1024,
-                    unit: PMA_messages['strMiB']
-                } ]
+                    label: PMA_messages['strUsedSwap'],
+                    fill:true,
+                    stackSeries: true
+                } ],
+                nodes: [{ dataPoints: [{ type: 'memory', name: 'SwapTotal' }]},
+                        { dataPoints: [{ type: 'memory', name: 'SwapUsed' }]}
+                ]
             }
         });
         break;
@@ -144,51 +149,38 @@ $(function() {
         $.extend(presetCharts, {
             'cpu': {
                 title: PMA_messages['strSystemCPUUsage'],
-                nodes: [ {
-                    name: PMA_messages['strAverageLoad'],
-                    dataPoints: [{ type: 'cpu', name: 'irrelevant' }],
-                    unit: '%',
-                    transformFn: 'cpu-linux'
-                } ]
+                series: [ {
+                    label: PMA_messages['strAverageLoad']
+                } ],
+                nodes: [{ dataPoints: [{ type: 'cpu', name: 'irrelevant' }], transformFn: 'cpu-linux'}]
             },
             'memory': {
                 title: PMA_messages['strSystemMemory'],
-                nodes: [
-                    { name: PMA_messages['strUsedMemory'], dataPoints: [{ type: 'memory', name: 'MemUsed' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] },
-                    { name: PMA_messages['strCachedMemory'], dataPoints: [{ type: 'memory', name: 'Cached' }],  valueDivisor: 1024, unit: PMA_messages['strMiB'] },
-                    { name: PMA_messages['strBufferedMemory'], dataPoints: [{ type: 'memory', name: 'Buffers' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] },
-                    { name: PMA_messages['strFreeMemory'], dataPoints: [{ type: 'memory', name: 'MemFree' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] }
+                series: [
+                    { label: PMA_messages['strUsedMemory'], fill:true, stackSeries: true},
+                    { label: PMA_messages['strCachedMemory'], fill:true, stackSeries: true},
+                    { label: PMA_messages['strBufferedMemory'], fill:true, stackSeries: true},
+                    { label: PMA_messages['strFreeMemory'], fill:true, stackSeries: true}
                 ],
-                settings: {
-                    chart: {
-                        type: 'area',
-                        animation: false
-                    },
-                    plotOptions: {
-                        area: {
-                            stacking: 'percent'
-                        }
-                    }
-                }
-            },
+                nodes: [
+                    { dataPoints: [{ type: 'memory', name: 'MemUsed' }], valueDivisor: 1024 },
+                    { dataPoints: [{ type: 'memory', name: 'Cached' }],  valueDivisor: 1024 },
+                    { dataPoints: [{ type: 'memory', name: 'Buffers' }], valueDivisor: 1024 },
+                    { dataPoints: [{ type: 'memory', name: 'MemFree' }], valueDivisor: 1024 }
+                ]                
+             },
             'swap': {
                 title: PMA_messages['strSystemSwap'],
-                nodes: [
-                    { name: PMA_messages['strUsedSwap'], dataPoints: [{ type: 'memory', name: 'SwapUsed' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] },
-                    { name: PMA_messages['strCachedSwap'], dataPoints: [{ type: 'memory', name: 'SwapCached' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] },
-                    { name: PMA_messages['strFreeSwap'], dataPoints: [{ type: 'memory', name: 'SwapFree' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] }
+                series: [
+                    { label: PMA_messages['strUsedSwap'], fill:true, stackSeries: true},
+                    { label: PMA_messages['strCachedSwap'], fill:true, stackSeries: true},
+                    { label: PMA_messages['strFreeSwap'], fill:true, stackSeries: true}
                 ],
-                settings: {
-                    chart: {
-                        type: 'area',
-                        animation: false
-                    },
-                    plotOptions: {
-                        area: {
-                            stacking: 'percent'
-                        }
-                    }
-                }
+                nodes: [
+                    { dataPoints: [{ type: 'memory', name: 'SwapUsed' }], valueDivisor: 1024 },
+                    { dataPoints: [{ type: 'memory', name: 'SwapCached' }], valueDivisor: 1024 },
+                    { dataPoints: [{ type: 'memory', name: 'SwapFree' }], valueDivisor: 1024 }
+                ]
             }
         });
         break;
@@ -197,19 +189,27 @@ $(function() {
     // Default setting for the chart grid
     defaultChartGrid = {
         'c0': {  title: PMA_messages['strQuestions'],
-                 nodes: [{name: PMA_messages['strQuestions'], dataPoints: [{ type: 'statusvar', name: 'Questions' }], display: 'differential' }]
+                 series: [{label: PMA_messages['strQuestions']}],
+                 nodes: [{dataPoints: [{ type: 'statusvar', name: 'Questions' }], display: 'differential' }]
         },
         'c1': {
                  title: PMA_messages['strChartConnectionsTitle'],
-                 nodes: [ { name: PMA_messages['strConnections'], dataPoints: [{ type: 'statusvar', name: 'Connections' }], display: 'differential' },
-                          { name: PMA_messages['strProcesses'], dataPoints: [{ type: 'proc', name: 'processes' }] } ]
+                 series: [ { label: PMA_messages['strConnections']},
+                          { label: PMA_messages['strProcesses']} ],
+                 nodes: [ { dataPoints: [{ type: 'statusvar', name: 'Connections' }], display: 'differential' },
+                          { dataPoints: [{ type: 'proc', name: 'processes' }] }
+                ]
         },
         'c2': {
                  title: PMA_messages['strTraffic'],
+                 series: [
+                    { label: PMA_messages['strBytesSent']},
+                    { label: PMA_messages['strBytesReceived']}
+                 ],
                  nodes: [
-                    { name: PMA_messages['strBytesSent'], dataPoints: [{ type: 'statusvar', name: 'Bytes_sent' }], display: 'differential', valueDivisor: 1024, unit: PMA_messages['strKiB'] },
-                    { name: PMA_messages['strBytesReceived'], dataPoints: [{ type: 'statusvar', name: 'Bytes_received' }], display: 'differential', valueDivisor: 1024, unit: PMA_messages['strKiB'] }
-                 ]
+                    { dataPoints: [{ type: 'statusvar', name: 'Bytes_sent' }], display: 'differential', valueDivisor: 1024 },
+                    { dataPoints: [{ type: 'statusvar', name: 'Bytes_received' }], display: 'differential', valueDivisor: 1024 }
+                ]
          }
     };
 
@@ -989,8 +989,8 @@ $(function() {
 
     /* Adds a chart to the chart grid */
     function addChart(chartObj, initialize) {
-        series = [];
-        for (var j = 0, l = chartObj.nodes.length; j < l; j++) {
+/*        series = [];
+        for (var j = 0; j<chartObj.nodes.length; j++)
             series.push(chartObj.nodes[j]);
         }
 
@@ -1081,44 +1081,50 @@ $(function() {
             buttons: gridbuttons,
             title: { text: chartObj.title }
         };
+*/
 
-        if (chartObj.settings) {
-            $.extend(true, settings, chartObj.settings);
-        }
-
-        var settings1 = {
+        settings = {
+            title: chartObj.title,
             axes: {
                 xaxis: {
                     renderer: $.jqplot.DateAxisRenderer,
                     tickOptions: {
-                        formatString: '%H:%M:%S'
-                    }
+                        formatString: '%H:%M:%S',
+                        showGridline: false
+                    },
+                    min: runtime.xmin,
+                    max: runtime.xmax
                 },
                 yaxis: {
-                    autoscale:true,
-                    label: PMA_messages['strTotalCount'],
-                    labelRenderer: $.jqplot.CanvasAxisLabelRenderer,
+                    min:0,
+                    max:500,
+                    numberTicks:6
                 }
             },
             seriesDefaults: {
                 rendererOptions: {
                     smooth: true
                 }
+            },
+            highlighter: {
+            show: true,
+            showTooltip: false
             }
         };
 
-        if ($('#' + settings.chart.renderTo).length == 0) {
+        settings.series = chartObj.series;
+
+        if ($('#' + 'gridchart' + runtime.chartAI).length == 0) {
             var numCharts = $('table#chartGrid .monitorChart').length;
 
             if (numCharts == 0 || !( numCharts % monitorSettings.columns)) {
                 $('table#chartGrid').append('<tr></tr>');
             }
 
-            $('table#chartGrid tr:last').append('<td><div class="ui-state-default monitorChart" id="' + settings.chart.renderTo + '"></div></td>');
+            $('table#chartGrid tr:last').append('<td><div class="ui-state-default monitorChart" id="' + 'gridchart' + runtime.chartAI + '"></div></td>');
         }
 
-        //chartObj.chart = PMA_createChart(settings);
-        chartObj.chart = $.jqplot(settings.chart.renderTo, [[0,0]], settings1);
+        chartObj.chart = $.jqplot('gridchart' + runtime.chartAI, [[,]], settings);
         chartObj.numPoints = 0;
 
         if (initialize != true) {
@@ -1239,7 +1245,7 @@ $(function() {
                     return;
                 }
                 // Draw all series
-                for (var j = 0, l = elem.nodes.length; j < l; j++) {
+                for (var j = 0; j < elem.chart.series.length; j++) {
                     // Update x-axis
                     if (i == 0 && j == 0) {
                         if (oldChartData == null) {
@@ -1288,19 +1294,16 @@ $(function() {
                             false,
                             elem.numPoints >= runtime.gridMaxPoints
                         );*/
-                        elem.chart.series[0].data.push([chartData.x, value]);
+                        elem.chart.series[j].data.push([chartData.x, value]);
                     }
                 }
 
                 // update chart options
-                var interval = (((runtime.xmax - runtime.xmin)/runtime.gridMaxPoints) / 1000);
                 elem.chart['axes']['xaxis']['max'] = runtime.xmax;
                 elem.chart['axes']['xaxis']['min'] = runtime.xmin;
-                elem.chart['axes']['xaxis']['tickInterval'] = interval + " seconds";
                 i++;
                 runtime.charts[orderKey].numPoints++;
                 if (runtime.redrawCharts) {
-                    elem.chart.redraw();
                     elem.chart.replot();
                 }
             });
diff --git a/po/ar.po b/po/ar.po
index 314124b2bf..0f5c7d5ef0 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -4,16 +4,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-08-28 14:48+0200\n"
-"PO-Revision-Date: 2011-09-24 21:48+0200\n"
-"Last-Translator: Abdullah Al-Saedi <abdullah.10@windowslive.com>\n"
-"Language-Team: arabic <ar@li.org>\n"
+"PO-Revision-Date: 2012-08-30 19:45+0200\n"
+"Last-Translator: مترجم حرّ <metehyi@gmail.com>\n"
+"Language-Team: Arabic <http://l10n.cihar.com/projects/phpmyadmin/master/ar/>\n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 2.0.5\n"
+"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"X-Generator: Weblate 1.2\n"
 
 #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354
 #: libraries/DisplayResults.class.php:816
@@ -540,7 +540,7 @@ msgstr "قيمة العمود \"%s\""
 
 #: gis_data_editor.php:104 tbl_gis_visualization.php:171
 msgid "Use OpenStreetMaps as Base Layer"
-msgstr ""
+msgstr "إستعمل خريطة الشوارع الحرة كطبقة أساسية"
 
 #: gis_data_editor.php:124
 msgid "SRID"
@@ -582,21 +582,20 @@ msgstr "منحنى"
 
 #: gis_data_editor.php:212 gis_data_editor.php:268 js/messages.php:328
 msgid "Outer Ring"
-msgstr ""
+msgstr "الحلقة الخارجية"
 
 #: gis_data_editor.php:214 gis_data_editor.php:270 js/messages.php:327
 msgid "Inner Ring"
-msgstr ""
+msgstr "الحلقة الداخلية"
 
 #: gis_data_editor.php:241
 msgid "Add a linestring"
 msgstr "إضافة منحنى"
 
 #: gis_data_editor.php:241 gis_data_editor.php:293 js/messages.php:330
-#, fuzzy
 #| msgid "Add unique index"
 msgid "Add an inner ring"
-msgstr "إضافة فهرس مميز"
+msgstr "إضافة حلقة الداخلية"
 
 #: gis_data_editor.php:255 js/messages.php:325
 msgid "Polygon"
@@ -755,22 +754,20 @@ msgid "This is not a number!"
 msgstr "هذا ليس رقم!"
 
 #: js/messages.php:42
-#, fuzzy
 #| msgid "Add index"
 msgid "Add Index"
 msgstr "إضافة فهرس"
 
 #: js/messages.php:43
-#, fuzzy
 #| msgid "Edit mode"
 msgid "Edit Index"
-msgstr "وضع التعديل"
+msgstr "حرّر الفهرس"
 
 #: js/messages.php:44 tbl_indexes.php:326
-#, fuzzy, php-format
+#, php-format
 #| msgid "Add into comments"
 msgid "Add %d column(s) to index"
-msgstr "أضف إلى الملاحظات"
+msgstr "أضف %d عمود/عواميد إلى الفهرس"
 
 #. l10n: Default description for the y-Axis of Charts
 #: js/messages.php:48
@@ -916,22 +913,19 @@ msgid ""
 msgstr ""
 
 #: js/messages.php:93
-#, fuzzy
 #| msgid "Tracking is not active."
 msgid "Query cache efficiency"
-msgstr "التتبع غير نشط."
+msgstr "فعالية خابية المسائلة"
 
 #: js/messages.php:94
-#, fuzzy
 #| msgid "Space usage"
 msgid "Query cache usage"
-msgstr "المساحة المستخدمة"
+msgstr "إستعمال خابية المسائلة"
 
 #: js/messages.php:95
-#, fuzzy
 #| msgid "Space usage"
 msgid "Query cache used"
-msgstr "المساحة المستخدمة"
+msgstr "خابية المسائلة المستعملة"
 
 #: js/messages.php:97
 msgid "System CPU Usage"
@@ -943,7 +937,7 @@ msgstr "ذاكرة النظام"
 
 #: js/messages.php:99
 msgid "System swap"
-msgstr ""
+msgstr "المقايدة النظامية"
 
 #. l10n: shortcuts for Megabyte
 #: js/messages.php:100 js/messages.php:123
@@ -1542,19 +1536,17 @@ msgid "ENUM/SET editor"
 msgstr ""
 
 #: js/messages.php:273
-#, fuzzy, php-format
+#, php-format
 #| msgid "Values for the column \"%s\""
 msgid "Values for column %s"
-msgstr "قيم للعمود \"%s\""
+msgstr "القيم للعمود %s"
 
 #: js/messages.php:274
-#, fuzzy
 #| msgid "Values for the column \"%s\""
 msgid "Values for a new column"
-msgstr "قيم للعمود \"%s\""
+msgstr "القيم لعمود جديد"
 
 #: js/messages.php:275
-#, fuzzy
 #| msgid "Enter each value in a separate field."
 msgid "Enter each value in a separate field"
 msgstr "أدخل كل قيمة بحقل منفصل"