[4.4] Inclusive Naming abort (language strings) (#41024)

brianteeman · web-flow · commit 06393cd5ded3 · 2023-06-24T11:34:39.000+02:00
We should be using inclusive naming throughout the cms not just in the language strings. Changes "abort" to "error" or "cancel" as appropriate, ### Rationale https://inclusivenaming.org/word-lists/tier-1/abort/ ### Test Code review Only ### Documentation New page will be added to manual.joomla.org shortly ### Note This is part of a series of pull requests that are submitted separately to make reviewing easier
diff --git a/administrator/language/en-GB/com_templates.ini b/administrator/language/en-GB/com_templates.ini
@@ -51,7 +51,7 @@ COM_TEMPLATES_DIFF_OPTIONS_SIDE="Side-by-Side"
 COM_TEMPLATES_DIFF_OVERRIDE="Override"
 COM_TEMPLATES_DIRECTORY_NOT_WRITABLE="The template folder is not writable. Some features may not work."
 COM_TEMPLATES_ERROR_ASSET_FILE_DELETE="The file joomla.asset.json can't be deleted. Make changes in the editor if you want to change the file."
-COM_TEMPLATES_ERROR_ASSET_FILE_INVALID_JSON="The joomla.asset.json file doesn't contain valid JSON, aborting save."
+COM_TEMPLATES_ERROR_ASSET_FILE_INVALID_JSON="The joomla.asset.json file doesn't contain valid JSON, cancelling save."
 COM_TEMPLATES_ERROR_CANNOT_DELETE_LAST_STYLE="Can't delete the last style of a template. Did you intend to <a href=\"index.php?option=com_installer&view=manage&filter[type]=template\" class=\"alert-link\">uninstall</a> the template?"
 COM_TEMPLATES_ERROR_CANNOT_UNSET_DEFAULT_STYLE="Can't unset default style."
 COM_TEMPLATES_ERROR_COULD_NOT_COPY="Unable to copy template files to temporary folder."
diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini
@@ -91,7 +91,7 @@ JHIDE="Hide"
 JHIDEPASSWORD="Hide Password"
 JHOMEDASHBOARD="Home Dashboard"
 JINVALID_TOKEN="The most recent request was denied because it had an invalid security token. Please refresh the page and try again."
-JINVALID_TOKEN_NOTICE="The security token did not match. The request was aborted to prevent any security breach. Please try again."
+JINVALID_TOKEN_NOTICE="The security token did not match. The request was cancelled to prevent any security breach. Please try again."
 JLOGIN="Log in"
 JLOGOUT="Log out"
 JMENU_MULTILANG_WARNING_MISSING_MODULES="An administrator menu module for <strong>%s</strong> does not exist. <br>Create a custom administrator menu and module for each administrator language or publish a menu module set to All languages."
diff --git a/administrator/language/en-GB/lib_joomla.ini b/administrator/language/en-GB/lib_joomla.ini
@@ -470,7 +470,7 @@ JLIB_HTML_UNPUBLISH_ITEM="Unpublish Item"
 JLIB_HTML_UNSETDEFAULT_ITEM="Unset default"
 JLIB_HTML_VIEW_ALL="View All"
 
-JLIB_INSTALLER_ABORT="Aborting language installation: %s"
+JLIB_INSTALLER_ABORT="Stopping language installation: %s"
 JLIB_INSTALLER_ABORT_ALREADY_EXISTS="Extension %1$s: Extension %2$s already exists."
 JLIB_INSTALLER_ABORT_ALREADYINSTALLED="Extension is already installed."
 JLIB_INSTALLER_ABORT_COMP_BUILDADMINMENUS_FAILED="Error building Administrator Menus."
@@ -499,7 +499,7 @@ JLIB_INSTALLER_ABORT_FILE_INSTALL_ROLLBACK="Files Install: %s"
 JLIB_INSTALLER_ABORT_FILE_INSTALL_SQL_ERROR="Files %1$s: SQL error file %2$s"
 JLIB_INSTALLER_ABORT_FILE_ROLLBACK="Files Install: %s"
 JLIB_INSTALLER_ABORT_FILE_UPDATE_SQL_ERROR="Files Update: SQL error file %s"
-JLIB_INSTALLER_ABORT_INSTALL_ABORTED="Extension installation aborted."
+JLIB_INSTALLER_ABORT_INSTALL_ABORTED="Extension installation stopped."
 JLIB_INSTALLER_ABORT_INSTALL_CUSTOM_INSTALL_FAILURE="Extension %s: Custom install routine failure."
 JLIB_INSTALLER_ABORT_LIB_COPY_FILES="Library %s: Could not copy files from the source."
 JLIB_INSTALLER_ABORT_LIB_INSTALL_ALREADY_INSTALLED="Library Install: Library already installed."
@@ -662,7 +662,7 @@ JLIB_INSTALLER_UPDATE="Update"
 JLIB_INSTALLER_UPDATE_LOG_QUERY="Ran query from file %1$s. Query text: %2$s."
 JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Unable to create a content language for %s language: %s"
 
-JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection abort has occurred while fetching the JSON data."
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection error has occurred while fetching the JSON data."
 JLIB_JS_AJAX_ERROR_NO_CONTENT="No content was returned."
 JLIB_JS_AJAX_ERROR_OTHER="An error has occurred while fetching the JSON data: HTTP %s status code."
 JLIB_JS_AJAX_ERROR_PARSE="A parse error has occurred while processing the following JSON data:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini
@@ -89,7 +89,7 @@ JHELP="Help"
 JHIDE="Hide"
 JHIDEPASSWORD="Hide Password"
 JINVALID_TOKEN="The most recent request was denied because it had an invalid security token. Please refresh the page and try again."
-JINVALID_TOKEN_NOTICE="The security token did not match. The request was aborted to prevent any security breach. Please try again."
+JINVALID_TOKEN_NOTICE="The security token did not match. The request was cancelled to prevent any security breach. Please try again."
 JLOGIN="Log in"
 JLOGOUT="Log out"
 JMENU_MULTILANG_WARNING_MISSING_MODULES="An administrator menu module for <strong>%s</strong> does not exist. <br>Create a custom administrator menu and module for each administrator language or publish a menu module set to All languages."
diff --git a/installation/language/en-GB/joomla.ini b/installation/language/en-GB/joomla.ini
@@ -226,7 +226,7 @@ JGLOBAL_SELECT_NO_RESULTS_MATCH="No results match"
 JGLOBAL_SELECT_SOME_OPTIONS="Select some options"
 JHIDEPASSWORD="Hide Password"
 JINVALID_TOKEN="The most recent request was denied because it had an invalid security token. Please refresh the page and try again."
-JINVALID_TOKEN_NOTICE="The security token did not match. The request was aborted to prevent any security breach. Please try again."
+JINVALID_TOKEN_NOTICE="The security token did not match. The request was cancelled to prevent any security breach. Please try again."
 JNEXT="Next"
 JNO="No"
 JNOTICE="Notice"
@@ -249,7 +249,7 @@ JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: Path is not a folder. Path: %2
 JLIB_FORM_FIELD_INVALID="Invalid field:&#160;"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Invalid field: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Field required: %s"
-JLIB_INSTALLER_ABORT="Aborting language installation: %s"
+JLIB_INSTALLER_ABORT="Stopping language installation: %s"
 JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Extension %1$s: Failed to create folder: %2$s"
 JLIB_INSTALLER_ABORT_NOINSTALLPATH="Install path does not exist."
 JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Package %1$s: There was an error installing an extension: %2$s."
@@ -290,7 +290,7 @@ NOTICE="Notice"
 WARNING="Warning"
 
 ; Javascript ajax error messages
-JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection abort has occurred while fetching the JSON data."
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection error has occurred while fetching the JSON data."
 JLIB_JS_AJAX_ERROR_NO_CONTENT="No content was returned."
 JLIB_JS_AJAX_ERROR_OTHER="An error has occurred while fetching the JSON data: HTTP %d status code."
 JLIB_JS_AJAX_ERROR_PARSE="A parse error has occurred while processing the following JSON data:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
diff --git a/language/en-GB/joomla.ini b/language/en-GB/joomla.ini
@@ -84,7 +84,7 @@ JINLINEHELP="Toggle Inline Help"
 JHIDE="Hide"
 JHIDEPASSWORD="Hide Password"
 JINVALID_TOKEN="The most recent request was denied because it had an invalid security token. Please refresh the page and try again."
-JINVALID_TOKEN_NOTICE="The security token did not match. The request was aborted to prevent any security breach. Please try again."
+JINVALID_TOKEN_NOTICE="The security token did not match. The request was cancelled to prevent any security breach. Please try again."
 JLOGIN="Log in"
 JLOGOUT="Log out"
 JMONTH="Month"
diff --git a/language/en-GB/lib_joomla.ini b/language/en-GB/lib_joomla.ini
@@ -467,7 +467,7 @@ JLIB_HTML_UNPUBLISH_ITEM="Unpublish Item"
 JLIB_HTML_UNSETDEFAULT_ITEM="Unset default"
 JLIB_HTML_VIEW_ALL="View All"
 
-JLIB_INSTALLER_ABORT="Aborting language installation: %s"
+JLIB_INSTALLER_ABORT="Stopping language installation: %s"
 JLIB_INSTALLER_ABORT_ALREADY_EXISTS="Extension %1$s: Extension %2$s already exists."
 JLIB_INSTALLER_ABORT_ALREADYINSTALLED="Extension is already installed."
 JLIB_INSTALLER_ABORT_COMP_BUILDADMINMENUS_FAILED="Error building Administrator Menus."
@@ -496,7 +496,7 @@ JLIB_INSTALLER_ABORT_FILE_INSTALL_ROLLBACK="Files Install: %s"
 JLIB_INSTALLER_ABORT_FILE_INSTALL_SQL_ERROR="Files %1$s: SQL error file %2$s"
 JLIB_INSTALLER_ABORT_FILE_ROLLBACK="Files Install: %s"
 JLIB_INSTALLER_ABORT_FILE_UPDATE_SQL_ERROR="Files Update: SQL error file %s"
-JLIB_INSTALLER_ABORT_INSTALL_ABORTED="Extension installation aborted."
+JLIB_INSTALLER_ABORT_INSTALL_ABORTED="Extension installation stopped."
 JLIB_INSTALLER_ABORT_INSTALL_CUSTOM_INSTALL_FAILURE="Extension %s: Custom install routine failure."
 JLIB_INSTALLER_ABORT_LIB_COPY_FILES="Library %s: Could not copy files from the source."
 JLIB_INSTALLER_ABORT_LIB_INSTALL_ALREADY_INSTALLED="Library Install: Library already installed."
@@ -659,7 +659,7 @@ JLIB_INSTALLER_UPDATE="Update"
 JLIB_INSTALLER_UPDATE_LOG_QUERY="Ran query from file %1$s. Query text: %2$s."
 JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Unable to create a content language for %s language: %s"
 
-JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection abort has occurred while fetching the JSON data."
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection error has occurred while fetching the JSON data."
 JLIB_JS_AJAX_ERROR_NO_CONTENT="No content was returned."
 JLIB_JS_AJAX_ERROR_OTHER="An error has occurred while fetching the JSON data: HTTP %s status code."
 JLIB_JS_AJAX_ERROR_PARSE="A parse error has occurred while processing the following JSON data:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
