Merge remote-tracking branch 'upstream/4.0-dev' into j4/prepared/com-…

…workflow

administrator/components/com_workflow/src/Model/TransitionsModel.php

@@ -192,7 +192,7 @@ public function getListQuery()
 		if (!empty($search))
 		{
 			$search = '%' . str_replace(' ', '%', trim($search)) . '%';
-			$query->where('(' . $db->quoteName('title') . ' LIKE :search1 OR ' . $db->quoteName('description') . ' LIKE :search2)')
+			$query->where('(' . $db->quoteName('t.title') . ' LIKE :search1 OR ' . $db->quoteName('t.description') . ' LIKE :search2)')
 				->bind([':search1', ':search2'], $search);
 		}
 

administrator/language/en-GB/mod_feed.ini

@@ -5,8 +5,8 @@
 
 MOD_FEED="Feed Display"
 MOD_FEED_ERR_CACHE="Please make cache folder writable."
-MOD_FEED_ERR_NO_URL="No feed URL specified."
 MOD_FEED_ERR_FEED_NOT_RETRIEVED="Feed not found."
+MOD_FEED_ERR_NO_URL="No feed URL specified."
 MOD_FEED_FIELD_DATE_LABEL="Feed Date"
 MOD_FEED_FIELD_DESCRIPTION_LABEL="Feed Description"
 MOD_FEED_FIELD_IMAGE_LABEL="Feed Image"

administrator/language/en-GB/mod_latest.ini

@@ -19,39 +19,39 @@ MOD_LATEST_NO_MATCHING_RESULTS="No Matching Results"
 MOD_LATEST_TITLE="Recently Created Articles"
 MOD_LATEST_TITLE_CREATED="Last Added Articles"
 MOD_LATEST_TITLE_CREATED_1="Last Added Article"
-MOD_LATEST_TITLE_CREATED_MORE="Last %1$s Added Articles"
-MOD_LATEST_TITLE_CREATED_NOT_ME="Last Added Articles Not By Me"
-MOD_LATEST_TITLE_CREATED_NOT_ME_1="Last Added Article Not By Me"
-MOD_LATEST_TITLE_CREATED_NOT_ME_MORE="Last %1$s Added Articles Not By Me"
 MOD_LATEST_TITLE_CREATED_BY_ME="Last Added Articles By Me"
 MOD_LATEST_TITLE_CREATED_BY_ME_1="Last Added Article By Me"
 MOD_LATEST_TITLE_CREATED_BY_ME_MORE="Last %1$s Added Articles By Me"
 MOD_LATEST_TITLE_CREATED_CATEGORY="Last Added Articles (%2$s category)"
 MOD_LATEST_TITLE_CREATED_CATEGORY_1="Last Added Article (%2$s category)"
-MOD_LATEST_TITLE_CREATED_CATEGORY_MORE="Last %1$s Added Articles (%2$s category)"
 MOD_LATEST_TITLE_CREATED_CATEGORY_BY_ME="Last Added Articles By Me (%2$s category)"
 MOD_LATEST_TITLE_CREATED_CATEGORY_BY_ME_1="Last Added Article By Me (%2$s category)"
 MOD_LATEST_TITLE_CREATED_CATEGORY_BY_ME_MORE="Last %1$s Added Articles By Me (%2$s category)"
+MOD_LATEST_TITLE_CREATED_CATEGORY_MORE="Last %1$s Added Articles (%2$s category)"
 MOD_LATEST_TITLE_CREATED_CATEGORY_NOT_ME="Last Added Articles Not By Me (%2$s category)"
 MOD_LATEST_TITLE_CREATED_CATEGORY_NOT_ME_1="Last Added Article Not By Me (%2$s category)"
 MOD_LATEST_TITLE_CREATED_CATEGORY_NOT_ME_MORE="Last %1$s Added Articles Not By Me (%2$s category)"
+MOD_LATEST_TITLE_CREATED_MORE="Last %1$s Added Articles"
+MOD_LATEST_TITLE_CREATED_NOT_ME="Last Added Articles Not By Me"
+MOD_LATEST_TITLE_CREATED_NOT_ME_1="Last Added Article Not By Me"
+MOD_LATEST_TITLE_CREATED_NOT_ME_MORE="Last %1$s Added Articles Not By Me"
 MOD_LATEST_TITLE_MODIFIED="Last Modified Articles"
 MOD_LATEST_TITLE_MODIFIED_1="Last Modified Article"
-MOD_LATEST_TITLE_MODIFIED_MORE="Last %1$s Modified Articles"
 MOD_LATEST_TITLE_MODIFIED_BY_ME="Last Modified Articles By Me"
 MOD_LATEST_TITLE_MODIFIED_BY_ME_1="Last Modified Article By Me"
 MOD_LATEST_TITLE_MODIFIED_BY_ME_MORE="Last %1$s Modified Articles By Me"
-MOD_LATEST_TITLE_MODIFIED_NOT_ME="Last Modified Articles Not By Me"
-MOD_LATEST_TITLE_MODIFIED_NOT_ME_1="Last Modified Article Not By Me"
-MOD_LATEST_TITLE_MODIFIED_NOT_ME_MORE="Last %1$s Modified Articles Not By Me"
 MOD_LATEST_TITLE_MODIFIED_CATEGORY="Last Modified Articles (%2$s category)"
 MOD_LATEST_TITLE_MODIFIED_CATEGORY_1="Last Modified Article (%2$s category)"
-MOD_LATEST_TITLE_MODIFIED_CATEGORY_MORE="Last %1$s Modified Articles (%2$s category)"
 MOD_LATEST_TITLE_MODIFIED_CATEGORY_BY_ME="Last Modified Articles By Me (%2$s category)"
 MOD_LATEST_TITLE_MODIFIED_CATEGORY_BY_ME_1="Last Modified Article By Me (%2$s category)"
 MOD_LATEST_TITLE_MODIFIED_CATEGORY_BY_ME_MORE="Last %1$s Modified Articles By Me (%2$s category)"
+MOD_LATEST_TITLE_MODIFIED_CATEGORY_MORE="Last %1$s Modified Articles (%2$s category)"
 MOD_LATEST_TITLE_MODIFIED_CATEGORY_NOT_ME="Last Modified Articles Not By Me (%2$s category)"
 MOD_LATEST_TITLE_MODIFIED_CATEGORY_NOT_ME_1="Last Modified Article Not By Me (%2$s category)"
 MOD_LATEST_TITLE_MODIFIED_CATEGORY_NOT_ME_MORE="Last %1$s Modified Articles Not By Me (%2$s category)"
+MOD_LATEST_TITLE_MODIFIED_MORE="Last %1$s Modified Articles"
+MOD_LATEST_TITLE_MODIFIED_NOT_ME="Last Modified Articles Not By Me"
+MOD_LATEST_TITLE_MODIFIED_NOT_ME_1="Last Modified Article Not By Me"
+MOD_LATEST_TITLE_MODIFIED_NOT_ME_MORE="Last %1$s Modified Articles Not By Me"
 MOD_LATEST_UNEXISTING="<em>Non existent</em>"
 MOD_LATEST_XML_DESCRIPTION="This module shows a list of the most recently created Articles."

administrator/language/en-GB/mod_logged.sys.ini

@@ -5,6 +5,5 @@
 
 
 MOD_LOGGED="Logged-in Users"
-MOD_LOGGED_XML_DESCRIPTION="This module shows a list of the Logged-in Users."
 MOD_LOGGED_LAYOUT_DEFAULT="Default"
-
+MOD_LOGGED_XML_DESCRIPTION="This module shows a list of the Logged-in Users."

administrator/language/en-GB/mod_loginsupport.sys.ini

@@ -6,4 +6,3 @@
 MOD_LOGINSUPPORT="Login Support Information"
 MOD_LOGINSUPPORT_LAYOUT_DEFAULT="Default"
 MOD_LOGINSUPPORT_XML_DESCRIPTION="This module displays some useful links to Joomla support sites on the login screen."
-

administrator/language/en-GB/mod_menu.sys.ini

@@ -6,4 +6,3 @@
 MOD_MENU="Administrator Menu"
 MOD_MENU_LAYOUT_DEFAULT="Default"
 MOD_MENU_XML_DESCRIPTION="This module displays an administrator menu module."
-

administrator/language/en-GB/mod_messages.sys.ini

@@ -6,4 +6,3 @@
 MOD_MESSAGES="Messages"
 MOD_MESSAGES_LAYOUT_DEFAULT="Default"
 MOD_MESSAGES_XML_DESCRIPTION="This module shows the count of private messages."
-

administrator/language/en-GB/mod_multilangstatus.sys.ini

@@ -5,4 +5,3 @@
 
 MOD_MULTILANGSTATUS="Multilingual Status"
 MOD_MULTILANGSTATUS_XML_DESCRIPTION="This module shows the status of the multilingual parameters."
-

administrator/language/en-GB/mod_popular.ini

@@ -14,21 +14,21 @@ MOD_POPULAR_ITEMS="Popular Items"
 MOD_POPULAR_NO_MATCHING_RESULTS="No Matching Results"
 MOD_POPULAR_TITLE="Popular Articles"
 MOD_POPULAR_TITLE_1="Top Popular Article"
-MOD_POPULAR_TITLE_MORE="Top %1$s Popular Articles"
 MOD_POPULAR_TITLE_BY_ME="Top Popular Articles By Me"
 MOD_POPULAR_TITLE_BY_ME_1="Top Popular Article By Me"
 MOD_POPULAR_TITLE_BY_ME_MORE="Top %1$s Popular Articles By Me"
-MOD_POPULAR_TITLE_NOT_ME="Top Popular Articles Not By Me"
-MOD_POPULAR_TITLE_NOT_ME_1="Top Popular Article Not By Me"
-MOD_POPULAR_TITLE_NOT_ME_MORE="Top %1$s Popular Articles Not By Me"
 MOD_POPULAR_TITLE_CATEGORY="Top Popular Articles (%2$s category)"
 MOD_POPULAR_TITLE_CATEGORY_1="Top Popular Article (%2$s category)"
-MOD_POPULAR_TITLE_CATEGORY_MORE="Top %1$s Popular Articles (%2$s category)"
 MOD_POPULAR_TITLE_CATEGORY_BY_ME="Top Popular Articles By Me (%2$s category)"
 MOD_POPULAR_TITLE_CATEGORY_BY_ME_1="Top Popular Article By Me (%2$s category)"
 MOD_POPULAR_TITLE_CATEGORY_BY_ME_MORE="Top %1$s Popular Articles By Me (%2$s category)"
+MOD_POPULAR_TITLE_CATEGORY_MORE="Top %1$s Popular Articles (%2$s category)"
 MOD_POPULAR_TITLE_CATEGORY_NOT_ME="Top Popular Articles Not By Me (%2$s category)"
 MOD_POPULAR_TITLE_CATEGORY_NOT_ME_1="Top Popular Article Not By Me (%2$s category)"
 MOD_POPULAR_TITLE_CATEGORY_NOT_ME_MORE="Top %1$s Popular Articles Not By Me (%2$s category)"
+MOD_POPULAR_TITLE_MORE="Top %1$s Popular Articles"
+MOD_POPULAR_TITLE_NOT_ME="Top Popular Articles Not By Me"
+MOD_POPULAR_TITLE_NOT_ME_1="Top Popular Article Not By Me"
+MOD_POPULAR_TITLE_NOT_ME_MORE="Top %1$s Popular Articles Not By Me"
 MOD_POPULAR_UNEXISTING="<em>Non existent</em>"
 MOD_POPULAR_XML_DESCRIPTION="This module shows a list of the most popular published Articles that are still current. Some that are shown may have expired even though they are the most recent."

administrator/language/en-GB/mod_popular.sys.ini

@@ -6,4 +6,3 @@
 MOD_POPULAR="Popular Articles"
 MOD_POPULAR_LAYOUT_DEFAULT="Default"
 MOD_POPULAR_XML_DESCRIPTION="This module shows a list of the most popular published Articles that are still current. Some that are shown may have expired even though they are the most recent."
-

administrator/language/en-GB/mod_post_installation_messages.sys.ini

@@ -5,4 +5,3 @@
 
 MOD_POST_INSTALLATION_MESSAGES="Post Installation Messages"
 MOD_POST_INSTALLATION_MESSAGES_XML_DESCRIPTION="This module shows the latest post installation messages."
-

administrator/language/en-GB/mod_privacy_dashboard.sys.ini

@@ -6,4 +6,3 @@
 MOD_PRIVACY_DASHBOARD="Privacy Dashboard"
 MOD_PRIVACY_DASHBOARD_LAYOUT_DEFAULT="Default"
 MOD_PRIVACY_DASHBOARD_XML_DESCRIPTION="The Privacy Dashboard Module shows information about privacy requests."
-

administrator/language/en-GB/mod_quickicon.ini

@@ -30,8 +30,8 @@ MOD_QUICKICON_PLUGIN_MANAGER="Plugins"
 MOD_QUICKICON_SHOW_ARTICLES_LABEL="Articles Icon"
 MOD_QUICKICON_SHOW_CACHE_LABEL="Cache Icon"
 MOD_QUICKICON_SHOW_CATEGORIES_LABEL="Categories Icon"
-MOD_QUICKICON_SHOW_CHECKINS_LABEL="Checkin Icon"
 MOD_QUICKICON_SHOW_CHECKIN_LABEL="Checkin Icon"
+MOD_QUICKICON_SHOW_CHECKINS_LABEL="Checkin Icon"
 MOD_QUICKICON_SHOW_EXTENSIONUPDATE_LABEL="Extension Update Check"
 MOD_QUICKICON_SHOW_GLOBAL_LABEL="Global Configuration Icon"
 MOD_QUICKICON_SHOW_JOOMLAUPDATE_LABEL="Joomla Update Check"

administrator/language/en-GB/mod_quickicon.sys.ini

@@ -6,4 +6,3 @@
 MOD_QUICKICON="Quick Icons"
 MOD_QUICKICON_LAYOUT_DEFAULT="Default"
 MOD_QUICKICON_XML_DESCRIPTION="This module shows Quick Icons that are visible on the Home Dashboard (administrator area home page)"
-

administrator/language/en-GB/mod_stats_admin.sys.ini

@@ -6,4 +6,3 @@
 MOD_STATS_ADMIN="Statistics"
 MOD_STATS_LAYOUT_DEFAULT="Default"
 MOD_STATS_XML_DESCRIPTION="The Statistics Module shows information about your server installation together with statistics on the website users and the number of Articles in your database."
-

administrator/language/en-GB/mod_title.sys.ini

@@ -6,4 +6,3 @@
 MOD_TITLE="Title"
 MOD_TITLE_LAYOUT_DEFAULT="Default"
 MOD_TITLE_XML_DESCRIPTION="This module shows the Toolbar Component Title."
-

administrator/language/en-GB/mod_toolbar.sys.ini

@@ -6,4 +6,3 @@
 MOD_TOOLBAR="Toolbar"
 MOD_TOOLBAR_LAYOUT_DEFAULT="Default"
 MOD_TOOLBAR_XML_DESCRIPTION="This module shows the toolbar icons used to control actions throughout the Administrator area."
-

administrator/language/en-GB/plg_captcha_recaptcha.ini

@@ -3,33 +3,28 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
-PLG_CAPTCHA_RECAPTCHA_XML_DESCRIPTION="This CAPTCHA plugin uses the reCAPTCHA service to prevent spammers while it helps to digitize books, newspapers and old radio shows. To get a site and secret key for your domain, go to <a href=\"https://www.google.com/recaptcha\" target=\"_blank\">https://www.google.com/recaptcha</a>. To use this for new account registration, go to Options in the User Manager and select CAPTCHA - reCAPTCHA as the CAPTCHA."
 PLG_CAPTCHA_RECAPTCHA="CAPTCHA - reCAPTCHA"
-
-; Params
-PLG_RECAPTCHA_VERSION_LABEL="Version"
-PLG_RECAPTCHA_VERSION_V2="2.0"
-PLG_RECAPTCHA_PUBLIC_KEY_LABEL="Site Key"
-PLG_RECAPTCHA_PRIVATE_KEY_LABEL="Secret Key"
-PLG_RECAPTCHA_THEME_LABEL="Theme"
-PLG_RECAPTCHA_THEME_LIGHT="Light"
-PLG_RECAPTCHA_THEME_DARK="Dark"
-PLG_RECAPTCHA_SIZE_LABEL="Size"
-PLG_RECAPTCHA_THEME_NORMAL="Normal"
-PLG_RECAPTCHA_THEME_COMPACT="Compact"
-PLG_RECAPTCHA_TABINDEX_LABEL="Tabindex"
-PLG_RECAPTCHA_TABINDEX_DESC="The tabindex of the reCAPTCHA widget."
-PLG_RECAPTCHA_CALLBACK_LABEL="Callback"
+PLG_CAPTCHA_RECAPTCHA_XML_DESCRIPTION="This CAPTCHA plugin uses the reCAPTCHA service to prevent spammers while it helps to digitize books, newspapers and old radio shows. To get a site and secret key for your domain, go to <a href=\"https://www.google.com/recaptcha\" target=\"_blank\">https://www.google.com/recaptcha</a>. To use this for new account registration, go to Options in the User Manager and select CAPTCHA - reCAPTCHA as the CAPTCHA."
 PLG_RECAPTCHA_CALLBACK_DESC="(Optional) JavaScript callback, executed after successful reCAPTCHA response."
-PLG_RECAPTCHA_ERROR_CALLBACK_LABEL="Error Callback"
+PLG_RECAPTCHA_CALLBACK_LABEL="Callback"
 PLG_RECAPTCHA_ERROR_CALLBACK_DESC="(Optional) JavaScript callback, executed when the reCAPTCHA encounters an error."
-PLG_RECAPTCHA_EXPIRED_CALLBACK_LABEL="Expired Callback"
-PLG_RECAPTCHA_EXPIRED_CALLBACK_DESC="(Optional) JavaScript callback, executed when the reCAPTCHA expired."
-
-; Error messages
-PLG_RECAPTCHA_ERROR_NO_PRIVATE_KEY="reCAPTCHA plugin needs a secret key to be set in its parameters. Please contact a site administrator."
-PLG_RECAPTCHA_ERROR_NO_PUBLIC_KEY="reCAPTCHA plugin needs a site key to be set in its parameters. Please contact a site administrator."
+PLG_RECAPTCHA_ERROR_CALLBACK_LABEL="Error Callback"
 PLG_RECAPTCHA_ERROR_EMPTY_SOLUTION="Please complete the CAPTCHA."
 PLG_RECAPTCHA_ERROR_NO_IP="For security reasons, you must pass the remote IP address to reCAPTCHA."
-
+PLG_RECAPTCHA_ERROR_NO_PRIVATE_KEY="reCAPTCHA plugin needs a secret key to be set in its parameters. Please contact a site administrator."
+PLG_RECAPTCHA_ERROR_NO_PUBLIC_KEY="reCAPTCHA plugin needs a site key to be set in its parameters. Please contact a site administrator."
+PLG_RECAPTCHA_EXPIRED_CALLBACK_DESC="(Optional) JavaScript callback, executed when the reCAPTCHA expired."
+PLG_RECAPTCHA_EXPIRED_CALLBACK_LABEL="Expired Callback"
 PLG_RECAPTCHA_PRIVACY_CAPABILITY_IP_ADDRESS="The reCAPTCHA plugin integrates with Google's reCAPTCHA system as a spam protection service. As part of this service, the IP address of the user answering the captcha challenge is transmitted to Google."
+PLG_RECAPTCHA_PRIVATE_KEY_LABEL="Secret Key"
+PLG_RECAPTCHA_PUBLIC_KEY_LABEL="Site Key"
+PLG_RECAPTCHA_SIZE_LABEL="Size"
+PLG_RECAPTCHA_TABINDEX_DESC="The tabindex of the reCAPTCHA widget."
+PLG_RECAPTCHA_TABINDEX_LABEL="Tabindex"
+PLG_RECAPTCHA_THEME_COMPACT="Compact"
+PLG_RECAPTCHA_THEME_DARK="Dark"
+PLG_RECAPTCHA_THEME_LABEL="Theme"
+PLG_RECAPTCHA_THEME_LIGHT="Light"
+PLG_RECAPTCHA_THEME_NORMAL="Normal"
+PLG_RECAPTCHA_VERSION_LABEL="Version"
+PLG_RECAPTCHA_VERSION_V2="2.0"

administrator/language/en-GB/plg_captcha_recaptcha.sys.ini

@@ -3,5 +3,5 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
-PLG_CAPTCHA_RECAPTCHA_XML_DESCRIPTION="This CAPTCHA plugin uses the reCAPTCHA service to prevent spammers while it helps to digitize books, newspapers and old radio shows. To get a site and secret key for your domain, go to <a href=\"https://www.google.com/recaptcha\" target=\"_blank\">https://www.google.com/recaptcha</a>. To use this for new account registration, go to Options in the User Manager and select CAPTCHA - reCAPTCHA as the CAPTCHA."
 PLG_CAPTCHA_RECAPTCHA="CAPTCHA - reCAPTCHA"
+PLG_CAPTCHA_RECAPTCHA_XML_DESCRIPTION="This CAPTCHA plugin uses the reCAPTCHA service to prevent spammers while it helps to digitize books, newspapers and old radio shows. To get a site and secret key for your domain, go to <a href=\"https://www.google.com/recaptcha\" target=\"_blank\">https://www.google.com/recaptcha</a>. To use this for new account registration, go to Options in the User Manager and select CAPTCHA - reCAPTCHA as the CAPTCHA."

administrator/language/en-GB/plg_captcha_recaptcha_invisible.ini

@@ -5,7 +5,6 @@
 
 PLG_CAPTCHA_RECAPTCHA_INVISIBLE="CAPTCHA - Invisible reCAPTCHA"
 PLG_CAPTCHA_RECAPTCHA_INVISIBLE_XML_DESCRIPTION="This CAPTCHA plugin uses the Invisible reCAPTCHA service. To get a site and secret key for your domain, go to <a href=\"https://www.google.com/recaptcha\" target=\"_blank\">https://www.google.com/recaptcha</a>."
-; Params
 PLG_RECAPTCHA_INVISIBLE_BADGE_BOTTOMLEFT="Bottom left"
 PLG_RECAPTCHA_INVISIBLE_BADGE_BOTTOMRIGHT="Bottom right"
 PLG_RECAPTCHA_INVISIBLE_BADGE_DESC="Positioning of the reCAPTCHA badge."
@@ -15,18 +14,16 @@ PLG_RECAPTCHA_INVISIBLE_CALLBACK_DESC="(Optional) JavaScript callback, executed
 PLG_RECAPTCHA_INVISIBLE_CALLBACK_LABEL="Callback"
 PLG_RECAPTCHA_INVISIBLE_ERROR_CALLBACK_DESC="(Optional) JavaScript callback, executed when the reCAPTCHA encounters an error."
 PLG_RECAPTCHA_INVISIBLE_ERROR_CALLBACK_LABEL="Error Callback"
+PLG_RECAPTCHA_INVISIBLE_ERROR_EMPTY_SOLUTION="Empty solution not allowed."
+PLG_RECAPTCHA_INVISIBLE_ERROR_NO_IP="For security reasons, you must pass the remote IP address to reCAPTCHA."
+PLG_RECAPTCHA_INVISIBLE_ERROR_NO_PRIVATE_KEY="reCAPTCHA plugin needs a secret key to be set in its parameters. Please contact a site administrator."
+PLG_RECAPTCHA_INVISIBLE_ERROR_NO_PUBLIC_KEY="reCAPTCHA plugin needs a site key to be set in its parameters. Please contact a site administrator."
 PLG_RECAPTCHA_INVISIBLE_EXPIRED_CALLBACK_DESC="(Optional) JavaScript callback, executed when the reCAPTCHA expired."
 PLG_RECAPTCHA_INVISIBLE_EXPIRED_CALLBACK_LABEL="Expired Callback"
+PLG_RECAPTCHA_INVISIBLE_PRIVACY_CAPABILITY_IP_ADDRESS="The Invisible reCAPTCHA plugin integrates with Google's reCAPTCHA system as a spam protection service. As part of this service, the IP address of the user answering the captcha challenge is transmitted to Google."
 PLG_RECAPTCHA_INVISIBLE_PRIVATE_KEY_DESC="Used in the communication between your server and the reCAPTCHA server. Be sure to keep it a secret."
 PLG_RECAPTCHA_INVISIBLE_PRIVATE_KEY_LABEL="Secret Key"
 PLG_RECAPTCHA_INVISIBLE_PUBLIC_KEY_DESC="Used in the JavaScript code that is served to your users."
 PLG_RECAPTCHA_INVISIBLE_PUBLIC_KEY_LABEL="Site Key"
 PLG_RECAPTCHA_INVISIBLE_TABINDEX_DESC="The tabindex of the challenge."
 PLG_RECAPTCHA_INVISIBLE_TABINDEX_LABEL="Tabindex"
-; Privacy notice
-PLG_RECAPTCHA_INVISIBLE_PRIVACY_CAPABILITY_IP_ADDRESS="The Invisible reCAPTCHA plugin integrates with Google's reCAPTCHA system as a spam protection service. As part of this service, the IP address of the user answering the captcha challenge is transmitted to Google."
-; Error messages
-PLG_RECAPTCHA_INVISIBLE_ERROR_EMPTY_SOLUTION="Empty solution not allowed."
-PLG_RECAPTCHA_INVISIBLE_ERROR_NO_IP="For security reasons, you must pass the remote IP address to reCAPTCHA."
-PLG_RECAPTCHA_INVISIBLE_ERROR_NO_PRIVATE_KEY="reCAPTCHA plugin needs a secret key to be set in its parameters. Please contact a site administrator."
-PLG_RECAPTCHA_INVISIBLE_ERROR_NO_PUBLIC_KEY="reCAPTCHA plugin needs a site key to be set in its parameters. Please contact a site administrator."

administrator/language/en-GB/plg_content_contact.ini

@@ -4,11 +4,11 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_CONTENT_CONTACT="Content - Contact"
-PLG_CONTENT_CONTACT_XML_DESCRIPTION="Provides a link between the content author and the contact item that can be used for an Author Profile."
-PLG_CONTENT_CONTACT_PARAM_URL_LABEL="Redirection"
+PLG_CONTENT_CONTACT_PARAM_ALIAS_DESCRIPTION="Link to the real user data even if an author alias is set in article options."
+PLG_CONTENT_CONTACT_PARAM_ALIAS_LABEL="Apply link also to alias name"
 PLG_CONTENT_CONTACT_PARAM_URL_DESCRIPTION="You can link the author name to:<ul><li>Associated contact page.<li>Webpage specified in the associated contact profile.<li>Email specified in the associated contact profile.</ul>"
+PLG_CONTENT_CONTACT_PARAM_URL_EMAIL="Email from contact"
+PLG_CONTENT_CONTACT_PARAM_URL_LABEL="Redirection"
 PLG_CONTENT_CONTACT_PARAM_URL_URL="Internal contact page"
 PLG_CONTENT_CONTACT_PARAM_URL_WEBPAGE="Webpage from contact"
-PLG_CONTENT_CONTACT_PARAM_URL_EMAIL="Email from contact"
-PLG_CONTENT_CONTACT_PARAM_ALIAS_LABEL="Apply link also to alias name"
-PLG_CONTENT_CONTACT_PARAM_ALIAS_DESCRIPTION="Link to the real user data even if an author alias is set in article options."
+PLG_CONTENT_CONTACT_XML_DESCRIPTION="Provides a link between the content author and the contact item that can be used for an Author Profile."

administrator/language/en-GB/plg_content_emailcloak.ini

@@ -7,4 +7,4 @@ PLG_CONTENT_EMAILCLOAK="Content - Email Cloaking"
 PLG_CONTENT_EMAILCLOAK_LINKABLE="As linkable mailto address"
 PLG_CONTENT_EMAILCLOAK_MODE_LABEL="Mode"
 PLG_CONTENT_EMAILCLOAK_NONLINKABLE="Non-linkable Text"
-PLG_CONTENT_EMAILCLOAK_XML_DESCRIPTION="Cloaks all email addresses in content from spambots using JavaScript."
+PLG_CONTENT_EMAILCLOAK_XML_DESCRIPTION="Cloaks all email addresses in content from spambots using JavaScript."

administrator/language/en-GB/plg_content_emailcloak.sys.ini

@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_CONTENT_EMAILCLOAK="Content - Email Cloaking"
-PLG_CONTENT_EMAILCLOAK_XML_DESCRIPTION="Cloaks all email addresses in content from spambots using JavaScript."
+PLG_CONTENT_EMAILCLOAK_XML_DESCRIPTION="Cloaks all email addresses in content from spambots using JavaScript."

administrator/language/en-GB/plg_content_finder.ini

@@ -5,13 +5,10 @@
 
 PLG_CONTENT_FINDER="Content - Smart Search"
 PLG_CONTENT_FINDER_XML_DESCRIPTION="Changes to content will not update the Smart Search index if you do not enable this plugin."
-
 PLG_FINDER_QUERY_FILTER_BRANCH_P__="All"
-
-PLG_FINDER_QUERY_FILTER_BRANCH_S_TYPE="Type"
-PLG_FINDER_QUERY_FILTER_BRANCH_S_LANGUAGE="Language"
-PLG_FINDER_QUERY_FILTER_BRANCH_S_CATEGORY="Category"
-
-PLG_FINDER_QUERY_FILTER_BRANCH_P_TYPE="Types"
-PLG_FINDER_QUERY_FILTER_BRANCH_P_LANGUAGE="Languages"
 PLG_FINDER_QUERY_FILTER_BRANCH_P_CATEGORY="Categories"
+PLG_FINDER_QUERY_FILTER_BRANCH_P_LANGUAGE="Languages"
+PLG_FINDER_QUERY_FILTER_BRANCH_P_TYPE="Types"
+PLG_FINDER_QUERY_FILTER_BRANCH_S_CATEGORY="Category"
+PLG_FINDER_QUERY_FILTER_BRANCH_S_LANGUAGE="Language"
+PLG_FINDER_QUERY_FILTER_BRANCH_S_TYPE="Type"