From 06988dd205a2e2b3dddbe590db9d877f405eaa7e Mon Sep 17 00:00:00 2001 From: Michael <Chefkeks@users.noreply.github.com> Date: Tue, 17 May 2016 16:13:34 +0200 Subject: [PATCH] Update settings-emails.inc.php and filter.inc.php Corrected "over-W-ridden" and removed the unnecessary "w" from the word "overridden" --- include/staff/filter.inc.php | 2 +- include/staff/settings-emails.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/staff/filter.inc.php b/include/staff/filter.inc.php index b216779ac..4175f2b3b 100644 --- a/include/staff/filter.inc.php +++ b/include/staff/filter.inc.php @@ -227,7 +227,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info); <th colspan="2"> <em><strong><?php echo __('Filter Actions');?></strong>: <div><?php - echo __('Can be overwridden by other filters depending on processing order.'); + echo __('Can be overridden by other filters depending on processing order.'); ?><br/><?php echo __('Actions are executed in the order declared below'); ?></div></em> diff --git a/include/staff/settings-emails.inc.php b/include/staff/settings-emails.inc.php index d84fdd63b..eddfb56a3 100644 --- a/include/staff/settings-emails.inc.php +++ b/include/staff/settings-emails.inc.php @@ -9,7 +9,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config) <thead> <tr> <th colspan="2"> - <em><?php echo __('Note that some of the global settings can be overwridden at department/email level.');?></em> + <em><?php echo __('Note that some of the global settings can be overridden at department/email level.');?></em> </th> </tr> </thead> -- GitLab