aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/adm/style/acp_ext_list.html19
-rw-r--r--phpBB/language/en/acp/extensions.php22
2 files changed, 27 insertions, 14 deletions
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index dad1838ed3..09cf6a31f5 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -6,8 +6,6 @@
<p>{L_EXTENSIONS_EXPLAIN}</p>
- <p>{L_EXTENSION_ACTIONS_EXPLAIN}</p>
-
<table class="table1">
<col class="row1" ><col class="row2" ><col class="row2" >
<thead>
@@ -57,5 +55,22 @@
<!-- ENDIF -->
</tbody>
</table>
+ <br />
+
+ <table class="table1">
+ <tr>
+ <th>{L_EXTENSION_UPDATE_HEADLINE}</th>
+ </tr>
+ <tr>
+ <td class="row3">{L_EXTENSION_UPDATE_EXPLAIN}</td>
+ </tr>
+ <tr>
+ <th>{L_EXTENSION_REMOVE_HEADLINE}</th>
+ </tr>
+ <tr>
+ <td class="row3">{L_EXTENSION_REMOVE_EXPLAIN}</td>
+ </tr>
+ </tbody>
+ </table>
<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index cbdc97b547..c024c92e61 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -66,22 +66,20 @@ $lang = array_merge($lang, array(
'EXTENSION_NAME' => 'Extension Name',
'EXTENSION_ACTIONS' => 'Actions',
- 'EXTENSION_ACTIONS_EXPLAIN' => 'In order to completly remove an extension from your board, you need to perform the following 3 steps:</p>
- <ol>
+ 'EXTENSION_OPTIONS' => 'Options',
+ 'EXTENSION_UPDATE_HEADLINE' => 'Updating an extension',
+ 'EXTENSION_UPDATE_EXPLAIN' => '<ol>
<li>Disable the extension</li>
- <li>Delete the extension’s data</li>
<li>Delete the extension’s files from the filesystem</li>
- </ol><br />
- <p>In order to update an extension from your board, you need to perform the following 6 steps:</p>
- <ol>
+ <li>Upload the new files</li>
+ <li>Enable the extension, note that the board will be automatically disabled for this step</li>
+ </ol>',
+ 'EXTENSION_REMOVE_HEADLINE' => 'Completly removing an extension from your board',
+ 'EXTENSION_REMOVE_EXPLAIN' => '<ol>
<li>Disable the extension</li>
+ <li>Delete the extension’s data</li>
<li>Delete the extension’s files from the filesystem</li>
- <li>Upload the new files</li>
- <li>Disable the board (optional but recommended)</li>
- <li>Enable the extension</li>
- <li>Enable the board</li>
- </ol><p>',
- 'EXTENSION_OPTIONS' => 'Options',
+ </ol>',
'EXTENSION_DELETE_DATA_CONFIRM' => 'Are you sure that you wish to delete the data associated with “%s”?<br /><br />This removes all of its data and settings and cannot be undone!',
'EXTENSION_DISABLE_CONFIRM' => 'Are you sure that you wish to disable the “%s” extension?',