aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2007-08-17 23:53:06 +0000
committerNils Adermann <naderman@naderman.de>2007-08-17 23:53:06 +0000
commitd25ca29ca032d73ab1824179c86e6a08ddaba1f4 (patch)
tree780b1a898a92f4430ead61cce5fbe23d3cb84f75 /phpBB/language
parent8257d1c82809165608b33268a561b53fd78675a4 (diff)
downloadforums-d25ca29ca032d73ab1824179c86e6a08ddaba1f4.tar
forums-d25ca29ca032d73ab1824179c86e6a08ddaba1f4.tar.gz
forums-d25ca29ca032d73ab1824179c86e6a08ddaba1f4.tar.bz2
forums-d25ca29ca032d73ab1824179c86e6a08ddaba1f4.tar.xz
forums-d25ca29ca032d73ab1824179c86e6a08ddaba1f4.zip
- strip_bbcode should not treat smilies which look like BBCode and are placed in front of a closing tag as BBCode
- highlight in post subjects and topic titles - language entry SMILIE_ONE_ADDED should have been SMILIES_ONE_ADDED git-svn-id: file:///svn/phpbb/trunk@8045 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/posting.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 87301a3b49..ebbbf61c44 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -109,12 +109,12 @@ $lang = array_merge($lang, array(
'ICONS_ADD' => 'Add a new icon',
'ICON_NONE_ADDED' => 'No icons were added.',
- 'ICONS_ONE_ADDED' => 'The icon has been added successfully.',
+ 'ICONS_ONE_ADDED' => 'The icon has been added successfully.',
'ICONS_ADDED' => 'The icons have been added successfully.',
'ICONS_CONFIG' => 'Icon configuration',
'ICONS_DELETED' => 'The icon has been removed successfully.',
'ICONS_EDIT' => 'Edit icon',
- 'ICONS_ONE_EDITED' => 'The icon has been updated successfully.',
+ 'ICONS_ONE_EDITED' => 'The icon has been updated successfully.',
'ICON_NONE_EDITED' => 'No icons were updated.',
'ICONS_EDITED' => 'The icons have been updated successfully.',
'ICONS_HEIGHT' => 'Icon height',
@@ -148,8 +148,8 @@ $lang = array_merge($lang, array(
'SELECT_PACKAGE' => 'Select a package file',
'SMILIES_ADD' => 'Add a new smiley',
- 'SMILIES_NONE_ADDED' => 'No smilies were added.',
- 'SMILIE_ONE_ADDED' => 'The smiley has been added successfully.',
+ 'SMILIES_NONE_ADDED' => 'No smilies were added.',
+ 'SMILIES_ONE_ADDED' => 'The smiley has been added successfully.',
'SMILIES_ADDED' => 'The smilies have been added successfully.',
'SMILIES_CODE' => 'Smiley code',
'SMILIES_CONFIG' => 'Smiley configuration',