diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-04-10 19:52:04 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-04-10 19:52:04 -0400 |
| commit | 5f05899588882bfa63c29d5548b2be1aa71e5b3a (patch) | |
| tree | c4f606138ec39ab5af550d8b7a7589326ba9830f | |
| parent | d3b5df2548446c76e94e41837abc8b5a8d034b42 (diff) | |
| parent | 5798c8f02e7ac7dd73dbbd7953467926b369023e (diff) | |
| download | forums-5f05899588882bfa63c29d5548b2be1aa71e5b3a.tar forums-5f05899588882bfa63c29d5548b2be1aa71e5b3a.tar.gz forums-5f05899588882bfa63c29d5548b2be1aa71e5b3a.tar.bz2 forums-5f05899588882bfa63c29d5548b2be1aa71e5b3a.tar.xz forums-5f05899588882bfa63c29d5548b2be1aa71e5b3a.zip | |
Merge branch 'ticket/bantu/10123' into develop-olympus
* ticket/bantu/10123:
[ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.
| -rw-r--r-- | phpBB/language/en/acp/posting.php | 6 |
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.', |