aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-04-08 12:30:43 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-04-08 12:31:56 +0200
commit5798c8f02e7ac7dd73dbbd7953467926b369023e (patch)
tree2171743e7a338c5a32bcd8000b54860ac88aead2 /phpBB/language/en
parentc910ce1cc6763bd31e7be6548f86b5c571c725c5 (diff)
downloadforums-5798c8f02e7ac7dd73dbbd7953467926b369023e.tar
forums-5798c8f02e7ac7dd73dbbd7953467926b369023e.tar.gz
forums-5798c8f02e7ac7dd73dbbd7953467926b369023e.tar.bz2
forums-5798c8f02e7ac7dd73dbbd7953467926b369023e.tar.xz
forums-5798c8f02e7ac7dd73dbbd7953467926b369023e.zip
[ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.
PHPBB3-10123
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/acp/posting.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 0fad400ea9..9719287c2a 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -168,9 +168,9 @@ $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.',
- 'SMILIE_NO_FILE' => 'The smilie “%s” was ignored, as the file is missing.',
+ 'SMILIE_NO_CODE' => 'The smiley “%s” was ignored, as there was no code entered.',
+ 'SMILIE_NO_EMOTION' => 'The smiley “%s” was ignored, as there was no emotion entered.',
+ 'SMILIE_NO_FILE' => 'The smiley “%s” was ignored, as the file is missing.',
'SMILIES_NONE_EDITED' => 'No smilies were updated.',
'SMILIES_ONE_EDITED' => 'The smiley has been updated successfully.',
'SMILIES_EDITED' => 'The smilies have been updated successfully.',