mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2017-04-26 19:08:30 -04:00
parent 2cf47ffaa1 a116762974
commit 47231fe435
2 changed files with 22 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/language/en/acp/common.php
View File

@@ -383,7 +383,7 @@ $lang = array_merge($lang, array(
'AVATAR_DIR_SIZE' => 'Avatar directory size',
'BOARD_STARTED' => 'Board started',
'BOARD_VERSION' => 'phpBB',
'BOARD_VERSION' => 'Board version',
'DATABASE_SERVER_INFO' => 'Database server',
'DATABASE_SIZE' => 'Database size',
@@ -411,7 +411,7 @@ $lang = array_merge($lang, array(
'NUMBER_USERS' => 'Number of users',
'NUMBER_ORPHAN' => 'Orphan attachments',
'PHP_VERSION' => 'PHP',
'PHP_VERSION' => 'PHP version',
'PHP_VERSION_OLD' => 'The version of PHP on this server (%1$s) will no longer be supported by future versions of phpBB. The minimum required version will be PHP %2$s. %3$sDetails%4$s',
'POSTS_PER_DAY' => 'Posts per day',
@@ -446,10 +446,6 @@ $lang = array_merge($lang, array(
'RESYNC_STATS_SUCCESS' => 'Resynchronised statistics',
'RUN' => 'Run now',
'SOFTWARE_HEADING' => 'Installed software',
'SOFTWARE_PRODUCT' => 'Product',
'SOFTWARE_VERSION' => 'Version',
'STATISTIC' => 'Statistic',
'STATISTIC_RESYNC_OPTIONS' => 'Resynchronise or reset statistics',