mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Oliver Schramm
2017-09-08 13:53:38 +02:00
parent 9b2c45d892 65692e8785
commit aa15e61e4c
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/language/en/acp/forums.php
View File

@@ -87,7 +87,7 @@ $lang = array_merge($lang, array(
'FORUM_DELETE_EXPLAIN' => 'The form below will allow you to delete a forum. If the forum is postable you are able to decide where you want to put all topics (or forums) it contained.',
'FORUM_DELETED' => 'Forum successfully deleted.',
'FORUM_DESC' => 'Description',
'FORUM_DESC_EXPLAIN' => 'Any HTML markup entered here will be displayed as is.',
'FORUM_DESC_EXPLAIN' => 'Any HTML markup entered here will be displayed as is. If the selected forum type is a category the description is not used.',
'FORUM_EDIT_EXPLAIN' => 'The form below will allow you to customise this forum. Please note that moderation and post count controls are set via forum permissions for each user or usergroup.',
'FORUM_IMAGE' => 'Forum image',
'FORUM_IMAGE_EXPLAIN' => 'Location, relative to the phpBB root directory, of an additional image to associate with this forum.',

2
phpBB/language/en/common.php
View File

@@ -48,7 +48,7 @@ $lang = array_merge($lang, array(
'USER_LANG' => 'en-gb',
// You can define different rules for the determination of plural forms here.
// See http://wiki.phpbb.com/Plural_Rules for more information
// See https://area51.phpbb.com/docs/dev/32x/language/plurals.html for more information
// or ask the translation manager for help.
'PLURAL_RULE' => 1,