Merge remote-tracking branch 'origin/main'

akeeba · Oct 26, 2023 · da355cc · da355cc
2 parents 4ded875 + aa73dc1
commit da355cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/languages/en-GB.ini b/languages/en-GB.ini
@@ -465,7 +465,7 @@ PANOPTICON_LOGIN_LBL_LOGIN=Login
 PANOPTICON_APP_MENU_TITLE_OVERVIEW=Overview
 PANOPTICON_MAIN_TITLE=Sites Overview
 PANOPTICON_MAIN_SITES_LBL_MY_SITES_MANAGE=Manage Sites
-PANOPTICON_MAIN_SITES_TABLE_CAPTION=Table of know sites and their information at a glance
+PANOPTICON_MAIN_SITES_TABLE_CAPTION=Table of known sites and their information at a glance
 PANOPTICON_MAIN_SITES_THEAD_SITE=Site
 PANOPTICON_MAIN_SITES_THEAD_JOOMLA=Joomla™ version
 PANOPTICON_MAIN_SITES_THEAD_EXTENSIONS=Extensions status
@@ -1361,7 +1361,7 @@ PANOPTICON_OVERRIDES_LBL_NO_OVERRIDE_SUGGESTION=Please visit your site's adminis
 ;; Logs
 PANOPTICON_LOGS_TITLE="Log Files"
 PANOPTICON_LOGS_TITLE_READ="Show Log File"
-PANOPTICON_LOGS_TABLE_COMMENT="Table of log files available"
+PANOPTICON_LOGS_TABLE_COMMENT="Table of available log files"
 PANOPTICON_LOGS_LBL_FIELD_ACTIONS="Actions"
 PANOPTICON_LOGS_LBL_FIELD_FILE="File"
 PANOPTICON_LOGS_LBL_FIELD_SITE="Site"
@@ -1431,17 +1431,17 @@ PANOPTICON_EXTUPDATES_FIELD_EXTENSION="Extension"
 PANOPTICON_EXTUPDATES_FIELD_VERSION="Version"
 PANOPTICON_EXTUPDATES_FIELD_AUTHOR="Author"
 
-PANOPTICON_EXTUPDATES_LBL_SCHEDULED_N="%d selected extensions have been scheduled for update installation."
-PANOPTICON_EXTUPDATES_LBL_SCHEDULED_N_0="None of the selected extensions have been scheduled for update installation. This is not an error: they might have been updated, or automatically scheduled in the meantime."
-PANOPTICON_EXTUPDATES_LBL_SCHEDULED_N_1="The selected extension has been scheduled for update installation."
+PANOPTICON_EXTUPDATES_LBL_SCHEDULED_N="%d selected extensions have been scheduled to be updated."
+PANOPTICON_EXTUPDATES_LBL_SCHEDULED_N_0="None of the selected extensions have been scheduled to be updated. This is not an error: they might have been updated, or automatically scheduled in the meantime."
+PANOPTICON_EXTUPDATES_LBL_SCHEDULED_N_1="The selected extension has been scheduled to be updated."
 
 PANOPTICON_EXTUPDATES_ERR_INVALID_SELECTION="Invalid extensions selection."
 
 ;; Core updates overview
 PANOPTICON_COREUPDATES_TITLE="Core Updates"
 PANOPTICON_COREUPDATES_BTN_UPDATE="Update Selected"
 PANOPTICON_COREUPDATES_BTN_CANCEL="Cancel Selected"
-PANOPTICON_COREUPDATES_TABLE_COMMENT="Table of sites with CMS updates available."
+PANOPTICON_COREUPDATES_TABLE_COMMENT="Table of sites with available CMS updates."
 
 PANOPTICON_COREUPDATES_LBL_SELECT_SITE="Select site “%s”"
 PANOPTICON_COREUPDATES_LBL_SELECT_CURRENT="– Current –"
@@ -1452,9 +1452,9 @@ PANOPTICON_COREUPDATES_FIELD_LATEST="Updates To"
 
 PANOPTICON_COREUPDATES_ERR_INVALID_SELECTION="Invalid sites selection."
 
-PANOPTICON_COREUPDATES_SCHEDULED_N="%d selected sites have been scheduled for core update installation."
-PANOPTICON_COREUPDATES_SCHEDULED_N_1="The selected site has been scheduled for core update installation."
-PANOPTICON_COREUPDATES_SCHEDULED_N_0="No selected sites have been scheduled for core update installation. This is not an error: they might have been already updated, or automatically scheduled in the meantime."
+PANOPTICON_COREUPDATES_SCHEDULED_N="%d selected sites have been scheduled for core updates."
+PANOPTICON_COREUPDATES_SCHEDULED_N_1="The selected site has been scheduled for core updates."
+PANOPTICON_COREUPDATES_SCHEDULED_N_0="No selected sites have been scheduled for core updates. This is not an error: they might have been already updated, or automatically scheduled in the meantime."
 
 PANOPTICON_COREUPDATES_CANCELED_N="%d selected sites will not be updated."
 PANOPTICON_COREUPDATES_CANCELED_N_1="The selected site will not be updated."

diff --git a/src/Library/JoomlaVersion/JoomlaVersion.php b/src/Library/JoomlaVersion/JoomlaVersion.php
@@ -51,7 +51,7 @@ public function __construct(private ?Container $container = null, private ?Clien
 	 * beyond the fact that they become EOL 2 years after their release (4 years since the release of the x.0 release
 	 * in the major version series). Since Joomla 3.10 which had the same role as a “caretaker version”, as they weirdly
 	 * put it in their release announcements, received bug fixes for a year and security updates for another year I am
-	 * using the same approach in my approximation fo support dates.
+	 * using the same approach in my approximation of support dates.
 	 *
 	 * @see    https://docs.joomla.org/Joomla!_CMS_versions
 	 * @see    https://downloads.joomla.org