Update to 4.3.4

Joomla-Ukraine · Oct 15, 2023 · dcaf409 · dcaf409
1 parent c9479bd
commit dcaf409
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 50 deletions.
diff --git a/administrator/language/uk-UA/com_guidedtours.ini b/administrator/language/uk-UA/com_guidedtours.ini
@@ -1,10 +1,6 @@
-<<<<<<< HEAD
 ; @version     4.3.4
 ; @date        2023-10-15
-=======
-; @version     4.3.1
-; @date        2023-05-14
->>>>>>> origin/4.x
+
 ; @author      Community Joomla! Ukraine
 ; @copyright   Copyright (C) 2005-2023 Open Source Matters. All rights reserved.
 ; @copyright   2006-2023 (C) Joomla! Ukraine (https://joomla-ua.org). All rights reserved.
@@ -13,10 +9,6 @@
 ; @note        All ini files need to be saved as UTF-8
 
 COM_GUIDEDTOURS="Екскурсії з гідом"
-<<<<<<< HEAD
-; Deprecated, will be removed with 5.0
-=======
->>>>>>> origin/4.x
 COM_GUIDEDTOURS_BASIC_STEP="Основний крок"
 COM_GUIDEDTOURS_CONFIGURATION="Екскурсії з гідом: налаштування"
 COM_GUIDEDTOURS_DESCRIPTION="Опис"
@@ -55,10 +47,9 @@ COM_GUIDEDTOURS_N_ITEMS_UNPUBLISHED="%d елементів неопубліко
 COM_GUIDEDTOURS_NEW_TOUR="Новий тур"
 COM_GUIDEDTOURS_ORDER_TYPE_ASC="Тип за зростанням"
 COM_GUIDEDTOURS_ORDER_TYPE_DESC="Тип за спаданням"
-<<<<<<< HEAD
+
 COM_GUIDEDTOURS_PLUGIN_DISABLED="Плагін «Екскурсії з гідом» вимкнено. Якщо його не ввімкнено, модуль Екскурсії не відображатиметься."
-=======
->>>>>>> origin/4.x
+
 COM_GUIDEDTOURS_STEP_DESCRIPTION_TRANSLATION="Опис (%)"
 COM_GUIDEDTOURS_STEP_EDIT_STEP="Редагувати крок"
 COM_GUIDEDTOURS_STEP_FILTER_SEARCH_DESC="Шукати в назві. Префікс з ID: для пошуку за ідентифікатором кроку або DESCRIPTION: для пошуку в описі."

diff --git a/administrator/language/uk-UA/com_guidedtours.sys.ini b/administrator/language/uk-UA/com_guidedtours.sys.ini
@@ -1,9 +1,10 @@
-; @version     4.3.2
-; @date        2023-06-03
+; @version     4.3.4
+; @date        2023-10-15
 ; @author      Community Joomla! Ukraine
 ; @copyright   Copyright (C) 2005-2023 Open Source Matters. All rights reserved.
 ; @copyright   2006-2023 (C) Joomla! Ukraine (https://joomla-ua.org). All rights reserved.
 ; @license     GNU General Public License version 2 or later; see LICENSE.txt
+; @note        Complete
 ; @note        Client Administrator
 ; @note        All ini files need to be saved as UTF-8
 

diff --git a/administrator/language/uk-UA/joomla.ini b/administrator/language/uk-UA/joomla.ini
@@ -1,8 +1,8 @@
-; @version     4.2.3
-; @date        2022-10-15
+; @version     4.2.4
+; @date        2023-10-15
 ; @author      Community Joomla! Ukraine
-; @copyright   Copyright (C) 2005-2022 Open Source Matters. All rights reserved.
-; @copyright   2006-2022 (C) Joomla! Ukraine (https://joomla-ua.org). All rights reserved.
+; @copyright   Copyright (C) 2005-2023 Open Source Matters. All rights reserved.
+; @copyright   2006-2023 (C) Joomla! Ukraine (https://joomla-ua.org). All rights reserved.
 ; @license     GNU General Public License version 2 or later; see LICENSE.txt
 ; @note        Client Administrator
 ; @note        All ini files need to be saved as UTF-8
@@ -378,6 +378,7 @@ JGLOBAL_BLOG_CLASS_LEADING="Клас провідної статті"
 JGLOBAL_BLOG_CLASS_NOTE_DESC="Ви можете додати будь-який клас CSS для стилю.<br>Додайте рамку вгорі. Для розташування зображення використовуйте, image-left, image-right. Додайте альтернативне зображення для альтернативного впорядкування інтро-зображень."
 JGLOBAL_BLOG_DOWN_OPTION="Вниз"
 JGLOBAL_BLOG_LAYOUT_OPTIONS="Макет блогу"
+JGLOBAL_BOTTOM="Внизу"
 JGLOBAL_CATEGORIES_OPTIONS="Категорії"
 JGLOBAL_CATEGORY_LAYOUT_DESC="Макет"
 JGLOBAL_CATEGORY_LAYOUT_LABEL="Обрати макет"

diff --git a/administrator/language/uk-UA/mod_guidedtours.ini b/administrator/language/uk-UA/mod_guidedtours.ini
@@ -1,16 +1,13 @@
-; @version     4.3.1
-; @date        2023-05-14
+; @version     4.3.4
+; @date        2023-10-15
 ; @author      Community Joomla! Ukraine
 ; @copyright   Copyright (C) 2005-2023 Open Source Matters. All rights reserved.
 ; @copyright   2006-2023 (C) Joomla! Ukraine (https://joomla-ua.org). All rights reserved.
 ; @license     GNU General Public License version 2 or later; see LICENSE.txt
+; @note        Complete
 ; @note        Client Administrator
 ; @note        All ini files need to be saved as UTF-8
 
-; Joomla! Project
-; (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
-; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
 MOD_GUIDEDTOURS="Екскурсії з гідом"
 MOD_GUIDEDTOURS_FIELD_TOUR_COUNT_DESC="Максимальна кількість турів, що показується у випадаючому списку."
 MOD_GUIDEDTOURS_FIELD_TOUR_COUNT_LABEL="Кількість турів"

diff --git a/administrator/language/uk-UA/mod_guidedtours.sys.ini b/administrator/language/uk-UA/mod_guidedtours.sys.ini
@@ -1,16 +1,13 @@
-; @version     4.3.1
-; @date        2023-05-14
+; @version     4.3.4
+; @date        2023-10-15
 ; @author      Community Joomla! Ukraine
-; @copyright   Copyright (C) 2005-2022 Open Source Matters. All rights reserved.
-; @copyright   2006-2022 (C) Joomla! Ukraine (https://joomla-ua.org). All rights reserved.
+; @copyright   Copyright (C) 2005-2023 Open Source Matters. All rights reserved.
+; @copyright   2006-2023 (C) Joomla! Ukraine (https://joomla-ua.org). All rights reserved.
 ; @license     GNU General Public License version 2 or later; see LICENSE.txt
+; @note        Complete
 ; @note        Client Administrator
 ; @note        All ini files need to be saved as UTF-8
 
-; Joomla! Project
-; (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
-; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
 MOD_GUIDEDTOURS="Екскурсії з гідом"
 MOD_GUIDEDTOURS_XML_DESCRIPTION="Цей модуль показує список доступних екскурсій."
 
diff --git a/administrator/language/uk-UA/plg_system_guidedtours.ini b/administrator/language/uk-UA/plg_system_guidedtours.ini
@@ -1,16 +1,13 @@
-; @version     4.3.1
-; @date        2023-05-14
+; @version     4.3.4
+; @date        2023-10-15
 ; @author      Community Joomla! Ukraine
 ; @copyright   Copyright (C) 2005-2023 Open Source Matters. All rights reserved.
 ; @copyright   2006-2023 (C) Joomla! Ukraine (https://joomla-ua.org). All rights reserved.
 ; @license     GNU General Public License version 2 or later; see LICENSE.txt
+; @note        Complete
 ; @note        Client Administrator
 ; @note        All ini files need to be saved as UTF-8
 
-; Joomla! Project
-; (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
-; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
 PLG_SYSTEM_GUIDEDTOURS="Система: плагін для екскурсій"
 PLG_SYSTEM_GUIDEDTOURS_BACK="Назад"
 PLG_SYSTEM_GUIDEDTOURS_COMPLETE="Завершено"

diff --git a/administrator/language/uk-UA/plg_system_guidedtours.sys.ini b/administrator/language/uk-UA/plg_system_guidedtours.sys.ini
@@ -1,16 +1,13 @@
-; @version     4.3.1
-; @date        2023-05-14
+; @version     4.3.4
+; @date        2023-10-15
 ; @author      Community Joomla! Ukraine
-; @copyright   Copyright (C) 2005-2022 Open Source Matters. All rights reserved.
-; @copyright   2006-2022 (C) Joomla! Ukraine (https://joomla-ua.org). All rights reserved.
+; @copyright   Copyright (C) 2005-2023 Open Source Matters. All rights reserved.
+; @copyright   2006-2023 (C) Joomla! Ukraine (https://joomla-ua.org). All rights reserved.
 ; @license     GNU General Public License version 2 or later; see LICENSE.txt
+; @note        Complete
 ; @note        Client Administrator
 ; @note        All ini files need to be saved as UTF-8
 
-; Joomla! Project
-; (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
-; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
 PLG_SYSTEM_GUIDEDTOURS="Система: плагін для екскурсій"
 PLG_SYSTEM_GUIDEDTOURS_DESCRIPTION="Плагін для системних екскурсій"
 
diff --git a/installation/language/uk-UA/joomla.ini b/installation/language/uk-UA/joomla.ini
@@ -1,8 +1,8 @@
-; @version     4.3.1
-; @date        2023-05-14
+; @version     4.3.4
+; @date        2023-10-15
 ; @author      Community Joomla! Ukraine
-; @copyright   Copyright (C) 2005-2022 Open Source Matters. All rights reserved.
-; @copyright   2006-2022 (C) Joomla! Ukraine (https://joomla-ua.org). All rights reserved.
+; @copyright   Copyright (C) 2005-2023 Open Source Matters. All rights reserved.
+; @copyright   2006-2023 (C) Joomla! Ukraine (https://joomla-ua.org). All rights reserved.
 ; @license     GNU General Public License version 2 or later; see LICENSE.txt
 ; @note        Client Installation
 ; @note        All ini files need to be saved as UTF-8