From 52c750e4f0e538ab1d4f7ee48d007dd6da74e633 Mon Sep 17 00:00:00 2001 From: Elisa Foltyn Date: Sun, 15 May 2022 19:16:52 +0200 Subject: [PATCH 01/33] Cassiopeia Privacy Consent - Display Options Inline (#37709) * Change ToS and Privacy Policy radio to inline * Update build/media_source/templates/site/cassiopeia/scss/blocks/_form.scss --- .../templates/site/cassiopeia/scss/blocks/_form.scss | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_form.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_form.scss index 02861039518cd..cdd48306d7189 100644 --- a/build/media_source/templates/site/cassiopeia/scss/blocks/_form.scss +++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_form.scss @@ -136,3 +136,14 @@ fieldset { .com-users-login__options { margin-top: $cassiopeia-grid-gutter*2; } + +.com-users-profile__edit, +.com-users-registration { + #jform_privacyconsent_privacy, + #jform_terms_terms { + .radio { + display: inline-flex; + gap: 1rem; + } + } +} From d2a63b1c9e7b1314cc88403cb3591840d5f3969d Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Mon, 16 May 2022 06:58:39 +0100 Subject: [PATCH 02/33] [4.1] Workflow Stage display (#37748) --- administrator/components/com_content/tmpl/articles/default.php | 3 +++ administrator/components/com_content/tmpl/featured/default.php | 3 +++ 2 files changed, 6 insertions(+) diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php index c28750896fbee..65bc6b43e4921 100644 --- a/administrator/components/com_content/tmpl/articles/default.php +++ b/administrator/components/com_content/tmpl/articles/default.php @@ -227,6 +227,9 @@ echo (new TransitionButton($options)) ->render(0, $i); ?> +
+ stage_title); ?> +
diff --git a/administrator/components/com_content/tmpl/featured/default.php b/administrator/components/com_content/tmpl/featured/default.php index 1325d13bd5e20..8c773b8985ee5 100644 --- a/administrator/components/com_content/tmpl/featured/default.php +++ b/administrator/components/com_content/tmpl/featured/default.php @@ -231,6 +231,9 @@ echo (new TransitionButton($options)) ->render(0, $i); ?> +
+ stage_title); ?> +
From f820a0250065a5901d0371c6bd530e6d48c643e1 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Mon, 16 May 2022 08:39:32 +0100 Subject: [PATCH 03/33] [4.1]Recent Articles admin module - workflows (#37749) * [4.1]Recent Articles admin module - workflows * cs * lang * refactor * space * Update administrator/modules/mod_latest/tmpl/default.php --- administrator/modules/mod_latest/mod_latest.php | 7 +++++++ administrator/modules/mod_latest/tmpl/default.php | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/administrator/modules/mod_latest/mod_latest.php b/administrator/modules/mod_latest/mod_latest.php index fbcae6160498b..28ed0c2486aa2 100644 --- a/administrator/modules/mod_latest/mod_latest.php +++ b/administrator/modules/mod_latest/mod_latest.php @@ -9,12 +9,19 @@ defined('_JEXEC') or die; +use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Helper\ModuleHelper; use Joomla\CMS\Layout\LayoutHelper; use Joomla\Module\Latest\Administrator\Helper\LatestHelper; $model = $app->bootComponent('com_content')->getMVCFactory()->createModel('Articles', 'Administrator', ['ignore_request' => true]); $list = LatestHelper::getList($params, $model); +$workflow_enabled = ComponentHelper::getParams('com_content')->get('workflow_enabled'); + +if ($workflow_enabled) +{ + $app->getLanguage()->load('com_workflow'); +} if ($params->get('automatic_title', 0)) { diff --git a/administrator/modules/mod_latest/tmpl/default.php b/administrator/modules/mod_latest/tmpl/default.php index a47567eeb8b58..0a317f748fb48 100644 --- a/administrator/modules/mod_latest/tmpl/default.php +++ b/administrator/modules/mod_latest/tmpl/default.php @@ -19,7 +19,10 @@ title; ?> - + + + + @@ -40,6 +43,11 @@ title, ENT_QUOTES, 'UTF-8'); ?> + + + stage_title); ?> + + author_name; ?> From fa4b0af2f4ff34c61df5879fceb9f61ac2a846ae Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Mon, 16 May 2022 10:13:38 +0100 Subject: [PATCH 04/33] [4.1] Scheduled task - alternate menu (#37758) --- administrator/components/com_menus/presets/alternate.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/administrator/components/com_menus/presets/alternate.xml b/administrator/components/com_menus/presets/alternate.xml index 8b4e74c23498e..cb2445e87ba3a 100644 --- a/administrator/components/com_menus/presets/alternate.xml +++ b/administrator/components/com_menus/presets/alternate.xml @@ -348,6 +348,7 @@ class="class:component" permission="core.manage;com_joomlaupdate" /> + + + Date: Mon, 16 May 2022 13:04:24 +0200 Subject: [PATCH 05/33] [4] scheduler (#37591) * necessarybutnotsufficient * meh * single quotes * fixed eslewhere --- libraries/src/Console/TasksStateCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/src/Console/TasksStateCommand.php b/libraries/src/Console/TasksStateCommand.php index ffe47f7e13634..9abd8d375dabd 100644 --- a/libraries/src/Console/TasksStateCommand.php +++ b/libraries/src/Console/TasksStateCommand.php @@ -117,7 +117,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in $state = (string) $this->ioStyle->ask('Should the state be "enable" (1), "disable" (0) or "trash" (-2)'); // Ensure we have the enumerated value (still as a string) - $state = (Task::isValidState($state)) ?: ArrayHelper::arraySearch($state, Task::STATE_MAP); + $state = (Task::isValidState($state)) ? $state : ArrayHelper::arraySearch($state, Task::STATE_MAP); } // Finally, the enumerated state and id in their pure form From 071f40515bfc5f8d77bd891ce01a735c9db76728 Mon Sep 17 00:00:00 2001 From: heelc29 <66922325+heelc29@users.noreply.github.com> Date: Mon, 16 May 2022 13:48:53 +0200 Subject: [PATCH 06/33] [4.1] scheduler tasks listview default sort (#37762) * task default sort * sort title asc * cs --- .../components/com_scheduler/forms/filter_tasks.xml | 2 +- .../components/com_scheduler/src/Model/TasksModel.php | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/administrator/components/com_scheduler/forms/filter_tasks.xml b/administrator/components/com_scheduler/forms/filter_tasks.xml index 5ec4d1980960e..ed9d4d151bf5b 100644 --- a/administrator/components/com_scheduler/forms/filter_tasks.xml +++ b/administrator/components/com_scheduler/forms/filter_tasks.xml @@ -45,7 +45,7 @@ type="list" label="JGLOBAL_SORT_BY" onchange="this.form.submit();" - default="a.title DESC" + default="a.title ASC" validate="options" > diff --git a/administrator/components/com_scheduler/src/Model/TasksModel.php b/administrator/components/com_scheduler/src/Model/TasksModel.php index 6326db46c8de2..ed37565ee0b48 100644 --- a/administrator/components/com_scheduler/src/Model/TasksModel.php +++ b/administrator/components/com_scheduler/src/Model/TasksModel.php @@ -351,7 +351,7 @@ static function (TaskOption $taskOption): string if (!$multiOrdering || !\is_array($multiOrdering)) { $orderCol = $this->state->get('list.ordering', 'a.title'); - $orderDir = $this->state->get('list.direction', 'desc'); + $orderDir = $this->state->get('list.direction', 'asc'); // Type title ordering is handled exceptionally in _getList() if ($orderCol !== 'j.type_title') @@ -390,10 +390,9 @@ static function (TaskOption $taskOption): string */ protected function _getList($query, $limitstart = 0, $limit = 0): array { - // Get stuff from the model state $listOrder = $this->getState('list.ordering', 'a.title'); - $listDirectionN = strtolower($this->getState('list.direction', 'desc')) == 'desc' ? -1 : 1; + $listDirectionN = strtolower($this->getState('list.direction', 'asc')) == 'desc' ? -1 : 1; // Set limit parameters and get object list $query->setLimit($limit, $limitstart); @@ -465,7 +464,7 @@ private function attachTaskOptions(array $items): void * @return void * @since 4.1.0 */ - protected function populateState($ordering = 'a.id', $direction = 'ASC'): void + protected function populateState($ordering = 'a.title', $direction = 'ASC'): void { // Call the parent method parent::populateState($ordering, $direction); From 154d2f45f873017c9b29f4ef3be296beb22d3be8 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Mon, 16 May 2022 17:32:43 +0100 Subject: [PATCH 07/33] [4.1] Workflows spacer width breaks layout (#37802) #22213 added a width of 440px to the label on a spacer field This breaks the layout of the article form when workflows is enabled at certain screen resolutions. Based on the comments on the initial commit this class is no longer required so by removing it here the article form layout is no longer broken. This is an scss change to will require npm run build:css to test Workflows must be enabled else the impacted fields will not be displayed. ### Before ### After --- .../templates/administrator/atum/scss/blocks/_form.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_form.scss b/build/media_source/templates/administrator/atum/scss/blocks/_form.scss index 8e4eef84f579a..2c9a947a16cec 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_form.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_form.scss @@ -57,10 +57,6 @@ hr { width: 380px; } - - label { - width: 440px; - } } td .form-control { From 4374661c63a5ef3584652a2749154c96e49a35cc Mon Sep 17 00:00:00 2001 From: Christiane Maier-Stadtherr Date: Tue, 17 May 2022 15:17:25 +0200 Subject: [PATCH 08/33] [4.2] Reduce number of permission columns (#37807) * Reduce number of permission columns * Update administrator/components/com_users/tmpl/debuguser/default.php Co-authored-by: Quy Co-authored-by: Quy --- .../com_users/tmpl/debuguser/default.php | 204 +++++++++++------- 1 file changed, 123 insertions(+), 81 deletions(-) diff --git a/administrator/components/com_users/tmpl/debuguser/default.php b/administrator/components/com_users/tmpl/debuguser/default.php index 1933de9bf19a7..75b108ef8b93b 100644 --- a/administrator/components/com_users/tmpl/debuguser/default.php +++ b/administrator/components/com_users/tmpl/debuguser/default.php @@ -16,95 +16,137 @@ $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); + +$loginActions = []; +$actions = []; + +// Split the actions table +foreach ($this->actions as $action) : + $name = $action[0]; + if (in_array($name, ['core.login.site', 'core.login.admin', 'core.login.offline', 'core.login.api', 'core.admin'])) : + $loginActions[] = $action; + else : + $actions[] = $action; + endif; +endforeach; ?>
$this)); ?> -
- - - - - - - actions as $key => $action) : ?> - - - - - - - - items as $i => $item) : ?> - - - - actions as $action) : ?> - checks[$name]; - if ($check === true) : - $class = 'text-success icon-check'; - $button = 'btn-success'; - $text = Text::_('COM_USERS_DEBUG_EXPLICIT_ALLOW'); - elseif ($check === false) : - $class = 'text-danger icon-times'; - $button = 'btn-danger'; - $text = Text::_('COM_USERS_DEBUG_EXPLICIT_DENY'); - elseif ($check === null) : - $class = 'text-danger icon-minus-circle'; - $button = 'btn-warning'; - $text = Text::_('COM_USERS_DEBUG_IMPLICIT_DENY'); - else : - $class = ''; - $button = ''; - $text = ''; - endif; - ?> - - - - - - - -
- - - - - - - - - -
- escape(Text::_($item->title)); ?> - - $item->level + 1)) . $this->escape($item->name); ?> - - - - - lft; ?> - - rgt; ?> - - id; ?> -
-
-    -    - +
+ items[0]->checks[$name]; + if ($check === true) : + $class = 'text-success icon-check'; + $button = 'btn-success'; + $text = Text::_('COM_USERS_DEBUG_EXPLICIT_ALLOW'); + elseif ($check === false) : + $class = 'text-danger icon-times'; + $button = 'btn-danger'; + $text = Text::_('COM_USERS_DEBUG_EXPLICIT_DENY'); + elseif ($check === null) : + $class = 'text-danger icon-minus-circle'; + $button = 'btn-warning'; + $text = Text::_('COM_USERS_DEBUG_IMPLICIT_DENY'); + else : + $class = ''; + $button = ''; + $text = ''; + endif; + ?> +
+ + +
+ +
- - pagination->getListFooter(); ?> + + + + + + + $action) : ?> + + + + + + + + items as $i => $item) :?> + + + + + checks[$name]; + if ($check === true) : + $class = 'text-success icon-check'; + $button = 'btn-success'; + $text = Text::_('COM_USERS_DEBUG_EXPLICIT_ALLOW'); + elseif ($check === false) : + $class = 'text-danger icon-times'; + $button = 'btn-danger'; + $text = Text::_('COM_USERS_DEBUG_EXPLICIT_DENY'); + elseif ($check === null) : + $class = 'text-danger icon-minus-circle'; + $button = 'btn-warning'; + $text = Text::_('COM_USERS_DEBUG_IMPLICIT_DENY'); + else : + $class = ''; + $button = ''; + $text = ''; + endif; + ?> + + + + + + + +
+ + + + + + + + + +
+ escape(Text::_($item->title)); ?> + + $item->level + 1)) . $this->escape($item->name); ?> + + + + + lft; ?> + - rgt; ?> + + id; ?> +
+
+    +    +
+ + + pagination->getListFooter(); ?> + From a8adadf982677c141686dc2b5560aabd2f944e76 Mon Sep 17 00:00:00 2001 From: Christiane Maier-Stadtherr Date: Tue, 17 May 2022 16:10:48 +0200 Subject: [PATCH 09/33] Fix deprecated warning in chrome html 5 (#37817) --- layouts/chromes/html5.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/chromes/html5.php b/layouts/chromes/html5.php index 7e370844d18a7..8979e47b6e9d9 100644 --- a/layouts/chromes/html5.php +++ b/layouts/chromes/html5.php @@ -23,7 +23,7 @@ $moduleTag = htmlspecialchars($params->get('module_tag', 'div'), ENT_QUOTES, 'UTF-8'); $moduleAttribs = []; -$moduleAttribs['class'] = 'moduletable ' . htmlspecialchars($params->get('moduleclass_sfx'), ENT_QUOTES, 'UTF-8'); +$moduleAttribs['class'] = 'moduletable ' . htmlspecialchars($params->get('moduleclass_sfx', ''), ENT_QUOTES, 'UTF-8'); $bootstrapSize = (int) $params->get('bootstrap_size', 0); $moduleAttribs['class'] .= $bootstrapSize !== 0 ? ' col-md-' . $bootstrapSize : ''; $headerTag = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8'); From 63b0744aa9057522f439322b8748976947f3d1e5 Mon Sep 17 00:00:00 2001 From: "Nicholas K. Dionysopoulos" Date: Tue, 17 May 2022 20:37:21 +0300 Subject: [PATCH 10/33] Work towards using concrete events everywhere maintaining b/c (#36578) Co-authored-by: Christiane Maier-Stadtherr Co-authored-by: Harald Leithner Co-authored-by: Robert Deutz --- libraries/src/Application/EventAware.php | 6 +- libraries/src/Event/AbstractEvent.php | 15 +++ libraries/src/Event/CoreEventAware.php | 122 ++++++++++++++++++ .../src/Event/QuickIcon/GetIconEvent.php | 64 +++++++++ libraries/src/Event/ReshapeArgumentsAware.php | 99 ++++++++++++++ libraries/src/Event/Result/ResultAware.php | 102 +++++++++++++++ .../src/Event/Result/ResultAwareInterface.php | 52 ++++++++ .../src/Event/Result/ResultTypeArrayAware.php | 71 ++++++++++ .../Event/Result/ResultTypeBooleanAware.php | 56 ++++++++ .../src/Event/Result/ResultTypeFloatAware.php | 71 ++++++++++ .../Event/Result/ResultTypeIntegerAware.php | 71 ++++++++++ .../src/Event/Result/ResultTypeMixedAware.php | 41 ++++++ .../Event/Result/ResultTypeNumericAware.php | 71 ++++++++++ .../Event/Result/ResultTypeObjectAware.php | 98 ++++++++++++++ .../Event/Result/ResultTypeStringAware.php | 71 ++++++++++ 15 files changed, 1009 insertions(+), 1 deletion(-) create mode 100644 libraries/src/Event/CoreEventAware.php create mode 100644 libraries/src/Event/QuickIcon/GetIconEvent.php create mode 100644 libraries/src/Event/ReshapeArgumentsAware.php create mode 100644 libraries/src/Event/Result/ResultAware.php create mode 100644 libraries/src/Event/Result/ResultAwareInterface.php create mode 100644 libraries/src/Event/Result/ResultTypeArrayAware.php create mode 100644 libraries/src/Event/Result/ResultTypeBooleanAware.php create mode 100644 libraries/src/Event/Result/ResultTypeFloatAware.php create mode 100644 libraries/src/Event/Result/ResultTypeIntegerAware.php create mode 100644 libraries/src/Event/Result/ResultTypeMixedAware.php create mode 100644 libraries/src/Event/Result/ResultTypeNumericAware.php create mode 100644 libraries/src/Event/Result/ResultTypeObjectAware.php create mode 100644 libraries/src/Event/Result/ResultTypeStringAware.php diff --git a/libraries/src/Application/EventAware.php b/libraries/src/Application/EventAware.php index 4237e6362c1fd..d1020858129a5 100644 --- a/libraries/src/Application/EventAware.php +++ b/libraries/src/Application/EventAware.php @@ -10,6 +10,7 @@ \defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Event\CoreEventAware; use Joomla\Event\DispatcherInterface; use Joomla\Event\Event; use Psr\Log\LoggerInterface; @@ -21,6 +22,8 @@ */ trait EventAware { + use CoreEventAware; + /** * Get the event dispatcher. * @@ -101,7 +104,8 @@ public function triggerEvent($eventName, $args = []) } elseif (\is_array($args)) { - $event = new Event($eventName, $args); + $className = self::getEventClassByEventName($eventName); + $event = new $className($eventName, $args); } else { diff --git a/libraries/src/Event/AbstractEvent.php b/libraries/src/Event/AbstractEvent.php index b507a650fa71e..5d313b7baa072 100644 --- a/libraries/src/Event/AbstractEvent.php +++ b/libraries/src/Event/AbstractEvent.php @@ -11,6 +11,7 @@ \defined('JPATH_PLATFORM') or die; use BadMethodCallException; +use Joomla\Event\Event; use Joomla\Event\Event as BaseEvent; use Joomla\String\Normalise; @@ -36,6 +37,8 @@ */ abstract class AbstractEvent extends BaseEvent { + use CoreEventAware; + /** * Creates a new CMS event object for a given event name and subject. The following arguments must be given: * subject object The subject of the event. This is the core object you are going to manipulate. @@ -87,6 +90,18 @@ public static function create(string $eventName, array $arguments = []) return new $eventClassName($eventName, $arguments); } + /** + * The detection code above failed. This is to be expected, it was written back when we only + * had the Table events. It does not address most other core events. So, let's use our + * fancier detection instead. + */ + $eventClassName = self::getEventClassByEventName($eventName); + + if (!empty($eventClassName) && ($eventClassName !== Event::class)) + { + return new $eventClassName($eventName, $arguments); + } + return new GenericEvent($eventName, $arguments); } diff --git a/libraries/src/Event/CoreEventAware.php b/libraries/src/Event/CoreEventAware.php new file mode 100644 index 0000000000000..301a25604dd34 --- /dev/null +++ b/libraries/src/Event/CoreEventAware.php @@ -0,0 +1,122 @@ + + * @license GNU General Public License version 2 or later; see LICENSE + */ + +namespace Joomla\CMS\Event; + +use Joomla\CMS\Event\Model\BeforeBatchEvent; +use Joomla\CMS\Event\QuickIcon\GetIconEvent; +use Joomla\CMS\Event\Table\AfterBindEvent; +use Joomla\CMS\Event\Table\AfterCheckinEvent; +use Joomla\CMS\Event\Table\AfterCheckoutEvent; +use Joomla\CMS\Event\Table\AfterDeleteEvent; +use Joomla\CMS\Event\Table\AfterHitEvent; +use Joomla\CMS\Event\Table\AfterLoadEvent; +use Joomla\CMS\Event\Table\AfterMoveEvent; +use Joomla\CMS\Event\Table\AfterPublishEvent; +use Joomla\CMS\Event\Table\AfterReorderEvent; +use Joomla\CMS\Event\Table\AfterResetEvent; +use Joomla\CMS\Event\Table\AfterStoreEvent; +use Joomla\CMS\Event\Table\BeforeBindEvent; +use Joomla\CMS\Event\Table\BeforeCheckinEvent; +use Joomla\CMS\Event\Table\BeforeCheckoutEvent; +use Joomla\CMS\Event\Table\BeforeDeleteEvent; +use Joomla\CMS\Event\Table\BeforeHitEvent; +use Joomla\CMS\Event\Table\BeforeLoadEvent; +use Joomla\CMS\Event\Table\BeforeMoveEvent; +use Joomla\CMS\Event\Table\BeforePublishEvent; +use Joomla\CMS\Event\Table\BeforeReorderEvent; +use Joomla\CMS\Event\Table\BeforeResetEvent; +use Joomla\CMS\Event\Table\BeforeStoreEvent; +use Joomla\CMS\Event\Table\CheckEvent; +use Joomla\CMS\Event\Table\ObjectCreateEvent; +use Joomla\CMS\Event\Table\SetNewTagsEvent; +use Joomla\CMS\Event\View\DisplayEvent; +use Joomla\CMS\Event\WebAsset\WebAssetRegistryAssetChanged; +use Joomla\CMS\Event\Workflow\WorkflowFunctionalityUsedEvent; +use Joomla\CMS\Event\Workflow\WorkflowTransitionEvent; +use Joomla\Event\Event; + +\defined('JPATH_PLATFORM') or die; + +/** + * Returns the most suitable event class for a Joomla core event name + * + * @since __DEPLOY_VERSION__ + */ +trait CoreEventAware +{ + /** + * Maps event names to concrete Event classes. + * + * This is only for events with invariable names. Events with variable names are handled with + * PHP logic in the getEventClassByEventName class. + * + * @var array + * @since __DEPLOY_VERSION__ + */ + private static $eventNameToConcreteClass = [ + // Model + 'onBeforeBatch' => BeforeBatchEvent::class, + // Quickicon + 'onGetIcon' => GetIconEvent::class, + // Table + 'onTableAfterBind' => AfterBindEvent::class, + 'onTableAfterCheckin' => AfterCheckinEvent::class, + 'onTableAfterCheckout' => AfterCheckoutEvent::class, + 'onTableAfterDelete' => AfterDeleteEvent::class, + 'onTableAfterHit' => AfterHitEvent::class, + 'onTableAfterLoad' => AfterLoadEvent::class, + 'onTableAfterMove' => AfterMoveEvent::class, + 'onTableAfterPublish' => AfterPublishEvent::class, + 'onTableAfterReorder' => AfterReorderEvent::class, + 'onTableAfterReset' => AfterResetEvent::class, + 'onTableAfterStore' => AfterStoreEvent::class, + 'onTableBeforeBind' => BeforeBindEvent::class, + 'onTableBeforeCheckin' => BeforeCheckinEvent::class, + 'onTableBeforeCheckout' => BeforeCheckoutEvent::class, + 'onTableBeforeDelete' => BeforeDeleteEvent::class, + 'onTableBeforeHit' => BeforeHitEvent::class, + 'onTableBeforeLoad' => BeforeLoadEvent::class, + 'onTableBeforeMove' => BeforeMoveEvent::class, + 'onTableBeforePublish' => BeforePublishEvent::class, + 'onTableBeforeReorder' => BeforeReorderEvent::class, + 'onTableBeforeReset' => BeforeResetEvent::class, + 'onTableBeforeStore' => BeforeStoreEvent::class, + 'onTableCheck' => CheckEvent::class, + 'onTableObjectCreate' => ObjectCreateEvent::class, + 'onTableSetNewTags' => SetNewTagsEvent::class, + // View + 'onBeforeDisplay' => DisplayEvent::class, + 'onAfterDisplay' => DisplayEvent::class, + // Worflow + 'onWorkflowFunctionalityUsed' => WorkflowFunctionalityUsedEvent::class, + 'onWorkflowAfterTransition' => WorkflowTransitionEvent::class, + 'onWorkflowBeforeTransition' => WorkflowTransitionEvent::class, + ]; + + /** + * Get the concrete event class name for the given event name. + * + * This method falls back to the generic Joomla\Event\Event class if the event name is unknown + * to this trait. + * + * @param string $eventName The event name + * + * @return string The event class name + * @since __DEPLOY_VERSION__ + */ + protected static function getEventClassByEventName(string $eventName): string + { + if (strpos($eventName, 'onWebAssetRegistryChangedAsset') === 0) + { + return WebAssetRegistryAssetChanged::class; + } + + return self::$eventNameToConcreteClass[$eventName] ?? Event::class; + } +} diff --git a/libraries/src/Event/QuickIcon/GetIconEvent.php b/libraries/src/Event/QuickIcon/GetIconEvent.php new file mode 100644 index 0000000000000..ee680e64bd78e --- /dev/null +++ b/libraries/src/Event/QuickIcon/GetIconEvent.php @@ -0,0 +1,64 @@ + + * @license GNU General Public License version 2 or later; see LICENSE + */ + +namespace Joomla\CMS\Event\QuickIcon; + +\defined('JPATH_PLATFORM') or die; + +use BadMethodCallException; +use DomainException; +use Joomla\CMS\Event\AbstractImmutableEvent; +use Joomla\CMS\Event\ReshapeArgumentsAware; +use Joomla\CMS\Event\Result\ResultAware; +use Joomla\CMS\Event\Result\ResultAwareInterface; +use Joomla\CMS\Event\Result\ResultTypeArrayAware; + +/** + * Event class for the onGetIcon event. + * + * @since __DEPLOY_VERSION__ + */ +class GetIconEvent extends AbstractImmutableEvent implements ResultAwareInterface +{ + use ResultAware; + use ResultTypeArrayAware; + use ReshapeArgumentsAware; + + /** + * Constructor. + * + * @param string $name The event name. + * @param array $arguments The event arguments. + * + * @since __DEPLOY_VERSION__ + * @throws BadMethodCallException + */ + public function __construct(string $name, array $arguments = []) + { + $this->reshapeArguments($arguments, ['context']); + + parent::__construct($name, $arguments); + } + + /** + * A method to validate the 'context' named parameter. + * + * @param string $value The calling context for retrieving icons. + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + public function setContext(string $value) + { + if (empty($value)) + { + throw new DomainException(sprintf("Argument 'context' of event %s must be a non-empty string.", $this->name)); + } + } +} diff --git a/libraries/src/Event/ReshapeArgumentsAware.php b/libraries/src/Event/ReshapeArgumentsAware.php new file mode 100644 index 0000000000000..b035c16cb206e --- /dev/null +++ b/libraries/src/Event/ReshapeArgumentsAware.php @@ -0,0 +1,99 @@ + + * @license GNU General Public License version 2 or later; see LICENSE + */ + +namespace Joomla\CMS\Event; + +use DomainException; + +\defined('JPATH_PLATFORM') or die; + +/** + * A Trait to reshape arguments maintaining b/c with legacy plugin events. + * + * Old plugin event handlers expect positional arguments, not named arguments, since they are simple + * PHP methods, e.g. + * public onExample($foo, $bar, $baz). + * Concrete Event classes, however, use named arguments which can be passed in any order. The + * following two examples are equivalent: + * $event1 = new ConcreteEventClass('onExample', ['foo' => 1, 'bar' => 2, 'baz' => 3]; + * $event2 = new ConcreteEventClass('onExample', ['bar' => 2, 'baz' => 3, 'foo' => 1,]; + * However, this means that the internal $arguments property of the event object holds the named + * arguments in a **different** order in each case. + * + * When the event handler is aware of the ConcreteEventClass it can retrieve named arguments and + * all is good in the world. However, when you have a legacy plugin listener registered through + * CMSPlugin::registerLegacyListener you have a major problem! The legacy listener is passing the + * arguments **positionally**, in the order they were added to the Event object. + * + * In the previous example, $event1 would work as expected because the foo, bar, and baz arguments + * were given in the same order legacy listeners expected them. On the other hand, $event2 would + * fail miserably because the call order would be $bar, $baz, $foo which is NOT what the legacy + * listener expected. + * + * The only way to fix that is to *reshape the argument* in the concrete event's constructor so that + * the order of arguments is guaranteed to be the same as expected by legacy listeners. Moreover, + * since Joomla is passing all arguments (except the 'result' argument) blindly to the legacy + * listener we must ensure that a. all necessary arguments are set and b. any other named arguments + * do NOT exist. Otherwise our legacy listeners would receive the wrong number of positional + * arguments and break. + * + * All this is achieved by the reshapeArguments() method in this trait which has to be called in the + * constructor of the concrete event class. + * + * This trait is marked as deprecated with a removal target of 5.0 because in Joomla 5 we will only + * be using concrete event classes with named arguments, removing legacy listeners and their + * positional arguments headaches. + * + * @since __DEPLOY_VERSION__ + * + * @deprecated 5.0 + */ +trait ReshapeArgumentsAware +{ + /** + * Reshape the arguments array to preserve b/c with legacy listeners + * + * @param array $arguments The named arguments array passed to the constructor. + * @param array $argumentNames The allowed argument names (mandatory AND optional). + * @param array $defaults Default values for optional arguments. + * + * @return array The reshaped arguments. + * + * @since __DEPLOY_VERSION__ + */ + protected function reshapeArguments(array $arguments, array $argumentNames, array $defaults = []) + { + $mandatoryKeys = array_diff($argumentNames, array_keys($defaults)); + $currentKeys = array_keys($arguments); + $missingKeys = array_diff($mandatoryKeys, $currentKeys); + $extraKeys = array_diff($currentKeys, $argumentNames); + + // Am I missing any mandatory arguments? + if ($missingKeys) + { + throw new DomainException(sprintf('Missing arguments for ‘%s’ event: %s', $this->getName(), implode(', ', $missingKeys))); + } + + // Do I have unknown arguments? + if ($extraKeys) + { + throw new DomainException(sprintf('Unknown arguments for ‘%s’ event: %s', $this->getName(), implode(', ', $missingKeys))); + } + + // Reconstruct the arguments in the order specified in $argumentTypes + $reconstructed = []; + + foreach ($argumentNames as $key) + { + $reconstructed[$key] = $arguments[$key] ?? $defaults[$key]; + } + + // Return the reconstructed arguments array + return $reconstructed; + } +} diff --git a/libraries/src/Event/Result/ResultAware.php b/libraries/src/Event/Result/ResultAware.php new file mode 100644 index 0000000000000..3a07485b8c86d --- /dev/null +++ b/libraries/src/Event/Result/ResultAware.php @@ -0,0 +1,102 @@ + + * @license GNU General Public License version 2 or later; see LICENSE + */ + +namespace Joomla\CMS\Event\Result; + +\defined('JPATH_PLATFORM') or die; + +use BadMethodCallException; +use Joomla\Event\Event as BaseEvent; + +/** + * This Trait partially implements the ResultAwareInterface for mutable and immutable events. + * + * You must additionally implement the typeCheckResult method or use one of the ResultType*Aware + * traits in your Event handler. + * + * @since __DEPLOY_VERSION__ + */ +trait ResultAware +{ + /** + * Disallow setting the result argument directly with setArgument() instead of going through addResult(). + * + * You should set this to true ONLY for event names which did NOT exist before Joomla __DEPLOY_VERSION__ + * or if you are a third party developer introducing new event names for use only in your software. + * + * @var boolean + * @since __DEPLOY_VERSION__ + * + * @deprecated 5.0 Using setArgument() for the result argument will always be disallowed. + */ + protected $preventSetArgumentResult = false; + + /** + * Appends data to the result array of the event. + * + * @param mixed $data What to add to the result array. + * + * @return void + * @since __DEPLOY_VERSION__ + */ + public function addResult($data): void + { + // Ensure this trait is applied to an Event object. + if (!($this instanceof BaseEvent)) + { + throw new \LogicException(sprintf('Event class ‘%s‘ must implement %s.', get_class($this), BaseEvent::class)); + } + + // Ensure the Event object fully implements the ResultAwareInterface. + if (!($this instanceof ResultAwareInterface)) + { + throw new \LogicException(sprintf('Event class ‘%s‘ must implement %s.', get_class($this), ResultAwareInterface::class)); + } + + // Make sure the data type is correct + $this->typeCheckResult($data); + + // Append the result. We use the arguments property directly to allow this to work on immutable events. + $this->arguments['result'] = $this->arguments['result'] ?? []; + $this->arguments['result'][] = $data; + } + + /** + * Handle setting the result argument directly. + * + * This method serves a dual purpose: backwards compatibility and enforcing the use of addResult. + * + * When $this->preventSetArgumentResult is false it acts as a backwards compatibility shim for + * event handlers expecting generic event classes instead of the concrete Events implemented in + * this package. This allows the migration to concrete event classes throughout the lifetime of + * Joomla 4.x. + * + * When $this->preventSetArgumentResult is false (which will always be the case on Joomla 5.0) + * it will throw a BadMethodCallException if the developer tries to call setArgument('result', ...) + * instead of going through the addResult() method. + * + * @param array $value The new result array. + * + * @return array + * @since __DEPLOY_VERSION__ + */ + protected function setResult(array $value) + { + if ($this->preventSetArgumentResult) + { + throw new BadMethodCallException('You are not allowed to set the result argument directly. Use addResult() instead.'); + } + + // Always assume that the last element of the array is the result the handler is trying to append. + $latestValue = array_pop($value); + + $this->addResult($latestValue); + + return $this->arguments['result']; + } +} diff --git a/libraries/src/Event/Result/ResultAwareInterface.php b/libraries/src/Event/Result/ResultAwareInterface.php new file mode 100644 index 0000000000000..2285a205bf02d --- /dev/null +++ b/libraries/src/Event/Result/ResultAwareInterface.php @@ -0,0 +1,52 @@ + + * @license GNU General Public License version 2 or later; see LICENSE + */ + +namespace Joomla\CMS\Event\Result; + +\defined('JPATH_PLATFORM') or die; + +use InvalidArgumentException; + +/** + * Defines an Event which has an append-only array argument named 'result'. + * + * This is used for Events whose handlers are expected to return something when called, similar to + * how many plugin events worked in earlier versions of Joomla. + * + * This interface is partially implemented by the ResultAware trait. The typeCheckResult method is + * implemented by the various ResultType*Aware traits. Your event needs to use both the ResultAware + * trait and one of the ResultType*Aware traits. For example, if your event returns boolean results + * you need to use the ResultAware and ResultTypeBooleanAware traits in your event. + * + * @since __DEPLOY_VERSION__ + */ +interface ResultAwareInterface +{ + /** + * Appends data to the result array of the event. + * + * @param mixed $data What to add to the result array. + * + * @return void + * @since __DEPLOY_VERSION__ + */ + public function addResult($data): void; + + /** + * Checks the type of the data being appended to the result argument. + * + * @param mixed $data The data to type check + * + * @return void + * @throws InvalidArgumentException + * + * @internal + * @since __DEPLOY_VERSION__ + */ + public function typeCheckResult($data): void; +} diff --git a/libraries/src/Event/Result/ResultTypeArrayAware.php b/libraries/src/Event/Result/ResultTypeArrayAware.php new file mode 100644 index 0000000000000..5ec554b657832 --- /dev/null +++ b/libraries/src/Event/Result/ResultTypeArrayAware.php @@ -0,0 +1,71 @@ + + * @license GNU General Public License version 2 or later; see LICENSE + */ + +namespace Joomla\CMS\Event\Result; + +\defined('JPATH_PLATFORM') or die; + +use InvalidArgumentException; + +/** + * This Trait partially implements the ResultAwareInterface for type checking. + * + * Events using this Trait (and the ResultAware trait) will expect event handlers to set results + * of an Array type. + * + * @since __DEPLOY_VERSION__ + */ +trait ResultTypeArrayAware +{ + /** + * Can the result attribute values also be NULL? + * + * @var boolean + * @since __DEPLOY_VERSION__ + */ + protected $resultIsNullable = false; + + /** + * Can the result attribute values also be boolean FALSE? + * + * @var boolean + * @since __DEPLOY_VERSION__ + * + * @deprecated 5.0 You should use nullable values or exceptions instead of returning boolean false results. + */ + protected $resultIsFalseable = false; + + /** + * Checks the type of the data being appended to the result argument. + * + * @param mixed $data The data to type check + * + * @return void + * @throws InvalidArgumentException + * + * @internal + * @since __DEPLOY_VERSION__ + */ + public function typeCheckResult($data): void + { + if ($this->resultIsNullable && $data === null) + { + return; + } + + if ($this->resultIsFalseable && $data === false) + { + return; + } + + if (!is_array($data)) + { + throw new InvalidArgumentException(sprintf('Event %s only accepts Array results.', $this->getName())); + } + } +} diff --git a/libraries/src/Event/Result/ResultTypeBooleanAware.php b/libraries/src/Event/Result/ResultTypeBooleanAware.php new file mode 100644 index 0000000000000..ecdcc049c91ae --- /dev/null +++ b/libraries/src/Event/Result/ResultTypeBooleanAware.php @@ -0,0 +1,56 @@ + + * @license GNU General Public License version 2 or later; see LICENSE + */ + +namespace Joomla\CMS\Event\Result; + +\defined('JPATH_PLATFORM') or die; + +use InvalidArgumentException; + +/** + * This Trait partially implements the ResultAwareInterface for type checking. + * + * Events using this Trait (and the ResultAware trait) will expect event handlers to set results + * of a Boolean type. + * + * @since __DEPLOY_VERSION__ + */ +trait ResultTypeBooleanAware +{ + /** + * Can the result attribute values also be NULL? + * + * @var boolean + * @since __DEPLOY_VERSION__ + */ + protected $resultIsNullable = false; + + /** + * Checks the type of the data being appended to the result argument. + * + * @param mixed $data The data to type check + * + * @return void + * @throws InvalidArgumentException + * + * @internal + * @since __DEPLOY_VERSION__ + */ + public function typeCheckResult($data): void + { + if ($this->resultIsNullable && $data === null) + { + return; + } + + if (!is_bool($data)) + { + throw new InvalidArgumentException(sprintf('Event %s only accepts Boolean results.', $this->getName())); + } + } +} diff --git a/libraries/src/Event/Result/ResultTypeFloatAware.php b/libraries/src/Event/Result/ResultTypeFloatAware.php new file mode 100644 index 0000000000000..c0b9a4174df29 --- /dev/null +++ b/libraries/src/Event/Result/ResultTypeFloatAware.php @@ -0,0 +1,71 @@ + + * @license GNU General Public License version 2 or later; see LICENSE + */ + +namespace Joomla\CMS\Event\Result; + +\defined('JPATH_PLATFORM') or die; + +use InvalidArgumentException; + +/** + * This Trait partially implements the ResultAwareInterface for type checking. + * + * Events using this Trait (and the ResultAware trait) will expect event handlers to set results + * of a Float type. + * + * @since __DEPLOY_VERSION__ + */ +trait ResultTypeFloatAware +{ + /** + * Can the result attribute values also be NULL? + * + * @var boolean + * @since __DEPLOY_VERSION__ + */ + protected $resultIsNullable = false; + + /** + * Can the result attribute values also be boolean FALSE? + * + * @var boolean + * @since __DEPLOY_VERSION__ + * + * @deprecated 5.0 You should use nullable values or exceptions instead of returning boolean false results. + */ + protected $resultIsFalseable = false; + + /** + * Checks the type of the data being appended to the result argument. + * + * @param mixed $data The data to type check + * + * @return void + * @throws InvalidArgumentException + * + * @internal + * @since __DEPLOY_VERSION__ + */ + public function typeCheckResult($data): void + { + if ($this->resultIsNullable && $data === null) + { + return; + } + + if ($this->resultIsFalseable && $data === false) + { + return; + } + + if (!is_float($data)) + { + throw new InvalidArgumentException(sprintf('Event %s only accepts Float results.', $this->getName())); + } + } +} diff --git a/libraries/src/Event/Result/ResultTypeIntegerAware.php b/libraries/src/Event/Result/ResultTypeIntegerAware.php new file mode 100644 index 0000000000000..fc393b379a848 --- /dev/null +++ b/libraries/src/Event/Result/ResultTypeIntegerAware.php @@ -0,0 +1,71 @@ + + * @license GNU General Public License version 2 or later; see LICENSE + */ + +namespace Joomla\CMS\Event\Result; + +\defined('JPATH_PLATFORM') or die; + +use InvalidArgumentException; + +/** + * This Trait partially implements the ResultAwareInterface for type checking. + * + * Events using this Trait (and the ResultAware trait) will expect event handlers to set results + * of an Integer type. + * + * @since __DEPLOY_VERSION__ + */ +trait ResultTypeIntegerAware +{ + /** + * Can the result attribute values also be NULL? + * + * @var boolean + * @since __DEPLOY_VERSION__ + */ + protected $resultIsNullable = false; + + /** + * Can the result attribute values also be boolean FALSE? + * + * @var boolean + * @since __DEPLOY_VERSION__ + * + * @deprecated 5.0 You should use nullable values or exceptions instead of returning boolean false results. + */ + protected $resultIsFalseable = false; + + /** + * Checks the type of the data being appended to the result argument. + * + * @param mixed $data The data to type check + * + * @return void + * @throws InvalidArgumentException + * + * @internal + * @since __DEPLOY_VERSION__ + */ + public function typeCheckResult($data): void + { + if ($this->resultIsNullable && $data === null) + { + return; + } + + if ($this->resultIsFalseable && $data === false) + { + return; + } + + if (!is_int($data)) + { + throw new InvalidArgumentException(sprintf('Event %s only accepts Integer results.', $this->getName())); + } + } +} diff --git a/libraries/src/Event/Result/ResultTypeMixedAware.php b/libraries/src/Event/Result/ResultTypeMixedAware.php new file mode 100644 index 0000000000000..987b87ec69ea1 --- /dev/null +++ b/libraries/src/Event/Result/ResultTypeMixedAware.php @@ -0,0 +1,41 @@ + + * @license GNU General Public License version 2 or later; see LICENSE + */ + +namespace Joomla\CMS\Event\Result; + +\defined('JPATH_PLATFORM') or die; + +use InvalidArgumentException; + +/** + * This Trait partially implements the ResultAwareInterface for type checking. + * + * Events using this Trait (and the ResultAware trait) will expect event handlers to set results + * of a any type. THIS IS A COP OUT! If you expect a nullable or union type it's best to implement + * the typeCheckResult method yourself to check for the exact types you expect. + * + * @since __DEPLOY_VERSION__ + */ +trait ResultTypeMixedAware +{ + /** + * Checks the type of the data being appended to the result argument. + * + * @param mixed $data The data to type check + * + * @return void + * @throws InvalidArgumentException + * + * @internal + * @since __DEPLOY_VERSION__ + */ + public function typeCheckResult($data): void + { + // Intentionally left blank; no type check is performed. + } +} diff --git a/libraries/src/Event/Result/ResultTypeNumericAware.php b/libraries/src/Event/Result/ResultTypeNumericAware.php new file mode 100644 index 0000000000000..1314a82ac24c1 --- /dev/null +++ b/libraries/src/Event/Result/ResultTypeNumericAware.php @@ -0,0 +1,71 @@ + + * @license GNU General Public License version 2 or later; see LICENSE + */ + +namespace Joomla\CMS\Event\Result; + +\defined('JPATH_PLATFORM') or die; + +use InvalidArgumentException; + +/** + * This Trait partially implements the ResultAwareInterface for type checking. + * + * Events using this Trait (and the ResultAware trait) will expect event handlers to set results + * of a Numeric type. + * + * @since __DEPLOY_VERSION__ + */ +trait ResultTypeNumericAware +{ + /** + * Can the result attribute values also be NULL? + * + * @var boolean + * @since __DEPLOY_VERSION__ + */ + protected $resultIsNullable = false; + + /** + * Can the result attribute values also be boolean FALSE? + * + * @var boolean + * @since __DEPLOY_VERSION__ + * + * @deprecated 5.0 You should use nullable values or exceptions instead of returning boolean false results. + */ + protected $resultIsFalseable = false; + + /** + * Checks the type of the data being appended to the result argument. + * + * @param mixed $data The data to type check + * + * @return void + * @throws InvalidArgumentException + * + * @internal + * @since __DEPLOY_VERSION__ + */ + public function typeCheckResult($data): void + { + if ($this->resultIsNullable && $data === null) + { + return; + } + + if ($this->resultIsFalseable && $data === false) + { + return; + } + + if (!is_numeric($data)) + { + throw new InvalidArgumentException(sprintf('Event %s only accepts Numeric results.', $this->getName())); + } + } +} diff --git a/libraries/src/Event/Result/ResultTypeObjectAware.php b/libraries/src/Event/Result/ResultTypeObjectAware.php new file mode 100644 index 0000000000000..24ff5228ba95b --- /dev/null +++ b/libraries/src/Event/Result/ResultTypeObjectAware.php @@ -0,0 +1,98 @@ + + * @license GNU General Public License version 2 or later; see LICENSE + */ + +namespace Joomla\CMS\Event\Result; + +\defined('JPATH_PLATFORM') or die; + +use InvalidArgumentException; + +/** + * This Trait partially implements the ResultAwareInterface for type checking. + * + * Events using this Trait (and the ResultAware trait) will expect event handlers to set results + * of an object type. + * + * If you do not set a list of acceptable result classes any PHP object will satisfy this type check. + * + * @since __DEPLOY_VERSION__ + */ +trait ResultTypeObjectAware +{ + /** + * Can the result attribute values also be NULL? + * + * @var boolean + * @since __DEPLOY_VERSION__ + */ + protected $resultIsNullable = false; + + /** + * Can the result attribute values also be boolean FALSE? + * + * @var boolean + * @since __DEPLOY_VERSION__ + * + * @deprecated 5.0 You should use nullable values or exceptions instead of returning boolean false results. + */ + protected $resultIsFalseable = false; + + /** + * Acceptable class names for result values. + * + * @var array + * @since __DEPLOY_VERSION__ + */ + protected $resultAcceptableClasses = []; + + /** + * Checks the type of the data being appended to the result argument. + * + * @param mixed $data The data to type check + * + * @return void + * @throws InvalidArgumentException + * + * @internal + * @since __DEPLOY_VERSION__ + */ + public function typeCheckResult($data): void + { + if ($this->resultIsNullable && $data === null) + { + return; + } + + if ($this->resultIsFalseable && $data === false) + { + return; + } + + if (!is_object($data)) + { + throw new InvalidArgumentException(sprintf('Event %s only accepts object results.', $this->getName())); + } + + if (empty($this->resultAcceptableClasses)) + { + return; + } + + foreach ($this->resultAcceptableClasses as $className) + { + if (is_a($data, $className)) + { + return; + } + } + + $acceptableTypes = implode(', ', $this->resultAcceptableClasses); + $messageTemplate = 'Event %s only accepts object results which are instances of one of %s.'; + throw new InvalidArgumentException(sprintf($messageTemplate, $this->getName(), $acceptableTypes)); + } +} diff --git a/libraries/src/Event/Result/ResultTypeStringAware.php b/libraries/src/Event/Result/ResultTypeStringAware.php new file mode 100644 index 0000000000000..ae4678f16ccac --- /dev/null +++ b/libraries/src/Event/Result/ResultTypeStringAware.php @@ -0,0 +1,71 @@ + + * @license GNU General Public License version 2 or later; see LICENSE + */ + +namespace Joomla\CMS\Event\Result; + +\defined('JPATH_PLATFORM') or die; + +use InvalidArgumentException; + +/** + * This Trait partially implements the ResultAwareInterface for type checking. + * + * Events using this Trait (and the ResultAware trait) will expect event handlers to set results + * of a String type. + * + * @since __DEPLOY_VERSION__ + */ +trait ResultTypeStringAware +{ + /** + * Can the result attribute values also be NULL? + * + * @var boolean + * @since __DEPLOY_VERSION__ + */ + protected $resultIsNullable = false; + + /** + * Can the result attribute values also be boolean FALSE? + * + * @var boolean + * @since __DEPLOY_VERSION__ + * + * @deprecated 5.0 You should use nullable values or exceptions instead of returning boolean false results. + */ + protected $resultIsFalseable = false; + + /** + * Checks the type of the data being appended to the result argument. + * + * @param mixed $data The data to type check + * + * @return void + * @throws InvalidArgumentException + * + * @internal + * @since __DEPLOY_VERSION__ + */ + public function typeCheckResult($data): void + { + if ($this->resultIsNullable && $data === null) + { + return; + } + + if ($this->resultIsFalseable && $data === false) + { + return; + } + + if (!is_string($data)) + { + throw new InvalidArgumentException(sprintf('Event %s only accepts String results.', $this->getName())); + } + } +} From e0b4ff8084c6ae478d1c6d2397de4f8e547dd609 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Tue, 17 May 2022 20:47:02 +0200 Subject: [PATCH 11/33] [4.1] TinyMCE should prefer the editor dimensions and fallback to the plugin params (#37603) * TinyMCE should prefer the editor dimensions and fallback to the plugin params * remove numeric check * same default value as manifest * text area dimensions --- .../tinymce/src/PluginTraits/DisplayTrait.php | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php b/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php index b8f8b630f00b0..f570b383f9886 100644 --- a/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php +++ b/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php @@ -65,8 +65,6 @@ public function onDisplay( $externalPlugins = []; $options = $doc->getScriptOptions('plg_editor_tinymce'); $theme = 'silver'; - $width = is_numeric($width) ? $width . 'px' : $width; - $height = is_numeric($height) ? $height . 'px' : $height; // Data object for the layout $textarea = new stdClass; @@ -75,8 +73,8 @@ public function onDisplay( $textarea->class = 'mce_editable joomla-editor-tinymce'; $textarea->cols = $col; $textarea->rows = $row; - $textarea->width = $width; - $textarea->height = $height; + $textarea->width = is_numeric($width) ? $width . 'px' : $width; + $textarea->height = is_numeric($height) ? $height . 'px' : $height; $textarea->content = $content; $textarea->readonly = !empty($params['readonly']); @@ -237,12 +235,6 @@ public function onDisplay( $valid_elements = trim($levelParams->get('valid_elements', '')); } - $html_height = $this->params->get('html_height', '550'); - $html_width = $this->params->get('html_width', ''); - $html_width = $html_width == 750 ? '' : $html_width; - $html_width = is_numeric($html_width) ? $html_width . 'px' : $html_width; - $html_height = is_numeric($html_height) ? $html_height . 'px' : $html_height; - // The param is true for vertical resizing only, false or both $resizing = (bool) $levelParams->get('resizing', true); $resize_horizontal = (bool) $levelParams->get('resize_horizontal', true); @@ -479,8 +471,8 @@ public function onDisplay( 'document_base_url' => Uri::root(true) . '/', 'image_caption' => true, 'importcss_append' => true, - 'height' => $html_height, - 'width' => $html_width, + 'height' => $height ?: $this->params->get('html_height', '550px'), + 'width' => $width ?: $this->params->get('html_width', ''), 'elementpath' => (bool) $levelParams->get('element_path', true), 'resize' => $resizing, 'templates' => $templates, From 839bd112abe1c78632585fe5e37ecab8884bf670 Mon Sep 17 00:00:00 2001 From: Bear Date: Tue, 17 May 2022 13:48:16 -0500 Subject: [PATCH 12/33] [4.1] Fixes spacing for inline tags. (#37805) * fixes spacing for inline tags. * remove spacing on left of tag block. --- .../templates/site/cassiopeia/scss/blocks/_tags.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_tags.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_tags.scss index 248e0770aeab8..2a85a1233b261 100644 --- a/build/media_source/templates/site/cassiopeia/scss/blocks/_tags.scss +++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_tags.scss @@ -11,5 +11,5 @@ .tag { display: inline-block; - padding: .5rem 0; + padding: .5rem .5rem .5rem 0; } From 4c66895b514f3a6e9072fe64d2f942d08ea931aa Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Tue, 17 May 2022 20:52:32 +0200 Subject: [PATCH 13/33] [4.1] Use HTMLHelper instead of layout helper (#37148) * Use HTMLHelper instead of layout helper * cs * Support attributes * adapt from change * use correct class name --- .../src/View/Category/FeedView.php | 10 +-- .../src/View/Featured/FeedView.php | 10 +-- .../tmpl/categories/default_items.php | 3 +- .../com_finder/tmpl/search/default_result.php | 8 +-- components/com_tags/tmpl/tag/default.php | 5 +- .../com_tags/tmpl/tag/default_items.php | 3 +- components/com_tags/tmpl/tag/list.php | 5 +- components/com_tags/tmpl/tags/default.php | 4 +- .../com_tags/tmpl/tags/default_items.php | 5 +- .../com_users/tmpl/login/default_login.php | 3 +- .../com_users/tmpl/login/default_logout.php | 3 +- libraries/src/HTML/HTMLHelper.php | 68 ++++++++++++++++--- modules/mod_feed/tmpl/default.php | 3 +- 13 files changed, 82 insertions(+), 48 deletions(-) diff --git a/components/com_content/src/View/Category/FeedView.php b/components/com_content/src/View/Category/FeedView.php index 744b51c585845..2511bdeaf4c44 100644 --- a/components/com_content/src/View/Category/FeedView.php +++ b/components/com_content/src/View/Category/FeedView.php @@ -12,11 +12,10 @@ \defined('_JEXEC') or die; use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\MVC\View\CategoryFeedView; use Joomla\CMS\Router\Route; -use Joomla\CMS\Uri\Uri; use Joomla\Component\Content\Site\Helper\RouteHelper; /** @@ -50,13 +49,10 @@ protected function reconcileNames($item) $params = $app->getParams(); $item->description = ''; $obj = json_decode($item->images); - $introImage = $obj->{'image_intro'} ?? ''; - if (isset($introImage) && ($introImage != '')) + if (!empty($obj->image_intro)) { - $item->description = '

' - . LayoutHelper::render('joomla.html.image', ['src' => preg_match('/http/', $introImage) ? $introImage : Uri::root() . $introImage]) - . '

'; + $item->description = '

' . HTMLHelper::_('image', $obj->image_intro, $obj->image_intro_alt) . '

'; } $item->description .= ($params->get('feed_summary', 0) ? $item->introtext . $item->fulltext : $item->introtext); diff --git a/components/com_content/src/View/Featured/FeedView.php b/components/com_content/src/View/Featured/FeedView.php index 66572e2f6a8d0..1a037b07c135f 100644 --- a/components/com_content/src/View/Featured/FeedView.php +++ b/components/com_content/src/View/Featured/FeedView.php @@ -14,11 +14,10 @@ use Joomla\CMS\Categories\Categories; use Joomla\CMS\Document\Feed\FeedItem; use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\MVC\View\AbstractView; use Joomla\CMS\Router\Route; -use Joomla\CMS\Uri\Uri; use Joomla\Component\Content\Site\Helper\RouteHelper; /** @@ -64,13 +63,10 @@ public function display($tpl = null) $description = ''; $obj = json_decode($row->images); - $introImage = $obj->{'image_intro'} ?? ''; - if (isset($introImage) && ($introImage != '')) + if (!empty($obj->image_intro)) { - $description = '

' - . LayoutHelper::render('joomla.html.image', ['src' => preg_match('/http/', $introImage) ? $introImage : Uri::root() . $introImage]) - . '

'; + $description = '

' . HTMLHelper::_('image', $obj->image_intro, $obj->image_intro_alt) . '

'; } $description .= ($params->get('feed_summary', 0) ? $row->introtext . $row->fulltext : $row->introtext); diff --git a/components/com_content/tmpl/categories/default_items.php b/components/com_content/tmpl/categories/default_items.php index 08f08e8410e9f..a591a4a8e4fb8 100644 --- a/components/com_content/tmpl/categories/default_items.php +++ b/components/com_content/tmpl/categories/default_items.php @@ -11,7 +11,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; use Joomla\Component\Content\Site\Helper\RouteHelper; @@ -46,7 +45,7 @@ class="btn btn-secondary btn-sm"
params->get('show_description_image') && $item->getParams()->get('image')) : ?> - $item->getParams()->get('image'), 'alt' => $item->getParams()->get('image_alt')]); ?> + getParams()->get('image'), $item->getParams()->get('image_alt')); ?> params->get('show_subcat_desc_cat') == 1) : ?> description) : ?> diff --git a/components/com_finder/tmpl/search/default_result.php b/components/com_finder/tmpl/search/default_result.php index 9b91f6e381fa5..8338a98121872 100644 --- a/components/com_finder/tmpl/search/default_result.php +++ b/components/com_finder/tmpl/search/default_result.php @@ -12,7 +12,6 @@ use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; use Joomla\Component\Finder\Administrator\Helper\LanguageHelper; use Joomla\Component\Finder\Administrator\Indexer\Helper; @@ -73,14 +72,13 @@ ?>
  • result->imageUrl)) : ?> -
    - $this->result->imageUrl, 'alt' => $this->result->imageAlt]); ?> +
    params->get('link_image') && $this->result->route) : ?> - + result->imageUrl, $this->result->imageAlt, $extraAttr); ?> - + result->imageUrl, $this->result->imageAlt, $extraAttr); ?>
    diff --git a/components/com_tags/tmpl/tag/default.php b/components/com_tags/tmpl/tag/default.php index 5edf95dd0b20f..5e17225a6ed76 100644 --- a/components/com_tags/tmpl/tag/default.php +++ b/components/com_tags/tmpl/tag/default.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; use Joomla\CMS\HTML\HTMLHelper; -use Joomla\CMS\Layout\LayoutHelper; // Note that there are certain parts of this layout used only when there is exactly one tag. $isSingleTag = count($this->item) === 1; @@ -36,7 +35,7 @@
    item[0]->images); ?> params->get('tag_list_show_tag_image', 1) == 1 && !empty($images->image_fulltext)) : ?> - $images->image_fulltext, 'alt' => $images->image_fulltext_alt]); ?> + image_fulltext, $images->image_fulltext_alt); ?> params->get('tag_list_show_tag_description') == 1 && $this->item[0]->description) : ?> item[0]->description, '', 'com_tags.tag'); ?> @@ -47,7 +46,7 @@ params->get('tag_list_show_tag_description', 1) || $this->params->get('show_description_image', 1)) : ?> params->get('show_description_image', 1) == 1 && $this->params->get('tag_list_image')) : ?> - $this->params->get('tag_list_image'), 'alt' => empty($this->params->get('tag_list_image_alt')) && empty($this->params->get('tag_list_image_alt_empty')) ? false : $this->params->get('tag_list_image_alt')]); ?> + params->get('tag_list_image'), empty($this->params->get('tag_list_image_alt')) && empty($this->params->get('tag_list_image_alt_empty')) ? false : $this->params->get('tag_list_image_alt')); ?> params->get('tag_list_description', '') > '') : ?> params->get('tag_list_description'), '', 'com_tags.tag'); ?> diff --git a/components/com_tags/tmpl/tag/default_items.php b/components/com_tags/tmpl/tag/default_items.php index b2e971847ae8c..ce51281cc7649 100644 --- a/components/com_tags/tmpl/tag/default_items.php +++ b/components/com_tags/tmpl/tag/default_items.php @@ -12,7 +12,6 @@ use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; use Joomla\CMS\Uri\Uri; use Joomla\Component\Tags\Site\Helper\RouteHelper; @@ -93,7 +92,7 @@ class="inputbox" onchange="document.adminForm.submit();" core_images); ?> params->get('tag_list_show_item_image', 1) == 1 && !empty($images->image_intro)) : ?> - $images->image_intro, 'alt' => $images->image_intro_alt]); ?> + image_intro, $images->image_intro_alt); ?> params->get('tag_list_show_item_description', 1)) : ?> diff --git a/components/com_tags/tmpl/tag/list.php b/components/com_tags/tmpl/tag/list.php index 2bd7053471985..05bbafc2a2394 100644 --- a/components/com_tags/tmpl/tag/list.php +++ b/components/com_tags/tmpl/tag/list.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; use Joomla\CMS\HTML\HTMLHelper; -use Joomla\CMS\Layout\LayoutHelper; // Note that there are certain parts of this layout used only when there is exactly one tag. $n = count($this->items); @@ -37,7 +36,7 @@
    item[0]->images); ?> params->get('tag_list_show_tag_image', 1) == 1 && !empty($images->image_fulltext)) : ?> - $images->image_fulltext]); ?> + image_fulltext, ''); ?> params->get('tag_list_show_tag_description') == 1 && $this->item[0]->description) : ?> item[0]->description, '', 'com_tags.tag'); ?> @@ -48,7 +47,7 @@ params->get('tag_list_show_tag_description', 1) || $this->params->get('show_description_image', 1)) : ?> params->get('show_description_image', 1) == 1 && $this->params->get('tag_list_image')) : ?> - $this->params->get('tag_list_image'), 'alt' => empty($this->params->get('tag_list_image_alt')) && empty($this->params->get('tag_list_image_alt_empty')) ? false : $this->params->get('tag_list_image_alt')]); ?> + params->get('tag_list_image'), empty($this->params->get('tag_list_image_alt')) && empty($this->params->get('tag_list_image_alt_empty')) ? false : $this->params->get('tag_list_image_alt')); ?> params->get('tag_list_description', '') > '') : ?> params->get('tag_list_description'), '', 'com_tags.tag'); ?> diff --git a/components/com_tags/tmpl/tags/default.php b/components/com_tags/tmpl/tags/default.php index 6e3628cb7ca8a..fe98a64e1b1c6 100644 --- a/components/com_tags/tmpl/tags/default.php +++ b/components/com_tags/tmpl/tags/default.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -use Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\HTML\HTMLHelper; // Note that there are certain parts of this layout used only when there is exactly one tag. $description = $this->params->get('all_tags_description'); @@ -23,7 +23,7 @@ params->get('all_tags_show_description_image') && !empty($descriptionImage)) : ?>
    - $descriptionImage, 'alt' => empty($this->params->get('all_tags_description_image_alt')) && empty($this->params->get('all_tags_description_image_alt_empty')) ? false : $this->params->get('all_tags_description_image_alt')]); ?> + params->get('all_tags_description_image_alt')) && empty($this->params->get('all_tags_description_image_alt_empty')) ? false : $this->params->get('all_tags_description_image_alt')); ?>
    diff --git a/components/com_tags/tmpl/tags/default_items.php b/components/com_tags/tmpl/tags/default_items.php index 36fd189332223..ff99c487e2509 100644 --- a/components/com_tags/tmpl/tags/default_items.php +++ b/components/com_tags/tmpl/tags/default_items.php @@ -12,7 +12,6 @@ use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; use Joomla\CMS\Uri\Uri; use Joomla\Component\Tags\Site\Helper\RouteHelper; @@ -108,12 +107,12 @@ class="inputbox" onchange="document.adminForm.submit();" image_intro)) : ?> float_intro) ? $this->params->get('float_intro') : $images->float_intro; ?>
    - $images->image_intro, 'alt' => $images->image_intro_alt]; ?> + image_intro_caption) : ?> image_intro_caption; ?> - + image_intro, $images->image_intro_alt, $imageOptions); ?>
    diff --git a/components/com_users/tmpl/login/default_login.php b/components/com_users/tmpl/login/default_login.php index 5f5e2e6436bfd..4b082f627df24 100644 --- a/components/com_users/tmpl/login/default_login.php +++ b/components/com_users/tmpl/login/default_login.php @@ -12,7 +12,6 @@ use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Plugin\PluginHelper; use Joomla\CMS\Router\Route; @@ -40,7 +39,7 @@ params->get('login_image') != '') : ?> - $this->params->get('login_image'), 'class' => 'com-users-login__image login-image', 'alt' => empty($this->params->get('login_image_alt')) && empty($this->params->get('login_image_alt_empty')) ? false : $this->params->get('login_image_alt')]); ?> + params->get('login_image'), empty($this->params->get('login_image_alt')) && empty($this->params->get('login_image_alt_empty')) ? false : $this->params->get('login_image_alt'), ['class' => 'com-users-login__image login-image']); ?> params->get('logindescription_show') == 1 && str_replace(' ', '', $this->params->get('login_description')) != '') || $this->params->get('login_image') != '') : ?> diff --git a/components/com_users/tmpl/login/default_logout.php b/components/com_users/tmpl/login/default_logout.php index b361973392e6c..408c0240d6d88 100644 --- a/components/com_users/tmpl/login/default_logout.php +++ b/components/com_users/tmpl/login/default_logout.php @@ -11,7 +11,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; ?> @@ -33,7 +32,7 @@ params->get('logout_image') != '') : ?> - $this->params->get('logout_image'), 'class' => 'com-users-logout__image thumbnail float-end logout-image', 'alt' => empty($this->params->get('logout_image_alt')) && empty($this->params->get('logout_image_alt_empty')) ? false : $this->params->get('logout_image_alt')]); ?> + params->get('logout_image'), empty($this->params->get('logout_image_alt')) && empty($this->params->get('logout_image_alt_empty')) ? false : $this->params->get('logout_image_alt'), ['class' => 'com-users-logout__image thumbnail float-end logout-image']); ?> params->get('logoutdescription_show') == 1 && str_replace(' ', '', $this->params->get('logout_description')) != '')|| $this->params->get('logout_image') != '') : ?> diff --git a/libraries/src/HTML/HTMLHelper.php b/libraries/src/HTML/HTMLHelper.php index 04b79ec48aea5..2c1e853d063fe 100644 --- a/libraries/src/HTML/HTMLHelper.php +++ b/libraries/src/HTML/HTMLHelper.php @@ -714,32 +714,84 @@ public static function cleanImageURL($url) */ public static function image($file, $alt, $attribs = null, $relative = false, $returnPath = 0) { + // Ensure is an integer $returnPath = (int) $returnPath; - if (strpos($file, '?') !== false) + // The path of the file + $path = $file; + + // The arguments of the file path + $arguments = ''; + + // Get the arguments positions + $pos1 = strpos($file, '?'); + $pos2 = strpos($file, '#'); + + // Check if there are arguments + if ($pos1 !== false || $pos2 !== false) { - $file = (static::cleanImageURL($file))->url; + // Get the path only + $path = substr($file, 0, min($pos1, $pos2)); + + // Determine the arguments is mostly the part behind the # + $arguments = str_replace($path, '', $file); } + // Get the relative file name when requested if ($returnPath !== -1) { - $includes = static::includeRelativeFiles('images', $file, $relative, false, false); - $file = \count($includes) ? $includes[0] : null; + // Search for relative file names + $includes = static::includeRelativeFiles('images', $path, $relative, false, false); + + // Grab the first found path and if none exists default to null + $path = \count($includes) ? $includes[0] : null; } - // If only path is required + // Compile the file name + $file = ($path === null ? null : $path . $arguments); + + // If only the file is required, return here if ($returnPath === 1) { return $file; } // Ensure we have a valid default for concatenating - if ($attribs === null) + if ($attribs === null || $attribs === false) + { + $attribs = []; + } + + // When it is a string, we need convert it to an array + if (is_string($attribs)) { - $attribs = ''; + $attributes = []; + + // Go through each argument + foreach (explode(' ', $attribs) as $attribute) + { + // When an argument without a value, default to an empty string + if (strpos($attribute, '=') === false) + { + $attributes[$attribute] = ''; + continue; + } + + // Set the attribute + list($key, $value) = explode('=', $attribute); + $attributes[$key] = trim($value, '"'); + } + + // Add the attributes from the string to the original attributes + $attribs = $attributes; } - return '' . $alt . ''; + // Fill the attributes with the file and alt text + $attribs['src'] = $file; + $attribs['alt'] = $alt; + + // Render the layout with the attributes + return LayoutHelper::render('joomla.html.image', $attribs); } /** diff --git a/modules/mod_feed/tmpl/default.php b/modules/mod_feed/tmpl/default.php index b315efe3080de..901f7d71d2cda 100644 --- a/modules/mod_feed/tmpl/default.php +++ b/modules/mod_feed/tmpl/default.php @@ -12,7 +12,6 @@ use Joomla\CMS\Filter\OutputFilter; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -use Joomla\CMS\Layout\LayoutHelper; // Check if feed URL has been set if (empty ($rssurl)) @@ -94,7 +93,7 @@ // Feed image if ($feed->image && $params->get('rssimage', 1)) : ?> - $feed->image->uri, 'alt' => $feed->image->title]); ?> + image->uri, $feed->image->title); ?> From 13a8e967e2749ec86afef8fbb4cf25d4651ebb0d Mon Sep 17 00:00:00 2001 From: Robert Deutz Date: Tue, 17 May 2022 20:57:54 +0200 Subject: [PATCH 14/33] [4.1] Filter on category state for Tags module (Part: frontend fix) (#37578) * filter on category state * cs fix --- .../src/Helper/TagsPopularHelper.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php b/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php index 30e5a271598af..7dcc83dd66d05 100644 --- a/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php +++ b/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php @@ -54,7 +54,7 @@ public static function getList(&$params) 'MAX(' . $db->quoteName('t.params') . ') AS ' . $db->quoteName('params'), ] ) - ->group($db->quoteName(['tag_id', 'title', 'access', 'alias'])) + ->group($db->quoteName(['tag_id', 't.title', 't.access', 't.alias'])) ->from($db->quoteName('#__contentitem_tag_map', 'm')) ->whereIn($db->quoteName('t.access'), $groups); @@ -69,6 +69,22 @@ public static function getList(&$params) $query->whereIn($db->quoteName('t.parent_id'), $parentTags); } + // Filter on category state + $query->join( + 'INNER', + $db->quoteName('#__ucm_content', 'ucm'), + $db->quoteName('m.content_item_id') . ' = ' . $db->quoteName('ucm.core_content_item_id') . + ' AND ' . $db->quoteName('m.type_id') . ' = ' . $db->quoteName('ucm.core_type_id') + ); + + $query->join( + 'INNER', + $db->quoteName('#__categories', 'cat'), + $db->quoteName('ucm.core_catid') . ' = ' . $db->quoteName('cat.id') + ); + + $query->where($db->quoteName('cat.published') . ' > 0'); + // Optionally filter on language $language = ComponentHelper::getParams('com_tags')->get('tag_list_language_filter', 'all'); From 2a5d90b0e767f531be037cddfe158021f633f922 Mon Sep 17 00:00:00 2001 From: joomla-translation-bot <87496051+joomla-translation-bot@users.noreply.github.com> Date: Tue, 17 May 2022 20:59:50 +0200 Subject: [PATCH 15/33] Translation Update (#37770) * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update --- installation/language/af-ZA/joomla.ini | 3 + installation/language/af-ZA/langmetadata.xml | 4 +- installation/language/ar-AA/joomla.ini | 3 + installation/language/ar-AA/langmetadata.xml | 4 +- installation/language/bg-BG/joomla.ini | 3 + installation/language/bg-BG/langmetadata.xml | 4 +- installation/language/ca-ES/joomla.ini | 3 + installation/language/ca-ES/langmetadata.xml | 4 +- installation/language/cs-CZ/joomla.ini | 3 + installation/language/cs-CZ/langmetadata.xml | 4 +- installation/language/cy-GB/joomla.ini | 3 + installation/language/cy-GB/langmetadata.xml | 4 +- installation/language/da-DK/joomla.ini | 3 + installation/language/da-DK/langmetadata.xml | 4 +- installation/language/de-AT/joomla.ini | 15 +- installation/language/de-AT/langmetadata.xml | 6 +- installation/language/de-CH/joomla.ini | 15 +- installation/language/de-CH/langmetadata.xml | 6 +- installation/language/de-DE/joomla.ini | 15 +- installation/language/de-DE/langmetadata.xml | 6 +- installation/language/de-LI/joomla.ini | 15 +- installation/language/de-LI/langmetadata.xml | 6 +- installation/language/de-LU/joomla.ini | 15 +- installation/language/de-LU/langmetadata.xml | 6 +- installation/language/el-GR/joomla.ini | 3 + installation/language/el-GR/langmetadata.xml | 4 +- installation/language/en-AU/joomla.ini | 3 + installation/language/en-AU/langmetadata.xml | 4 +- installation/language/en-CA/joomla.ini | 3 + installation/language/en-CA/langmetadata.xml | 4 +- installation/language/en-NZ/joomla.ini | 3 + installation/language/en-NZ/langmetadata.xml | 4 +- installation/language/en-US/joomla.ini | 3 + installation/language/en-US/langmetadata.xml | 4 +- installation/language/es-ES/joomla.ini | 3 + installation/language/es-ES/langmetadata.xml | 4 +- installation/language/et-EE/joomla.ini | 3 + installation/language/et-EE/langmetadata.xml | 4 +- installation/language/eu-ES/joomla.ini | 3 + installation/language/eu-ES/langmetadata.xml | 4 +- installation/language/fa-AF/joomla.ini | 3 + installation/language/fa-AF/langmetadata.xml | 4 +- installation/language/fa-IR/joomla.ini | 3 + installation/language/fa-IR/langmetadata.xml | 4 +- installation/language/fi-FI/joomla.ini | 5 +- installation/language/fi-FI/langmetadata.xml | 4 +- installation/language/fr-FR/joomla.ini | 11 +- installation/language/fr-FR/langmetadata.xml | 4 +- installation/language/he-IL/joomla.ini | 175 +++++++++++- installation/language/he-IL/langmetadata.xml | 4 +- installation/language/hu-HU/joomla.ini | 3 + installation/language/hu-HU/langmetadata.xml | 4 +- installation/language/it-IT/joomla.ini | 3 + installation/language/it-IT/langmetadata.xml | 4 +- installation/language/ja-JP/joomla.ini | 3 + installation/language/ja-JP/langmetadata.xml | 4 +- installation/language/ka-GE/joomla.ini | 11 +- installation/language/ka-GE/langmetadata.xml | 4 +- installation/language/kk-KZ/joomla.ini | 3 + installation/language/kk-KZ/langmetadata.xml | 4 +- installation/language/lv-LV/joomla.ini | 3 + installation/language/lv-LV/langmetadata.xml | 4 +- installation/language/nl-BE/joomla.ini | 3 + installation/language/nl-BE/langmetadata.xml | 4 +- installation/language/nl-NL/joomla.ini | 3 + installation/language/nl-NL/langmetadata.xml | 4 +- installation/language/pl-PL/joomla.ini | 5 +- installation/language/pl-PL/langmetadata.xml | 4 +- installation/language/pt-BR/joomla.ini | 3 + installation/language/pt-BR/langmetadata.xml | 4 +- installation/language/pt-PT/joomla.ini | 11 +- installation/language/pt-PT/langmetadata.xml | 4 +- installation/language/ro-RO/joomla.ini | 5 + installation/language/ro-RO/langmetadata.xml | 4 +- installation/language/ru-RU/joomla.ini | 3 + installation/language/ru-RU/langmetadata.xml | 4 +- installation/language/sk-SK/joomla.ini | 3 + installation/language/sk-SK/langmetadata.xml | 4 +- installation/language/sl-SI/joomla.ini | 3 + installation/language/sl-SI/langmetadata.xml | 4 +- installation/language/sr-YU/joomla.ini | 279 +++++++++++++++++++ installation/language/sr-YU/langmetadata.xml | 19 ++ installation/language/sv-SE/joomla.ini | 3 + installation/language/sv-SE/langmetadata.xml | 4 +- installation/language/ta-IN/joomla.ini | 51 ++-- installation/language/ta-IN/langmetadata.xml | 4 +- installation/language/th-TH/joomla.ini | 11 +- installation/language/th-TH/langmetadata.xml | 4 +- installation/language/tr-TR/joomla.ini | 3 + installation/language/tr-TR/langmetadata.xml | 4 +- installation/language/uk-UA/joomla.ini | 3 + installation/language/uk-UA/langmetadata.xml | 4 +- installation/language/zh-CN/joomla.ini | 3 + installation/language/zh-CN/langmetadata.xml | 4 +- installation/language/zh-TW/joomla.ini | 3 + installation/language/zh-TW/langmetadata.xml | 4 +- templates/system/build_incomplete.html | 2 +- templates/system/fatal-error.html | 2 +- templates/system/incompatible.html | 2 +- 99 files changed, 785 insertions(+), 176 deletions(-) create mode 100644 installation/language/sr-YU/joomla.ini create mode 100644 installation/language/sr-YU/langmetadata.xml diff --git a/installation/language/af-ZA/joomla.ini b/installation/language/af-ZA/joomla.ini index c8732fe5374fa..67f11b114bb15 100644 --- a/installation/language/af-ZA/joomla.ini +++ b/installation/language/af-ZA/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Kon nie lêer %1$s na JLIB_INSTALLER_INSTALL="Installeer" JLIB_INSTALLER_NOT_ERROR="As die fout verband hou met die installering van TinyMCE-taallêers, het dit geen invloed op die installering van die taal(e) nie. Sommige taalpakkette wat voor Joomla 3.2.0 geskep is, kan probeer om aparte TinyMCE-taallêers te installeer. Aangesien dit nou in die kern is, hoef dit nie meer geïnstalleer te word nie." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Kan nie 'n inhoudstaal skep vir %s taal %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Die PHP allow_url_fopen stelling is gedeaktiveer. Hierdie stelling moet geaktiveer wees vir die opdateerder om te werk." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Opdateer: ::Collection:: Kon nie %s oopmaak nie" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Opdateer: :Collection: Kon nie verdeel %s nie" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Opdatering: kon die opdateringswerf nie oopmaak nie #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Kon nie aan die databasis koppel nie
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/af-ZA/langmetadata.xml b/installation/language/af-ZA/langmetadata.xml index df535af2e2e15..d7931e2090be8 100644 --- a/installation/language/af-ZA/langmetadata.xml +++ b/installation/language/af-ZA/langmetadata.xml @@ -1,8 +1,8 @@ Afrikaans (Suid-Afrika) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Joomla! Projek (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ar-AA/joomla.ini b/installation/language/ar-AA/joomla.ini index a58fb2f8299cf..1f1c395db3205 100644 --- a/installation/language/ar-AA/joomla.ini +++ b/installation/language/ar-AA/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: فشل عملية ن JLIB_INSTALLER_INSTALL="تثبيت" JLIB_INSTALLER_NOT_ERROR="إذا كان الخطأ في التنصيب مرتبط في حزمة اللغة للمحرر TinyMCE فلا تقلق فليس له أي تأثير على عملية التنصيب للغات التي تريدها. بعض حزم اللغات تم إنشاؤها قبل اصدار جوملا! 3.2 و التي تحتوي على حزمة اللغة منفصلة. كما يتم تضمين هذه الآن في الأساس لهذا لم تعد تحتاج إلى تنصيبها." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="تعذر إنشاء لغة المحتوى %s للغة:%s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="الدالة allow_url_fopen غير مفعلة. يجب تفعيلها كي تتم عملية التحديث." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: غير قادر على فتح %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: لا يمكن تحليل %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="تحديث: تعذر فتح موقع التحديث #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: تعذر الاتصال بقاعدة البيانات
    joomla.library: %1$s - %2$s" ; Strings for the language debugger diff --git a/installation/language/ar-AA/langmetadata.xml b/installation/language/ar-AA/langmetadata.xml index 178ba8bf4eb37..0c2cf767db7c4 100644 --- a/installation/language/ar-AA/langmetadata.xml +++ b/installation/language/ar-AA/langmetadata.xml @@ -1,8 +1,8 @@ Arabic (اللغة العربية) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Dr. Ashraf Damra (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/bg-BG/joomla.ini b/installation/language/bg-BG/joomla.ini index 78161484570e2..e047e21de57a5 100644 --- a/installation/language/bg-BG/joomla.ini +++ b/installation/language/bg-BG/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Инсталиране: Неу JLIB_INSTALLER_INSTALL="Инсталиране" JLIB_INSTALLER_NOT_ERROR="Ако грешката е свързана с инсталирането на езиковите файлове на TinyMCE, то тя няма ефект върху инсталирането на езика(езиците). Някои езикови пакет, създадени преди Joomla 3.2.0 може да се опитват да инсталират отделни TinyMCE езикови файлове. Тъй като тези вече са част от ядрото, няма нужда да бъдат инсталирани отделно." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Не може да създаде език за съдържание за %s език: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP настройката allow_url_fopen е забранена. За да работи автоматичното, тази настройка трябва да е включена." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Обновяване: Колекция: Не може да бъде отворено %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Обновяване: :Колекция: Не може да бъде парснато %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Обновяване: Не може да бъде отворен сайтът с обновления #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Не може да бъде осъществена връзка с базата данни
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/bg-BG/langmetadata.xml b/installation/language/bg-BG/langmetadata.xml index cea12e89670ef..e3667939d56ab 100644 --- a/installation/language/bg-BG/langmetadata.xml +++ b/installation/language/bg-BG/langmetadata.xml @@ -1,8 +1,8 @@ Bulgarian (bg-BG) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Joomla! Bulgaria (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ca-ES/joomla.ini b/installation/language/ca-ES/joomla.ini index 1addbe82823c4..546f0f5ac3f26 100644 --- a/installation/language/ca-ES/joomla.ini +++ b/installation/language/ca-ES/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Instal·lació: Error en copia JLIB_INSTALLER_INSTALL="Instal·la" JLIB_INSTALLER_NOT_ERROR="Si l`error és relacionat amb la instal·lació dels arxius d`idioma de TinyMCE no tindrà efecte sobre la instal·lació dels arxius. Alguns paquets d`idioma creats abans de Joomla! 3.2.0 poden intentar instal·lar els arxius per separat de TinyMCE. Ara que aquests arxius estan inclosos al core ja no és necessari instal·lar-los." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="No es pot crear un idioma de contingut per a l'idioma %s: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="El paràmetre de PHP allow_url_fopen està desactivat. Aquest paràmetre s'ha d'habilitar perquè l'actualitzador funcioni." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Actualitza: :Collection: No es pot obrir %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Actualitza: :Collection: No es pot analitzar %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Actualització: No s'ha pogut obrir l`actualització de lloc #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: No s'ha pogut connectar amb la base de dades
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/ca-ES/langmetadata.xml b/installation/language/ca-ES/langmetadata.xml index edc857ec841fe..75350ff545c24 100644 --- a/installation/language/ca-ES/langmetadata.xml +++ b/installation/language/ca-ES/langmetadata.xml @@ -1,8 +1,8 @@ Catalan (ca-ES) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Catalan Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/cs-CZ/joomla.ini b/installation/language/cs-CZ/joomla.ini index cf4455381d045..81ac29e0b5d51 100644 --- a/installation/language/cs-CZ/joomla.ini +++ b/installation/language/cs-CZ/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Instalace: Selhalo kopírován JLIB_INSTALLER_INSTALL="Instalovat" JLIB_INSTALLER_NOT_ERROR="Pokud je chyba spojena s instalací jazykových souborů TinyMCE, nemá to žádný vliv na instalaci jazyku. Některé jazykové balíčky vytvořené před Joomla 3.2.0 se mohou pokusit nainstalovat samostatné jazykové soubory pro TinyMCE. Vzhledem k tomu, že jsou nyní tyto soubory zahrnuty do jádra, již nemusí být instalovány samostatně." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Nelze vytvořit jazyk obsahu %s pro jazyk: %s" +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Nastavení PHP allow_url_fopen je zakázáno. Pro správnou práci automatických aktualizací musí být povoleno." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Aktualizace :Collection: Nelze otevřít %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Aktualizace :Collection: Nelze zpracovat %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Aktualizace: Nelze otevřít stránku aktualizace #%d '%s', URL: %s" JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabáze: :getInstance: Nelze se připojit k databázi
    joomla.library: %1$s - %2$s" ; Strings for the language debugger diff --git a/installation/language/cs-CZ/langmetadata.xml b/installation/language/cs-CZ/langmetadata.xml index 1923e8d300fe2..74a868a9da83f 100644 --- a/installation/language/cs-CZ/langmetadata.xml +++ b/installation/language/cs-CZ/langmetadata.xml @@ -1,8 +1,8 @@ Czech (Čeština) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Czech Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/cy-GB/joomla.ini b/installation/language/cy-GB/joomla.ini index d5798eec6b091..5d0a7e1518a0f 100644 --- a/installation/language/cy-GB/joomla.ini +++ b/installation/language/cy-GB/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Wedi methu copio y ff JLIB_INSTALLER_INSTALL="Gosod" JLIB_INSTALLER_NOT_ERROR="Os yw'r gwall yn ymwneud â gosod ffeiliau iaith TinyMCE nid yw'n cael unrhyw effaith ar osodiad yr iaith/y ieithoedd. Efallai bydd rhai pecynnau iaith a grëwyd cyn Joomla! 3.2.0 yn ceisio gosod ffeiliau iaith TinyMCE ar wahan. Gan eu bod nawr yn cael eu cynnwys yn y craidd nid oes angen eu gosod." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Does dim modd creu iaith gynnwys ar gyfer yr iaith %s: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Mae'r gosodiad PHP allow_url_fopen wedi'i analluogi. Rhaid galluogi'r gosodiad hwn er mwyn i'r diweddarydd weithio." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Diweddaru: :Collection: Doedd dim modd agor %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Diweddaru: :Collection: Methu dosrannu %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Diweddaru: Heb lwyddo i agor y wefan diweddaru #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Doedd dim modd cysylltu â'r gronfa ddata
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/cy-GB/langmetadata.xml b/installation/language/cy-GB/langmetadata.xml index 8a20e9fe7f538..5b9bc862b9123 100644 --- a/installation/language/cy-GB/langmetadata.xml +++ b/installation/language/cy-GB/langmetadata.xml @@ -1,8 +1,8 @@ Welsh (United Kingdom) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Joomla! Project - Welsh Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/da-DK/joomla.ini b/installation/language/da-DK/joomla.ini index 4531002f7a2ef..4ebdb227e1bce 100644 --- a/installation/language/da-DK/joomla.ini +++ b/installation/language/da-DK/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Installer: Kunne ikke kopiere JLIB_INSTALLER_INSTALL="Installer" JLIB_INSTALLER_NOT_ERROR="Hvis fejlen er relateret til installationen af TinyMCE sprogfiler, så har det ingen effekt på installationen af sprog(ene). Nogle sprogpakker oprettet før Joomla 3.2.0 kan forsøge at installere separate TinyMCE sprogfiler. Da disse nu er inkluderet i kernen, så behøves de ikke længere at blive installeret." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Kunne ikke oprette et indholdssprog for %s sprog: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP allow_url_fopen indstillingen er deaktiveret. Denne indstilling skal være aktiveret for at opdateringsfunktionen kan fungere." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Opdater: :Samling: Kunne ikke åbne %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Opdater: :Samling: Kunne ikke parse %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Opdater: Kunne ikke åbne opdateringswebsted #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Kunne ikke forbinde til database
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/da-DK/langmetadata.xml b/installation/language/da-DK/langmetadata.xml index 04312257d5192..d63cd41092ef0 100644 --- a/installation/language/da-DK/langmetadata.xml +++ b/installation/language/da-DK/langmetadata.xml @@ -1,8 +1,8 @@ Danish (Danmark) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Danish Translation Team (Transl.: Ronny Buelund) (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/de-AT/joomla.ini b/installation/language/de-AT/joomla.ini index e7555d2cdf235..790ead4a75e31 100644 --- a/installation/language/de-AT/joomla.ini +++ b/installation/language/de-AT/joomla.ini @@ -8,7 +8,7 @@ ; These will be processed by the JavaScript Build BUILD_FATAL_HEADER="Es ist ein Problem aufgetreten." BUILD_FATAL_LANGUAGE="Deutsch" -BUILD_FATAL_TEXT="Der Server lieferte ein \"{{statusCode_statusText}}\"" +BUILD_FATAL_TEXT="Der Server lieferte ein "{{statusCode_statusText}}"" BUILD_FATAL_URL_TEXT="Weitere Informationen sind in der Dokumentation zu finden." ; Build incomplete error page @@ -39,7 +39,7 @@ INSTL_SETUP_LOGIN_DATA="Zugangsdaten einrichten" INSTL_WARNJAVASCRIPT="Warnung! JavaScript muss für eine reibungslose Installation von Joomla! aktiviert sein." INSTL_WARNJSON="In der PHP-Umgebung muss JSON aktiviert sein, damit Joomla! installiert werden kann." -;Precheck view +; Precheck view INSTL_DATABASE_SUPPORT="Datenbankunterstützung:" INSTL_JSON_SUPPORT_AVAILABLE="JSON-Support" INSTL_MB_LANGUAGE_IS_DEFAULT="PHPs mbstring Spracheinstellung ist neutral" @@ -53,7 +53,7 @@ INSTL_NOTICE_XML_SUPPORT="Die XML-Unterstützung ist nicht verfügbar. Dies soll INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Die Zlib-Kompression ist nicht aktiviert. Dies kann lokal aktiviert werden, indem eine neue Zeile mit zlib.output_compression = On in die php.ini Datei eingefügt wird." INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Unterstützung" INSTL_PRECHECK_ACTUAL="Aktuell" -INSTL_PRECHECK_DESC="Sollte einer der Einträge vom Server nicht unterstützt werden, mit einem „Nein“ gekennzeichnet, bitte die Einstellungen auf dem Server prüfen und anpassen.
    Joomla! kann nicht installiert werden, wenn die unten aufgeführten Systemvoraussetzungen nicht erfüllt sind." +INSTL_PRECHECK_DESC="Sollte einer der Einträge vom Server nicht unterstützt werden, mit einem „Nein“ gekennzeichnet, bitte die Einstellungen auf dem Server prüfen und anpassen.
    Joomla! kann nicht installiert werden, wenn die unten aufgeführten Systemvoraussetzungen nicht erfüllt sind." INSTL_PRECHECK_DIRECTIVE="Funktionen" INSTL_PRECHECK_RECOMMENDED="Empfohlen" INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Diese Einstellungen werden für PHP empfohlen, um eine gute Kompatibilität mit Joomla! zu gewährleisten.
    Jedoch kann Joomla! hier mit Einschränkungen in den Empfehlungen trotzdem funktionieren." @@ -82,7 +82,7 @@ INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL-Datenbankabfrage fehlgeschlage INSTL_DATABASE_HOST_DESC="Datenbankserver („localhost“ oder vom Webhoster vorgegeben)" INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Aufgrund eines unbekannten Fehlers kann die Datei nicht automatisch erstellt werden. Daher ist die Datei mit dem Namen „%1$s“ manuell zu erstellen und in das Verzeichnis „%2$s“ hochzuladen. Anschließend „%3$s“ klicken um fortzufahren." INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Um die Eigentümerschaft zu bestätigen muss die Datei „%1$s“, die soeben im „%2$s“-Verzeichnis von Joomla! erstellt wurde, wieder gelöscht werden. Anschließend „%3$s“ klicken um fortzufahren." -INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss dazu die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen sind in der Dokumentation zu finden." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss dazu die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen sind in der Dokumentation zu finden." INSTL_DATABASE_HOST_LABEL="Datenbankserver" INSTL_DATABASE_NAME_DESC="Datenbankname" INSTL_DATABASE_NAME_LABEL="Datenbankname" @@ -95,7 +95,7 @@ INSTL_DATABASE_PREFIX_MSG="Der Tabellenpräfix muss mit einem Buchstaben beginne INSTL_DATABASE_RESPONSE_ERROR="Der Installationsvorgang ist fehlgeschlagen." INSTL_DATABASE_TYPE_DESC="Datenbanktyp auswählen" INSTL_DATABASE_USER_DESC="Datenbank Benutzer" -INSTL_DATABASE_VALIDATION_ERROR="Datenbank-Anmeldeinformationen, den Datenbanktyp, den Datenbanknamen oder den Hostnamen überprüfen. Wenn MySQL 8 installiert ist, dann bitte den Schritten in der Dokumentation folgen." +INSTL_DATABASE_VALIDATION_ERROR="Datenbank-Anmeldeinformationen, den Datenbanktyp, den Datenbanknamen oder den Hostnamen überprüfen. Wenn MySQL 8 installiert ist, dann bitte den Schritten in der Dokumentation folgen." INSTL_CONNECT_DB="Datenbankverbindung einrichten" INSTL_INSTALL_JOOMLA="Joomla! installieren" @@ -254,6 +254,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Fehler beim Kopieren JLIB_INSTALLER_INSTALL="Installieren" JLIB_INSTALLER_NOT_ERROR="Wenn der Fehler mit der Installation von TinyMCE-Sprachdateien in Verbindung steht, so hat er keine Auswirkungen auf die Installation der Sprache(n). Einige Sprachpakete vor Joomla! 3.2.0 haben separate TinyMCE-Sprachdateien mitinstalliert, da diese Sprachdateien jetzt aber bereits im Joomla-Core enthalten sind, brauchen sie nun nicht länger separat installiert zu werden." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Es ist nicht möglich, eine Inhaltssprache für %s zu erstellen. Sprache: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Die PHP-Einstellung „allow_url_fopen“ ist deaktiviert. Diese Einstellung muss aber für Updates aktiviert sein." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: „%s“ kann nicht geöffnet werden." +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: „%s“ kann nicht geparsed werden." JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Update: Die Update-Quelle #%d "%s", URL: %s, konnte nicht geöffnet werden." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Keine Verbindung mit der Datenbank.
    joomla.library: %1$s - %2$s." @@ -285,7 +288,7 @@ WARNING="Warnung" JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Ein Verbindungsabbruch trat beim Abruf der JSON-Daten auf." JLIB_JS_AJAX_ERROR_NO_CONTENT="Kein Inhalt wurde zurückgegeben." JLIB_JS_AJAX_ERROR_OTHER="Beim Abrufen von JSON-Daten wurde ein HTTP-Statuscode %s zurückgegeben." -JLIB_JS_AJAX_ERROR_PARSE="Ein Parsing-Fehler trat bei der Verarbeitung der folgenden JSON-Daten auf:
    %s" +JLIB_JS_AJAX_ERROR_PARSE="Ein Parsing-Fehler trat bei der Verarbeitung der folgenden JSON-Daten auf:
    %s" JLIB_JS_AJAX_ERROR_TIMEOUT="Eine Zeitüberschreitung trat beim Abruf der JSON-Daten auf." ; Field password messages diff --git a/installation/language/de-AT/langmetadata.xml b/installation/language/de-AT/langmetadata.xml index 076ebf523b72b..0ea587f969a3d 100644 --- a/installation/language/de-AT/langmetadata.xml +++ b/installation/language/de-AT/langmetadata.xml @@ -1,8 +1,8 @@ - + German (Austria) - 4.1.0 - January 2022 + 4.1.3 + May 2022 J!German (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/de-CH/joomla.ini b/installation/language/de-CH/joomla.ini index 71be089cd23f2..37cc862f47eac 100644 --- a/installation/language/de-CH/joomla.ini +++ b/installation/language/de-CH/joomla.ini @@ -8,7 +8,7 @@ ; These will be processed by the JavaScript Build BUILD_FATAL_HEADER="Es ist ein Problem aufgetreten." BUILD_FATAL_LANGUAGE="Deutsch" -BUILD_FATAL_TEXT="Der Server lieferte ein \"{{statusCode_statusText}}\"" +BUILD_FATAL_TEXT="Der Server lieferte ein "{{statusCode_statusText}}"" BUILD_FATAL_URL_TEXT="Weitere Informationen sind in der Dokumentation zu finden." ; Build incomplete error page @@ -39,7 +39,7 @@ INSTL_SETUP_LOGIN_DATA="Zugangsdaten einrichten" INSTL_WARNJAVASCRIPT="Warnung! JavaScript muss für eine reibungslose Installation von Joomla! aktiviert sein." INSTL_WARNJSON="In der PHP-Umgebung muss JSON aktiviert sein, damit Joomla! installiert werden kann." -;Precheck view +; Precheck view INSTL_DATABASE_SUPPORT="Datenbankunterstützung:" INSTL_JSON_SUPPORT_AVAILABLE="JSON-Support" INSTL_MB_LANGUAGE_IS_DEFAULT="PHPs mbstring Spracheinstellung ist neutral" @@ -53,7 +53,7 @@ INSTL_NOTICE_XML_SUPPORT="Die XML-Unterstützung ist nicht verfügbar. Dies soll INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Die Zlib-Kompression ist nicht aktiviert. Dies kann lokal aktiviert werden, indem eine neue Zeile mit zlib.output_compression = On in die php.ini Datei eingefügt wird." INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Unterstützung" INSTL_PRECHECK_ACTUAL="Aktuell" -INSTL_PRECHECK_DESC="Sollte einer der Einträge vom Server nicht unterstützt werden, mit einem „Nein“ gekennzeichnet, bitte die Einstellungen auf dem Server prüfen und anpassen.
    Joomla! kann nicht installiert werden, wenn die unten aufgeführten Systemvoraussetzungen nicht erfüllt sind." +INSTL_PRECHECK_DESC="Sollte einer der Einträge vom Server nicht unterstützt werden, mit einem „Nein“ gekennzeichnet, bitte die Einstellungen auf dem Server prüfen und anpassen.
    Joomla! kann nicht installiert werden, wenn die unten aufgeführten Systemvoraussetzungen nicht erfüllt sind." INSTL_PRECHECK_DIRECTIVE="Funktionen" INSTL_PRECHECK_RECOMMENDED="Empfohlen" INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Diese Einstellungen werden für PHP empfohlen, um eine gute Kompatibilität mit Joomla! zu gewährleisten.
    Jedoch kann Joomla! hier mit Einschränkungen in den Empfehlungen trotzdem funktionieren." @@ -82,7 +82,7 @@ INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL-Datenbankabfrage fehlgeschlage INSTL_DATABASE_HOST_DESC="Datenbankserver („localhost“ oder vom Webhoster vorgegeben)" INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Aufgrund eines unbekannten Fehlers kann die Datei nicht automatisch erstellt werden. Daher ist die Datei mit dem Namen „%1$s“ manuell zu erstellen und in das Verzeichnis „%2$s“ hochzuladen. Anschliessend „%3$s“ klicken um fortzufahren." INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Um die Eigentümerschaft zu bestätigen muss die Datei „%1$s“, die soeben im „%2$s“-Verzeichnis von Joomla! erstellt wurde, wieder gelöscht werden. Anschliessend „%3$s“ klicken um fortzufahren." -INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss dazu die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen sind in der Dokumentation zu finden." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss dazu die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen sind in der Dokumentation zu finden." INSTL_DATABASE_HOST_LABEL="Datenbankserver" INSTL_DATABASE_NAME_DESC="Datenbankname" INSTL_DATABASE_NAME_LABEL="Datenbankname" @@ -95,7 +95,7 @@ INSTL_DATABASE_PREFIX_MSG="Der Tabellenpräfix muss mit einem Buchstaben beginne INSTL_DATABASE_RESPONSE_ERROR="Der Installationsvorgang ist fehlgeschlagen." INSTL_DATABASE_TYPE_DESC="Datenbanktyp auswählen" INSTL_DATABASE_USER_DESC="Datenbank Benutzer" -INSTL_DATABASE_VALIDATION_ERROR="Datenbank-Anmeldeinformationen, den Datenbanktyp, den Datenbanknamen oder den Hostnamen überprüfen. Wenn MySQL 8 installiert ist, dann bitte den Schritten in der Dokumentation folgen." +INSTL_DATABASE_VALIDATION_ERROR="Datenbank-Anmeldeinformationen, den Datenbanktyp, den Datenbanknamen oder den Hostnamen überprüfen. Wenn MySQL 8 installiert ist, dann bitte den Schritten in der Dokumentation folgen." INSTL_CONNECT_DB="Datenbankverbindung einrichten" INSTL_INSTALL_JOOMLA="Joomla! installieren" @@ -254,6 +254,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Fehler beim Kopieren JLIB_INSTALLER_INSTALL="Installieren" JLIB_INSTALLER_NOT_ERROR="Wenn der Fehler mit der Installation von TinyMCE-Sprachdateien in Verbindung steht, so hat er keine Auswirkungen auf die Installation der Sprache(n). Einige Sprachpakete vor Joomla! 3.2.0 haben separate TinyMCE-Sprachdateien mitinstalliert, da diese Sprachdateien jetzt aber bereits im Joomla-Core enthalten sind, brauchen sie nun nicht länger separat installiert zu werden." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Es ist nicht möglich, eine Inhaltssprache für %s zu erstellen. Sprache: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Die PHP-Einstellung „allow_url_fopen“ ist deaktiviert. Diese Einstellung muss aber für Updates aktiviert sein." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: „%s“ kann nicht geöffnet werden." +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: „%s“ kann nicht geparsed werden." JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Update: Die Update-Quelle #%d "%s", URL: %s, konnte nicht geöffnet werden." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Keine Verbindung mit der Datenbank.
    joomla.library: %1$s - %2$s." @@ -285,7 +288,7 @@ WARNING="Warnung" JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Ein Verbindungsabbruch trat beim Abruf der JSON-Daten auf." JLIB_JS_AJAX_ERROR_NO_CONTENT="Kein Inhalt wurde zurückgegeben." JLIB_JS_AJAX_ERROR_OTHER="Beim Abrufen von JSON-Daten wurde ein HTTP-Statuscode %s zurückgegeben." -JLIB_JS_AJAX_ERROR_PARSE="Ein Parsing-Fehler trat bei der Verarbeitung der folgenden JSON-Daten auf:
    %s" +JLIB_JS_AJAX_ERROR_PARSE="Ein Parsing-Fehler trat bei der Verarbeitung der folgenden JSON-Daten auf:
    %s" JLIB_JS_AJAX_ERROR_TIMEOUT="Eine Zeitüberschreitung trat beim Abruf der JSON-Daten auf." ; Field password messages diff --git a/installation/language/de-CH/langmetadata.xml b/installation/language/de-CH/langmetadata.xml index bf1926393a83b..b8f002dd72fa0 100644 --- a/installation/language/de-CH/langmetadata.xml +++ b/installation/language/de-CH/langmetadata.xml @@ -1,8 +1,8 @@ - + German (Switzerland) - 4.1.0 - January 2022 + 4.1.3 + May 2022 J!German (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/de-DE/joomla.ini b/installation/language/de-DE/joomla.ini index 6f6799b9e656c..381f5b2e0c481 100644 --- a/installation/language/de-DE/joomla.ini +++ b/installation/language/de-DE/joomla.ini @@ -8,7 +8,7 @@ ; These will be processed by the JavaScript Build BUILD_FATAL_HEADER="Es ist ein Problem aufgetreten." BUILD_FATAL_LANGUAGE="Deutsch" -BUILD_FATAL_TEXT="Der Server lieferte ein \"{{statusCode_statusText}}\"" +BUILD_FATAL_TEXT="Der Server lieferte ein "{{statusCode_statusText}}"" BUILD_FATAL_URL_TEXT="Weitere Informationen sind in der Dokumentation zu finden." ; Build incomplete error page @@ -39,7 +39,7 @@ INSTL_SETUP_LOGIN_DATA="Zugangsdaten einrichten" INSTL_WARNJAVASCRIPT="Warnung! JavaScript muss für eine reibungslose Installation von Joomla! aktiviert sein." INSTL_WARNJSON="In der PHP-Umgebung muss JSON aktiviert sein, damit Joomla! installiert werden kann." -;Precheck view +; Precheck view INSTL_DATABASE_SUPPORT="Datenbankunterstützung:" INSTL_JSON_SUPPORT_AVAILABLE="JSON-Support" INSTL_MB_LANGUAGE_IS_DEFAULT="PHPs mbstring Spracheinstellung ist neutral" @@ -53,7 +53,7 @@ INSTL_NOTICE_XML_SUPPORT="Die XML-Unterstützung ist nicht verfügbar. Dies soll INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Die Zlib-Kompression ist nicht aktiviert. Dies kann lokal aktiviert werden, indem eine neue Zeile mit zlib.output_compression = On in die php.ini Datei eingefügt wird." INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Unterstützung" INSTL_PRECHECK_ACTUAL="Aktuell" -INSTL_PRECHECK_DESC="Sollte einer der Einträge vom Server nicht unterstützt werden, mit einem „Nein“ gekennzeichnet, bitte die Einstellungen auf dem Server prüfen und anpassen.
    Joomla! kann nicht installiert werden, wenn die unten aufgeführten Systemvoraussetzungen nicht erfüllt sind." +INSTL_PRECHECK_DESC="Sollte einer der Einträge vom Server nicht unterstützt werden, mit einem „Nein“ gekennzeichnet, bitte die Einstellungen auf dem Server prüfen und anpassen.
    Joomla! kann nicht installiert werden, wenn die unten aufgeführten Systemvoraussetzungen nicht erfüllt sind." INSTL_PRECHECK_DIRECTIVE="Funktionen" INSTL_PRECHECK_RECOMMENDED="Empfohlen" INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Diese Einstellungen werden für PHP empfohlen, um eine gute Kompatibilität mit Joomla! zu gewährleisten.
    Jedoch kann Joomla! hier mit Einschränkungen in den Empfehlungen trotzdem funktionieren." @@ -82,7 +82,7 @@ INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL-Datenbankabfrage fehlgeschlage INSTL_DATABASE_HOST_DESC="Datenbankserver („localhost“ oder vom Webhoster vorgegeben)" INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Aufgrund eines unbekannten Fehlers kann die Datei nicht automatisch erstellt werden. Daher ist die Datei mit dem Namen „%1$s“ manuell zu erstellen und in das Verzeichnis „%2$s“ hochzuladen. Anschließend „%3$s“ klicken um fortzufahren." INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Um die Eigentümerschaft zu bestätigen muss die Datei „%1$s“, die soeben im „%2$s“-Verzeichnis von Joomla! erstellt wurde, wieder gelöscht werden. Anschließend „%3$s“ klicken um fortzufahren." -INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss dazu die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen sind in der Dokumentation zu finden." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss dazu die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen sind in der Dokumentation zu finden." INSTL_DATABASE_HOST_LABEL="Datenbankserver" INSTL_DATABASE_NAME_DESC="Datenbankname" INSTL_DATABASE_NAME_LABEL="Datenbankname" @@ -95,7 +95,7 @@ INSTL_DATABASE_PREFIX_MSG="Der Tabellenpräfix muss mit einem Buchstaben beginne INSTL_DATABASE_RESPONSE_ERROR="Der Installationsvorgang ist fehlgeschlagen." INSTL_DATABASE_TYPE_DESC="Datenbanktyp auswählen" INSTL_DATABASE_USER_DESC="Datenbank Benutzer" -INSTL_DATABASE_VALIDATION_ERROR="Datenbank-Anmeldeinformationen, den Datenbanktyp, den Datenbanknamen oder den Hostnamen überprüfen. Wenn MySQL 8 installiert ist, dann bitte den Schritten in der Dokumentation folgen." +INSTL_DATABASE_VALIDATION_ERROR="Datenbank-Anmeldeinformationen, den Datenbanktyp, den Datenbanknamen oder den Hostnamen überprüfen. Wenn MySQL 8 installiert ist, dann bitte den Schritten in der Dokumentation folgen." INSTL_CONNECT_DB="Datenbankverbindung einrichten" INSTL_INSTALL_JOOMLA="Joomla! installieren" @@ -254,6 +254,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Fehler beim Kopieren JLIB_INSTALLER_INSTALL="Installieren" JLIB_INSTALLER_NOT_ERROR="Wenn der Fehler mit der Installation von TinyMCE-Sprachdateien in Verbindung steht, so hat er keine Auswirkungen auf die Installation der Sprache(n). Einige Sprachpakete vor Joomla! 3.2.0 haben separate TinyMCE-Sprachdateien mitinstalliert, da diese Sprachdateien jetzt aber bereits im Joomla-Core enthalten sind, brauchen sie nun nicht länger separat installiert zu werden." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Es ist nicht möglich, eine Inhaltssprache für %s zu erstellen. Sprache: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Die PHP-Einstellung „allow_url_fopen“ ist deaktiviert. Diese Einstellung muss aber für Updates aktiviert sein." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: „%s“ kann nicht geöffnet werden." +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: „%s“ kann nicht geparsed werden." JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Update: Die Update-Quelle #%d "%s", URL: %s, konnte nicht geöffnet werden." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Keine Verbindung mit der Datenbank.
    joomla.library: %1$s - %2$s." @@ -285,7 +288,7 @@ WARNING="Warnung" JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Ein Verbindungsabbruch trat beim Abruf der JSON-Daten auf." JLIB_JS_AJAX_ERROR_NO_CONTENT="Kein Inhalt wurde zurückgegeben." JLIB_JS_AJAX_ERROR_OTHER="Beim Abrufen von JSON-Daten wurde ein HTTP-Statuscode %s zurückgegeben." -JLIB_JS_AJAX_ERROR_PARSE="Ein Parsing-Fehler trat bei der Verarbeitung der folgenden JSON-Daten auf:
    %s" +JLIB_JS_AJAX_ERROR_PARSE="Ein Parsing-Fehler trat bei der Verarbeitung der folgenden JSON-Daten auf:
    %s" JLIB_JS_AJAX_ERROR_TIMEOUT="Eine Zeitüberschreitung trat beim Abruf der JSON-Daten auf." ; Field password messages diff --git a/installation/language/de-DE/langmetadata.xml b/installation/language/de-DE/langmetadata.xml index d8d30f554cfcf..fe587c03ec314 100644 --- a/installation/language/de-DE/langmetadata.xml +++ b/installation/language/de-DE/langmetadata.xml @@ -1,8 +1,8 @@ - + German (Germany) - 4.1.0 - January 2022 + 4.1.3 + May 2022 J!German (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/de-LI/joomla.ini b/installation/language/de-LI/joomla.ini index 3ad46dc94dd82..34ae357b4f05d 100644 --- a/installation/language/de-LI/joomla.ini +++ b/installation/language/de-LI/joomla.ini @@ -8,7 +8,7 @@ ; These will be processed by the JavaScript Build BUILD_FATAL_HEADER="Es ist ein Problem aufgetreten." BUILD_FATAL_LANGUAGE="Deutsch" -BUILD_FATAL_TEXT="Der Server lieferte ein \"{{statusCode_statusText}}\"" +BUILD_FATAL_TEXT="Der Server lieferte ein "{{statusCode_statusText}}"" BUILD_FATAL_URL_TEXT="Weitere Informationen sind in der Dokumentation zu finden." ; Build incomplete error page @@ -39,7 +39,7 @@ INSTL_SETUP_LOGIN_DATA="Zugangsdaten einrichten" INSTL_WARNJAVASCRIPT="Warnung! JavaScript muss für eine reibungslose Installation von Joomla! aktiviert sein." INSTL_WARNJSON="In der PHP-Umgebung muss JSON aktiviert sein, damit Joomla! installiert werden kann." -;Precheck view +; Precheck view INSTL_DATABASE_SUPPORT="Datenbankunterstützung:" INSTL_JSON_SUPPORT_AVAILABLE="JSON-Support" INSTL_MB_LANGUAGE_IS_DEFAULT="PHPs mbstring Spracheinstellung ist neutral" @@ -53,7 +53,7 @@ INSTL_NOTICE_XML_SUPPORT="Die XML-Unterstützung ist nicht verfügbar. Dies soll INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Die Zlib-Kompression ist nicht aktiviert. Dies kann lokal aktiviert werden, indem eine neue Zeile mit zlib.output_compression = On in die php.ini Datei eingefügt wird." INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Unterstützung" INSTL_PRECHECK_ACTUAL="Aktuell" -INSTL_PRECHECK_DESC="Sollte einer der Einträge vom Server nicht unterstützt werden, mit einem „Nein“ gekennzeichnet, bitte die Einstellungen auf dem Server prüfen und anpassen.
    Joomla! kann nicht installiert werden, wenn die unten aufgeführten Systemvoraussetzungen nicht erfüllt sind." +INSTL_PRECHECK_DESC="Sollte einer der Einträge vom Server nicht unterstützt werden, mit einem „Nein“ gekennzeichnet, bitte die Einstellungen auf dem Server prüfen und anpassen.
    Joomla! kann nicht installiert werden, wenn die unten aufgeführten Systemvoraussetzungen nicht erfüllt sind." INSTL_PRECHECK_DIRECTIVE="Funktionen" INSTL_PRECHECK_RECOMMENDED="Empfohlen" INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Diese Einstellungen werden für PHP empfohlen, um eine gute Kompatibilität mit Joomla! zu gewährleisten.
    Jedoch kann Joomla! hier mit Einschränkungen in den Empfehlungen trotzdem funktionieren." @@ -82,7 +82,7 @@ INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL-Datenbankabfrage fehlgeschlage INSTL_DATABASE_HOST_DESC="Datenbankserver („localhost“ oder vom Webhoster vorgegeben)" INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Aufgrund eines unbekannten Fehlers kann die Datei nicht automatisch erstellt werden. Daher ist die Datei mit dem Namen „%1$s“ manuell zu erstellen und in das Verzeichnis „%2$s“ hochzuladen. Anschliessend „%3$s“ klicken um fortzufahren." INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Um die Eigentümerschaft zu bestätigen muss die Datei „%1$s“, die soeben im „%2$s“-Verzeichnis von Joomla! erstellt wurde, wieder gelöscht werden. Anschliessend „%3$s“ klicken um fortzufahren." -INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss dazu die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen sind in der Dokumentation zu finden." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss dazu die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen sind in der Dokumentation zu finden." INSTL_DATABASE_HOST_LABEL="Datenbankserver" INSTL_DATABASE_NAME_DESC="Datenbankname" INSTL_DATABASE_NAME_LABEL="Datenbankname" @@ -95,7 +95,7 @@ INSTL_DATABASE_PREFIX_MSG="Der Tabellenpräfix muss mit einem Buchstaben beginne INSTL_DATABASE_RESPONSE_ERROR="Der Installationsvorgang ist fehlgeschlagen." INSTL_DATABASE_TYPE_DESC="Datenbanktyp auswählen" INSTL_DATABASE_USER_DESC="Datenbank Benutzer" -INSTL_DATABASE_VALIDATION_ERROR="Datenbank-Anmeldeinformationen, den Datenbanktyp, den Datenbanknamen oder den Hostnamen überprüfen. Wenn MySQL 8 installiert ist, dann bitte den Schritten in der Dokumentation folgen." +INSTL_DATABASE_VALIDATION_ERROR="Datenbank-Anmeldeinformationen, den Datenbanktyp, den Datenbanknamen oder den Hostnamen überprüfen. Wenn MySQL 8 installiert ist, dann bitte den Schritten in der Dokumentation folgen." INSTL_CONNECT_DB="Datenbankverbindung einrichten" INSTL_INSTALL_JOOMLA="Joomla! installieren" @@ -254,6 +254,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Fehler beim Kopieren JLIB_INSTALLER_INSTALL="Installieren" JLIB_INSTALLER_NOT_ERROR="Wenn der Fehler mit der Installation von TinyMCE-Sprachdateien in Verbindung steht, so hat er keine Auswirkungen auf die Installation der Sprache(n). Einige Sprachpakete vor Joomla! 3.2.0 haben separate TinyMCE-Sprachdateien mitinstalliert, da diese Sprachdateien jetzt aber bereits im Joomla-Core enthalten sind, brauchen sie nun nicht länger separat installiert zu werden." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Es ist nicht möglich, eine Inhaltssprache für %s zu erstellen. Sprache: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Die PHP-Einstellung „allow_url_fopen“ ist deaktiviert. Diese Einstellung muss aber für Updates aktiviert sein." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: „%s“ kann nicht geöffnet werden." +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: „%s“ kann nicht geparsed werden." JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Update: Die Update-Quelle #%d "%s", URL: %s, konnte nicht geöffnet werden." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Keine Verbindung mit der Datenbank.
    joomla.library: %1$s - %2$s." @@ -285,7 +288,7 @@ WARNING="Warnung" JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Ein Verbindungsabbruch trat beim Abruf der JSON-Daten auf." JLIB_JS_AJAX_ERROR_NO_CONTENT="Kein Inhalt wurde zurückgegeben." JLIB_JS_AJAX_ERROR_OTHER="Beim Abrufen von JSON-Daten wurde ein HTTP-Statuscode %s zurückgegeben." -JLIB_JS_AJAX_ERROR_PARSE="Ein Parsing-Fehler trat bei der Verarbeitung der folgenden JSON-Daten auf:
    %s" +JLIB_JS_AJAX_ERROR_PARSE="Ein Parsing-Fehler trat bei der Verarbeitung der folgenden JSON-Daten auf:
    %s" JLIB_JS_AJAX_ERROR_TIMEOUT="Eine Zeitüberschreitung trat beim Abruf der JSON-Daten auf." ; Field password messages diff --git a/installation/language/de-LI/langmetadata.xml b/installation/language/de-LI/langmetadata.xml index 111a8a419ce35..ee6b9e86a12bd 100644 --- a/installation/language/de-LI/langmetadata.xml +++ b/installation/language/de-LI/langmetadata.xml @@ -1,8 +1,8 @@ - + German (Lichtenstein) - 4.1.0 - January 2022 + 4.1.3 + May 2022 J!German (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/de-LU/joomla.ini b/installation/language/de-LU/joomla.ini index 21839c1dd726c..66c4ce214d0be 100644 --- a/installation/language/de-LU/joomla.ini +++ b/installation/language/de-LU/joomla.ini @@ -8,7 +8,7 @@ ; These will be processed by the JavaScript Build BUILD_FATAL_HEADER="Es ist ein Problem aufgetreten." BUILD_FATAL_LANGUAGE="Deutsch" -BUILD_FATAL_TEXT="Der Server lieferte ein \"{{statusCode_statusText}}\"" +BUILD_FATAL_TEXT="Der Server lieferte ein "{{statusCode_statusText}}"" BUILD_FATAL_URL_TEXT="Weitere Informationen sind in der Dokumentation zu finden." ; Build incomplete error page @@ -39,7 +39,7 @@ INSTL_SETUP_LOGIN_DATA="Zugangsdaten einrichten" INSTL_WARNJAVASCRIPT="Warnung! JavaScript muss für eine reibungslose Installation von Joomla! aktiviert sein." INSTL_WARNJSON="In der PHP-Umgebung muss JSON aktiviert sein, damit Joomla! installiert werden kann." -;Precheck view +; Precheck view INSTL_DATABASE_SUPPORT="Datenbankunterstützung:" INSTL_JSON_SUPPORT_AVAILABLE="JSON-Support" INSTL_MB_LANGUAGE_IS_DEFAULT="PHPs mbstring Spracheinstellung ist neutral" @@ -53,7 +53,7 @@ INSTL_NOTICE_XML_SUPPORT="Die XML-Unterstützung ist nicht verfügbar. Dies soll INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Die Zlib-Kompression ist nicht aktiviert. Dies kann lokal aktiviert werden, indem eine neue Zeile mit zlib.output_compression = On in die php.ini Datei eingefügt wird." INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Unterstützung" INSTL_PRECHECK_ACTUAL="Aktuell" -INSTL_PRECHECK_DESC="Sollte einer der Einträge vom Server nicht unterstützt werden, mit einem „Nein“ gekennzeichnet, bitte die Einstellungen auf dem Server prüfen und anpassen.
    Joomla! kann nicht installiert werden, wenn die unten aufgeführten Systemvoraussetzungen nicht erfüllt sind." +INSTL_PRECHECK_DESC="Sollte einer der Einträge vom Server nicht unterstützt werden, mit einem „Nein“ gekennzeichnet, bitte die Einstellungen auf dem Server prüfen und anpassen.
    Joomla! kann nicht installiert werden, wenn die unten aufgeführten Systemvoraussetzungen nicht erfüllt sind." INSTL_PRECHECK_DIRECTIVE="Funktionen" INSTL_PRECHECK_RECOMMENDED="Empfohlen" INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Diese Einstellungen werden für PHP empfohlen, um eine gute Kompatibilität mit Joomla! zu gewährleisten.
    Jedoch kann Joomla! hier mit Einschränkungen in den Empfehlungen trotzdem funktionieren." @@ -82,7 +82,7 @@ INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL-Datenbankabfrage fehlgeschlage INSTL_DATABASE_HOST_DESC="Datenbankserver („localhost“ oder vom Webhoster vorgegeben)" INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Aufgrund eines unbekannten Fehlers kann die Datei nicht automatisch erstellt werden. Daher ist die Datei mit dem Namen „%1$s“ manuell zu erstellen und in das Verzeichnis „%2$s“ hochzuladen. Anschließend „%3$s“ klicken um fortzufahren." INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Um die Eigentümerschaft zu bestätigen muss die Datei „%1$s“, die soeben im „%2$s“-Verzeichnis von Joomla! erstellt wurde, wieder gelöscht werden. Anschließend „%3$s“ klicken um fortzufahren." -INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss dazu die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen sind in der Dokumentation zu finden." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss dazu die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen sind in der Dokumentation zu finden." INSTL_DATABASE_HOST_LABEL="Datenbankserver" INSTL_DATABASE_NAME_DESC="Datenbankname" INSTL_DATABASE_NAME_LABEL="Datenbankname" @@ -95,7 +95,7 @@ INSTL_DATABASE_PREFIX_MSG="Der Tabellenpräfix muss mit einem Buchstaben beginne INSTL_DATABASE_RESPONSE_ERROR="Der Installationsvorgang ist fehlgeschlagen." INSTL_DATABASE_TYPE_DESC="Datenbanktyp auswählen" INSTL_DATABASE_USER_DESC="Datenbank Benutzer" -INSTL_DATABASE_VALIDATION_ERROR="Datenbank-Anmeldeinformationen, den Datenbanktyp, den Datenbanknamen oder den Hostnamen überprüfen. Wenn MySQL 8 installiert ist, dann bitte den Schritten in der Dokumentation folgen." +INSTL_DATABASE_VALIDATION_ERROR="Datenbank-Anmeldeinformationen, den Datenbanktyp, den Datenbanknamen oder den Hostnamen überprüfen. Wenn MySQL 8 installiert ist, dann bitte den Schritten in der Dokumentation folgen." INSTL_CONNECT_DB="Datenbankverbindung einrichten" INSTL_INSTALL_JOOMLA="Joomla! installieren" @@ -254,6 +254,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Fehler beim Kopieren JLIB_INSTALLER_INSTALL="Installieren" JLIB_INSTALLER_NOT_ERROR="Wenn der Fehler mit der Installation von TinyMCE-Sprachdateien in Verbindung steht, so hat er keine Auswirkungen auf die Installation der Sprache(n). Einige Sprachpakete vor Joomla! 3.2.0 haben separate TinyMCE-Sprachdateien mitinstalliert, da diese Sprachdateien jetzt aber bereits im Joomla-Core enthalten sind, brauchen sie nun nicht länger separat installiert zu werden." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Es ist nicht möglich, eine Inhaltssprache für %s zu erstellen. Sprache: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Die PHP-Einstellung „allow_url_fopen“ ist deaktiviert. Diese Einstellung muss aber für Updates aktiviert sein." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: „%s“ kann nicht geöffnet werden." +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: „%s“ kann nicht geparsed werden." JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Update: Die Update-Quelle #%d "%s", URL: %s, konnte nicht geöffnet werden." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Keine Verbindung mit der Datenbank.
    joomla.library: %1$s - %2$s." @@ -285,7 +288,7 @@ WARNING="Warnung" JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Ein Verbindungsabbruch trat beim Abruf der JSON-Daten auf." JLIB_JS_AJAX_ERROR_NO_CONTENT="Kein Inhalt wurde zurückgegeben." JLIB_JS_AJAX_ERROR_OTHER="Beim Abrufen von JSON-Daten wurde ein HTTP-Statuscode %s zurückgegeben." -JLIB_JS_AJAX_ERROR_PARSE="Ein Parsing-Fehler trat bei der Verarbeitung der folgenden JSON-Daten auf:
    %s" +JLIB_JS_AJAX_ERROR_PARSE="Ein Parsing-Fehler trat bei der Verarbeitung der folgenden JSON-Daten auf:
    %s" JLIB_JS_AJAX_ERROR_TIMEOUT="Eine Zeitüberschreitung trat beim Abruf der JSON-Daten auf." ; Field password messages diff --git a/installation/language/de-LU/langmetadata.xml b/installation/language/de-LU/langmetadata.xml index 6bd479632ff0d..80f87123db78f 100644 --- a/installation/language/de-LU/langmetadata.xml +++ b/installation/language/de-LU/langmetadata.xml @@ -1,8 +1,8 @@ - + German (Luxembourg) - 4.1.0 - January 2022 + 4.1.3 + May 2022 J!German (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/el-GR/joomla.ini b/installation/language/el-GR/joomla.ini index 022daf3819c59..f0223b2dcbc4f 100644 --- a/installation/language/el-GR/joomla.ini +++ b/installation/language/el-GR/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Αποτυχία αν JLIB_INSTALLER_INSTALL="Εγκατάσταση" JLIB_INSTALLER_NOT_ERROR="Εάν το σφάλμα σχετίζεται με την εγκατάσταση των αρχείων γλώσσας TinyMCE δεν έχει καμία επίδραση στην εγκατάσταση των γλωσσών. Ορισμένα πακέτα γλώσσας που δημιουργήθηκαν πριν από το Joomla 3.2.0 μπορεί να προσπαθήσει να εγκαταστήσει ξεχωριστά αρχεία γλώσσας του TinyMCE. Δεδομένου ότι αυτά περιλαμβάνονται πλέον στον πυρήνα δεν χρειάζεται να εγκατασταθούν." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Δεν είναι δυνατή η δημιουργία γλώσσας περιεχομένου για τη %s γλώσσα: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Η ρύθμιση allow_url_fopen της PHP είναι απενεργοποιημένη. Πρέπει να ενεργοποιηθεί για να λειτουργήσει η ενημέρωση." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Ενημέρωση: :Collection: Δεν ήταν δυνατό το άνοιγμα του %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: Δεν ήταν δυνατή η ανάλυση %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Ενημέρωση: Δεν ήταν δυνατό το άνοιγμα του ιστοτόπου ενημέρωσης #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Δεν ήταν δυνατή η σύνδεση στη βάση δεδομένων
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/el-GR/langmetadata.xml b/installation/language/el-GR/langmetadata.xml index e9cffecc19591..9f109d929ee76 100644 --- a/installation/language/el-GR/langmetadata.xml +++ b/installation/language/el-GR/langmetadata.xml @@ -1,8 +1,8 @@ Greek (el-GR) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Ομάδα Μετάφρασης στα Ελληνικά: joomla. gr (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/en-AU/joomla.ini b/installation/language/en-AU/joomla.ini index a9f97aefc94cd..b64102ea30064 100644 --- a/installation/language/en-AU/joomla.ini +++ b/installation/language/en-AU/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Failed to copy file % JLIB_INSTALLER_INSTALL="Install" JLIB_INSTALLER_NOT_ERROR="If the error is related to the installation of TinyMCE language files it has no effect on the installation of the language(s). Some language packs created prior to Joomla 3.2.0 may try to install separate TinyMCE language files. As these are now included in the core they no longer need to be installed." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Unable to create a content language for %s language: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="The PHP allow_url_fopen setting is disabled. This setting must be enabled for the updater to work." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: Could not open %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: Could not parse %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Update: Could not open update site #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Could not connect to database
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/en-AU/langmetadata.xml b/installation/language/en-AU/langmetadata.xml index 30fd5e1cb6799..c76e6e1da0d5c 100644 --- a/installation/language/en-AU/langmetadata.xml +++ b/installation/language/en-AU/langmetadata.xml @@ -1,8 +1,8 @@ English (Australia) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Joomla! Project (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/en-CA/joomla.ini b/installation/language/en-CA/joomla.ini index c3b37807fe74c..092d8f0c623e2 100644 --- a/installation/language/en-CA/joomla.ini +++ b/installation/language/en-CA/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Failed to copy file % JLIB_INSTALLER_INSTALL="Install" JLIB_INSTALLER_NOT_ERROR="If the error is related to the installation of TinyMCE language files it has no effect on the installation of the language(s). Some language packs created prior to Joomla 3.2.0 may try to install separate TinyMCE language files. As these are now included in the core they no longer need to be installed." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Unable to create a content language for %s language: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="The PHP allow_url_fopen setting is disabled. This setting must be enabled for the updater to work." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: Could not open %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: Could not parse %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Update: Could not open update site #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Could not connect to database
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/en-CA/langmetadata.xml b/installation/language/en-CA/langmetadata.xml index 97543b4a2be47..e47baae27b98f 100644 --- a/installation/language/en-CA/langmetadata.xml +++ b/installation/language/en-CA/langmetadata.xml @@ -1,8 +1,8 @@ English (Canada) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Joomla! Project (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/en-NZ/joomla.ini b/installation/language/en-NZ/joomla.ini index 0249d5f689b32..b493e98ad0950 100644 --- a/installation/language/en-NZ/joomla.ini +++ b/installation/language/en-NZ/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Failed to copy file % JLIB_INSTALLER_INSTALL="Install" JLIB_INSTALLER_NOT_ERROR="If the error is related to the installation of TinyMCE language files it has no effect on the installation of the language(s). Some language packs created prior to Joomla 3.2.0 may try to install separate TinyMCE language files. As these are now included in the core they no longer need to be installed." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Unable to create a content language for %s language: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="The PHP allow_url_fopen setting is disabled. This setting must be enabled for the updater to work." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: Could not open %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: Could not parse %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Update: Could not open update site #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Could not connect to database
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/en-NZ/langmetadata.xml b/installation/language/en-NZ/langmetadata.xml index c1ca39b08e5fa..fe3f60b505d24 100644 --- a/installation/language/en-NZ/langmetadata.xml +++ b/installation/language/en-NZ/langmetadata.xml @@ -1,8 +1,8 @@ English (New Zealand) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Joomla! Project (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/en-US/joomla.ini b/installation/language/en-US/joomla.ini index 49e050a10794c..2f117a318aad2 100644 --- a/installation/language/en-US/joomla.ini +++ b/installation/language/en-US/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Failed to copy file % JLIB_INSTALLER_INSTALL="Install" JLIB_INSTALLER_NOT_ERROR="If the error is related to the installation of TinyMCE language files it has no effect on the installation of the language(s). Some language packs created prior to Joomla 3.2.0 may try to install separate TinyMCE language files. As these are now included in the core they no longer need to be installed." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Unable to create a content language for %s language: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="The PHP allow_url_fopen setting is disabled. This setting must be enabled for the updater to work." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update::Collection: Could not open %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update::Collection: Could not parse %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Update: Could not open update site #%d \"%s\", URL: %s" JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase::getInstance: Could not connect to database
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/en-US/langmetadata.xml b/installation/language/en-US/langmetadata.xml index a3a2d80f5f93e..dfca6e7eccac6 100644 --- a/installation/language/en-US/langmetadata.xml +++ b/installation/language/en-US/langmetadata.xml @@ -1,8 +1,8 @@ English (United States) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Joomla! Project (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/es-ES/joomla.ini b/installation/language/es-ES/joomla.ini index 35ef8002d6275..e331a82bc9411 100644 --- a/installation/language/es-ES/joomla.ini +++ b/installation/language/es-ES/joomla.ini @@ -231,6 +231,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Fallo al copiar el ar JLIB_INSTALLER_INSTALL="Instalar" JLIB_INSTALLER_NOT_ERROR="Si el error está relacionado con la instalación de archivos del idioma del editor TinyMCE, no tendrá ningún efecto en la instalación del idioma o idiomas. Algunos paquetes del idioma anteriores a Joomla! 3.2.0 podrían estar intentando instalar los archivo del idioma del editor por separado. Como ahora esos archivos del editor se incluyen desde el núcleo de Joomla, no es necesario que sean instalados." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="No se puede crear un idioma de contenido para %s idioma: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="La directiva de PHP 'allow_url_fopen' está deshabilitado. Debe estar habilitada para que funcione el instalador." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: No se ha podido abrir %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: No se ha podido analizar %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Actualización: no se pudo abrir el sitio de actualización #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: No se puede conectar con la base de datos
    joomla.library: %1$s - %2$s" ; Strings for the language debugger diff --git a/installation/language/es-ES/langmetadata.xml b/installation/language/es-ES/langmetadata.xml index 46ddbc4e87bbd..a8fe4812a8af1 100644 --- a/installation/language/es-ES/langmetadata.xml +++ b/installation/language/es-ES/langmetadata.xml @@ -1,8 +1,8 @@ Spanish (Spain) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Spanish [es-ES] Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/et-EE/joomla.ini b/installation/language/et-EE/joomla.ini index 5307a89fd9f23..b265e4b4fc651 100644 --- a/installation/language/et-EE/joomla.ini +++ b/installation/language/et-EE/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Paigalda: Faili kopeerimine %1 JLIB_INSTALLER_INSTALL="Paigalda" JLIB_INSTALLER_NOT_ERROR="TinyMCE keelefailide paigaldamise veateade ei tähenda, et Joomla! keelefailide paigaldamine oleks ebaõnnestunud. Mõned enne Joomla! 3.2.0 tehtud keelepakid võivad proovida paigaldada eraldi TinyMCE keelefaile paigaldada, aga kuna need on nüüd juba osa tuuma failidest, siis pole neid vaja enam eraldi paigaldada." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Ei suuda luua sisukeelt %s keelele: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP valik allow_url_fopen on välja lülitatud. See valik peab olema uuendaja töötamiseks sisse lülitatud." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Uuenda: :Kollektsioon: %s avamine ebaõnnestus" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Uuendamine: :Kollektsioon: %s parsimine ebaõnnestus" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Uuenda: Uuenduste saidi #%d \"%s\", URL: %s avamine ebaõnnestus." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Andmebaasiga ühendumine ebaõnnestus
    joomla.library: %1$s - %2$s" ; Strings for the language debugger diff --git a/installation/language/et-EE/langmetadata.xml b/installation/language/et-EE/langmetadata.xml index 0d1ca8a7eae99..aec3c2b020724 100644 --- a/installation/language/et-EE/langmetadata.xml +++ b/installation/language/et-EE/langmetadata.xml @@ -1,8 +1,8 @@ Estonian - 4.1.1 - March 2022 + 4.1.4 + May 2022 Joomla! Project (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/eu-ES/joomla.ini b/installation/language/eu-ES/joomla.ini index b869a432a3537..ab1c72ad1db8c 100644 --- a/installation/language/eu-ES/joomla.ini +++ b/installation/language/eu-ES/joomla.ini @@ -230,6 +230,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Huts egin da fitxateg JLIB_INSTALLER_INSTALL="Instalatu " JLIB_INSTALLER_NOT_ERROR="Akatsa TinyMCE hizkuntza fitxategien instalazioarekin lotuta badago, ez du eraginik hizkuntza(k) instalatzean. Joomla 3.2.0 baino lehen sortutako hizkuntza pakete batzuk TinyMCE hizkuntza fitxategi aparte instalatzen saia daitezke. Hauek nukleoan sartuta daudenez, jada ez dira instalatu behar." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Ezin da %s hizkuntzarako eduki hizkuntza sortu:%s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHPko allow_url_fopen ezarpena desgaituta dago. Eguneratzaileak funtzionatu dezan hautatuta egon behar da ezaugarri hau." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: Ezin da ireki %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: Ezin da analizatu %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Eguneratu: ezin izan da #%d \"%s\", URL: %s gunea eguneratu ireki" JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Ezin da datu-basearekin konektatu.
    joomla.library: %1$s - %2$s" ; Strings for the language debugger diff --git a/installation/language/eu-ES/langmetadata.xml b/installation/language/eu-ES/langmetadata.xml index 65c7c44ac4ac5..94f5420e1139b 100644 --- a/installation/language/eu-ES/langmetadata.xml +++ b/installation/language/eu-ES/langmetadata.xml @@ -1,8 +1,8 @@ Basque - 4.1.1 - March 2022 + 4.1.4 + May 2022 Joomla! Basque Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/fa-AF/joomla.ini b/installation/language/fa-AF/joomla.ini index 47e720fc417dd..3903eb41151f4 100644 --- a/installation/language/fa-AF/joomla.ini +++ b/installation/language/fa-AF/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: رونوشت کردن JLIB_INSTALLER_INSTALL="نصب" JLIB_INSTALLER_NOT_ERROR="اگر خطا به فایل‌های زبان TinyMCE مربوط است، تاثیری در نصب فایل‌های زبان نخواهد داشت. بعضی از بسته‌ها که برای نسخه‌های قدیمی‌تر جوملا 3.2.0 ساخته شده‌اند ممکن است فایل‌های زبان جداگانه برای TinyMCE نصب کنند. با توجه به اینکه در حال حاضر این فایل‌ها در هسته قرار داده شده‌اند، دیگر نیازی به نصب نخواهند داشت." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="امکان ایجاد محتوای زبان برای %s زبان: %s وجود ندارد." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="تابع allow_url_fopen در تنظیمات PHP غیر فعال است. فعال کردن این تابع برای کار کردن آپدیت الزامیست." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="آپدیت: :Collection: ‎%s‎ باز نمی‌شود" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="آپدیت: :Collection: قادر به پردازش %s نیست" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="آپدیت: نمی‌تواند سایت آپدیت #%d \"%s\" را باز کند، آدرس: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: امکان اتصال به دیتابیس نیست
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/fa-AF/langmetadata.xml b/installation/language/fa-AF/langmetadata.xml index d44ec71412324..2f5be032fba10 100644 --- a/installation/language/fa-AF/langmetadata.xml +++ b/installation/language/fa-AF/langmetadata.xml @@ -1,8 +1,8 @@ فارسی (دری) - 4.1.1 - March 2022 + 4.1.4 + May 2022 JoomlaPersian Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/fa-IR/joomla.ini b/installation/language/fa-IR/joomla.ini index f9be54b18633e..7adf3da9906ac 100644 --- a/installation/language/fa-IR/joomla.ini +++ b/installation/language/fa-IR/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: پرونده %1$s د JLIB_INSTALLER_INSTALL="نصب" JLIB_INSTALLER_NOT_ERROR="اگر خطا مربوط به نصب پرونده های زبان TinyMCE باشد، تأثیری در نصب زبان (زبان ها) ندارد. برخی از بسته های زبانی که قبل از جوملا 3.2.0 ایجاد شده اند ممکن است سعی کنند پرونده های جداگانه زبان TinyMCE را نصب کنند. از آنجا که این موارد اکنون در هسته گنجانده شده اند، دیگر نیازی به نصب ندارند." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="ایجاد یک زبان محتوا برای زبان %s امکان پذیر نیست: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="در تنظیمات پی اچ پی allow_url_fopen غیر فعال است. برای ارتقا بسته ها allow_url_fopen باید فعال باشد" +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :مجموعه: عدم امکان باز کردن %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :مجموعه: عدم امکان بازکردن %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Update: سایت به روزرسانی باز نشد #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: اتصال به پایگاه داده امکان پذیر نیست
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/fa-IR/langmetadata.xml b/installation/language/fa-IR/langmetadata.xml index 4b47e1891f88a..7d192096113ef 100644 --- a/installation/language/fa-IR/langmetadata.xml +++ b/installation/language/fa-IR/langmetadata.xml @@ -1,8 +1,8 @@ Persian (پارسی) - 4.1.1 - March 2022 + 4.1.4 + May 2022 JoomlaFarsi.Com Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/fi-FI/joomla.ini b/installation/language/fi-FI/joomla.ini index 7d218fd875539..ebcb6377d5fe4 100644 --- a/installation/language/fi-FI/joomla.ini +++ b/installation/language/fi-FI/joomla.ini @@ -15,7 +15,7 @@ BUILD_INCOMPLETE_LANGUAGE="Suomi" BUILD_INCOMPLETE_TEXT="Näyttää siltä, että yrität ajaa Joomlaa meidän git-repositorystä. Tehdäksesi niin joudut suorittamaan ensin pari ylimääräistä vaihetta." BUILD_INCOMPLETE_URL_TEXT="Lisätietoja" ; These will be processed by the JavaScript Build -BUILD_NOXML_HEADER="Valitettavasti PHP: stä puuttuu tärkeä kirjasto" +BUILD_NOXML_HEADER="Valitettavasti PHP:stä puuttuu tärkeä kirjasto" BUILD_NOXML_LANGUAGE="Suomi" BUILD_NOXML_TEXT="Isäntäsi täytyy käyttää PHP:tä XML-kirjaston tuella, jotta tämä Joomlan versio voidaan suorittaa!" BUILD_NOXML_URL_TEXT="Auta minua ratkaisemaan tämä" @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Tiedoston %1$s kopion JLIB_INSTALLER_INSTALL="Asenna" JLIB_INSTALLER_NOT_ERROR="Jos virhe liittyy TinyMCE kielitiedostojen asennukseen, sillä ei ole vaikutusta kiel(i)en asennukseen. Jotkin kielipaketit, mitkä on luotu ennen Joomla! 3.2.0, voivat yrittää asentaa erillisiä TinyMCE kielitiedostoja. Koska ne ovat nyt mukana Joomlassa, niitä ei tarvitse asentaa." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Ei voitu luoda sisällön kieltä kielelle %s: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP allow_url_fopen asetus ei ole käytössä. Tämä asetus tulee ottaa käyttöön, jotta päivitys onnistuisi." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: Kohdetta %s ei voitu avata" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: Kohdetta %s ei voitu lukea" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Update: Päivityssivustoa ei voitu avata #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Ei saada yhteyttä tietokantaan
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/fi-FI/langmetadata.xml b/installation/language/fi-FI/langmetadata.xml index d5d6516493be3..db030b80feb4c 100644 --- a/installation/language/fi-FI/langmetadata.xml +++ b/installation/language/fi-FI/langmetadata.xml @@ -1,8 +1,8 @@ Finnish (Suomi) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Finnish translation team: Joomla.fi (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/fr-FR/joomla.ini b/installation/language/fr-FR/joomla.ini index 11bf475252a1d..86adf4d19d732 100644 --- a/installation/language/fr-FR/joomla.ini +++ b/installation/language/fr-FR/joomla.ini @@ -63,7 +63,7 @@ INSTL_DATABASE_ENCRYPTION_MODE_VALUE_NONE="Par défaut (contrôlé par le serveu INSTL_DATABASE_ENCRYPTION_MODE_VALUE_ONE_WAY="Authentification unique" INSTL_DATABASE_ENCRYPTION_MODE_VALUE_TWO_WAY="Double authentification" INSTL_DATABASE_ENCRYPTION_MSG_CONN_NOT_ENCRYPT="Vous avez choisi d'utiliser une connexion cryptée à la base de données mais le cryptage ne s'est pas effectué bien que la connexion se soit bien établie. La raison peut provenir du fait que le serveur de la base de données soit configuré pour revenir à une connexion non cryptée en cas de mauvais paramétrage. Veuillez vérifier et adapter les paramètres de cryptage si nécessaire, ou alors modifier le champ 'Connection Encryption' pour revenir à 'Default (server controlled)'." -INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="Le fichier saisi dans le champ \"%s\" n'existe pas ou n'est pas accessible." +INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="Le fichier saisi dans le champ '%s' n'existe pas ou n'est pas accessible." INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_EMPTY="Le champ \"%s\" est vide ou ne contient pas de chemin d'accès valide." INSTL_DATABASE_ENCRYPTION_MSG_LOCALHOST="Vous avez saisi \"localhost\" comme nom d'hôte. La connexion cryptée à la base de données peut échouer avec ce paramètre. Vous pouvez soit changer \"localhost\" en \"127.0.0.1\" ou \"::1\" ou un autre nom d'hôte, soit modifier le champ \"Connection Encryption\" en \"Default (server controlled)\"." INSTL_DATABASE_ENCRYPTION_MSG_SRV_NOT_SUPPORTS="Le serveur de la base de données ne prend pas en charge le cryptage des connexions. Activez le support TLS (souvent appelé SSL) sur votre serveur de base de données, ou modifiez le champ \"Connection Encryption\" pour revenir à \"Default (server controlled)\"." @@ -110,7 +110,7 @@ INSTL_COMPLETE_ADMIN_BTN="Accéder à l'administration" INSTL_COMPLETE_FINAL="L'installation est terminée" INSTL_COMPLETE_FINAL_DESC="Votre installation de Joomla est maintenant terminée et prête à l'emploi." INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Installer des langues supplémentaires" -INSTL_REMOVE_INST_FOLDER="Êtes-vous sûr de vouloir supprimer ? La confirmation supprimera définitivement le dossier \"%s\"." +INSTL_REMOVE_INST_FOLDER="Êtes-vous sûr de vouloir supprimer ? La confirmation supprimera définitivement le dossier \"%s\"." ; Languages view INSTL_LANGUAGES="Installer des langues supplémentaires" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Paramètres de langue" @@ -153,7 +153,7 @@ INSTL_DATABASE_FIELD_VALUE_BACKUP="Sauvegarder" INSTL_DATABASE_FIELD_VALUE_REMOVE="Supprimer" INSTL_DATABASE_FILE_DOES_NOT_EXIST="Le fichier %s est introuvable" INSTL_DATABASE_FIX_LOWERCASE="Pour PostgreSQL le préfixe de table doit être en minuscule." -INSTL_DATABASE_FIX_TOO_LONG="Le préfixe de table MySQL ne peut pas dépasser 15 caractères" +INSTL_DATABASE_FIX_TOO_LONG="Le préfixe de table MySQL ne peut pas dépasser 15 caractères." INSTL_DATABASE_INVALID_DB_DETAILS="Les détails fournis pour la base de données sont incorrects et/ou vides." INSTL_DATABASE_INVALID_MARIADB_VERSION="Vous avez besoin de MariaDB %1$s ou supérieur pour continuer l'installation. Votre version est la %2$s" INSTL_DATABASE_INVALID_MYSQL_VERSION="La version de MySQL doit être la %1$s ou supérieure pour poursuivre l’installation. Votre version est la %2$s" @@ -178,7 +178,7 @@ INSTL_DISPLAY_ERRORS="Afficher les erreurs" INSTL_ERROR="Erreur" INSTL_ERROR_DB="Des erreurs sont survenues lors du remplissage la base de données: %s" INSTL_ERROR_INITIALISE_SCHEMA="Impossible d'initialiser le schéma de la base de données." -INSTL_EXTENSION_AVAILABLE="%s Disponible" +INSTL_EXTENSION_AVAILABLE="%s disponible" INSTL_FILE_UPLOADS="Transfert de fichiers" INSTL_GNU_GPL_LICENSE="Licence Publique Générale GNU (consulter la présentation en français...)" INSTL_HELP_LINK="Aide à l’installation de Joomla" @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Erreur de copie du fi JLIB_INSTALLER_INSTALL="Installer" JLIB_INSTALLER_NOT_ERROR="Si l'erreur ci-dessus concerne l'installation de fichiers de langue pour TinyMce, elle n'a pas d'effet sur l'installation de(s) langue(s). Certains packs de langue créés avant la version 3.2.0 de Joomla! peuvent aussi tenter d'installer des fichiers de langue TinyMce. Comme ceux-ci sont dorénavant inclus dans le noyau, ils n'ont plus besoin d'être installés." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Impossible de créer une langue de contenu pour la langue %s : %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Le paramètre PHP allow_url_fopen est désactivé. Il doit être activé pour que la mise à jour fonctionne." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Mise à jour::Collection : impossible d'ouvrir %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Mise à jour::Collection : impossible d'analyser %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Mise à jour : Impossible d'ouvrir le site de mise à jour avec l'ID %d, \"%s\", URL : %s" JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Impossible de se connecter à la base de données
    joomla.library : %1$s - %2$s" ; Strings for the language debugger diff --git a/installation/language/fr-FR/langmetadata.xml b/installation/language/fr-FR/langmetadata.xml index 7655dd5132158..51ada42f003d8 100644 --- a/installation/language/fr-FR/langmetadata.xml +++ b/installation/language/fr-FR/langmetadata.xml @@ -1,8 +1,8 @@ French (fr-FR) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Joomla! Project - French translation team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/he-IL/joomla.ini b/installation/language/he-IL/joomla.ini index 4e3321190c051..72549320d6a02 100644 --- a/installation/language/he-IL/joomla.ini +++ b/installation/language/he-IL/joomla.ini @@ -5,16 +5,30 @@ ; Fatal error page ; These will be processed by the JavaScript Build - -; Build incomplete error page +BUILD_FATAL_HEADER="מצטערים, הייתה בעיה שלא הצלחנו להתאושש ממנה." +BUILD_FATAL_LANGUAGE="אנגלית GB" +BUILD_FATAL_TEXT="השרת החזיר \"{{statusCode_statusText}}\"" +BUILD_FATAL_URL_TEXT="עזור לי לפתור זאת" ; These will be processed by the JavaScript Build +BUILD_INCOMPLETE_HEADER="הגדרת הסביבה לא הושלמה" +BUILD_INCOMPLETE_LANGUAGE="אנגלית GB" +BUILD_INCOMPLETE_TEXT="נראה שאתה מנסה להריץ את ג'ומלה ממאגר ה- git שלנו. לשם כך עליך לבצע מספר שלבים נוספים תחילה." BUILD_INCOMPLETE_URL_TEXT="פרטים נוספים" ; These will be processed by the JavaScript Build BUILD_NOXML_HEADER="מצטערים, בגרסת ה PHP שלך חסרה ספרייה חיונית" +BUILD_NOXML_LANGUAGE="אנגלית GB" +BUILD_NOXML_TEXT="השרת המארח שלך צריך להשתמש ב- PHP עם תמיכה בספריית ה- XML להפעלת גרסה זו של ג'ומלה!" +BUILD_NOXML_URL_TEXT="עזור לי לפתור זאת" +; These will be processed by the JavaScript Build +BUILD_MIN_PHP_ERROR_HEADER="מצטערים, גרסת ה- PHP שלך אינה נתמכת." +BUILD_MIN_PHP_ERROR_LANGUAGE="אנגלית GB" +BUILD_MIN_PHP_ERROR_TEXT="השרת מארח שלך צריך להשתמש בגרסת PHP {{phpversion}} ואילך כדי להריץ גירסה זו של ג'ומלה." +BUILD_MIN_PHP_ERROR_URL_TEXT="עזור לי לפתור זאת" ; Main Config INSTL_SELECT_INSTALL_LANG="בחר שפת התקנה" INSTL_SELECT_LANGUAGE_TITLE="בחירת שפה" INSTL_SETUP_LOGIN_DATA="הגדרת נתוני התחברות" +INSTL_WARNJAVASCRIPT="אַזהָרָה! JavaScript חייבת להיות במצב מאופשר להתקנה תקינה של ג'ומלה." INSTL_WARNJSON="גרסת ה-PHP המותקנת, מחייבת JSON במצב מאופשר, כדי להתקין את ג'ומלה!" ; Precheck view INSTL_DATABASE_SUPPORT="תמיכה בבסיסי נתונים:" @@ -25,72 +39,219 @@ INSTL_NOTICE_DATABASE_SUPPORT="לא נמצאו בסיסי נתונים נתמכ INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="גרסת ה-PHP המותקנת, מחייבת JSON במצב מאופשר, כדי להתקין את ג'ומלה!" INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP שפת (קידוד) מרובת בתים אינה מוגדרת למצב טבעי.ניתן להגדיר זאת על ידי הכנסת php_value mbstring.language neutral בקובץ .htaccess שלכם." INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP שפת (קידוד) מרובת בתים - פונקציית טעינת יתר מוגדרת. ניתן לבטל את ההגדרה בעזרת הכנסת php_value mbstring.func_overload 0 בקובץ .htaccess שלכם." +INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="The required php functions parse_ini_file and parse_ini_string are disabled on your server." +INSTL_NOTICE_XML_SUPPORT="XML Support is not available. This should be enabled by default in php but Ubuntu users may need to install this by doing sudo apt-get install php-xml followed by web server restart." +INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib compression is not set. This can be turned on locally by entering zlib.output_compression = On in your php.ini file." INSTL_PARSE_INI_FILE_AVAILABLE="תמיכת מנתח INI" INSTL_PRECHECK_ACTUAL="בפועל" +INSTL_PRECHECK_DESC="אם אחד מהפריטים האלה אינו נתמך, אנא בצע פעולות לתיקונם.
    לא תוכל להתקין את ג'ומלה עד שההגדרה שלך תעמוד בדרישות אלה." INSTL_PRECHECK_DIRECTIVE="הנחיה" INSTL_PRECHECK_RECOMMENDED="מומלץ" +INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="הגדרות אלה מומלצות עבור PHP כדי להבטיח תאימות מלאה עם ג'ומלה." +INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="הגדרות מומלצות:" +INSTL_PRECHECK_TITLE="בדיקה לפני התקנה" INSTL_XML_SUPPORT="תמיכת XML" INSTL_ZLIB_COMPRESSION_SUPPORT="תמיכת דחיסת Zlib" ; Database view +INSTL_DATABASE="הגדרת בסיס נתונים" +INSTL_DATABASE_ENCRYPTION_CA_LABEL="נתיב לקובץ CA" +INSTL_DATABASE_ENCRYPTION_CERT_LABEL="נתיב לקובץ התעודה" +INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="חבילת צופן נתמכת (אופציונלי)" +INSTL_DATABASE_ENCRYPTION_KEY_LABEL="נתיב לקובץ מפתח פרטי" +INSTL_DATABASE_ENCRYPTION_MODE_LABEL="הצפנת חיבור" +INSTL_DATABASE_ENCRYPTION_MODE_VALUE_NONE="ברירת מחדל (שרת מבוקר)" +INSTL_DATABASE_ENCRYPTION_MODE_VALUE_ONE_WAY="אימות חד כיווני" +INSTL_DATABASE_ENCRYPTION_MODE_VALUE_TWO_WAY="אימות דו כיווני" +INSTL_DATABASE_ENCRYPTION_MSG_CONN_NOT_ENCRYPT="You have selected to use database connection encryption, and a connection could be established, but it was not encrypted. The reason might be that the database server is configured to fall back to an unencrypted connection in case of bad encryption parameters. Either check and correct the database encryption parameters, or change field \"Connection Encryption\" back to \"Default (server controlled)\"." +INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="הקובץ שהוזן בשדה \"%s \" אינו קיים או אינו נגיש." +INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_EMPTY="השדה \"%s \" ריק או שאינו מכיל נתיב חוקי." +INSTL_DATABASE_ENCRYPTION_MSG_LOCALHOST="You have entered \"localhost\" as host name. Connecting to the database with connection encryption might fail with this. Either change \"localhost\" to \"127.0.0.1\" or \"::1\" or a different host name, or change field \"Connection Encryption\" back to \"Default (server controlled)\"." +INSTL_DATABASE_ENCRYPTION_MSG_SRV_NOT_SUPPORTS="The database server doesn't support connection encryption. Either enable TLS (often called SSL in docs) support on your database server, or change field \"Connection Encryption\" back to \"Default (server controlled)\"." +INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="אמת את תעודת השרת" +INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="ביצוע השאילתה במסד הנתונים PostgreSQL נכשלה." +INSTL_DATABASE_HOST_DESC="Enter the host name, usually \"localhost\" or a name provided by your host." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="We were not able to create the file. Please manually create a file named \"%1$s\" and upload it to the \"%2$s\" folder of your Joomla site. Then select \"%3$s\" to continue." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="To confirm that you are the owner of this website please delete the file named \"%1$s\" that has been created in the \"%2$s\" folder of your Joomla site. Then select \"%3$s\" to continue." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="You are trying to use a database host which is not on your local server. For security reasons, you need to verify the ownership of your web hosting account. Please read the documentation for more information." +INSTL_DATABASE_HOST_LABEL="שם שרת מארח" +INSTL_DATABASE_NAME_DESC="פה מכניסים את שם בסיס הנתונים." INSTL_DATABASE_NAME_LABEL="שם בסיס נתונים" +INSTL_DATABASE_NAME_MSG_MYSQL="שם בסיס הנתונים אינו מוכר או זמין הוא חייה להכיל את אחד התווים הבאים /\" +INSTL_DATABASE_NAME_MSG_POSTGRES="שם מסד הנתונים אינו תקף. השם חייב להתחיל באות ואחריה תווים אלפנומריים (אותיות ומספרים בלבד)." +INSTL_DATABASE_NO_SCHEMA="למסד הנתונים מסוג זה לא קיימת סכמת מסד נתונים." +INSTL_DATABASE_PASSWORD_DESC="סיסמה חדשה שיצרת או סופקה בידי ספק האחסון." +INSTL_DATABASE_PREFIX_DESC="יש להזין קידומת לטבלאות או להשתמש בזו שנוצרה אקראית." +INSTL_DATABASE_PREFIX_MSG="קידומת הטבלה חייבת להתחיל באות, ולאחריה תווים אלפנומריים (אותיות ומספרים) ומקף תחתון." +INSTL_DATABASE_RESPONSE_ERROR="תהליך ההתקנה נכשל." +INSTL_DATABASE_TYPE_DESC="יש לבחור את סוג מסד הנתונים." +INSTL_DATABASE_USER_DESC="שם משתמש שיצרת או שם שנוצר על ידי ספק האחסון." +INSTL_DATABASE_VALIDATION_ERROR="יש לבדוק את פרטי ההתחברות למסד הנתונים, סוג מסד הנתונים, שם מסד הנתונים או שם המחשב המארת אם מותקנת MySQL 8 נא לקרוא את ההסבר הבא למידע נוסף: wiki" + +INSTL_CONNECT_DB="הגדרת חיבור למסד הנתונים" +INSTL_INSTALL_JOOMLA="התקנת ג'ומלה" +; Site View +INSTL_ADMIN_EMAIL_DESC="כתובת הדוא\"ל של ה-Super User." +INSTL_ADMIN_PASSWORD_DESC="הגדרת סיסמה לחשבון משתמש Super User." +INSTL_ADMIN_PASSWORD_LENGTH="הסיסמה צריכה להכיל לפחות 12 תווים." +INSTL_ADMIN_USER_DESC="יש להזין את שמו האמיתי של ה-Super User." +INSTL_ADMIN_USERNAME_DESC="שם המשתמש עבור חשבון Super User." +INSTL_LOGIN_DATA="נתוני כניסה לחשבון" +INSTL_SETUP_SITE_NAME="הגדרת שם האתר" +INSTL_SITE="תצורה ראשית" +INSTL_SITE_DEVMODE_LABEL="ישנה הבחנה שהמערכת נמצאת במצב פיתוח - Development Mode" +INSTL_SITE_NAME_DESC="יש להזין את שם אתר הג'ומלה." +; Complete view +INSTL_COMPLETE_ERROR_FOLDER_DELETE="תיקיית \"%s\" לא נמצאה. יש למחוק ידנית את התיקייה." +INSTL_COMPLETE_REMOVE_FOLDER="הסרת תיקיית \"%s\"" +INSTL_COMPLETE_CONGRAT="ההתקנה בוצעה בהצלחה!" +INSTL_COMPLETE_TITLE="מצויין! אתר הג'ומלה שלך מוכן לעבודה." +INSTL_COMPLETE_SITE_BTN="סיום ומעבר לאתר" +INSTL_COMPLETE_ADMIN_BTN="סיום ומעבר לפאנל ניהול האתר" +INSTL_COMPLETE_FINAL="ההתקנה הושלמה" +INSTL_COMPLETE_FINAL_DESC="התקנת ג'ומלה הושלמה והמערכת מוכנה לפעולה." +INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="התקנת שפות נוספות" +INSTL_REMOVE_INST_FOLDER="התיקייה עומדת בפני מחיקה. אישור יגרום למחיקה מוחלטת של תיקיית \"%s\" ." ; Languages view +INSTL_LANGUAGES="התקנת שפות נוספות" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="שפה" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="בחירת שפה" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="תג שפה" INSTL_LANGUAGES_COLUMN_HEADER_VERSION="גירסה" +INSTL_LANGUAGES_DESC="ממשק הג'ומלה זמין במספר שפות. בחר את השפות המועדפות עליך על ידי בחירת תיבות הסימון ולאחר מכן התקן אותן על ידי בחירה בלחצן הבא.
    הערה: פעולה זו תיקח כעשר שניות עד שתוריד ותתקין כל שפה. כדי למנוע פסק זמן, בחר לא יותר משלוש שפות להתקנה." +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="פעולה זו תיקח עד 10 שניות לשפה להשלים
    אנא המתן בזמן שאנו מורידים ומתקינים את השפות ..." +INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="לא נבחרו שפות להתקנה." +INSTL_LANGUAGES_WARNING_NO_INTERNET="ג'ומלה לא הצליחה להתחבר לשרת השפות. אנא סיים את תהליך ההתקנה." +INSTL_LANGUAGES_WARNING_NO_INTERNET2="לתשומת ליבך, תוכל להתקין שפות מאוחר יותר באמצעות ממשק הניהול." +INSTL_LANGUAGES_WARNING_BACK_BUTTON="חזור לשלב ההתקנה הקודם" ; Default language view +INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="שפת ניהול ברירת מחדל" +INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="ג'ומלה לא הצליחה להגדיר את השפה כברירת מחדל. אנגלית תשמש כשפת ברירת המחדל של ממשק הניהול." +INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla has set %s as your default ADMINISTRATOR language." INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="בחירה" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="שפה" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="תגית" +INSTL_DEFAULTLANGUAGE_COULD_NOT_DOWNLOAD_PACKAGE="ג'ומלה לא הצליחה להוריד או לפתוח את חבילת השפה מ: %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="ג'ומלה לא הצליחה להתקין את שפת %s." +INSTL_DEFAULTLANGUAGE_DESC="ג'ומלה התקינה את השפות הבאות. בחר את שפת ברירת המחדל הרצויה עבור מנהל המערכת ." +INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="ג'ומלה התקינה את השפות הבאות. בחר את שפת ברירת המחדל הרצויה עבור ה Joomla Frontend ." +INSTL_DEFAULTLANGUAGE_FRONTEND="שפת ברירת המחדל של האתר" +INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="ג'ומלה לא הצליחה להגדיר את השפה כשפת ברירת המחדל של האתר. אנגלית תשמש כשפת ברירת המחדל." +INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="ג'ומלה הגדירה %s כשפת ברירת המחדל של האתר." +INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="הגדרת שפה ברירת מחדל" +INSTL_DEFAULTLANGUAGE_TRY_LATER="תוכל להתקין זאת מאוחר יותר באמצעות ממשק הניהול של ג'ומלה." + +INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="אנגלית (UK)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español ; Database Model +INSTL_DATABASE_COULD_NOT_CONNECT="לא מצליח להתחבר למסד נתונים. הממשק החזיר הודעת שגיאה: %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="המתקין לא הצליח להתחבר למסד הנתונים שצוין ולא הצליח ליצור את מסד הנתונים. אנא אמת את ההגדרות שלך ובמידת הצורך צור ידנית את מסד הנתונים שלך." +INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="לא ניתן לרענן את מטמון המניפסט לרכיב: %s" +INSTL_DATABASE_ERROR_BACKINGUP="אירעו כמה טעויות בגיבוי מסד הנתונים." +INSTL_DATABASE_ERROR_CREATE="אירעה שגיאה בעת ניסיון ליצור את מסד הנתונים %s. +
    ייתכן שלמשתמש אין מספיק הרשאות ליצירת מסד נתונים. ייתכן שיהיה צורך ליצור את מסד הנתונים הנדרש בנפרד לפני שתוכל להתקין את ג'ומלה" +INSTL_DATABASE_ERROR_DELETE="אירעו כמה שגיאות במחיקת מסד הנתונים." +INSTL_DATABASE_ERROR_READING_SQL_FILE="לא ניתן לקרוא קובץ SQL." +INSTL_DATABASE_FIELD_VALUE_BACKUP="גיבוי" INSTL_DATABASE_FIELD_VALUE_REMOVE="הסרה" +INSTL_DATABASE_FILE_DOES_NOT_EXIST="הקובץ %s אינו קיים." +INSTL_DATABASE_FIX_LOWERCASE="קידומת הטבלה חייבת להיות קטנה עבור PostgreSQL." +INSTL_DATABASE_FIX_TOO_LONG="קידומת הטבלה MySQL חייבת להיות לכל היותר 15 תווים." +INSTL_DATABASE_INVALID_DB_DETAILS="פרטי מסד הנתונים שגויים ו/או ריקים." +INSTL_DATABASE_INVALID_MARIADB_VERSION="You need MariaDB %1$s or higher to continue the installation. Your version is: %2$s" +INSTL_DATABASE_INVALID_MYSQL_VERSION="You need MySQL %1$s or higher to continue the installation. Your version is: %2$s" +INSTL_DATABASE_INVALID_MYSQLI_VERSION="You need MySQL %1$s or higher to continue the installation. Your version is: %2$s" +INSTL_DATABASE_INVALID_PGSQL_VERSION="You need PostgreSQL %1$s or higher to continue the installation. Your version is: %2$s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="You need PostgreSQL %1$s or higher to continue the installation. Your version is: %2$s" +INSTL_DATABASE_INVALID_TYPE="אנא בחר את סוג מסד הנתונים." +INSTL_DATABASE_NAME_INVALID_CHAR="אין מזהה MySQL יכול להיות בעל NULL ASCII (0x00)." +INSTL_DATABASE_NAME_INVALID_SPACES="שמות מסדי נתונים ושמות טבלאות של MySQL אינם רשאים להתחיל או להסתיים ברווחים." +INSTL_DATABASE_NAME_TOO_LONG="שם מסד הנתונים MySQL חייב לכלול 64 תווים לכל היותר." ; Controllers +INSTL_COOKIES_NOT_ENABLED="לא נראה שהעוגיות מופעלות בלקוח הדפדפן שלך. לא תוכל להתקין את האפליקציה כשהתכונה הזו מושבתת. לחלופין, עלולה להיות בעיה גם ב session.save_path של השרת. אם זה המקרה, פנה לספק האירוח שלך אם אינך יודע כיצד לבדוק או לתקן זאת בעצמך." INSTL_HEADER_ERROR="תקלה" +; Helpers +INSTL_PAGE_TITLE="מתקין ג'ומלה" +; Configuration model +INSTL_ERROR_CONNECT_DB="Could not connect to the database. Connector returned number: %d." +INSTL_STD_OFFLINE_MSG="אתר זה מושבת לתחזוקה.
    אנא בדוק שוב בקרוב." ; Others +INSTL_CONFPROBLEM="קובץ התצורה או התיקיה שלך אינם מורשים לכתיבה או הייתה בעיה ביצירת קובץ התצורה. יהיה עליך להעלות את הקוד באופן ידני. בחר באזור הטקסט כדי לסמן את כל הקוד ולאחר מכן הדבק אותו בקובץ טקסט חדש. תן שם לקובץ זה 'config.php' והעלה אותו לתיקיית הבסיס של האתר שלך." INSTL_DISPLAY_ERRORS="הצגת שגיאות" INSTL_ERROR="תקלה" +INSTL_ERROR_DB="Some errors occurred while populating the database: %s." +INSTL_ERROR_INITIALISE_SCHEMA="לא ניתן לאתחל את סכמת מסד הנתונים." +INSTL_EXTENSION_AVAILABLE="%s זמין" INSTL_FILE_UPLOADS="טעינת קובץ" +INSTL_GNU_GPL_LICENSE="רישיון ציבורי כללי של GNU" +INSTL_HELP_LINK="עזרה להתקנת ג'ומלה" +INSTL_NOTICE_NEEDSTOBEWRITABLE="אתה עדיין יכול להמשיך בהתקנה אם תתקן את ההרשאות." INSTL_OUTPUT_BUFFERING="חציצת פלט" INSTL_PHP_VERSION="גירסת PHP" INSTL_PHP_VERSION_NEWER="גרסת ה-PHP > = %s" +INSTL_PROCESS_BUSY="התהליך בעיצומו. המתן בבקשה ..." INSTL_SESSION_AUTO_START="איתחול אוטומטי של פעילות (session)" +INSTL_WRITABLE="Insufficient permission to create %s." INSTL_ZIP_SUPPORT_AVAILABLE="תמיכה מקומית ב-ZIP" ; Global strings JADMINISTRATOR="ניהול" JEMAIL="דוא\"ל" JERROR="תקלה" JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="שגיאה קרתה בזמן ביצוע הבקשה שלכם." +JGLOBAL_ISFREESOFTWARE="%s is free software released under the %s." +JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="חבילת השפה אינה תואמת לגרסת ג'ומלה זו. ייתכן שחלק מהמחרוזות חסרות והן יוצגו באנגלית." JGLOBAL_SELECT_AN_OPTION="Select an option" JGLOBAL_SELECT_NO_RESULTS_MATCH="No results match" JGLOBAL_SELECT_SOME_OPTIONS="בחרו אפשרות" +JHIDEPASSWORD="הסתר סיסמה" JINVALID_TOKEN="הבקשה האחרונה נדחתה מכיוון שהיא מכילה מחרוזת שגויה. אנא טען מחדש את העמוד ונסה שוב." JINVALID_TOKEN_NOTICE="אסימון האבטחה לא תואם. הבקשה בוטלה כדי למנוע פרצת אבטחה. נא נסה שוב." JNEXT="הבא" +JNO="אף פעם" JNOTICE="התראה" JOFF="כיבוי" JON="הדלקה" JPREVIOUS="הקודם" +JSHOWPASSWORD="הצג סיסמא" JSITE="קודם" +JSKIP="דלג" JUSERNAME="שם משתמש" JYES="כן" ; Framework strings necessary when no lang pack is available JLIB_DATABASE_ERROR_CONNECT_MYSQL="Could not connect to MySQL." +JLIB_DATABASE_ERROR_DATABASE="שגיאת מסד נתונים." +JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="לא מצליח לעלות את התקן בסיס הנתונים: %s" +JLIB_DATABASE_ERROR_VALID_MAIL="כתובת הדוא\"ל שהזנת אינה חוקית. אנא הזן כתובת דוא\"ל אחרת." +JLIB_ENVIRONMENT_SESSION_EXPIRED="פג תוקף הדף שלך שלך, יש לטעון מחדש." +JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: Path is not a folder. Path: %2$s" +JLIB_FORM_FIELD_INVALID="Invalid field: " JLIB_FORM_VALIDATE_FIELD_INVALID="שדה שגוי: %s" JLIB_FORM_VALIDATE_FIELD_REQUIRED="שדה חובה: %s" JLIB_INSTALLER_ABORT="Aborting language installation: %s" JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="סיומת %1$s: יצירת תיקיה נכשלה: %2$s" JLIB_INSTALLER_ABORT_NOINSTALLPATH="Install path does not exist" +JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Package %1$s: There was an error installing an extension: %2$s." JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="Package %s: There were no files to install!" +JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Failed to copy file %1$s to %2$s." JLIB_INSTALLER_INSTALL="התקנה" +JLIB_INSTALLER_NOT_ERROR="אם השגיאה קשורה להתקנת קבצי שפות TinyMCE אין לה השפעה על התקנת השפות. חבילות שפה מסוימות שנוצרו לפני Joomla 3.2.0 עשויות לנסות להתקין קבצי שפה נפרדים של TinyMCE. מכיוון שהם כלולים כעת בליבה אין צורך להתקין אותם יותר." +JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="אין אפשרות ליצור שפת תוכן עבור שפה %s: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="פונקציית PHP allow_url_fopen מושבתת. חובה להעביר אותה למצב מאופשר על מנת שרכיב העידכונים יוכל לפעול." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: לא מצליחה לפתוח %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: לא מצליחה לפרוס %s" +JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="עדכון: לא היתה אפשרות לפתוח עדכון האתר #%d \"%s\", כתובת האתר: %s." +JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Could not connect to database
    joomla.library: %1$s - %2$s." ; Strings for the language debugger JDEBUG_LANGUAGE_FILES_IN_ERROR="Parsing errors in language files" +JDEBUG_LANGUAGE_UNTRANSLATED_STRING="מחרוזות לא מתורגמות" JNONE="ללא" ; Necessary for errors +ADMIN_EMAIL="דוא\"ל של מנהל המערכת" +ADMIN_PASSWORD="סיסמת מנהל המערכת" SITE_NAME="שם האתר" ; Database types (allows for a more descriptive label than the internal name) MYSQL="MySQL (PDO)" MYSQLI="MySQLi" ORACLE="Oracle" +PGSQL="PostgreSQL (PDO)" POSTGRESQL="PostgreSQL" SQLITE="SQLite" ; Javascript message titles @@ -101,8 +262,18 @@ WARNING="אזהרה" ; Javascript ajax error messages JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="לניתוק ההתקשרות אירעה בעת שליפת הנתונים של JSON." JLIB_JS_AJAX_ERROR_NO_CONTENT="תוכן לא הוחזר." +JLIB_JS_AJAX_ERROR_OTHER="An error has occurred while fetching the JSON data: HTTP %d status code." +JLIB_JS_AJAX_ERROR_PARSE="A parse error has occurred while processing the following JSON data:
    %s" JLIB_JS_AJAX_ERROR_TIMEOUT="פסק זמן אירע בעת שליפת הנתונים של JSON." ; Field password messages +JFIELD_PASSWORD_INDICATE_COMPLETE="הסיסמא התקבלה" +JFIELD_PASSWORD_INDICATE_INCOMPLETE="הסיסמה אינה עומדת בדרישות האתר." JFIELD_PASSWORD_SPACES_IN_PASSWORD="הסיסמא לא יכולה להכיל רווחים בתחילתה או בסופה." JFIELD_PASSWORD_TOO_LONG="הסיסמא ארוכה מדי. הסיסמא חייבת להכיל פחות מ- 100 תווים." +JFIELD_PASSWORD_TOO_SHORT_N="Password is too short. Passwords must have at least %d characters." +; Javascript Form Validation Messages +JLIB_FORM_CONTAINS_INVALID_FIELDS="לא ניתן לשלוח את הטופס מכיוון שחסרים בו נתונים נדרשים.
    אנא תקן את השדות המסומנים ונסה שוב." +JLIB_FORM_FIELD_INVALID_VALUE="ערך זה אינו תקף." +JLIB_FORM_FIELD_REQUIRED_CHECK="יש לבחור אחת מהאפשרויות." +JLIB_FORM_FIELD_REQUIRED_VALUE="נא למלא את השדה." diff --git a/installation/language/he-IL/langmetadata.xml b/installation/language/he-IL/langmetadata.xml index ee2208744d427..3873e78d34f2a 100644 --- a/installation/language/he-IL/langmetadata.xml +++ b/installation/language/he-IL/langmetadata.xml @@ -1,8 +1,8 @@ Hebrew (Israel) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Joomla! Project (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/hu-HU/joomla.ini b/installation/language/hu-HU/joomla.ini index 5811afa031cb9..4f595bb8cfc2c 100644 --- a/installation/language/hu-HU/joomla.ini +++ b/installation/language/hu-HU/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: A(z) %1$s fájl máso JLIB_INSTALLER_INSTALL="Telepítés" JLIB_INSTALLER_NOT_ERROR="Ha a hiba a TinyMCE nyelvi fájljainak telepítésével kapcsolatos, az nincs hatással a nyelv(ek) telepítésére. A Joomla 3.2.0 előtt készített néhány nyelvi csomag megpróbálhat külön TinyMCE nyelvi fájlokat telepíteni. Mivel az alapcsomag most már tartalmazza ezeket, a továbbiakban nincs szükség a telepítésükre." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Nem hozható létre tartalom nyelv a(z) %s nyelvhez: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Tiltva van az allow_url_fopen PHP-beállítás. A frissítő használatához engedélyezni kell ezt a beállítást." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Frissítés: :Collection: Nem lehetett megnyitni a következőt: %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Frissítés: :Collection: Nem sikerült feldolgozni a következőt: %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Frissítés: Nem sikerült megnyitni a következő frissítési oldalt: #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Nem lehetett kapcsolódni az adatbázishoz
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/hu-HU/langmetadata.xml b/installation/language/hu-HU/langmetadata.xml index 96ddb310e9309..9e24ce07aa0a9 100644 --- a/installation/language/hu-HU/langmetadata.xml +++ b/installation/language/hu-HU/langmetadata.xml @@ -1,8 +1,8 @@ Hungarian (Magyar) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Joomla! Magyarország (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/it-IT/joomla.ini b/installation/language/it-IT/joomla.ini index 8210c2f1d9f99..1173bc6c798f8 100644 --- a/installation/language/it-IT/joomla.ini +++ b/installation/language/it-IT/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Copia del file %1$s i JLIB_INSTALLER_INSTALL="Installa" JLIB_INSTALLER_NOT_ERROR="Se l'errore è inerente all'installazione dei file lingua di TinyMCE, non ha effetto sull'installazione della(e) lingua(e). Alcuni pacchetti lingua creati prima di Joomla 3.2.0 potrebbero tentare di installare separatamente i file lingua di TinyMCE. Dato che ora sono inclusi nel core, non è più necessario installarli." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Impossibile creare una lingua di contenuto per la lingua %s: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="L'impostazione PHP allow_url_fopen è disabilitata. Questa impostazione dev'essere abilitata perché l'updater funzioni." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Aggiornamento: :Collection: Impossibile aprire %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Aggiornamento: :Collection: Impossibile analizzare %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Aggiornamento: Non è possibile aggiornare il sito #%d \"%s\", URL: %s" JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Non è stato possibile connettersi al database
    joomla.library:%1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/it-IT/langmetadata.xml b/installation/language/it-IT/langmetadata.xml index c94cda7ce9a01..e7292c647e783 100644 --- a/installation/language/it-IT/langmetadata.xml +++ b/installation/language/it-IT/langmetadata.xml @@ -1,8 +1,8 @@ Italiano (it-IT) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Italian Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ja-JP/joomla.ini b/installation/language/ja-JP/joomla.ini index 5ba23b72f2ba4..4435394caef54 100644 --- a/installation/language/ja-JP/joomla.ini +++ b/installation/language/ja-JP/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :インストール: ファイ JLIB_INSTALLER_INSTALL="インストール" JLIB_INSTALLER_NOT_ERROR="エラーがTinyMCE言語ファイルのインストールに関連している場合、言語のインストールには影響しません。Joomla 3.2.0より前に作成された一部の言語パックは、個別のTinyMCE言語ファイルをインストールしようとする場合があります。これらはコアに含まれるようになったため、インストールする必要はありません。" JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="%s 言語のコンテンツ言語を作成できません：%s" +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHPの allow_url_fopen 設定が無効です。更新機能を利用するにはこの設定を有効にする必要があります。" +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="更新：:収集：%s を開けませんでした" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="更新：:収集：%s を解析できませんでした" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="アップデート：更新サイトを開くことができませんでした #%d 「%s」URL: %s" JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: データベースに接続できません
    joomla.library: %1$s - %2$s" ; Strings for the language debugger diff --git a/installation/language/ja-JP/langmetadata.xml b/installation/language/ja-JP/langmetadata.xml index 9d523bfd57962..a63cc118de446 100644 --- a/installation/language/ja-JP/langmetadata.xml +++ b/installation/language/ja-JP/langmetadata.xml @@ -1,8 +1,8 @@ Japanese (ja-JP) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Joomla!じゃぱん (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ka-GE/joomla.ini b/installation/language/ka-GE/joomla.ini index aa022cdf2f78c..1d24e852518f2 100644 --- a/installation/language/ka-GE/joomla.ini +++ b/installation/language/ka-GE/joomla.ini @@ -217,7 +217,7 @@ JYES="კი" ; Framework strings necessary when no lang pack is available JLIB_DATABASE_ERROR_CONNECT_MYSQL="MySQL-თან დაკავშირება ვერ მოხერხდა." JLIB_DATABASE_ERROR_DATABASE="მოხდა მონაცემთა ბაზის შეცდომა" -JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="მონაცემთა ბაზის დრაივერის ჩატვირთვა ვერ მოხერხდა: %s" +JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="ვერ მოხერხდა მონაცემთა ბაზის დრაივერის ჩატვირთვა: %s" JLIB_DATABASE_ERROR_VALID_MAIL="თქვენს მიერ შეყვანილი ელ-ფოსტის მისამართი არასწორია. გთხოვთ შეიყვანოთ სხვა ელ-ფოსტის მისამართი." JLIB_ENVIRONMENT_SESSION_EXPIRED="თქვენი სესიისთვის განკუთვნილი დრო ამოიწურა, გთხოვთ განაახლოთ გვერდი." JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: გზა არ წარმოადგენს საქაღალდეს. გზა: %2$s" @@ -225,7 +225,7 @@ JLIB_FORM_FIELD_INVALID="ველი არასწორად არის JLIB_FORM_VALIDATE_FIELD_INVALID="ველი არასწორად არის შევსებული: %s" JLIB_FORM_VALIDATE_FIELD_REQUIRED="აუცილებელია შეივსოს ველი: %s" JLIB_INSTALLER_ABORT="ენის ინსტალაცია შეწვეტილია: %s" -JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="გაფართოება %1$s: საქაღალეს შექმნა ვერ მოხერხდა: %2$s" +JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="გაფართოება %1$s: ვერ მოხერხდა საქაღალეს შექმნა: %2$s" JLIB_INSTALLER_ABORT_NOINSTALLPATH="ინსტალაციის მისამართი არ არსებობს." JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="პაკეტი %1$s: გაფართოების ინსტალაციისას მოხდა შეცდომა: %2$s." JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="პაკეტი %s: ინსტალაციისთვის არ გვაქვს ფაილები!" @@ -233,8 +233,11 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: ფაილის %1 JLIB_INSTALLER_INSTALL="ინსტალაცია" JLIB_INSTALLER_NOT_ERROR="ენის ფაილების TinyMCE დაყენების დროს მომხდარი შეცდომები არანაირად არ აისახება ენის პაკეტის ინსტალაციაზე. ენის ზოგიერთი პაკეტი, რომელიც შექმნილია Joomla! 3.2.0-ზე ქვედა ვერსიებისთვის, შესაძლოა შეეცადოს დააყენოს TinyMCE ენის ფაილები. თუმცა, TinyMCE ენის ფაილები უკვე გათვალისწინებულია და შედის ძირითად ბირთვში, ამიტომ მისი დამატებით დაყენება საჭირო არ არის." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="ვერ მოხერხდა კონტენტის ენის შექმნა ენისთვის %s: %s." -JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="განახლება: განახლების სერვერის გახსნა ვერ მოხერხდა #%d \"%s\", URL: %s." -JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: მონაცემთა ბაზასთან მიერთება ვერ მოხერხდა
    joomla.library: %1$s - %2$s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP allow_url_fopen პარამეტრი გამორთულია. განახლების მუშაობისთვის ეს პარამეტრი უნდა იყოს ჩართული." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: ვერ მოხერხდა გახსნა %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: ვერ მოხერხდა დამუშავება %s" +JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Update: ვერ მოხერხდა განახლების სერვერის გახსნა #%d \"%s\", URL: %s." +JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: ვერ მოხერხდა მონაცემთა ბაზასთან მიერთება
    joomla.library: %1$s - %2$s." ; Strings for the language debugger JDEBUG_LANGUAGE_FILES_IN_ERROR="შეცდომები ენის ფაილებში" JDEBUG_LANGUAGE_UNTRANSLATED_STRING="სათარგმნი სტრიქონები" diff --git a/installation/language/ka-GE/langmetadata.xml b/installation/language/ka-GE/langmetadata.xml index 4d4b845c9b4b9..9fa3b282328b8 100644 --- a/installation/language/ka-GE/langmetadata.xml +++ b/installation/language/ka-GE/langmetadata.xml @@ -1,8 +1,8 @@ Georgian (Georgia) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Georgian Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/kk-KZ/joomla.ini b/installation/language/kk-KZ/joomla.ini index feb837423688b..802513aa8d503 100644 --- a/installation/language/kk-KZ/joomla.ini +++ b/installation/language/kk-KZ/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE=" JInstaller:: Install: %1$s файлын %2 JLIB_INSTALLER_INSTALL="Электрондық пошта теңшелімі" JLIB_INSTALLER_NOT_ERROR="Егер қате TinyMCE тіл файлдарын орнатумен байланысты болса, ол тілді(тілдерді) орнатуға әсер етпейді. Кейбір тіл бумалары дейін құрылған Joomla! 3.2.0 жеке TinyMCE тіл файлдарын орнатуға тырысуы мүмкін. Олар енді ядроға енгізілгендіктен, оларды орнату қажет емес." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="%s тілі үшін мазмұн тілін жасау мүмкін емес: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP allow_url_fopen параметрі өшірілген. Жаңартқыш жұмыс істеуі үшін бұл параметрді қосу керек." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Жаңарту: :Жинақ: %s ашу мүмкін емес" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Жаңарту: :Жинақ: %s сараптау мүмкін емес" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Жаңарту: #%d \"%s\" жаңарту сайтын ашу мүмкін болмады, URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE=" JDatabase:: getInstance:
    joomla деректер базасына қосылу мүмкін емес.кітапхана: %1$s - %2$s" ; Strings for the language debugger diff --git a/installation/language/kk-KZ/langmetadata.xml b/installation/language/kk-KZ/langmetadata.xml index 1689ac008d8f5..5bf626122f155 100644 --- a/installation/language/kk-KZ/langmetadata.xml +++ b/installation/language/kk-KZ/langmetadata.xml @@ -1,8 +1,8 @@ Kazakh (Kazakhstan) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Sarvarov Akylkerey (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/lv-LV/joomla.ini b/installation/language/lv-LV/joomla.ini index d8a66166b928a..67d08799ade11 100644 --- a/installation/language/lv-LV/joomla.ini +++ b/installation/language/lv-LV/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: kļūda kopējot datn JLIB_INSTALLER_INSTALL="Instalēt" JLIB_INSTALLER_NOT_ERROR="Ja kļūdas paziņojums ir saistīts ar TinyMCE tulkojuma instalāciju, tad tam nav saistības ar pārējo tulkojuma pakotnes datņu instalāciju. Dažas tulkojuma pakotnes, kas ir veidotas pirms Joomla! 3.2.0 var mēģināt instalēt redaktora TinyMCE tulkojuma datnes. Kopš Joomla 3.2.0 versijas šīs datnes ir iekļautas Joomla kodola sastāvā un to instalācija nav nepieciešama." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Nevar izveidot satura valodu priekš %s valodas: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP funkcija allow_url_fopen ir atslēgta. Šai funkcijai ir jābūt ieslēgtai, lai darbotos atjaunošanas funkcijas." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Atjaunināšana: :Kolekcija: nevar atvērt %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Atjaunināšana: :Kolekcija: nevar izanalizēt %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Jauninājums: Nevar atrast jauninājumu saiti #%d \"%s\", Adrese: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: nav iespējams pieslēgties datu bāzei
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/lv-LV/langmetadata.xml b/installation/language/lv-LV/langmetadata.xml index 55ab552bd55d4..4da5a8179c844 100644 --- a/installation/language/lv-LV/langmetadata.xml +++ b/installation/language/lv-LV/langmetadata.xml @@ -1,8 +1,8 @@ Latvian (Latvia) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Joomla! Projekts (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/nl-BE/joomla.ini b/installation/language/nl-BE/joomla.ini index 3839ad4ba938c..91f54cf23cf14 100644 --- a/installation/language/nl-BE/joomla.ini +++ b/installation/language/nl-BE/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Kopiëren bestand %1$ JLIB_INSTALLER_INSTALL="Installeren" JLIB_INSTALLER_NOT_ERROR="Als de fout gerelateerd is aan de installatie van TinyMCE-taalbestanden, heeft dit geen invloed op de installatie van de taal (talen). Sommige taalpakketten van vóór Joomla 3.2.0, kunnen proberen afzonderlijke TinyMCE-taalbestanden te installeren. Omdat deze nu in de kern zijn opgenomen, hoeven ze niet langer te worden geïnstalleerd." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Niet mogelijk om een inhoudstaal aan te maken voor %s taal: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="De PHP allow_url_fopen instelling is gedeactiveerd. Deze instelling moet geactiveerd zijn opdat de updater zou werken." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: %s kon niet geopend worden" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: %s kon niet ontleed worden" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Update: Kan updatesite #%d \"%s\" niet openen, URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Kan niet verbinden met de database
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/nl-BE/langmetadata.xml b/installation/language/nl-BE/langmetadata.xml index 9874ae1fa5d3f..81bad652aff0e 100644 --- a/installation/language/nl-BE/langmetadata.xml +++ b/installation/language/nl-BE/langmetadata.xml @@ -1,8 +1,8 @@ Dutch (Belgium) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Dutch (BE) translation team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/nl-NL/joomla.ini b/installation/language/nl-NL/joomla.ini index 3beeed65a152c..194120d9b39f8 100644 --- a/installation/language/nl-NL/joomla.ini +++ b/installation/language/nl-NL/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Installeren: Kopiëren bestand JLIB_INSTALLER_INSTALL="Installeren" JLIB_INSTALLER_NOT_ERROR="Als de fout gerelateerd is aan de installatie van TinyMCE-taalbestanden, heeft dit geen invloed op de installatie van de taal (talen). Sommige taalpakketten van vóór Joomla 3.2.0, kunnen proberen afzonderlijke TinyMCE-taalbestanden te installeren. Omdat deze nu in de kern zijn opgenomen, hoeven ze niet langer te worden geïnstalleerd." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Niet mogelijk om een inhoudstaal aan te maken voor %s taal: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="De PHP allow_url_fopen instelling is uitgeschakeld. Deze instelling moet ingeschakeld zijn voor het functioneren van de updater." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Updaten: :Collectie: Kan %s niet openen" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collectie: Kan %s niet parsen" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Update: Kan updatesite #%d \"%s\" niet openen, URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Kan niet verbinden met de database
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/nl-NL/langmetadata.xml b/installation/language/nl-NL/langmetadata.xml index 8a9a3c848877b..1a95e57849d68 100644 --- a/installation/language/nl-NL/langmetadata.xml +++ b/installation/language/nl-NL/langmetadata.xml @@ -1,8 +1,8 @@ Dutch (nl-NL) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Dutch Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/pl-PL/joomla.ini b/installation/language/pl-PL/joomla.ini index bb1d18be3d4b7..6eb4500c250ae 100644 --- a/installation/language/pl-PL/joomla.ini +++ b/installation/language/pl-PL/joomla.ini @@ -130,7 +130,7 @@ INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla ustawił język %s jako domyśln INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Wybierz" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Język" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Tag" -INSTL_DEFAULTLANGUAGE_COULD_NOT_DOWNLOAD_PACKAGE="Joomla nie udało się pobrać lub rozpakować pakietu językowego z: %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_DOWNLOAD_PACKAGE="Nie udało się pobrać lub rozpakować pakietu językowego z: %s" INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Nie udało się zainstalować języka %s." INSTL_DEFAULTLANGUAGE_DESC="W Joomla zainstalowano następujące języki. Wybierz pożądany język domyślny zaplecza administracyjnego." INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="W Joomla zainstalowano następujące języki. Wybierz pożądany język domyślny witryny." @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Nie udało się kopio JLIB_INSTALLER_INSTALL="Instaluj" JLIB_INSTALLER_NOT_ERROR="Jeśli błąd jest związany z instalacją plików językowych TinyMCE, nie ma to wpływu na instalację języka. Niektóre pakiety językowe utworzone przed Joomla 3.2.0 mogą próbować zainstalować oddzielne pliki językowe TinyMCE. Ponieważ są one teraz zawarte w rdzeniu, nie trzeba ich już instalować." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Nie można utworzyć języka treści dla języka %s: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="W pliku konfiguracyjnym PHP wyłączono opcję allow_url_fopen. Aby korzystać z automatycznej aktualizacji, ta opcja musi być włączona." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Aktualizacja::Kolekcja: Nie można otworzyć %s." +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Aktualizacja::Kolekcja: Nie można przetworzyć %s." JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Aktualizacja: Nie można otworzyć witryny aktualizacji #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase::getInstance: Nie można się połączyć z bazą danych
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/pl-PL/langmetadata.xml b/installation/language/pl-PL/langmetadata.xml index d37f47805223c..a3db003186e42 100644 --- a/installation/language/pl-PL/langmetadata.xml +++ b/installation/language/pl-PL/langmetadata.xml @@ -1,8 +1,8 @@ Polish (Poland) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Projekt Joomla! (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/pt-BR/joomla.ini b/installation/language/pt-BR/joomla.ini index ca2faae845795..07a8a8f38a897 100644 --- a/installation/language/pt-BR/joomla.ini +++ b/installation/language/pt-BR/joomla.ini @@ -230,6 +230,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Falha ao copiar o arq JLIB_INSTALLER_INSTALL="Instalar" JLIB_INSTALLER_NOT_ERROR="Se o erro está relacionado com a instalação de arquivos de tradução do TinyMCE, não haverá qualquer efeito sobre a instalação do(s) idioma(s). Alguns pacotes de idioma criados antes do Joomla 3.2.0 podem tentar instalar arquivos de idioma TinyMCE separados.. Uma vez que eles estão agora incluídos no núcleo, eles já não precisam ser instalados." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Não foi possível criar o idioma de conteúdo para o idioma %s: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="A configuração do PHP allow_url_fopen está desativada. Essa configuração deve estar ativa para o atualizador funcionar." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: Não foi possível abrir %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: Não foi possível analisar %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Atualização: Não foi possível abrir a atualização de site #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Não foi possível conectar ao banco de dados
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/pt-BR/langmetadata.xml b/installation/language/pt-BR/langmetadata.xml index cc593840daf2e..ce606db179887 100644 --- a/installation/language/pt-BR/langmetadata.xml +++ b/installation/language/pt-BR/langmetadata.xml @@ -1,8 +1,8 @@ Português Brasil (pt-BR) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Projeto Joomla! (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/pt-PT/joomla.ini b/installation/language/pt-PT/joomla.ini index 1e7447b53696b..0604f8f8c0251 100644 --- a/installation/language/pt-PT/joomla.ini +++ b/installation/language/pt-PT/joomla.ini @@ -90,11 +90,11 @@ INSTL_DATABASE_VALIDATION_ERROR="Verifique as suas credenciais da base de dados, INSTL_CONNECT_DB="Ligação à base de dados" INSTL_INSTALL_JOOMLA="Instalar o Joomla" ; Site View -INSTL_ADMIN_EMAIL_DESC="Digite o endereço de email do Super utilizador do sítio." -INSTL_ADMIN_PASSWORD_DESC="Defina a senha da sua conta de Super utilizador." +INSTL_ADMIN_EMAIL_DESC="Digite o endereço de email do superutilizador do sítio." +INSTL_ADMIN_PASSWORD_DESC="Defina a senha da sua conta de supe utilizador." INSTL_ADMIN_PASSWORD_LENGTH="Introduza pelo menos 12 caracteres." -INSTL_ADMIN_USER_DESC="Digite o nome real para o seu Super utilizador." -INSTL_ADMIN_USERNAME_DESC="Defina o nome de utilizador para a sua conta de Super utilizador." +INSTL_ADMIN_USER_DESC="Digite o nome real para o seu superutilizador." +INSTL_ADMIN_USERNAME_DESC="Defina o nome de utilizador para a sua conta de superutilizador." INSTL_LOGIN_DATA="Dados de início de sessão" INSTL_SETUP_SITE_NAME="Configurar nome do sítio" INSTL_SITE="Configuração principal" @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Falha ao copiar o fic JLIB_INSTALLER_INSTALL="Instalar" JLIB_INSTALLER_NOT_ERROR="Se o erro estiver relacionado com a instalação dos ficheiros de idioma do TinyMCE não terá qualquer efeito na instalação do(s) idioma(s). Alguns pacotes de Idiomas, criados em versões anteriores a Joomla! 3.2.0, poderão tentar instalar separadamente ficheiros de idioma do TinyMCE. Como estes ficheiros estão agora incluídos no núcleo Joomla, não é necessária a sua instalação." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Não foi possível criar um idioma de conteúdo para o idioma %s: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="A definição PHP allow_url_fopen está desativada. Essa definição deve ser ativada para o atualizador poder funcionar." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Atualização: :Collection: Não foi possível abrir %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Atualização: :Collection: Não foi possível compilar %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Atualização - Não foi possível abrir o sítio de atualização #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: não foi possível ligar à base de dados
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/pt-PT/langmetadata.xml b/installation/language/pt-PT/langmetadata.xml index aa6e8c0033cc7..cc2d04c058402 100644 --- a/installation/language/pt-PT/langmetadata.xml +++ b/installation/language/pt-PT/langmetadata.xml @@ -1,8 +1,8 @@ Português (Portugal) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Comunidade JoomlaPortugal (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ro-RO/joomla.ini b/installation/language/ro-RO/joomla.ini index e12626e8765f0..cdc2224206e49 100644 --- a/installation/language/ro-RO/joomla.ini +++ b/installation/language/ro-RO/joomla.ini @@ -105,6 +105,8 @@ INSTL_COMPLETE_ERROR_FOLDER_DELETE="Directorul \"%s\" nu a putut fi șters. Vă INSTL_COMPLETE_REMOVE_FOLDER="Șterge directorul \"%s\"" INSTL_COMPLETE_CONGRAT="Felicitări!" INSTL_COMPLETE_TITLE="Felicitări! Site-ul dvs Joomla este gata." +INSTL_COMPLETE_SITE_BTN="Deschideți site-ul" +INSTL_COMPLETE_ADMIN_BTN="Deschideți zona de administrare" INSTL_COMPLETE_FINAL="Instalarea este completă" INSTL_COMPLETE_FINAL_DESC="Instalarea dvs. Joomla este acum completă și gata pentru utilizare." INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Instalați limbi suplimentare" @@ -231,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: A eșuat copierea fi JLIB_INSTALLER_INSTALL="Instalare" JLIB_INSTALLER_NOT_ERROR="Dacă eroarea este legată de instalarea fișierelor de limbă TinyMCE nu are nici un efect asupra instalării limbii (limbilor). Unele pachete de limbă create înainte de Joomla! 3.2.0 pot încerca instalarea separată de fișiere de limbă pentru TinyMCE. Deoarece acum sunt incluse în nucleu acestea nu mai sunt necesare." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Nu se poate crea limba de conținut aferentă limbii %s: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Setarea PHP allow_url_fopen este dezactivată. Aceasta trebuie activată pentru ca actualizatorul să funcționeze." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: Nu s-au putut deschide %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: Nu s-a putut parcurge %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Actualizare: Nu s-a putut deschide site-ul de actualizări #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Nu s-a reușit conectarea la baza de date
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/ro-RO/langmetadata.xml b/installation/language/ro-RO/langmetadata.xml index 5e8e17a29f258..5cfe8d2a1d512 100644 --- a/installation/language/ro-RO/langmetadata.xml +++ b/installation/language/ro-RO/langmetadata.xml @@ -1,8 +1,8 @@ Română (România) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Horia Negura - Quanta (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ru-RU/joomla.ini b/installation/language/ru-RU/joomla.ini index ed3f11c9720aa..6ac83f85206cb 100644 --- a/installation/language/ru-RU/joomla.ini +++ b/installation/language/ru-RU/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Не удалось JLIB_INSTALLER_INSTALL="Установка" JLIB_INSTALLER_NOT_ERROR="Если ошибка связана с установкой языковых файлов TinyMCE, она не влияет на установку языковых пакетов. Некоторые пакеты, созданные до версии Joomla 3.2.0, могут пытаться установить отдельные языковые файлы TinyMCE. Поскольку в настоящее время они включены в ядро, их больше не нужно устанавливать отдельно." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Не удалось создать язык контента для языка %s: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Для использования функции обновления необходимо в конфигурации PHP включить директиву allow_url_fopen." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: Не удалось открыть %s." +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: Не удалось обработать %s." JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Не удалось открыть сервер обновлений \"%s\" (ID %d): %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Не удалось подключиться к базе данных.
    joomla.library: %1$s - %2$s" ; Strings for the language debugger diff --git a/installation/language/ru-RU/langmetadata.xml b/installation/language/ru-RU/langmetadata.xml index 45aacafc140d8..a7b539bddeeee 100644 --- a/installation/language/ru-RU/langmetadata.xml +++ b/installation/language/ru-RU/langmetadata.xml @@ -1,8 +1,8 @@ Russian (Russia) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Russian Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/sk-SK/joomla.ini b/installation/language/sk-SK/joomla.ini index 1ae3a846e8f27..9083bc2c0b042 100644 --- a/installation/language/sk-SK/joomla.ini +++ b/installation/language/sk-SK/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Zlyhalo kopírovanie JLIB_INSTALLER_INSTALL="Inštalovať" JLIB_INSTALLER_NOT_ERROR="Ak je chyba spojená s inštaláciou jazykových súborov pre TinyMCE, netýka sa to inštalácií jazyka(ov). Niektoré jazykové balíčky vytvorené pre Joomla! 3.2.0 môžu skúšať inštaláciu oddelených TinyMCE jazykových súborov. Nakoľko tie sú v súčasnosti zahrnuté v základnom preklade, nie je potrebná ich nová inštalácia." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Nemožno vytvoriť jazyk obsahu pre jazyk %s: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Nastavenie PHP allow_url_fopen je vypnuté. Toto nastavenie musí byť zapnuté, aby aktualizácia fungovala." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Aktualizácia: :Collection: Nemôžem otvoriť %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Aktualizácia: :Collection: Nemôžem parsovať %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Aktualizácia: Nemôžem otvoriť aktualizačný web #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Nemôžem sa pripojiť na databázu
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/sk-SK/langmetadata.xml b/installation/language/sk-SK/langmetadata.xml index 7e115e1048de6..571d19e3fdb9b 100644 --- a/installation/language/sk-SK/langmetadata.xml +++ b/installation/language/sk-SK/langmetadata.xml @@ -1,8 +1,8 @@ Slovak (Slovakia) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Slovak translation team : Peter Michnica (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/sl-SI/joomla.ini b/installation/language/sl-SI/joomla.ini index 510486c5fd3f3..c15dd39cda2d7 100644 --- a/installation/language/sl-SI/joomla.ini +++ b/installation/language/sl-SI/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Napaka kopiranja dato JLIB_INSTALLER_INSTALL="Namesti" JLIB_INSTALLER_NOT_ERROR="Če se napaka povezana z namestitvijo TinyMCE jezikovnih datotek nima vpliva na namestitev jezika (-ov). Nekatere jezikovne pakete, ustvarjeni pred Joomla 3.2.0 lahko poskusite namestiti ločene TinyMCE jezikovnih datotek. Ker so ti zdaj vključene v jedru jih ni več treba namestiti." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Ni mogoče ustvariti jezik vsebine za %s jezik: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP nastavitve morajo omogočati FTP dostop. Te nastavitve morajo biti omogočene, da bodo posodobitve delovale." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Posodobitev: :Collection: Ni mogoče odpreti %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Posodobitev: :Collection: Ni mogoče razčleniti %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Posodobitev: Ne morem odpreti strani posodobitve #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Ne morem se povezati z bazo podatkov
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/sl-SI/langmetadata.xml b/installation/language/sl-SI/langmetadata.xml index 1649f18d0e7b8..360c533aeaaaf 100644 --- a/installation/language/sl-SI/langmetadata.xml +++ b/installation/language/sl-SI/langmetadata.xml @@ -1,8 +1,8 @@ Slovenščina (Slovenija) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Slovenska prevajalska ekipa (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/sr-YU/joomla.ini b/installation/language/sr-YU/joomla.ini new file mode 100644 index 0000000000000..9bd8a367863c7 --- /dev/null +++ b/installation/language/sr-YU/joomla.ini @@ -0,0 +1,279 @@ +; Joomla! Project +; (C) 2005 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 + +; Fatal error page +; These will be processed by the JavaScript Build +BUILD_FATAL_HEADER="Žao nam je, došlo je do problema i ne možemo se oporaviti." +BUILD_FATAL_LANGUAGE="Srpski Latinica SRB" +BUILD_FATAL_TEXT="Server je vratio grešku \"{{statusCode_statusText}}\"" +BUILD_FATAL_URL_TEXT="Kako da rešim ovo" +; These will be processed by the JavaScript Build +BUILD_INCOMPLETE_HEADER="Podešavanje okruženja je nepotpuno" +BUILD_INCOMPLETE_LANGUAGE="Srpski SRB" +BUILD_INCOMPLETE_TEXT="Izgleda da pokušavate da pokrenete Joomla! iz našeg git skladišta. Da biste to uradili potrebno je da završite nekoliko dodatnih koraka." +BUILD_INCOMPLETE_URL_TEXT="Više detalja" +; These will be processed by the JavaScript Build +BUILD_NOXML_HEADER="Žao nam je, PHP-u nedostaje vitalna biblioteka" +BUILD_NOXML_LANGUAGE="Srpski Latinica SRB" +BUILD_NOXML_TEXT="Vaš host mora da koristi PHP sa podrškom za XML biblioteke da bi pokrenuo ovu verziju Joomla!" +BUILD_NOXML_URL_TEXT="Kako da rešim ovo" +; These will be processed by the JavaScript Build +BUILD_MIN_PHP_ERROR_HEADER="Žao nam je vaša PHP verzija nije podržana." +BUILD_MIN_PHP_ERROR_LANGUAGE="Srpski Latinica SRB" +BUILD_MIN_PHP_ERROR_TEXT="Vaš host mora da koristi PHP verziju {{phpversion}} ili noviju da bi ova vezija Joomla! radila." +BUILD_MIN_PHP_ERROR_URL_TEXT="Kako da rešim ovo" +; Main Config +INSTL_SELECT_INSTALL_LANG="Izaberite jezik instalacije" +INSTL_SELECT_LANGUAGE_TITLE="Odaberite jezik" +INSTL_SETUP_LOGIN_DATA="Podesite podatke za prijavu" +INSTL_WARNJAVASCRIPT="Upozorenje! JavaScript mora biti omogućen zarad inspravne instalacije Joomla-e." +INSTL_WARNJSON="Za Joomla! instalaciju PHP mora imati omogućenu JSON ekstenziju" +; Precheck view +INSTL_DATABASE_SUPPORT="Podrška baze:" +INSTL_JSON_SUPPORT_AVAILABLE="JSON podrška" +INSTL_MB_LANGUAGE_IS_DEFAULT="MB jezik je podrazumevan" +INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload isključen" +INSTL_NOTICE_DATABASE_SUPPORT="Nepodržana baza je detektovana." +INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Za Joomla! instalaciju PHP mora imati omogućenu JSON ekstenziju" +INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring jezik nije neutralan. Ovo možete namestiti lokalno unošenjem php_value mbstring.language neutral u .htaccess." +INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring function overload je podešen. Ovo može biti isključeno lokalno unošenjem php_value mbstring.func_overload 0 u .htaccess." +INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Potrebne php funkcije parse_ini_file i parse_ini_string su isključene na serveru." +INSTL_NOTICE_XML_SUPPORT="XML podrška nije dostupna. Treba je omogućiti u php-u, Ubuntu korisnici treba da instaliraju pokretanjem komande sudo apt-get install php-xml prateći restartovanje servera." +INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib kompresija nije podešena. Može se uključiti setovanjem zlib.output_compression = On u php.ini datoteci." +INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser podrška" +INSTL_PRECHECK_ACTUAL="Trenutno" +INSTL_PRECHECK_DESC="Ukoliko neka od ovih stavki nije podržana, morate ih ispraviti.
    Joomla se ne može instalirati dok sve stavke nisu podržane." +INSTL_PRECHECK_DIRECTIVE="Direktiva" +INSTL_PRECHECK_RECOMMENDED="Preporučeno" +INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Ove postavke su preporučene za PHP, kako bi Joomla pravilno radila." +INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Preporučena podešavanja:" +INSTL_PRECHECK_TITLE="Preinstalaciona provera" +INSTL_XML_SUPPORT="XML podrška" +INSTL_ZLIB_COMPRESSION_SUPPORT="Podrška za Zlib kompresiju" +; Database view +INSTL_DATABASE="Konfiguracija baze podataka" +INSTL_DATABASE_ENCRYPTION_CA_LABEL="Putanja do CA datoteke" +INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Putanja do Certificate datoteke" +INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Podržana Cipher Suite (opciono)" +INSTL_DATABASE_ENCRYPTION_KEY_LABEL="Putanja do Private Key datoteke" +INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Enkripcija konekcije" +INSTL_DATABASE_ENCRYPTION_MODE_VALUE_NONE="Podrazumevano (serverski kontrolisano)" +INSTL_DATABASE_ENCRYPTION_MODE_VALUE_ONE_WAY="Jednostrana autentikacija" +INSTL_DATABASE_ENCRYPTION_MODE_VALUE_TWO_WAY="Dvostepena autentikacija" +INSTL_DATABASE_ENCRYPTION_MSG_CONN_NOT_ENCRYPT="Izabrana je kriptovana konekcija sa bazom. Veza je uspostavljena, ali nije kriptovana. Razlog je što možda server je podešen da vrati nekriptovani odgovor ukoliko parametri nisu dobro podešeni. Možete proveriti parametre enkripcije ili vratiti podešavanje \"Enkripcija konekcije \" nazad na \"Podrazumevano (server controlled)\"." +INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="Fajl koji ste uneli u \"%s\" ne postoji ili nije dostupan." +INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_EMPTY="Polje \"%s\" je prazno ili ima neodgovarajuću putanju." +INSTL_DATABASE_ENCRYPTION_MSG_LOCALHOST="Uneli ste \"localhost\" kao ime hosta. Enkriptovano konektovanje sa bazom možda neće raditi. Možete promeniti \"localhost\" u \"127.0.0.1\" ili \"::1\" ili unesite ime hosta, ili promenite \"Enkriptovanje konekcije\" nazad na \"Podrazumevano (server controlled)\"." +INSTL_DATABASE_ENCRYPTION_MSG_SRV_NOT_SUPPORTS="Server ne podržava kriptovanu vezu sa bazom. Možete uključiti TLS (takođe nazivan SSL) na vašem serveru, ili promeniti \"Enkriptovanje konekcije\" u \"Podrazumevano (server controlled)\"." +INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verifikuj sertifikat servera" +INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL upit nije uspeo." +INSTL_DATABASE_HOST_DESC="Unesite ime hosta, obično je \"localhost\" ili naziv koji vam je dat od hostinga." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Nismo mogli da kreiramo fajl. Ručno kreirajte fajl sa imenom \"%1$s\" i uploadujte ga u \"%2$s\" folder vašeg sajta. Nakon toga izaberite \"%3$s\" za nastavak." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Da biste potvridili da ste vlasnik sajta, molimo da obrišete fajla sa imenom \"%1$s\" koji je kreiran u \"%2$s\" direktorijumu Joomle. Nakon toga izaberite \"%3$s\" za nastavak." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Pokušavate da koristite bazu koja nije na lokalnom serveru. Iz bezbednostnih razloga, morate verifikovati vlasništvo nad hosting nalogom. Pročitajte dokumentaciju za više informacija." +INSTL_DATABASE_HOST_LABEL="Ime servera" +INSTL_DATABASE_NAME_DESC="Unesite ime baze." +INSTL_DATABASE_NAME_LABEL="Ime baze podataka" +INSTL_DATABASE_NAME_MSG_MYSQL="Neodgovarajuće ime baze. Ime ne sme sadržati karaktere: \ /" +INSTL_DATABASE_NAME_MSG_POSTGRES="Neispravno ime baze Ime mora započeti sa slovom i u nastavku mogu biti slova i brojevi." +INSTL_DATABASE_NO_SCHEMA="Ne postoji šema baze za ovaj tip baze." +INSTL_DATABASE_PASSWORD_DESC="Lozinka koju ste kreirali ili koju vam je dostavio vaš hosting." +INSTL_DATABASE_PREFIX_DESC="Unesite prefix tabela baze ili izaberite neki nasumičan." +INSTL_DATABASE_PREFIX_MSG="Prefiks tabela baze mora započeti slovom i nastaviti sa slovima i brojevima, a mora se završiti donjom crtom" +INSTL_DATABASE_RESPONSE_ERROR="Instalacija nije uspela." +INSTL_DATABASE_TYPE_DESC="Izaberi tip baze." +INSTL_DATABASE_USER_DESC="Ili korisničko ime koje ste kreirali ili korisničko ime dobijeno od strane hosting provajdera." +INSTL_DATABASE_VALIDATION_ERROR="Proverite podatke od baze, korisnička imena ili lozinke, tip, ime ili ime hosta. Ukoliko imate instaliran MySQL 8 pročitajte ovo wiki za više informacija." + +INSTL_CONNECT_DB="Podesi konekciju baze" +INSTL_INSTALL_JOOMLA="Instalirajte Joomla" +; Site View +INSTL_ADMIN_EMAIL_DESC="Unesite e-poštu adresu super korisnika sajta." +INSTL_ADMIN_PASSWORD_DESC="Unesite lozinku za vaš super korisnik nalog." +INSTL_ADMIN_PASSWORD_LENGTH="Unesite minimum 12 karaktera." +INSTL_ADMIN_USER_DESC="Unesite pravo ime super korisnika." +INSTL_ADMIN_USERNAME_DESC="Odaberite korisničko ime vašeg super korisničkog naloga." +INSTL_LOGIN_DATA="Podaci za pristup" +INSTL_SETUP_SITE_NAME="Unesite ime sajta" +INSTL_SITE="Osnovna konfiguracija" +INSTL_SITE_DEVMODE_LABEL="Primećen je mod za razvoj (development mode)" +INSTL_SITE_NAME_DESC="Unesite ime za vaš Joomla sajt." +; Complete view +INSTL_COMPLETE_ERROR_FOLDER_DELETE="Direktorijum \"%s\" se nije mogao obrisati automatski. Obrišite ga ručno." +INSTL_COMPLETE_REMOVE_FOLDER="Obrišite \"%s\" direktorijum" +INSTL_COMPLETE_CONGRAT="Čestitamo!" +INSTL_COMPLETE_TITLE="Čestitamo! Vaš Joomla sajt je spreman." +INSTL_COMPLETE_SITE_BTN="Otvori sajt" +INSTL_COMPLETE_ADMIN_BTN="Otvori administraciju" +INSTL_COMPLETE_FINAL="Instalacija je završena" +INSTL_COMPLETE_FINAL_DESC="Instalacija Joomla-e je završena i sajt je spreman za upotrebu." +INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Instaliraj dodatne jezike" +INSTL_REMOVE_INST_FOLDER="Da li ste sigurni da želite ta obrišete? Potvrdom će se obrisati \"%s\" direktorijum." +; Languages view +INSTL_LANGUAGES="Instaliraj dodatne jezike" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Jezik" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="Odaberite jezik" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Jezička oznaka" +INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Verzija" +INSTL_LANGUAGES_DESC="Joomla je dostupna na nekoliko jezika. Izaberite željeni jezik klikom na kvadrat i instaliraj jezik klikom na dugme.
    Napomena: Ova operacija može trajati i 10 sekundi da se reuzme jezička datoteka i instalira. Da bi izbegli prekid veze, nemojte izabrati više od 3 jezika odjednom." +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Potrebno je oko 10 sekudi za svaku instalaciju jezika.
    Molimo vas da sačekate dok se preuzme jezička datoteka i instalira ..." +INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Nije izabran ni jedan jezik za instalaciju." +INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! ne može da se prijavi na server sa jezicima. Završite instalacioni proces." +INSTL_LANGUAGES_WARNING_NO_INTERNET2="Napomena: Drugi jezici se mogu i kasnije instalirati iz administrativnog dela." +INSTL_LANGUAGES_WARNING_BACK_BUTTON="Povratak na poslednji instalacioni korak" +; Default language view +INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Podrazumevani administratorski jezik" +INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla nije mogla da postavi podrazumevani jezik. Engleski će se koristiti kao podrazumevani jezik administratora." +INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla je postavila %s kao vaš podrazumevani administratorski jezik." +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Odaberi +Izaberi" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Jezik" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Oznaka" +INSTL_DEFAULTLANGUAGE_COULD_NOT_DOWNLOAD_PACKAGE="Joomla nije uspela da preuzme ili otpakuje jezički paket sa: %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla nije uspela da instalira %s jezik." +INSTL_DEFAULTLANGUAGE_DESC="Joomla je instalirala sledeće jezike. Izaberite podrazumevani jezik za Joomla Administrator." +INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla je instalirala sledeće jezike. Izaberite podrazumevani jezik za vaš sajt Jezik za posetioce sajta." +INSTL_DEFAULTLANGUAGE_FRONTEND="Podrazumevani jezik sajta" +INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla nije mogla da postavi podrazumevani jezik. Engleski je postavljen kao podrazumevani jezik za korisnike." +INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla je postavila %s kao vaš podrazumevani jezik sajta." +INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Postavi podrazumevani jezik" +INSTL_DEFAULTLANGUAGE_TRY_LATER="Možete postaviti jezik i kasnije iz administrativnog dela." + +INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Srpski Latinica (SRB Latinica)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español +; Database Model +INSTL_DATABASE_COULD_NOT_CONNECT="Nije moguće konektovati se na bazu. Poruka o grešci: %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Instaler se nije mogao povezati sa određenom bazu podataka i nije mogao da kreira bazu podataka. Molimo vas da proverite podešavanja i ako je potrebno ručno napravite bazu podataka." +INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Nije moguće osvežavanje manifest keša za ekstenziju: %s" +INSTL_DATABASE_ERROR_BACKINGUP="Greška prilikom kopiranja baze." +INSTL_DATABASE_ERROR_CREATE="Greška prilikom kreiranja baze %s.
    Korisnik nema potrebne privilegije za kreiranje baze. Baza se mora napraviti ručno, pre instalacije Joomla-e" +INSTL_DATABASE_ERROR_DELETE="Pojavile su se greške prilikom brisanja baze." +INSTL_DATABASE_ERROR_READING_SQL_FILE="Neuspešno čitanje SQL fajla." +INSTL_DATABASE_FIELD_VALUE_BACKUP="Rezervna kopija" +INSTL_DATABASE_FIELD_VALUE_REMOVE="Obriši" +INSTL_DATABASE_FILE_DOES_NOT_EXIST="Datoteka %s ne postoji." +INSTL_DATABASE_FIX_LOWERCASE="Prefiks tabela Postgresql baze mora biti napisan malim slovima." +INSTL_DATABASE_FIX_TOO_LONG="Prefiks MySQL tabele mora imati najviše 15 karaktera." +INSTL_DATABASE_INVALID_DB_DETAILS="Sadržaj baze je pogrešan i/ili prazan." +INSTL_DATABASE_INVALID_MARIADB_VERSION="Potrebna vam je MariaDB %1$s ili novija. Vaša verzije je: %2$s" +INSTL_DATABASE_INVALID_MYSQL_VERSION="Potrebna vam je MySQL%1$s ili novija za nastavak instalacije. Vaša verzije je: %2$s" +INSTL_DATABASE_INVALID_MYSQLI_VERSION="Potrebna vam je MySQL%1$s ili novija za nastavak instalacije. Vaša verzije je: %2$s" +INSTL_DATABASE_INVALID_PGSQL_VERSION="Potreban vam je PostgreSQL %1$s ili noviji za nastavak instalacije. Vaša verzije je: %2$s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Potreban vam je PostgreSQL %1$s ili noviji za nastavak instalacije. Vaša verzije je: %2$s" +INSTL_DATABASE_INVALID_TYPE="Molimo da izaberete tip baze." +INSTL_DATABASE_NAME_INVALID_CHAR="Nijedan MySQL identifier ne može da sadrži NUL ASCII(0x00)." +INSTL_DATABASE_NAME_INVALID_SPACES="MySQL imebaze i tabele ne može početi ili završiti se praznim mestom (spaces)." +INSTL_DATABASE_NAME_TOO_LONG="Ime MySQL baze podataka mora imati najviše 64 karaktera." +; Controllers +INSTL_COOKIES_NOT_ENABLED="Kolačići nisu dozvoljeni u vašem brauzeru. Nećete moći instalirati aplikaciju ukoliko je ta opcija isključena. Takođe, moguće je da imate problem na serverskoj strani session.save_path. Ako je to slučaj, konsultujte se sa vašim hosting provajderom, ako to ne možete sami da rešite." +INSTL_HEADER_ERROR="Greška" +; Helpers +INSTL_PAGE_TITLE="Joomla instaler" +; Configuration model +INSTL_ERROR_CONNECT_DB="Neuspešno konektovanje na bazu. Povratni broj greške je: %d." +INSTL_STD_OFFLINE_MSG="Sajt je trenutno nedostupan.
    Proverite uskoro." +; Others +INSTL_CONFPROBLEM="Vaša datoteka ili direktorijum nisu podešeni za upis ili je došlo do problema u pravljenju datoteke sa podešavanjima. Treba da prepišete sledeći kod ručno. Kliknite na prostor za tekst da obeležite ceo tekst koda i onda Kopiraj i Dodaj u novu datoteku sa imenom configuration.php i iskopirajte to u osnovni direktorijum vašeg sajta." +INSTL_DISPLAY_ERRORS="Prikaži greške" +INSTL_ERROR="Greška" +INSTL_ERROR_DB="Došlo je do greške u popunjavanju baze: %s." +INSTL_ERROR_INITIALISE_SCHEMA="Ne može se pokrenuti šema baze." +INSTL_EXTENSION_AVAILABLE="%s dostupno" +INSTL_FILE_UPLOADS="Dodavanje datoteke" +INSTL_GNU_GPL_LICENSE="GNU Opšta Javna Licenca" +INSTL_HELP_LINK="Pomoć pri instalaciji Joomla-e" +INSTL_NOTICE_NEEDSTOBEWRITABLE="Možete nastaviti instalaciju kada popravite dozvole." +INSTL_OUTPUT_BUFFERING="Izlazna međumemorija" +INSTL_PHP_VERSION="PHP verzija" +INSTL_PHP_VERSION_NEWER="PHP verzija >= %s" +INSTL_PROCESS_BUSY="Proces je u toku. Molim vas sačekajte..." +INSTL_SESSION_AUTO_START="Automatsko pokretanje sesija" +INSTL_WRITABLE="Nedovoljan nivo dozvola za kreiranje %s." +INSTL_ZIP_SUPPORT_AVAILABLE="Podrška za izvorni ZIP" +; Global strings +JADMINISTRATOR="Administrator" +JEMAIL="E-pošta" +JERROR="Greška" +JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="Došlo je do greške prilikom obrade vašeg zahteva." +JGLOBAL_ISFREESOFTWARE="%s je slobodan softver pod %s." +JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Jezički paket ne odgovara verziji Joomla-e. Neki tekstovi će biti prikazani na Engleskom." +JGLOBAL_SELECT_AN_OPTION="Odaberi opciju" +JGLOBAL_SELECT_NO_RESULTS_MATCH="Nema rezultata" +JGLOBAL_SELECT_SOME_OPTIONS="Odaberi neku opciju" +JHIDEPASSWORD="Sakrij lozinku" +JINVALID_TOKEN="Najnoviji zahtev je odbijen, jer sadrži nevažeći sigurnosni token. Molim vas da osvežite stranicu i pokušate ponovo." +JINVALID_TOKEN_NOTICE="Bezbednosni token ne odgovara. Zahtev je odbijen iz bezbednosnih razloga. Pokušajte ponovo." +JNEXT="Sledeći" +JNO="Ne" +JNOTICE="Obaveštenje" +JOFF="Isključeno" +JON="Uklјučeno" +JPREVIOUS="Prethodni" +JSHOWPASSWORD="Prikaži lozinku" +JSITE="Sajt" +JSKIP="Preskoči" +JUSERNAME="Korisničko ime" +JYES="Da" +; Framework strings necessary when no lang pack is available +JLIB_DATABASE_ERROR_CONNECT_MYSQL="Nemoguća konekcija na MySQL." +JLIB_DATABASE_ERROR_DATABASE="Greška u bazi." +JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Nije moguća učitati drajver baze: %s." +JLIB_DATABASE_ERROR_VALID_MAIL="Unesite validnu adresu e-pošte." +JLIB_ENVIRONMENT_SESSION_EXPIRED="Vaša sesija je istekla, molimo vas učitajte ponovo stranu." +JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: putanja nije direktorijum. Putanja: %2$s" +JLIB_FORM_FIELD_INVALID="Pogrešno polje: " +JLIB_FORM_VALIDATE_FIELD_INVALID="Neispravno polje: %s" +JLIB_FORM_VALIDATE_FIELD_REQUIRED="Traženo polje: %s" +JLIB_INSTALLER_ABORT="Prekidanje instalacije jezika: %s" +JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Ekstenzija %1$s: Nije moguće kreirati direktorijum: %2$s" +JLIB_INSTALLER_ABORT_NOINSTALLPATH="Instalaciona putanja ne postoji." +JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Paket %1$s: došlo je do greške prilikom instaliranja ekstenzije: %2$s." +JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="Paket %s: Nema datoteka za instalaciju!" +JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: nije uspelo kopiranje datoteke %1$s u %2$s." +JLIB_INSTALLER_INSTALL="Instalacija" +JLIB_INSTALLER_NOT_ERROR="Ukoliko je greška povezana sa TinyMCE jezičkom datotekom, to neće uticati na instalaciju jezika. Neki jezički fajlovi napravljeni pre verije Joomla 3.2.0 mogu pokušati da instaliraju zaseban TinyMCE jezički fajl. Sada su uključeni u glavni paket i nisu više potrebni." +JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Nije moguće kreirati sadržaj %s za jezik: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Postavka PHP allow_url_fopen je onemogućena. Ova postavka mora biti omogućena da bi program za ažuriranje radio." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Ažuriranje: :Collection: nije uspelo otvaranje %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Ažuriranje: :Collection: nije uspelo parsiranje %s" +JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Ažuriranje: Ažuriranje sajta nije uspelo #%d \"%s\", URL: %s." +JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Nije se konektovala na bazu
    joomla.library: %1$s - %2$s." +; Strings for the language debugger +JDEBUG_LANGUAGE_FILES_IN_ERROR="Raščlanjivanje grešaka u datotekama jezika" +JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Neprevedene fraze" +JNONE="Ništa" +; Necessary for errors +ADMIN_EMAIL="Administratorska e-pošta" +ADMIN_PASSWORD="Administratorska lozinka" +SITE_NAME="Ime sajta" +; Database types (allows for a more descriptive label than the internal name) +MYSQL="MySQL (PDO)" +MYSQLI="MySQLi" +ORACLE="Oracle" +PGSQL="PostgreSQL (PDO)" +POSTGRESQL="PostgreSQL" +SQLITE="SQLite" +; Javascript message titles +ERROR="Greška" +MESSAGE="Poruka" +NOTICE="Obaveštenje" +WARNING="Upozorenje" +; Javascript ajax error messages +JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Prekid konekcije u toku preuzimanja JSON podataka." +JLIB_JS_AJAX_ERROR_NO_CONTENT="Nema povratnih podataka." +JLIB_JS_AJAX_ERROR_OTHER="Greška pri preuzimanju JSON podataka: HTTP %d status kod." +JLIB_JS_AJAX_ERROR_PARSE="Greška pri parsiranju JSON podataka:
    %s" +JLIB_JS_AJAX_ERROR_TIMEOUT="Isteklo je vreme za preuzimanje JSON podataka." +; Field password messages +JFIELD_PASSWORD_INDICATE_COMPLETE="Lozinka je prihvaćena" +JFIELD_PASSWORD_INDICATE_INCOMPLETE="Lozinka nije prihvatljiva." +JFIELD_PASSWORD_SPACES_IN_PASSWORD="Lozinka ne sme da sadrži razmake (prazna mesta)." +JFIELD_PASSWORD_TOO_LONG="Lozinka je predugačka. Lozinka mora imati manje od 100 karaktera." +JFIELD_PASSWORD_TOO_SHORT_N="Uneta lozinka je prekratka. lozinke moraju imati najmanje %d karaktera." +; Javascript Form Validation Messages +JLIB_FORM_CONTAINS_INVALID_FIELDS="Formular se ne može psolati, jer ne sadrži sve podatke.
    Ispravite označena polja i pokušajte ponovo." +JLIB_FORM_FIELD_INVALID_VALUE="Vrednost nije ispravna." +JLIB_FORM_FIELD_REQUIRED_CHECK="Barem jedna opcija se mora izabrati." +JLIB_FORM_FIELD_REQUIRED_VALUE="Popunite ovo polje." + diff --git a/installation/language/sr-YU/langmetadata.xml b/installation/language/sr-YU/langmetadata.xml new file mode 100644 index 0000000000000..1743803cd6c84 --- /dev/null +++ b/installation/language/sr-YU/langmetadata.xml @@ -0,0 +1,19 @@ + + + Srpski Latinica (Republika Srbija) + 4.1.4 + May 2022 + Goran Nešić - UIX Web Design & Saša Matić Bardak.RS + (C) 2005 Open Source Matters, Inc. + GNU General Public License version 2 or later; see LICENSE.txt + + joomla.ini + + + Srpski Latinica (Republika Srbija) + Srpski Latinica (Republika Srbija) + sr-YU + 0 + + + diff --git a/installation/language/sv-SE/joomla.ini b/installation/language/sv-SE/joomla.ini index 169e22c19a6ce..d86909dd369b2 100644 --- a/installation/language/sv-SE/joomla.ini +++ b/installation/language/sv-SE/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Kan inte kopiera file JLIB_INSTALLER_INSTALL="Installera" JLIB_INSTALLER_NOT_ERROR="Om felmeddelanden är relaterade till installation av språkfiler för TinyMCE, så har de ingen påverkan på installation av språken. Vissa språkpaket skapade före Joomla! 3.2.0 kan försöka att installera separata TinyMCE språkfiler. Dessa ingår nu i grundpaketet och skall inte längre installeras." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Det går inte att skapa ett innehållsspråk för %s språk: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP-inställningen allow_url_fopen är avaktiverad. Detta måste vara aktiverat för att uppdateringen ska fungera." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Uppdatera: :Collection: Kunde inte öppna %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Uppdatera: :Collection: Kunde inte parsa %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Uppdatera: Kan inte öppna uppdaterings-webbplatsen #%d \"%s\", URL: %s" JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Kan inte ansluta till databasen
    joomla.library: %1$s - %2$s" ; Strings for the language debugger diff --git a/installation/language/sv-SE/langmetadata.xml b/installation/language/sv-SE/langmetadata.xml index 5026e0d7e86e0..d6d51feb39bde 100644 --- a/installation/language/sv-SE/langmetadata.xml +++ b/installation/language/sv-SE/langmetadata.xml @@ -1,8 +1,8 @@ Swedish (Sweden) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Swedish Translation Team - SvenskJoomla (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ta-IN/joomla.ini b/installation/language/ta-IN/joomla.ini index c6ae0c5520018..1844e075ab379 100644 --- a/installation/language/ta-IN/joomla.ini +++ b/installation/language/ta-IN/joomla.ini @@ -26,7 +26,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Joomla-வின் இந்தப் பதிப் BUILD_MIN_PHP_ERROR_URL_TEXT="இதனைத் தீர்க்க எனக்கு உதவுக" ; Main Config INSTL_SELECT_INSTALL_LANG="நிறுவல் மொழித் தேர்வு" -INSTL_SELECT_LANGUAGE_TITLE="மொழியை தேர்வுசெய்யவும்" +INSTL_SELECT_LANGUAGE_TITLE="மொழியைத் தேர்வுசெய்யவும்" INSTL_SETUP_LOGIN_DATA="உள்நுழைவு தரவு அமைத்தல்" INSTL_WARNJAVASCRIPT="எச்சரிக்கை! Joomla-வை சரியாக நிறுவுவதற்கு JavaScript கட்டாயம் இயலுமைப்படுத்தப்பட வேண்டும்." INSTL_WARNJSON="Joomla-வை நிறுவுவதற்கு, தங்கள் PHP நிறுவலில் JSON ஆனது இயலுமைப்படுத்தப்பட்டிருக்க வேண்டும்!" @@ -40,14 +40,14 @@ INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Joomla-வை நிறுவுவதற INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring language நடு நிலையாக (neutral) அமைக்கப்படவில்லை. இதனைத் தங்கள் தளத்தில் php_value mbstring.language neutral என்ற சொற்றொடரைத் தங்கள் .htaccess கோப்பில் எழுதுவதின் மூலம் உள்ளகத்தில் அமைக்க (locally set) முடியும்." INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring function overload அமைக்கப்பட்டுள்ளது. இதனைத் தங்கள் தளத்தில் php_value mbstring.func_overload 0 என்ற சொற்றொடரைத் தங்கள் .htaccess கோப்பில் எழுதுவதின் மூலம் உள்ளகத்தில் நிறுத்த முடியும் (turned off locally)." INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="தங்கள் சேவையகத்தில், தேவையான php செயற்பாடுகள் parse_ini_file மற்றும் parse_ini_string ஆகியவை முடக்கப்பட்டுள்ளன." -INSTL_NOTICE_XML_SUPPORT="XML Support இல்லை. இதனை இயல்புநிலையாக php-இல் இயலுமைப்படுத்தப்பட வேண்டும். ஆனால், Ubuntu பயனாளர்கள் இதனை sudo apt-get install php-xml என்ற குறியீட்டை செயற்படுத்தி, அதன் பின் சேவையகத்தை மறுதொடக்கம் செய்து நிறுவ வேண்டியிருக்கலாம்." +INSTL_NOTICE_XML_SUPPORT="XML Support இல்லை. இதனை இயல்புநிலையாக php-இல் இயலுமைப்படுத்தப்பட வேண்டும். ஆனால், Ubuntu பயனாளர்கள் இதனை sudo apt-get install php-xml என்ற குறியீட்டைச் செயற்படுத்தி, அதன் பின் சேவையகத்தை மறுதொடக்கம் செய்து நிறுவ வேண்டியிருக்கலாம்." INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib compression அமைக்கப்படவில்லை. இதனைத் தங்கள் தளத்தில் zlib.output_compression = On என்ற சொற்றொடரைத் தங்கள் php.ini கோப்பில் எழுதுவதின் மூலம் அமைக்க (locally set) முடியும்." INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Support" INSTL_PRECHECK_ACTUAL="இருப்பது" INSTL_PRECHECK_DESC="இந்த உருப்படிகளில் எவற்றிற்கேனும் ஆதரவு இல்லையெனில், தயவுசெய்து பிழைகளை நீக்கத் தகுந்த நடவடிக்கைகளை மேற்கொள்ளவும்.
    இந்தத் தேவைகள் தங்கள் அமைவில் பூர்த்தியாகும் வரை தாங்கள் Joomla-வை நிறுவ முடியாது." INSTL_PRECHECK_DIRECTIVE="அமைப்பு" INSTL_PRECHECK_RECOMMENDED="பரிந்துரைப்பது" -INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="இந்த அமைப்புகள் (Settings) PHP-க்கு Joomla உடன் முழுமையாக பொருந்தக்கூடியவை (Compatibility) என உறுதிப்படுத்துவதற்காக பரிந்துரைக்கப்பட்ட (Recommended) அமைப்புகள் ஆகும்." +INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="இந்த அமைப்புகள் (Settings) PHP-க்கு Joomla உடன் முழுமையாகப் பொருந்தக்கூடியவை (Compatibility) என உறுதிப்படுத்துவதற்காகப் பரிந்துரைக்கப்பட்ட (Recommended) அமைப்புகள் ஆகும்." INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="பரிந்துரைக்கப்படும் அமைப்புகள்:" INSTL_PRECHECK_TITLE="முன்-நிறுவல் சரிபார்ப்பு" INSTL_XML_SUPPORT="XML Support" @@ -70,20 +70,20 @@ INSTL_DATABASE_ENCRYPTION_MSG_SRV_NOT_SUPPORTS="தரவுத்தள சே INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="சேவையக சான்றிதழ் உறுதிப்படுத்துக" INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL தரவுத்தள வினவல் (query) தோல்வியுற்றது." INSTL_DATABASE_HOST_DESC="புரவலர்-கணினிப் பெயரை (Host name) நிரப்பவும்; இது வழக்கமாக \"localhost\" அல்லது தங்கள் சேவை வழங்குபவரால் (Host service provider) கொடுக்கப்பட்ட ஒரு பெயர் ஆகும்." -INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="எங்களால் கோப்பை உருவாக்க முடியவில்லை. தயவுசெய்து \"%1$s\" என்ற பெயருடைய ஒரு கோப்பை கைமுறையாக உருவாக்கி அதனை தங்கள் Joomla தளத்தில் உள்ள \"%2$s\" என்ற பெயருடைய கோப்பகத்தில் பதிவேற்றவும். பின்னர், தொடர, \"%3$s\"-ஐ தேர்வுசெய்யவும்." -INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="தாங்கள் இந்த இணையதளத்துக்கான (website) உரிமையாளர் என்பதனை உறுதிசெய்ய தங்கள் Joomla தளத்தில் உள்ள \"%2$s\" என்ற பெயருடைய கோப்பகத்தில் நாங்கள் உருவாக்கியுள்ள \"%1$s\" என்ற பெயருடைய கோப்பை தயவுசெய்து நீக்கவும். பின்னர், தொடர, \"%3$s\"-ஐ தேர்வுசெய்யவும்." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="எங்களால் கோப்பை உருவாக்க முடியவில்லை. தயவுசெய்து \"%1$s\" என்ற பெயருடைய ஒரு கோப்பை கைமுறையாக உருவாக்கி அதனைத் தங்கள் Joomla தளத்தில் உள்ள \"%2$s\" என்ற பெயருடைய கோப்பகத்தில் பதிவேற்றவும். பின்னர், தொடர, \"%3$s\"-ஐ தேர்வுசெய்யவும்." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="தாங்கள் இந்த இணையதளத்துக்கான (website) உரிமையாளர் என்பதனை உறுதிசெய்யத் தங்கள் Joomla தளத்தில் உள்ள \"%2$s\" என்ற பெயருடைய கோப்பகத்தில் நாங்கள் உருவாக்கியுள்ள \"%1$s\" என்ற பெயருடைய கோப்பை தயவுசெய்து நீக்கவும். பின்னர், தொடர, \"%3$s\"-ஐ தேர்வுசெய்யவும்." INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="தாங்கள் உள்ளக (local) சேவையகத்தில் (server) அல்லாத வேறு ஒரு தரவுத்தளப் புரவலர்-கணினியைப் (database host) பயன்படுத்த முயற்சிக்கிறீர்கள். பாதுகாப்புக் காரணங்களுக்காக, பயன்படுத்தப்படும் இணையசேவையின் சேவைக்கணக்கின் (webhosting account) உரிமையை (ownership) தாங்கள் உறுதிப்படுத்த வேண்டும். மேலும் விவரங்களுக்கு, தயவுசெய்து ஆவணத்தை படிக்கவும்." INSTL_DATABASE_HOST_LABEL="புரவலர்-கணினி பெயர்" INSTL_DATABASE_NAME_DESC="தரவுத்தளத்தின் பெயரை நிரப்பவும்." INSTL_DATABASE_NAME_LABEL="தரவுத்தளம் பெயர்" INSTL_DATABASE_NAME_MSG_MYSQL="தரவுத்தளப் பெயர் செல்லுபடியாகாதது. இது பின்வரும் உருக்களைக் கட்டாயம் கொண்டிருத்தல் கூடாது: \ /" INSTL_DATABASE_NAME_MSG_POSTGRES="தரவுத்தளப் பெயர் செல்லுபடியாகாதது. இது கட்டாயம் ஒரு எழுத்தில் ஆரம்பித்து, எண்ணெழுத்து உருக்களால் பின்பற்றப்பட வேண்டும்." -INSTL_DATABASE_NO_SCHEMA="இந்த தரவுத்தள வகைக்கு, அமைப்புமுறைகள் (schema) இல்லை." +INSTL_DATABASE_NO_SCHEMA="இந்தத் தரவுத்தள வகைக்கு, அமைப்புமுறைகள் (schema) இல்லை." INSTL_DATABASE_PASSWORD_DESC="தாங்கள் உருவாக்கிய கடவுச்சொல்லை அல்லது தங்கள் சேவை வழங்குபவரால் கொடுக்கப்பட்ட கடவுச்சொல்லை நிரப்பவும்." INSTL_DATABASE_PREFIX_DESC="அட்டவணை முன்-ஒட்டு ஒன்றை நிரப்பவும் அல்லது குறிப்பிலா வகையில் உருவாக்கப்பட்டதைப் பயன்படுத்தவும்." INSTL_DATABASE_PREFIX_MSG="அட்டவணை முன்-ஒட்டு ஆனது கட்டாயம் ஒரு எழுத்தில் ஆரம்பித்து, விருப்பமானால் எண்ணெழுத்து உருக்களால் பின்பற்றப்பட்டு, கட்டாயம் அடிக்கோடுடன் முடிவதாகவும் இருத்தல் வேண்டும்" INSTL_DATABASE_RESPONSE_ERROR="நிறுவல் தோல்வியுற்றது." -INSTL_DATABASE_TYPE_DESC="தரவுத்தள வகையை தேர்வுசெய்யவும்." +INSTL_DATABASE_TYPE_DESC="தரவுத்தள வகையைத் தேர்வுசெய்யவும்." INSTL_DATABASE_USER_DESC="தாங்கள் உருவாக்கிய பயனாளர்பெயரை அல்லது தங்கள் சேவை வழங்குபவரால் (Host) கொடுக்கப்பட்ட பயனாளர்பெயரை நிரப்பவும்." INSTL_DATABASE_VALIDATION_ERROR="தங்கள் தரவுத்தள சான்றுகள், தரவுத்தள வகை, தரவுத்தளப் பெயர் அல்லது புரவலர்-கணினிப் பெயர் ஆகியவற்றை சரிபார்க்கவும். தாங்கள் MySQL 8-ஐ நிறுவி இருந்தால், மேலும் விவரங்களுக்கு தயவுசெய்து படிக்கவும்: விக்கி (wiki)." @@ -101,7 +101,7 @@ INSTL_SITE="பிரதான உள்ளமைவு" INSTL_SITE_DEVMODE_LABEL="உருவாக்க முறைமையை நாங்கள் கண்டறிந்துள்ளோம்" INSTL_SITE_NAME_DESC="தங்கள் Joomla தளத்தின் பெயரை நிரப்பவும்." ; Complete view -INSTL_COMPLETE_ERROR_FOLDER_DELETE="\"%s\" என்று பெயரிட்ட கோப்பகத்தை நீக்க முடியவில்லை. தயவுசெய்து இக்கோப்பகத்தை கைமுறையால் நீக்கவும்." +INSTL_COMPLETE_ERROR_FOLDER_DELETE="\"%s\" என்று பெயரிட்ட கோப்பகத்தை நீக்க முடியவில்லை. தயவுசெய்து இந்தக் கோப்பகத்தை கைமுறையால் நீக்கவும்." INSTL_COMPLETE_REMOVE_FOLDER="\"%s\" என்று பெயரிட்ட கோப்பகத்தை நீக்குக" INSTL_COMPLETE_CONGRAT="வாழ்த்துகள்!" INSTL_COMPLETE_TITLE="வாழ்த்துகள்! தங்கள் Joomla தளம் தயார்." @@ -114,11 +114,11 @@ INSTL_REMOVE_INST_FOLDER="தாங்கள் உறுதியாக நீ ; Languages view INSTL_LANGUAGES="கூடுதல் மொழிகள் நிறுவல்" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="மொழி" -INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="மொழியை தேர்வுசெய்யவும்" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="மொழியைத் தேர்வுசெய்யவும்" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="மொழி அடையாள ஒட்டு" INSTL_LANGUAGES_COLUMN_HEADER_VERSION="பதிப்பு" INSTL_LANGUAGES_DESC="Joomla இடைமுகமானது பல்வேறு மொழிகளில் கிடைக்கிறது. தாங்கள் விரும்பும் மொழிகளை, முதலில், அவற்றின் தெரிவுப்பெட்டிகளில் தேர்வுசெய்யவும்; பின்னர், அவற்றை நிறுவ 'அடுத்த' பொத்தானைத் தேர்வுசெய்யவும்.
    குறிப்பு: இந்த செயல்பாடானது (பதிவிறக்கம் மற்றும் நிறுவல்) ஒவ்வொரு மொழிக்கும் சுமார் 10 வினாடிகள் எடுத்துக்கொள்ளும். எனவே, நேரம் முடிதலைத் (timeout) தவிர்க்க, தயவுசெய்து 3 மொழிகளுக்கு மிகாமல் தேர்வுசெய்யவும்." -INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="இந்த செயல்பாடானது ஒவ்வொரு மொழிக்கும் சுமார் 10 வினாடிகள் எடுத்துக்கொள்ளும்.
    தயவுசெய்து மொழிகள் பதிவிறக்கம் செய்து நிறுவும் வரை காத்திருக்கவும்..." +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="இந்தச் செயல்பாடானது ஒவ்வொரு மொழிக்கும் சுமார் 10 வினாடிகள் எடுத்துக்கொள்ளும்.
    தயவுசெய்து மொழிகள் பதிவிறக்கம் செய்து நிறுவும் வரை காத்திருக்கவும்..." INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="நிறுவுவதற்கு எந்த மொழியும் தேர்வுசெய்யப்படவில்லை." INSTL_LANGUAGES_WARNING_NO_INTERNET="மொழி சேவையகத்துடன் Joomla தொடர்புகொள்ள முடியவில்லை. தயவுசெய்து நிறுவலை முடிக்கவும்." INSTL_LANGUAGES_WARNING_NO_INTERNET2="குறிப்பு: Joomla நிர்வாகியைப் பயன்படுத்தி, பின்னர், தங்களால் மொழிகளை நிறுவ முடியும்." @@ -132,8 +132,8 @@ INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="மொழி" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="அடையாள ஒட்டு" INSTL_DEFAULTLANGUAGE_COULD_NOT_DOWNLOAD_PACKAGE="\"%s\"-இல் இருந்து மொழிக் கட்டை பதிவிறக்குதலிலோ அல்லது பிரித்தெடுத்தலிலோ Joomla தோல்வியுற்றது." INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="%s மொழியை Joomla-வினால் நிறுவ முடியவில்லை." -INSTL_DEFAULTLANGUAGE_DESC="பின்வரும் மொழிகளை Joomla நிறுவியுள்ளது. தயவுசெய்து தாங்கள் விரும்பும் Joomla நிர்வாகிக்கான இயல்புநிலை மொழியை தேர்வுசெய்யவும்." -INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="பின்வரும் மொழிகளை Joomla நிறுவியுள்ளது. தயவுசெய்து தாங்கள் விரும்பும் Joomla தளத்திற்கான இயல்புநிலை மொழியை தேர்வுசெய்யவும்." +INSTL_DEFAULTLANGUAGE_DESC="பின்வரும் மொழிகளை Joomla நிறுவியுள்ளது. தயவுசெய்து தாங்கள் விரும்பும் Joomla நிர்வாகிக்கான இயல்புநிலை மொழியைத் தேர்வுசெய்யவும்." +INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="பின்வரும் மொழிகளை Joomla நிறுவியுள்ளது. தயவுசெய்து தாங்கள் விரும்பும் Joomla தளத்திற்கான இயல்புநிலை மொழியைத் தேர்வுசெய்யவும்." INSTL_DEFAULTLANGUAGE_FRONTEND="இயல்புநிலை தள மொழி" INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla-வால் மொழியை இயல்புநிலையாக அமைக்க முடியவில்லை. ஆகவே, முன்புற தளத்திற்கான இயல்புநிலை மொழியாக ஆங்கிலம் பயன்படுத்தப்படும்." INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="தங்கள் இயல்புநிலை தள மொழியாக Joomla அமைத்திருப்பது: %s" @@ -143,9 +143,9 @@ INSTL_DEFAULTLANGUAGE_TRY_LATER="Joomla நிர்வாகியைப் ப INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="தமிழ் (இந்தியா)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español ; Database Model INSTL_DATABASE_COULD_NOT_CONNECT="தரவுத்தளத்துடன் தொடர்பு கொள்ள முடியவில்லை. இணைப்பான் (Connector) திருப்பிய பிழைச் செய்தி: %s" -INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="குறிப்பிட்ட தரவுத்தளத்துடன் நிறுவியால் தொடர்பு கொள்ள முடியவில்லை. ஆதலால், தரவுத்தளத்தை உருவாக்க முடியவில்லை. தயவுசெய்து தங்கள் தரவுத்தள அமைப்புகளை சரிபார்க்கவும். வேண்டுமானால், தரவுத்தளத்தை தாங்களே உருவாக்கவும்." +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="குறிப்பிட்ட தரவுத்தளத்துடன் நிறுவியால் தொடர்பு கொள்ள முடியவில்லை. ஆதலால், தரவுத்தளத்தை உருவாக்க முடியவில்லை. தயவுசெய்து தங்கள் தரவுத்தள அமைப்புகளைச் சரிபார்க்கவும். வேண்டுமானால், தரவுத்தளத்தைத் தாங்களே உருவாக்கவும்." INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="நீட்சி %s-க்கான வெளிப்படுத்தும் பதுக்குநினைவகத்தைப் (manifest cache) புதுப்பிக்க (refresh) முடியவில்லை" -INSTL_DATABASE_ERROR_BACKINGUP="தரவுத்தளத்தை காப்பு நகலெடுக்கும்போது சில பிழைகள் ஏற்பட்டுள்ளன." +INSTL_DATABASE_ERROR_BACKINGUP="தரவுத்தளத்தைக் காப்பு நகலெடுக்கும்போது சில பிழைகள் ஏற்பட்டுள்ளன." INSTL_DATABASE_ERROR_CREATE="%s என்ற தரவுத்தளத்தை உருவாக்க முயலும்போது பிழை ஏற்பட்டுள்ளது.
    பயனாளருக்குத் தரவுத்தளத்தை உருவாக்கப் போதிய உரிமை இல்லாமல் இருக்கக்கூடும். வேண்டிய தரவுத்தளத்தை Joomla-வை நிறுவுவதற்கு முன் தனியாக உருவாக்க வேண்டியிருக்கலாம்." INSTL_DATABASE_ERROR_DELETE="தரவுத்தளத்தை நீக்கும்போது சில பிழைகள் ஏற்பட்டுள்ளன." INSTL_DATABASE_ERROR_READING_SQL_FILE="SQL கோப்பைப் படிக்க முடியவில்லை." @@ -160,7 +160,7 @@ INSTL_DATABASE_INVALID_MYSQL_VERSION="நிறுவலைத் தொடர, INSTL_DATABASE_INVALID_MYSQLI_VERSION="நிறுவலைத் தொடர, தங்களுக்கு MySQL %1$s அல்லது அதற்கும் மேலானது தேவை. தங்கள் பதிப்பு ஆனது: %2$s" INSTL_DATABASE_INVALID_PGSQL_VERSION="நிறுவலைத் தொடர, தங்களுக்கு PostgreSQL %1$s அல்லது அதற்கும் மேலானது தேவை. தங்கள் பதிப்பு ஆனது: %2$s" INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="நிறுவலைத் தொடர, தங்களுக்கு PostgreSQL %1$s அல்லது அதற்கும் மேலானது தேவை. தங்கள் பதிப்பு ஆனது: %2$s" -INSTL_DATABASE_INVALID_TYPE="தயவுசெய்து தரவுத்தள வகையை தேர்வுசெய்யவும்." +INSTL_DATABASE_INVALID_TYPE="தயவுசெய்து தரவுத்தள வகையைத் தேர்வுசெய்யவும்." INSTL_DATABASE_NAME_INVALID_CHAR="எந்த ஒரு MySQL குறிப்பானும் (identifier) NULL ASCII(0x00) கொண்டிருத்தல் கூடாது." INSTL_DATABASE_NAME_INVALID_SPACES="MySQL தரவுத்தளப் பெயர்கள் மற்றும் அட்டவணைப் பெயர்கள் ஆகியவை இடைவெளிகளைக் கொண்டு ஆரம்பிக்கவோ அல்லது முடிக்கவோ கூடாது." INSTL_DATABASE_NAME_TOO_LONG="MySQL தரவுத்தளப் பெயர் கட்டாயம் 64 உருக்களுக்கு மிகாமல் இருத்தல் வேண்டும்." @@ -171,7 +171,7 @@ INSTL_HEADER_ERROR="பிழை" INSTL_PAGE_TITLE="Joomla நிறுவி" ; Configuration model INSTL_ERROR_CONNECT_DB="தரவுத்தளத்துடன் தொடர்பு கொள்ள முடியவில்லை. இணைப்பான் திருப்பிய எண்: %d" -INSTL_STD_OFFLINE_MSG="இத்தளம் பராமரிப்புக்காக நிறுத்தப்பட்டுள்ளது.
    தயவுசெய்து மீண்டும் விரைவில் உலாவ வரவும்." +INSTL_STD_OFFLINE_MSG="இந்தத் தளம் பராமரிப்புக்காக நிறுத்தப்பட்டுள்ளது.
    தயவுசெய்து மீண்டும் விரைவில் உலாவ வரவும்." ; Others INSTL_CONFPROBLEM="தங்கள் உள்ளமைவுக் (configuration) கோப்பு அல்லது கோப்பகம் எழுத முடியாதது அல்லது கோப்பை எழுதுவதில் பிரச்சினை உள்ளது. தாங்கள் கீழ்க்காணும் குறிமுறையை கையால் பதிவேற்ற வேண்டும். அனைத்துக் குறிமுறைகளையும் உரைப் பிரதேசத்தில் தேர்வுசெய்யவும். பிறகு, புதிய உரைக் கோப்பில் தேர்வுசெய்தக் குறிமுறையை ஒட்டவும். இந்த உரைக் கோப்பை 'configuration.php' எனப் பெயரிட்டு அதனைத் தங்கள் தளத்தின் வேர்க் கோப்பகத்தில் பதிவேற்றவும்." INSTL_DISPLAY_ERRORS="Display Errors" @@ -188,7 +188,7 @@ INSTL_PHP_VERSION="PHP பதிப்பு" INSTL_PHP_VERSION_NEWER="PHP பதிப்பு >= %s" INSTL_PROCESS_BUSY="செயலாக்கம் நடந்தேறிக் கொண்டிருக்கிறது. தயவுசெய்து காத்திருக்கவும்..." INSTL_SESSION_AUTO_START="Session Auto Start" -INSTL_WRITABLE="%s-ஐ உருவாக்க போதுமான அனுமதி இல்லை." +INSTL_WRITABLE="%s-ஐ உருவாக்கப் போதுமான அனுமதி இல்லை." INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIP Support" ; Global strings JADMINISTRATOR="நிர்வாகி" @@ -197,11 +197,11 @@ JERROR="பிழை" JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="தங்கள் வேண்டுதலைச் செயலாக்கும்போது ஒரு பிழை ஏற்பட்டுள்ளது." JGLOBAL_ISFREESOFTWARE="%s-வானது %s-இன் கீழ் வெளியிடப்பட்ட ஒரு இலவச மென்பொருள்." JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="மொழித்தொகுப்பானது இந்த Joomla பதிப்புடன் பொருந்தவில்லை. சில எழுத்துச்சரங்கள் காணாமல் இருக்கக்கூடும்; இவை ஆங்கிலத்தில் காட்சிப்படுத்தப்படும்." -JGLOBAL_SELECT_AN_OPTION="ஒரு விருப்பை தேர்வுசெய்க" +JGLOBAL_SELECT_AN_OPTION="ஒரு விருப்பை தேர்வுசெய்யவும்" JGLOBAL_SELECT_NO_RESULTS_MATCH="பொருந்தும் எந்த முடிவும் இல்லை" -JGLOBAL_SELECT_SOME_OPTIONS="சில விருப்புகளை தேர்வுசெய்க" +JGLOBAL_SELECT_SOME_OPTIONS="சில விருப்புகளை தேர்வுசெய்யவும்" JHIDEPASSWORD="கடவுச்சொல் மறைக்க" -JINVALID_TOKEN="செல்லாத பாதுகாப்பு token கொண்டிருந்ததால் சமீபத்திய வேண்டுதல் மறுக்கப்பட்டது. தயவுசெய்து பக்கத்தை புதுப்பித்தல் செய்து மீண்டும் முயற்சிக்கவும்." +JINVALID_TOKEN="செல்லுபடியாகாத பாதுகாப்பு token கொண்டிருந்ததால் சமீபத்திய வேண்டுதல் மறுக்கப்பட்டது. தயவுசெய்து பக்கத்தைப் புதுப்பித்தல் செய்து மீண்டும் முயற்சிக்கவும்." JINVALID_TOKEN_NOTICE="பாதுகாப்பு token பொருந்தவில்லை. பாதுகாப்பு அத்துமீறல்களைத் தடுக்க, வேண்டுதல் ஆனது கைவிடப்பட்டது. தயவுசெய்து மீண்டும் முயற்சிக்கவும்." JNEXT="அடுத்த" JNO="இல்லை" @@ -218,8 +218,8 @@ JYES="ஆம்" JLIB_DATABASE_ERROR_CONNECT_MYSQL="MySQL உடன் தொடர்பு கொள்ள முடியவில்லை" JLIB_DATABASE_ERROR_DATABASE="ஒரு தரவுத்தள பிழை ஏற்பட்டுள்ளது." JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="பதிவேற்ற இயலாத தரவுத்தள இயக்கி: %s." -JLIB_DATABASE_ERROR_VALID_MAIL="தாங்கள் நிரப்பிய மின்-அஞ்சல் முகவரி செல்லுபடியாகாதது. தயவுசெய்து மற்றொரு மின்-அஞ்சல் முகவரியை நிரப்புக." -JLIB_ENVIRONMENT_SESSION_EXPIRED="தங்கள் அமர்வு நேரம் (session) காலாவதியாகிவிட்டது; தயவுசெய்து இந்தப் பக்கத்தை புதுப்பிக்கவும் (reload)." +JLIB_DATABASE_ERROR_VALID_MAIL="தாங்கள் நிரப்பிய மின்-அஞ்சல் முகவரி செல்லுபடியாகாதது. தயவுசெய்து மற்றொரு மின்-அஞ்சல் முகவரியை நிரப்பவும்." +JLIB_ENVIRONMENT_SESSION_EXPIRED="தங்கள் அமர்வு நேரம் (session) காலாவதியாகிவிட்டது; தயவுசெய்து இந்தப் பக்கத்தைப் புதுப்பிக்கவும் (reload)." JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: பாதை ஒரு கோப்பகம் அல்ல. பாதை: %2$s" JLIB_FORM_FIELD_INVALID="செல்லாத புலம்: " JLIB_FORM_VALIDATE_FIELD_INVALID="செல்லாத புலம்: %s" @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: கோப்பு \" JLIB_INSTALLER_INSTALL="நிறுவுக" JLIB_INSTALLER_NOT_ERROR="பிழையானது TinyMCE மொழிக் கோப்புகள் நிறுவல் தொடர்பானது என்றால் இப்பிழை Joomla! மொழி(கள்) நிறுவலுக்கு எந்த விளைவையும் ஏற்படுத்தாது. Joomla 3.2.0-க்கு முன் உருவாக்கப்பட்ட சில மொழித் தொகுப்புகள் TinyMCE மொழிக் கோப்புகளைத் தனியாக நிறுவ முயற்சிக்கலாம். இந்த TinyMCE மொழிக் கோப்புகள் தற்சமயம் Joomla-வில் சேர்க்கப்பட்டிருப்பதால் இவற்றைத் தனியாக நிறுவ வேண்டாம்." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="%s மொழிக்கு உள்ளடக்க மொழியை (content language) உருவாக்க முடியவில்லை: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP-இன் allow_url_fopen அமைப்பு முடக்கப்பட்டுள்ளது. புதுப்பி (updater) வேலை செய்வதற்கு இந்த அமைப்பானது கட்டாயம் இயலுமைப்படுத்தியிருக்க வேண்டும்." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="புதுப்பித்தல்: :Collection: %s-ஐத் திறக்க முடியவில்லை." +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="புதுப்பித்தல்: :Collection: %s-ஐ அலகிட (parse) முடியவில்லை." JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="புதுப்பித்தல்: புதுப்பித்தல் தளத்தைத் திறக்க முடியவில்லை #%d \"%s\", இணையமுகவரி: %s" JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: தரவுத்தளத்துடன் தொடர்பு கொள்ள முடியவில்லை
    joomla.library: %1$s - %2$s" ; Strings for the language debugger @@ -265,10 +268,10 @@ JLIB_JS_AJAX_ERROR_TIMEOUT="JSON தரவு பெறும்போது (fe JFIELD_PASSWORD_INDICATE_COMPLETE="கடவுச்சொல் ஏற்றுக்கொள்ளப்பட்டது" JFIELD_PASSWORD_INDICATE_INCOMPLETE="கடவுச்சொல் தளத்தின் தேவைகளைப் பூர்த்தி செய்யவில்லை." JFIELD_PASSWORD_SPACES_IN_PASSWORD="கடவுச்சொல்லின் தொடக்கத்திலும் இறுதியிலும் இடைவெளி இருத்தல் கூடாது." -JFIELD_PASSWORD_TOO_LONG="கடவுச்சொல் மிகவும் நீளமாக உள்ளது. கடவுச்சொல்லானது 100 உருக்களை விட குறைவாக இருத்தல் வேண்டும்." +JFIELD_PASSWORD_TOO_LONG="கடவுச்சொல் மிகவும் நீளமாக உள்ளது. கடவுச்சொல்லானது 100 உருக்களை விடக் குறைவாக இருத்தல் வேண்டும்." JFIELD_PASSWORD_TOO_SHORT_N="கடவுச்சொல் மிகவும் குறுகியதாக உள்ளது. கடவுச்சொல்லில் குறைந்தது %d உருக்களாவது இருத்தல் வேண்டும்." ; Javascript Form Validation Messages -JLIB_FORM_CONTAINS_INVALID_FIELDS="தேவையான தரவைக் காணவில்லை என்பதால் படிவத்தை சமர்ப்பிக்க முடியாது.
    குறிக்கப்பட்ட புலங்களை சரிசெய்து மீண்டும் முயற்சிக்கவும்." +JLIB_FORM_CONTAINS_INVALID_FIELDS="தேவையான தரவைக் காணவில்லை என்பதால் படிவத்தைச் சமர்ப்பிக்க முடியாது.
    குறிக்கப்பட்ட புலங்களைச் சரிசெய்து மீண்டும் முயற்சிக்கவும்." JLIB_FORM_FIELD_INVALID_VALUE="இந்தப் பெறுமானம் செல்லுபடியாகாது." JLIB_FORM_FIELD_REQUIRED_CHECK="விருப்புகளில் ஒன்று தேர்வுசெய்யப்பட வேண்டும்." JLIB_FORM_FIELD_REQUIRED_VALUE="இந்தப் புலத்தை நிரப்பவும்." diff --git a/installation/language/ta-IN/langmetadata.xml b/installation/language/ta-IN/langmetadata.xml index 63672001cef93..b5660462dfea7 100644 --- a/installation/language/ta-IN/langmetadata.xml +++ b/installation/language/ta-IN/langmetadata.xml @@ -1,8 +1,8 @@ Tamil (India) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Ilagnayeru 'MIG' Manickam, Elango Samy Manim (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/th-TH/joomla.ini b/installation/language/th-TH/joomla.ini index 5a57e6d4ce859..17eee4442a893 100644 --- a/installation/language/th-TH/joomla.ini +++ b/installation/language/th-TH/joomla.ini @@ -227,14 +227,17 @@ JLIB_FORM_VALIDATE_FIELD_REQUIRED="Field required: %s" JLIB_INSTALLER_ABORT="Aborting language installation: %s" JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Extension %1$s: Failed to create folder: %2$s" JLIB_INSTALLER_ABORT_NOINSTALLPATH="Install path does not exist." -JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Package %1$s: There was an error installing an extension: %2$s." +JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="แพ็กเกจ %1$s: เกิดข้อผิดพลาดในการติดตั้งส่วนเสริม: %2$s" JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="Package %s: There were no files to install!" JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: การคัดลอกไฟล์ล้มเหลวจาก %1$s ไปยัง %2$s" JLIB_INSTALLER_INSTALL="ติดตั้ง" JLIB_INSTALLER_NOT_ERROR="หากมีข้อผิดที่เกี่ยวข้องกับการติดตั้งไฟล์ภาษาของ TinyMCE ซึ่งจะไม่มีผลกระทบต่อการติดตั้งของไฟล์ภาษา เพราะบางแพ็คเกจภาษาถูกสร้างขึ้นก่อนที่จะมี Joomla 3.2.0 อาจเป็นเพราะพยายามที่จะติดตั้งไฟล์ภาษาของ TinyMCE แยกต่างหาก ซึ่งตอนนี้ได้ถูกรวมอยู่ในคอร์หลักนี้แล้ว โดยที่ไม่จำเป็นต้องมีการติดตั้งตามลงไป" -JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Unable to create a content language for %s language: %s." -JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Update: Could not open update site #%d \"%s\", URL: %s." -JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: ไม่สามารถเชื่อมต่อกับฐานข้อมูล
    joomla.library: %1$s - %2$s." +JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="ไม่สามารถสร้างภาษาของเนื้อหาสำหรับ %s ภาษา: %s" +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="การตั้งค่า PHP allow_url_fopen ถูกปิดใช้งาน ต้องเปิดใช้งานการตั้งค่านี้เพื่อให้ตัวอัปเดตทำงานได้" +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="อัปเดต: :Collection: เปิด %s ไม่ได้" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="อัปเดต: :Collection: แยกวิเคราะห์ %s ไม่ได้" +JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="อัปเดต: ไม่สามารถเปิดอัปเดตไซต์ #%d \"%s\", URL: %s" +JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: ไม่สามารถเชื่อมต่อกับฐานข้อมูล
    joomla.library: %1$s - %2$s" ; Strings for the language debugger JDEBUG_LANGUAGE_FILES_IN_ERROR="ความผิดพลาดในการแยกวิเคราะห์ไฟล์ภาษา" JDEBUG_LANGUAGE_UNTRANSLATED_STRING="สตริงที่ไม่ได้แปล" diff --git a/installation/language/th-TH/langmetadata.xml b/installation/language/th-TH/langmetadata.xml index fc72eff2bd61c..587b42bef85b4 100644 --- a/installation/language/th-TH/langmetadata.xml +++ b/installation/language/th-TH/langmetadata.xml @@ -1,8 +1,8 @@ Thai (ภาษาไทย) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Thai Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/tr-TR/joomla.ini b/installation/language/tr-TR/joomla.ini index bf3c73ff2cd72..950b06aca0985 100644 --- a/installation/language/tr-TR/joomla.ini +++ b/installation/language/tr-TR/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Yükleme: %1$s dosyası %2$s ' JLIB_INSTALLER_INSTALL="Kur" JLIB_INSTALLER_NOT_ERROR="Hata TinyMCE dil dosyalarının yüklenmesiyle ilgiliyse, dilin/dillerin yüklenmesi üzerinde hiçbir etkisi yoktur. Joomla 3.2.0 'dan önce oluşturulan bazı dil paketleri, ayrı TinyMCE dil dosyaları yüklemeyi deneyebilir. Bunlar artık çekirdeğe dahil edildiğinden, artık kurulmaları gerekmez." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="%s dili için içerik dili oluşturulamıyor: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP allow_url_fopen ayarı devre dışı. Güncelleyicinin çalışması için bu ayar etkinleştirilmelidir." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Güncelleme: ::Collection: %s açılamadı" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Güncelleme: :Collection: %s ayrıştırılamadı" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Güncelleme: #%d \"%s\" güncelleme sitesi açılamadı, URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance:
    joomla.library veritabanına bağlanılamadı: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/tr-TR/langmetadata.xml b/installation/language/tr-TR/langmetadata.xml index 3907615f31deb..3b0a976281d52 100644 --- a/installation/language/tr-TR/langmetadata.xml +++ b/installation/language/tr-TR/langmetadata.xml @@ -1,8 +1,8 @@ Turkish (Turkey) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Joomla! Turkey (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/uk-UA/joomla.ini b/installation/language/uk-UA/joomla.ini index 74b8f965771a4..1a38618394623 100644 --- a/installation/language/uk-UA/joomla.ini +++ b/installation/language/uk-UA/joomla.ini @@ -231,6 +231,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Помилка коп JLIB_INSTALLER_INSTALL="Встановлення" JLIB_INSTALLER_NOT_ERROR="Якщо помилка пов'язана з встановленням мовних файлів редактора TinyMCE, то це ніяким чином не вплине на встановлення мови для Joomla. Деякі мовні пакети, створені до Joomla! 3.2.0 можуть спробувати встановити окремий пакет мовних файлів для TinyMCE. Оскільки ваша мова включена в основний пакет, то ці версії мовних файлів більше не є потрібними і їх не потрібно встановлювати." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Неможливо створити мову вмісту для мови %s: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Директива PHP allow_url_fopen відключена. Директива повинна бути увімкнута для роботи оновлення." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Оновлення пакету: неможливо відкрити %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Оновлення пакету: не вдалося розібрати %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Оновлення: не вдалося відкрити сайт для оновлення #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Не можливо з'єднатися з базою даних
    joomla.library: %1$s — %2$s" ; Strings for the language debugger diff --git a/installation/language/uk-UA/langmetadata.xml b/installation/language/uk-UA/langmetadata.xml index a8a3f23c71802..b93aed0c97dfe 100644 --- a/installation/language/uk-UA/langmetadata.xml +++ b/installation/language/uk-UA/langmetadata.xml @@ -1,8 +1,8 @@ Ukrainian (uk-UA) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Joomla! Project - Ukrainian translation team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/zh-CN/joomla.ini b/installation/language/zh-CN/joomla.ini index 9ff1d062baa71..4b32023c99a6c 100644 --- a/installation/language/zh-CN/joomla.ini +++ b/installation/language/zh-CN/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: 从 %1$s 到 %2$s 复 JLIB_INSTALLER_INSTALL="安装" JLIB_INSTALLER_NOT_ERROR="如果错误与 TinyMCE 语言文件的安装有关，则对语言的安装没有影响。一些在 Joomla 3.2.0 之前创建的语言包可能会尝试安装单独的 TinyMCE 语言文件。因为这些现在已经包含在核心中，它们不再需要安装。" JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="无法为 %s 语言创建内容语言：%s" +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP 设置中 allow_url_fopen 参数已设置为关闭. 升级程序正常工作必须开启此项设置" +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: 不能打开 %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: 不能解析 %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="升级: 无法打开升级网站 #%d \"%s\", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase::getInstance: 无法连接到数据库
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/zh-CN/langmetadata.xml b/installation/language/zh-CN/langmetadata.xml index 14dd930e19e5d..076986611f6b3 100644 --- a/installation/language/zh-CN/langmetadata.xml +++ b/installation/language/zh-CN/langmetadata.xml @@ -1,8 +1,8 @@ 简体中文(中国) - 4.1.1 - March 2022 + 4.1.4 + May 2022 逐浪中文网 joomlachina.org.cn 周永建 (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/zh-TW/joomla.ini b/installation/language/zh-TW/joomla.ini index 9a2d662bd6321..ad6e6c53958ab 100644 --- a/installation/language/zh-TW/joomla.ini +++ b/installation/language/zh-TW/joomla.ini @@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: 無法複製檔案從 JLIB_INSTALLER_INSTALL="安裝" JLIB_INSTALLER_NOT_ERROR="如果錯誤是和安裝的 TinyMCE 語言檔有關的話，它並不會影響語言的安裝。有些Joomla! 3.2.0之前的語言包會試著安裝另外的TinyMCE語言檔案，但現在已經包含在核心之中，不需要再另外安裝。" JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="無法建立 %s 語言的內容語言: %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP 設定中 allow_url_fopen 參數已設定為關閉. 升級程式正常工作必須開啓此項設定" +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: 不能打開 %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: 不能解析 %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="更新：無法打開更新網站 #%d \"%s\", 網址： %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: 無法連上資料庫
    joomla.library: %1$s - %2$s." ; Strings for the language debugger diff --git a/installation/language/zh-TW/langmetadata.xml b/installation/language/zh-TW/langmetadata.xml index b1f5ef102d65c..df9960913066a 100644 --- a/installation/language/zh-TW/langmetadata.xml +++ b/installation/language/zh-TW/langmetadata.xml @@ -1,8 +1,8 @@ 正體中文 (臺灣) - 4.1.1 - March 2022 + 4.1.4 + May 2022 Joomla! 專案 (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/templates/system/build_incomplete.html b/templates/system/build_incomplete.html index 0e9a69e166689..c79a9d0e6c5a0 100644 --- a/templates/system/build_incomplete.html +++ b/templates/system/build_incomplete.html @@ -6,7 +6,7 @@ Joomla: Environment Setup Incomplete - +
    diff --git a/templates/system/fatal-error.html b/templates/system/fatal-error.html index 37aad1bef7796..c4667a8698be1 100644 --- a/templates/system/fatal-error.html +++ b/templates/system/fatal-error.html @@ -6,7 +6,7 @@ An Error Occurred: {{statusText}} - +
    diff --git a/templates/system/incompatible.html b/templates/system/incompatible.html index 8096c1fb07a59..788a9d26274da 100644 --- a/templates/system/incompatible.html +++ b/templates/system/incompatible.html @@ -6,7 +6,7 @@ Joomla: unsupported PHP version - +
    From 233e14482a5abff36ba93097524e4715f2cb0d6c Mon Sep 17 00:00:00 2001 From: Tobias Zulauf Date: Wed, 18 May 2022 17:08:00 +0200 Subject: [PATCH 16/33] correctly handle save2copy for menus (#37813) --- .../com_menus/src/Model/ItemModel.php | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/administrator/components/com_menus/src/Model/ItemModel.php b/administrator/components/com_menus/src/Model/ItemModel.php index a39959dc587d7..332a88191f24d 100644 --- a/administrator/components/com_menus/src/Model/ItemModel.php +++ b/administrator/components/com_menus/src/Model/ItemModel.php @@ -1433,8 +1433,8 @@ public function rebuild() */ public function save($data) { - $pk = isset($data['id']) ? $data['id'] : (int) $this->getState('item.id'); - $isNew = true; + $pk = isset($data['id']) ? $data['id'] : (int) $this->getState('item.id'); + $isNew = true; $db = $this->getDbo(); $query = $db->getQuery(true); $table = $this->getTable(); @@ -1512,13 +1512,24 @@ public function save($data) return false; } - // Alter the title & alias for save as copy. Also, unset the home record. - if (!$isNew && $data['id'] == 0) + // Alter the title & alias for save2copy when required. Also, unset the home record. + if (Factory::getApplication()->input->get('task') === 'save2copy' && $data['id'] === 0) { - list($title, $alias) = $this->generateNewTitle($table->parent_id, $table->alias, $table->title); + $origTable = $this->getTable(); + $origTable->load($this->getState('item.id')); + + if ($table->title === $origTable->title) + { + list($title, $alias) = $this->generateNewTitle($table->parent_id, $table->alias, $table->title); + $table->title = $title; + $table->alias = $alias; + } + + if ($table->alias === $origTable->alias) + { + $table->alias = ''; + } - $table->title = $title; - $table->alias = $alias; $table->published = 0; $table->home = 0; } From 0fd479e66512be9ae6146f692141677e8ce307f1 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Wed, 18 May 2022 18:47:58 +0200 Subject: [PATCH 17/33] Node 12 reached EOL (#37757) * Node 12 reached EOL * Update .drone.yml * Update README.md * Update .drone.yml --- .drone.yml | 4 ++-- README.md | 2 +- package.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8feac298fb2f2..9d0479c42d41c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,7 +23,7 @@ steps: - echo $(date) - name: npm - image: node:14-alpine + image: node:16-alpine depends_on: [ phpcs ] commands: - npm ci --unsafe-perm @@ -419,6 +419,6 @@ steps: --- kind: signature -hmac: 15e1abb49597a83c250c8785948aa9fa0c6d93ec88b03e45c30d8050b338ea5d +hmac: c34b8c98013a4c7f604f5c650875d03f4291e4fa42ba9ceb730993172d965aff ... diff --git a/README.md b/README.md index d9ff48d2c9ef4..a01c9a9068af3 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Build Status --------------------- | Drone-CI | AppVeyor | PHP | Node | npm | | ------------- | ------------- | ------------- | ------------- | ------------- | -| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=4.1-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/4.1-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V7.2.5-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V12.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v6.13.4-green)](https://nodejs.org/en/) | +| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=4.1-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/4.1-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V7.2.5-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V16.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v8.6.0-green)](https://nodejs.org/en/) | Overview --------------------- diff --git a/package.json b/package.json index c802a5872f93a..70026bd1074dc 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,8 @@ "url": "https://github.com/joomla/joomla-cms.git" }, "engines": { - "node": ">=12.0", - "npm": ">=6.13.4" + "node": ">=16", + "npm": ">=8.6.0" }, "scripts": { "build:js": "node build/build.js --compile-js", From b1830431b46b9add802202689cdb16be1c8d38f8 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Wed, 18 May 2022 19:15:37 +0200 Subject: [PATCH 18/33] Cache the menu instances in the app (#37824) --- libraries/src/Application/CMSApplication.php | 21 +++++++++++++++++++- libraries/src/Menu/AbstractMenu.php | 4 +++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php index 3cd35d59e9fab..542e06b880790 100644 --- a/libraries/src/Application/CMSApplication.php +++ b/libraries/src/Application/CMSApplication.php @@ -129,6 +129,14 @@ abstract class CMSApplication extends WebApplication implements ContainerAwareIn */ protected $authenticationPluginType = 'authentication'; + /** + * Menu instances container. + * + * @var AbstractMenu[] + * @since __DEPLOY_VERSION__ + */ + protected $menus = []; + /** * The menu factory * @@ -525,12 +533,23 @@ public function getMenu($name = null, $options = array()) $options['app'] = $this; } + if (array_key_exists($name, $this->menus)) + { + return $this->menus[$name]; + } + if ($this->menuFactory === null) { + @trigger_error('Menu factory must be set in 5.0', E_USER_DEPRECATED); $this->menuFactory = $this->getContainer()->get(MenuFactoryInterface::class); } - return $this->menuFactory->createMenu($name, $options); + $this->menus[$name] = $this->menuFactory->createMenu($name, $options); + + // Make sure the abstract menu has the instance too, is needed for BC and will be removed with version 5 + AbstractMenu::$instances[$name] = $this->menus[$name]; + + return $this->menus[$name]; } /** diff --git a/libraries/src/Menu/AbstractMenu.php b/libraries/src/Menu/AbstractMenu.php index 180f5d0135c48..f3a7b2f499986 100644 --- a/libraries/src/Menu/AbstractMenu.php +++ b/libraries/src/Menu/AbstractMenu.php @@ -55,8 +55,10 @@ abstract class AbstractMenu * @var AbstractMenu[] * * @since 1.7 + * + * @deprecated 5.0 Use the MenuFactoryInterface from the container instead */ - protected static $instances = array(); + public static $instances = array(); /** * User object to check access levels for From cc14bace65a76abeaf5143d495fe6067f004c1b2 Mon Sep 17 00:00:00 2001 From: Roland Dalmulder Date: Wed, 18 May 2022 19:25:05 +0200 Subject: [PATCH 19/33] Updated drone hmac Signed-off-by: Roland Dalmulder --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index ce7e1e7ae3aec..2ac5ed92cd652 100644 --- a/.drone.yml +++ b/.drone.yml @@ -420,6 +420,6 @@ steps: --- kind: signature -hmac: adfaa112f82d0487b292e9b22400b04abfbf56eb44516bc764abc1804a6f472b +hmac: 24b9cf86c8dcb5efc6b7c0dfc7bd774410f81907d228eb63931224449953d9fe ... From 2069ac3ddcd09d7352d1c52e97116cd955716a2d Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Wed, 18 May 2022 20:30:51 +0200 Subject: [PATCH 20/33] Fix mistakes from last upmerge (#37826) --- administrator/components/com_admin/script.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 09647883c014b..02a773c006531 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -6387,6 +6387,8 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/administrator/components/com_users/src/Field/PrimaryauthprovidersField.php', // From 4.1.2 to 4.1.3 '/libraries/vendor/webmozart/assert/.php_cs', + // From 4.1 to 4.2.0 + '/libraries/src/Service/Provider/ApiRouter.php', ); $folders = array( @@ -7720,10 +7722,6 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/libraries/vendor/tobscure/json-api/.git/hooks', '/libraries/vendor/tobscure/json-api/.git/branches', '/libraries/vendor/tobscure/json-api/.git', - // From 4.1.1 to 4.1.2 - '/administrator/components/com_users/src/Field/PrimaryauthprovidersField.php', - // From 4.1.1 to 4.2.0 - '/libraries/src/Service/Provider/ApiRouter.php' ); $status['files_checked'] = $files; From dd25b968e4f14b29bd5d324d2f78c0407661deba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyril=20Rez=C3=A9?= Date: Wed, 18 May 2022 21:14:15 +0200 Subject: [PATCH 21/33] FIX #37772 - inlineHelp Toggle Button control (#37819) * Add inlineHelp toggle button check * Add inlineHelp toggle button control * Add inlineHelp toggle button control --- .../com_config/forms/application.xml | 3 +++ layouts/joomla/form/renderfield.php | 2 +- libraries/src/Form/FormField.php | 22 +++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml index 977f1f2140782..2f8c06b3db421 100644 --- a/administrator/components/com_config/forms/application.xml +++ b/administrator/components/com_config/forms/application.xml @@ -1,5 +1,8 @@ + + +
    diff --git a/layouts/joomla/form/renderfield.php b/layouts/joomla/form/renderfield.php index 68398e9a3f00d..95e969a09070b 100644 --- a/layouts/joomla/form/renderfield.php +++ b/layouts/joomla/form/renderfield.php @@ -37,7 +37,7 @@ $id = ($id ?? $name) . '-desc'; $hideLabel = !empty($options['hiddenLabel']); $hideDescription = empty($options['hiddenDescription']) ? false : $options['hiddenDescription']; -$descClass = ($options['descClass'] ?? '') ?: 'hide-aware-inline-help d-none'; +$descClass = ($options['descClass'] ?? '') ?: (!empty($options['inlineHelp']) ? 'hide-aware-inline-help d-none' : ''); if (!empty($parentclass)) { diff --git a/libraries/src/Form/FormField.php b/libraries/src/Form/FormField.php index d328421e3bf69..ba1f12084d8b6 100644 --- a/libraries/src/Form/FormField.php +++ b/libraries/src/Form/FormField.php @@ -119,6 +119,14 @@ abstract class FormField */ protected $hiddenDescription = false; + /** + * Should the description be hidden/shown with toggle button when rendering the form field? + * + * @var boolean + * @since 4.1.4 + */ + protected $inlineHelp = false; + /** * True to translate the field label string. * @@ -1067,6 +1075,20 @@ public function renderField($options = array()) } } + if (empty($options['inlineHelp'])) + { + if ($this->getAttribute('inlineHelp')) + { + $options['inlineHelp'] = $this->getAttribute('inlineHelp') == 'true'; + } + else + { + $options['inlineHelp'] = isset($this->form->getXml()->config->inlinehelp['button']) + ? ((string) $this->form->getXml()->config->inlinehelp['button'] == 'show' ?: false) + : $this->inlineHelp; + } + } + if ($this->showon) { $options['rel'] = ' data-showon=\'' . From 5fdd2ef6c913171310d40214582ea76826f6ccc7 Mon Sep 17 00:00:00 2001 From: Benjamin Trenkle Date: Wed, 18 May 2022 22:12:55 +0200 Subject: [PATCH 22/33] Bump to 4.1.4-rc1 --- administrator/manifests/files/joomla.xml | 2 +- libraries/src/Version.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index aed7535ddfc34..9d12b7727916c 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,7 +6,7 @@ www.joomla.org (C) 2019 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt - 4.1.4-dev + 4.1.4-rc1 May 2022 FILES_JOOMLA_XML_DESCRIPTION diff --git a/libraries/src/Version.php b/libraries/src/Version.php index a9b2932f34155..0c34bec0e5595 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -61,7 +61,7 @@ final class Version * @var string * @since 3.8.0 */ - const EXTRA_VERSION = 'dev'; + const EXTRA_VERSION = 'rc1'; /** * Development status. @@ -69,7 +69,7 @@ final class Version * @var string * @since 3.5 */ - const DEV_STATUS = 'Development'; + const DEV_STATUS = 'Release Candidate'; /** * Code name. @@ -85,7 +85,7 @@ final class Version * @var string * @since 3.5 */ - const RELDATE = '10-May-2022'; + const RELDATE = '18-May-2022'; /** * Release time. @@ -93,7 +93,7 @@ final class Version * @var string * @since 3.5 */ - const RELTIME = '16:00'; + const RELTIME = '22:00'; /** * Release timezone. From f5ae0cd1797a9d547d61c61419098bad449243c7 Mon Sep 17 00:00:00 2001 From: Benjamin Trenkle Date: Thu, 19 May 2022 04:18:30 +0200 Subject: [PATCH 23/33] Revert to dev --- administrator/manifests/files/joomla.xml | 2 +- libraries/src/Version.php | 8 ++++---- package-lock.json | 9 +++++++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 9d12b7727916c..bc92d8deae6a1 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,7 +6,7 @@ www.joomla.org (C) 2019 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt - 4.1.4-rc1 + 4.1.4-rc2-dev May 2022 FILES_JOOMLA_XML_DESCRIPTION diff --git a/libraries/src/Version.php b/libraries/src/Version.php index 0c34bec0e5595..ffaf48dfa97f6 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -61,7 +61,7 @@ final class Version * @var string * @since 3.8.0 */ - const EXTRA_VERSION = 'rc1'; + const EXTRA_VERSION = 'rc2-dev'; /** * Development status. @@ -69,7 +69,7 @@ final class Version * @var string * @since 3.5 */ - const DEV_STATUS = 'Release Candidate'; + const DEV_STATUS = 'Development'; /** * Code name. @@ -85,7 +85,7 @@ final class Version * @var string * @since 3.5 */ - const RELDATE = '18-May-2022'; + const RELDATE = '19-May-2022'; /** * Release time. @@ -93,7 +93,7 @@ final class Version * @var string * @since 3.5 */ - const RELTIME = '22:00'; + const RELTIME = '03:10'; /** * Release timezone. diff --git a/package-lock.json b/package-lock.json index 90720e927b921..3c759daef23e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -86,8 +86,8 @@ "terser": "^5.7.0" }, "engines": { - "node": ">=12.0", - "npm": ">=6.13.4" + "node": ">=16", + "npm": ">=8.6.0" } }, "node_modules/@babel/code-frame": { @@ -2735,6 +2735,7 @@ "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", + "fsevents": "~2.3.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -5213,6 +5214,7 @@ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, "dependencies": { + "graceful-fs": "^4.1.6", "universalify": "^2.0.0" }, "optionalDependencies": { @@ -7100,6 +7102,9 @@ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.62.0.tgz", "integrity": "sha512-cJEQq2gwB0GWMD3rYImefQTSjrPYaC6s4J9pYqnstVLJ1CHa/aZNVkD4Epuvg4iLeMA4KRiq7UM7awKK6j7jcw==", "dev": true, + "dependencies": { + "fsevents": "~2.3.2" + }, "bin": { "rollup": "dist/bin/rollup" }, From f001c84aed4e4d402bf76a232e81ce12adad8612 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Fri, 20 May 2022 12:46:05 +0200 Subject: [PATCH 24/33] [4.2] Smart Search: Index custom fields (#36747) Finder: Add custom fields to search index --- .../components/com_fields/forms/field.xml | 14 +++++++ .../components/com_fields/tmpl/field/edit.php | 1 + .../com_finder/src/Indexer/Helper.php | 38 +++++++++++++++++++ administrator/language/en-GB/com_fields.ini | 6 +++ plugins/finder/contacts/contacts.php | 1 + plugins/finder/content/content.php | 1 + 6 files changed, 61 insertions(+) diff --git a/administrator/components/com_fields/forms/field.xml b/administrator/components/com_fields/forms/field.xml index 68becf1523927..19fb8a53dae38 100644 --- a/administrator/components/com_fields/forms/field.xml +++ b/administrator/components/com_fields/forms/field.xml @@ -328,6 +328,20 @@
    +
    + + + + + + +
    diff --git a/administrator/components/com_fields/tmpl/field/edit.php b/administrator/components/com_fields/tmpl/field/edit.php index a357d89c7928b..1a6f95a144c16 100644 --- a/administrator/components/com_fields/tmpl/field/edit.php +++ b/administrator/components/com_fields/tmpl/field/edit.php @@ -77,6 +77,7 @@
    + form->renderField('searchindexing'); ?>
    diff --git a/administrator/components/com_finder/src/Indexer/Helper.php b/administrator/components/com_finder/src/Indexer/Helper.php index fc3f13ab97794..8539c76707ce7 100644 --- a/administrator/components/com_finder/src/Indexer/Helper.php +++ b/administrator/components/com_finder/src/Indexer/Helper.php @@ -17,6 +17,7 @@ use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Plugin\PluginHelper; use Joomla\CMS\Table\Table; +use Joomla\Component\Fields\Administrator\Helper\FieldsHelper; use Joomla\Registry\Registry; use Joomla\String\StringHelper; @@ -432,6 +433,43 @@ public static function getContentExtras(Result $item) return true; } + /** + * Add custom fields for the item to the Result object + * + * @param Result $item Result object to add the custom fields to + * @param string $context Context of the item in the custom fields + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + public static function addCustomFields(Result $item, $context) + { + $obj = new \stdClass; + $obj->id = $item->id; + + $fields = FieldsHelper::getFields($context, $obj, true); + + foreach ($fields as $field) + { + $searchindex = $field->params->get('searchindex', 0); + + // We want to add this field to the search index + if ($searchindex == 1 || $searchindex == 3) + { + $name = 'jsfield_' . $field->name; + $item->$name = $field->value; + $item->addInstruction(Indexer::META_CONTEXT, $name); + } + + // We want to add this field as a taxonomy + if (($searchindex == 2 || $searchindex == 3) && $field->value) + { + $item->addTaxonomy($field->title, $field->value, $field->state, $field->access, $field->language); + } + } + } + /** * Method to process content text using the onContentPrepare event trigger. * diff --git a/administrator/language/en-GB/com_fields.ini b/administrator/language/en-GB/com_fields.ini index 138475daa335c..c8573bf25d9ad 100644 --- a/administrator/language/en-GB/com_fields.ini +++ b/administrator/language/en-GB/com_fields.ini @@ -57,8 +57,14 @@ COM_FIELDS_FIELD_RENDER_CLASS_LABEL="Display Class" COM_FIELDS_FIELD_RENDEROPTIONS_HEADING="Display Options" COM_FIELDS_FIELD_REQUIRED_LABEL="Required" COM_FIELDS_FIELD_SAVE_SUCCESS="Field saved" +COM_FIELDS_FIELD_SEARCHINDEX_BOTH="Make searchable and add as taxonomy" +COM_FIELDS_FIELD_SEARCHINDEX_DONT="Don't make searchable" +COM_FIELDS_FIELD_SEARCHINDEX_LABEL="Searchindex" +COM_FIELDS_FIELD_SEARCHINDEX_SEARCHABLE="Make searchable" +COM_FIELDS_FIELD_SEARCHINDEX_TAXONOMY="Add as taxonomy" COM_FIELDS_FIELD_SHOWLABEL_DESC="Show or Hide the label when the field displays." COM_FIELDS_FIELD_SHOWLABEL_LABEL="Label" +COM_FIELDS_FIELD_SMARTSEARCHOPTIONS_HEADING="Smart Search" COM_FIELDS_FIELD_SUFFIX_LABEL="Suffix" COM_FIELDS_FIELD_TYPE_LABEL="Type" COM_FIELDS_FIELD_USE_GLOBAL="Use settings from Plugin" diff --git a/plugins/finder/contacts/contacts.php b/plugins/finder/contacts/contacts.php index 45b587ccdbe1f..b916ebc134584 100644 --- a/plugins/finder/contacts/contacts.php +++ b/plugins/finder/contacts/contacts.php @@ -387,6 +387,7 @@ protected function index(Result $item) // Get content extras. Helper::getContentExtras($item); + Helper::addCustomFields($item, 'com_contact.contact'); // Index the item. $this->indexer->index($item); diff --git a/plugins/finder/content/content.php b/plugins/finder/content/content.php index dd18a3b4818ba..a3d1f707b2a22 100644 --- a/plugins/finder/content/content.php +++ b/plugins/finder/content/content.php @@ -343,6 +343,7 @@ protected function index(Result $item) // Get content extras. Helper::getContentExtras($item); + Helper::addCustomFields($item, 'com_content.article'); // Index the item. $this->indexer->index($item); From cc7e26d3d9708dd2ea14453dc82f9b3d6d354c24 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Fri, 20 May 2022 16:20:16 +0200 Subject: [PATCH 25/33] Initialize the contact text attribute as string (#37836) --- components/com_contact/src/View/Contact/HtmlView.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/com_contact/src/View/Contact/HtmlView.php b/components/com_contact/src/View/Contact/HtmlView.php index 8a2f9906faefa..af207dfbc37f2 100644 --- a/components/com_contact/src/View/Contact/HtmlView.php +++ b/components/com_contact/src/View/Contact/HtmlView.php @@ -341,7 +341,7 @@ public function display($tpl = null) $offset = $state->get('list.offset'); // Fix for where some plugins require a text attribute - $item->text = null; + $item->text = ''; if (!empty($item->misc)) { From 965723adc5734e26cd4473e3ccfaec53d9e0876b Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Fri, 20 May 2022 23:22:05 +0200 Subject: [PATCH 26/33] [4.1] Remove maximebf debugbar developer stuff from builds and on update (#37827) * Remove maximebf/debugbar developer files * Move down for better ordering --- administrator/components/com_admin/script.php | 80 +++++++++++++++++++ build/build.php | 8 ++ 2 files changed, 88 insertions(+) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 3f975de029dea..0f6d0e34f70ca 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -6387,6 +6387,66 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/administrator/components/com_users/src/Field/PrimaryauthprovidersField.php', // From 4.1.2 to 4.1.3 '/libraries/vendor/webmozart/assert/.php_cs', + // From 4.1.3 to 4.1.4 + '/libraries/vendor/maximebf/debugbar/.bowerrc', + '/libraries/vendor/maximebf/debugbar/bower.json', + '/libraries/vendor/maximebf/debugbar/build/namespaceFontAwesome.php', + '/libraries/vendor/maximebf/debugbar/demo/ajax.php', + '/libraries/vendor/maximebf/debugbar/demo/ajax_exception.php', + '/libraries/vendor/maximebf/debugbar/demo/bootstrap.php', + '/libraries/vendor/maximebf/debugbar/demo/bridge/cachecache/index.php', + '/libraries/vendor/maximebf/debugbar/demo/bridge/doctrine/bootstrap.php', + '/libraries/vendor/maximebf/debugbar/demo/bridge/doctrine/build.sh', + '/libraries/vendor/maximebf/debugbar/demo/bridge/doctrine/cli-config.php', + '/libraries/vendor/maximebf/debugbar/demo/bridge/doctrine/index.php', + '/libraries/vendor/maximebf/debugbar/demo/bridge/doctrine/src/Demo/Product.php', + '/libraries/vendor/maximebf/debugbar/demo/bridge/monolog/index.php', + '/libraries/vendor/maximebf/debugbar/demo/bridge/propel/build.properties', + '/libraries/vendor/maximebf/debugbar/demo/bridge/propel/build.sh', + '/libraries/vendor/maximebf/debugbar/demo/bridge/propel/index.php', + '/libraries/vendor/maximebf/debugbar/demo/bridge/propel/runtime-conf.xml', + '/libraries/vendor/maximebf/debugbar/demo/bridge/propel/schema.xml', + '/libraries/vendor/maximebf/debugbar/demo/bridge/slim/index.php', + '/libraries/vendor/maximebf/debugbar/demo/bridge/swiftmailer/index.php', + '/libraries/vendor/maximebf/debugbar/demo/bridge/twig/foobar.html', + '/libraries/vendor/maximebf/debugbar/demo/bridge/twig/hello.html', + '/libraries/vendor/maximebf/debugbar/demo/bridge/twig/index.php', + '/libraries/vendor/maximebf/debugbar/demo/dump_assets.php', + '/libraries/vendor/maximebf/debugbar/demo/index.php', + '/libraries/vendor/maximebf/debugbar/demo/open.php', + '/libraries/vendor/maximebf/debugbar/demo/pdo.php', + '/libraries/vendor/maximebf/debugbar/demo/stack.php', + '/libraries/vendor/maximebf/debugbar/docs/ajax_and_stack.md', + '/libraries/vendor/maximebf/debugbar/docs/base_collectors.md', + '/libraries/vendor/maximebf/debugbar/docs/bridge_collectors.md', + '/libraries/vendor/maximebf/debugbar/docs/data_collectors.md', + '/libraries/vendor/maximebf/debugbar/docs/data_formatter.md', + '/libraries/vendor/maximebf/debugbar/docs/http_drivers.md', + '/libraries/vendor/maximebf/debugbar/docs/javascript_bar.md', + '/libraries/vendor/maximebf/debugbar/docs/manifest.json', + '/libraries/vendor/maximebf/debugbar/docs/openhandler.md', + '/libraries/vendor/maximebf/debugbar/docs/rendering.md', + '/libraries/vendor/maximebf/debugbar/docs/screenshot.png', + '/libraries/vendor/maximebf/debugbar/docs/storage.md', + '/libraries/vendor/maximebf/debugbar/docs/style.css', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataCollector/AggregatedCollectorTest.php', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataCollector/ConfigCollectorTest.php', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataCollector/MessagesCollectorTest.php', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataCollector/MockCollector.php', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataCollector/Propel2CollectorTest.php', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataCollector/TimeDataCollectorTest.php', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataFormatter/DataFormatterTest.php', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataFormatter/DebugBarVarDumperTest.php', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DebugBarTest.php', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DebugBarTestCase.php', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/JavascriptRendererTest.php', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/MockHttpDriver.php', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/OpenHandlerTest.php', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/Storage/FileStorageTest.php', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/Storage/MockStorage.php', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/TracedStatementTest.php', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/full_init.html', + '/libraries/vendor/maximebf/debugbar/tests/bootstrap.php', ); $folders = array( @@ -7720,6 +7780,26 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/libraries/vendor/tobscure/json-api/.git/hooks', '/libraries/vendor/tobscure/json-api/.git/branches', '/libraries/vendor/tobscure/json-api/.git', + // From 4.1.3 to 4.1.4 + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/Storage', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataFormatter', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/DataCollector', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests', + '/libraries/vendor/maximebf/debugbar/tests/DebugBar', + '/libraries/vendor/maximebf/debugbar/tests', + '/libraries/vendor/maximebf/debugbar/docs', + '/libraries/vendor/maximebf/debugbar/demo/bridge/twig', + '/libraries/vendor/maximebf/debugbar/demo/bridge/swiftmailer', + '/libraries/vendor/maximebf/debugbar/demo/bridge/slim', + '/libraries/vendor/maximebf/debugbar/demo/bridge/propel', + '/libraries/vendor/maximebf/debugbar/demo/bridge/monolog', + '/libraries/vendor/maximebf/debugbar/demo/bridge/doctrine/src/Demo', + '/libraries/vendor/maximebf/debugbar/demo/bridge/doctrine/src', + '/libraries/vendor/maximebf/debugbar/demo/bridge/doctrine', + '/libraries/vendor/maximebf/debugbar/demo/bridge/cachecache', + '/libraries/vendor/maximebf/debugbar/demo/bridge', + '/libraries/vendor/maximebf/debugbar/demo', + '/libraries/vendor/maximebf/debugbar/build', ); $status['files_checked'] = $files; diff --git a/build/build.php b/build/build.php index d92bf8fd264c9..b32dd923fbab6 100644 --- a/build/build.php +++ b/build/build.php @@ -115,6 +115,8 @@ function clean_checkout(string $dir) system('find libraries/vendor -name .pullapprove.yml | xargs rm -rf -'); system('find libraries/vendor -name phpstan.neon | xargs rm -rf -'); system('find libraries/vendor -name _config.yml | xargs rm -rf -'); + system('find libraries/vendor -name .bowerrc | xargs rm -rf -'); + system('find libraries/vendor -name bower.json | xargs rm -rf -'); system('rm -rf libraries/vendor/bin'); // aldo26-matthias/idna-convert @@ -147,6 +149,12 @@ function clean_checkout(string $dir) system('rm -rf images/sampledata/parks'); system('rm -rf images/sampledata/fruitshop'); + // maximebf/debugbar + system('rm -rf libraries/vendor/maximebf/debugbar/build'); + system('rm -rf libraries/vendor/maximebf/debugbar/demo'); + system('rm -rf libraries/vendor/maximebf/debugbar/docs'); + system('rm -rf libraries/vendor/maximebf/debugbar/tests'); + // paragonie/sodium_compat system('rm -rf libraries/vendor/paragonie/sodium_compat/build-phar.sh'); From 444965e0b7d5f0e393691d86d9f634989ebad383 Mon Sep 17 00:00:00 2001 From: joomla-translation-bot <87496051+joomla-translation-bot@users.noreply.github.com> Date: Fri, 20 May 2022 23:37:30 +0200 Subject: [PATCH 27/33] Translation Update (#37835) * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update --- installation/language/ru-RU/joomla.ini | 129 ++++++++++++------- installation/language/ru-RU/langmetadata.xml | 38 +++--- 2 files changed, 98 insertions(+), 69 deletions(-) diff --git a/installation/language/ru-RU/joomla.ini b/installation/language/ru-RU/joomla.ini index 6ac83f85206cb..afc5052157f96 100644 --- a/installation/language/ru-RU/joomla.ini +++ b/installation/language/ru-RU/joomla.ini @@ -1,35 +1,43 @@ -; Joomla! Project -; (C) 2005 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 +; Joomla! Project +; Copyright (C) 2005 - 2022 Open Source Matters, Inc. +; License GNU General Public License version 2 or later; see LICENSE.txt +; Note : This file needs to be saved as UTF-8 -; Fatal error page -; These will be processed by the JavaScript Build -BUILD_FATAL_HEADER="Произошла критическая ошибка" -BUILD_FATAL_LANGUAGE="Русский RU" -BUILD_FATAL_TEXT="Сервер вернул ответ \"{{statusCode_statusText}}\"." +; Fatal error page +; These will be processed by the Javascript Build +BUILD_FATAL_HEADER="Произошла критическая ошибка" +BUILD_FATAL_LANGUAGE="Русский RU" +BUILD_FATAL_TEXT="Сервер вернул ответ \"{{statusCode_statusText}}\"." BUILD_FATAL_URL_TEXT="Подробнее о решении проблемы" -; These will be processed by the JavaScript Build + +; Build incomplete error page +; These will be processed by the Javascript Build BUILD_INCOMPLETE_HEADER="Настройка среды не завершена" BUILD_INCOMPLETE_LANGUAGE="Русский RU" BUILD_INCOMPLETE_TEXT="Похоже, вы пытаетесь установить Joomla из нашего Git-репозитория. Пожалуйста, выполните несколько дополнительных шагов перед началом установки." BUILD_INCOMPLETE_URL_TEXT="Подробнее" -; These will be processed by the JavaScript Build -BUILD_NOXML_HEADER="В используемой версии PHP отключена поддержка XML" -BUILD_NOXML_LANGUAGE="Русский RU" -BUILD_NOXML_TEXT="Для установки Joomla на сервере необходимо наличие PHP с поддержкой XML." + +; No XML PHP error page +; These will be processed by the Javascript Build +BUILD_NOXML_HEADER="В используемой версии PHP отключена поддержка XML" +BUILD_NOXML_LANGUAGE="Русский RU" +BUILD_NOXML_TEXT="Для установки Joomla на сервере необходимо наличие PHP с поддержкой XML." BUILD_NOXML_URL_TEXT="Подробнее о решении проблемы" -; These will be processed by the JavaScript Build + +; Minimum PHP error page +; These will be processed by the Javascript Build BUILD_MIN_PHP_ERROR_HEADER="Используемая версия PHP не поддерживается" BUILD_MIN_PHP_ERROR_LANGUAGE="Русский RU" BUILD_MIN_PHP_ERROR_TEXT="Для установки Joomla на сервере необходимо наличие PHP {{phpversion}} или более новой версии." BUILD_MIN_PHP_ERROR_URL_TEXT="Подробнее о решении проблемы" + ; Main Config INSTL_SELECT_INSTALL_LANG="Параметры языка" INSTL_SELECT_LANGUAGE_TITLE="Язык установки" INSTL_SETUP_LOGIN_DATA="Параметры учетной записи" INSTL_WARNJAVASCRIPT="Для установки Joomla в браузере должен быть включен Javascript." INSTL_WARNJSON="Для установки Joomla в PHP должен быть включен JSON." + ; Precheck view INSTL_DATABASE_SUPPORT="Поддержка баз данных" INSTL_JSON_SUPPORT_AVAILABLE="Поддержка JSON" @@ -52,6 +60,7 @@ INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Рекомендуемые парам INSTL_PRECHECK_TITLE="Начальная проверка" INSTL_XML_SUPPORT="Поддержка XML" INSTL_ZLIB_COMPRESSION_SUPPORT="Поддержка Zlib" + ; Database view INSTL_DATABASE="Параметры базы данных" INSTL_DATABASE_ENCRYPTION_CA_LABEL="Путь к файлу CA" @@ -89,61 +98,67 @@ INSTL_DATABASE_VALIDATION_ERROR="Проверьте тип, учетные да INSTL_CONNECT_DB="Параметры базы данных" INSTL_INSTALL_JOOMLA="Установить Joomla" -; Site View -INSTL_ADMIN_EMAIL_DESC="Адрес e-mail администратора сайта" -INSTL_ADMIN_PASSWORD_DESC="Пароль администратора сайта" -INSTL_ADMIN_PASSWORD_LENGTH="Длина пароля должна быть не менее 12 символов." -INSTL_ADMIN_USER_DESC="Имя администратора сайта" -INSTL_ADMIN_USERNAME_DESC="Логин администратора сайта" + +; Site view +INSTL_ADMIN_EMAIL_DESC="E-mail администратора" +INSTL_ADMIN_PASSWORD_DESC="Пароль администратора" +INSTL_ADMIN_PASSWORD_LENGTH="Длина пароля должна быть не менее 12 символов" +INSTL_ADMIN_USER_DESC="Имя администратора" +INSTL_ADMIN_USERNAME_DESC="Логин администратора" INSTL_LOGIN_DATA="Параметры учетной записи" INSTL_SETUP_SITE_NAME="Параметры сайта" INSTL_SITE="Параметры сайта" INSTL_SITE_DEVMODE_LABEL="Обнаружен режим разработки" INSTL_SITE_NAME_DESC="Название сайта" + ; Complete view INSTL_COMPLETE_ERROR_FOLDER_DELETE="Не удалось удалить каталог \"%s\". Пожалуйста, удалите его вручную." INSTL_COMPLETE_REMOVE_FOLDER="Удалить каталог \"%s\"" INSTL_COMPLETE_CONGRAT="Завершение установки" INSTL_COMPLETE_TITLE="Поздравляем! Вы успешно установили Joomla!" -INSTL_COMPLETE_SITE_BTN="Завершить и открыть сайт" -INSTL_COMPLETE_ADMIN_BTN="Завершить и открыть панель управления" +INSTL_COMPLETE_SITE_BTN="Открыть сайт" +INSTL_COMPLETE_ADMIN_BTN="Открыть панель управления" INSTL_COMPLETE_FINAL="Установка завершена" INSTL_COMPLETE_FINAL_DESC="Установка Joomla успешно завершена и готова к использованию." -INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Установить дополнительные языковые пакеты" +INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Установить языковые пакеты" INSTL_REMOVE_INST_FOLDER="Вы уверены, что хотите удалить каталог \"%s\"?" + ; Languages view INSTL_LANGUAGES="Установка языковых пакетов" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Язык" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="Выбрать" -INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Тег" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Тег языка" INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Версия" INSTL_LANGUAGES_DESC="Интерфейс Joomla доступен на множестве языков. Выберите необходимые языковые пакеты и нажмите \"Далее\".

    На установку каждого языкового пакета необходимо около 10 секунд. Не рекомендуется выбирать более трех языковых пакетов одновременно." INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="На установку каждого языкового пакета необходимо около 10 секунд. Пожалуйста, подождите пока языковые пакеты будут загружены и установлены." INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Пожалуйста, выберите языковые пакеты для установки." INSTL_LANGUAGES_WARNING_NO_INTERNET="Не удалось подключиться к серверу языковых пакетов Joomla! Пожалуйста, завершите процесс установки." -INSTL_LANGUAGES_WARNING_NO_INTERNET2="Вы сможете установить языковые пакеты позже в панели управления Joomla." +INSTL_LANGUAGES_WARNING_NO_INTERNET2="Вы можете установить языковые пакеты позже в панели управления Joomla." INSTL_LANGUAGES_WARNING_BACK_BUTTON="Назад" + ; Default language view INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Язык панели управления" -INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Не удалось изменить значение языка по умолчанию для панели управления. По умолчанию языком панели управления установлен \"английский\"." +INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Не удалось изменить значение языка по умолчанию для панели управления. По умолчанию установлен язык \"English (en-GB)\"." INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Язык \"%s\" установлен по умолчанию для панели управления." INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Выбрать" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Язык" -INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Тег" -INSTL_DEFAULTLANGUAGE_COULD_NOT_DOWNLOAD_PACKAGE="Не удалось загрузить или распаковать языковой пакет по URL: %s." +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Тег языка" +INSTL_DEFAULTLANGUAGE_COULD_NOT_DOWNLOAD_PACKAGE="Не удалось загрузить или распаковать языковой пакет по ссылке %s." INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Не удалось установить языковой пакет \"%s\"." INSTL_DEFAULTLANGUAGE_DESC="Языковые пакеты установлены. Пожалуйста, выберите язык по умолчанию для панели управления и нажмите \"Установить по умолчанию\"." INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Языковые пакеты установлены. Пожалуйста, выберите язык по умолчанию для сайта и нажмите \"Установить по умолчанию\"." INSTL_DEFAULTLANGUAGE_FRONTEND="Язык сайта" -INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Не удалось изменить значение языка по умолчанию для сайта. По умолчанию языком сайта установлен \"английский\"." +INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Не удалось изменить значение языка по умолчанию для сайта. По умолчанию установлен язык \"English (en-GB)\"." INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Язык \"%s\" установлен по умолчанию для сайта." INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Установить по умолчанию" -INSTL_DEFAULTLANGUAGE_TRY_LATER="Вы сможете установить его позже в панели управления Joomla." +INSTL_DEFAULTLANGUAGE_TRY_LATER="Вы можете установить его позже в панели управления Joomla." + +; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español +INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Русский (RU)" -INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Русский (RU)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español ; Database Model INSTL_DATABASE_COULD_NOT_CONNECT="Не удалось подключиться к базе данных: %s." -INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Не удалось подключиться к базе данных и не удалось создать базу данных. Пожалуйста, проверьте параметры и при необходимости создайте базу данных вручную." +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Не удалось подключиться к базе данных и не удалось создать таблицы базы данных. Пожалуйста, проверьте параметры и при необходимости создайте базу данных вручную." INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Не удалось обновить кэш манифеста: %s." INSTL_DATABASE_ERROR_BACKINGUP="При создании резервной копии базы данных произошла ошибка." INSTL_DATABASE_ERROR_CREATE="При создании базы данных произошла ошибка: %s.

    Возможно, у пользователя недостаточно прав для создания базы данных. В таком случае базу данных необходимо создать вручную до начала установки Joomla." @@ -164,14 +179,18 @@ INSTL_DATABASE_INVALID_TYPE="Пожалуйста, выберите тип ба INSTL_DATABASE_NAME_INVALID_CHAR="Идентификатор MySQL не может содержать NULL ASCII(0x00)." INSTL_DATABASE_NAME_INVALID_SPACES="Имя базы данных и таблиц MySQL не должны содержать пробелов в начале или конце строки." INSTL_DATABASE_NAME_TOO_LONG="Имя базы данных MySQL должно содержать не более 64 символов." + ; Controllers -INSTL_COOKIES_NOT_ENABLED="В браузере отключено использование файлов cookies или на сервере некорректно работает директива session.save_path. Пожалуйста, обратитесь в администрацию хостинга, если вы не знаете, как это проверить или исправить самостоятельно." +INSTL_COOKIES_NOT_ENABLED="В браузере отключено использование файлов cookies или на сервере некорректно работает директива session.save_path. Пожалуйста, обратитесь к администрации хостинга, если вы не знаете, как это проверить или исправить самостоятельно." INSTL_HEADER_ERROR="Ошибка" + ; Helpers INSTL_PAGE_TITLE="Мастер установки Joomla!" + ; Configuration model INSTL_ERROR_CONNECT_DB="Не удалось подключиться к базе данных. Текст ошибки: %s" INSTL_STD_OFFLINE_MSG="Сайт закрыт на техническое обслуживание. Пожалуйста, зайдите позже." + ; Others INSTL_CONFPROBLEM="Файл конфигурации недоступен для записи или при его создании произошла ошибка. Необходимо вручную создать текстовый файл, переименовать его в configuration.php, выделить/скопировать отображаемый код и вставить в него, а затем разместить файл конфигурации в корневом каталоге сайта." INSTL_DISPLAY_ERRORS="Отображение ошибок" @@ -186,20 +205,21 @@ INSTL_NOTICE_NEEDSTOBEWRITABLE="Вы по-прежнему можете прод INSTL_OUTPUT_BUFFERING="Буферизация вывода" INSTL_PHP_VERSION="Версия PHP" INSTL_PHP_VERSION_NEWER="Версия PHP >= %s" -INSTL_PROCESS_BUSY="Выполняется процесс установки. Пожалуйста, подождите..." +INSTL_PROCESS_BUSY="Подождите, выполняется установка..." INSTL_SESSION_AUTO_START="Session Auto Start" INSTL_WRITABLE="Недостаточно прав для создания файла %s." INSTL_ZIP_SUPPORT_AVAILABLE="Поддержка ZIP" + ; Global strings JADMINISTRATOR="Панель управления" JEMAIL="E-mail" JERROR="Ошибка" JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="При обработке запроса произошла ошибка." JGLOBAL_ISFREESOFTWARE="%s - программное обеспечение, распространяемое по лицензии %s." -JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Языковой пакет не соответствует версии Joomla! Некоторые константы могут отсутствовать и будут отображаться на английском языке." +JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Языковой пакет не соответствует версии Joomla. Некоторые языковые константы могут отображаться на английском языке." JGLOBAL_SELECT_AN_OPTION="Выберите значение" JGLOBAL_SELECT_NO_RESULTS_MATCH="Ничего не найдено." -JGLOBAL_SELECT_SOME_OPTIONS="Выберите несколько значений" +JGLOBAL_SELECT_SOME_OPTIONS="Выберите одно или несколько значений" JHIDEPASSWORD="Скрыть пароль" JINVALID_TOKEN="Последний запрос был отклонен из-за некорректного токена безопасности. Пожалуйста, обновите страницу и попробуйте еще раз." JINVALID_TOKEN_NOTICE="Токен безопасности не прошел проверку! Запрос был прерван. Пожалуйста, обновите страницу и попробуйте еще раз." @@ -214,6 +234,7 @@ JSITE="Сайт" JSKIP="Пропустить" JUSERNAME="Имя пользователя" JYES="Да" + ; Framework strings necessary when no lang pack is available JLIB_DATABASE_ERROR_CONNECT_MYSQL="Не удалось подключиться к MySQL." JLIB_DATABASE_ERROR_DATABASE="Произошла ошибка базы данных." @@ -225,54 +246,62 @@ JLIB_FORM_FIELD_INVALID="Некорректно заполнено поле: JLIB_FORM_VALIDATE_FIELD_INVALID="Некорректно заполнено поле: %s." JLIB_FORM_VALIDATE_FIELD_REQUIRED="Необходимо заполнить поле: %s." JLIB_INSTALLER_ABORT="Отмена установки языкового пакета: %s." -JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Расширение: %1$s: Не удалось создать каталог: %2$s." +JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Расширение: %1$s: Не удалось создать каталог: %2$s." JLIB_INSTALLER_ABORT_NOINSTALLPATH="Пути установки не существует." JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Пакет: %1$s: В процессе установки произошла ошибка: %2$s." JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="Пакет: %s: Не удалось найти файлы для установки." JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Не удалось скопировать файл %1$s в %2$s." JLIB_INSTALLER_INSTALL="Установка" -JLIB_INSTALLER_NOT_ERROR="Если ошибка связана с установкой языковых файлов TinyMCE, она не влияет на установку языковых пакетов. Некоторые пакеты, созданные до версии Joomla 3.2.0, могут пытаться установить отдельные языковые файлы TinyMCE. Поскольку в настоящее время они включены в ядро, их больше не нужно устанавливать отдельно." +JLIB_INSTALLER_NOT_ERROR="Если ошибка связана с установкой языковых файлов TinyMCE, она не влияет на установку языковых пакетов. Некоторые пакеты, которые созданы до версии Joomla 3.2, могут пытаться установить отдельные языковые файлы TinyMCE. Поскольку в настоящее время они включены в ядро, в их установке нет необходимости." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Не удалось создать язык контента для языка %s: %s." -JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Для использования функции обновления необходимо в конфигурации PHP включить директиву allow_url_fopen." -JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: Не удалось открыть %s." +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Для использования функции обновления необходимо в конфигурации PHP включить директиву allow_url_fopen." +JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: Не удалось открыть %s." JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: Не удалось обработать %s." -JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Не удалось открыть сервер обновлений \"%s\" (ID %d): %s." +JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Не удалось открыть сервер обновлений \"%2$s\" (ID %1$s): %3$s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Не удалось подключиться к базе данных.
    joomla.library: %1$s - %2$s" + ; Strings for the language debugger JDEBUG_LANGUAGE_FILES_IN_ERROR="Ошибки парсинга в языковых файлах" JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Непереведенные строки" JNONE="Нет" + ; Necessary for errors ADMIN_EMAIL="E-mail администратора" ADMIN_PASSWORD="Пароль администратора" SITE_NAME="Название сайта" + ; Database types (allows for a more descriptive label than the internal name) -MYSQL="MySQL (PDO)" -MYSQLI="MySQLi" -ORACLE="Oracle" -PGSQL="PostgreSQL (PDO)" -POSTGRESQL="PostgreSQL" +MYSQL="MySQL (PDO)" +MYSQLI="MySQLi" +ORACLE="Oracle" +PGSQL="PostgreSQL (PDO)" +POSTGRESQL="PostgreSQL" SQLITE="SQLite" + ; Javascript message titles ERROR="Ошибка" MESSAGE="Сообщение" NOTICE="Внимание" WARNING="Предупреждение" + ; Javascript ajax error messages JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Произошла ошибка соединения при получении данных JSON." JLIB_JS_AJAX_ERROR_NO_CONTENT="Содержимое не было возвращено." -JLIB_JS_AJAX_ERROR_OTHER="Произошла ошибка при получении данных JSON. Код состояния HTTP %d." +JLIB_JS_AJAX_ERROR_OTHER="Произошла ошибка при получении данных JSON. Код состояния HTTP %s." JLIB_JS_AJAX_ERROR_PARSE="Произошла ошибка парсинга при обработке данных JSON:
    %s" JLIB_JS_AJAX_ERROR_TIMEOUT="Превышено время ожидания ответа при получении данных JSON." + ; Field password messages JFIELD_PASSWORD_INDICATE_COMPLETE="Пароль соответствует необходимым требованиям" JFIELD_PASSWORD_INDICATE_INCOMPLETE="Пароль не соответствует необходимым требованиям" JFIELD_PASSWORD_SPACES_IN_PASSWORD="Пароль не должен содержать пробелов в начале или конце строки." JFIELD_PASSWORD_TOO_LONG="Пароль слишком длинный. Длина пароля должна быть менее 100 символов." -JFIELD_PASSWORD_TOO_SHORT_N="Пароль слишком короткий. Пароль должен содержать не менее %d символов." +JFIELD_PASSWORD_TOO_SHORT_N_1="Пароль слишком короткий. Длина пароля должна быть не менее %d символа." +JFIELD_PASSWORD_TOO_SHORT_N_2="Пароль слишком короткий. Длина пароля должна быть не менее %d символов." +JFIELD_PASSWORD_TOO_SHORT_N="Пароль слишком короткий. Длина пароля должна быть не менее %d символов." + ; Javascript Form Validation Messages JLIB_FORM_CONTAINS_INVALID_FIELDS="Форма не может быть отправлена, так как одно или несколько полей заполнено некорректно." JLIB_FORM_FIELD_INVALID_VALUE="Пожалуйста, введите корректное значение" JLIB_FORM_FIELD_REQUIRED_CHECK="Пожалуйста, выберите значение" JLIB_FORM_FIELD_REQUIRED_VALUE="Пожалуйста, заполните поле" - diff --git a/installation/language/ru-RU/langmetadata.xml b/installation/language/ru-RU/langmetadata.xml index a7b539bddeeee..3e44b3ad211b8 100644 --- a/installation/language/ru-RU/langmetadata.xml +++ b/installation/language/ru-RU/langmetadata.xml @@ -1,19 +1,19 @@ - - - Russian (Russia) - 4.1.4 - May 2022 - Russian Translation Team - (C) 2005 Open Source Matters, Inc. - GNU General Public License version 2 or later; see LICENSE.txt - - joomla.ini - - - Russian (ru-RU) - Русский (Россия) - ru-RU - 0 - - - + + + Russian (Russia) + 4.1.3.1 + May 2022 + Russian Translation Team + (C) 2005 Open Source Matters, Inc. + GNU General Public License version 2 or later; see LICENSE.txt + + joomla.ini + + + Russian (ru-RU) + Русский (Россия) + ru-RU + 0 + + + From eb26a4a9da225ae27e12f83756245f33162d495d Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sat, 21 May 2022 16:50:15 +0200 Subject: [PATCH 28/33] Update deleted files and folders for 4.2-alpha3 (#37848) --- administrator/components/com_admin/script.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 66924cfd9f161..c88f6f5dd6e65 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -6387,8 +6387,6 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/administrator/components/com_users/src/Field/PrimaryauthprovidersField.php', // From 4.1.2 to 4.1.3 '/libraries/vendor/webmozart/assert/.php_cs', - // From 4.1 to 4.2.0 - '/libraries/src/Service/Provider/ApiRouter.php', // From 4.1.3 to 4.1.4 '/libraries/vendor/maximebf/debugbar/.bowerrc', '/libraries/vendor/maximebf/debugbar/bower.json', @@ -6449,6 +6447,11 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/TracedStatementTest.php', '/libraries/vendor/maximebf/debugbar/tests/DebugBar/Tests/full_init.html', '/libraries/vendor/maximebf/debugbar/tests/bootstrap.php', + // From 4.1 to 4.2.0 + '/libraries/src/Service/Provider/ApiRouter.php', + '/libraries/vendor/nyholm/psr7/doc/final.md', + '/modules/mod_articles_news/mod_articles_news.php', + '/plugins/system/cache/cache.php', ); $folders = array( @@ -7802,6 +7805,8 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/libraries/vendor/maximebf/debugbar/demo/bridge', '/libraries/vendor/maximebf/debugbar/demo', '/libraries/vendor/maximebf/debugbar/build', + // From 4.1 to 4.2.0 + '/libraries/vendor/nyholm/psr7/doc', ); $status['files_checked'] = $files; From 80a99c3768f510fe18230d6516ddc398a9572074 Mon Sep 17 00:00:00 2001 From: Thomas Hunziker Date: Sat, 21 May 2022 19:31:41 +0200 Subject: [PATCH 29/33] Check if language file is for selected language before processing. (#37809) Co-authored-by: Thomas Hunziker Co-authored-by: Allon Moritz Co-authored-by: Roland Dalmulder --- .../components/com_languages/src/Model/StringsModel.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/administrator/components/com_languages/src/Model/StringsModel.php b/administrator/components/com_languages/src/Model/StringsModel.php index b79ba3b62c92e..55a662f2dc6ff 100644 --- a/administrator/components/com_languages/src/Model/StringsModel.php +++ b/administrator/components/com_languages/src/Model/StringsModel.php @@ -91,6 +91,12 @@ public function refresh() // Parse all found ini files and add the strings to the database cache. foreach ($files as $file) { + // Only process if language file is for selected language + if (strpos($file, $language, strlen($base)) === false) + { + continue; + } + $strings = LanguageHelper::parseIniFile($file); if ($strings) From bf95455b2991131555e62109ceadc244c439ef7c Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Sat, 21 May 2022 20:18:55 +0200 Subject: [PATCH 30/33] [4.2] Convert basic API auth plugin to services (#37803) * Convert basic api auth plugin to services * Load user by factory * spelling * visibility * Update plugins/api-authentication/basic/basic.xml Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> * Update plugins/api-authentication/basic/services/provider.php Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> * lang files * Update plugins/api-authentication/basic/basic.xml Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> * Update plugins/api-authentication/basic/services/provider.php Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> * doc * Update plugins/api-authentication/basic/services/provider.php Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> * Update plugins/api-authentication/basic/src/Basic.php Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> * Extension ns Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> Co-authored-by: Roland Dalmulder --- plugins/api-authentication/basic/basic.xml | 8 +-- .../basic/services/provider.php | 49 ++++++++++++++++++ .../{basic.php => src/Extension/Basic.php} | 50 +++++++++++++------ 3 files changed, 90 insertions(+), 17 deletions(-) create mode 100644 plugins/api-authentication/basic/services/provider.php rename plugins/api-authentication/basic/{basic.php => src/Extension/Basic.php} (64%) diff --git a/plugins/api-authentication/basic/basic.xml b/plugins/api-authentication/basic/basic.xml index 4e3c90c7fb172..4bc18acc159aa 100644 --- a/plugins/api-authentication/basic/basic.xml +++ b/plugins/api-authentication/basic/basic.xml @@ -9,11 +9,13 @@ www.joomla.org 4.0.0 PLG_API-AUTHENTICATION_BASIC_XML_DESCRIPTION + Joomla\Plugin\ApiAuthentication\Basic - basic.php + services + src - language/en-GB/plg_authentication_api_basic.ini - language/en-GB/plg_authentication_api_basic.sys.ini + language/en-GB/plg_api-authentication_basic.ini + language/en-GB/plg_api-authentication_basic.sys.ini diff --git a/plugins/api-authentication/basic/services/provider.php b/plugins/api-authentication/basic/services/provider.php new file mode 100644 index 0000000000000..77278ea99d0cc --- /dev/null +++ b/plugins/api-authentication/basic/services/provider.php @@ -0,0 +1,49 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +defined('_JEXEC') or die; + +use Joomla\CMS\Extension\PluginInterface; +use Joomla\CMS\Plugin\PluginHelper; +use Joomla\CMS\User\UserFactoryInterface; +use Joomla\Database\DatabaseInterface; +use Joomla\DI\Container; +use Joomla\DI\ServiceProviderInterface; +use Joomla\Event\DispatcherInterface; +use Joomla\Plugin\ApiAuthentication\Basic\Extension\Basic; + +return new class implements ServiceProviderInterface +{ + /** + * Registers the service provider with a DI container. + * + * @param Container $container The DI container. + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + public function register(Container $container) + { + $container->set( + PluginInterface::class, + function (Container $container) + { + $plugin = new Basic( + $container->get(DispatcherInterface::class), + (array) PluginHelper::getPlugin('api-authentication', 'basic'), + $container->get(UserFactoryInterface::class) + ); + $plugin->setDatabase($container->get(DatabaseInterface::class)); + + return $plugin; + } + ); + } +}; diff --git a/plugins/api-authentication/basic/basic.php b/plugins/api-authentication/basic/src/Extension/Basic.php similarity index 64% rename from plugins/api-authentication/basic/basic.php rename to plugins/api-authentication/basic/src/Extension/Basic.php index 44cd2ad57292e..89998499ca7ee 100644 --- a/plugins/api-authentication/basic/basic.php +++ b/plugins/api-authentication/basic/src/Extension/Basic.php @@ -1,42 +1,64 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +namespace Joomla\Plugin\ApiAuthentication\Basic\Extension; + defined('_JEXEC') or die; +use Joomla\CMS\Application\CMSApplicationInterface; use Joomla\CMS\Authentication\Authentication; -use Joomla\CMS\Language\Text; use Joomla\CMS\Plugin\CMSPlugin; -use Joomla\CMS\User\User; +use Joomla\CMS\User\UserFactoryInterface; use Joomla\CMS\User\UserHelper; +use Joomla\Database\DatabaseAwareTrait; +use Joomla\Event\DispatcherInterface; /** * Joomla Authentication plugin * * @since 4.0.0 */ -class PlgApiAuthenticationBasic extends CMSPlugin +final class Basic extends CMSPlugin { + use DatabaseAwareTrait; + /** * The application object * - * @var \Joomla\CMS\Application\CMSApplicationInterface + * @var CMSApplicationInterface * @since 4.0.0 */ protected $app; /** - * The application object + * The user factory * - * @var \Joomla\Database\DatabaseInterface - * @since 4.0.0 + * @var UserFactoryInterface + * @since __DEPLOY_VERSION__ + */ + private $userFactory; + + /** + * Constructor. + * + * @param DispatcherInterface $dispatcher The dispatcher + * @param array $config An optional associative array of configuration settings + * @param UserFactoryInterface $userFactory The user factory + * + * @since __DEPLOY_VERSION__ */ - protected $db; + public function __construct(DispatcherInterface $dispatcher, array $config, UserFactoryInterface $userFactory) + { + parent::__construct($dispatcher, $config); + + $this->userFactory = $userFactory; + } /** * This method should handle any authentication and report back to the subject @@ -59,12 +81,12 @@ public function onUserAuthenticate($credentials, $options, &$response) if ($password === '') { $response->status = Authentication::STATUS_FAILURE; - $response->error_message = Text::_('JGLOBAL_AUTH_EMPTY_PASS_NOT_ALLOWED'); + $response->error_message = $this->app->getLanguage()->_('JGLOBAL_AUTH_EMPTY_PASS_NOT_ALLOWED'); return; } - $db = $this->db; + $db = $this->getDatabase(); $query = $db->getQuery(true) ->select($db->quoteName(['id', 'password'])) ->from($db->quoteName('#__users')) @@ -81,7 +103,7 @@ public function onUserAuthenticate($credentials, $options, &$response) if ($match === true) { // Bring this in line with the rest of the system - $user = User::getInstance($result->id); + $user = $this->userFactory->loadUserById($result->id); $response->email = $user->email; $response->fullname = $user->name; $response->username = $username; @@ -103,7 +125,7 @@ public function onUserAuthenticate($credentials, $options, &$response) { // Invalid password $response->status = Authentication::STATUS_FAILURE; - $response->error_message = Text::_('JGLOBAL_AUTH_INVALID_PASS'); + $response->error_message = $this->app->getLanguage()->_('JGLOBAL_AUTH_INVALID_PASS'); } } else @@ -114,7 +136,7 @@ public function onUserAuthenticate($credentials, $options, &$response) // Invalid user $response->status = Authentication::STATUS_FAILURE; - $response->error_message = Text::_('JGLOBAL_AUTH_NO_USER'); + $response->error_message = $this->app->getLanguage()->_('JGLOBAL_AUTH_NO_USER'); } } } From 6be6d8093ff506c793196b64e5e07ec79291584a Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Sat, 21 May 2022 21:01:21 +0200 Subject: [PATCH 31/33] [4.2] Convert token API auth plugin to services (#37804) * Convert token api auth plugin to services * cs * final * Update plugins/api-authentication/token/services/provider.php Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> * Inject filter * Use the model to load the plugin params * Update plugins/api-authentication/token/services/provider.php Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> * Update plugins/api-authentication/token/services/provider.php Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> * Update plugins/api-authentication/token/services/provider.php Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> * Update plugins/api-authentication/token/src/Extension/Token.php Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> * Update plugins/api-authentication/token/token.xml Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> * Update plugins/api-authentication/token/src/Extension/Token.php Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> * Update plugins/api-authentication/token/src/Extension/Token.php Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> * Update plugins/api-authentication/token/src/Extension/Token.php Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> * Update administrator/components/com_plugins/src/Model/PluginModel.php Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> * Update administrator/components/com_plugins/src/Model/PluginModel.php Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> * Update plugins/api-authentication/token/src/Extension/Token.php Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com> Co-authored-by: Roland Dalmulder --- .../com_plugins/src/Model/PluginModel.php | 21 ++- .../token/services/provider.php | 51 +++++++ .../{token.php => src/Extension/Token.php} | 124 ++++++++++-------- plugins/api-authentication/token/token.xml | 4 +- 4 files changed, 137 insertions(+), 63 deletions(-) create mode 100644 plugins/api-authentication/token/services/provider.php rename plugins/api-authentication/token/{token.php => src/Extension/Token.php} (77%) diff --git a/administrator/components/com_plugins/src/Model/PluginModel.php b/administrator/components/com_plugins/src/Model/PluginModel.php index 1cb39063a885a..a63e6ffc826fa 100644 --- a/administrator/components/com_plugins/src/Model/PluginModel.php +++ b/administrator/components/com_plugins/src/Model/PluginModel.php @@ -161,13 +161,20 @@ public function getItem($pk = null) { $pk = (!empty($pk)) ? $pk : (int) $this->getState('plugin.id'); - if (!isset($this->_cache[$pk])) + $cacheId = $pk; + + if (\is_array($cacheId)) + { + $cacheId = serialize($cacheId); + } + + if (!isset($this->_cache[$cacheId])) { // Get a row instance. $table = $this->getTable(); // Attempt to load the row. - $return = $table->load(array('extension_id' => $pk, 'type' => 'plugin')); + $return = $table->load(\is_array($pk) ? $pk : ['extension_id' => $pk, 'type' => 'plugin']); // Check for a table object error. if ($return === false) @@ -177,26 +184,26 @@ public function getItem($pk = null) // Convert to the \Joomla\CMS\Object\CMSObject before adding other data. $properties = $table->getProperties(1); - $this->_cache[$pk] = ArrayHelper::toObject($properties, CMSObject::class); + $this->_cache[$cacheId] = ArrayHelper::toObject($properties, CMSObject::class); // Convert the params field to an array. $registry = new Registry($table->params); - $this->_cache[$pk]->params = $registry->toArray(); + $this->_cache[$cacheId]->params = $registry->toArray(); // Get the plugin XML. $path = Path::clean(JPATH_PLUGINS . '/' . $table->folder . '/' . $table->element . '/' . $table->element . '.xml'); if (file_exists($path)) { - $this->_cache[$pk]->xml = simplexml_load_file($path); + $this->_cache[$cacheId]->xml = simplexml_load_file($path); } else { - $this->_cache[$pk]->xml = null; + $this->_cache[$cacheId]->xml = null; } } - return $this->_cache[$pk]; + return $this->_cache[$cacheId]; } /** diff --git a/plugins/api-authentication/token/services/provider.php b/plugins/api-authentication/token/services/provider.php new file mode 100644 index 0000000000000..e0843da80bdc0 --- /dev/null +++ b/plugins/api-authentication/token/services/provider.php @@ -0,0 +1,51 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +defined('_JEXEC') or die; + +use Joomla\CMS\Extension\PluginInterface; +use Joomla\CMS\Plugin\PluginHelper; +use Joomla\CMS\User\UserFactoryInterface; +use Joomla\Database\DatabaseInterface; +use Joomla\DI\Container; +use Joomla\DI\ServiceProviderInterface; +use Joomla\Event\DispatcherInterface; +use Joomla\Filter\InputFilter; +use Joomla\Plugin\ApiAuthentication\Token\Extension\Token; + +return new class implements ServiceProviderInterface +{ + /** + * Registers the service provider with a DI container. + * + * @param Container $container The DI container. + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + public function register(Container $container) + { + $container->set( + PluginInterface::class, + function (Container $container) + { + $plugin = new Token( + $container->get(DispatcherInterface::class), + (array) PluginHelper::getPlugin('api-authentication', 'token'), + $container->get(UserFactoryInterface::class), + new InputFilter + ); + $plugin->setDatabase($container->get(DatabaseInterface::class)); + + return $plugin; + } + ); + } +}; diff --git a/plugins/api-authentication/token/token.php b/plugins/api-authentication/token/src/Extension/Token.php similarity index 77% rename from plugins/api-authentication/token/token.php rename to plugins/api-authentication/token/src/Extension/Token.php index 1f46c5d37932c..d40fb33ccfcf7 100644 --- a/plugins/api-authentication/token/token.php +++ b/plugins/api-authentication/token/src/Extension/Token.php @@ -7,27 +7,30 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +namespace Joomla\Plugin\ApiAuthentication\Token\Extension; + defined('_JEXEC') or die; use Joomla\CMS\Application\ApiApplication; use Joomla\CMS\Authentication\Authentication; use Joomla\CMS\Crypt\Crypt; -use Joomla\CMS\Factory; -use Joomla\CMS\Filter\InputFilter; -use Joomla\CMS\Language\Text; use Joomla\CMS\Plugin\CMSPlugin; -use Joomla\CMS\Plugin\PluginHelper; -use Joomla\Database\DatabaseInterface; +use Joomla\CMS\User\UserFactoryInterface; +use Joomla\Component\Plugins\Administrator\Model\PluginModel; +use Joomla\Database\DatabaseAwareTrait; use Joomla\Database\ParameterType; -use Joomla\Registry\Registry; +use Joomla\Event\DispatcherInterface; +use Joomla\Filter\InputFilter; /** * Joomla Token Authentication plugin * * @since 4.0.0 */ -class PlgApiAuthenticationToken extends CMSPlugin +final class Token extends CMSPlugin { + use DatabaseAwareTrait; + /** * The application object * @@ -36,14 +39,6 @@ class PlgApiAuthenticationToken extends CMSPlugin */ protected $app; - /** - * The application object - * - * @var DatabaseInterface - * @since 4.0.0 - */ - protected $db; - /** * The prefix of the user profile keys, without the dot. * @@ -60,6 +55,40 @@ class PlgApiAuthenticationToken extends CMSPlugin */ private $allowedAlgos = ['sha256', 'sha512']; + /** + * The user factory + * + * @var UserFactoryInterface + * @since __DEPLOY_VERSION__ + */ + private $userFactory; + + /** + * The input filter + * + * @var InputFilter + * @since __DEPLOY_VERSION__ + */ + private $filter; + + /** + * Constructor. + * + * @param DispatcherInterface $dispatcher The dispatcher + * @param array $config An optional associative array of configuration settings + * @param UserFactoryInterface $userFactory The user factory + * @param InputFilter $filter The input filter + * + * @since __DEPLOY_VERSION__ + */ + public function __construct(DispatcherInterface $dispatcher, array $config, UserFactoryInterface $userFactory, InputFilter $filter) + { + parent::__construct($dispatcher, $config); + + $this->userFactory = $userFactory; + $this->filter = $filter; + } + /** * This method should handle any authentication and report back to the subject * @@ -76,7 +105,7 @@ public function onUserAuthenticate($credentials, $options, &$response): void // Default response is authentication failure. $response->type = 'Token'; $response->status = Authentication::STATUS_FAILURE; - $response->error_message = Text::_('JGLOBAL_AUTH_FAIL'); + $response->error_message = $this->app->getLanguage()->_('JGLOBAL_AUTH_FAIL'); /** * First look for an HTTP Authorization header with the following format: @@ -95,8 +124,7 @@ public function onUserAuthenticate($credentials, $options, &$response): void if (array_key_exists('authorization', $apacheHeaders)) { - $filter = \Joomla\CMS\Filter\InputFilter::getInstance(); - $authHeader = $filter->clean($apacheHeaders['authorization'], 'STRING'); + $authHeader = $this->filter->clean($apacheHeaders['authorization'], 'STRING'); } } @@ -104,8 +132,7 @@ public function onUserAuthenticate($credentials, $options, &$response): void { $parts = explode(' ', $authHeader, 2); $tokenString = trim($parts[1]); - $filter = InputFilter::getInstance(); - $tokenString = $filter->clean($tokenString, 'BASE64'); + $tokenString = $this->filter->clean($tokenString, 'BASE64'); } if (empty($tokenString)) @@ -157,7 +184,7 @@ public function onUserAuthenticate($credentials, $options, &$response): void { $siteSecret = $this->app->get('secret'); } - catch (Exception $e) + catch (\Exception $e) { return; } @@ -217,7 +244,7 @@ public function onUserAuthenticate($credentials, $options, &$response): void } // Get the actual user record - $user = Factory::getUser($userId); + $user = $this->userFactory->loadUserById($userId); // Disallow login for blocked, inactive or password reset required users if ($user->block || !empty(trim($user->activation)) || $user->requireReset) @@ -249,12 +276,12 @@ private function getTokenSeedForUser(int $userId): ?string { try { - $db = $this->db; + $db = $this->getDatabase(); $query = $db->getQuery(true) - ->select($db->qn('profile_value')) - ->from($db->qn('#__user_profiles')) - ->where($db->qn('profile_key') . ' = :profileKey') - ->where($db->qn('user_id') . ' = :userId'); + ->select($db->quoteName('profile_value')) + ->from($db->quoteName('#__user_profiles')) + ->where($db->quoteName('profile_key') . ' = :profileKey') + ->where($db->quoteName('user_id') . ' = :userId'); $profileKey = $this->profileKeyPrefix . '.token'; $query->bind(':profileKey', $profileKey, ParameterType::STRING); @@ -262,7 +289,7 @@ private function getTokenSeedForUser(int $userId): ?string return $db->setQuery($query)->loadResult(); } - catch (Exception $e) + catch (\Exception $e) { return null; } @@ -281,12 +308,12 @@ private function isTokenEnabledForUser(int $userId): bool { try { - $db = $this->db; + $db = $this->getDatabase(); $query = $db->getQuery(true) - ->select($db->qn('profile_value')) - ->from($db->qn('#__user_profiles')) - ->where($db->qn('profile_key') . ' = :profileKey') - ->where($db->qn('user_id') . ' = :userId'); + ->select($db->quoteName('profile_value')) + ->from($db->quoteName('#__user_profiles')) + ->where($db->quoteName('profile_key') . ' = :profileKey') + ->where($db->quoteName('user_id') . ' = :userId'); $profileKey = $this->profileKeyPrefix . '.enabled'; $query->bind(':profileKey', $profileKey, ParameterType::STRING); @@ -296,7 +323,7 @@ private function isTokenEnabledForUser(int $userId): bool return $value == 1; } - catch (Exception $e) + catch (\Exception $e) { return false; } @@ -313,30 +340,19 @@ private function isTokenEnabledForUser(int $userId): bool * @return mixed * @since 4.0.0 */ - private function getPluginParameter(string $folder, string $plugin, string $param, - $default = null - ) + private function getPluginParameter(string $folder, string $plugin, string $param, $default = null) { - if (!PluginHelper::isEnabled($folder, $plugin)) - { - return $default; - } - - $pluginObject = PluginHelper::getPlugin($folder, $plugin); + /** @var PluginModel $model */ + $model = $this->app->bootComponent('plugins')->getMVCFactory()->createModel('Plugin', 'Administrator', ['ignore_request' => true]); - if (empty($pluginObject)) - { - return $default; - } + $pluginObject = $model->getItem(['folder' => $folder, 'element' => $plugin]); - if (!is_object($pluginObject) || !isset($pluginObject->params)) + if (!\is_object($pluginObject) || !$pluginObject->enabled || !\array_key_exists($param, $pluginObject->params)) { return $default; } - $params = new Registry($pluginObject->params); - - return $params->get($param, $default); + return $pluginObject->params[$param]; } /** @@ -347,9 +363,7 @@ private function getPluginParameter(string $folder, string $plugin, string $para */ private function getAllowedUserGroups(): array { - $userGroups = $this->getPluginParameter('user', 'token', - 'allowedUserGroups', [8] - ); + $userGroups = $this->getPluginParameter('user', 'token', 'allowedUserGroups', [8]); if (empty($userGroups)) { @@ -376,7 +390,7 @@ private function isInAllowedUserGroup($userId) { $allowedUserGroups = $this->getAllowedUserGroups(); - $user = Factory::getUser($userId); + $user = $this->userFactory->loadUserById($userId); if ($user->id != $userId) { diff --git a/plugins/api-authentication/token/token.xml b/plugins/api-authentication/token/token.xml index a3c5cd6861262..85e28ee408fa4 100644 --- a/plugins/api-authentication/token/token.xml +++ b/plugins/api-authentication/token/token.xml @@ -9,8 +9,10 @@ www.joomla.org 4.0.0 PLG_API-AUTHENTICATION_TOKEN_XML_DESCRIPTION + Joomla\Plugin\ApiAuthentication\Token - token.php + services + src language/en-GB/plg_api-authentication_token.ini From fb9ad9cfe53ea210303bb1e40cab4a8827249fb9 Mon Sep 17 00:00:00 2001 From: heelc29 <66922325+heelc29@users.noreply.github.com> Date: Sat, 21 May 2022 21:44:39 +0200 Subject: [PATCH 32/33] [4.2] Code style for cache plugin #36042 (#37820) * cs * cs Co-authored-by: Quy Co-authored-by: Roland Dalmulder Co-authored-by: Allon Moritz --- plugins/system/cache/services/provider.php | 3 ++- plugins/system/cache/src/Extension/Cache.php | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/system/cache/services/provider.php b/plugins/system/cache/services/provider.php index 6cf09d9211bb5..cb40d211a2131 100644 --- a/plugins/system/cache/services/provider.php +++ b/plugins/system/cache/services/provider.php @@ -19,7 +19,8 @@ use Joomla\Event\DispatcherInterface; use Joomla\Plugin\System\Cache\Extension\Cache; -return new class implements ServiceProviderInterface { +return new class implements ServiceProviderInterface +{ /** * Registers the service provider with a DI container. * diff --git a/plugins/system/cache/src/Extension/Cache.php b/plugins/system/cache/src/Extension/Cache.php index 705c445af7c4f..1944f4e91e81e 100644 --- a/plugins/system/cache/src/Extension/Cache.php +++ b/plugins/system/cache/src/Extension/Cache.php @@ -1,11 +1,10 @@ - * @license GNU General Public License version 2 or later; see LICENSE.txt + * @copyright (C) 2022 Open Source Matters, Inc. + * @license GNU General Public License version 2 or later; see LICENSE.txt */ namespace Joomla\Plugin\System\Cache\Extension; From 9ee1dd39ea06bcf0051e8555456ab7ff70d264d8 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sat, 21 May 2022 21:48:34 +0200 Subject: [PATCH 33/33] Update deleted files and folders for 4.2-alpha3 2nd set (#37850) --- administrator/components/com_admin/script.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index c88f6f5dd6e65..06ef940d6c7e9 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -6451,6 +6451,8 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/libraries/src/Service/Provider/ApiRouter.php', '/libraries/vendor/nyholm/psr7/doc/final.md', '/modules/mod_articles_news/mod_articles_news.php', + '/plugins/api-authentication/basic/basic.php', + '/plugins/api-authentication/token/token.php', '/plugins/system/cache/cache.php', );