diff --git a/CHANGELOG b/CHANGELOG index 7c85acdcb00ca749f8db3e573ed299421d6dbfc0..18f07c3356d04f4e107217eb802cd5ba50586a5a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1875,7 +1875,7 @@ Fixes a lot of wordings => Bugfix #417 => Bugfix #436 => Reporting : CSV export now takes correct timeperiod parameters -=> Reporting : fixes bug that occured when hosts/services were renamed +=> Reporting : fixes bug that occurred when hosts/services were renamed => ACL : ServiceGroups are no longer restrictions, they grant access to resources instead => Enhanced generation of configuration files => New Centreon logo diff --git a/lib/perl/centreon/script/centcore.pm b/lib/perl/centreon/script/centcore.pm index ee04c08537345576604d9c117a19af68672be2ae..52489adc9094e6e4f4c41b795ea7dd01d973f495 100755 --- a/lib/perl/centreon/script/centcore.pm +++ b/lib/perl/centreon/script/centcore.pm @@ -407,7 +407,7 @@ sub waitPipe($) { } ## -# Checks if rotation occured, +# Checks if rotation occurred, # sub checkRotation($$$$$) { my $self = shift; diff --git a/www/include/options/oreon/modules/licenseUpload.php b/www/include/options/oreon/modules/licenseUpload.php index f20db4c59579435741860f256955470380d58e1d..7d7f18ed4f2826656778499bfd617b107edfef54 100644 --- a/www/include/options/oreon/modules/licenseUpload.php +++ b/www/include/options/oreon/modules/licenseUpload.php @@ -110,9 +110,9 @@ if ($LicenseFileInfos['name'] == 'merethis_lic.zl') rename(_CENTREON_PATH_ . "www/modules/" . $filename . "/license/merethis_lic_temp.zl", _CENTREON_PATH_ . "www/modules/" . $filename . "/license/merethis_lic.zl"); clearstatcache(true, _CENTREON_PATH_ . "www/modules/" . $filename . "/license/merethis_lic.zl"); if (zend_loader_install_license(_CENTREON_PATH_ . "www/modules/" . $filename . "/license/merethis_lic.zl", true)) { - echo _("The license has been sucessfully installed"); + echo _("The license has been successfully installed"); } else { - echo _("An error occured"); + echo _("An error occurred"); } } else diff --git a/www/include/views/graphs/javascript/cropper/cropper.uncompressed.js b/www/include/views/graphs/javascript/cropper/cropper.uncompressed.js index 99619a7a8272887e41e9fd2f03afb0ff73f39809..35a15332c108a2f2fbfa56ebd48ea671d85401ac 100755 --- a/www/include/views/graphs/javascript/cropper/cropper.uncompressed.js +++ b/www/include/views/graphs/javascript/cropper/cropper.uncompressed.js @@ -347,7 +347,7 @@ Cropper.Img = Class.create({ this.ratioY = 0; /** * @var boolean - * Whether we've attached sucessfully + * Whether we've attached successfully */ this.attached = false; /**