From c1c5c69fe1610f3b7973ef1434949a70a2569585 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Wed, 13 Nov 2024 10:14:03 +0600
Subject: [PATCH] Localisation fixes

---
 source/ubl-strings.h              |   1 +
 ubl-settings-kernel-info.glade    |   4 +-
 ubl-settings-kernel-install.glade |  40 ++++++++-
 ubl-settings-kernel.pot           | 118 ++++++++++++------------
 ubl-settings-kernel_ru.po         | 144 +++++++++++++++++-------------
 5 files changed, 183 insertions(+), 124 deletions(-)

diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 167faa8..b931eb0 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -21,6 +21,7 @@
 #define INITRAMFS_TITLE_LABEL _("Initramfs building")
 #define EXECUTE_LABEL _("Execute")
 #define KERNEL_VERSION_LABEL _("Kernel version:")
+#define IMAGE_FILE_LABEL _("Image file:")
 #define ADD_DEBUG_LABEL _("Add debug components")
 #define ADD_DRIVERS_LABEL _("Add drivers for current hardware components only")
 
diff --git a/ubl-settings-kernel-info.glade b/ubl-settings-kernel-info.glade
index 143b6be..5ed16f5 100644
--- a/ubl-settings-kernel-info.glade
+++ b/ubl-settings-kernel-info.glade
@@ -35,10 +35,12 @@
                   <object class="GtkLabel" id="InfoLabel">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="label" translatable="yes">label</property>
                     <property name="wrap">True</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
+                    <attributes>
+                      <attribute name="font-desc" value="Source Code Pro Italic 10"/>
+                    </attributes>
                   </object>
                 </child>
               </object>
diff --git a/ubl-settings-kernel-install.glade b/ubl-settings-kernel-install.glade
index d88d358..be7d339 100644
--- a/ubl-settings-kernel-install.glade
+++ b/ubl-settings-kernel-install.glade
@@ -45,10 +45,11 @@
                 <property name="can-focus">False</property>
                 <property name="spacing">5</property>
                 <child>
-                  <object class="GtkLabel">
+                  <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="label" translatable="yes">Kernel version:</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -76,10 +77,35 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="FilenameEntry">
+              <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="placeholder-text" translatable="yes">ublinux</property>
+                <property name="can-focus">False</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes">Image file:</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="FilenameEntry">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="placeholder-text" translatable="yes">ublinux</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -172,4 +198,10 @@
       </object>
     </child>
   </object>
+  <object class="GtkSizeGroup">
+    <widgets>
+      <widget name="label1"/>
+      <widget name="label2"/>
+    </widgets>
+  </object>
 </interface>
diff --git a/ubl-settings-kernel.pot b/ubl-settings-kernel.pot
index 1d6dcc6..96ae115 100644
--- a/ubl-settings-kernel.pot
+++ b/ubl-settings-kernel.pot
@@ -22,11 +22,8 @@ msgid "System kernel"
 msgstr ""
 
 #: source/ubl-strings.h:3
-msgid "Kernel downloading and installation, kernel selection to boot by default"
-msgstr ""
-
-#: source/ubl-strings.h:22
-msgid "Kernel version:"
+msgid ""
+"Kernel downloading and installation, kernel selection to boot by default"
 msgstr ""
 
 #: source/ubl-strings.h:5
@@ -65,146 +62,157 @@ msgstr ""
 msgid "Startup boot"
 msgstr ""
 
-#: source/ubl-strings.h:20
-msgid "Initramfs building"
+#: source/ubl-strings.h:18
+msgid "Running"
 msgstr ""
 
 #: source/ubl-strings.h:21
-msgid "Execute"
+msgid "Initramfs building"
 msgstr ""
 
 #: source/ubl-strings.h:22
-msgid "Kernel version:"
+msgid "Execute"
 msgstr ""
 
 #: source/ubl-strings.h:23
-msgid "Add debug components"
+msgid "Kernel version:"
 msgstr ""
 
 #: source/ubl-strings.h:24
-msgid "Add drivers for current hardware components only"
+msgid "Image file:"
+msgstr ""
+
+#: source/ubl-strings.h:25
+msgid "Add debug components"
 msgstr ""
 
 #: source/ubl-strings.h:26
+msgid "Add drivers for current hardware components only"
+msgstr ""
+
+#: source/ubl-strings.h:28
 msgid "Install module"
 msgstr ""
 
-#: source/ubl-strings.h:27
+#: source/ubl-strings.h:29
 msgid "Remove module"
 msgstr ""
 
-#: source/ubl-strings.h:28
+#: source/ubl-strings.h:30
 msgid "Install package"
 msgstr ""
 
-#: source/ubl-strings.h:29
+#: source/ubl-strings.h:31
 msgid "Remove package"
 msgstr ""
 
-#: source/ubl-strings.h:30
+#: source/ubl-strings.h:32
 msgid "Changelog"
 msgstr ""
 
-#: source/ubl-strings.h:31
+#: source/ubl-strings.h:33
 msgid "Launch"
 msgstr ""
 
-#: source/ubl-strings.h:32
+#: source/ubl-strings.h:34
 msgid "LTS"
 msgstr ""
 
-#: source/ubl-strings.h:33
+#: source/ubl-strings.h:35
 msgid "Reactive"
 msgstr ""
 
-#: source/ubl-strings.h:34
+#: source/ubl-strings.h:36
 msgid "Recomended"
 msgstr ""
 
-#: source/ubl-strings.h:35
+#: source/ubl-strings.h:37
 msgid "Hardened"
 msgstr ""
 
-#: source/ubl-strings.h:36
+#: source/ubl-strings.h:38
 msgid "RealTime"
 msgstr ""
 
-#: source/ubl-strings.h:37
+#: source/ubl-strings.h:39
 msgid "Stable"
 msgstr ""
 
-#: source/ubl-strings.h:39
+#: source/ubl-strings.h:41
 msgid "Kernels"
 msgstr ""
 
-#: source/ubl-strings.h:40
+#: source/ubl-strings.h:42
 msgid "Additions"
 msgstr ""
 
-#: source/ubl-strings.h:41
+#: source/ubl-strings.h:43
 msgid "Update"
 msgstr ""
 
-#: source/ubl-strings.h:42
+#: source/ubl-strings.h:44
 msgid "Open package information"
 msgstr ""
 
-#: source/ubl-strings.h:43
+#: source/ubl-strings.h:45
 msgid "More"
 msgstr ""
 
-#: source/ubl-strings.h:43
-msgid "Running"
+#: source/ubl-strings.h:47
+msgid "Accept"
 msgstr ""
 
-#: source/ubl-strings.h:43
-msgid "Are you sure want to install kernel"
+#: source/ubl-strings.h:48
+msgid "Warning"
 msgstr ""
 
-#: source/ubl-strings.h:43
-msgid "Are you sure want to install package"
+#: source/ubl-strings.h:49
+msgid "Dependences"
 msgstr ""
 
-#: source/ubl-strings.h:43
-msgid "Are you sure want to remove module"
+#: source/ubl-strings.h:51
+msgid "Module"
 msgstr ""
 
-#: source/ubl-strings.h:43
-msgid "Are you sure want to remove package"
+#: source/ubl-strings.h:52
+msgid "Package"
 msgstr ""
 
-#: source/ubl-strings.h:43
-msgid "Are you sure want to launch"
+#: source/ubl-strings.h:53
+msgid "Description"
 msgstr ""
 
-#: source/ubl-strings.h:7
-msgid "Module"
+#: source/ubl-strings.h:55
+msgid "Terminal operation success"
 msgstr ""
 
-#: source/ubl-strings.h:7
-msgid "Package"
+#: source/ubl-strings.h:56
+msgid "Terminal operation failed"
 msgstr ""
 
-#: source/ubl-strings.h:7
-msgid "Description"
+#: source/ubl-strings.h:58
+msgid "Are you sure want to install kernel"
 msgstr ""
 
-#: source/ubl-strings.h:7
-msgid "Accept"
+#: source/ubl-strings.h:59
+msgid "Are you sure want to install package"
 msgstr ""
 
-#: source/ubl-strings.h:7
-msgid "for boot?\n\nChanges will be applied after system restart"
+#: source/ubl-strings.h:60
+msgid "Are you sure want to remove module"
 msgstr ""
 
-#: source/ubl-strings.h:7
-msgid "Terminal operation failed"
+#: source/ubl-strings.h:61
+msgid "Are you sure want to remove package"
 msgstr ""
 
-#: source/ubl-strings.h:7
-msgid "Terminal Operation success"
+#: source/ubl-strings.h:62
+msgid "Are you sure want to launch"
 msgstr ""
 
-#: source/ubl-strings.h:7
-msgid "Warning"
+#: source/ubl-strings.h:62
+msgid ""
+"for boot?\n"
+"\n"
+"Changes will be applied after system restart"
 msgstr ""
diff --git a/ubl-settings-kernel_ru.po b/ubl-settings-kernel_ru.po
index c4dfaaa..0dcc21e 100644
--- a/ubl-settings-kernel_ru.po
+++ b/ubl-settings-kernel_ru.po
@@ -22,8 +22,10 @@ msgid "System kernel"
 msgstr "Ядро системы"
 
 #: source/ubl-strings.h:3
-msgid "Kernel downloading and installation, kernel selection to boot by default"
-msgstr "Загрузка и установка ядер системы, выбор ядра для загрузки по умолчанию"
+msgid ""
+"Kernel downloading and installation, kernel selection to boot by default"
+msgstr ""
+"Загрузка и установка ядер системы, выбор ядра для загрузки по умолчанию"
 
 #: source/ubl-strings.h:5
 msgid "Information"
@@ -33,26 +35,6 @@ msgstr "Информация"
 msgid "Module:"
 msgstr "Модуль:"
 
-#: source/ubl-strings.h:7
-msgid "Module"
-msgstr "Модуль"
-
-#: source/ubl-strings.h:7
-msgid "Package"
-msgstr "Пакет"
-
-#: source/ubl-strings.h:7
-msgid "Description"
-msgstr "Описание"
-
-#: source/ubl-strings.h:7
-msgid "Accept"
-msgstr "Принять"
-
-#: source/ubl-strings.h:7
-msgid "for boot?\n\nChanges will be applied after system restart"
-msgstr "загрузочным?\n\nИзменения вступят в силу после перезагрузки."
-
 #: source/ubl-strings.h:8
 msgid "Package:"
 msgstr "Пакет:"
@@ -81,126 +63,160 @@ msgstr "Установлен модуль"
 msgid "Startup boot"
 msgstr "Будет запущено"
 
-#: source/ubl-strings.h:20
+#: source/ubl-strings.h:18
+msgid "Running"
+msgstr "Запущено"
+
+#: source/ubl-strings.h:21
 msgid "Initramfs building"
 msgstr "Сборка Initramfs"
 
-#: source/ubl-strings.h:21
+#: source/ubl-strings.h:22
 msgid "Execute"
 msgstr "Выполнить"
 
-#: source/ubl-strings.h:22
+#: source/ubl-strings.h:23
 msgid "Kernel version:"
 msgstr "Версия ядра:"
 
-#: source/ubl-strings.h:23
+#: source/ubl-strings.h:24
+msgid "Image file:"
+msgstr "Файл образа:"
+
+#: source/ubl-strings.h:25
 msgid "Add debug components"
 msgstr "Добавить компоненты отладки"
 
-#: source/ubl-strings.h:24
+#: source/ubl-strings.h:26
 msgid "Add drivers for current hardware components only"
 msgstr "Добавить драйвера только текущих аппаратных компонентов"
 
-#: source/ubl-strings.h:26
+#: source/ubl-strings.h:28
 msgid "Install module"
 msgstr "Установить модуль"
 
-#: source/ubl-strings.h:27
+#: source/ubl-strings.h:29
 msgid "Remove module"
 msgstr "Удалить модуль"
 
-#: source/ubl-strings.h:28
+#: source/ubl-strings.h:30
 msgid "Install package"
 msgstr "Установить пакет"
 
-#: source/ubl-strings.h:29
+#: source/ubl-strings.h:31
 msgid "Remove package"
 msgstr "Удалить пакет"
 
-#: source/ubl-strings.h:30
+#: source/ubl-strings.h:32
 msgid "Changelog"
 msgstr "Список изменений"
 
-#: source/ubl-strings.h:31
+#: source/ubl-strings.h:33
 msgid "Launch"
 msgstr "Запускать"
 
-#: source/ubl-strings.h:32
+#: source/ubl-strings.h:34
 msgid "LTS"
 msgstr "LTS"
 
-#: source/ubl-strings.h:33
+#: source/ubl-strings.h:35
 msgid "Reactive"
 msgstr "Реактивное"
 
-#: source/ubl-strings.h:34
+#: source/ubl-strings.h:36
 msgid "Recomended"
 msgstr "Рекомендуется"
 
-#: source/ubl-strings.h:35
+#: source/ubl-strings.h:37
 msgid "Hardened"
 msgstr ""
 
-#: source/ubl-strings.h:36
+#: source/ubl-strings.h:38
 msgid "RealTime"
 msgstr "Реальное время"
 
-#: source/ubl-strings.h:37
+#: source/ubl-strings.h:39
 msgid "Stable"
 msgstr "Стабильное"
 
-#: source/ubl-strings.h:39
+#: source/ubl-strings.h:41
 msgid "Kernels"
 msgstr "Ядра"
 
-#: source/ubl-strings.h:40
+#: source/ubl-strings.h:42
 msgid "Additions"
 msgstr "Дополнения"
 
-#: source/ubl-strings.h:41
+#: source/ubl-strings.h:43
 msgid "Update"
 msgstr "Обновить"
 
-#: source/ubl-strings.h:42
+#: source/ubl-strings.h:44
 msgid "Open package information"
 msgstr "Открыть информацию о пакете"
 
-#: source/ubl-strings.h:43
+#: source/ubl-strings.h:45
 msgid "More"
 msgstr "Подробнее"
 
-#: source/ubl-strings.h:43
-msgid "Running"
-msgstr "Запущено"
+#: source/ubl-strings.h:47
+msgid "Accept"
+msgstr "Принять"
 
-#: source/ubl-strings.h:43
+#: source/ubl-strings.h:48
+msgid "Warning"
+msgstr "Внимание"
+
+#: source/ubl-strings.h:49
+msgid "Dependences"
+msgstr "Зависимости"
+
+#: source/ubl-strings.h:51
+msgid "Module"
+msgstr "Модуль"
+
+#: source/ubl-strings.h:52
+msgid "Package"
+msgstr "Пакет"
+
+#: source/ubl-strings.h:53
+msgid "Description"
+msgstr "Описание"
+
+#: source/ubl-strings.h:55
+msgid "Terminal operation success"
+msgstr "Операция терминала успешно завершена"
+
+#: source/ubl-strings.h:56
+msgid "Terminal operation failed"
+msgstr "Операция терминала завершена с ошибкой"
+
+#: source/ubl-strings.h:58
 msgid "Are you sure want to install kernel"
-msgstr "Вы хотитее установить в систему ядро"
+msgstr "Вы хотите установить в систему ядро"
 
-#: source/ubl-strings.h:43
+#: source/ubl-strings.h:59
 msgid "Are you sure want to install package"
 msgstr "Вы хотите установить в систему пакет с ядром"
 
-#: source/ubl-strings.h:43
+#: source/ubl-strings.h:60
 msgid "Are you sure want to remove module"
 msgstr "Вы действительно хотите удалить из системы пакет с модулем ядра"
 
-#: source/ubl-strings.h:43
+#: source/ubl-strings.h:61
 msgid "Are you sure want to remove package"
 msgstr "Вы действительно хотите удалить из системы пакет с ядром"
 
-#: source/ubl-strings.h:43
+#: source/ubl-strings.h:62
 msgid "Are you sure want to launch"
 msgstr "Выбрать ядро"
 
-#: source/ubl-strings.h:7
-msgid "Terminal operation failed"
-msgstr "Операция терминала завершена с ошибкой"
-
-#: source/ubl-strings.h:7
-msgid "Terminal operation success"
-msgstr "Операция терминала успешно завершена"
-
-#: source/ubl-strings.h:7
-msgid "Warning"
-msgstr "Внимание"
\ No newline at end of file
+#: source/ubl-strings.h:62
+msgid ""
+"for boot?\n"
+"\n"
+"Changes will be applied after system restart"
+msgstr ""
+"загрузочным?\n"
+"\n"
+"Изменения вступят в силу после перезагрузки."