aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2008-01-23 14:32:15 +0000
committerHenry Sudhof <kellanved@phpbb.com>2008-01-23 14:32:15 +0000
commit7fed5dd1666c2d54b87dd8e46dadcbb167e702a7 (patch)
treed582a484f8d9b65576426369a7e8effd3a9591ab /phpBB/language
parente6991260df29e519f1282d1f34fd7c4d300e122b (diff)
downloadforums-7fed5dd1666c2d54b87dd8e46dadcbb167e702a7.tar
forums-7fed5dd1666c2d54b87dd8e46dadcbb167e702a7.tar.gz
forums-7fed5dd1666c2d54b87dd8e46dadcbb167e702a7.tar.bz2
forums-7fed5dd1666c2d54b87dd8e46dadcbb167e702a7.tar.xz
forums-7fed5dd1666c2d54b87dd8e46dadcbb167e702a7.zip
cross-checkin for the TRUNK
git-svn-id: file:///svn/phpbb/trunk@8333 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/posting.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 2f390dfebd..961ca2612c 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -162,6 +162,8 @@ $lang = array_merge($lang, array(
'SMILIES_CONFIG' => 'Smiley configuration',
'SMILIES_DELETED' => 'The smiley has been removed successfully.',
'SMILIES_EDIT' => 'Edit smiley',
+ 'SMILIE_NO_CODE' => 'The smilie ā€œ%sā€ was ignored, as there was no code entered.',
+ 'SMILIE_NO_EMOTION' => 'The smilie ā€œ%sā€ was ignored, as there was no emotion entered.',
'SMILIES_NONE_EDITED' => 'No smilies were updated.',
'SMILIES_ONE_EDITED' => 'The smiley has been updated successfully.',
'SMILIES_EDITED' => 'The smilies have been updated successfully.',