[6.0] Removal of deprecated language strings (joomla#44103)

brianteeman · web-flow · commit 7fc53f595807 · 2024-10-02T18:54:24.000+01:00
diff --git a/administrator/language/en-GB/com_fields.ini b/administrator/language/en-GB/com_fields.ini
@@ -21,8 +21,6 @@ COM_FIELDS_FIELD_EDITABLE_IN_BOTH="Both"
 COM_FIELDS_FIELD_EDITABLE_IN_LABEL="Editable In"
 COM_FIELDS_FIELD_EDITABLE_IN_SITE="Site"
 COM_FIELDS_FIELD_FORM_EDIT="Edit Field"
-; The following string is deprecated and will be removed with 6.0
-COM_FIELDS_FIELD_FORM_LAYOUT_LABEL="Layout"
 COM_FIELDS_FIELD_FORM_NEW="New Field"
 COM_FIELDS_FIELD_FORMOPTIONS_HEADING="Form Options"
 COM_FIELDS_FIELD_GROUP_LABEL="Field Group"
diff --git a/administrator/language/en-GB/com_joomlaupdate.ini b/administrator/language/en-GB/com_joomlaupdate.ini
@@ -15,8 +15,6 @@ COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_CUSTOM_ERROR="The custom URL field is empty
 COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_DEFAULT="Default"
 COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_LABEL="Update Channel"
 COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_NEXT="Joomla Next"
-; Deprecated, will be removed with 6.0
-COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_TESTING="Testing"
 COM_JOOMLAUPDATE_CONFIG_VERSIONCHECK_DESC="Shows the checkbox in the pre–update check if any of the extensions installed on your site is potentially incompatible with the version of Joomla you are upgrading to. Note: the checkbox is displayed when upgrading to a new Joomla version family (minor or major version)."
 COM_JOOMLAUPDATE_CONFIG_VERSIONCHECK_LABEL="Potentially incompatible extensions checkbox"
 COM_JOOMLAUPDATE_CONFIGURATION="Joomla Update: Options"
@@ -203,11 +201,7 @@ INSTL_EXTENSION_AVAILABLE="%s Available"
 INSTL_FILE_UPLOADS="File Uploads"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
 INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering <strong>php_value mbstring.language neutral</strong> in your <code>.htaccess</code> file."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload is set. This can be turned off locally by entering <strong>php_value mbstring.func_overload 0</strong> in your <code>.htaccess</code> file."
 INSTL_OUTPUT_BUFFERING="Output Buffering"
 INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Support"
 INSTL_PHP_VERSION_NEWER="PHP Version >= %s"
diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini
@@ -689,8 +689,6 @@ JGLOBAL_VOTES="Votes"
 JGLOBAL_VOTES_ASC="Votes ascending"
 JGLOBAL_VOTES_DESC="Votes descending"
 JGLOBAL_WARNCOOKIES="Warning! Cookies must be enabled to access the Administrator Backend."
-; @deprecated 5.0 will be removed in 6.0
-JGLOBAL_WARNIE="Warning! Internet Explorer should not be used for proper operation of the Administrator Backend."
 JGLOBAL_WARNJAVASCRIPT="Warning! JavaScript must be enabled for proper operation of the Administrator Backend."
 JGLOBAL_WIDTH="Width"
 
diff --git a/administrator/language/en-GB/lib_joomla.ini b/administrator/language/en-GB/lib_joomla.ini
@@ -625,8 +625,6 @@ JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MANIFEST_NOT_REMOVED="Package Uninstall: Err
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MISSING_EXTENSION="Package Uninstall: This extension is missing or has already been uninstalled: %s"
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MISSINGMANIFEST="Package Uninstall: Missing manifest file."
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_NOT_PROPER="Package Uninstall: This extension may have already been uninstalled or might not have been uninstalled properly: %s"
-; The following string is deprecated and will be removed with 6.0
-JLIB_INSTALLER_ERROR_PACK_UNINSTALL_UNKNOWN_EXTENSION="Trying to uninstall unknown extension from package. This extension may have already been removed earlier."
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_WARNCOREPACK="Package Uninstall: Trying to uninstall core package."
 JLIB_INSTALLER_ERROR_PLG_DISCOVER_STORE_DETAILS="Plugin Discover install: Failed to store plugin details."
 JLIB_INSTALLER_ERROR_PLG_REFRESH_MANIFEST_CACHE="Plugin Refresh manifest cache: Failed to store plugin details."
diff --git a/administrator/language/en-GB/mod_user.ini b/administrator/language/en-GB/mod_user.ini
@@ -10,7 +10,3 @@ MOD_USER_LIGHTDARK_MODE="Light/Dark Mode"
 MOD_USER_MENU="User Menu"
 MOD_USER_TITLE="Signed in as %s"
 MOD_USER_XML_DESCRIPTION="This module shows the User Menu and is intended to be displayed in the 'status' position."
-
-; Deprecated, will be removed with 6.0
-MOD_USER_LIGHT_MODE="Light Mode"
-MOD_USER_DARK_MODE="Dark Mode"
diff --git a/administrator/language/en-GB/plg_editors_codemirror.ini b/administrator/language/en-GB/plg_editors_codemirror.ini
@@ -26,26 +26,3 @@ PLG_CODEMIRROR_FIELDSET_TOOLBAR_OPTIONS_LABEL="Toolbar Options"
 PLG_CODEMIRROR_TOGGLE_FULL_SCREEN="Press %s to toggle Full Screen editing."
 PLG_CODEMIRROR_XML_DESCRIPTION="This plugin loads the CodeMirror editor."
 PLG_EDITORS_CODEMIRROR="Editor - CodeMirror"
-
-; Deprecated, will be removed with 6.0
-PLG_CODEMIRROR_FIELDSET_APPEARANCE_OPTIONS_LABEL="Appearance Options"
-PLG_CODEMIRROR_FIELD_ACTIVELINE_COLOR_LABEL="Active Line Colour"
-PLG_CODEMIRROR_FIELD_ACTIVELINE_LABEL="Highlight Active Line"
-PLG_CODEMIRROR_FIELD_AUTOCLOSETAGS_LABEL="Tag Completion"
-PLG_CODEMIRROR_FIELD_FONT_FAMILY_LABEL="Font"
-PLG_CODEMIRROR_FIELD_FONT_SIZE_LABEL="Font Size (px)"
-PLG_CODEMIRROR_FIELD_HIGHLIGHT_MATCH_COLOR_LABEL="Matching Tag Colour"
-PLG_CODEMIRROR_FIELD_KEYMAP_SUBLIME="Sublime Text"
-PLG_CODEMIRROR_FIELD_KEYMAP_VIM="Vim"
-PLG_CODEMIRROR_FIELD_LINE_HEIGHT_LABEL="Line Height (em)"
-PLG_CODEMIRROR_FIELD_MARKERGUTTER_LABEL="Gutters"
-PLG_CODEMIRROR_FIELD_MATCHBRACKETS_LABEL="Match Brackets"
-PLG_CODEMIRROR_FIELD_MATCHTAGS_LABEL="Match Tags"
-PLG_CODEMIRROR_FIELD_PREVIEW_LABEL="Preview"
-PLG_CODEMIRROR_FIELD_THEME_LABEL="Theme"
-PLG_CODEMIRROR_FIELD_VALUE_FONT_FAMILY_DEFAULT="Browser Default"
-PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_DEFAULT="Default"
-PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_LABEL="Scrollbar Style"
-PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_OVERLAY="Overlay"
-PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_SIMPLE="Simple"
-PLG_CODEMIRROR_FIELD_VIM_KEYBINDING_LABEL="Vim Keybinding"
diff --git a/administrator/language/en-GB/plg_fields_list.ini b/administrator/language/en-GB/plg_fields_list.ini
@@ -5,8 +5,6 @@
 
 PLG_FIELDS_LIST="Fields - List"
 PLG_FIELDS_LIST_LABEL="List (%s)"
-; The following string is deprecated and will be removed with 6.0
-PLG_FIELDS_LIST_PARAMS_FORM_LAYOUT_FANCY_SELECT="Enhanced select"
 PLG_FIELDS_LIST_PARAMS_HEADER_DESC="Add a string with no value at the top of the dropdown list eg ' - Select Article - '."
 PLG_FIELDS_LIST_PARAMS_HEADER_LABEL="Header"
 PLG_FIELDS_LIST_PARAMS_MULTIPLE_LABEL="Multiple"
diff --git a/administrator/language/en-GB/plg_fields_sql.ini b/administrator/language/en-GB/plg_fields_sql.ini
@@ -6,8 +6,6 @@
 PLG_FIELDS_SQL="Fields - SQL"
 PLG_FIELDS_SQL_CREATE_NOT_POSSIBLE="Only a Super User can create or edit an SQL field!"
 PLG_FIELDS_SQL_LABEL="SQL (%s)"
-; The following string is deprecated and will be removed with 6.0
-PLG_FIELDS_SQL_PARAMS_FORM_LAYOUT_FANCY_SELECT="Enhanced select"
 PLG_FIELDS_SQL_PARAMS_HEADER_DESC="Add a string with no value at the top of the dropdown list eg ' - Select Article - '."
 PLG_FIELDS_SQL_PARAMS_HEADER_LABEL="Header"
 PLG_FIELDS_SQL_PARAMS_MULTIPLE_LABEL="Multiple"
diff --git a/administrator/language/en-GB/plg_system_actionlogs.ini b/administrator/language/en-GB/plg_system_actionlogs.ini
@@ -20,7 +20,3 @@ PLG_SYSTEM_ACTIONLOGS_CONTENT_PUBLISHED="User <a href=\"{accountlink}\">{usernam
 PLG_SYSTEM_ACTIONLOGS_CONTENT_TRASHED="User <a href=\"{accountlink}\">{username}</a> trashed the {type} <a href=\"{itemlink}\">{title}</a>"
 PLG_SYSTEM_ACTIONLOGS_CONTENT_UNPUBLISHED="User <a href=\"{accountlink}\">{username}</a> unpublished the {type} <a href=\"{itemlink}\">{title}</a>"
 PLG_SYSTEM_ACTIONLOGS_CONTENT_UPDATED="User <a href=\"{accountlink}\">{username}</a> updated the {type} <a href=\"{itemlink}\">{title}</a>"
-
-; All the following strings are deprecated and will be removed with 6.0
-PLG_SYSTEM_ACTIONLOGS_LOG_DELETE_PERIOD="Days to delete logs after"
-PLG_SYSTEM_ACTIONLOGS_LOG_DELETE_PERIOD_DESC="Enter 0 if you don't want to delete the logs."
diff --git a/administrator/language/en-GB/plg_system_privacyconsent.ini b/administrator/language/en-GB/plg_system_privacyconsent.ini
@@ -25,20 +25,3 @@ PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_DESC="Custom message to be displayed
 PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_LABEL="Redirect Message"
 PLG_SYSTEM_PRIVACYCONSENT_SUBJECT="Privacy Policy"
 PLG_SYSTEM_PRIVACYCONSENT_XML_DESCRIPTION="Basic plugin to request user's consent to the site's privacy policy. Existing users who have not consented yet will be redirected on login to update their profile."
-
-; All the following strings are deprecated and will be removed with 6.0
-PLG_SYSTEM_PRIVACYCONSENT_CACHETIMEOUT_DESC="How often the check is performed."
-PLG_SYSTEM_PRIVACYCONSENT_CACHETIMEOUT_LABEL="Periodic check (days)"
-PLG_SYSTEM_PRIVACYCONSENT_CONSENTEXPIRATION_DESC="Number of days after which the privacy consent shall expire."
-PLG_SYSTEM_PRIVACYCONSENT_CONSENTEXPIRATION_LABEL="Expiration"
-PLG_SYSTEM_PRIVACYCONSENT_EMAIL_REMIND_BODY="Your Privacy Consent given at {URL} will expire in few days, you can renew the privacy consent for this website.\n\nIn order to do this, you can complete one of the following tasks:\n\n1. Visit the following URL: {TOKENURL}\n\n2. Copy your token from this email, visit the referenced URL, and paste your token into the form.\nURL: {FORMURL}\nToken: {TOKEN}\n\nPlease note that this token is only valid for this account."
-PLG_SYSTEM_PRIVACYCONSENT_EMAIL_REMIND_SUBJECT="Privacy Consent at {SITENAME}"
-PLG_SYSTEM_PRIVACYCONSENT_EXPIRATION_FIELDSET_LABEL="Expiration"
-PLG_SYSTEM_PRIVACYCONSENT_FIELD_ENABLED_DESC="When enabled it performs checks for consent expiration."
-PLG_SYSTEM_PRIVACYCONSENT_FIELD_ENABLED_LABEL="Enable"
-PLG_SYSTEM_PRIVACYCONSENT_MAIL_REQUEST_REMINDER_DESC="Reminder to renew the privacy consent for this website."
-PLG_SYSTEM_PRIVACYCONSENT_MAIL_REQUEST_REMINDER_TITLE="System - Privacy Consent: Renew Consent"
-PLG_SYSTEM_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_MESSAGE="Privacy consent has expired for %1$s."
-PLG_SYSTEM_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_SUBJECT="Privacy Consent Expired"
-PLG_SYSTEM_PRIVACYCONSENT_REMINDBEFORE_DESC="Number of days to send a reminder before the expiration of the privacy consent."
-PLG_SYSTEM_PRIVACYCONSENT_REMINDBEFORE_LABEL="Remind"
diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini
@@ -681,8 +681,6 @@ JGLOBAL_VOTES="Votes"
 JGLOBAL_VOTES_ASC="Votes ascending"
 JGLOBAL_VOTES_DESC="Votes descending"
 JGLOBAL_WARNCOOKIES="Warning! Cookies must be enabled to access the Administrator Backend."
-; @deprecated 5.0 will be removed in 6.0
-JGLOBAL_WARNIE="Warning! Internet Explorer should not be used for proper operation of the Administrator Backend."
 JGLOBAL_WARNJAVASCRIPT="Warning! JavaScript must be enabled for proper operation of the Administrator Backend."
 JGLOBAL_WIDTH="Width"
 
diff --git a/installation/language/en-GB/joomla.ini b/installation/language/en-GB/joomla.ini
@@ -42,13 +42,9 @@ INSTL_WARNJSON="Your PHP installation needs to have JSON enabled for Joomla to b
 INSTL_DATABASE_SUPPORT="Database Support:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
 INSTL_NOTICE_DATABASE_SUPPORT="No supported databases were found."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Your PHP installation needs to have JSON enabled for Joomla to be installed!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering <strong>php_value mbstring.language neutral</strong> in your <code>.htaccess</code> file."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring function overload is set. This can be turned off locally by entering <strong>php_value mbstring.func_overload 0</strong> in your <code>.htaccess</code> file."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="The required php functions <code>parse_ini_file</code> and <code>parse_ini_string</code> are disabled on your server."
 INSTL_NOTICE_XML_SUPPORT="XML Support is not available. This should be enabled by default in php but Ubuntu users may need to install this by doing <code>sudo apt-get install php-xml</code> followed by web server restart."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib compression is not set. This can be turned on locally by entering <strong>zlib.output_compression = On</strong> in your <code>php.ini</code> file."
diff --git a/language/en-GB/files_joomla.sys.ini b/language/en-GB/files_joomla.sys.ini
@@ -5,7 +5,3 @@
 
 FILES_JOOMLA="Joomla CMS"
 FILES_JOOMLA_XML_DESCRIPTION="Joomla! 5 Content Management System."
-
-; All the following strings are deprecated and will be removed with 6.0
-FILES_JOOMLA_ERROR_FILE_FOLDER="Error on deleting file or folder %s"
-FILES_JOOMLA_ERROR_MANIFEST="Error on updating manifest cache: (type, element, folder, client) = (%s, %s, %s, %s)"
diff --git a/language/en-GB/lib_joomla.ini b/language/en-GB/lib_joomla.ini
@@ -619,8 +619,6 @@ JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MANIFEST_NOT_REMOVED="Package Uninstall: Err
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MISSING_EXTENSION="Package Uninstall: This extension is missing or has already been uninstalled: %s"
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MISSINGMANIFEST="Package Uninstall: Missing manifest file."
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_NOT_PROPER="Package Uninstall: This extension may have already been uninstalled or might not have been uninstalled properly: %s"
-; The following string is deprecated and will be removed with 6.0
-JLIB_INSTALLER_ERROR_PACK_UNINSTALL_UNKNOWN_EXTENSION="Trying to uninstall unknown extension from package. This extension may have already been removed earlier."
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_WARNCOREPACK="Package Uninstall: Trying to uninstall core package."
 JLIB_INSTALLER_ERROR_PLG_DISCOVER_STORE_DETAILS="Plugin Discover install: Failed to store plugin details."
 JLIB_INSTALLER_ERROR_PLG_REFRESH_MANIFEST_CACHE="Plugin Refresh manifest cache: Failed to store plugin details."
