From d17a8ab523f5cc77352170c679767c5523f57ec9 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 29 Feb 2016 08:28:37 -0800 Subject: [ticket/12684] Fix merge errors PHPBB3-12684 --- phpBB/language/en/cli.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'phpBB/language/en/cli.php') diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index 1c549e5f9f..9a082b0c57 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -82,6 +82,11 @@ $lang = array_merge($lang, array( 'CLI_DESCRIPTION_THUMBNAIL_GENERATE' => 'Generate all missing thumbnails.', 'CLI_DESCRIPTION_THUMBNAIL_RECREATE' => 'Recreate all thumbnails.', + 'CLI_DESCRIPTION_USER_ADD' => 'Add a new user', + 'CLI_DESCRIPTION_USER_ADD_OPTION_USERNAME' => 'Username of the new user', + 'CLI_DESCRIPTION_USER_ADD_OPTION_PASSWORD' => 'Password of the new user', + 'CLI_DESCRIPTION_USER_ADD_OPTION_EMAIL' => 'E-mail address of the new user', + 'CLI_EXTENSION_DISABLE_FAILURE' => 'Could not disable extension %s', 'CLI_EXTENSION_DISABLE_SUCCESS' => 'Successfully disabled extension %s', 'CLI_EXTENSION_ENABLE_FAILURE' => 'Could not enable extension %s', -- cgit v1.2.1