makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ticket/bantu/10123' into develop-olympus

Browse source 
* ticket/bantu/10123:
  [ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.
This commit is contained in:
Oleg Pudeyev 2011-04-10 19:52:04 -04:00
commit 5f05899588
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/language/en/acp/posting.php
View file

@ -168,9 +168,9 @@ $lang = array_merge($lang, array(
'SMILIES_CONFIG' => 'Smiley configuration', 'SMILIES_CONFIG' => 'Smiley configuration',
'SMILIES_DELETED' => 'The smiley has been removed successfully.', 'SMILIES_DELETED' => 'The smiley has been removed successfully.',
'SMILIES_EDIT' => 'Edit smiley', 'SMILIES_EDIT' => 'Edit smiley',
'SMILIE_NO_CODE' => 'The smilie “%s” was ignored, as there was no code entered.', 'SMILIE_NO_CODE' => 'The smiley “%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_EMOTION' => 'The smiley “%s” was ignored, as there was no emotion entered.',
'SMILIE_NO_FILE' => 'The smilie “%s” was ignored, as the file is missing.', 'SMILIE_NO_FILE' => 'The smiley “%s” was ignored, as the file is missing.',
'SMILIES_NONE_EDITED' => 'No smilies were updated.', 'SMILIES_NONE_EDITED' => 'No smilies were updated.',
'SMILIES_ONE_EDITED' => 'The smiley has been updated successfully.', 'SMILIES_ONE_EDITED' => 'The smiley has been updated successfully.',
'SMILIES_EDITED' => 'The smilies have been updated successfully.', 'SMILIES_EDITED' => 'The smilies have been updated successfully.',