From e8bc42e19580859153f4254ceb2ba13b496fcf70 Mon Sep 17 00:00:00 2001 From: brian teeman Date: Tue, 12 Sep 2023 14:05:21 +0100 Subject: [PATCH 1/5] [5.0] Removal of deprecated language strings This pr replaces several others that were created earlier and had conflicts code review only --- administrator/components/com_admin/script.php | 4 ++ .../language/en-GB/com_guidedtours.ini | 2 - administrator/language/en-GB/com_media.ini | 4 -- .../language/en-GB/com_newsfeeds.ini | 8 ---- administrator/language/en-GB/com_users.ini | 25 ---------- administrator/language/en-GB/joomla.ini | 8 ---- .../language/en-GB/plg_system_debug.ini | 48 ------------------- .../language/en-GB/plg_twofactorauth_totp.ini | 34 ------------- .../en-GB/plg_twofactorauth_totp.sys.ini | 8 ---- .../en-GB/plg_twofactorauth_yubikey.ini | 20 -------- .../en-GB/plg_twofactorauth_yubikey.sys.ini | 8 ---- api/language/en-GB/joomla.ini | 8 ---- language/en-GB/com_media.ini | 4 -- language/en-GB/com_users.ini | 12 ----- 14 files changed, 4 insertions(+), 189 deletions(-) delete mode 100644 administrator/language/en-GB/plg_twofactorauth_totp.ini delete mode 100644 administrator/language/en-GB/plg_twofactorauth_totp.sys.ini delete mode 100644 administrator/language/en-GB/plg_twofactorauth_yubikey.ini delete mode 100644 administrator/language/en-GB/plg_twofactorauth_yubikey.sys.ini diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index d9d334204f160..893540f902676 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -2045,6 +2045,10 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/media/com_contenthistory/js/admin-history-versions.min.js.gz', // From 5.0.0-beta1 to 5.0.0-beta2 '/libraries/src/Cache/Storage/WincacheStorage.php', + '/administrator/language/en-GB/plg_twofactorauth_totp.ini', + '/administrator/language/en-GB/plg_twofactorauth_totp.sys.ini', + '/administrator/language/en-GB/plg_twofactorauth_yubikey.ini', + '/administrator/language/en-GB/plg_twofactorauth_yubikey.sys.ini', ]; $folders = [ diff --git a/administrator/language/en-GB/com_guidedtours.ini b/administrator/language/en-GB/com_guidedtours.ini index 94669973f4243..84b009fb525dc 100644 --- a/administrator/language/en-GB/com_guidedtours.ini +++ b/administrator/language/en-GB/com_guidedtours.ini @@ -4,8 +4,6 @@ ; Note : All ini files need to be saved as UTF-8 COM_GUIDEDTOURS="Guided Tours" -; Deprecated, will be removed with 5.0 -COM_GUIDEDTOURS_BASIC_STEP="Basic Step" COM_GUIDEDTOURS_CONFIGURATION="Guided Tours: Options" COM_GUIDEDTOURS_DESCRIPTION="Description" COM_GUIDEDTOURS_DESCRIPTION_TRANSLATION="Description (%s)" diff --git a/administrator/language/en-GB/com_media.ini b/administrator/language/en-GB/com_media.ini index 61ae6cb410017..915cca96a746d 100644 --- a/administrator/language/en-GB/com_media.ini +++ b/administrator/language/en-GB/com_media.ini @@ -43,10 +43,6 @@ COM_MEDIA_FIELD_CHECK_MIME_DESC="Use MIME Magic or Fileinfo to attempt to verify COM_MEDIA_FIELD_CHECK_MIME_LABEL="Check MIME Types" COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC="Ignored file extensions for MIME type checking and restricted uploads." COM_MEDIA_FIELD_IGNORED_EXTENSIONS_LABEL="Ignored Extensions" -; Deprecated, will be removed with 5.0 -COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC="A comma separated list of forbidden MIME types to upload." -; Deprecated, will be removed with 5.0 -COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_LABEL="Forbidden MIME Types" COM_MEDIA_FIELD_LEGAL_AUDIO_EXTENSIONS_DESC="Audio extensions (file types) you are allowed to upload (comma separated). These are used to check for valid audio headers." COM_MEDIA_FIELD_LEGAL_AUDIO_EXTENSIONS_LABEL="Legal Audio Extensions (File Types)" COM_MEDIA_FIELD_LEGAL_DOCUMENT_EXTENSIONS_DESC="Document extensions (file types) you are allowed to upload (comma separated). These are used to check for valid document headers." diff --git a/administrator/language/en-GB/com_newsfeeds.ini b/administrator/language/en-GB/com_newsfeeds.ini index 55941aede1a7b..cec86065bd342 100644 --- a/administrator/language/en-GB/com_newsfeeds.ini +++ b/administrator/language/en-GB/com_newsfeeds.ini @@ -89,15 +89,7 @@ COM_NEWSFEEDS_NUM_ARTICLES_HEADING_ASC="# Articles ascending" COM_NEWSFEEDS_NUM_ARTICLES_HEADING_DESC="# Articles descending" COM_NEWSFEEDS_RIGHT="Right" COM_NEWSFEEDS_SAVE_SUCCESS="News feed saved." -; Deprecated, will be removed with 5.0 -COM_NEWSFEEDS_SEARCH_IN_TITLE="Search" COM_NEWSFEEDS_SELECT_A_FEED="Select a News Feed" -; Deprecated, will be removed with 5.0 -COM_NEWSFEEDS_SELECT_FEED="Select feed" -; Deprecated, will be removed with 5.0 -COM_NEWSFEEDS_SUBMENU_CATEGORIES="Categories" -; Deprecated, will be removed with 5.0 -COM_NEWSFEEDS_SUBMENU_NEWSFEEDS="News Feeds" COM_NEWSFEEDS_TABLE_CAPTION="News Feeds" COM_NEWSFEEDS_TIP_ASSOCIATION="Associated news feeds" COM_NEWSFEEDS_WARNING_PROVIDE_VALID_NAME="Please provide a valid name." diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini index 56bcedadc5b63..9864e177ca8eb 100644 --- a/administrator/language/en-GB/com_users.ini +++ b/administrator/language/en-GB/com_users.ini @@ -222,14 +222,6 @@ COM_USERS_MAIL_NO_USERS_COULD_BE_FOUND_IN_THIS_GROUP="No users could be found in COM_USERS_MAIL_ONLY_YOU_COULD_BE_FOUND_IN_THIS_GROUP="You are the only user in this group." COM_USERS_MAIL_PASSWORD_RESET_DESC="Sent to a user by the "Forgot your password?" link eg in a login form." COM_USERS_MAIL_PASSWORD_RESET_TITLE="Users: Password Reset" -; Deprecated, will be removed with 5.0 -COM_USERS_MAIL_PLEASE_FILL_IN_THE_FORM_CORRECTLY="Please fill in the form correctly." -; Deprecated, will be removed with 5.0 -COM_USERS_MAIL_PLEASE_FILL_IN_THE_MESSAGE="Please enter a message" -; Deprecated, will be removed with 5.0 -COM_USERS_MAIL_PLEASE_FILL_IN_THE_SUBJECT="Please enter a subject" -; Deprecated, will be removed with 5.0 -COM_USERS_MAIL_PLEASE_SELECT_A_GROUP="Please select a Group" COM_USERS_MAIL_REGISTRATION_ADMIN_NEW_NOTIFICATION_DESC="Notification to the admin that a new, activated account has been created." COM_USERS_MAIL_REGISTRATION_ADMIN_NEW_NOTIFICATION_TITLE="Users: New account notification to admin" COM_USERS_MAIL_REGISTRATION_ADMIN_VERIFICATION_REQUEST_DESC="Notification to admins to verify a new, verified account." @@ -454,20 +446,3 @@ COM_CATEGORIES_CATEGORY_ADD_TITLE="User Notes: New Category" ; Categories overri COM_CATEGORIES_CATEGORY_EDIT_TITLE="User Notes: Edit Category" ; Categories overrides COM_MODULES_NONE=":: None ::" ; Duplicate, used in MFA settings - -; Obsolete language strings since 4.2.0 -- Remove them in Joomla 5.0 -COM_USERS_CONFIG_FIELD_ENFORCE_2FA_FIELD_ADMIN="Admin (Backend)" -COM_USERS_CONFIG_FIELD_ENFORCE_2FA_FIELD_BOTH="Both" -COM_USERS_CONFIG_FIELD_ENFORCE_2FA_FIELD_DESC="You must enable at least one Two Factor Authentication plugin." -COM_USERS_CONFIG_FIELD_ENFORCE_2FA_FIELD_LABEL="Enforce Two Factor Authentication" -COM_USERS_CONFIG_FIELD_ENFORCE_2FA_FIELD_SITE="Site (Frontend)" -COM_USERS_CONFIG_FIELD_ENFORCE_2FA_GROUPS_LABEL="Enforce Two Factor Authentication for Usergroups" -COM_USERS_ERROR_SECRET_CODE_WITHOUT_TFA="You have entered a Secret Code but two factor authentication is not enabled in your user account. If you want to use a secret code to secure your login please edit your user profile and enable two factor authentication." -COM_USERS_HEADING_TFA="Two Factor" -COM_USERS_TFA_ACTIVE="Uses Two Factor Authentication" -COM_USERS_TFA_NOTACTIVE="Does not use Two Factor Authentication" -COM_USERS_USER_FIELD_TWOFACTOR_LABEL="Authentication Method" -COM_USERS_USER_OTEPS="One time emergency passwords" -COM_USERS_USER_OTEPS_DESC="If you do not have access to your two factor authentication device you can use any of the following passwords instead of a regular security code. Each one of these emergency passwords is immediately destroyed upon use. We recommend printing these passwords out and keeping the printout in a safe and accessible location, eg your wallet or a safety deposit box." -COM_USERS_USER_OTEPS_WAIT_DESC="There are no emergency one time passwords generated in your account. The passwords will be generated automatically and displayed here as soon as you activate two factor authentication." -COM_USERS_USER_TWO_FACTOR_AUTH="Two Factor Authentication" diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini index aeda60ee07221..4e2999720cbb6 100644 --- a/administrator/language/en-GB/joomla.ini +++ b/administrator/language/en-GB/joomla.ini @@ -203,14 +203,8 @@ JFIELD_ALIAS_LABEL="Alias" JFIELD_ALIAS_PLACEHOLDER="Auto-generate from title" JFIELD_ALT_COMPONENT_LAYOUT_DESC="Use a layout from the supplied component view or overrides in the templates." JFIELD_ALT_LAYOUT_LABEL="Layout" -; Deprecated, will be removed with 5.0 -JFIELD_ALT_MODULE_LAYOUT_DESC="Use a layout from the supplied module or overrides in the templates." JFIELD_ALT_PAGE_TITLE_DESC="An optional alternative page title to set that will change the TITLE tag in the HTML output." JFIELD_ALT_PAGE_TITLE_LABEL="Alternative Page Title" -; Deprecated, will be removed with 5.0 -JFIELD_ASSET_ID_DESC="Asset ID" -; Deprecated, will be removed with 5.0 -JFIELD_ASSET_ID_LABEL="Asset ID" JFIELD_BASIC_LOGIN_DESCRIPTION_LABEL="Login Description Text" JFIELD_BASIC_LOGIN_DESCRIPTION_SHOW_LABEL="Login Description" JFIELD_BASIC_LOGOUT_DESCRIPTION_LABEL="Logout Description Text" @@ -693,8 +687,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/plg_system_debug.ini b/administrator/language/en-GB/plg_system_debug.ini index cdb82aafd0481..4760a33d8f2a6 100644 --- a/administrator/language/en-GB/plg_system_debug.ini +++ b/administrator/language/en-GB/plg_system_debug.ini @@ -30,51 +30,3 @@ PLG_DEBUG_LANGUAGE_FIELDSET_LABEL="Language" PLG_DEBUG_LOGGING_FIELDSET_LABEL="Logging" PLG_DEBUG_XML_DESCRIPTION="This plugin provides a variety of system information as well as help for the creation of translation files." PLG_SYSTEM_DEBUG="System - Debug" - -; All the following strings are deprecated and will be removed with 5.0 -PLG_DEBUG_BYTES="Bytes" -PLG_DEBUG_CALL_STACK="Call Stack" -PLG_DEBUG_CALL_STACK_CALLER="Caller" -PLG_DEBUG_CALL_STACK_FILE_AND_LINE="File and line number" -PLG_DEBUG_CALL_STACK_SAME_FILE="Same as call in the line below." -PLG_DEBUG_ERRORS="Errors" -PLG_DEBUG_EXPLAIN="Explain" -PLG_DEBUG_LANGUAGE_FILES_IN_ERROR="Parsing errors in language files" -PLG_DEBUG_LANGUAGE_FILES_LOADED="Language Files Loaded" -PLG_DEBUG_LANG_LOADED="Loaded" -PLG_DEBUG_LANG_NOT_LOADED="Not loaded" -PLG_DEBUG_LINK_FORMAT="Add xdebug.file_link_format directive to your php.ini file to have links for files." -PLG_DEBUG_LOGS="Log Messages" -PLG_DEBUG_LOGS_DEPRECATED_FOUND_TEXT="The code that is marked as deprecated will not work in upcoming Joomla versions, please review it." -PLG_DEBUG_LOGS_DEPRECATED_FOUND_TITLE="%s deprecated messages logged!" -PLG_DEBUG_LOGS_LOGGED="%s messages logged" -PLG_DEBUG_MEMORY="Memory" -PLG_DEBUG_MEMORY_USAGE="Memory Usage" -PLG_DEBUG_MEMORY_USED_FOR_QUERY="Query memory: %s Memory before query: %s" -PLG_DEBUG_NO_PROFILE="No SHOW PROFILE (maybe because there are more than 100 queries)" -PLG_DEBUG_OTHER_QUERIES="OTHER Tables:" -PLG_DEBUG_PROFILE="Profile" -PLG_DEBUG_PROFILE_INFORMATION="Profile Information" -PLG_DEBUG_QUERIES="Database Queries" -PLG_DEBUG_QUERIES_LOGGED="%d Queries Logged" -PLG_DEBUG_QUERIES_TIME="Database queries total: %s" -PLG_DEBUG_QUERY_AFTER_LAST="After last query: %s" -PLG_DEBUG_QUERY_DUPLICATES="Duplicate queries" -PLG_DEBUG_QUERY_DUPLICATES_FOUND="Duplicate found!" -PLG_DEBUG_QUERY_DUPLICATES_NUMBER="%s duplicates" -PLG_DEBUG_QUERY_DUPLICATES_TOTAL_NUMBER="%s duplicate found!" -PLG_DEBUG_QUERY_EXPLAIN_NOT_POSSIBLE="EXPLAIN not possible on query: %s" -PLG_DEBUG_QUERY_TIME="Query Time: %s" -PLG_DEBUG_QUERY_TYPES_LOGGED="%d Query Types Logged, Sorted by Occurrences." -PLG_DEBUG_QUERY_TYPE_AND_OCCURRENCES="%2$d × %1$s" -PLG_DEBUG_ROWS_RETURNED_BY_QUERY="Rows returned: %s" -PLG_DEBUG_SELECT_QUERIES="SELECT Tables:" -PLG_DEBUG_SESSION="Session" -PLG_DEBUG_TIME="Time" -PLG_DEBUG_TITLE="Joomla! Debug Console" -PLG_DEBUG_UNKNOWN_FILE="Unknown file" -PLG_DEBUG_UNTRANSLATED_STRINGS="Untranslated Strings" -PLG_DEBUG_WARNING_NO_INDEX="NO INDEX KEY COULD BE USED" -PLG_DEBUG_WARNING_NO_INDEX_DESC="This table probably has a missing index on WHERE equalities and/or JOIN ON column(s) or is written in a way that no index can be used, causing a time-consuming full table scan." -PLG_DEBUG_WARNING_USING_FILESORT="Using filesort" -PLG_DEBUG_WARNING_USING_FILESORT_DESC="This table probably has a missing index on WHERE/ON equality column(s) ending by the ORDER BY column(s) or is written in a way that no index can be used, causing a time-consuming filesort." diff --git a/administrator/language/en-GB/plg_twofactorauth_totp.ini b/administrator/language/en-GB/plg_twofactorauth_totp.ini deleted file mode 100644 index 7a29b31ee787b..0000000000000 --- a/administrator/language/en-GB/plg_twofactorauth_totp.ini +++ /dev/null @@ -1,34 +0,0 @@ -; Joomla! Project -; (C) 2013 Open Source Matters, Inc. -; License GNU General Public License version 2 or later; see LICENSE.txt -; Note : All ini files need to be saved as UTF-8 -; Obsolete since 4.2.0 -- The entire file must be removed in Joomla 5.0 - -PLG_TWOFACTORAUTH_TOTP="Two Factor Authentication - Google Authenticator" -PLG_TWOFACTORAUTH_TOTP_ERR_VALIDATIONFAILED="You did not enter a valid security code. Please check your Google Authenticator setup and make sure that the time on your device matches the time on the site." -PLG_TWOFACTORAUTH_TOTP_INTRO="This feature allows you to use Google Authenticator, or a compatible application such as FreeOTP, for two factor authentication. In addition to your username and password you will also need to provide a six digit security code to be able to login to this site. The security code is rotated every 30 seconds. This provides extra protection against hackers logging in to your account even if they were able to get hold of your password." -PLG_TWOFACTORAUTH_TOTP_METHOD_TITLE="Google Authenticator" -PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_ACTION="Enable two factor authentication" -PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_BODY="

Joomla! comes with a built-in two factor authentication system. It secures your site login with a secondary secret code that's changing every 30 seconds. You can use your mobile device and the Google Authenticator app to produce that code.

By selecting the button below:

" -PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_TITLE="Two Factor Authentication is Available" -PLG_TWOFACTORAUTH_TOTP_SECTION_ADMIN="Administrator (Backend)" -PLG_TWOFACTORAUTH_TOTP_SECTION_BOTH="Both" -PLG_TWOFACTORAUTH_TOTP_SECTION_LABEL="Site Section" -PLG_TWOFACTORAUTH_TOTP_SECTION_SITE="Site (Frontend)" -PLG_TWOFACTORAUTH_TOTP_STEP1_HEAD="Step 1 - Get Google Authenticator" -PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM1="Official Google Authenticator app for Android, iOS and BlackBerry" -PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM1_LINK="https://support.google.com/accounts/bin/answer.py?hl=en&answer=1066447" ; Check the URL and change the part hl=en to your language tag if this is available (example hl=de; hl=zh-cn; hl=zh-tw) -PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM2="Compatible clients for other devices and operating system (listed in Wikipedia)." -PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM2_LINK="https://en.wikipedia.org/wiki/Google_Authenticator#Implementation" ; Change and check this link if there is a translation in your language available. (current: German, Spanish, French, Japanese, Polish) -PLG_TWOFACTORAUTH_TOTP_STEP1_TEXT="Download and install Google Authenticator, or a compatible application such as FreeOTP, on your smartphone or desktop. Use one of the following:" -PLG_TWOFACTORAUTH_TOTP_STEP1_WARN="Please remember to sync your device's clock with a time-server. Time drift in your device may cause an inability to log in to your site." -PLG_TWOFACTORAUTH_TOTP_STEP2_ACCOUNT="Account" -PLG_TWOFACTORAUTH_TOTP_STEP2_ALTTEXT="Alternatively, you can scan the following QR code in Google Authenticator." -PLG_TWOFACTORAUTH_TOTP_STEP2_HEAD="Step 2 - Set up" -PLG_TWOFACTORAUTH_TOTP_STEP2_KEY="Key" -PLG_TWOFACTORAUTH_TOTP_STEP2_RESET="If you want to change the key, disable the two factor authentication. When you try enabling it again it will generate a new key." -PLG_TWOFACTORAUTH_TOTP_STEP2_TEXT="You will need to enter the following information to Google Authenticator or a compatible app." -PLG_TWOFACTORAUTH_TOTP_STEP3_HEAD="Step 3 - Activate Two Factor Authentication" -PLG_TWOFACTORAUTH_TOTP_STEP3_SECURITYCODE="Security Code" -PLG_TWOFACTORAUTH_TOTP_STEP3_TEXT="To verify that everything is set up properly, please enter the security code displayed in Google Authenticator in the field below. Afterwards, please save your user profile. If the code is correct, the Two Factor Authentication feature will be enabled." -PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION="Allows users on your site to use two factor authentication using Google Authenticator or other compatible time-based One Time Password generators such as FreeOTP. To use two factor authentication please edit the user profile and enable two factor authentication." diff --git a/administrator/language/en-GB/plg_twofactorauth_totp.sys.ini b/administrator/language/en-GB/plg_twofactorauth_totp.sys.ini deleted file mode 100644 index d8d618252874f..0000000000000 --- a/administrator/language/en-GB/plg_twofactorauth_totp.sys.ini +++ /dev/null @@ -1,8 +0,0 @@ -; Joomla! Project -; (C) 2013 Open Source Matters, Inc. -; License GNU General Public License version 2 or later; see LICENSE.txt -; Note : All ini files need to be saved as UTF-8 -; Obsolete since 4.2.0 -- The entire file must be removed in Joomla 5.0 - -PLG_TWOFACTORAUTH_TOTP="Two Factor Authentication - Google Authenticator" -PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION="Allows users on your site to use two factor authentication using Google Authenticator or other compatible time-based One Time Password generators such as FreeOTP. To use two factor authentication please edit the user profile and enable two factor authentication." diff --git a/administrator/language/en-GB/plg_twofactorauth_yubikey.ini b/administrator/language/en-GB/plg_twofactorauth_yubikey.ini deleted file mode 100644 index cb6ef398a2866..0000000000000 --- a/administrator/language/en-GB/plg_twofactorauth_yubikey.ini +++ /dev/null @@ -1,20 +0,0 @@ -; Joomla! Project -; (C) 2013 Open Source Matters, Inc. -; License GNU General Public License version 2 or later; see LICENSE.txt -; Note : All ini files need to be saved as UTF-8 -; Obsolete since 4.2.0 -- The entire file must be removed in Joomla 5.0 - -PLG_TWOFACTORAUTH_TOTP_RESET_HEAD="Your YubiKey is already linked to your user account." -PLG_TWOFACTORAUTH_TOTP_RESET_TEXT="If you want to unlink your YubiKey from your user account or use another YubiKey, please first disable two factor authentication and save your user profile. Then come back to this user profile page and re-activate two factor authentication with the YubiKey method." -PLG_TWOFACTORAUTH_YUBIKEY="Two Factor Authentication - YubiKey" -PLG_TWOFACTORAUTH_YUBIKEY_ERR_VALIDATIONFAILED="You did not enter a valid YubiKey secret code or the YubiCloud servers are unreachable at this time." -PLG_TWOFACTORAUTH_YUBIKEY_INTRO="This feature allows you to use a YubiKey secure hardware token for two factor authentication. In addition to your username and password you will also need to insert your YubiKey into your computer's USB port, select inside the Secret Key area of the site's login area and touch YubiKey's gold disk. The secret code generated by your YubiKey is unique to your device and changes constantly. This provides extra protection against hackers logging in to your account even if they were able to get hold of your password." -PLG_TWOFACTORAUTH_YUBIKEY_METHOD_TITLE="YubiKey" -PLG_TWOFACTORAUTH_YUBIKEY_SECTION_ADMIN="Administrator (Backend)" -PLG_TWOFACTORAUTH_YUBIKEY_SECTION_BOTH="Both" -PLG_TWOFACTORAUTH_YUBIKEY_SECTION_LABEL="Site Section" -PLG_TWOFACTORAUTH_YUBIKEY_SECTION_SITE="Site (Frontend)" -PLG_TWOFACTORAUTH_YUBIKEY_SECURITYCODE="Security Code" -PLG_TWOFACTORAUTH_YUBIKEY_STEP1_HEAD="Set up" -PLG_TWOFACTORAUTH_YUBIKEY_STEP1_TEXT="Please insert your YubiKey device into your computer's USB port. Select the Security Code field below. Then touch the gold disk on your YubiKey device for one second. Afterwards, please save your user profile. If the code generated by your YubiKey is validated by YubiCloud the Two Factor Authentication feature will be enabled and this YubiKey will be linked with your user account." -PLG_TWOFACTORAUTH_YUBIKEY_XML_DESCRIPTION="Allows users on your site to use two factor authentication using a YubiKey secure hardware token. Users need their own YubiKey available from www.yubico.com. To use two factor authentication users have to edit their user profile and enable two factor authentication." diff --git a/administrator/language/en-GB/plg_twofactorauth_yubikey.sys.ini b/administrator/language/en-GB/plg_twofactorauth_yubikey.sys.ini deleted file mode 100644 index 15c97bdf8688e..0000000000000 --- a/administrator/language/en-GB/plg_twofactorauth_yubikey.sys.ini +++ /dev/null @@ -1,8 +0,0 @@ -; Joomla! Project -; (C) 2013 Open Source Matters, Inc. -; License GNU General Public License version 2 or later; see LICENSE.txt -; Note : All ini files need to be saved as UTF-8 -; Obsolete since 4.2.0 -- The entire file must be removed in Joomla 5.0 - -PLG_TWOFACTORAUTH_YUBIKEY="Two Factor Authentication - YubiKey" -PLG_TWOFACTORAUTH_YUBIKEY_XML_DESCRIPTION="Allows users on your site to use two factor authentication using a YubiKey secure hardware token. Users need their own YubiKey available from www.yubico.com. To use two factor authentication users have to edit their user profile and enable two factor authentication." diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini index e787e4f8d6986..3d2b86cc26101 100644 --- a/api/language/en-GB/joomla.ini +++ b/api/language/en-GB/joomla.ini @@ -201,14 +201,8 @@ JFIELD_ALIAS_LABEL="Alias" JFIELD_ALIAS_PLACEHOLDER="Auto-generate from title" JFIELD_ALT_COMPONENT_LAYOUT_DESC="Use a layout from the supplied component view or overrides in the templates." JFIELD_ALT_LAYOUT_LABEL="Layout" -; Deprecated, will be removed with 5.0 -JFIELD_ALT_MODULE_LAYOUT_DESC="Use a layout from the supplied module or overrides in the templates." JFIELD_ALT_PAGE_TITLE_DESC="An optional alternative page title to set that will change the TITLE tag in the HTML output." JFIELD_ALT_PAGE_TITLE_LABEL="Alternative Page Title" -; Deprecated, will be removed with 5.0 -JFIELD_ASSET_ID_DESC="Asset ID" -; Deprecated, will be removed with 5.0 -JFIELD_ASSET_ID_LABEL="Asset ID" JFIELD_BASIC_LOGIN_DESCRIPTION_LABEL="Login Description Text" JFIELD_BASIC_LOGIN_DESCRIPTION_SHOW_LABEL="Login Description" JFIELD_BASIC_LOGOUT_DESCRIPTION_LABEL="Logout Description Text" @@ -685,8 +679,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/language/en-GB/com_media.ini b/language/en-GB/com_media.ini index 37e1947201b98..3ec34a0f5c8c4 100644 --- a/language/en-GB/com_media.ini +++ b/language/en-GB/com_media.ini @@ -53,10 +53,6 @@ COM_MEDIA_FIELD_CHECK_MIME_DESC="Use MIME Magic or Fileinfo to try to verify fil COM_MEDIA_FIELD_CHECK_MIME_LABEL="Check MIME Types" COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC="Ignored file extensions for MIME type checking and restricted uploads." COM_MEDIA_FIELD_IGNORED_EXTENSIONS_LABEL="Ignored Extensions" -; Deprecated, will be removed with 5.0 -COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC="A comma separated list of forbidden MIME types to upload." -; Deprecated, will be removed with 5.0 -COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_LABEL="Forbidden MIME Types" COM_MEDIA_FIELD_LEGAL_EXTENSIONS_DESC="Extensions (file types) you are allowed to upload (comma separated)." COM_MEDIA_FIELD_LEGAL_EXTENSIONS_LABEL="Legal Extensions (File Types)" COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_DESC="Image extensions (file types) you are allowed to upload (comma separated). These are used to check for valid image headers." diff --git a/language/en-GB/com_users.ini b/language/en-GB/com_users.ini index 2ff24bcfa8d52..1e1d270d6d75d 100644 --- a/language/en-GB/com_users.ini +++ b/language/en-GB/com_users.ini @@ -153,15 +153,3 @@ COM_USERS_USER_FIELD_TIMEZONE_LABEL="Time Zone" COM_USERS_USER_MULTIFACTOR_AUTH="Multi-factor Authentication" COM_USERS_USER_NOT_FOUND="User not found." COM_USERS_USER_SAVE_FAILED="Failed to save user: %s" - -; Obsolete language strings since 4.2.0 -- Remove them in Joomla 5.0 -COM_USERS_ERROR_SECRET_CODE_WITHOUT_TFA="You have entered a Secret Code but two factor authentication is not enabled in your user account. If you want to use a secret code to secure your login please edit your user profile and enable two factor authentication." -COM_USERS_PROFILE_OTEPS="One time emergency passwords" -COM_USERS_PROFILE_OTEPS_DESC="If you do not have access to your two factor authentication device you can use any of the following passwords instead of a regular security code. Each one of these emergency passwords is immediately destroyed upon use. We recommend printing these passwords out and keeping the printout in a safe and accessible location, eg your wallet or a safety deposit box." -COM_USERS_PROFILE_OTEPS_WAIT_DESC="There are no emergency one time passwords generated in your account. The passwords will be generated automatically and displayed here as soon as you activate two factor authentication." -COM_USERS_PROFILE_TWOFACTOR_DESC="Select the two factor authentication method you want to use." -COM_USERS_PROFILE_TWOFACTOR_LABEL="Authentication Method" -COM_USERS_PROFILE_TWO_FACTOR_AUTH="Two Factor Authentication" - -; Obsolete language strings since 4.3.0 -- Remove them in Joomla 5.0 -COM_USERS_FRONTEND_LOGIN_SUCCESS="You have been logged in." From 9e735aa6c115d172f81d768f5616bb3e42db8e01 Mon Sep 17 00:00:00 2001 From: brian teeman Date: Tue, 12 Sep 2023 15:42:56 +0100 Subject: [PATCH 2/5] oops --- administrator/language/en-GB/joomla.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini index 4e2999720cbb6..e8fc3c3c8f0ab 100644 --- a/administrator/language/en-GB/joomla.ini +++ b/administrator/language/en-GB/joomla.ini @@ -687,6 +687,8 @@ 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" From 7de12648bf25467feee149fa82ecffc19fced2f6 Mon Sep 17 00:00:00 2001 From: brian teeman Date: Tue, 12 Sep 2023 15:43:47 +0100 Subject: [PATCH 3/5] oopsoops --- api/language/en-GB/joomla.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini index 3d2b86cc26101..09cfd06dd5044 100644 --- a/api/language/en-GB/joomla.ini +++ b/api/language/en-GB/joomla.ini @@ -679,6 +679,8 @@ 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" From 55b6967a66a28f5a9c12b503775cb074ab7cc05a Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Tue, 12 Sep 2023 19:03:52 +0100 Subject: [PATCH 4/5] Update script.php --- administrator/components/com_admin/script.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 893540f902676..e9f8f7513fe58 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -2044,11 +2044,11 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/media/com_contenthistory/js/admin-history-versions.min.js', '/media/com_contenthistory/js/admin-history-versions.min.js.gz', // From 5.0.0-beta1 to 5.0.0-beta2 - '/libraries/src/Cache/Storage/WincacheStorage.php', '/administrator/language/en-GB/plg_twofactorauth_totp.ini', '/administrator/language/en-GB/plg_twofactorauth_totp.sys.ini', '/administrator/language/en-GB/plg_twofactorauth_yubikey.ini', '/administrator/language/en-GB/plg_twofactorauth_yubikey.sys.ini', + '/libraries/src/Cache/Storage/WincacheStorage.php', ]; $folders = [ From 0b4196b5c4cad142d5021a321e9bf1f3d9ddfe84 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Tue, 12 Sep 2023 20:35:28 +0100 Subject: [PATCH 5/5] Update script.php --- administrator/components/com_admin/script.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 10bd3054de103..28eca787ecebc 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -2048,10 +2048,6 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/media/com_contenthistory/js/admin-history-versions.min.js', '/media/com_contenthistory/js/admin-history-versions.min.js.gz', // From 5.0.0-beta1 to 5.0.0-beta2 - '/administrator/language/en-GB/plg_twofactorauth_totp.ini', - '/administrator/language/en-GB/plg_twofactorauth_totp.sys.ini', - '/administrator/language/en-GB/plg_twofactorauth_yubikey.ini', - '/administrator/language/en-GB/plg_twofactorauth_yubikey.sys.ini', '/language/en-GB/lib_simplepie.sys.ini', '/libraries/src/Cache/Storage/WincacheStorage.php', ];