diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-06-10 00:26:41 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-06-10 00:26:41 +0200 |
| commit | 735cae076a2b2814e40dda08b5f4dacf0b408345 (patch) | |
| tree | 1011a958cfcfe84725d2a2a2f0e4894af24d8f0e /phpBB/language | |
| parent | da41c754be14147de439fa0cc76bc682a84f7353 (diff) | |
| parent | 5b701dc3ed83345c70eabc1d88a721a7df8e43e5 (diff) | |
| download | forums-735cae076a2b2814e40dda08b5f4dacf0b408345.tar forums-735cae076a2b2814e40dda08b5f4dacf0b408345.tar.gz forums-735cae076a2b2814e40dda08b5f4dacf0b408345.tar.bz2 forums-735cae076a2b2814e40dda08b5f4dacf0b408345.tar.xz forums-735cae076a2b2814e40dda08b5f4dacf0b408345.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/6712] Properly explain result of setting the bump interval to 0.
[ticket/6712] Add phpbb_ function name prefix, more docs, rename current_time
[ticket/6712] Pass $post_data by the value instead of by the reference.
[ticket/6712] Bump does not create new topic icon on index.
Conflicts:
phpBB/includes/functions_posting.php
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 9299d96823..5306936812 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -151,7 +151,7 @@ $lang = array_merge($lang, array( 'ALLOW_POST_FLASH_EXPLAIN' => 'If disallowed the <code>[FLASH]</code> BBCode tag is disabled in posts. Otherwise the permission system controls which users can use the <code>[FLASH]</code> BBCode tag.', '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. Setting the value to 0 disables this feature.', + 'BUMP_INTERVAL_EXPLAIN' => 'Number of minutes, hours or days between the last post to a topic and the ability to bump that topic. Setting the value to 0 disables bumping entirely.', 'CHAR_LIMIT' => 'Maximum characters per post/message', 'CHAR_LIMIT_EXPLAIN' => 'The number of characters allowed within a post/private message. Set to 0 for unlimited characters.', 'DELETE_TIME' => 'Limit deleting time', |