Merge branch 'master' into master

3 months ago · 57013b8ee6
parent ddf2e74a8d a42f7b6395
commit 57013b8ee6
33 changed files with 275 additions and 5 deletions
--- a/files/carousel/carousel.svg
+++ b/files/carousel/carousel.svg
--- a/files/install_type/install_type_custom_normal.png
+++ b/files/install_type/install_type_custom_normal.png
--- a/files/install_type/install_type_custom_select.png
+++ b/files/install_type/install_type_custom_select.png
--- a/files/install_type/install_type_data_only_normal.png
+++ b/files/install_type/install_type_data_only_normal.png
--- a/files/install_type/install_type_data_only_select.png
+++ b/files/install_type/install_type_data_only_select.png
--- a/files/install_type/install_type_fast_normal.png
+++ b/files/install_type/install_type_fast_normal.png
--- a/files/install_type/install_type_fast_select.png
+++ b/files/install_type/install_type_fast_select.png
--- a/files/install_type/install_type_grub_install_normal.png
+++ b/files/install_type/install_type_grub_install_normal.png
--- a/files/install_type/install_type_grub_install_select.png
+++ b/files/install_type/install_type_grub_install_select.png
--- a/files/install_type/install_type_grub_update_normal.png
+++ b/files/install_type/install_type_grub_update_normal.png
--- a/files/install_type/install_type_grub_update_select.png
+++ b/files/install_type/install_type_grub_update_select.png
--- a/files/install_type/install_type_next_normal.png
+++ b/files/install_type/install_type_next_normal.png
--- a/files/install_type/install_type_next_select.png
+++ b/files/install_type/install_type_next_select.png
--- a/files/install_type/install_type_part_normal.png
+++ b/files/install_type/install_type_part_normal.png
--- a/files/install_type/install_type_part_select.png
+++ b/files/install_type/install_type_part_select.png
--- a/files/install_type/install_type_recovery_normal.png
+++ b/files/install_type/install_type_recovery_normal.png
--- a/files/install_type/install_type_recovery_select.png
+++ b/files/install_type/install_type_recovery_select.png
--- a/files/install_type/install_type_system_only_normal.png
+++ b/files/install_type/install_type_system_only_normal.png
--- a/files/install_type/install_type_system_only_select.png
+++ b/files/install_type/install_type_system_only_select.png
--- a/files/kernel-list-addon.csv
+++ b/files/kernel-list-addon.csv
@ -0,0 +1,13 @@
+NAME;PAСKAGE_UBM;PAСKAGE;DESCRIPTION
+Linux 5.15 headers;ubm-002-linux515-headers;linux515-headers;The Linux kernel headers v5.15
+Linux 5.15 Docs;ubm-003-linux515-docs;linux515-docs;The Linux kernel docs v5.15
+Linux 5.15 DKMS modules;ubm-linux515-dkms;;The Linux kernel DKMS modules v5.15 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu
+Linux 5.15 DKMS modules;ubm-linux515-r8168-8136;;The Linux kernel DKMS modules v5.15 : r8168-8136
+Linux 6.1 headers;ubm-002-linux61-headers;linux61-headers;The Linux kernel headers v6.1
+Linux 6.1 Docs;ubm-003-linux61-docs;linux61-docs;The Linux kernel docs v6.1
+Linux 6.1 DKMS modules;ubm-linux61-dkms;;The Linux kernel DKMS modules v6.1 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu
+Linux 6.1 DKMS modules;ubm-linux61-r8168-8136;;The Linux kernel DKMS modules v6.1 : r8168-8136
+Linux 6.6 headers;ubm-002-linux66-headers;linux66-headers;The Linux kernel headers v6.6
+Linux 6.6 Docs;ubm-003-linux66-docs;linux66-docs;The Linux kernel docs v6.6
+Linux 6.6 DKMS modules;ubm-linux66-dkms;;The Linux kernel DKMS modules v6.6 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu
+Linux 6.6 DKMS modules;ubm-linux66-dkms-r8168-8136;;The Linux kernel DKMS modules v6.6 : r8168-8136
--- a/files/kernel-list.csv
+++ b/files/kernel-list.csv
@ -0,0 +1,5 @@
+NAME;PAСKAGE_UBM;PAСKAGE;PAСKAGE_UBM_REQUIRED;PAСKAGE_REQUIRED;TAG;DESCRIPTION
+Linux 5.15;ubm-001-linux515-test;linux515-test;ubm-002-linux515-test-headers;linux515-test-headers;LTS, Stable, RealTime, Hardened, Recomended;The Linux kernel v5.15 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs
+Linux 5.15;ubm-001-linux515;linux515;ubm-002-linux515-headers;linux515-headers;LTS, Stable;The Linux kernel v5.15 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs
+Linux 6.1;ubm-001-linux61;linux61;ubm-002-linux61-headers;linux61-headers;LTS, Stable, Recomended;The Linux kernel v6.1 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs
+Linux 6.6;ubm-001-linux66;linux66;ubm-002-linux66-headers;linux66-headers;LTS, Stable;The Linux kernel v6.6 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs
--- a/files/list-ubm-kernel.csv
+++ b/files/list-ubm-kernel.csv
@ -1,4 +0,0 @@
-NAME;PAСKAGE_UBM;PAСKAGE_UBM_REQUIRED;DESCRIPTION
-Linux 5.15;ubm-001-linux515;ubm-002-linux515-headers;The Linux kernel v5.15 and modules, headers. Manual modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs
-Linux 6.1;ubm-001-linux61;ubm-002-linux61-headers;The Linux kernel v6.1 and modules, headers. Manual modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs
-Linux 6.6;ubm-001-linux66;ubm-002-linux66-headers;The Linux kernel v6.6 and modules, headers. Manual modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs
--- a/files/modules-list.csv
+++ b/files/modules-list.csv
--- a/files/network-list.csv
+++ b/files/network-list.csv
--- a/files/services-list.csv
+++ b/files/services-list.csv
@ -1,4 +1,4 @@
-NAME;NAME_SERVICES;DECRIPTION
+NAME;NAME_SERVICES;DESCRIPTION
 UBManager WebPanel;cockpit.socket;Operating system monitoring and management manager service
 Network Manager;NetworkManager;Is a program for providing detection and configuration for systems to automatically connect to networks
 SSH;sshd;The daemon that listens for connections from clients on port 22
--- a/locale/kernel-list-addon.pot
+++ b/locale/kernel-list-addon.pot
@ -0,0 +1,57 @@
+# Language translations for ubl-settings-kernel package.
+# Copyright (C) 2025, UBTech LLC
+# This file is distributed under the same license as the ubl-settings-kernel.kernel-list-addon.csv package.
+# UBLinux Team <info@ublinux.com>, 2025
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ubl-settings-kernel 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-05-22 16:12+0600\n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "DESCRIPTION"
+msgstr ""
+
+msgid "The Linux kernel headers v5.15"
+msgstr ""
+
+msgid "The Linux kernel docs v5.15"
+msgstr ""
+
+msgid "The Linux kernel DKMS modules v5.15 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu"
+msgstr ""
+
+msgid "The Linux kernel DKMS modules v5.15 : r8168-8136"
+msgstr ""
+
+msgid "The Linux kernel headers v6.1"
+msgstr ""
+
+msgid "The Linux kernel docs v6.1"
+msgstr ""
+
+msgid "The Linux kernel DKMS modules v6.1 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu"
+msgstr ""
+
+msgid "The Linux kernel DKMS modules v6.1 : r8168-8136"
+msgstr ""
+
+msgid "The Linux kernel headers v6.6"
+msgstr ""
+
+msgid "The Linux kernel docs v6.6"
+msgstr ""
+
+msgid "The Linux kernel DKMS modules v6.6 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu"
+msgstr ""
+
+msgid "The Linux kernel DKMS modules v6.6 : r8168-8136"
+msgstr ""
--- a/locale/kernel-list-addon_ru.po
+++ b/locale/kernel-list-addon_ru.po
@ -0,0 +1,54 @@
+# Russian translations for ubl-settings-kernel package.
+# Copyright (C) 2025, UBTech LLC
+# This file is distributed under the same license as the ubl-settings-kernel package.
+# UBLinux Team <info@ublinux.com>, 2025
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ubl-settings-kernel 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-05-22 16:12+0600\n"
+"PO-Revision-Date: 2025-01-01 00:00+0600\n"
+"Last-Translator: UBLinux Team <info@ublinux.com>\n"
+"Language-Team: Russian - UBLinux Team <info@ublinux.com>\n"
+"Language: Russian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "The Linux kernel headers v5.15"
+msgstr "Ядро Linux, заголовки версии 5.15"
+
+msgid "The Linux kernel docs v5.15"
+msgstr "Ядро Linux, документация версии 5.15"
+
+msgid "The Linux kernel DKMS modules v5.15 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu"
+msgstr "Ядро Linux, DKMS-модули версии 5.15: v4l2loopback, rtl88x2bu, r8125, rtl8192eu"
+
+msgid "The Linux kernel DKMS modules v5.15 : r8168-8136"
+msgstr "Ядро Linux, DKMS-модули версии 5.15: r8168-8136"
+
+msgid "The Linux kernel headers v6.1"
+msgstr "Ядро Linux, заголовки версии 6.1"
+
+msgid "The Linux kernel docs v6.1"
+msgstr "Ядро Linux, документация версии 6.1"
+
+msgid "The Linux kernel DKMS modules v6.1 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu"
+msgstr "Ядро Linux, DKMS-модули версии 6.1: v4l2loopback, rtl88x2bu, r8125, rtl8192eu"
+
+msgid "The Linux kernel DKMS modules v6.1 : r8168-8136"
+msgstr "Ядро Linux, DKMS-модули версии 6.1: r8168-8136"
+
+msgid "The Linux kernel headers v6.6"
+msgstr "Ядро Linux, заголовки версии 6.6"
+
+msgid "The Linux kernel docs v6.6"
+msgstr "Ядро Linux, документация версии 6.6"
+
+msgid "The Linux kernel DKMS modules v6.6 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu"
+msgstr "Ядро Linux, DKMS-модули версии 6.6: v4l2loopback, rtl88x2bu, r8125, rtl8192eu"
+
+msgid "The Linux kernel DKMS modules v6.6 : r8168-8136"
+msgstr "Ядро Linux, DKMS-модули версии 6.6: r8168-8136"
--- a/locale/kernel-list.pot
+++ b/locale/kernel-list.pot
@ -0,0 +1,31 @@
+# Language translations for ubl-settings-kernel package.
+# Copyright (C) 2022, UBTech LLC
+# This file is distributed under the same license as the ubl-settings-kernel.kernel-list.csv package.
+# UBLinux Team <info@ublinux.com>, 2022
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ubl-settings-kernel 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-05-22 16:12+0600\n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+#: ./kernel-list.csv:1
+
+#: ./kernel-list.csv:2
+msgid "The Linux kernel v5.15 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs"
+msgstr ""
+
+#: ./kernel-list.csv:3
+msgid "The Linux kernel v6.1 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs"
+msgstr ""
+
+#: ./kernel-list.csv:4
+msgid "The Linux kernel v6.6 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs"
+msgstr ""
--- a/locale/kernel-list_ru.po
+++ b/locale/kernel-list_ru.po
@ -0,0 +1,30 @@
+# Russian translations for ubl-settings-kernel package.
+# Copyright (C) 2022, UBTech LLC
+# This file is distributed under the same license as the ubl-settings-kernel package.
+# UBLinux Team <info@ublinux.com>, 2022
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ubl-settings-kernel 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-05-22 16:12+0600\n"
+"PO-Revision-Date: 2023-01-01 00:00+0600\n"
+"Last-Translator: UBLinux Team <info@ublinux.com>\n"
+"Language-Team: Russian - UBLinux Team <info@ublinux.com>\n"
+"Language: Russian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ./kernel-list.csv:2
+msgid "The Linux kernel v5.15 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs"
+msgstr "Ядро Linux v5.15 и модули, заголовки. Дополнительные модули ядра: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs"
+
+#: ./kernel-list.csv:3
+msgid "The Linux kernel v6.1 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs"
+msgstr "Ядро Linux v6.1 и модули, заголовки. Дополнительные модули ядра: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs"
+
+#: ./kernel-list.csv:4
+msgid "The Linux kernel v6.6 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs"
+msgstr "Ядро Linux v6.6 и модули, заголовки. Дополнительные модули ядра: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs"
--- a/locale/modules-list.pot
+++ b/locale/modules-list.pot
@ -0,0 +1,21 @@
+# Language translations for ubinstall-gtk.
+# Copyright (C) 2025, UBTech LLC
+# This file is distributed under the same license as the ubinstall-gtk package.
+# UBLinux Team <support@ublinux.com>, 2025
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ubinstall-gtk 1.0\n"
+"Report-Msgid-Bugs-To: support@ublinux.com\n"
+"POT-Creation-Date: 2025-01-06 00:00+0600\n"
+"PO-Revision-Date: 2025-01-06 00:00+0600\n"
+"Last-Translator: UBLinux Team <support@ublinux.com>\n"
+"Language-Team: UBLinux Team <support@ublinux.com>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid ""
+msgstr ""
--- a/locale/modules-list_ru.po
+++ b/locale/modules-list_ru.po
@ -0,0 +1,21 @@
+# Russian translations for ubinstall-gtk.
+# Copyright (C) 2025, UBTech LLC
+# This file is distributed under the same license as the ubinstall-gtk package.
+# UBLinux Team <support@ublinux.com>, 2025
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ubinstall-gtk 1.0\n"
+"Report-Msgid-Bugs-To: support@ublinux.com\n"
+"POT-Creation-Date: 2025-01-06 00:00+0600\n"
+"PO-Revision-Date: 2025-01-06 00:00+0600\n"
+"Last-Translator: ublinux <support@ublinux.com>\n"
+"Language-Team: Russian - UBLinux Team <support@ublinux.com>\n"
+"Language: Russian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid ""
+msgstr ""
--- a/locale/services-list.pot
+++ b/locale/services-list.pot
@ -0,0 +1,21 @@
+# Language translations for ubinstall-gtk.
+# Copyright (C) 2025, UBTech LLC
+# This file is distributed under the same license as the ubinstall-gtk package.
+# UBLinux Team <support@ublinux.com>, 2025
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ubinstall-gtk 1.0\n"
+"Report-Msgid-Bugs-To: support@ublinux.com\n"
+"POT-Creation-Date: 2025-01-06 00:00+0600\n"
+"PO-Revision-Date: 2025-01-06 00:00+0600\n"
+"Last-Translator: UBLinux Team <support@ublinux.com>\n"
+"Language-Team: UBLinux Team <support@ublinux.com>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid ""
+msgstr ""
--- a/locale/services-list_ru.po
+++ b/locale/services-list_ru.po
@ -0,0 +1,21 @@
+# Russian translations for ubinstall-gtk.
+# Copyright (C) 2025, UBTech LLC
+# This file is distributed under the same license as the ubinstall-gtk package.
+# UBLinux Team <support@ublinux.com>, 2025
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ubinstall-gtk 1.0\n"
+"Report-Msgid-Bugs-To: support@ublinux.com\n"
+"POT-Creation-Date: 2025-01-06 00:00+0600\n"
+"PO-Revision-Date: 2025-01-06 00:00+0600\n"
+"Last-Translator: ublinux <support@ublinux.com>\n"
+"Language-Team: Russian - UBLinux Team <support@ublinux.com>\n"
+"Language: Russian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid ""
+msgstr ""