aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-08-11 17:15:50 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-08-11 17:15:50 +0200
commit96335c0402e164768b5335767ec95c766dc033a3 (patch)
tree86b2279daaeb719b81ca04efeb87be652621c763 /phpBB/language
parentbf6f1cac8fa3adf0b090c1d082818f2aa5d81834 (diff)
parent0854c7226dac3e241fa7a9a8bb6a49e257bd8c5d (diff)
downloadforums-96335c0402e164768b5335767ec95c766dc033a3.tar
forums-96335c0402e164768b5335767ec95c766dc033a3.tar.gz
forums-96335c0402e164768b5335767ec95c766dc033a3.tar.bz2
forums-96335c0402e164768b5335767ec95c766dc033a3.tar.xz
forums-96335c0402e164768b5335767ec95c766dc033a3.zip
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/posting.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 9157f407dd..639b8d8370 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -43,6 +43,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_COMMENT_NO_EMOJIS' => 'The attachment comment contains forbidden characters (Emoji).',
'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)',