diff options
| -rw-r--r-- | phpBB/includes/functions_template.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/forums.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php index 540aa329c1..bf70f174d3 100644 --- a/phpBB/includes/functions_template.php +++ b/phpBB/includes/functions_template.php @@ -23,6 +23,8 @@ if (!defined('IN_PHPBB')) * psoTFX - Completion of file caching, decompilation routines and implementation of * conditionals/keywords and associated changes * +* phpBB Development Team - further additions and fixes +* * The interface was inspired by PHPLib templates, and the template file (formats are * quite similar) * @@ -36,6 +38,8 @@ if (!defined('IN_PHPBB')) */ class template_compile { + var $template; + /** * constuctor */ diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index 367c693cec..b339ac5fdc 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -71,7 +71,7 @@ $lang = array_merge($lang, array( 'FORUM_IMAGE' => 'Forum Image', 'FORUM_IMAGE_EXPLAIN' => 'Location, relative to the phpBB root directory, of an image to associate with this forum.', 'FORUM_LINK' => 'Forum Link', - 'FORUM_LINK_EXPLAIN' => 'Full URL to location clicking this forum will take the user.', + 'FORUM_LINK_EXPLAIN' => 'Full URL (including the protocol, for example http://) to location clicking this forum will take the user.', 'FORUM_LINK_TRACK' => 'Track Link Redirects', 'FORUM_LINK_TRACK_EXPLAIN' => 'Records the number of times a forum link was clicked.', 'FORUM_NAME' => 'Forum Name', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 1170e1b32d..55cd584bb1 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -430,7 +430,10 @@ $lang = array_merge($lang, array( 'THE_TEAM' => 'The team', 'TIME' => 'Time', + 'TOO_LONG_NEW_PASSWORD' => 'The password you entered is too long.', + 'TOO_LONG_PASSWORD_CONFIRM' => 'The password confirmation you entered is too long.', 'TOO_LONG_USER_PASSWORD' => 'The password you entered is too long.', + 'TOO_LONG_USERNAME' => 'The username you entered is too long.', 'TOO_MANY_VOTE_OPTIONS' => 'You have tried to vote for too many options.', 'TOO_SHORT_NEW_PASSWORD' => 'The password you entered is too short.', 'TOO_SHORT_PASSWORD_CONFIRM' => 'The password confirmation you entered is too short.', |