diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-03-21 16:29:10 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-03-21 16:29:10 +0100 |
| commit | c9aab0baefcfe2ff81aeaa32d926435f26dfaa57 (patch) | |
| tree | 4fc276fda2b1a747877a17b6ed214b30b3478ac0 /phpBB/language | |
| parent | bd34b2301edbe4d3dbe3c980c568cf96c05eab40 (diff) | |
| parent | d15b88af2acd45d19b983d75eaefdeba30d31e93 (diff) | |
| download | forums-c9aab0baefcfe2ff81aeaa32d926435f26dfaa57.tar forums-c9aab0baefcfe2ff81aeaa32d926435f26dfaa57.tar.gz forums-c9aab0baefcfe2ff81aeaa32d926435f26dfaa57.tar.bz2 forums-c9aab0baefcfe2ff81aeaa32d926435f26dfaa57.tar.xz forums-c9aab0baefcfe2ff81aeaa32d926435f26dfaa57.zip | |
Merge pull request #4752 from nomind60s/ticket/15137
[ticket/15137] Global Announcements shouldn't always be never ending
* github.com:phpbb/phpbb:
[ticket/15137] Missed one language string change
[ticket/15137] Global announcements can stick for a non-zero number of days
fixes #4752
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/posting.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 68b81a6eaf..7c415b3457 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -241,9 +241,9 @@ $lang = array_merge($lang, array( 'SMILIES' => 'Smilies', 'SMILIES_ARE_OFF' => 'Smilies are <em>OFF</em>', 'SMILIES_ARE_ON' => 'Smilies are <em>ON</em>', - 'STICKY_ANNOUNCE_TIME_LIMIT'=> 'Sticky/Announcement time limit', + 'STICKY_ANNOUNCE_TIME_LIMIT'=> 'Sticky/Announcement/Global time limit', 'STICK_TOPIC_FOR' => 'Stick topic for', - 'STICK_TOPIC_FOR_EXPLAIN' => 'Enter 0 for a never ending Sticky/Announcement. Please note that this number is relative to the date of the post.', + 'STICK_TOPIC_FOR_EXPLAIN' => 'Enter 0 for a never ending Sticky/Announcement/Global. Please note that this number is relative to the date of the post.', 'STYLES_TIP' => 'Tip: Styles can be applied quickly to selected text.', 'TOO_FEW_CHARS' => 'Your message contains too few characters.', |