diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-06-06 14:00:52 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-06-06 14:00:52 +0000 |
| commit | ed17471e0c658f381e342a484cc1bb00a03b7a2a (patch) | |
| tree | ab26d2a78d6970cc68d105d4ef7f853cba77d526 /phpBB/language | |
| parent | d268559876288ce432dfce1c637c1b81e6d5bd7d (diff) | |
| download | forums-ed17471e0c658f381e342a484cc1bb00a03b7a2a.tar forums-ed17471e0c658f381e342a484cc1bb00a03b7a2a.tar.gz forums-ed17471e0c658f381e342a484cc1bb00a03b7a2a.tar.bz2 forums-ed17471e0c658f381e342a484cc1bb00a03b7a2a.tar.xz forums-ed17471e0c658f381e342a484cc1bb00a03b7a2a.zip | |
Changing the stance we take towards flash. (DelvarWorld, NeoThermic)
fixing a few smaller bugs.
#12007
#12003
git-svn-id: file:///svn/phpbb/trunk@7715 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/mcp.php | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index d5c72e0e9c..d44106e622 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -126,6 +126,8 @@ $lang = array_merge($lang, array( 'ACP_POST_SETTINGS_EXPLAIN' => 'Here you can set all default settings for posting.', 'ALLOW_POST_LINKS' => 'Allow links in posts/private messages', 'ALLOW_POST_LINKS_EXPLAIN' => 'If disallowed the <code>[URL]</code> BBCode tag and automatic/magic URLs are disabled.', + 'ALLOW_POST_FLASH' => 'Allow use of <code>[FLASH]</code> BBCode tag', + 'ALLOW_POST_FLASH_EXPLAIN' => 'If disallowed the <code>[FLASH]</code> BBCode tag is disabled in posts.', 'BUMP_INTERVAL' => 'Bump interval', 'BUMP_INTERVAL_EXPLAIN' => 'Number of minutes, hours or days between the last post to a topic and the ability to bump this topic.', diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 854dc198af..47a3442187 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -647,7 +647,7 @@ $lang = array_merge($lang, array( 'LOG_USER_DEL_AVATAR_USER' => '<strong>User avatar removed</strong>', 'LOG_USER_DEL_SIG_USER' => '<strong>User signature removed</strong>', 'LOG_USER_FEEDBACK' => '<strong>Added user feedback</strong><br />» %s', - 'LOG_USER_GENERAL' => '%s', + 'LOG_USER_GENERAL' => '<strong>Entry added:</strong><br />%s', 'LOG_USER_INACTIVE_USER' => '<strong>User account de-activated</strong>', 'LOG_USER_LOCK' => '<strong>User locked own topic</strong><br />» %s', 'LOG_USER_MOVE_POSTS_USER' => '<strong>Moved all posts to forum</strong>» %s', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index 26f0c54e2d..5b4e239952 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -346,7 +346,7 @@ $lang = array_merge($lang, array( 'WARNED_USERS_EXPLAIN' => 'This is a list of users with unexpired warnings issued to them.', 'WARNING_PM_BODY' => 'The following is a warning which has been issued to you by an administrator or moderator of this site.[quote]%s[/quote]', 'WARNING_PM_SUBJECT' => 'Board warning issued', - 'WARNING_POST_DEFAULT' => 'This is a warning regarding the following post made by you: %s.', + 'WARNING_POST_DEFAULT' => 'This is a warning regarding the following post made by you: %s .', 'WARNINGS_ZERO_TOTAL' => 'No warnings exist.', 'YOU_SELECTED_TOPIC' => 'You selected topic number %d: %s.', |