diff options
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 19 | ||||
| -rw-r--r-- | phpBB/language/en/acp/forums.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/cli.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 3 |
4 files changed, 15 insertions, 10 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 63235c01d8..de5039f047 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -440,16 +440,19 @@ $lang = array_merge($lang, array( 'UPLOAD_DIR_SIZE' => 'Size of posted attachments', 'USERS_PER_DAY' => 'Users per day', - 'VALUE' => 'Value', - 'VERSIONCHECK_FAIL' => 'Failed to obtain latest version information.', - 'VERSIONCHECK_FORCE_UPDATE' => 'Re-Check version', - 'VERSION_CHECK' => 'Version check', - 'VERSION_CHECK_EXPLAIN' => 'Checks to see if your phpBB installation is up to date.', + 'VALUE' => 'Value', + 'VERSIONCHECK_FAIL' => 'Failed to obtain latest version information.', + 'VERSIONCHECK_FORCE_UPDATE' => 'Re-Check version', + 'VERSION_CHECK' => 'Version check', + 'VERSION_CHECK_EXPLAIN' => 'Checks to see if your phpBB installation is up to date.', + 'VERSIONCHECK_INVALID_ENTRY' => 'Latest version information contains an unsupported entry.', + 'VERSIONCHECK_INVALID_URL' => 'Latest version information contains invalid URL.', + 'VERSIONCHECK_INVALID_VERSION' => 'Latest version information contains an invalid version.', 'VERSION_NOT_UP_TO_DATE_ACP' => 'Your phpBB installation is not up to date.<br />Below is a link to the release announcement, which contains more information as well as instructions on updating.', 'VERSION_NOT_UP_TO_DATE_TITLE' => 'Your phpBB installation is not up to date.', - 'VERSION_UP_TO_DATE_ACP' => 'Your phpBB installation is up to date. There are no updates available at this time.', - 'VIEW_ADMIN_LOG' => 'View administrator log', - 'VIEW_INACTIVE_USERS' => 'View inactive users', + 'VERSION_UP_TO_DATE_ACP' => 'Your phpBB installation is up to date. There are no updates available at this time.', + 'VIEW_ADMIN_LOG' => 'View administrator log', + 'VIEW_INACTIVE_USERS' => 'View inactive users', 'WELCOME_PHPBB' => 'Welcome to phpBB', 'WRITABLE_CONFIG' => 'Your config file (config.php) is currently world-writable. We strongly encourage you to change the permissions to 640 or at least to 644 (for example: <a href="http://en.wikipedia.org/wiki/Chmod" rel="external">chmod</a> 640 config.php).', diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index 541d05c255..7a7176369f 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -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.', diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index 124d9cb6ef..1655855edb 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -123,6 +123,7 @@ $lang = array_merge($lang, array( 'CLI_EXTENSION_UPDATE_FAILURE' => 'Could not update extension %s', 'CLI_EXTENSION_UPDATE_SUCCESS' => 'Successfully updated extension %s', 'CLI_EXTENSION_NOT_FOUND' => 'No extensions were found.', + 'CLI_EXTENSION_NOT_ENABLEABLE' => 'Extension %s is not enableable.', 'CLI_EXTENSIONS_AVAILABLE' => 'Available', 'CLI_EXTENSIONS_DISABLED' => 'Disabled', 'CLI_EXTENSIONS_ENABLED' => 'Enabled', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 709b7d9731..d7a1ce8e71 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -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, @@ -556,6 +556,7 @@ $lang = array_merge($lang, array( ), 'OPTIONS' => 'Options', + 'PAGE_NOT_FOUND' => 'The requested page could not be found.', 'PAGE_OF' => 'Page <strong>%1$d</strong> of <strong>%2$d</strong>', 'PAGE_TITLE_NUMBER' => 'Page %s', 'PASSWORD' => 'Password', |