diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-12-03 14:42:27 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-12-03 14:42:27 +0100 |
| commit | 3acee9a3eea8e3fdcef59876da273358a46903e8 (patch) | |
| tree | 3ed42316c51a61a1f40fb4a2c2f5952efc64c11d /phpBB/language/en | |
| parent | 487df8befc9477c742b2794593c2ddb290c1c678 (diff) | |
| parent | 5895f56de05b637765a6583b8c51c1db3daabe91 (diff) | |
| download | forums-3acee9a3eea8e3fdcef59876da273358a46903e8.tar forums-3acee9a3eea8e3fdcef59876da273358a46903e8.tar.gz forums-3acee9a3eea8e3fdcef59876da273358a46903e8.tar.bz2 forums-3acee9a3eea8e3fdcef59876da273358a46903e8.tar.xz forums-3acee9a3eea8e3fdcef59876da273358a46903e8.zip | |
Merge pull request #4189 from marc1706/ticket/14492
[ticket/14492] Improve send stats page and include VigLink
* marc1706/ticket/14492: (47 commits)
[ticket/14492] Add user service to installer & only instantiate if needed
[ticket/14492] Fix redirection to help phpBB page
[ticket/14492] Encode URI components in systemdata for stats
[ticket/14492] Always update the time the stats were sent
[ticket/14492] Update versions in files
[ticket/14492] Add missing event variable
[ticket/14492] Don't explicitly pass data providers by refs
[ticket/14492] Update phpBB version and fix miscellaneous code issues
[ticket/14492] Install all extensions if 'all' is specified for extensions
[ticket/14492] Checkout master if viglink tag does not exist for latest version
[ticket/14492] Add language variables for updating extensions
[ticket/14492] Prevent timeouts in install & update extensions tasks
[ticket/14492] Use same list for checking if extension should be updated
[ticket/14492] Add missing config to schema_data.sql
[ticket/14492] Unify version check for installing default extensions
[ticket/14492] Use extension manager instead of finder and add try/catch
[ticket/14492] Checkout viglink for each version depending on tags
[ticket/14492] Remove unused use statement
[ticket/14492] Redirect to help phpBB page after installation
[ticket/14492] Properly retrieve version updating from
...
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 10 | ||||
| -rw-r--r-- | phpBB/language/en/cli.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/install.php | 3 |
3 files changed, 12 insertions, 3 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index f30d1e7198..053671e1a2 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -108,6 +108,8 @@ $lang = array_merge($lang, array( 'ACP_GROUPS_PERMISSIONS' => 'Group permissions', 'ACP_GROUPS_POSITION' => 'Manage group positions', + 'ACP_HELP_PHPBB' => 'Help support phpBB', + 'ACP_ICONS' => 'Topic icons', 'ACP_ICONS_SMILIES' => 'Topic icons/smilies', 'ACP_INACTIVE_USERS' => 'Inactive users', @@ -167,7 +169,6 @@ $lang = array_merge($lang, array( 'ACP_SEARCH_SETTINGS' => 'Search settings', 'ACP_SECURITY_SETTINGS' => 'Security settings', - 'ACP_SEND_STATISTICS' => 'Send statistical information', 'ACP_SERVER_CONFIGURATION' => 'Server configuration', 'ACP_SERVER_SETTINGS' => 'Server settings', 'ACP_SIGNATURE_SETTINGS' => 'Signature settings', @@ -474,16 +475,18 @@ $lang = array_merge($lang, array( 'USER_IS_INACTIVE' => 'User is inactive', )); -// Send statistics page +// Help support phpBB page $lang = array_merge($lang, array( 'EXPLAIN_SEND_STATISTICS' => 'Please send information about your server and board configurations to phpBB for statistical analysis. All information that could identify you or your website has been removed - the data is entirely <strong>anonymous</strong>. We base decisions about future phpBB versions on this information. The statistics are made available publically. We also share this data with the PHP project, the programming language phpBB is made with.', 'EXPLAIN_SHOW_STATISTICS' => 'Using the button below you can preview all variables that will be transmitted.', 'DONT_SEND_STATISTICS' => 'Return to the ACP if you do not wish to send statistical information to phpBB.', 'GO_ACP_MAIN' => 'Go to the ACP start page', 'HIDE_STATISTICS' => 'Hide details', - 'SEND_STATISTICS' => 'Send statistical information', + 'SEND_STATISTICS' => 'Send statistics', + 'SEND_STATISTICS_LONG' => 'Send statistical information', 'SHOW_STATISTICS' => 'Show details', 'THANKS_SEND_STATISTICS' => 'Thank you for submitting your information.', + 'FAIL_SEND_STATISTICS' => 'phpBB was unable to send statistics', )); // Log Entries @@ -816,4 +819,5 @@ $lang = array_merge($lang, array( 'LOG_EXT_ENABLE' => '<strong>Extension enabled</strong><br />» %s', 'LOG_EXT_DISABLE' => '<strong>Extension disabled</strong><br />» %s', 'LOG_EXT_PURGE' => '<strong>Extension’s data deleted</strong><br />» %s', + 'LOG_EXT_UPDATE' => '<strong>Extension updated</strong><br />» %s', )); diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index db4b5f9ec6..09f46a5cee 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -104,6 +104,8 @@ $lang = array_merge($lang, array( 'CLI_EXTENSION_NAME' => 'Name of the extension', 'CLI_EXTENSION_PURGE_FAILURE' => 'Could not purge extension %s', 'CLI_EXTENSION_PURGE_SUCCESS' => 'Successfully purged extension %s', + '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_EXTENSIONS_AVAILABLE' => 'Available', 'CLI_EXTENSIONS_DISABLED' => 'Disabled', diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 35cea17a24..45ed51f641 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -301,6 +301,7 @@ $lang = array_merge($lang, array( 'TASK_ADD_MODULES' => 'Installing modules', // Install finish tasks + 'TASK_INSTALL_EXTENSIONS' => 'Installing packaged extensions', 'TASK_NOTIFY_USER' => 'Sending notification e-mail', 'TASK_POPULATE_MIGRATIONS' => 'Populating migrations', @@ -457,6 +458,8 @@ $lang = array_merge($lang, array( 'STAGE_UPDATE_DATABASE' => 'Update database', 'INLINE_UPDATE_SUCCESSFUL' => 'The database update was successful.', + + 'TASK_UPDATE_EXTENSIONS' => 'Updating extensions', )); // Converter |