mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
Merge branch '3.2.x'
* 3.2.x: [ticket/15137] Missed one language string change [ticket/15137] Global announcements can stick for a non-zero number of days
This commit is contained in:
@@ -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.',
|
||||
|
Reference in New Issue
Block a user