rpms
/
anaconda
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added more products

Browse Source
al changed/i9/anaconda-34.25.2.10-1.el9_2.inferit.7
Arkady L. Shane 1 year ago
parent bba5406653
commit eca39a7d65
Signed by: tigro
GPG Key ID: 9C7900103E1C4F8B
2 changed files with 126 additions and 36 deletions
Show Stats Download Patch File Download Diff File

157
SOURCES/0011-Add-MSVSphere-identification-support.patch
Unescape View File

@ -1,18 +1,18 @@
From c330f35f646f1b13cdeb052b815c927cfd050b7d Mon Sep 17 00:00:00 2001 From 9af79df7a7c2cd36e1b5967f862fb67394269a46 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <evgeniy.zamriy@softline.com> From: Eugene Zamriy <evgeniy.zamriy@softline.com>
Date: Thu, 18 May 2023 11:38:45 +0300 Date: Thu, 18 May 2023 11:38:45 +0300
Subject: [PATCH 11/11] Add MSVSphere identification support Subject: [PATCH] Add MSVSphere identification support
--- ---
data/liveinst/gnome/fedora-welcome.desktop | 4 +- data/liveinst/gnome/fedora-welcome.desktop | 4 +-
data/liveinst/gnome/fedora-welcome.js | 2 +- data/liveinst/gnome/fedora-welcome.js | 2 +-
po/ru.po | 136 +++++++++++++----- po/ru.po | 196 ++++++++++++++----
pyanaconda/product.py | 30 +++- pyanaconda/product.py | 36 +++-
.../ui/gui/spokes/installation_progress.py | 8 +- .../ui/gui/spokes/installation_progress.py | 8 +-
.../ui/gui/spokes/lib/storage_dialogs.py | 4 +- .../ui/gui/spokes/lib/storage_dialogs.py | 4 +-
pyanaconda/ui/gui/spokes/welcome.py | 15 +- pyanaconda/ui/gui/spokes/welcome.py | 21 +-
pyanaconda/vnc.py | 27 +++- pyanaconda/vnc.py | 42 +++-
8 files changed, 173 insertions(+), 53 deletions(-) 8 files changed, 260 insertions(+), 53 deletions(-)
diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/fedora-welcome.desktop diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/fedora-welcome.desktop
index 90f5678..abbbff3 100644 index 90f5678..abbbff3 100644
@ -41,10 +41,10 @@ index 4c0a66a..120d718 100755
this.window.connect('key-press-event', Lang.bind(this, this.window.connect('key-press-event', Lang.bind(this,
function(w, event) { function(w, event) {
diff --git a/po/ru.po b/po/ru.po diff --git a/po/ru.po b/po/ru.po
index c478f3f..914b54c 100644 index c478f3f..85e830e 100644
--- a/po/ru.po --- a/po/ru.po
+++ b/po/ru.po +++ b/po/ru.po
@@ -375,7 +375,22 @@ msgid "" @@ -375,7 +375,37 @@ msgid ""
"Would you like to ignore this and continue with installation?" "Would you like to ignore this and continue with installation?"
msgstr "" msgstr ""
@ -61,14 +61,29 @@ index c478f3f..914b54c 100644
+ +
+#: pyanaconda/product.py:87 +#: pyanaconda/product.py:87
+#, python-format +#, python-format
+msgid "MSVSphere %(productVersion)s Cinnamon INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s Cinnamon"
+
+#: pyanaconda/product.py:89
+#, python-format
+msgid "MSVSphere %(productVersion)s KDE INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s KDE"
+
+#: pyanaconda/product.py:91
+#, python-format
+msgid "MSVSphere %(productVersion)s XFCE INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s XFCE"
+
+#: pyanaconda/product.py:93
+#, python-format
+msgid "MSVSphere %(productVersion)s OS INSTALLATION" +msgid "MSVSphere %(productVersion)s OS INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s ОС" +msgstr "УСТАНОВКА МСВСфера %(productVersion)s ОС"
+ +
+#: pyanaconda/product.py:89 +#: pyanaconda/product.py:95
#, python-format #, python-format
msgid "%(productName)s %(productVersion)s INSTALLATION" msgid "%(productName)s %(productVersion)s INSTALLATION"
msgstr "УСТАНОВКА %(productName)s %(productVersion)s" msgstr "УСТАНОВКА %(productName)s %(productVersion)s"
@@ -1152,7 +1167,7 @@ msgstr "" @@ -1152,7 +1182,7 @@ msgstr ""
#: pyanaconda/ui/gui/__init__.py:365 widgets/src/BaseWindow.c:151 #: pyanaconda/ui/gui/__init__.py:365 widgets/src/BaseWindow.c:151
msgid "Help!" msgid "Help!"
@ -77,7 +92,7 @@ index c478f3f..914b54c 100644
#: pyanaconda/ui/gui/__init__.py:854 #: pyanaconda/ui/gui/__init__.py:854
#: pyanaconda/ui/gui/spokes/lib/detailederror.py:58 #: pyanaconda/ui/gui/spokes/lib/detailederror.py:58
@@ -1182,7 +1197,7 @@ msgid "" @@ -1182,7 +1212,7 @@ msgid ""
"\"\">Click for details.</a>" "\"\">Click for details.</a>"
msgstr "" msgstr ""
"Предупреждение: в процессоре включена одновременная многопоточность (SMT). " "Предупреждение: в процессоре включена одновременная многопоточность (SMT). "
@ -86,7 +101,7 @@ index c478f3f..914b54c 100644
#: pyanaconda/ui/gui/hubs/summary.py:103 #: pyanaconda/ui/gui/hubs/summary.py:103
msgid "" msgid ""
@@ -1424,7 +1439,22 @@ msgctxt "GUI|Custom Partitioning|Reset Dialog" @@ -1424,7 +1454,37 @@ msgctxt "GUI|Custom Partitioning|Reset Dialog"
msgid "_Preserve current selections" msgid "_Preserve current selections"
msgstr "О_ставить текущий выбор" msgstr "О_ставить текущий выбор"
@ -103,14 +118,29 @@ index c478f3f..914b54c 100644
+ +
+#: pyanaconda/ui/gui/spokes/welcome.py:282 +#: pyanaconda/ui/gui/spokes/welcome.py:282
+#, python-format +#, python-format
+msgid "WELCOME TO MSVSphere %(version)s Cinnamon"
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s Cinnamon"
+
+#: pyanaconda/ui/gui/spokes/welcome.py:284
+#, python-format
+msgid "WELCOME TO MSVSphere %(version)s KDE"
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s KDE"
+
+#: pyanaconda/ui/gui/spokes/welcome.py:286
+#, python-format
+msgid "WELCOME TO MSVSphere %(version)s XFCE"
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s XFCE"
+
+#: pyanaconda/ui/gui/spokes/welcome.py:288
+#, python-format
+msgid "WELCOME TO MSVSphere %(version)s OS" +msgid "WELCOME TO MSVSphere %(version)s OS"
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s ОС" +msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s ОС"
+ +
+#: pyanaconda/ui/gui/spokes/welcome.py:284 +#: pyanaconda/ui/gui/spokes/welcome.py:290
#, python-format #, python-format
msgid "WELCOME TO %(name)s %(version)s." msgid "WELCOME TO %(name)s %(version)s."
msgstr "ДОБРО ПОЖАЛОВАТЬ В %(name)s %(version)s." msgstr "ДОБРО ПОЖАЛОВАТЬ В %(name)s %(version)s."
@@ -1944,7 +1974,7 @@ msgid "" @@ -1944,7 +2004,7 @@ msgid ""
"You haven't created any mount points for your %(product)s %(version)s " "You haven't created any mount points for your %(product)s %(version)s "
"installation yet. You can:" "installation yet. You can:"
msgstr "" msgstr ""
@ -119,7 +149,7 @@ index c478f3f..914b54c 100644
"Вы можете:" "Вы можете:"
#: pyanaconda/ui/gui/spokes/lib/accordion.py:479 #: pyanaconda/ui/gui/spokes/lib/accordion.py:479
@@ -2024,7 +2054,7 @@ msgid "" @@ -2024,7 +2084,7 @@ msgid ""
"of available space, including <b>%(software)s</b> for software and <b>" "of available space, including <b>%(software)s</b> for software and <b>"
"%(swap)s</b> for swap space." "%(swap)s</b> for swap space."
msgstr "" msgstr ""
@ -128,7 +158,7 @@ index c478f3f..914b54c 100644
"%(software)s</b> для программ и <b>%(swap)s</b> для подкачки." "%(software)s</b> для программ и <b>%(swap)s</b> для подкачки."
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:81 #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:81
@@ -2035,7 +2065,7 @@ msgid "" @@ -2035,7 +2095,7 @@ msgid ""
"%(software)s</b> for software and <b>%(swap)s</b> for swap space." "%(software)s</b> for software and <b>%(swap)s</b> for swap space."
msgstr "" msgstr ""
"Для <a href=\"\" title=\"%(tooltip)s\">программного обеспечения <b>" "Для <a href=\"\" title=\"%(tooltip)s\">программного обеспечения <b>"
@ -137,7 +167,7 @@ index c478f3f..914b54c 100644
"%(software)s</b> для программ и <b>%(swap)s</b> для подкачки." "%(software)s</b> для программ и <b>%(swap)s</b> для подкачки."
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:132 #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:132
@@ -2046,11 +2076,11 @@ msgstr "%s На выбранных дисках доступно:" @@ -2046,11 +2106,11 @@ msgstr "%s На выбранных дисках доступно:"
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:142 #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:142
#, python-format #, python-format
msgid "" msgid ""
@ -151,7 +181,7 @@ index c478f3f..914b54c 100644
"существующие разделы с помощью помощника или самостоятельно выбрать размеры " "существующие разделы с помощью помощника или самостоятельно выбрать размеры "
"разделов в окне настройки разделов." "разделов в окне настройки разделов."
@@ -2060,7 +2090,7 @@ msgid "" @@ -2060,7 +2120,7 @@ msgid ""
" You don't have enough space available to install <b>%(product)s</b>, even " " You don't have enough space available to install <b>%(product)s</b>, even "
"if you used all of the free space available on the selected disks." "if you used all of the free space available on the selected disks."
msgstr "" msgstr ""
@ -160,7 +190,7 @@ index c478f3f..914b54c 100644
"использовать все свободное место на выбранных дисках." "использовать все свободное место на выбранных дисках."
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:178 #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:178
@@ -2071,10 +2101,10 @@ msgid "" @@ -2071,10 +2131,10 @@ msgid ""
"could add more disks for additional space, modify your software selection to " "could add more disks for additional space, modify your software selection to "
"install a smaller version of <b>%(productName)s</b>, or quit the installer." "install a smaller version of <b>%(productName)s</b>, or quit the installer."
msgstr "" msgstr ""
@ -173,7 +203,7 @@ index c478f3f..914b54c 100644
"покинуть программу установки." "покинуть программу установки."
#: pyanaconda/ui/gui/spokes/lib/detailederror.py:48 #: pyanaconda/ui/gui/spokes/lib/detailederror.py:48
@@ -2272,20 +2302,20 @@ msgstr "_Завершить установку" @@ -2272,20 +2332,20 @@ msgstr "_Завершить установку"
#: pyanaconda/ui/gui/spokes/installation_progress.py:158 #: pyanaconda/ui/gui/spokes/installation_progress.py:158
#, python-format #, python-format
msgid "" msgid ""
@ -200,7 +230,7 @@ index c478f3f..914b54c 100644
#: pyanaconda/ui/gui/spokes/software_selection.py:66 #: pyanaconda/ui/gui/spokes/software_selection.py:66
msgctxt "GUI|Spoke" msgctxt "GUI|Spoke"
@@ -2448,7 +2478,7 @@ msgid "" @@ -2448,7 +2508,7 @@ msgid ""
"you'll be able to view their details here." "you'll be able to view their details here."
msgstr "" msgstr ""
"Здесь будет показана информация о созданных точках монтирования для " "Здесь будет показана информация о созданных точках монтирования для "
@ -209,7 +239,7 @@ index c478f3f..914b54c 100644
#: pyanaconda/ui/gui/spokes/custom_storage.py:615 #: pyanaconda/ui/gui/spokes/custom_storage.py:615
#: pyanaconda/ui/gui/spokes/advstorage/nvdimm.glade:178 #: pyanaconda/ui/gui/spokes/advstorage/nvdimm.glade:178
@@ -2868,7 +2898,7 @@ msgid "" @@ -2868,7 +2928,7 @@ msgid ""
"recommended for a normal %(productName)s install." "recommended for a normal %(productName)s install."
msgstr "" msgstr ""
"Размер раздела %(mount)s меньше %(size)s, что меньше рекомендованного " "Размер раздела %(mount)s меньше %(size)s, что меньше рекомендованного "
@ -218,7 +248,7 @@ index c478f3f..914b54c 100644
#: pyanaconda/modules/storage/checker/utils.py:131 #: pyanaconda/modules/storage/checker/utils.py:131
#, python-format #, python-format
@@ -3548,7 +3578,7 @@ msgstr "Не удалось продолжить установку." @@ -3548,7 +3608,7 @@ msgstr "Не удалось продолжить установку."
#: pyanaconda/modules/storage/partitioning/interactive/utils.py:213 #: pyanaconda/modules/storage/partitioning/interactive/utils.py:213
#, python-brace-format #, python-brace-format
msgid "New {name} {version} Installation" msgid "New {name} {version} Installation"
@ -227,7 +257,7 @@ index c478f3f..914b54c 100644
#: pyanaconda/modules/storage/partitioning/interactive/utils.py:275 #: pyanaconda/modules/storage/partitioning/interactive/utils.py:275
msgid "Cannot set label on file system." msgid "Cannot set label on file system."
@@ -3959,13 +3989,13 @@ msgstr "" @@ -3959,13 +4019,13 @@ msgstr ""
#: pyanaconda/core/constants.py:159 #: pyanaconda/core/constants.py:159
msgid "" msgid ""
@ -247,7 +277,7 @@ index c478f3f..914b54c 100644
#: pyanaconda/core/constants.py:165 #: pyanaconda/core/constants.py:165
msgid "" msgid ""
@@ -4303,12 +4333,42 @@ msgstr "не настроено" @@ -4303,12 +4363,72 @@ msgstr "не настроено"
msgid "Full name cannot contain colon characters" msgid "Full name cannot contain colon characters"
msgstr "Полное имя не может содержать двоеточий" msgstr "Полное имя не может содержать двоеточий"
@ -264,10 +294,25 @@ index c478f3f..914b54c 100644
+ +
+#: pyanaconda/vnc.py:85 +#: pyanaconda/vnc.py:85
+#, python-format +#, python-format
+msgid "MSVSphere %(productVersion)s Cinnamon installation"
+msgstr "Установка МСВСфера %(productVersion)s Cinnamon"
+
+#: pyanaconda/vnc.py:87
+#, python-format
+msgid "MSVSphere %(productVersion)s KDE installation"
+msgstr "Установка МСВСфера %(productVersion)s KDE"
+
+#: pyanaconda/vnc.py:89
+#, python-format
+msgid "MSVSphere %(productVersion)s XFCE installation"
+msgstr "Установка МСВСфера %(productVersion)s XFCE"
+
+#: pyanaconda/vnc.py:91
+#, python-format
+msgid "MSVSphere %(productVersion)s OS installation" +msgid "MSVSphere %(productVersion)s OS installation"
+msgstr "Установка МСВСфера %(productVersion)s ОС" +msgstr "Установка МСВСфера %(productVersion)s ОС"
+ +
+#: pyanaconda/vnc.py:87 +#: pyanaconda/vnc.py:93
#, python-format #, python-format
msgid "%(productName)s %(productVersion)s installation" msgid "%(productName)s %(productVersion)s installation"
msgstr "Установка %(productName)s %(productVersion)s" msgstr "Установка %(productName)s %(productVersion)s"
@ -283,6 +328,21 @@ index c478f3f..914b54c 100644
+msgid "MSVSphere %(productVersion)s ARM installation on host %(name)s" +msgid "MSVSphere %(productVersion)s ARM installation on host %(name)s"
+msgstr "Установка МСВСфера %(productVersion)s АРМ на %(name)s" +msgstr "Установка МСВСфера %(productVersion)s АРМ на %(name)s"
+ +
+#: pyanaconda/vnc.py:162
+#, python-format
+msgid "MSVSphere %(productVersion)s Cinnamon installation on host %(name)s"
+msgstr "Установка МСВСфера %(productVersion)s Cinnamon на %(name)s"
+
+#: pyanaconda/vnc.py:162
+#, python-format
+msgid "MSVSphere %(productVersion)s KDE installation on host %(name)s"
+msgstr "Установка МСВСфера %(productVersion)s KDE на %(name)s"
+
+#: pyanaconda/vnc.py:162
+#, python-format
+msgid "MSVSphere %(productVersion)s XFCE installation on host %(name)s"
+msgstr "Установка МСВСфера %(productVersion)s XFCE на %(name)s"
+
+#: pyanaconda/vnc.py:165 +#: pyanaconda/vnc.py:165
+#, python-format +#, python-format
+msgid "MSVSphere %(productVersion)s OS installation on host %(name)s" +msgid "MSVSphere %(productVersion)s OS installation on host %(name)s"
@ -292,7 +352,7 @@ index c478f3f..914b54c 100644
#, python-format #, python-format
msgid "%(productName)s %(productVersion)s installation on host %(name)s" msgid "%(productName)s %(productVersion)s installation on host %(name)s"
msgstr "Установка %(productName)s %(productVersion)s на %(name)s" msgstr "Установка %(productName)s %(productVersion)s на %(name)s"
@@ -7556,22 +7616,22 @@ msgstr "Установить Live CD на жёсткий диск" @@ -7556,22 +7676,22 @@ msgstr "Установить Live CD на жёсткий диск"
#: data/liveinst/gnome/fedora-welcome.desktop:3 #: data/liveinst/gnome/fedora-welcome.desktop:3
#: data/liveinst/gnome/fedora-welcome.js:65 #: data/liveinst/gnome/fedora-welcome.js:65
@ -325,7 +385,7 @@ index c478f3f..914b54c 100644
#: data/liveinst/gnome/fedora-welcome.js:130 #: data/liveinst/gnome/fedora-welcome.js:130
msgid "" msgid ""
diff --git a/pyanaconda/product.py b/pyanaconda/product.py diff --git a/pyanaconda/product.py b/pyanaconda/product.py
index 9dbfe1f..34118d0 100644 index 9dbfe1f..4feea0a 100644
--- a/pyanaconda/product.py --- a/pyanaconda/product.py
+++ b/pyanaconda/product.py +++ b/pyanaconda/product.py
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
@ -336,7 +396,7 @@ index 9dbfe1f..34118d0 100644
from pyanaconda.core.i18n import _ from pyanaconda.core.i18n import _
@@ -64,9 +65,36 @@ def trim_product_version_for_ui(version): @@ -64,9 +65,42 @@ def trim_product_version_for_ui(version):
productVersion = trim_product_version_for_ui(productVersion) productVersion = trim_product_version_for_ui(productVersion)
@ -366,6 +426,12 @@ index 9dbfe1f..34118d0 100644
+ distro_text = _("MSVSphere %(productVersion)s Server INSTALLATION") + distro_text = _("MSVSphere %(productVersion)s Server INSTALLATION")
+ elif productBase == "MSVSphere" and productFlavor == "ARM": + elif productBase == "MSVSphere" and productFlavor == "ARM":
+ distro_text = _("MSVSphere %(productVersion)s ARM INSTALLATION") + distro_text = _("MSVSphere %(productVersion)s ARM INSTALLATION")
+ elif productBase == "MSVSphere" and productFlavor == "Cinnamon":
+ distro_text = _("MSVSphere %(productVersion)s Cinnamon INSTALLATION")
+ elif productBase == "MSVSphere" and productFlavor == "KDE":
+ distro_text = _("MSVSphere %(productVersion)s KDE INSTALLATION")
+ elif productBase == "MSVSphere" and productFlavor == "XFCE":
+ distro_text = _("MSVSphere %(productVersion)s XFCE INSTALLATION")
+ elif productBase == "MSVSphere" and productFlavor == "OS": + elif productBase == "MSVSphere" and productFlavor == "OS":
+ distro_text = _("MSVSphere %(productVersion)s OS INSTALLATION") + distro_text = _("MSVSphere %(productVersion)s OS INSTALLATION")
+ else: + else:
@ -415,7 +481,7 @@ index 2f8338b..e330641 100644
self._add_modify_watcher(label) self._add_modify_watcher(label)
diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py
index 2d8f6b2..4e1fd87 100644 index 2d8f6b2..3885c7c 100644
--- a/pyanaconda/ui/gui/spokes/welcome.py --- a/pyanaconda/ui/gui/spokes/welcome.py
+++ b/pyanaconda/ui/gui/spokes/welcome.py +++ b/pyanaconda/ui/gui/spokes/welcome.py
@@ -34,7 +34,10 @@ from pyanaconda.ui.gui.spokes.lib.lang_locale_handler import LangLocaleHandler @@ -34,7 +34,10 @@ from pyanaconda.ui.gui.spokes.lib.lang_locale_handler import LangLocaleHandler
@ -430,7 +496,7 @@ index 2d8f6b2..4e1fd87 100644
from pyanaconda import flags from pyanaconda import flags
from pyanaconda import geoloc from pyanaconda import geoloc
from pyanaconda.core.i18n import _, C_ from pyanaconda.core.i18n import _, C_
@@ -271,7 +274,15 @@ class WelcomeLanguageSpoke(StandaloneSpoke, LangLocaleHandler): @@ -271,7 +274,21 @@ class WelcomeLanguageSpoke(StandaloneSpoke, LangLocaleHandler):
# substituted. # substituted.
welcomeLabel = self.builder.get_object("welcomeLabel") welcomeLabel = self.builder.get_object("welcomeLabel")
@ -439,6 +505,12 @@ index 2d8f6b2..4e1fd87 100644
+ welcome_text = _("WELCOME TO MSVSphere %(version)s Server") + welcome_text = _("WELCOME TO MSVSphere %(version)s Server")
+ elif productBase == "MSVSphere" and productFlavor == "ARM": + elif productBase == "MSVSphere" and productFlavor == "ARM":
+ welcome_text = _("WELCOME TO MSVSphere %(version)s ARM") + welcome_text = _("WELCOME TO MSVSphere %(version)s ARM")
+ elif productBase == "MSVSphere" and productFlavor == "Cinnamon":
+ welcome_text = _("WELCOME TO MSVSphere %(version)s Cinnamon")
+ elif productBase == "MSVSphere" and productFlavor == "KDE":
+ welcome_text = _("WELCOME TO MSVSphere %(version)s KDE")
+ elif productBase == "MSVSphere" and productFlavor == "XFCE":
+ welcome_text = _("WELCOME TO MSVSphere %(version)s XFCE")
+ elif productBase == "MSVSphere" and productFlavor == "OS": + elif productBase == "MSVSphere" and productFlavor == "OS":
+ welcome_text = _("WELCOME TO MSVSphere %(version)s OS") + welcome_text = _("WELCOME TO MSVSphere %(version)s OS")
+ else: + else:
@ -448,10 +520,10 @@ index 2d8f6b2..4e1fd87 100644
# Retranslate the language (filtering) entry's placeholder text # Retranslate the language (filtering) entry's placeholder text
diff --git a/pyanaconda/vnc.py b/pyanaconda/vnc.py diff --git a/pyanaconda/vnc.py b/pyanaconda/vnc.py
index 5fadcde..c53249f 100644 index 5fadcde..c349de8 100644
--- a/pyanaconda/vnc.py --- a/pyanaconda/vnc.py
+++ b/pyanaconda/vnc.py +++ b/pyanaconda/vnc.py
@@ -76,7 +76,16 @@ class VncServer(object): @@ -76,7 +76,22 @@ class VncServer(object):
self.anaconda = None self.anaconda = None
self.log = get_stdout_logger() self.log = get_stdout_logger()
@ -461,6 +533,12 @@ index 5fadcde..c53249f 100644
+ desktop_text = _("MSVSphere %(productVersion)s Server installation") + desktop_text = _("MSVSphere %(productVersion)s Server installation")
+ elif is_sphere and product.productFlavor == "ARM": + elif is_sphere and product.productFlavor == "ARM":
+ desktop_text = _("MSVSphere %(productVersion)s ARM installation") + desktop_text = _("MSVSphere %(productVersion)s ARM installation")
+ elif is_sphere and product.productFlavor == "Cinnamon":
+ desktop_text = _("MSVSphere %(productVersion)s Cinnamon installation")
+ elif is_sphere and product.productFlavor == "KDE":
+ desktop_text = _("MSVSphere %(productVersion)s KDE installation")
+ elif is_sphere and product.productFlavor == "XFCE":
+ desktop_text = _("MSVSphere %(productVersion)s XFCE installation")
+ elif is_sphere and product.productFlavor == "OS": + elif is_sphere and product.productFlavor == "OS":
+ desktop_text = _("MSVSphere %(productVersion)s OS installation") + desktop_text = _("MSVSphere %(productVersion)s OS installation")
+ else: + else:
@ -469,7 +547,7 @@ index 5fadcde..c53249f 100644
% {'productName': product.productName, % {'productName': product.productName,
'productVersion': product.productVersion} 'productVersion': product.productVersion}
@@ -145,8 +154,20 @@ class VncServer(object): @@ -145,8 +160,29 @@ class VncServer(object):
# figure out product info # figure out product info
if host: if host:
@ -482,6 +560,15 @@ index 5fadcde..c53249f 100644
+ elif is_sphere and product.productFlavor == "ARM": + elif is_sphere and product.productFlavor == "ARM":
+ desktop_text = _("MSVSphere %(productVersion)s ARM " + desktop_text = _("MSVSphere %(productVersion)s ARM "
+ "installation on host %(name)s") + "installation on host %(name)s")
+ elif is_sphere and product.productFlavor == "Cinnamon":
+ desktop_text = _("MSVSphere %(productVersion)s Cinnamon "
+ "installation on host %(name)s")
+ elif is_sphere and product.productFlavor == "KDE":
+ desktop_text = _("MSVSphere %(productVersion)s KDE "
+ "installation on host %(name)s")
+ elif is_sphere and product.productFlavor == "XFCE":
+ desktop_text = _("MSVSphere %(productVersion)s XFCE "
+ "installation on host %(name)s")
+ elif is_sphere and product.productFlavor == "OS": + elif is_sphere and product.productFlavor == "OS":
+ desktop_text = _("MSVSphere %(productVersion)s OS " + desktop_text = _("MSVSphere %(productVersion)s OS "
+ "installation on host %(name)s") + "installation on host %(name)s")

5
SPECS/anaconda.spec
Unescape View File

@ -1,7 +1,7 @@
Summary: Graphical system installer Summary: Graphical system installer
Name: anaconda Name: anaconda
Version: 34.25.2.10 Version: 34.25.2.10
Release: 1%{?dist}.inferit.6 Release: 1%{?dist}.inferit.7
License: GPLv2+ and MIT License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda URL: http://fedoraproject.org/wiki/Anaconda
@ -430,6 +430,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
%{_prefix}/libexec/anaconda/dd_* %{_prefix}/libexec/anaconda/dd_*
%changelog %changelog
* Mon Aug 21 2023 Arkady L. Shane <ashejn@msvsphere> - 34.25.2.10-1.inferit.7
- Added more products
* Mon Aug 7 2023 Arkady L. Shane <ashejn@msvsphere> - 34.25.2.10-1.inferit.6 * Mon Aug 7 2023 Arkady L. Shane <ashejn@msvsphere> - 34.25.2.10-1.inferit.6
- Remove dot in translations - Remove dot in translations

Write Preview
Loading…
Cancel
Save