[4.1] Upmerges from 3.x 2022-05-01

[joomlapl-bot]

PR w związku ze zmianą oryginału joomla/joomla-cms#37704 Poniżej zmiany w oryginale:

Click to expand the diff!

diff --git a/administrator/language/en-GB/plg_system_privacyconsent.ini b/administrator/language/en-GB/plg_system_privacyconsent.ini
index 0b5bfbb17e36..30ef0294554d 100644
--- a/administrator/language/en-GB/plg_system_privacyconsent.ini
+++ b/administrator/language/en-GB/plg_system_privacyconsent.ini
@@ -32,6 +32,7 @@ PLG_SYSTEM_PRIVACYCONSENT_NOTE_FIELD_LABEL="Short Privacy Policy"
 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_OPTION_AGREE="I agree"
+PLG_SYSTEM_PRIVACYCONSENT_OPTION_DO_NOT_AGREE="I do not agree"
 PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_DEFAULT="Please confirm that you consent to this website storing your information by agreeing to the privacy policy."
 PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_DESC="Custom message to be displayed on redirect. If left blank then the default message will be used."
 PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_LABEL="Redirect Message"
diff --git a/administrator/language/en-GB/plg_user_profile.ini b/administrator/language/en-GB/plg_user_profile.ini
index 0b3e2ed7cb49..a2c2a57c1b37 100644
--- a/administrator/language/en-GB/plg_user_profile.ini
+++ b/administrator/language/en-GB/plg_user_profile.ini
@@ -25,6 +25,7 @@ PLG_USER_PROFILE_FIELD_TOS_LABEL="Terms of Service"
 PLG_USER_PROFILE_FIELD_WEB_SITE_LABEL="Website"
 PLG_USER_PROFILE_FILL_FIELD_DESC_SITE="If required, please fill this field."
 PLG_USER_PROFILE_OPTION_AGREE="Agree"
+PLG_USER_PROFILE_OPTION_DO_NOT_AGREE="I do not agree"
 PLG_USER_PROFILE_SLIDER_LABEL="User Profile"
 PLG_USER_PROFILE_SPACER_DOB="The date of birth entered should use the format Year-Month-Day, eg 2019-01-27." ; Adapt to the format you entered in the 'DATE_FORMAT_CALENDAR_DATE'
 PLG_USER_PROFILE_XML_DESCRIPTION="User Profile Plugin"
diff --git a/language/en-GB/com_privacy.ini b/language/en-GB/com_privacy.ini
index bad578ebc323..e5540fb0a00f 100644
--- a/language/en-GB/com_privacy.ini
+++ b/language/en-GB/com_privacy.ini
@@ -9,7 +9,7 @@ COM_PRIVACY_ADMIN_NOTIFICATION_USER_CONFIRMED_REQUEST_SUBJECT="Information Reque
 COM_PRIVACY_ADMIN_NOTIFICATION_USER_CREATED_REQUEST_MESSAGE="A new information request has been submitted by %1$s."
 COM_PRIVACY_ADMIN_NOTIFICATION_USER_CREATED_REQUEST_SUBJECT="Information Request Submitted"
 COM_PRIVACY_CONFIRM_REMIND_SUCCEEDED="Your consent to this website's Privacy Policy has been extended."
-COM_PRIVACY_CONFIRM_REQUEST_FIELDSET_LABEL="An email has been sent to your email address. The email has a confirmation token, please confirm your email address again and paste the confirmation token in the field below to prove that you are the owner of the information being requested."
+COM_PRIVACY_CONFIRM_REQUEST_FIELDSET_LABEL="An email has been sent to your email address. Please paste the confirmation token from the email into the field below to prove that you are the owner of the information being requested."
 COM_PRIVACY_CONFIRM_REQUEST_SUCCEEDED="Your information request has been confirmed. We will process your request as soon as possible and the export will be sent to your email."
 COM_PRIVACY_CREATE_REQUEST_SUCCEEDED="Your information request has been created. Before it can be processed, you must verify this request. An email has been sent to your address with additional instructions to complete this verification."
 COM_PRIVACY_EMAIL_REQUEST_BODY_EXPORT_REQUEST="Someone has created a request to export all personal information related to this email address at {URL}. As a security measure, you must confirm that this is a valid request for your personal information from this website.\n\nIf this was a mistake, ignore this email and nothing will happen.\n\nIn order to confirm this request, 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 24 hours from the time this email was sent."
diff --git a/plugins/system/privacyconsent/forms/privacyconsent.xml b/plugins/system/privacyconsent/forms/privacyconsent.xml
index e572bca1255c..ce7dc3ed67c9 100644
--- a/plugins/system/privacyconsent/forms/privacyconsent.xml
+++ b/plugins/system/privacyconsent/forms/privacyconsent.xml
@@ -14,7 +14,7 @@
 				required="true"
 				>
 				<option value="1">PLG_SYSTEM_PRIVACYCONSENT_OPTION_AGREE</option>
-				<option value="0">JNO</option>
+				<option value="0">PLG_SYSTEM_PRIVACYCONSENT_OPTION_DO_NOT_AGREE</option>
 			</field>
 		</fieldset>
 	</fields>
diff --git a/plugins/user/profile/forms/profile.xml b/plugins/user/profile/forms/profile.xml
index 604d8fdfe83c..38a1bfce5c5e 100644
--- a/plugins/user/profile/forms/profile.xml
+++ b/plugins/user/profile/forms/profile.xml
@@ -105,7 +105,7 @@
 				filter="integer"
 				>
 				<option value="1">PLG_USER_PROFILE_OPTION_AGREE</option>
-				<option value="0">JNO</option>
+				<option value="0">PLG_USER_PROFILE_OPTION_DO_NOT_AGREE</option>
 			</field>
 		</fieldset>
 	</fields>