diff options
| author | Florian Pritz <bluewind@xinu.at> | 2023-01-29 13:58:21 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2023-01-29 13:58:21 +0100 |
| commit | c88be04f0ec35304be812d7f5379c4362008b730 (patch) | |
| tree | 0d161faf7b5d03396fcab28e1ecb8e8764f32cb2 /system/language/english | |
| parent | 457e351cbc1335de951f4ac79bb91a9f3ea9ab38 (diff) | |
| parent | a6faab2ebf082eefff9c2422fce016e49da548bf (diff) | |
Merge remote-tracking branch 'upstream/develop' into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'system/language/english')
| -rw-r--r-- | system/language/english/form_validation_lang.php | 1 | ||||
| -rw-r--r-- | system/language/english/imglib_lang.php | 1 | ||||
| -rw-r--r-- | system/language/english/index.html | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php index a2e300efa..fdfb3cfa6 100644 --- a/system/language/english/form_validation_lang.php +++ b/system/language/english/form_validation_lang.php @@ -44,6 +44,7 @@ $lang['form_validation_valid_email'] = 'The {field} field must contain a valid $lang['form_validation_valid_emails'] = 'The {field} field must contain all valid email addresses.'; $lang['form_validation_valid_url'] = 'The {field} field must contain a valid URL.'; $lang['form_validation_valid_ip'] = 'The {field} field must contain a valid IP.'; +$lang['form_validation_valid_mac'] = 'The {field} field must contain a valid MAC.'; $lang['form_validation_valid_base64'] = 'The {field} field must contain a valid Base64 string.'; $lang['form_validation_min_length'] = 'The {field} field must be at least {param} characters in length.'; $lang['form_validation_max_length'] = 'The {field} field cannot exceed {param} characters in length.'; diff --git a/system/language/english/imglib_lang.php b/system/language/english/imglib_lang.php index 01ac9d345..b0a80a5d0 100644 --- a/system/language/english/imglib_lang.php +++ b/system/language/english/imglib_lang.php @@ -45,6 +45,7 @@ $lang['imglib_unsupported_imagecreate'] = 'Your server does not support the GD f $lang['imglib_gif_not_supported'] = 'GIF images are often not supported due to licensing restrictions. You may have to use JPG or PNG images instead.'; $lang['imglib_jpg_not_supported'] = 'JPG images are not supported.'; $lang['imglib_png_not_supported'] = 'PNG images are not supported.'; +$lang['imglib_webp_not_supported'] = 'WEBP images are not supported.'; $lang['imglib_jpg_or_png_required'] = 'The image resize protocol specified in your preferences only works with JPEG or PNG image types.'; $lang['imglib_copy_error'] = 'An error was encountered while attempting to replace the file. Please make sure your file directory is writable.'; $lang['imglib_rotate_unsupported'] = 'Image rotation does not appear to be supported by your server.'; diff --git a/system/language/english/index.html b/system/language/english/index.html index b702fbc39..bcb7cae34 100644 --- a/system/language/english/index.html +++ b/system/language/english/index.html @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html> +<html lang="en"> <head> <title>403 Forbidden</title> </head> |