diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-06-06 21:59:30 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-06-06 21:59:30 +0200 |
| commit | bc59342e1a2302f75894ab4fd45a8fac990219ea (patch) | |
| tree | 0ceebdb3c4b96ae3625491c2486e1f904f1a53fb /phpBB/language/en | |
| parent | 9e90b27ba19fc2972b368c78e89bbc3bcaa3f9fd (diff) | |
| parent | 4f44145301590e462f9c98dc3ed6859b17eddfd4 (diff) | |
| download | forums-bc59342e1a2302f75894ab4fd45a8fac990219ea.tar forums-bc59342e1a2302f75894ab4fd45a8fac990219ea.tar.gz forums-bc59342e1a2302f75894ab4fd45a8fac990219ea.tar.bz2 forums-bc59342e1a2302f75894ab4fd45a8fac990219ea.tar.xz forums-bc59342e1a2302f75894ab4fd45a8fac990219ea.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index b92710b178..96897af6fd 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -44,7 +44,7 @@ $lang = array_merge($lang, array( 'BOARD_STYLE' => 'Board style', 'CUSTOM_DATEFORMAT' => 'Custom…', 'DEFAULT_DATE_FORMAT' => 'Date format', - 'DEFAULT_DATE_FORMAT_EXPLAIN' => 'The date format is the same as the PHP <code>date</code> function.', + 'DEFAULT_DATE_FORMAT_EXPLAIN' => 'The date format is the same as the PHP <code><a href="https://secure.php.net/manual/function.date.php">date()</a></code> function.', 'DEFAULT_LANGUAGE' => 'Default language', 'DEFAULT_STYLE' => 'Default style', 'DEFAULT_STYLE_EXPLAIN' => 'The default style for new users.', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index b82759ae0e..66fb554f78 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -116,7 +116,7 @@ $lang = array_merge($lang, array( 'BIRTHDAY' => 'Birthday', 'BIRTHDAY_EXPLAIN' => 'Setting a year will list your age when it is your birthday.', 'BOARD_DATE_FORMAT' => 'My date format', - 'BOARD_DATE_FORMAT_EXPLAIN' => 'The syntax used is identical to the PHP <a href="http://www.php.net/date">date()</a> function.', + 'BOARD_DATE_FORMAT_EXPLAIN' => 'The syntax used is identical to the PHP <a href="https://secure.php.net/manual/function.date.php">date()</a> function.', 'BOARD_LANGUAGE' => 'My language', 'BOARD_STYLE' => 'My board style', 'BOARD_TIMEZONE' => 'My timezone', |