From 6fce4b44a8daaad76e9f819c69699d78d1d763b4 Mon Sep 17 00:00:00 2001 From: Matt Friedman <maf675@gmail.com> Date: Sat, 19 Oct 2013 08:47:12 -0700 Subject: [ticket/11935] Fix <p> tags not allowed inside <strong> tags PHPBB3-11935 --- phpBB/language/en/acp/extensions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en/acp/extensions.php') diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 0adaff10c8..369397ead2 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -39,7 +39,7 @@ $lang = array_merge($lang, array( 'EXTENSIONS' => 'Extensions', 'EXTENSIONS_ADMIN' => 'Extensions Manager', 'EXTENSIONS_EXPLAIN' => 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.', - 'EXTENSION_INVALID_LIST' => 'The "%s" extension is not valid.<br /><p>%s</p>', + 'EXTENSION_INVALID_LIST' => 'The "%s" extension is not valid.<br />%s<br /><br />', 'EXTENSION_NOT_AVAILABLE' => 'The selected extension is not available for this board, please verify your phpBB and PHP versions are allowed (see the details page).', 'DETAILS' => 'Details', -- cgit v1.2.1 From 8d5fcc8d4ca85c2752771ba7c808ed4e19c3c773 Mon Sep 17 00:00:00 2001 From: Joas Schilling <nickvergessen@gmx.de> Date: Fri, 1 Nov 2013 15:33:31 +0100 Subject: [ticket/11994] Make extension manager UI less misleading Enable and Install were split into two different expressions. Purge was renamed to uninstall to make clearer what is going to happen. PHPBB3-11994 --- phpBB/language/en/acp/extensions.php | 51 +++++++++++++++++------------------- 1 file changed, 24 insertions(+), 27 deletions(-) (limited to 'phpBB/language/en/acp/extensions.php') diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 369397ead2..d97100da70 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -39,47 +39,44 @@ $lang = array_merge($lang, array( 'EXTENSIONS' => 'Extensions', 'EXTENSIONS_ADMIN' => 'Extensions Manager', 'EXTENSIONS_EXPLAIN' => 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.', - 'EXTENSION_INVALID_LIST' => 'The "%s" extension is not valid.<br />%s<br /><br />', + 'EXTENSION_INVALID_LIST' => 'The “%s” extension is not valid.<br />%s<br /><br />', 'EXTENSION_NOT_AVAILABLE' => 'The selected extension is not available for this board, please verify your phpBB and PHP versions are allowed (see the details page).', 'DETAILS' => 'Details', - 'AVAILABLE' => 'Available', - 'ENABLED' => 'Enabled', - 'DISABLED' => 'Disabled', - 'PURGED' => 'Purged', - 'UPLOADED' => 'Uploaded', + 'EXTENSIONS_ENABLED' => 'Enabled Extensions', + 'EXTENSIONS_DISABLED' => 'Disabled Extensions', - 'ENABLE' => 'Enable', - 'DISABLE' => 'Disable', - 'PURGE' => 'Purge', + 'EXTENSION_DISABLE' => 'Disable', + 'EXTENSION_ENABLE' => 'Enable', + 'EXTENSION_INSTALL' => 'Install', + 'EXTENSION_UNINSTALL' => 'Uninstall', - 'ENABLE_EXPLAIN' => 'Enabling an extension allows you to use it on your board.', - 'DISABLE_EXPLAIN' => 'Disabling an extension retains its files and settings but removes any functionality added by the extension.', - 'PURGE_EXPLAIN' => 'Purging an extension clears an extensions data while retaining its files.', - 'DELETE_EXPLAIN' => 'Deleting an extension removes all of its files and settings. Log entries will remain, although any language variables added by the extension will not be available.', + 'EXTENSION_DISABLE_EXPLAIN' => 'Disabling an extension retains its files, data and settings but removes any functionality added by the extension.', + 'EXTENSION_ENABLE_EXPLAIN' => 'Enabling an extension allows you to use it on your board.', + 'EXTENSION_INSTALL_EXPLAIN' => 'Installing an extension will perform database changes that are required to use the extension on your board.', + 'EXTENSION_UNINSTALL_EXPLAIN' => 'Uninstalling an extension removes all data and settings of the extensions. Only the extension files are retained, so you can install it again.', - 'DISABLE_IN_PROGRESS' => 'The extension is currently being disabled, please do not leave this page or refresh until it is completed.', - 'ENABLE_IN_PROGRESS' => 'The extension is currently being installed, please do not leave this page or refresh until it is completed.', - 'PURGE_IN_PROGRESS' => 'The extension is currently being purged, please do not leave this page or refresh until it is completed.', - 'ENABLE_SUCCESS' => 'The extension was enabled successfully', - 'DISABLE_SUCCESS' => 'The extension was disabled successfully', - 'PURGE_SUCCESS' => 'The extension was purged successfully', + 'EXTENSION_DISABLE_IN_PROGRESS' => 'The extension is currently being disabled, please do not leave this page or refresh until it is completed.', + 'EXTENSION_ENABLE_IN_PROGRESS' => 'The extension is currently being enabled, please do not leave this page or refresh until it is completed.', + 'EXTENSION_INSTALL_IN_PROGRESS' => 'The extension is currently being installed, please do not leave this page or refresh until it is completed.', + 'EXTENSION_UNINSTALL_IN_PROGRESS' => 'The extension is currently being purged, please do not leave this page or refresh until it is completed.', - 'ENABLE_FAIL' => 'The extension could not be enabled', - 'DISABLE_FAIL' => 'The extension could not be disabled', - 'PURGE_FAIL' => 'The extension could not be purged', + 'EXTENSION_DISABLE_SUCCESS' => 'The extension was disabled successfully', + 'EXTENSION_ENABLE_SUCCESS' => 'The extension was enabled successfully', + 'EXTENSION_INSTALL_SUCCESS' => 'The extension was installed successfully', + 'EXTENSION_UNINSTALL_SUCCESS' => 'The extension was uninstalled successfully', 'EXTENSION_NAME' => 'Extension Name', 'EXTENSION_ACTIONS' => 'Actions', 'EXTENSION_OPTIONS' => 'Options', - 'ENABLE_CONFIRM' => 'Are you sure that you wish to enable this extension?', - 'DISABLE_CONFIRM' => 'Are you sure that you wish to disable this extension?', - 'PURGE_CONFIRM' => 'Are you sure that you wish to purge this extension's data? This will remove all settings stored for this extension and cannot be undone!', + 'EXTENSION_DISABLE_CONFIRM' => 'Are you sure that you wish to disable the “%s” extension?', + 'EXTENSION_ENABLE_CONFIRM' => 'Are you sure that you wish to enable the “%s” extension?', + 'EXTENSION_INSTALL_CONFIRM' => 'Are you sure that you wish to install the “%s” extension?', + 'EXTENSION_UNINSTALL_CONFIRM' => 'Are you sure that you wish to uninstall the “%s” extension? This will remove all data and settings stored for this extension and cannot be undone!', - 'WARNING' => 'Warning', - 'RETURN' => 'Return', + 'RETURN_TO_EXTENSION_LIST' => 'Return to the extension list', 'EXT_DETAILS' => 'Extension Details', 'DISPLAY_NAME' => 'Display Name', -- cgit v1.2.1 From 7bc6f3210005d8623ba363b9a19903c5bd3a402a Mon Sep 17 00:00:00 2001 From: Joas Schilling <nickvergessen@gmx.de> Date: Fri, 1 Nov 2013 15:56:59 +0100 Subject: [ticket/11994] More language fixes PHPBB3-11994 --- phpBB/language/en/acp/extensions.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'phpBB/language/en/acp/extensions.php') diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index d97100da70..75bb0e3cfa 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -55,12 +55,12 @@ $lang = array_merge($lang, array( 'EXTENSION_DISABLE_EXPLAIN' => 'Disabling an extension retains its files, data and settings but removes any functionality added by the extension.', 'EXTENSION_ENABLE_EXPLAIN' => 'Enabling an extension allows you to use it on your board.', 'EXTENSION_INSTALL_EXPLAIN' => 'Installing an extension will perform database changes that are required to use the extension on your board.', - 'EXTENSION_UNINSTALL_EXPLAIN' => 'Uninstalling an extension removes all data and settings of the extensions. Only the extension files are retained, so you can install it again.', + 'EXTENSION_UNINSTALL_EXPLAIN' => 'Uninstalling an extension removes all data and settings of the extensions. The extension files are retained so it can be installed again.', - 'EXTENSION_DISABLE_IN_PROGRESS' => 'The extension is currently being disabled, please do not leave this page or refresh until it is completed.', - 'EXTENSION_ENABLE_IN_PROGRESS' => 'The extension is currently being enabled, please do not leave this page or refresh until it is completed.', - 'EXTENSION_INSTALL_IN_PROGRESS' => 'The extension is currently being installed, please do not leave this page or refresh until it is completed.', - 'EXTENSION_UNINSTALL_IN_PROGRESS' => 'The extension is currently being purged, please do not leave this page or refresh until it is completed.', + 'EXTENSION_DISABLE_IN_PROGRESS' => 'The extension is currently being disabled, please do not leave or refresh this page until it is completed.', + 'EXTENSION_ENABLE_IN_PROGRESS' => 'The extension is currently being enabled, please do not leave or refresh this page until it is completed.', + 'EXTENSION_INSTALL_IN_PROGRESS' => 'The extension is currently being installed, please do not leave or refresh this page until it is completed.', + 'EXTENSION_UNINSTALL_IN_PROGRESS' => 'The extension is currently being purged, please do not leave or refresh this page until it is completed.', 'EXTENSION_DISABLE_SUCCESS' => 'The extension was disabled successfully', 'EXTENSION_ENABLE_SUCCESS' => 'The extension was enabled successfully', -- cgit v1.2.1 From 3ac3688a7fb77250a75e8d7a3223f46a52cdfcf8 Mon Sep 17 00:00:00 2001 From: Joas Schilling <nickvergessen@gmx.de> Date: Sat, 2 Nov 2013 14:28:35 +0100 Subject: [ticket/11994] Fix some language PHPBB3-11994 --- phpBB/language/en/acp/extensions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/language/en/acp/extensions.php') diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 75bb0e3cfa..96eed14c0e 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -55,12 +55,12 @@ $lang = array_merge($lang, array( 'EXTENSION_DISABLE_EXPLAIN' => 'Disabling an extension retains its files, data and settings but removes any functionality added by the extension.', 'EXTENSION_ENABLE_EXPLAIN' => 'Enabling an extension allows you to use it on your board.', 'EXTENSION_INSTALL_EXPLAIN' => 'Installing an extension will perform database changes that are required to use the extension on your board.', - 'EXTENSION_UNINSTALL_EXPLAIN' => 'Uninstalling an extension removes all data and settings of the extensions. The extension files are retained so it can be installed again.', + 'EXTENSION_UNINSTALL_EXPLAIN' => 'Uninstalling an extension removes all of its data and settings. The extension files are retained so it can be installed again.', 'EXTENSION_DISABLE_IN_PROGRESS' => 'The extension is currently being disabled, please do not leave or refresh this page until it is completed.', 'EXTENSION_ENABLE_IN_PROGRESS' => 'The extension is currently being enabled, please do not leave or refresh this page until it is completed.', 'EXTENSION_INSTALL_IN_PROGRESS' => 'The extension is currently being installed, please do not leave or refresh this page until it is completed.', - 'EXTENSION_UNINSTALL_IN_PROGRESS' => 'The extension is currently being purged, please do not leave or refresh this page until it is completed.', + 'EXTENSION_UNINSTALL_IN_PROGRESS' => 'The extension is currently being uninstalled, please do not leave or refresh this page until it is completed.', 'EXTENSION_DISABLE_SUCCESS' => 'The extension was disabled successfully', 'EXTENSION_ENABLE_SUCCESS' => 'The extension was enabled successfully', -- cgit v1.2.1 From 7e1a02b3a192771043009078630e8e2b9b8026a1 Mon Sep 17 00:00:00 2001 From: Joas Schilling <nickvergessen@gmx.de> Date: Sat, 2 Nov 2013 23:23:48 +0100 Subject: [ticket/11994] Make install/enable just one UI thing PHPBB3-11994 --- phpBB/language/en/acp/extensions.php | 5 ----- 1 file changed, 5 deletions(-) (limited to 'phpBB/language/en/acp/extensions.php') diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 96eed14c0e..5421789e68 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -49,22 +49,18 @@ $lang = array_merge($lang, array( 'EXTENSION_DISABLE' => 'Disable', 'EXTENSION_ENABLE' => 'Enable', - 'EXTENSION_INSTALL' => 'Install', 'EXTENSION_UNINSTALL' => 'Uninstall', 'EXTENSION_DISABLE_EXPLAIN' => 'Disabling an extension retains its files, data and settings but removes any functionality added by the extension.', 'EXTENSION_ENABLE_EXPLAIN' => 'Enabling an extension allows you to use it on your board.', - 'EXTENSION_INSTALL_EXPLAIN' => 'Installing an extension will perform database changes that are required to use the extension on your board.', 'EXTENSION_UNINSTALL_EXPLAIN' => 'Uninstalling an extension removes all of its data and settings. The extension files are retained so it can be installed again.', 'EXTENSION_DISABLE_IN_PROGRESS' => 'The extension is currently being disabled, please do not leave or refresh this page until it is completed.', 'EXTENSION_ENABLE_IN_PROGRESS' => 'The extension is currently being enabled, please do not leave or refresh this page until it is completed.', - 'EXTENSION_INSTALL_IN_PROGRESS' => 'The extension is currently being installed, please do not leave or refresh this page until it is completed.', 'EXTENSION_UNINSTALL_IN_PROGRESS' => 'The extension is currently being uninstalled, please do not leave or refresh this page until it is completed.', 'EXTENSION_DISABLE_SUCCESS' => 'The extension was disabled successfully', 'EXTENSION_ENABLE_SUCCESS' => 'The extension was enabled successfully', - 'EXTENSION_INSTALL_SUCCESS' => 'The extension was installed successfully', 'EXTENSION_UNINSTALL_SUCCESS' => 'The extension was uninstalled successfully', 'EXTENSION_NAME' => 'Extension Name', @@ -73,7 +69,6 @@ $lang = array_merge($lang, array( 'EXTENSION_DISABLE_CONFIRM' => 'Are you sure that you wish to disable the “%s” extension?', 'EXTENSION_ENABLE_CONFIRM' => 'Are you sure that you wish to enable the “%s” extension?', - 'EXTENSION_INSTALL_CONFIRM' => 'Are you sure that you wish to install the “%s” extension?', 'EXTENSION_UNINSTALL_CONFIRM' => 'Are you sure that you wish to uninstall the “%s” extension? This will remove all data and settings stored for this extension and cannot be undone!', 'RETURN_TO_EXTENSION_LIST' => 'Return to the extension list', -- cgit v1.2.1 From f8e92efc3f213f966a4faa1966ff8e64270328f4 Mon Sep 17 00:00:00 2001 From: Joas Schilling <nickvergessen@gmx.de> Date: Sat, 2 Nov 2013 23:40:56 +0100 Subject: [ticket/11994] Rename "uninstall" to "delete data" PHPBB3-11994 --- phpBB/language/en/acp/extensions.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'phpBB/language/en/acp/extensions.php') diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 5421789e68..7477324637 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -44,32 +44,32 @@ $lang = array_merge($lang, array( 'DETAILS' => 'Details', - 'EXTENSIONS_ENABLED' => 'Enabled Extensions', 'EXTENSIONS_DISABLED' => 'Disabled Extensions', + 'EXTENSIONS_ENABLED' => 'Enabled Extensions', + 'EXTENSION_DELETE_DATA' => 'Delete data', 'EXTENSION_DISABLE' => 'Disable', 'EXTENSION_ENABLE' => 'Enable', - 'EXTENSION_UNINSTALL' => 'Uninstall', + 'EXTENSION_DELETE_DATA_EXPLAIN' => 'Deleting data of an extension removes all of its data and settings. The extension files are retained so it can be enabled again.', 'EXTENSION_DISABLE_EXPLAIN' => 'Disabling an extension retains its files, data and settings but removes any functionality added by the extension.', 'EXTENSION_ENABLE_EXPLAIN' => 'Enabling an extension allows you to use it on your board.', - 'EXTENSION_UNINSTALL_EXPLAIN' => 'Uninstalling an extension removes all of its data and settings. The extension files are retained so it can be installed again.', + 'EXTENSION_DELETE_DATA_IN_PROGRESS' => 'The data of the extension is currently being deleted, please do not leave or refresh this page until it is completed.', 'EXTENSION_DISABLE_IN_PROGRESS' => 'The extension is currently being disabled, please do not leave or refresh this page until it is completed.', 'EXTENSION_ENABLE_IN_PROGRESS' => 'The extension is currently being enabled, please do not leave or refresh this page until it is completed.', - 'EXTENSION_UNINSTALL_IN_PROGRESS' => 'The extension is currently being uninstalled, please do not leave or refresh this page until it is completed.', + 'EXTENSION_DELETE_DATA_SUCCESS' => 'The data of the extension was deleted successfully', 'EXTENSION_DISABLE_SUCCESS' => 'The extension was disabled successfully', 'EXTENSION_ENABLE_SUCCESS' => 'The extension was enabled successfully', - 'EXTENSION_UNINSTALL_SUCCESS' => 'The extension was uninstalled successfully', 'EXTENSION_NAME' => 'Extension Name', 'EXTENSION_ACTIONS' => 'Actions', 'EXTENSION_OPTIONS' => 'Options', + 'EXTENSION_DELETE_DATA_CONFIRM' => 'Are you sure that you wish to delete all data of the “%s” extension? This cannot be undone!', 'EXTENSION_DISABLE_CONFIRM' => 'Are you sure that you wish to disable the “%s” extension?', 'EXTENSION_ENABLE_CONFIRM' => 'Are you sure that you wish to enable the “%s” extension?', - 'EXTENSION_UNINSTALL_CONFIRM' => 'Are you sure that you wish to uninstall the “%s” extension? This will remove all data and settings stored for this extension and cannot be undone!', 'RETURN_TO_EXTENSION_LIST' => 'Return to the extension list', -- cgit v1.2.1 From 05c97fd03c68edd65d1a73806a569d9011574804 Mon Sep 17 00:00:00 2001 From: Joas Schilling <nickvergessen@gmx.de> Date: Sun, 3 Nov 2013 00:29:35 +0100 Subject: [ticket/11994] Fix more language PHPBB3-11994 --- phpBB/language/en/acp/extensions.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'phpBB/language/en/acp/extensions.php') diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 7477324637..8279a68022 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -51,15 +51,15 @@ $lang = array_merge($lang, array( 'EXTENSION_DISABLE' => 'Disable', 'EXTENSION_ENABLE' => 'Enable', - 'EXTENSION_DELETE_DATA_EXPLAIN' => 'Deleting data of an extension removes all of its data and settings. The extension files are retained so it can be enabled again.', + 'EXTENSION_DELETE_DATA_EXPLAIN' => 'Deleting an extension’s data removes all of its data and settings. The extension files are retained so it can be enabled again.', 'EXTENSION_DISABLE_EXPLAIN' => 'Disabling an extension retains its files, data and settings but removes any functionality added by the extension.', 'EXTENSION_ENABLE_EXPLAIN' => 'Enabling an extension allows you to use it on your board.', - 'EXTENSION_DELETE_DATA_IN_PROGRESS' => 'The data of the extension is currently being deleted, please do not leave or refresh this page until it is completed.', - 'EXTENSION_DISABLE_IN_PROGRESS' => 'The extension is currently being disabled, please do not leave or refresh this page until it is completed.', - 'EXTENSION_ENABLE_IN_PROGRESS' => 'The extension is currently being enabled, please do not leave or refresh this page until it is completed.', + 'EXTENSION_DELETE_DATA_IN_PROGRESS' => 'The extension’s data is currently being deleted. Please do not leave or refresh this page until it is completed.', + 'EXTENSION_DISABLE_IN_PROGRESS' => 'The extension is currently being disabled. Please do not leave or refresh this page until it is completed.', + 'EXTENSION_ENABLE_IN_PROGRESS' => 'The extension is currently being enabled. Please do not leave or refresh this page until it is completed.', - 'EXTENSION_DELETE_DATA_SUCCESS' => 'The data of the extension was deleted successfully', + 'EXTENSION_DELETE_DATA_SUCCESS' => 'The extension’s data was deleted successfully', 'EXTENSION_DISABLE_SUCCESS' => 'The extension was disabled successfully', 'EXTENSION_ENABLE_SUCCESS' => 'The extension was enabled successfully', @@ -67,7 +67,7 @@ $lang = array_merge($lang, array( 'EXTENSION_ACTIONS' => 'Actions', 'EXTENSION_OPTIONS' => 'Options', - 'EXTENSION_DELETE_DATA_CONFIRM' => 'Are you sure that you wish to delete all data of the “%s” extension? This cannot be undone!', + '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?', 'EXTENSION_ENABLE_CONFIRM' => 'Are you sure that you wish to enable the “%s” extension?', -- cgit v1.2.1