Click to expand the diff!
```diff
diff --git a/administrator/language/en-GB/com_config.ini b/administrator/language/en-GB/com_config.ini
index 9cf76faf5aa1..c4c0b646d826 100644
--- a/administrator/language/en-GB/com_config.ini
+++ b/administrator/language/en-GB/com_config.ini
@@ -67,7 +67,7 @@ COM_CONFIG_FIELD_DEBUG_CONST_LANG_DESC="Select if you should display the languag
COM_CONFIG_FIELD_DEBUG_CONST_LANG_LABEL="Language Display"
COM_CONFIG_FIELD_DEBUG_LANG_DESC="Displays ?? around a language string constant when the string is not present in the currently loaded language files or ** around the string value when the string is present. If none of the above is displayed, it could mean the text is hardcoded and needs a language string."
COM_CONFIG_FIELD_DEBUG_LANG_LABEL="Debug Language"
-COM_CONFIG_FIELD_DEBUG_SYSTEM_DESC="Use it only for troubleshooting, ideally on private copies of your site. The more technical information displayed in this mode can be a security risk if left enabled on live sites. Remember to publish the “System - Debug” plugin to get detailed information on each page being loaded."
+COM_CONFIG_FIELD_DEBUG_SYSTEM_DESC="Use it only for troubleshooting, ideally on private copies of your site. The more technical information displayed in this mode can be a security risk if left enabled on live sites. Remember to publish the \"System - Debug\" plugin to get detailed information on each page being loaded."
COM_CONFIG_FIELD_DEBUG_SYSTEM_LABEL="Debug System"
COM_CONFIG_FIELD_DEBUG_VALUE="Value"
COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC="Set the Access Level which will be assigned by default to newly created items."
@@ -158,7 +158,7 @@ COM_CONFIG_FIELD_REDIS_PORT_LABEL="Redis Server Port"
COM_CONFIG_FIELD_SEF_REWRITE_NOTE="Apache and Litespeed: Rename htaccess.txt to .htaccess IIS: Rename web.config.txt to web.config NginX: you must configure your server. Other servers or if unsure: please consult your hosting company."
COM_CONFIG_FIELD_SEF_REWRITE_DESC="Removes the index.php/ part from the URLs."
COM_CONFIG_FIELD_SEF_REWRITE_LABEL="Use URL Rewriting"
-COM_CONFIG_FIELD_SEF_SUFFIX_DESC="By default, Joomla URLs are “bare”, without an extension. This options tells Joomla to add an extension such as .html, .feed etc based on the type of content being displayed by the URL."
+COM_CONFIG_FIELD_SEF_SUFFIX_DESC="By default, Joomla URLs are \"bare\", without an extension. This options tells Joomla to add an extension such as .html, .feed etc based on the type of content being displayed by the URL."
COM_CONFIG_FIELD_SEF_SUFFIX_LABEL="Add Suffix to URL"
COM_CONFIG_FIELD_SEF_URL_DESC="Joomla URLs normally look like index.php?option=com_example&task=item.display&id=1 which isn't easy to convey verbally or in writing. Search Engine Friendly (SEF) URLs are more human–readable, e.g. index.php/example/display/something."
COM_CONFIG_FIELD_SEF_URL_LABEL="Search Engine Friendly URLs"
@@ -209,7 +209,7 @@ COM_CONFIG_FIELD_WEBSERVICES_CORS_ALLOW_METHODS_DESC="Specifies the Web service
COM_CONFIG_FIELD_WEBSERVICES_CORS_ALLOW_ORIGIN_DESC="Specifies the origin allowed to access Web services on this site, sent back in response to a preflight request. Default: * (=all)."
COM_CONFIG_FIELDSET_TAGS_LABEL="Tags"
COM_CONFIG_FILTER_OPTION_SELECT_EXTENSION="- Select Extension -"
-COM_CONFIG_FRONTEDITING_DESC="Joomla can show an overlay in the public front–end, visible only to users with edit privileges, to directly modify the configuration of each module and/or menu displayed on the site. Set to “None” to disable this feature."
+COM_CONFIG_FRONTEDITING_DESC="Joomla can show an overlay in the public front–end, visible only to users with edit privileges, to directly modify the configuration of each module and/or menu displayed on the site. Set to \"None\" to disable this feature."
COM_CONFIG_FRONTEDITING_LABEL="Frontend Editing"
COM_CONFIG_FRONTEDITING_MENUSANDMODULES="Modules & Menus"
COM_CONFIG_FRONTEDITING_MODULES="Modules"
diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini
index 26b58b01cf92..2f81794c2195 100644
--- a/administrator/language/en-GB/com_users.ini
+++ b/administrator/language/en-GB/com_users.ini
@@ -59,7 +59,7 @@ COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_ADMINACTIVATION="Administrator"
COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_SELFACTIVATION="Self"
COM_USERS_CONFIG_FORCEMFAUSERGROUPS_DESC="Any user who belongs in any of the selected user groups will be required to enable Multi-factor Authentication before being able to use the site."
COM_USERS_CONFIG_FORCEMFAUSERGROUPS_LABEL="Enforce Multi-factor Authentication"
-COM_USERS_CONFIG_FRONTEND_CAPTIVE_TEMPLATE_DESC="Choose the frontend template style to use in the Multi-factor Authentication page. Select “- Use Default -” to use the default site template style."
+COM_USERS_CONFIG_FRONTEND_CAPTIVE_TEMPLATE_DESC="Choose the frontend template style to use in the Multi-factor Authentication page. Select \"- Use Default -\" to use the default site template style."
COM_USERS_CONFIG_FRONTEND_CAPTIVE_TEMPLATE_LABEL="Frontend template style"
COM_USERS_CONFIG_FRONTEND_SHOW_TITLE_DESC="Should I display a title in the frontend Multi-factor Authentication verification page? Please note that the title is always displayed in the backend. If you need to change the title please override the language key COM_USERS_USER_MULTIFACTOR_AUTH using the System, Manage, Language Overrides page of the site's backend."
COM_USERS_CONFIG_FRONTEND_SHOW_TITLE_LABEL="Show title in frontend"
@@ -256,7 +256,7 @@ COM_USERS_MFA_ADD_PAGE_HEAD="Add a Multi-factor Authentication Method"
COM_USERS_MFA_BACKUPCODES_PRINT_PROMPT="Backup Codes let you log into the site if your regular Multi-factor Authentication method does not work or you no longer have access to it. Each code can be used only once."
COM_USERS_MFA_BACKUPCODES_PRINT_PROMPT_HEAD="Print these codes and keep them in your wallet."
COM_USERS_MFA_BACKUPCODES_RESET="Regenerate Backup Codes"
-COM_USERS_MFA_BACKUPCODES_RESET_INFO="Use the “Regenerate Backup Codes” button on the toolbar to generate a new set of Backup Codes. We recommend that you do this if you think your Backup Codes are compromised, e.g. someone got hold of a printout with them, or if you are running low on available Backup Codes."
+COM_USERS_MFA_BACKUPCODES_RESET_INFO="Use the \"Regenerate Backup Codes\" button on the toolbar to generate a new set of Backup Codes. We recommend that you do this if you think your Backup Codes are compromised, e.g. someone got hold of a printout with them, or if you are running low on available Backup Codes."
COM_USERS_MFA_EDIT_FIELD_DEFAULT="Make this the default Multi-factor Authentication method"
COM_USERS_MFA_EDIT_FIELD_TITLE="Title"
COM_USERS_MFA_EDIT_FIELD_TITLE_DESC="You and the site administrators will see this name in the list of available Multi-factor Authentication methods for your user account. Please do not include any sensitive or personally identifiable information."
diff --git a/administrator/language/en-GB/plg_multifactorauth_email.ini b/administrator/language/en-GB/plg_multifactorauth_email.ini
index b764291a816d..67812dc9fc9d 100644
--- a/administrator/language/en-GB/plg_multifactorauth_email.ini
+++ b/administrator/language/en-GB/plg_multifactorauth_email.ini
@@ -21,6 +21,6 @@ PLG_MULTIFACTORAUTH_EMAIL_LBL_LABEL="Authentication Code"
PLG_MULTIFACTORAUTH_EMAIL_LBL_PRE_MESSAGE="You have received a six digit Multi-factor Authentication code in your email. Please enter it below."
PLG_MULTIFACTORAUTH_EMAIL_LBL_SETUP_PLACEHOLDER="Six Digit Authentication Code"
PLG_MULTIFACTORAUTH_EMAIL_LBL_SHORTINFO="Receive six digit codes by email."
-PLG_MULTIFACTORAUTH_EMAIL_MAIL_MAIL_DESC="Sent to users from the Multi-factor Authentication page when using the “Authentication Code by Email” option."
+PLG_MULTIFACTORAUTH_EMAIL_MAIL_MAIL_DESC="Sent to users from the Multi-factor Authentication page when using the \"Authentication Code by Email\" option."
PLG_MULTIFACTORAUTH_EMAIL_MAIL_MAIL_TITLE="Code sent by email"
PLG_MULTIFACTORAUTH_EMAIL_XML_DESCRIPTION="Use time limited, six digit security codes sent to you by email."
diff --git a/administrator/language/en-GB/plg_multifactorauth_totp.ini b/administrator/language/en-GB/plg_multifactorauth_totp.ini
index 55550adf4415..7de7c1c7aaf2 100644
--- a/administrator/language/en-GB/plg_multifactorauth_totp.ini
+++ b/administrator/language/en-GB/plg_multifactorauth_totp.ini
@@ -7,7 +7,7 @@ PLG_MULTIFACTORAUTH_TOTP="Multi-factor Authentication - Verification Code"
PLG_MULTIFACTORAUTH_TOTP_CAPTIVE_PROMPT="Please open your authenticator application or password manager and copy the six digit code for this site in the text box below, then click on the Validate button. If this code has been automatically filled in for you just click on the Validate button."
PLG_MULTIFACTORAUTH_TOTP_ERR_VALIDATIONFAILED="You did not enter a valid verification code. Please check your authenticator app setup, and make sure that the time and time zone on your device is set correctly."
PLG_MULTIFACTORAUTH_TOTP_LBL_LABEL="Enter the six digit verification code"
-PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_INSTRUCTIONS="Set up your verification code (also known as an “authenticator code”) using the information below. You can use an authenticator app (such Google Authenticator, Authy, LastPass Authenticator, etc), your favourite password manager (1Password, BitWarden, Keeper, KeePassXC, Strongbox, etc) or, in some cases, your browser."
+PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_INSTRUCTIONS="Set up your verification code (also known as an \"authenticator code\") using the information below. You can use an authenticator app (such Google Authenticator, Authy, LastPass Authenticator, etc), your favourite password manager (1Password, BitWarden, Keeper, KeePassXC, Strongbox, etc) or, in some cases, your browser."
PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_PLACEHOLDER="Six Digit Code"
PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_TABLE_HEADING="Authenticator app setup"
PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_TABLE_KEY="Enter this key"
```
PR w związku ze zmianą oryginału https://github.com/joomla/joomla-cms/pull/39677 Poniżej zmiany w oryginale:
Click to expand the diff!
```diff diff --git a/administrator/language/en-GB/com_config.ini b/administrator/language/en-GB/com_config.ini index 9cf76faf5aa1..c4c0b646d826 100644 --- a/administrator/language/en-GB/com_config.ini +++ b/administrator/language/en-GB/com_config.ini @@ -67,7 +67,7 @@ COM_CONFIG_FIELD_DEBUG_CONST_LANG_DESC="Select if you should display the languag COM_CONFIG_FIELD_DEBUG_CONST_LANG_LABEL="Language Display" COM_CONFIG_FIELD_DEBUG_LANG_DESC="Displays??around a language string constant when the string is not present in the currently loaded language files or**around the string value when the string is present. If none of the above is displayed, it could mean the text is hardcoded and needs a language string." COM_CONFIG_FIELD_DEBUG_LANG_LABEL="Debug Language" -COM_CONFIG_FIELD_DEBUG_SYSTEM_DESC="Use it only for troubleshooting, ideally on private copies of your site. The more technical information displayed in this mode can be a security risk if left enabled on live sites. Remember to publish the “System - Debug” plugin to get detailed information on each page being loaded." +COM_CONFIG_FIELD_DEBUG_SYSTEM_DESC="Use it only for troubleshooting, ideally on private copies of your site. The more technical information displayed in this mode can be a security risk if left enabled on live sites. Remember to publish the \"System - Debug\" plugin to get detailed information on each page being loaded." COM_CONFIG_FIELD_DEBUG_SYSTEM_LABEL="Debug System" COM_CONFIG_FIELD_DEBUG_VALUE="Value" COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC="Set the Access Level which will be assigned by default to newly created items." @@ -158,7 +158,7 @@ COM_CONFIG_FIELD_REDIS_PORT_LABEL="Redis Server Port" COM_CONFIG_FIELD_SEF_REWRITE_NOTE="Apache and Litespeed: Renamehtaccess.txtto.htaccessIIS: Rename
web.config.txttoweb.configNginX: you must configure your server.
Other servers or if unsure: please consult your hosting company." COM_CONFIG_FIELD_SEF_REWRITE_DESC="Removes the
index.php/part from the URLs." COM_CONFIG_FIELD_SEF_REWRITE_LABEL="Use URL Rewriting" -COM_CONFIG_FIELD_SEF_SUFFIX_DESC="By default, Joomla URLs are “bare”, without an extension. This options tells Joomla to add an extension such as.html,.feedetc based on the type of content being displayed by the URL." +COM_CONFIG_FIELD_SEF_SUFFIX_DESC="By default, Joomla URLs are \"bare\", without an extension. This options tells Joomla to add an extension such as.html,.feedetc based on the type of content being displayed by the URL." COM_CONFIG_FIELD_SEF_SUFFIX_LABEL="Add Suffix to URL" COM_CONFIG_FIELD_SEF_URL_DESC="Joomla URLs normally look likeindex.php?option=com_example&task=item.display&id=1which isn't easy to convey verbally or in writing. Search Engine Friendly (SEF) URLs are more human–readable, e.g.index.php/example/display/something." COM_CONFIG_FIELD_SEF_URL_LABEL="Search Engine Friendly URLs" @@ -209,7 +209,7 @@ COM_CONFIG_FIELD_WEBSERVICES_CORS_ALLOW_METHODS_DESC="Specifies the Web service COM_CONFIG_FIELD_WEBSERVICES_CORS_ALLOW_ORIGIN_DESC="Specifies the origin allowed to access Web services on this site, sent back in response to a preflight request. Default: * (=all)." COM_CONFIG_FIELDSET_TAGS_LABEL="Tags" COM_CONFIG_FILTER_OPTION_SELECT_EXTENSION="- Select Extension -" -COM_CONFIG_FRONTEDITING_DESC="Joomla can show an overlay in the public front–end, visible only to users with edit privileges, to directly modify the configuration of each module and/or menu displayed on the site. Set to “None” to disable this feature." +COM_CONFIG_FRONTEDITING_DESC="Joomla can show an overlay in the public front–end, visible only to users with edit privileges, to directly modify the configuration of each module and/or menu displayed on the site. Set to \"None\" to disable this feature." COM_CONFIG_FRONTEDITING_LABEL="Frontend Editing" COM_CONFIG_FRONTEDITING_MENUSANDMODULES="Modules & Menus" COM_CONFIG_FRONTEDITING_MODULES="Modules" diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini index 26b58b01cf92..2f81794c2195 100644 --- a/administrator/language/en-GB/com_users.ini +++ b/administrator/language/en-GB/com_users.ini @@ -59,7 +59,7 @@ COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_ADMINACTIVATION="Administrator" COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_SELFACTIVATION="Self" COM_USERS_CONFIG_FORCEMFAUSERGROUPS_DESC="Any user who belongs in any of the selected user groups will be required to enable Multi-factor Authentication before being able to use the site." COM_USERS_CONFIG_FORCEMFAUSERGROUPS_LABEL="Enforce Multi-factor Authentication" -COM_USERS_CONFIG_FRONTEND_CAPTIVE_TEMPLATE_DESC="Choose the frontend template style to use in the Multi-factor Authentication page. Select “- Use Default -” to use the default site template style." +COM_USERS_CONFIG_FRONTEND_CAPTIVE_TEMPLATE_DESC="Choose the frontend template style to use in the Multi-factor Authentication page. Select \"- Use Default -\" to use the default site template style." COM_USERS_CONFIG_FRONTEND_CAPTIVE_TEMPLATE_LABEL="Frontend template style" COM_USERS_CONFIG_FRONTEND_SHOW_TITLE_DESC="Should I display a title in the frontend Multi-factor Authentication verification page? Please note that the title is always displayed in the backend. If you need to change the title please override the language keyCOM_USERS_USER_MULTIFACTOR_AUTHusing the System, Manage, Language Overrides page of the site's backend." COM_USERS_CONFIG_FRONTEND_SHOW_TITLE_LABEL="Show title in frontend" @@ -256,7 +256,7 @@ COM_USERS_MFA_ADD_PAGE_HEAD="Add a Multi-factor Authentication Method" COM_USERS_MFA_BACKUPCODES_PRINT_PROMPT="Backup Codes let you log into the site if your regular Multi-factor Authentication method does not work or you no longer have access to it. Each code can be used only once." COM_USERS_MFA_BACKUPCODES_PRINT_PROMPT_HEAD="Print these codes and keep them in your wallet." COM_USERS_MFA_BACKUPCODES_RESET="Regenerate Backup Codes" -COM_USERS_MFA_BACKUPCODES_RESET_INFO="Use the “Regenerate Backup Codes” button on the toolbar to generate a new set of Backup Codes. We recommend that you do this if you think your Backup Codes are compromised, e.g. someone got hold of a printout with them, or if you are running low on available Backup Codes." +COM_USERS_MFA_BACKUPCODES_RESET_INFO="Use the \"Regenerate Backup Codes\" button on the toolbar to generate a new set of Backup Codes. We recommend that you do this if you think your Backup Codes are compromised, e.g. someone got hold of a printout with them, or if you are running low on available Backup Codes." COM_USERS_MFA_EDIT_FIELD_DEFAULT="Make this the default Multi-factor Authentication method" COM_USERS_MFA_EDIT_FIELD_TITLE="Title" COM_USERS_MFA_EDIT_FIELD_TITLE_DESC="You and the site administrators will see this name in the list of available Multi-factor Authentication methods for your user account. Please do not include any sensitive or personally identifiable information." diff --git a/administrator/language/en-GB/plg_multifactorauth_email.ini b/administrator/language/en-GB/plg_multifactorauth_email.ini index b764291a816d..67812dc9fc9d 100644 --- a/administrator/language/en-GB/plg_multifactorauth_email.ini +++ b/administrator/language/en-GB/plg_multifactorauth_email.ini @@ -21,6 +21,6 @@ PLG_MULTIFACTORAUTH_EMAIL_LBL_LABEL="Authentication Code" PLG_MULTIFACTORAUTH_EMAIL_LBL_PRE_MESSAGE="You have received a six digit Multi-factor Authentication code in your email. Please enter it below." PLG_MULTIFACTORAUTH_EMAIL_LBL_SETUP_PLACEHOLDER="Six Digit Authentication Code" PLG_MULTIFACTORAUTH_EMAIL_LBL_SHORTINFO="Receive six digit codes by email." -PLG_MULTIFACTORAUTH_EMAIL_MAIL_MAIL_DESC="Sent to users from the Multi-factor Authentication page when using the “Authentication Code by Email” option." +PLG_MULTIFACTORAUTH_EMAIL_MAIL_MAIL_DESC="Sent to users from the Multi-factor Authentication page when using the \"Authentication Code by Email\" option." PLG_MULTIFACTORAUTH_EMAIL_MAIL_MAIL_TITLE="Code sent by email" PLG_MULTIFACTORAUTH_EMAIL_XML_DESCRIPTION="Use time limited, six digit security codes sent to you by email." diff --git a/administrator/language/en-GB/plg_multifactorauth_totp.ini b/administrator/language/en-GB/plg_multifactorauth_totp.ini index 55550adf4415..7de7c1c7aaf2 100644 --- a/administrator/language/en-GB/plg_multifactorauth_totp.ini +++ b/administrator/language/en-GB/plg_multifactorauth_totp.ini @@ -7,7 +7,7 @@ PLG_MULTIFACTORAUTH_TOTP="Multi-factor Authentication - Verification Code" PLG_MULTIFACTORAUTH_TOTP_CAPTIVE_PROMPT="Please open your authenticator application or password manager and copy the six digit code for this site in the text box below, then click on the Validate button. If this code has been automatically filled in for you just click on the Validate button." PLG_MULTIFACTORAUTH_TOTP_ERR_VALIDATIONFAILED="You did not enter a valid verification code. Please check your authenticator app setup, and make sure that the time and time zone on your device is set correctly." PLG_MULTIFACTORAUTH_TOTP_LBL_LABEL="Enter the six digit verification code" -PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_INSTRUCTIONS="Set up your verification code (also known as an “authenticator code”) using the information below. You can use an authenticator app (such Google Authenticator, Authy, LastPass Authenticator, etc), your favourite password manager (1Password, BitWarden, Keeper, KeePassXC, Strongbox, etc) or, in some cases, your browser." +PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_INSTRUCTIONS="Set up your verification code (also known as an \"authenticator code\") using the information below. You can use an authenticator app (such Google Authenticator, Authy, LastPass Authenticator, etc), your favourite password manager (1Password, BitWarden, Keeper, KeePassXC, Strongbox, etc) or, in some cases, your browser." PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_PLACEHOLDER="Six Digit Code" PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_TABLE_HEADING="Authenticator app setup" PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_TABLE_KEY="Enter this key" ```