diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php
index cd6f3e3b28..b30b39fdb4 100644
--- a/packages/web/lib/fog/system.class.php
+++ b/packages/web/lib/fog/system.class.php
@@ -53,9 +53,9 @@ private static function _versionCompare()
public function __construct()
{
self::_versionCompare();
- define('FOG_VERSION', '13');
+ define('FOG_VERSION', '14');
define('FOG_SCHEMA', 245);
- define('FOG_BCACHE_VER', 111);
+ define('FOG_BCACHE_VER', 112);
define('FOG_SVN_REVISION', 6052);
define('FOG_CLIENT_VERSION', '0.11.8');
}
diff --git a/packages/web/lib/pages/dashboardpage.class.php b/packages/web/lib/pages/dashboardpage.class.php
index d7d63baae4..888886b582 100644
--- a/packages/web/lib/pages/dashboardpage.class.php
+++ b/packages/web/lib/pages/dashboardpage.class.php
@@ -21,6 +21,18 @@
*/
class DashboardPage extends FOGPage
{
+ /**
+ * The tftp variable.
+ *
+ * @var string
+ */
+ private static $_tftp = '';
+ /**
+ * The bandwidth time variable.
+ *
+ * @var int
+ */
+ private static $_bandwidthtime = 1;
/**
* The node urls
*
@@ -40,7 +52,13 @@ class DashboardPage extends FOGPage
*/
private static $_nodeOpts;
/**
- * The node to display page for
+ * The group options
+ *
+ * @var string
+ */
+ private static $_groupOpts;
+ /**
+ * The node to display page for.
*
* @var string
*/
@@ -48,7 +66,7 @@ class DashboardPage extends FOGPage
/**
* Initialize the dashboard page
*
- * @param string $name the name to initialize with
+ * @param string $name the name to initialize with.
*
* @return void
*/
@@ -59,71 +77,89 @@ public function __construct($name = '')
global $sub;
global $id;
$objName = 'StorageNode';
- if ($sub === 'clientcount') {
- $objName = 'StorageGroup';
+ switch ($sub) {
+ case 'clientcount':
+ $this->obj = new StorageGroup($id);
+ break;
+ case 'diskusage':
+ $this->obj = new StorageNode($id);
+ break;
+ default:
+ $this->obj = new StorageNode();
}
- $this->obj = new $objName($id);
- $this->menu = array();
- $this->subMenu = array();
- $this->notes = array();
- if (!self::$ajax) {
- $find = array(
- 'isEnabled' => 1,
- 'isGraphEnabled' => 1
+ if (self::$ajax) {
+ return;
+ }
+ $find = array(
+ 'isEnabled' => 1,
+ 'isGraphEnabled' => 1
+ );
+ foreach ((array)self::getClass('StorageNodeManager')
+ ->find($find) as &$StorageNode
+ ) {
+ $ip = $StorageNode->get('ip');
+ $url = sprintf(
+ 'http://%s/fog/',
+ $ip
);
- foreach ((array)self::getClass('StorageNodeManager')
- ->find($find) as &$StorageNode
- ) {
- $ip = $StorageNode->get('ip');
- $URL = sprintf(
- 'http://%s/fog/',
- $ip
- );
- $testurls[] = sprintf(
- 'http://%s/fog/management/index.php',
- $ip
- );
- unset($ip);
- self::$_nodeOpts[] = sprintf(
- '',
- $StorageNode->get('id'),
- sprintf(
- '%sservice/getversion.php',
- $URL
- ),
- $StorageNode->get('name'),
- (
- $StorageNode->get('isMaster') ?
- ' *' :
- ''
- )
- );
- $URL = sprintf(
- '%sstatus/bandwidth.php?dev=%s',
- $URL,
- $StorageNode->get('interface')
- );
- self::$_nodeNames[] = $StorageNode->get('name');
- self::$_nodeURLs[] = $URL;
- unset($StorageNode);
- }
- $test = array_filter(self::$FOGURLRequests->isAvailable($testurls));
- self::$_nodeOpts = array_intersect_key(self::$_nodeOpts, $test);
- self::$_nodeOpts = implode(self::$_nodeOpts);
- self::$_nodeNames = array_intersect_key(self::$_nodeNames, $test);
- self::$_nodeURLs = array_intersect_key(self::$_nodeURLs, $test);
- printf(
- '',
- implode(',', self::$_nodeURLs)
+ $testurls[] = sprintf(
+ '%smanagement/index.php',
+ $url
+ );
+ unset($ip);
+ self::$_nodeOpts[] = sprintf(
+ '',
+ $StorageNode->get('id'),
+ sprintf(
+ '%sservice/getversion.php',
+ $url
+ ),
+ $StorageNode->get('name'),
+ (
+ $StorageNode->get('isMaster') ?
+ ' *' :
+ ''
+ )
);
- printf(
- '',
- implode(',', self::$_nodeNames)
+ self::$_nodeNames[] = $StorageNode->get('name');
+ self::$_nodeURLs[] = sprintf(
+ '%sstatus/bandwidth.php?dev=%s',
+ $url,
+ $StorageNode->get('interface')
);
+ unset($StorageNode);
}
+ foreach ((array)self::getClass('StorageGroupManager')
+ ->find() as &$StorageGroup
+ ) {
+ self::$_groupOpts .= sprintf(
+ '',
+ $StorageGroup->get('id'),
+ $StorageGroup->get('name')
+ );
+ unset($StorageGroup);
+ }
+ $test = array_filter(self::$FOGURLRequests->isAvailable($testurls));
+ self::$_nodeOpts = array_intersect_key(self::$_nodeOpts, $test);
+ self::$_nodeNames = array_intersect_key(self::$_nodeNames, $test);
+ self::$_nodeURLs = array_intersect_key(self::$_nodeURLs, $test);
+ self::$_nodeOpts = implode(self::$_nodeOpts);
+ list(
+ self::$_bandwidthtime,
+ self::$_tftp
+ ) = self::getSubObjectIDs(
+ 'Service',
+ array(
+ 'name' => array(
+ 'FOG_BANDWIDTH_TIME',
+ 'FOG_TFTP_HOST'
+ )
+ ),
+ 'value'
+ );
}
/**
- * The index to display
+ * The index to display.
*
* @return void
*/
@@ -149,30 +185,37 @@ public function index()
_('here'),
_('to review.')
);
- if ($_SESSION['Pending-Hosts'] && $_SESSION['Pending-MACs']) {
- $this->setMessage("$hostPend
$macPend");
- } elseif ($_SESSION['Pending-Hosts']) {
- $this->setMessage($hostPend);
- } elseif ($_SESSION['Pending-MACs']) {
- $this->setMessage($macPend);
+ $setMesg = '';
+ if ($_SESSION['Pending-Hosts']) {
+ $setMesg = $hostPend;
+ }
+ if ($_SESSION['Pending-MACs']) {
+ if (empty($setMesage)) {
+ $setMesg = $macPend;
+ } else {
+ $setMesg .= "
$macPend";
+ }
+ }
+ if (!empty($setMesg)) {
+ $this->setMessage($setMesg);
}
$SystemUptime = self::$FOGCore->systemUptime();
$fields = array(
_('Username') => $_SESSION['FOG_USERNAME'],
- _('Web Server') => self::getSetting('FOG_WEB_HOST'),
- _('TFTP Server') => self::getSetting('FOG_TFTP_HOST'),
+ _('Web Server') => $_SERVER['SERVER_ADDR'],
+ _('TFTP Server') => self::$_tftp,
_('Load Average') => $SystemUptime['load'],
- _('System Uptime') => $SystemUptime['uptime'],
+ _('System Uptime') => $SystemUptime['uptime']
);
$this->templates = array(
'${field}',
- '${input}',
+ '${input}'
);
$this->attributes = array(
array(),
- array(),
+ array()
);
- // Overview Pane
+ // Overview
printf(
'
%s
',
_('System Overview')
@@ -184,13 +227,20 @@ public function index()
array(
'data' => &$this->data,
'templates' => &$this->templates,
- 'attributes'=>&$this->attributes
+ 'attributes' => &$this->attributes
)
);
$this->render();
echo ' ';
- unset($this->templates, $this->attributes, $fields, $SystemUptime);
- // Activity Pane
+ unset(
+ $this->data,
+ $this->templates,
+ $this->attributes,
+ $fields,
+ $SystemUptime,
+ $tftp
+ );
+ // Client Count/Activity
printf(
'%s
'
. ''
@@ -198,154 +248,114 @@ public function index()
_('The selected node\'s storage group slot usage'),
_('Storage Group Activity')
);
- ob_start();
- foreach ((array)self::getClass('StorageGroupManager')
- ->find() as &$StorageGroup
- ) {
- if (count($StorageGroup->get('enablednodes')) < 1) {
- continue;
- }
- printf(
- '
',
- $StorageGroup->get('id'),
- $StorageGroup->get('name')
- );
- unset($StorageGroup);
- }
printf(
'
'
. '
'
. '
'
. '
'
- . '
',
- ob_get_clean()
+ . '',
+ self::$_groupOpts
);
- $find = array(
- 'isEnabled' => 1,
- 'isGraphEnabled' => 1
+ // Disk Usage
+ printf(
+ '%s
'
+ . '',
+ _('The selected node\'s image storage usage'),
+ _('Storage Node Disk Usage')
+ );
+ printf(
+ ''
+ . '
',
+ self::$_nodeOpts
);
- $StorageEnabledCount = self::getClass('StorageNodeManager')
- ->count($find);
- if ($StorageEnabledCount > 0) {
- // Disk Usage Pane
- printf(
- '%s
'
- . '',
- _('The selected node\'s image storage disk usage'),
- _('Storage Node Disk Usage')
- );
- printf(
- ''
- . '
',
- self::$_nodeOpts
- );
- }
echo '
';
- // 30 Day Usage Graph
+ // 30 day history
printf(
- '%s
',
+ '%s
'
+ . '',
_('Imaging Over the last 30 days')
);
- ob_start();
- $start = self::niceDate()->setTime(00, 00, 00)->modify('-30 days');
- $end = self::niceDate()->setTime(23, 59, 59);
- $int = new DateInterval('P1D');
- $DatePeriod = new DatePeriod($start, $int, $end);
- $dates = iterator_to_array($DatePeriod);
- foreach ((array)$dates as $index => &$date) {
- $count = self::getClass('ImagingLogManager')
- ->count(
- array(
- 'start' => $date->format('Y-m-d%'),
- 'finish' => $date->format('Y-m-d%')
- ),
- 'OR'
- );
- printf(
- '["%s", %s]%s',
- (1000 * $date->getTimestamp()),
- $count,
- (
- $index < 30 ?
- ', ' :
- ''
- )
- );
- unset($date, $index);
- }
+ echo '';
+ // Bandwidth display
+ $bandwidthtime = self::$_bandwidthtime;
+ $datapointshour = (3600 / $bandwidthtime);
+ $bandwidthtime *= 1000;
+ $datapointshalf = ($datapointshour / 2);
+ $datapointsten = ($datapointshour / 6);
+ $datapointstwo = ($datapointshour / 30);
printf(
- '[%s]
',
- ob_get_clean()
+ ''
+ . ''
+ . '',
+ $bandwidthtime,
+ implode(',', self::$_nodeURLs),
+ implode(',', self::$_nodeNames)
+ );
+ printf(
+ '%s - %s
'
+ . ''
+ . '
'
+ . '
%s'
+ . '
%s'
+ . '
'
+ . '
'
+ . '
'
+ . '
%s'
+ . '
%s'
+ . '
%s'
+ . '
%s'
+ . '
'
+ . '
'
+ . '',
+ self::$foglang['Bandwidth'],
+ self::$foglang['Transmit'],
+ self::$foglang['Transmit'],
+ self::$foglang['Receive'],
+ $datapointshour,
+ _('1 hour'),
+ $datapointshalf,
+ _('30 Minutes'),
+ $datapointsten,
+ _('10 Minutes'),
+ $datapointstwo,
+ _('2 Minutes')
);
- if ($StorageEnabledCount > 0) {
- $bandwidthtime = self::getSetting('FOG_BANDWIDTH_TIME') * 1000;
- $datapointshour = (3600 / self::getSetting('FOG_BANDWIDTH_TIME'));
- $datapointshalf = ($datapointshour / 2);
- $datapointsten = ($datapointshour / 6);
- $datapointstwo = ($datapointshour / 30);
- // Bandwidth Graph
- printf(
- ''
- . '%s - %s'
- . '
'
- . '',
- $bandwidthtime,
- self::$foglang['Bandwidth'],
- self::$foglang['Transmit'],
- self::$foglang['Transmit'],
- self::$foglang['Receive'],
- $datapointshour,
- _('1 hour'),
- $datapointshalf,
- _('30 Minutes'),
- $datapointsten,
- _('10 Minutes'),
- $datapointstwo,
- _('2 Minutes')
- );
- }
}
/**
- * Gets the bandwidth of the nodes
+ * Gets the client count active/used/queued
*
* @return void
*/
- public function bandwidth()
+ public function clientcount()
{
session_write_close();
ignore_user_abort(true);
set_time_limit(0);
- self::$_nodeURLs = (array)$_REQUEST['url'];
- self::$_nodeNames = (array)$_REQUEST['names'];
- $datas = self::$FOGURLRequests
- ->process(self::$_nodeURLs);
- $dataSet = array();
- foreach ((array)$datas as &$data) {
- $dataSet[] = json_decode($data, true);
- unset($data);
- }
- echo json_encode(
- array_combine(
- self::$_nodeNames,
- $dataSet
- )
+ $ActivityActive = $ActivityQueued = $ActivityTotalClients = 0;
+ $ActivityTotalClients = $this->obj->getTotalAvailableSlots();
+ $ActivityQueued = $this->obj->getQueuedSlots();
+ $ActivityActive = $this->obj->getUsedSlots();
+ $data = array(
+ 'ActivityActive' => &$ActivityActive,
+ 'ActivityQueued' => &$ActivityQueued,
+ 'ActivitySlots' => &$ActivityTotalClients
);
+ unset(
+ $ActivityActive,
+ $ActivityQueued,
+ $ActivityTotalClients
+ );
+ echo json_encode($data);
+ unset($data);
exit;
}
/**
- * Gets the disk usage of the nodes
+ * Gets the disk usage of the selected node.
*
* @return void
*/
@@ -354,96 +364,98 @@ public function diskusage()
session_write_close();
ignore_user_abort(true);
set_time_limit(0);
- try {
- if (!$this->obj->isValid()) {
- throw new Exception(_('Invalid storage node'));
- }
- if ($this->obj->get('isGraphEnabled') < 1) {
- throw new Exception(_('Graph is disabled for this node'));
- }
- $curroot = trim(
- trim(
- $this->obj->get('webroot'),
- '/'
- )
- );
- $webroot = sprintf(
- '/%s',
- (
- strlen($curroot) > 1 ?
- sprintf(
- '%s/',
- $curroot
- ) :
- ''
- )
- );
- $URL = sprintf(
- 'http://%s%sstatus/freespace.php?path=%s',
- $this->obj->get('ip'),
- $webroot,
- base64_encode($this->obj->get('path'))
- );
- $testurl = sprintf(
- 'http://%s/fog/management/index.php',
- $this->obj->get('ip')
- );
- $test = self::$FOGURLRequests->isAvailable($testurl);
- $test = array_shift($test);
- if (false !== $test) {
- unset($curroot, $webroot);
- $Response = self::$FOGURLRequests
- ->process($URL);
- $Response = json_decode(
- array_shift($Response),
- true
- );
- $Data = array(
- 'free' => $Response['free'],
- 'used' => $Response['used']
- );
- unset($Response);
- }
- } catch (Exception $e) {
- $Data['error'] = $e->getMessage();
- }
- echo json_encode((array)$Data);
+ $url = sprintf(
+ 'http://%s/fog/status/freespace.php?path=%s',
+ $this->obj->get('ip'),
+ base64_encode($this->obj->get('path'))
+ );
+ $data = self::$FOGURLRequests
+ ->process($url);
+ $data = json_decode(
+ array_shift($data),
+ true
+ );
+ $data = array(
+ 'free' => $data['free'],
+ 'used' => $data['used']
+ );
+ unset($url);
+ echo json_encode((array)$data);
+ unset($data);
+ exit;
+ }
+ /**
+ * Gets the 30 day graph.
+ *
+ * @return void
+ */
+ public function get30day()
+ {
+ session_write_close();
+ ignore_user_abort(true);
+ set_time_limit(0);
+ $start = self::niceDate()
+ ->setTime(00, 00, 00)
+ ->modify('-30 days');
+ $end = self::niceDate()
+ ->setTime(23, 59, 59);
+ $int = new DateInterval('P1D');
+ $period = new DatePeriod($start, $int, $end);
+ $dates = iterator_to_array($period);
unset(
- $curroot,
- $webroot,
- $URL,
- $Response,
- $Data
+ $start,
+ $end,
+ $int,
+ $period
);
+ foreach ((array)$dates as $index => &$date) {
+ $count = self::getClass('ImagingLogManager')
+ ->count(
+ array(
+ 'start' => $date->format('Y-m-d%'),
+ 'finish' => $date->format('Y-m-d%')
+ ),
+ 'OR'
+ );
+ $data[] = array(
+ ($date->getTimestamp() * 1000),
+ $count
+ );
+ unset($date);
+ }
+ echo json_encode($data);
exit;
}
/**
- * Gets the client count active/used/queued
+ * Gets the bandwidth of the nodes
*
* @return void
*/
- public function clientcount()
+ public function bandwidth()
{
session_write_close();
ignore_user_abort(true);
set_time_limit(0);
- if (!($this->obj->isValid()
- && count($this->obj->get('enablednodes') > 1))
- ) {
- return;
+ $sent = $_REQUEST['url'];
+ $names = $_REQUEST['names'];
+ $urls = array();
+ foreach ((array)$sent as &$url) {
+ $urls[] = $url;
+ unset($url);
}
- $ActivityActive = $ActivityQueued = $ActivityTotalClients = 0;
- $ActivityTotalClients = $this->obj->getTotalAvailableSlots();
- $ActivityQueued = $this->obj->getQueuedSlots();
- $ActivityActive = $this->obj->getUsedSlots();
- $data = array(
- 'ActivityActive'=>$ActivityActive,
- 'ActivityQueued'=>$ActivityQueued,
- 'ActivitySlots'=>$ActivityTotalClients,
+ $datas = self::$FOGURLRequests
+ ->process($urls);
+ $dataSet = array();
+ foreach ((array)$datas as &$data) {
+ $dataSet[] = json_decode($data, true);
+ unset($data);
+ }
+ echo json_encode(
+ array_combine(
+ $names,
+ $dataSet
+ )
);
- unset($ActivityActive, $ActivityQueued, $ActivityTotalClients);
- echo json_encode($data);
- unset($data);
exit;
}
}
diff --git a/packages/web/management/js/fog/fog.dashboard.js b/packages/web/management/js/fog/fog.dashboard.js
index b7ed8be754..0c9086b191 100644
--- a/packages/web/management/js/fog/fog.dashboard.js
+++ b/packages/web/management/js/fog/fog.dashboard.js
@@ -65,7 +65,9 @@ var Graph30DayOpts = {
colors: ['#7386ad'],
xaxis: {mode: 'time'},
yaxis: {
- tickFormatter: function(v) {return ''+v+'
';},
+ tickFormatter: function(v) {
+ return ''+v+'
';
+ },
min: 0,
minTickSize: 1
},
@@ -105,6 +107,8 @@ var bandinterval = false;
var clientinterval = false;
$(function() {
var now = new Date().getTime();
+ // 30 Day History Graph
+ Update30Day();
// Diskusage Graph - Node select - Hook select box to load new data via AJAX
// Start counters
GraphDiskUsageUpdate();
@@ -126,9 +130,6 @@ $(function() {
});
// Client Count starter.
// Only start bandwidth once the page is fully loaded.
- // 30 Day History Graph
- if (typeof(Graph30dayData) != 'undefined') Graph30DayData = [{label: 'Computers Imaged',data: JSONParseFunction(Graph30dayData)}];
- $.plot(Graph30Day,Graph30DayData,Graph30DayOpts);
// Bandwidth Graph - TX/RX Filter
GraphBandwidthFilters.click(function(e) {
// Blur -> add active class -> remove active class from old active item
@@ -155,6 +156,26 @@ $(function() {
// Remove loading spinners
$('.graph').not(GraphBandwidth,GraphDiskUsage).addClass('loaded');
});
+// 30 day function
+function Update30Day() {
+ $.ajax({
+ url: '?node=home',
+ type: 'POST',
+ data: {
+ sub: 'get30day'
+ },
+ dataType: 'json',
+ success: function(data) {
+ Graph30DayData = [
+ {
+ label: 'Computers Imaged',
+ data: data
+ }
+ ];
+ $.plot(Graph30Day, Graph30DayData, Graph30DayOpts);
+ }
+ });
+}
// Disk Usage Functions
function GraphDiskUsageUpdate() {
if (GraphDiskUsageAJAX) GraphDiskUsageAJAX.abort();
diff --git a/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po
index 0fdfc742f9..e3cdb67459 100644
--- a/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fog-project-2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 01:08-0500\n"
+"POT-Creation-Date: 2017-01-14 19:46-0500\n"
"PO-Revision-Date: 2016-05-23 07:36-0400\n"
"Last-Translator: vspushbullet \n"
"Language-Team: German\n"
@@ -824,7 +824,7 @@ msgid "Host"
msgstr "Host"
#: /var/www/fog/lib/fog/fogftp.class.php:380
-#: /var/www/fog/lib/pages/dashboardpage.class.php:161
+#: /var/www/fog/lib/pages/dashboardpage.class.php:204
#: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:89
#: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:553
#: /var/www/fog/lib/pages/usermanagementpage.class.php:67
@@ -2205,96 +2205,89 @@ msgstr "Stornierte Aufgabe"
msgid "Force"
msgstr "Kraft"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:136
+#: /var/www/fog/lib/pages/dashboardpage.class.php:172
msgid "Pending hosts"
msgstr "Ausstehende Gastgeber"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:137
-#: /var/www/fog/lib/pages/dashboardpage.class.php:146
+#: /var/www/fog/lib/pages/dashboardpage.class.php:173
+#: /var/www/fog/lib/pages/dashboardpage.class.php:182
#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:231
msgid "Click"
msgstr "Klicken Sie auf"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:140
-#: /var/www/fog/lib/pages/dashboardpage.class.php:149
+#: /var/www/fog/lib/pages/dashboardpage.class.php:176
+#: /var/www/fog/lib/pages/dashboardpage.class.php:185
#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:232
#: /var/www/fog/commons/text.php:92
msgid "here"
msgstr "Hier"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:141
-#: /var/www/fog/lib/pages/dashboardpage.class.php:150
+#: /var/www/fog/lib/pages/dashboardpage.class.php:177
+#: /var/www/fog/lib/pages/dashboardpage.class.php:186
msgid "to review."
msgstr "um zu überprüfen."
-#: /var/www/fog/lib/pages/dashboardpage.class.php:145
+#: /var/www/fog/lib/pages/dashboardpage.class.php:181
msgid "Pending macs"
msgstr "Ausstehende macs"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:162
+#: /var/www/fog/lib/pages/dashboardpage.class.php:205
msgid "Web Server"
msgstr "Web-Server"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:163
+#: /var/www/fog/lib/pages/dashboardpage.class.php:206
msgid "TFTP Server"
msgstr "TFTP-Server"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:164
+#: /var/www/fog/lib/pages/dashboardpage.class.php:207
msgid "Load Average"
msgstr "Durchschnittliche Belastung"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:165
+#: /var/www/fog/lib/pages/dashboardpage.class.php:208
msgid "System Uptime"
msgstr "Betriebsbereitschaft des Systems"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:178
+#: /var/www/fog/lib/pages/dashboardpage.class.php:221
msgid "System Overview"
msgstr "Systemübersicht"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:198
+#: /var/www/fog/lib/pages/dashboardpage.class.php:248
msgid "The selected node's storage group slot usage"
msgstr "Den ausgewählten Knoten Speichernutzung Gruppe slot"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:199
+#: /var/www/fog/lib/pages/dashboardpage.class.php:249
msgid "Storage Group Activity"
msgstr "Speichergruppe Aktivität"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:235
-msgid "The selected node's image storage disk usage"
+#: /var/www/fog/lib/pages/dashboardpage.class.php:264
+#, fuzzy
+msgid "The selected node's image storage usage"
msgstr "Den ausgewählten Knoten Bild Speicher Datenträgerverwendung"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:236
+#: /var/www/fog/lib/pages/dashboardpage.class.php:265
msgid "Storage Node Disk Usage"
msgstr "Storage Node Datenträgerverwendung"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:250
+#: /var/www/fog/lib/pages/dashboardpage.class.php:279
msgid "Imaging Over the last 30 days"
msgstr "Imaging in den letzten 30 Tagen"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:310
+#: /var/www/fog/lib/pages/dashboardpage.class.php:320
msgid "1 hour"
msgstr "1 Stunde"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:312
+#: /var/www/fog/lib/pages/dashboardpage.class.php:322
msgid "30 Minutes"
msgstr "30 Minuten"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:314
+#: /var/www/fog/lib/pages/dashboardpage.class.php:324
msgid "10 Minutes"
msgstr "10 Minuten"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:316
+#: /var/www/fog/lib/pages/dashboardpage.class.php:326
msgid "2 Minutes"
msgstr "2 Minuten"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:359
-msgid "Invalid storage node"
-msgstr "Ungültige Speicherknoten"
-
-#: /var/www/fog/lib/pages/dashboardpage.class.php:362
-msgid "Graph is disabled for this node"
-msgstr "Grafik ist für diesen Knoten deaktiviert."
-
#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:56
msgid "FOG Project on Github"
msgstr "Nebel-Projekt auf Github"
@@ -8628,6 +8621,12 @@ msgstr "Hallo Nebel Client"
msgid "There are no locations on this server"
msgstr "Es gibt keine Orte auf diesem Server."
+#~ msgid "Invalid storage node"
+#~ msgstr "Ungültige Speicherknoten"
+
+#~ msgid "Graph is disabled for this node"
+#~ msgstr "Grafik ist für diesen Knoten deaktiviert."
+
#, fuzzy
#~ msgid "User Nam Attribute"
#~ msgstr "Benutzername"
diff --git a/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po
index 6425c87ada..e8dbf2da31 100644
--- a/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 01:08-0500\n"
+"POT-Creation-Date: 2017-01-14 19:46-0500\n"
"PO-Revision-Date: 2016-05-22 15:14-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -817,7 +817,7 @@ msgid "Host"
msgstr "Host"
#: /var/www/fog/lib/fog/fogftp.class.php:380
-#: /var/www/fog/lib/pages/dashboardpage.class.php:161
+#: /var/www/fog/lib/pages/dashboardpage.class.php:204
#: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:89
#: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:553
#: /var/www/fog/lib/pages/usermanagementpage.class.php:67
@@ -2195,96 +2195,89 @@ msgstr "Cancelled task"
msgid "Force"
msgstr "Force"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:136
+#: /var/www/fog/lib/pages/dashboardpage.class.php:172
msgid "Pending hosts"
msgstr "Pending hosts"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:137
-#: /var/www/fog/lib/pages/dashboardpage.class.php:146
+#: /var/www/fog/lib/pages/dashboardpage.class.php:173
+#: /var/www/fog/lib/pages/dashboardpage.class.php:182
#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:231
msgid "Click"
msgstr "Click"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:140
-#: /var/www/fog/lib/pages/dashboardpage.class.php:149
+#: /var/www/fog/lib/pages/dashboardpage.class.php:176
+#: /var/www/fog/lib/pages/dashboardpage.class.php:185
#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:232
#: /var/www/fog/commons/text.php:92
msgid "here"
msgstr "here"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:141
-#: /var/www/fog/lib/pages/dashboardpage.class.php:150
+#: /var/www/fog/lib/pages/dashboardpage.class.php:177
+#: /var/www/fog/lib/pages/dashboardpage.class.php:186
msgid "to review."
msgstr "to review."
-#: /var/www/fog/lib/pages/dashboardpage.class.php:145
+#: /var/www/fog/lib/pages/dashboardpage.class.php:181
msgid "Pending macs"
msgstr "Pending macs"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:162
+#: /var/www/fog/lib/pages/dashboardpage.class.php:205
msgid "Web Server"
msgstr "Web Server"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:163
+#: /var/www/fog/lib/pages/dashboardpage.class.php:206
msgid "TFTP Server"
msgstr "TFTP Server"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:164
+#: /var/www/fog/lib/pages/dashboardpage.class.php:207
msgid "Load Average"
msgstr "Load Average"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:165
+#: /var/www/fog/lib/pages/dashboardpage.class.php:208
msgid "System Uptime"
msgstr "System Uptime"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:178
+#: /var/www/fog/lib/pages/dashboardpage.class.php:221
msgid "System Overview"
msgstr "System Overview"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:198
+#: /var/www/fog/lib/pages/dashboardpage.class.php:248
msgid "The selected node's storage group slot usage"
msgstr "The selected node's storage group slot usage"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:199
+#: /var/www/fog/lib/pages/dashboardpage.class.php:249
msgid "Storage Group Activity"
msgstr "Storage Group Activity"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:235
-msgid "The selected node's image storage disk usage"
+#: /var/www/fog/lib/pages/dashboardpage.class.php:264
+#, fuzzy
+msgid "The selected node's image storage usage"
msgstr "The selected node's image storage disk usage"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:236
+#: /var/www/fog/lib/pages/dashboardpage.class.php:265
msgid "Storage Node Disk Usage"
msgstr "Storage Node Disk Usage"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:250
+#: /var/www/fog/lib/pages/dashboardpage.class.php:279
msgid "Imaging Over the last 30 days"
msgstr "Imaging Over the last 30 days"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:310
+#: /var/www/fog/lib/pages/dashboardpage.class.php:320
msgid "1 hour"
msgstr "1 hour"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:312
+#: /var/www/fog/lib/pages/dashboardpage.class.php:322
msgid "30 Minutes"
msgstr "30 Minutes"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:314
+#: /var/www/fog/lib/pages/dashboardpage.class.php:324
msgid "10 Minutes"
msgstr "10 Minutes"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:316
+#: /var/www/fog/lib/pages/dashboardpage.class.php:326
msgid "2 Minutes"
msgstr "2 Minutes"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:359
-msgid "Invalid storage node"
-msgstr "Invalid storage node"
-
-#: /var/www/fog/lib/pages/dashboardpage.class.php:362
-msgid "Graph is disabled for this node"
-msgstr "Graph is disabled for this node"
-
#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:56
msgid "FOG Project on Github"
msgstr "FOG Project on Github"
@@ -8596,6 +8589,12 @@ msgstr "Hello FOG Client"
msgid "There are no locations on this server"
msgstr "There are no locations on this server."
+#~ msgid "Invalid storage node"
+#~ msgstr "Invalid storage node"
+
+#~ msgid "Graph is disabled for this node"
+#~ msgstr "Graph is disabled for this node"
+
#, fuzzy
#~ msgid "User Nam Attribute"
#~ msgstr "User Name"
diff --git a/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po
index ed501a616d..6a30ac3838 100755
--- a/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 01:08-0500\n"
+"POT-Creation-Date: 2017-01-14 19:46-0500\n"
"PO-Revision-Date: 2016-05-22 15:14-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -820,7 +820,7 @@ msgid "Host"
msgstr "Anfitrión"
#: /var/www/fog/lib/fog/fogftp.class.php:380
-#: /var/www/fog/lib/pages/dashboardpage.class.php:161
+#: /var/www/fog/lib/pages/dashboardpage.class.php:204
#: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:89
#: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:553
#: /var/www/fog/lib/pages/usermanagementpage.class.php:67
@@ -2201,96 +2201,89 @@ msgstr "tarea Cancelado"
msgid "Force"
msgstr "Fuerza"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:136
+#: /var/www/fog/lib/pages/dashboardpage.class.php:172
msgid "Pending hosts"
msgstr "anfitriones pendientes"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:137
-#: /var/www/fog/lib/pages/dashboardpage.class.php:146
+#: /var/www/fog/lib/pages/dashboardpage.class.php:173
+#: /var/www/fog/lib/pages/dashboardpage.class.php:182
#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:231
msgid "Click"
msgstr "Hacer clic"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:140
-#: /var/www/fog/lib/pages/dashboardpage.class.php:149
+#: /var/www/fog/lib/pages/dashboardpage.class.php:176
+#: /var/www/fog/lib/pages/dashboardpage.class.php:185
#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:232
#: /var/www/fog/commons/text.php:92
msgid "here"
msgstr "aquí"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:141
-#: /var/www/fog/lib/pages/dashboardpage.class.php:150
+#: /var/www/fog/lib/pages/dashboardpage.class.php:177
+#: /var/www/fog/lib/pages/dashboardpage.class.php:186
msgid "to review."
msgstr "para revisar."
-#: /var/www/fog/lib/pages/dashboardpage.class.php:145
+#: /var/www/fog/lib/pages/dashboardpage.class.php:181
msgid "Pending macs"
msgstr "macs pendientes"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:162
+#: /var/www/fog/lib/pages/dashboardpage.class.php:205
msgid "Web Server"
msgstr "Servidor web"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:163
+#: /var/www/fog/lib/pages/dashboardpage.class.php:206
msgid "TFTP Server"
msgstr "servidor TFTP"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:164
+#: /var/www/fog/lib/pages/dashboardpage.class.php:207
msgid "Load Average"
msgstr "Promedio de carga"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:165
+#: /var/www/fog/lib/pages/dashboardpage.class.php:208
msgid "System Uptime"
msgstr "Tiempo de actividad del sistema"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:178
+#: /var/www/fog/lib/pages/dashboardpage.class.php:221
msgid "System Overview"
msgstr "Resumen del sistema"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:198
+#: /var/www/fog/lib/pages/dashboardpage.class.php:248
msgid "The selected node's storage group slot usage"
msgstr "el uso de la ranura del grupo de almacenamiento del nodo seleccionado"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:199
+#: /var/www/fog/lib/pages/dashboardpage.class.php:249
msgid "Storage Group Activity"
msgstr "Grupo de almacenamiento de Actividad"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:235
-msgid "The selected node's image storage disk usage"
+#: /var/www/fog/lib/pages/dashboardpage.class.php:264
+#, fuzzy
+msgid "The selected node's image storage usage"
msgstr "el uso del disco de almacenamiento de imágenes del nodo seleccionado"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:236
+#: /var/www/fog/lib/pages/dashboardpage.class.php:265
msgid "Storage Node Disk Usage"
msgstr "Uso del disco nodo de almacenamiento"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:250
+#: /var/www/fog/lib/pages/dashboardpage.class.php:279
msgid "Imaging Over the last 30 days"
msgstr "Imaging lo largo de los últimos 30 días"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:310
+#: /var/www/fog/lib/pages/dashboardpage.class.php:320
msgid "1 hour"
msgstr "1 hora"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:312
+#: /var/www/fog/lib/pages/dashboardpage.class.php:322
msgid "30 Minutes"
msgstr "30 minutos"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:314
+#: /var/www/fog/lib/pages/dashboardpage.class.php:324
msgid "10 Minutes"
msgstr "10 minutos"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:316
+#: /var/www/fog/lib/pages/dashboardpage.class.php:326
msgid "2 Minutes"
msgstr "2 minutos"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:359
-msgid "Invalid storage node"
-msgstr "nodo de almacenamiento no válido"
-
-#: /var/www/fog/lib/pages/dashboardpage.class.php:362
-msgid "Graph is disabled for this node"
-msgstr "Gráfico está deshabilitado para este nodo"
-
#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:56
msgid "FOG Project on Github"
msgstr "Proyecto FOG en Github"
@@ -8622,6 +8615,12 @@ msgstr "Hola Cliente FOG"
msgid "There are no locations on this server"
msgstr "No hay lugares en este servidor."
+#~ msgid "Invalid storage node"
+#~ msgstr "nodo de almacenamiento no válido"
+
+#~ msgid "Graph is disabled for this node"
+#~ msgstr "Gráfico está deshabilitado para este nodo"
+
#, fuzzy
#~ msgid "User Nam Attribute"
#~ msgstr "Nombre de usuario"
diff --git a/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po
index 1792b6afef..b09740db73 100644
--- a/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 01:08-0500\n"
+"POT-Creation-Date: 2017-01-14 19:46-0500\n"
"PO-Revision-Date: 2016-05-22 15:14-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -824,7 +824,7 @@ msgid "Host"
msgstr "Hôte"
#: /var/www/fog/lib/fog/fogftp.class.php:380
-#: /var/www/fog/lib/pages/dashboardpage.class.php:161
+#: /var/www/fog/lib/pages/dashboardpage.class.php:204
#: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:89
#: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:553
#: /var/www/fog/lib/pages/usermanagementpage.class.php:67
@@ -2206,97 +2206,90 @@ msgstr "tâche Annulé"
msgid "Force"
msgstr "Obliger"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:136
+#: /var/www/fog/lib/pages/dashboardpage.class.php:172
msgid "Pending hosts"
msgstr "hôtes en attente"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:137
-#: /var/www/fog/lib/pages/dashboardpage.class.php:146
+#: /var/www/fog/lib/pages/dashboardpage.class.php:173
+#: /var/www/fog/lib/pages/dashboardpage.class.php:182
#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:231
msgid "Click"
msgstr "Cliquez"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:140
-#: /var/www/fog/lib/pages/dashboardpage.class.php:149
+#: /var/www/fog/lib/pages/dashboardpage.class.php:176
+#: /var/www/fog/lib/pages/dashboardpage.class.php:185
#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:232
#: /var/www/fog/commons/text.php:92
msgid "here"
msgstr "ici"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:141
-#: /var/www/fog/lib/pages/dashboardpage.class.php:150
+#: /var/www/fog/lib/pages/dashboardpage.class.php:177
+#: /var/www/fog/lib/pages/dashboardpage.class.php:186
msgid "to review."
msgstr "réviser."
-#: /var/www/fog/lib/pages/dashboardpage.class.php:145
+#: /var/www/fog/lib/pages/dashboardpage.class.php:181
msgid "Pending macs"
msgstr "macs en attente"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:162
+#: /var/www/fog/lib/pages/dashboardpage.class.php:205
msgid "Web Server"
msgstr "Serveur Web"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:163
+#: /var/www/fog/lib/pages/dashboardpage.class.php:206
msgid "TFTP Server"
msgstr "serveur TFTP"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:164
+#: /var/www/fog/lib/pages/dashboardpage.class.php:207
msgid "Load Average"
msgstr "charge moyenne"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:165
+#: /var/www/fog/lib/pages/dashboardpage.class.php:208
msgid "System Uptime"
msgstr "système Uptime"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:178
+#: /var/www/fog/lib/pages/dashboardpage.class.php:221
msgid "System Overview"
msgstr "Présentation du système"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:198
+#: /var/www/fog/lib/pages/dashboardpage.class.php:248
msgid "The selected node's storage group slot usage"
msgstr ""
"le stockage de l'utilisation de l'emplacement de groupe du noeud sélectionné"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:199
+#: /var/www/fog/lib/pages/dashboardpage.class.php:249
msgid "Storage Group Activity"
msgstr "Stockage Activité Groupe"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:235
-msgid "The selected node's image storage disk usage"
+#: /var/www/fog/lib/pages/dashboardpage.class.php:264
+#, fuzzy
+msgid "The selected node's image storage usage"
msgstr "stockage d'image de l'utilisation du disque du noeud sélectionné"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:236
+#: /var/www/fog/lib/pages/dashboardpage.class.php:265
msgid "Storage Node Disk Usage"
msgstr "Utilisation Noeud de stockage de disque"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:250
+#: /var/www/fog/lib/pages/dashboardpage.class.php:279
msgid "Imaging Over the last 30 days"
msgstr "Imaging Au cours des 30 derniers jours"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:310
+#: /var/www/fog/lib/pages/dashboardpage.class.php:320
msgid "1 hour"
msgstr "1 heure"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:312
+#: /var/www/fog/lib/pages/dashboardpage.class.php:322
msgid "30 Minutes"
msgstr "30 minutes"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:314
+#: /var/www/fog/lib/pages/dashboardpage.class.php:324
msgid "10 Minutes"
msgstr "10 minutes"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:316
+#: /var/www/fog/lib/pages/dashboardpage.class.php:326
msgid "2 Minutes"
msgstr "2 minutes"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:359
-msgid "Invalid storage node"
-msgstr "nœud de stockage non valide"
-
-#: /var/www/fog/lib/pages/dashboardpage.class.php:362
-msgid "Graph is disabled for this node"
-msgstr "Graphique est désactivé pour ce noeud"
-
#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:56
msgid "FOG Project on Github"
msgstr "Projet FOG sur Github"
@@ -8629,6 +8622,12 @@ msgstr "Bonjour FOG client"
msgid "There are no locations on this server"
msgstr "Il n'y a aucun emplacement sur ce serveur."
+#~ msgid "Invalid storage node"
+#~ msgstr "nœud de stockage non valide"
+
+#~ msgid "Graph is disabled for this node"
+#~ msgstr "Graphique est désactivé pour ce noeud"
+
#, fuzzy
#~ msgid "User Nam Attribute"
#~ msgstr "Nom d'utilisateur"
diff --git a/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po
index 08ed11f0fc..02368196ca 100644
--- a/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 01:08-0500\n"
+"POT-Creation-Date: 2017-01-14 19:46-0500\n"
"PO-Revision-Date: 2016-05-22 15:14-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -819,7 +819,7 @@ msgid "Host"
msgstr "Ospite"
#: /var/www/fog/lib/fog/fogftp.class.php:380
-#: /var/www/fog/lib/pages/dashboardpage.class.php:161
+#: /var/www/fog/lib/pages/dashboardpage.class.php:204
#: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:89
#: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:553
#: /var/www/fog/lib/pages/usermanagementpage.class.php:67
@@ -2200,96 +2200,89 @@ msgstr "compito Annullato"
msgid "Force"
msgstr "Vigore"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:136
+#: /var/www/fog/lib/pages/dashboardpage.class.php:172
msgid "Pending hosts"
msgstr "host in sospeso"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:137
-#: /var/www/fog/lib/pages/dashboardpage.class.php:146
+#: /var/www/fog/lib/pages/dashboardpage.class.php:173
+#: /var/www/fog/lib/pages/dashboardpage.class.php:182
#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:231
msgid "Click"
msgstr "Clic"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:140
-#: /var/www/fog/lib/pages/dashboardpage.class.php:149
+#: /var/www/fog/lib/pages/dashboardpage.class.php:176
+#: /var/www/fog/lib/pages/dashboardpage.class.php:185
#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:232
#: /var/www/fog/commons/text.php:92
msgid "here"
msgstr "Qui"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:141
-#: /var/www/fog/lib/pages/dashboardpage.class.php:150
+#: /var/www/fog/lib/pages/dashboardpage.class.php:177
+#: /var/www/fog/lib/pages/dashboardpage.class.php:186
msgid "to review."
msgstr "revisionare."
-#: /var/www/fog/lib/pages/dashboardpage.class.php:145
+#: /var/www/fog/lib/pages/dashboardpage.class.php:181
msgid "Pending macs"
msgstr "Mac attesa"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:162
+#: /var/www/fog/lib/pages/dashboardpage.class.php:205
msgid "Web Server"
msgstr "Server web"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:163
+#: /var/www/fog/lib/pages/dashboardpage.class.php:206
msgid "TFTP Server"
msgstr "TFTP Server"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:164
+#: /var/www/fog/lib/pages/dashboardpage.class.php:207
msgid "Load Average"
msgstr "Carico medio"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:165
+#: /var/www/fog/lib/pages/dashboardpage.class.php:208
msgid "System Uptime"
msgstr "sistema Uptime"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:178
+#: /var/www/fog/lib/pages/dashboardpage.class.php:221
msgid "System Overview"
msgstr "panoramica del sistema"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:198
+#: /var/www/fog/lib/pages/dashboardpage.class.php:248
msgid "The selected node's storage group slot usage"
msgstr "stoccaggio utilizzo di slot gruppo del nodo selezionato"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:199
+#: /var/www/fog/lib/pages/dashboardpage.class.php:249
msgid "Storage Group Activity"
msgstr "Gruppo di archiviazione di attività"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:235
-msgid "The selected node's image storage disk usage"
+#: /var/www/fog/lib/pages/dashboardpage.class.php:264
+#, fuzzy
+msgid "The selected node's image storage usage"
msgstr "memorizzazione delle immagini utilizzo del disco del nodo selezionato"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:236
+#: /var/www/fog/lib/pages/dashboardpage.class.php:265
msgid "Storage Node Disk Usage"
msgstr "Uso nodo di archiviazione su disco"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:250
+#: /var/www/fog/lib/pages/dashboardpage.class.php:279
msgid "Imaging Over the last 30 days"
msgstr "Imaging Negli ultimi 30 giorni"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:310
+#: /var/www/fog/lib/pages/dashboardpage.class.php:320
msgid "1 hour"
msgstr "1 ora"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:312
+#: /var/www/fog/lib/pages/dashboardpage.class.php:322
msgid "30 Minutes"
msgstr "30 minuti"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:314
+#: /var/www/fog/lib/pages/dashboardpage.class.php:324
msgid "10 Minutes"
msgstr "10 minuti"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:316
+#: /var/www/fog/lib/pages/dashboardpage.class.php:326
msgid "2 Minutes"
msgstr "2 minuti"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:359
-msgid "Invalid storage node"
-msgstr "nodo di archiviazione non valido"
-
-#: /var/www/fog/lib/pages/dashboardpage.class.php:362
-msgid "Graph is disabled for this node"
-msgstr "Graph è disabilitata per questo nodo"
-
#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:56
msgid "FOG Project on Github"
msgstr "Progetto FOG su Github"
@@ -8613,6 +8606,12 @@ msgstr "Ciao FOG client"
msgid "There are no locations on this server"
msgstr "Non ci sono posizioni su questo server."
+#~ msgid "Invalid storage node"
+#~ msgstr "nodo di archiviazione non valido"
+
+#~ msgid "Graph is disabled for this node"
+#~ msgstr "Graph è disabilitata per questo nodo"
+
#, fuzzy
#~ msgid "User Nam Attribute"
#~ msgstr "Nome utente"
diff --git a/packages/web/management/languages/messages.pot b/packages/web/management/languages/messages.pot
index 32a7d59e08..050e3afbd1 100644
--- a/packages/web/management/languages/messages.pot
+++ b/packages/web/management/languages/messages.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 12:15-0500\n"
+"POT-Creation-Date: 2017-01-14 19:46-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -744,7 +744,7 @@ msgid "Host"
msgstr ""
#: /var/www/fog/lib/fog/fogftp.class.php:380
-#: /var/www/fog/lib/pages/dashboardpage.class.php:161
+#: /var/www/fog/lib/pages/dashboardpage.class.php:204
#: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:89
#: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:553
#: /var/www/fog/lib/pages/usermanagementpage.class.php:67
@@ -2079,96 +2079,88 @@ msgstr ""
msgid "Force"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:136
+#: /var/www/fog/lib/pages/dashboardpage.class.php:172
msgid "Pending hosts"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:137
-#: /var/www/fog/lib/pages/dashboardpage.class.php:146
+#: /var/www/fog/lib/pages/dashboardpage.class.php:173
+#: /var/www/fog/lib/pages/dashboardpage.class.php:182
#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:231
msgid "Click"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:140
-#: /var/www/fog/lib/pages/dashboardpage.class.php:149
+#: /var/www/fog/lib/pages/dashboardpage.class.php:176
+#: /var/www/fog/lib/pages/dashboardpage.class.php:185
#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:232
#: /var/www/fog/commons/text.php:92
msgid "here"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:141
-#: /var/www/fog/lib/pages/dashboardpage.class.php:150
+#: /var/www/fog/lib/pages/dashboardpage.class.php:177
+#: /var/www/fog/lib/pages/dashboardpage.class.php:186
msgid "to review."
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:145
+#: /var/www/fog/lib/pages/dashboardpage.class.php:181
msgid "Pending macs"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:162
+#: /var/www/fog/lib/pages/dashboardpage.class.php:205
msgid "Web Server"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:163
+#: /var/www/fog/lib/pages/dashboardpage.class.php:206
msgid "TFTP Server"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:164
+#: /var/www/fog/lib/pages/dashboardpage.class.php:207
msgid "Load Average"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:165
+#: /var/www/fog/lib/pages/dashboardpage.class.php:208
msgid "System Uptime"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:178
+#: /var/www/fog/lib/pages/dashboardpage.class.php:221
msgid "System Overview"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:198
+#: /var/www/fog/lib/pages/dashboardpage.class.php:248
msgid "The selected node's storage group slot usage"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:199
+#: /var/www/fog/lib/pages/dashboardpage.class.php:249
msgid "Storage Group Activity"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:235
-msgid "The selected node's image storage disk usage"
+#: /var/www/fog/lib/pages/dashboardpage.class.php:264
+msgid "The selected node's image storage usage"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:236
+#: /var/www/fog/lib/pages/dashboardpage.class.php:265
msgid "Storage Node Disk Usage"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:250
+#: /var/www/fog/lib/pages/dashboardpage.class.php:279
msgid "Imaging Over the last 30 days"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:310
+#: /var/www/fog/lib/pages/dashboardpage.class.php:320
msgid "1 hour"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:312
+#: /var/www/fog/lib/pages/dashboardpage.class.php:322
msgid "30 Minutes"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:314
+#: /var/www/fog/lib/pages/dashboardpage.class.php:324
msgid "10 Minutes"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:316
+#: /var/www/fog/lib/pages/dashboardpage.class.php:326
msgid "2 Minutes"
msgstr ""
-#: /var/www/fog/lib/pages/dashboardpage.class.php:359
-msgid "Invalid storage node"
-msgstr ""
-
-#: /var/www/fog/lib/pages/dashboardpage.class.php:362
-msgid "Graph is disabled for this node"
-msgstr ""
-
#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:56
msgid "FOG Project on Github"
msgstr ""
diff --git a/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po
index cf180bd9d1..294dcd336c 100644
--- a/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 01:08-0500\n"
+"POT-Creation-Date: 2017-01-14 19:46-0500\n"
"PO-Revision-Date: 2016-05-22 15:14-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -820,7 +820,7 @@ msgid "Host"
msgstr "Anfitrião"
#: /var/www/fog/lib/fog/fogftp.class.php:380
-#: /var/www/fog/lib/pages/dashboardpage.class.php:161
+#: /var/www/fog/lib/pages/dashboardpage.class.php:204
#: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:89
#: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:553
#: /var/www/fog/lib/pages/usermanagementpage.class.php:67
@@ -2198,96 +2198,89 @@ msgstr "tarefa cancelada"
msgid "Force"
msgstr "Força"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:136
+#: /var/www/fog/lib/pages/dashboardpage.class.php:172
msgid "Pending hosts"
msgstr "anfitriões pendentes"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:137
-#: /var/www/fog/lib/pages/dashboardpage.class.php:146
+#: /var/www/fog/lib/pages/dashboardpage.class.php:173
+#: /var/www/fog/lib/pages/dashboardpage.class.php:182
#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:231
msgid "Click"
msgstr "Clique"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:140
-#: /var/www/fog/lib/pages/dashboardpage.class.php:149
+#: /var/www/fog/lib/pages/dashboardpage.class.php:176
+#: /var/www/fog/lib/pages/dashboardpage.class.php:185
#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:232
#: /var/www/fog/commons/text.php:92
msgid "here"
msgstr "Aqui"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:141
-#: /var/www/fog/lib/pages/dashboardpage.class.php:150
+#: /var/www/fog/lib/pages/dashboardpage.class.php:177
+#: /var/www/fog/lib/pages/dashboardpage.class.php:186
msgid "to review."
msgstr "rever."
-#: /var/www/fog/lib/pages/dashboardpage.class.php:145
+#: /var/www/fog/lib/pages/dashboardpage.class.php:181
msgid "Pending macs"
msgstr "macs pendentes"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:162
+#: /var/www/fog/lib/pages/dashboardpage.class.php:205
msgid "Web Server"
msgstr "Servidor web"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:163
+#: /var/www/fog/lib/pages/dashboardpage.class.php:206
msgid "TFTP Server"
msgstr "Servidor TFTP"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:164
+#: /var/www/fog/lib/pages/dashboardpage.class.php:207
msgid "Load Average"
msgstr "Carga média"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:165
+#: /var/www/fog/lib/pages/dashboardpage.class.php:208
msgid "System Uptime"
msgstr "Uptime sistema"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:178
+#: /var/www/fog/lib/pages/dashboardpage.class.php:221
msgid "System Overview"
msgstr "Visão geral do sistema"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:198
+#: /var/www/fog/lib/pages/dashboardpage.class.php:248
msgid "The selected node's storage group slot usage"
msgstr "utilização das faixas do grupo de armazenamento do nó selecionado"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:199
+#: /var/www/fog/lib/pages/dashboardpage.class.php:249
msgid "Storage Group Activity"
msgstr "Actividade do Grupo de Armazenamento"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:235
-msgid "The selected node's image storage disk usage"
+#: /var/www/fog/lib/pages/dashboardpage.class.php:264
+#, fuzzy
+msgid "The selected node's image storage usage"
msgstr "o uso do disco de armazenamento de imagem do nó selecionado"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:236
+#: /var/www/fog/lib/pages/dashboardpage.class.php:265
msgid "Storage Node Disk Usage"
msgstr "Uso nó de armazenamento do disco"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:250
+#: /var/www/fog/lib/pages/dashboardpage.class.php:279
msgid "Imaging Over the last 30 days"
msgstr "Imagem Ao longo dos últimos 30 dias"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:310
+#: /var/www/fog/lib/pages/dashboardpage.class.php:320
msgid "1 hour"
msgstr "1 hora"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:312
+#: /var/www/fog/lib/pages/dashboardpage.class.php:322
msgid "30 Minutes"
msgstr "30 minutos"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:314
+#: /var/www/fog/lib/pages/dashboardpage.class.php:324
msgid "10 Minutes"
msgstr "10 Minutos"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:316
+#: /var/www/fog/lib/pages/dashboardpage.class.php:326
msgid "2 Minutes"
msgstr "2 minutos"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:359
-msgid "Invalid storage node"
-msgstr "nó de armazenamento inválido"
-
-#: /var/www/fog/lib/pages/dashboardpage.class.php:362
-msgid "Graph is disabled for this node"
-msgstr "Graph está desativada para este nó"
-
#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:56
msgid "FOG Project on Github"
msgstr "Projeto FOG no Github"
@@ -8605,6 +8598,12 @@ msgstr "Olá Cliente FOG"
msgid "There are no locations on this server"
msgstr "Não há locais neste servidor."
+#~ msgid "Invalid storage node"
+#~ msgstr "nó de armazenamento inválido"
+
+#~ msgid "Graph is disabled for this node"
+#~ msgstr "Graph está desativada para este nó"
+
#, fuzzy
#~ msgid "User Nam Attribute"
#~ msgstr "Nome de usuário"
diff --git a/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po
index 1c63ac84f9..2de430ce46 100644
--- a/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-14 01:08-0500\n"
+"POT-Creation-Date: 2017-01-14 19:46-0500\n"
"PO-Revision-Date: 2016-05-22 15:14-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -813,7 +813,7 @@ msgid "Host"
msgstr "主办"
#: /var/www/fog/lib/fog/fogftp.class.php:380
-#: /var/www/fog/lib/pages/dashboardpage.class.php:161
+#: /var/www/fog/lib/pages/dashboardpage.class.php:204
#: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:89
#: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:553
#: /var/www/fog/lib/pages/usermanagementpage.class.php:67
@@ -2191,96 +2191,89 @@ msgstr "取消任务"
msgid "Force"
msgstr "力"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:136
+#: /var/www/fog/lib/pages/dashboardpage.class.php:172
msgid "Pending hosts"
msgstr "待主机"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:137
-#: /var/www/fog/lib/pages/dashboardpage.class.php:146
+#: /var/www/fog/lib/pages/dashboardpage.class.php:173
+#: /var/www/fog/lib/pages/dashboardpage.class.php:182
#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:231
msgid "Click"
msgstr "点击"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:140
-#: /var/www/fog/lib/pages/dashboardpage.class.php:149
+#: /var/www/fog/lib/pages/dashboardpage.class.php:176
+#: /var/www/fog/lib/pages/dashboardpage.class.php:185
#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:232
#: /var/www/fog/commons/text.php:92
msgid "here"
msgstr "这里"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:141
-#: /var/www/fog/lib/pages/dashboardpage.class.php:150
+#: /var/www/fog/lib/pages/dashboardpage.class.php:177
+#: /var/www/fog/lib/pages/dashboardpage.class.php:186
msgid "to review."
msgstr "回顾。"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:145
+#: /var/www/fog/lib/pages/dashboardpage.class.php:181
msgid "Pending macs"
msgstr "待淅淅沥沥"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:162
+#: /var/www/fog/lib/pages/dashboardpage.class.php:205
msgid "Web Server"
msgstr "网络服务器"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:163
+#: /var/www/fog/lib/pages/dashboardpage.class.php:206
msgid "TFTP Server"
msgstr "TFTP服务器"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:164
+#: /var/www/fog/lib/pages/dashboardpage.class.php:207
msgid "Load Average"
msgstr "平均负载"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:165
+#: /var/www/fog/lib/pages/dashboardpage.class.php:208
msgid "System Uptime"
msgstr "系统正常运行时间"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:178
+#: /var/www/fog/lib/pages/dashboardpage.class.php:221
msgid "System Overview"
msgstr "系统总览"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:198
+#: /var/www/fog/lib/pages/dashboardpage.class.php:248
msgid "The selected node's storage group slot usage"
msgstr "所选节点的存储组时隙的使用"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:199
+#: /var/www/fog/lib/pages/dashboardpage.class.php:249
msgid "Storage Group Activity"
msgstr "存储组活动"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:235
-msgid "The selected node's image storage disk usage"
+#: /var/www/fog/lib/pages/dashboardpage.class.php:264
+#, fuzzy
+msgid "The selected node's image storage usage"
msgstr "所选节点的图像存储磁盘使用情况"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:236
+#: /var/www/fog/lib/pages/dashboardpage.class.php:265
msgid "Storage Node Disk Usage"
msgstr "存储节点的磁盘使用情况"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:250
+#: /var/www/fog/lib/pages/dashboardpage.class.php:279
msgid "Imaging Over the last 30 days"
msgstr "成像在过去30天"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:310
+#: /var/www/fog/lib/pages/dashboardpage.class.php:320
msgid "1 hour"
msgstr "1小时"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:312
+#: /var/www/fog/lib/pages/dashboardpage.class.php:322
msgid "30 Minutes"
msgstr "30分钟"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:314
+#: /var/www/fog/lib/pages/dashboardpage.class.php:324
msgid "10 Minutes"
msgstr "10分钟"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:316
+#: /var/www/fog/lib/pages/dashboardpage.class.php:326
msgid "2 Minutes"
msgstr "2分钟"
-#: /var/www/fog/lib/pages/dashboardpage.class.php:359
-msgid "Invalid storage node"
-msgstr "无效的存储节点"
-
-#: /var/www/fog/lib/pages/dashboardpage.class.php:362
-msgid "Graph is disabled for this node"
-msgstr "图为该节点禁用"
-
#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:56
msgid "FOG Project on Github"
msgstr "FOG项目在Github"
@@ -8575,6 +8568,12 @@ msgstr "你好FOG客户端"
msgid "There are no locations on this server"
msgstr "有此服务器上没有的位置。"
+#~ msgid "Invalid storage node"
+#~ msgstr "无效的存储节点"
+
+#~ msgid "Graph is disabled for this node"
+#~ msgstr "图为该节点禁用"
+
#, fuzzy
#~ msgid "User Nam Attribute"
#~ msgstr "用户名"