Merge branch 'master' into dropzone-timeout

[bookstack] / resources / lang / en / errors.php

diff --git a/resources/lang/en/errors.php b/resources/lang/en/errors.php
index eb73b880bf1fb36a88f2e24533fb271060f4b7ea..7a881e021a70ba94db76e380d7f71e8f4612c460 100644 (file)
--- a/resources/lang/en/errors.php
+++ b/resources/lang/en/errors.php
@@ -36,6 +36,7 @@ return [
     'uploaded'  => 'The server does not allow uploads of this size. Please try a smaller file size.',
     'image_upload_error' => 'An error occurred uploading the image',
     'image_upload_type_error' => 'The image type being uploaded is invalid',
+    'file_upload_timeout' => 'The file upload has timed out.',
 
     // Attachments
     'attachment_page_mismatch' => 'Page mismatch during attachment update',