mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-07 01:06:48 +02:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [Ticket/10675] Correct language string ATTACH_DISK_FULL [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus [ticket/10675] Add disk full language string when posting attachments
This commit is contained in:
@@ -41,6 +41,7 @@ $lang = array_merge($lang, array(
|
||||
'ADD_POLL' => 'Poll creation',
|
||||
'ADD_POLL_EXPLAIN' => 'If you do not want to add a poll to your topic leave the fields blank.',
|
||||
'ALREADY_DELETED' => 'Sorry but this message is already deleted.',
|
||||
'ATTACH_DISK_FULL' => 'There is not enough free disk space to post this attachment.',
|
||||
'ATTACH_QUOTA_REACHED' => 'Sorry, the board attachment quota has been reached.',
|
||||
'ATTACH_SIG' => 'Attach a signature (signatures can be altered via the UCP)',
|
||||
|
||||
|
Reference in New Issue
Block a user