From dcdb8f60461dd8b00c7f934ddd8fe31d46d5bf14 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Thu, 5 Jun 2025 05:28:14 +0000
Subject: [PATCH] fixes

---
 gresource.xml                        | 2 +-
 grub-melody.csv => grub-play.csv     | 0
 locale/ubl-settings-bootloader.pot   | 4 +---
 locale/ubl-settings-bootloader_ru.po | 5 ++---
 source/CMakeLists.txt                | 2 +-
 source/ubl-settings-bootloader.h     | 2 +-
 source/ubl-strings.h                 | 2 +-
 ubl-settings-bootloader.glade        | 7 ++-----
 8 files changed, 9 insertions(+), 15 deletions(-)
 rename grub-melody.csv => grub-play.csv (100%)

diff --git a/gresource.xml b/gresource.xml
index bda515b..70595e4 100644
--- a/gresource.xml
+++ b/gresource.xml
@@ -15,6 +15,6 @@
     <file>grub-cmdline-linux.csv</file>
     <file>grub-terminal-input.csv</file>
     <file>grub-terminal-output.csv</file>
-    <file>grub-melody.csv</file>
+    <file>grub-play.csv</file>
   </gresource>
 </gresources>
\ No newline at end of file
diff --git a/grub-melody.csv b/grub-play.csv
similarity index 100%
rename from grub-melody.csv
rename to grub-play.csv
diff --git a/locale/ubl-settings-bootloader.pot b/locale/ubl-settings-bootloader.pot
index b876a89..ea2678d 100644
--- a/locale/ubl-settings-bootloader.pot
+++ b/locale/ubl-settings-bootloader.pot
@@ -26,9 +26,7 @@ msgid "Configuring system boot parameters"
 msgstr ""
 
 #: source/ubl-strings.h:4
-msgid ""
-"https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/"
-"ubl-settings-bootloader"
+msgid "https://wiki.ublinux.ru/en/Software/Programs_and_utilities/All/ubl-settings-bootloader"
 msgstr ""
 
 #: source/ubl-strings.h:6
diff --git a/locale/ubl-settings-bootloader_ru.po b/locale/ubl-settings-bootloader_ru.po
index 7558c4f..e26395d 100644
--- a/locale/ubl-settings-bootloader_ru.po
+++ b/locale/ubl-settings-bootloader_ru.po
@@ -27,9 +27,8 @@ msgstr "Настройка параметров загрузки системы"
 
 #: source/ubl-strings.h:4
 msgid ""
-"https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/"
-"ubl-settings-bootloader"
-msgstr ""
+"https://wiki.ublinux.ru/en/Software/Programs_and_utilities/All/ubl-settings-bootloader"
+msgstr "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-bootloader"
 
 #: source/ubl-strings.h:6
 msgid "Boot menu"
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index e1d0565..2ad45c8 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -40,7 +40,7 @@ set(DEPENDFILES
                 ../grub-cmdline-linux.csv
                 ../grub-terminal-input.csv
                 ../grub-terminal-output.csv
-                ../grub-melody.csv
+                ../grub-play.csv
                 ../gresource.xml
                 ../ubl-settings-bootloader.css
         )
diff --git a/source/ubl-settings-bootloader.h b/source/ubl-settings-bootloader.h
index 3eef6a1..8e3e9e0 100644
--- a/source/ubl-settings-bootloader.h
+++ b/source/ubl-settings-bootloader.h
@@ -30,7 +30,7 @@
 #define kernel_options_path "resource:///com/ublinux/csv/grub-cmdline-linux.csv"
 #define terminal_input_path "resource:///com/ublinux/csv/grub-terminal-input.csv"
 #define terminal_output_path "resource:///com/ublinux/csv/grub-terminal-output.csv"
-#define melody_path "resource:///com/ublinux/csv/grub-melody.csv"
+#define melody_path "resource:///com/ublinux/csv/grub-play.csv"
 
 #define LocaleName "ubl-settings-bootloader"
 
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 38408e6..e453749 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -1,7 +1,7 @@
 
 #define TITLE_LABEL _("System boot")
 #define TITLE_INFO_LABEL _("Configuring system boot parameters")
-#define WIKI_LINK _("https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-bootloader")
+#define WIKI_LINK _("https://wiki.ublinux.ru/en/Software/Programs_and_utilities/All/ubl-settings-bootloader")
 
 #define BOOT_MENU_LABEL _("Boot menu")
 #define BOOT_SELECTION_LABEL _("Boot selection menu timer:")
diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade
index 79ecf1d..d5b2003 100644
--- a/ubl-settings-bootloader.glade
+++ b/ubl-settings-bootloader.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="ubl-settings-bootloader">
   <requires lib="gtk+" version="3.24"/>
   <!-- interface-css-provider-path ubl-settings-bootloader.css -->
@@ -83,9 +83,7 @@
           <object class="GtkViewport">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="margin-start">5</property>
-            <property name="margin-end">5</property>
-            <property name="margin-bottom">5</property>
+            <property name="margin-end">10</property>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
@@ -118,7 +116,6 @@
                                   <object class="GtkBox">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="margin-end">5</property>
                                     <property name="orientation">vertical</property>
                                     <property name="spacing">5</property>
                                     <child>