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 
* 3.2.x:
  [ticket/15097] New 'Installed software' lead section
  [ticket/15097] Resolve travis-ci error
  [ticket/15097] Resolve travis-ci error
  [ticket/15097] Add PHP version to Board statistics
  [ticket/15097] Add PHP version to Board statistics
This commit is contained in:
Tristan Darricau
2017-04-18 23:15:10 +02:00
parent 19cbb8fa9d 4cbf619fd5
commit 451a7ce43c
3 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,7 +367,7 @@ $lang = array_merge($lang, array(
'AVATAR_DIR_SIZE' => 'Avatar directory size',
'BOARD_STARTED' => 'Board started',
'BOARD_VERSION' => 'Board version',
'BOARD_VERSION' => 'phpBB',
'DATABASE_SERVER_INFO' => 'Database server',
'DATABASE_SIZE' => 'Database size',
@@ -395,6 +395,7 @@ $lang = array_merge($lang, array(
'NUMBER_USERS' => 'Number of users',
'NUMBER_ORPHAN' => 'Orphan attachments',
'PHP_VERSION' => 'PHP',
'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',
@@ -429,6 +430,10 @@ $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',