From 5df4f3a23ed8b6b23df1dada5591d0ae5fbf3e3d Mon Sep 17 00:00:00 2001 From: tigro Date: Tue, 23 Jan 2024 15:01:42 +0300 Subject: [PATCH] Update translation --- ...allation-image-bootloader-to-Russian.patch | 18 +++++++-------- ...ate-live-image-bootloader-to-Russian.patch | 23 +++++++++++-------- SPECS/lorax-templates-rhel.spec | 5 +++- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/SOURCES/0003-Translate-installation-image-bootloader-to-Russian.patch b/SOURCES/0003-Translate-installation-image-bootloader-to-Russian.patch index da3d471..9b35e5b 100644 --- a/SOURCES/0003-Translate-installation-image-bootloader-to-Russian.patch +++ b/SOURCES/0003-Translate-installation-image-bootloader-to-Russian.patch @@ -1,14 +1,14 @@ -From 052906521348a219d2efc021aadcabf13446978a Mon Sep 17 00:00:00 2001 +From 95a6cc401844ccc51c10841104697cca0e61cdf2 Mon Sep 17 00:00:00 2001 From: tigro Date: Fri, 22 Dec 2023 16:29:51 +0300 -Subject: [PATCH 3/3] Translate installation image bootloader to Russian +Subject: [PATCH 3/4] Translate installation image bootloader to Russian --- 80-rhel/config_files/x86/grub2-efi.cfg | 15 ++++++---- - 80-rhel/config_files/x86/isolinux.cfg | 40 +++++++++++++++----------- + 80-rhel/config_files/x86/isolinux.cfg | 41 +++++++++++++++----------- 80-rhel/efi.tmpl | 10 ++++++- - 80-rhel/x86.tmpl | 24 ++++++++++++++-- - 4 files changed, 64 insertions(+), 25 deletions(-) + 80-rhel/x86.tmpl | 24 +++++++++++++-- + 4 files changed, 64 insertions(+), 26 deletions(-) diff --git a/80-rhel/config_files/x86/grub2-efi.cfg b/80-rhel/config_files/x86/grub2-efi.cfg index 8c9adad..5a7b61f 100644 @@ -54,7 +54,7 @@ index 8c9adad..5a7b61f 100644 initrdefi @INITRDPATH@ } diff --git a/80-rhel/config_files/x86/isolinux.cfg b/80-rhel/config_files/x86/isolinux.cfg -index 1b3fae2..698695a 100644 +index 1b3fae2..a8b2b3f 100644 --- a/80-rhel/config_files/x86/isolinux.cfg +++ b/80-rhel/config_files/x86/isolinux.cfg @@ -1,6 +1,8 @@ @@ -97,7 +97,7 @@ index 1b3fae2..698695a 100644 menu default kernel vmlinuz append initrd=initrd.img @ROOT@ rd.live.check quiet -@@ -72,49 +74,53 @@ label check +@@ -72,49 +74,52 @@ label check menu separator # insert an empty line # utilities submenu @@ -112,10 +112,10 @@ index 1b3fae2..698695a 100644 - menu label Install @PRODUCT@ @VERSION@ in ^basic graphics mode + menu label ^1. Установить @PRODUCT@ @VERSION@@FLAVOR@ (текстовый установщик) text help - Try this option out if you're having trouble installing +- Try this option out if you're having trouble installing - @PRODUCT@ @VERSION@. + Попробуйте этот режим если у вас возникают проблемы с -+ установкой @PRODUCT@ @VERSION@@FLAVOR@. ++ установкой @PRODUCT@ @VERSION@@FLAVOR@. endtext kernel vmlinuz append initrd=initrd.img @ROOT@ nomodeset quiet diff --git a/SOURCES/0004-Translate-live-image-bootloader-to-Russian.patch b/SOURCES/0004-Translate-live-image-bootloader-to-Russian.patch index 9bc8b7a..7416792 100644 --- a/SOURCES/0004-Translate-live-image-bootloader-to-Russian.patch +++ b/SOURCES/0004-Translate-live-image-bootloader-to-Russian.patch @@ -1,15 +1,15 @@ -From 968e8fe83b140e04129b5eb4cb6188717d132039 Mon Sep 17 00:00:00 2001 +From 10b123d26e239d48b21fc017f1e1d780d23dd6bf Mon Sep 17 00:00:00 2001 From: tigro Date: Fri, 22 Dec 2023 16:42:33 +0300 Subject: [PATCH 4/4] Translate live image bootloader to Russian --- - 80-rhel/live/config_files/x86/grub2-efi.cfg | 13 ++++++--- - 80-rhel/live/config_files/x86/isolinux.cfg | 29 ++++++++++--------- + 80-rhel/live/config_files/x86/grub2-efi.cfg | 13 +++++--- + 80-rhel/live/config_files/x86/isolinux.cfg | 33 +++++++++++---------- 80-rhel/live/efi.tmpl | 6 ++++ - 80-rhel/live/x86.tmpl | 31 ++++++++++++++++++++- + 80-rhel/live/x86.tmpl | 31 ++++++++++++++++++- 80-rhel/x86.tmpl | 2 +- - 5 files changed, 62 insertions(+), 19 deletions(-) + 5 files changed, 64 insertions(+), 21 deletions(-) diff --git a/80-rhel/live/config_files/x86/grub2-efi.cfg b/80-rhel/live/config_files/x86/grub2-efi.cfg index 2e24b15..4dc2fb2 100644 @@ -50,7 +50,7 @@ index 2e24b15..4dc2fb2 100644 initrdefi @INITRDPATH@ } diff --git a/80-rhel/live/config_files/x86/isolinux.cfg b/80-rhel/live/config_files/x86/isolinux.cfg -index bc36bb9..8dc0640 100644 +index bc36bb9..9d6ae27 100644 --- a/80-rhel/live/config_files/x86/isolinux.cfg +++ b/80-rhel/live/config_files/x86/isolinux.cfg @@ -1,6 +1,8 @@ @@ -93,7 +93,7 @@ index bc36bb9..8dc0640 100644 menu default kernel vmlinuz append initrd=initrd.img @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet -@@ -72,12 +74,13 @@ label check +@@ -72,39 +74,40 @@ label check menu separator # insert an empty line # utilities submenu @@ -108,9 +108,12 @@ index bc36bb9..8dc0640 100644 - menu label Start @PRODUCT@ @VERSION@ in ^basic graphics mode + menu label ^3. Запустить @PRODUCT@ @VERSION@FLAVOR@ в базовом графическом режиме text help - Try this option out if you're having trouble starting - @PRODUCT@ @VERSION@. -@@ -86,25 +89,25 @@ label vesa +- Try this option out if you're having trouble starting +- @PRODUCT@ @VERSION@. ++ Попробуйте этот режим если у вас возникают проблемы с ++ установкой @PRODUCT@ @VERSION@@FLAVOR@. + endtext + kernel vmlinuz append initrd=initrd.img @ROOT@ @EXTRA@ rd.live.image nomodeset quiet label memtest diff --git a/SPECS/lorax-templates-rhel.spec b/SPECS/lorax-templates-rhel.spec index 62c0a8a..39bd89f 100644 --- a/SPECS/lorax-templates-rhel.spec +++ b/SPECS/lorax-templates-rhel.spec @@ -1,6 +1,6 @@ Name: lorax-templates-msvsphere Version: 8.7 -Release: 1%{?dist}.4 +Release: 1%{?dist}.5 Summary: MSVSphere build templates for lorax and livemedia-creator License: GPLv2+ @@ -44,6 +44,9 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{templatedir}/live/config_files/x86/ %{templatedir}/* %changelog +* Tue Jan 23 2024 Arkady L. Shane - 8.7-1.5 +- Update translation + * Tue Jan 23 2024 Arkady L. Shane - 8.7-1.4 - Define UTF-8 config form efi.tmpl - Fix missing FLAVOR parameter