diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php index d5602beb..c20d0a41 100644 --- a/data/web/lang/lang.en.php +++ b/data/web/lang/lang.en.php @@ -125,7 +125,7 @@ $lang['user']['weeks'] = 'Weeks'; $lang['user']['spamfilter'] = 'Spam filter'; $lang['admin']['spamfilter'] = 'Spam filter'; $lang['user']['spamfilter_wl'] = 'Whitelist'; -$lang['user']['spamfilter_wl_desc'] = 'Whitelisted email addresses to never classify as spam. Wildcards may be used. A filter is only applied to direct aliases (aliases with a single target mailbox) exclulding catch-all aliases and a mailbox itself.'; +$lang['user']['spamfilter_wl_desc'] = 'Whitelisted email addresses to never classify as spam. Wildcards may be used. A filter is only applied to direct aliases (aliases with a single target mailbox) excluding catch-all aliases and a mailbox itself.'; $lang['user']['spamfilter_bl'] = 'Blacklist'; $lang['user']['spamfilter_bl_desc'] = 'Blacklisted email addresses to always classify as spam and reject. Wildcards may be used. A filter is only applied to direct aliases (aliases with a single target mailbox) excluding catch-all aliases and a mailbox itself.'; $lang['user']['spamfilter_behavior'] = 'Rating'; diff --git a/update.sh b/update.sh index e83a473f..88903ad0 100755 --- a/update.sh +++ b/update.sh @@ -28,6 +28,7 @@ while (($#)); do MERGE_STRATEGY=ours ;; esac + shift done [[ ! -f mailcow.conf ]] && { echo "mailcow.conf is missing"; exit 1;}