rpms
/
anaconda
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'cd40b9d0e8'
${ noResults }
anaconda/SOURCES/0009-MSVSphere-Adaptation-P...

1046 lines
52 KiB
Raw Normal View History Unescape

MSVSphere debranding and rebuild
8 months ago
From a0489a4395f7674dfd5f6f0cd0328cb9c846ffa8 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <sergey.cherevko@softline.com>
Date: Tue, 16 Apr 2024 14:02:08 +0300
Subject: [PATCH 09/14] MSVSphere Adaptation Patch - Debranding - Update
Russian transaltions - Added new products
---
data/liveinst/gnome/rhel-welcome.desktop | 3 +-
data/liveinst/gnome/rhel-welcome.js | 6 +-
docs/intro.rst | 2 +-
docs/iscsi.rst | 2 +-
po/ru.po | 278 +++++++++++++-----
pyanaconda/core/constants.py | 8 +-
pyanaconda/errors.py | 6 +-
pyanaconda/installation.py | 2 +-
pyanaconda/modules/payloads/source/cdn/cdn.py | 2 +-
pyanaconda/product.py | 39 ++-
.../ui/gui/spokes/installation_progress.py | 8 +-
.../ui/gui/spokes/installation_source.glade | 2 +-
pyanaconda/ui/gui/spokes/lib/accordion.py | 2 +-
.../ui/gui/spokes/software_selection.py | 2 +-
pyanaconda/ui/gui/spokes/storage.py | 4 +-
pyanaconda/ui/gui/spokes/subscription.glade | 4 +-
pyanaconda/ui/gui/spokes/subscription.py | 8 +-
pyanaconda/ui/gui/spokes/welcome.py | 21 +-
pyanaconda/vnc.py | 42 ++-
19 files changed, 328 insertions(+), 113 deletions(-)
diff --git a/data/liveinst/gnome/rhel-welcome.desktop b/data/liveinst/gnome/rhel-welcome.desktop
index 8f81a1b..a216c7b 100644
--- a/data/liveinst/gnome/rhel-welcome.desktop
+++ b/data/liveinst/gnome/rhel-welcome.desktop
@@ -1,5 +1,6 @@
[Desktop Entry]
-Name=Welcome to Red Hat Enterprise Linux
+Name=Welcome to MSVSphere ARM
+Name[ru]=Добро пожаловать в МСВСфера АРМ
Exec=/usr/share/anaconda/gnome/rhel-welcome
Terminal=false
Type=Application
diff --git a/data/liveinst/gnome/rhel-welcome.js b/data/liveinst/gnome/rhel-welcome.js
index 7b6df63..a92e157 100755
--- a/data/liveinst/gnome/rhel-welcome.js
+++ b/data/liveinst/gnome/rhel-welcome.js
@@ -59,7 +59,7 @@ const WelcomeWindow = new Lang.Class({
default_width: 600,
default_height: 550,
skip_taskbar_hint: true,
- title: _("Welcome to Red Hat Enterprise Linux"),
+ title: _("Welcome to MSVSphere ARM"),
window_position: Gtk.WindowPosition.CENTER });
this.window.connect('key-press-event', Lang.bind(this,
function(w, event) {
@@ -88,7 +88,7 @@ const WelcomeWindow = new Lang.Class({
spacing: 16 });
tryContent.add(new Gtk.Image({ icon_name: 'media-optical',
pixel_size: 256 }));
- tryContent.add(makeLabel(_("Try RHEL"), true));
+ tryContent.add(makeLabel(_("Try MSVSphere ARM"), true));
let tryButton = new Gtk.Button({ child: tryContent });
buttonBox.add(tryButton);
@@ -104,7 +104,7 @@ const WelcomeWindow = new Lang.Class({
let installButton = new Gtk.Button({ child: installContent });
buttonBox.add(installButton);
- this._label = makeLabel(_("You are currently running Red Hat Enterprise Linux from live media.\nYou can install Red Hat Enterprise Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."), false);
+ this._label = makeLabel(_("You are currently running MSVSphere ARM from live media.\nYou can install MSVSphere ARM now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."), false);
mainGrid.add(this._label);
installButton.connect('clicked', Lang.bind(this,
diff --git a/docs/intro.rst b/docs/intro.rst
index bbaf74f..394456a 100644
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -2,7 +2,7 @@ Introduction to Anaconda
========================
Anaconda is the installation program used by Fedora, Red Hat Enterprise Linux
-and some other distributions.
+, MSVSphere and some other distributions.
During installation, a target computer's hardware is identified and configured
and the appropriate file systems for the system's architecture are created.
diff --git a/docs/iscsi.rst b/docs/iscsi.rst
index 847078d..6d9c4b3 100644
--- a/docs/iscsi.rst
+++ b/docs/iscsi.rst
@@ -139,7 +139,7 @@ If for some reason the DeviceTree fails at recognizing iscsi devices as such,
The booting problems are either due to incorrectly generated dracut boot
arguments or they are simply dracut bugs.
-Note that many of the iscsi adapters are installed in different Red Hat machines
+Note that many of the iscsi adapters are installed in different MSVSphere machines
and so the issues can often be reproduced and debugged.
diff --git a/po/ru.po b/po/ru.po
index 3a91354..ec18fd7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -99,13 +99,13 @@ msgstr ""
#: pyanaconda/core/constants.py:164
msgid ""
-"This hardware (or a combination thereof) is not supported by Red Hat. For "
-"more information on supported hardware, please refer to http://www.redhat."
-"com/hardware."
+"This hardware (or a combination thereof) is not supported by MSVSphere. For "
+"more information on supported hardware, please refer to https://msvsphere-os."
+"ru."
msgstr ""
-"Это аппаратное обеспечение (или их комбинация) не поддерживается Red Hat. "
+"Это аппаратное обеспечение (или их комбинация) не поддерживается MSVSphere. "
"Для получения дополнительной информации о поддерживаемом оборудовании см. "
-"Http://www.redhat.com/hardware."
+"https://msvsphere-os.ru."
#: pyanaconda/core/constants.py:170
msgid ""
@@ -125,28 +125,28 @@ msgid ""
"improvements for certain workloads, but introduces several publicly "
"disclosed security issues. You have the option of disabling SMT, which may "
"impact performance. If you choose to leave SMT enabled, please read https://"
-"red.ht/rhel-smt to understand your potential risks and learn about other "
+"docs.msvsphere-os.ru/knowledge-base/security/smt.html to understand your potential risks and learn about other "
"ways to mitigate these risks."
msgstr ""
"Технология одновременной многопоточности (SMT) может обеспечить повышение "
"производительности при определенных рабочих нагрузках, но привносит "
"несколько известных проблем безопасности. Вы можете отключить SMT, что может "
"повлиять на производительность. Если вы решите оставить SMT включенным, "
-"прочитайте https://red.ht/rhel-smt для понимания потенциальных рисков и "
+"прочитайте https://docs.msvsphere-os.ru/knowledge-base/security/smt.html для понимания потенциальных рисков и "
"чтобы узнать о других способах снижения этих рисков."
#: pyanaconda/core/constants.py:190
msgid ""
"Simultaneous Multithreading (SMT) may improve performance for certain "
"workloads, but introduces several publicly disclosed security issues. You "
-"can disable SMT, which may impact performance. Please read https://red.ht/"
-"rhel-smt to understand potential risks and learn about ways to mitigate "
+"can disable SMT, which may impact performance. Please read https://docs.msvsphere-os.ru/"
+"knowledge-base/security/smt.html/ to understand potential risks and learn about ways to mitigate "
"these risks."
msgstr ""
"Одновременная многопоточность (SMT) может увеличить производительность при "
"определенных рабочих нагрузках, но привносит несколько известных проблем "
"безопасности. Можно отключить SMT, что может повлиять на производительность. "
-"Прочитайте https://red.ht/rhel-smt для понимания потенциальных рисков и "
+"Прочитайте https://docs.msvsphere-os.ru/knowledge-base/security/smt.html для понимания потенциальных рисков и "
"чтобы узнать о способах снижения этих рисков."
#: pyanaconda/core/constants.py:206
@@ -423,8 +423,8 @@ msgid "%s is missing. Cannot setup firewall."
msgstr "Нет %s. Настройка сетевого экрана невозможна."
#: pyanaconda/modules/payloads/source/cdn/cdn.py:47
-msgid "Red Hat CDN"
-msgstr "CDN Red Hat"
+msgid "MSVSphere CDN"
+msgstr "CDN МСВСфера"
#: pyanaconda/modules/payloads/source/cdrom/cdrom.py:62
msgid "Local media"
@@ -647,7 +647,7 @@ msgid ""
"recommended for a normal %(productName)s install."
msgstr ""
"Размер раздела %(mount)s меньше %(size)s, что меньше рекомендованного "
-"размера для обычной установки %(productName)s."
+"размера для обычной установки операционной системы."
#: pyanaconda/modules/storage/checker/utils.py:130
#, python-format
@@ -1162,7 +1162,7 @@ msgstr "Не удалось сменить устройство."
#: pyanaconda/modules/storage/partitioning/interactive/utils.py:213
#, python-brace-format
msgid "New {name} {version} Installation"
-msgstr "Новая установка {name} {version}"
+msgstr "Новая установка МСВСфера {version} ОС"
#: pyanaconda/modules/storage/partitioning/interactive/utils.py:275
msgid "Cannot set label on file system."
@@ -1823,7 +1823,7 @@ msgid ""
"You haven't created any mount points for your %(product)s %(version)s "
"installation yet. You can:"
msgstr ""
-"Вы еще не создали точки монтирования для установки %(product)s %(version)s. "
+"Вы еще не создали точки монтирования для установки операционной системы. "
"Вы можете:"
#: pyanaconda/ui/gui/spokes/lib/accordion.py:500
@@ -1853,6 +1853,11 @@ msgctxt "GUI|Custom Partitioning|Autopart Page"
msgid "_Encrypt automatically created mount points by default:"
msgstr "_Шифровать автоматически созданные точки монтирования по умолчанию:"
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:568
+msgctxt "GUI|Custom Partitioning|Autopart Page"
+msgid "Encrypt my data."
+msgstr "Зашифровать данные."
+
#: pyanaconda/ui/gui/spokes/lib/cart.py:193
msgctxt "GUI|Selected Disks Dialog"
msgid "_Do not install boot loader"
@@ -2143,7 +2148,7 @@ msgid ""
"you'll be able to view their details here."
msgstr ""
"Здесь будет показана информация о созданных точках монтирования для "
-"установки %(name)s %(version)s."
+"установки операционной системы."
#: pyanaconda/ui/gui/spokes/custom_storage.py:460
#: pyanaconda/ui/gui/spokes/custom_storage.py:503
@@ -2231,7 +2236,7 @@ msgstr "Не удалось разблокировать зашифровано
#: pyanaconda/ui/gui/spokes/datetime_spoke.py:427
msgctxt "GUI|Spoke"
msgid "_Time & Date"
-msgstr "_Time & Date"
+msgstr "_Дата и время"
#: pyanaconda/ui/gui/spokes/datetime_spoke.py:578
msgid "Restoring hardware time..."
@@ -2301,20 +2306,20 @@ msgstr "_Завершить установку"
#: pyanaconda/ui/gui/spokes/installation_progress.py:155
#, python-format
msgid ""
-"%s is now successfully installed and ready for you to use!\n"
+"%(name)s is now successfully installed and ready for you to use!\n"
"Go ahead and reboot your system to start using it!"
msgstr ""
-"%s успешно установлена и готова к использованию!\n"
-"Давайте, перезагружайте систему и начинайте использовать ее!"
+"Операционная система установлена и готова к работе.\n"
+"Необходимо перезагрузить систему чтобы приступить к использованию."
#: pyanaconda/ui/gui/spokes/installation_progress.py:160
#, python-format
msgid ""
-"%s is now successfully installed and ready for you to use!\n"
+"%(name)s is now successfully installed and ready for you to use!\n"
"Go ahead and quit the application to start using it!"
msgstr ""
-"%s успешно установлено и готово к использованию!\n"
-"Выйдите из приложения и начните использовать его!"
+"Операционная система установлена и готова к работе.\n"
+"Необходимо выйти из приложения чтобы приступить к использованию."
#: pyanaconda/ui/gui/spokes/installation_source.py:71
msgid "Setting up installation source..."
@@ -2348,7 +2353,7 @@ msgstr "Этот носитель не подходит для установк
#: pyanaconda/ui/gui/spokes/installation_source.py:412
msgctxt "GUI|Spoke"
msgid "_Installation Source"
-msgstr "_Инсталляционный источник"
+msgstr "_Источник установки"
#: pyanaconda/ui/gui/spokes/installation_source.py:567
msgid "Failed to set up installation source; check the repo url"
@@ -2467,7 +2472,7 @@ msgstr "%s для переключения раскладки."
#: pyanaconda/ui/gui/spokes/keyboard.py:280
msgctxt "GUI|Spoke"
msgid "_Keyboard"
-msgstr "_Keyboard"
+msgstr "_Клавиатура"
#: pyanaconda/ui/gui/spokes/keyboard.py:386
msgid "Testing layouts configuration not available."
@@ -2492,7 +2497,7 @@ msgstr "Переключение раскладки не настроено."
#: pyanaconda/ui/gui/spokes/language_support.py:64
msgctxt "GUI|Spoke"
msgid "_Language Support"
-msgstr "Поддержка _Language"
+msgstr "_Языковая поддержка"
#: pyanaconda/ui/gui/spokes/network.py:80
msgid "Status unknown (missing)"
@@ -2643,7 +2648,7 @@ msgstr "Неправильное имя узла: %s"
#: pyanaconda/ui/gui/spokes/root_password.py:56
msgctxt "GUI|Spoke"
msgid "_Root Password"
-msgstr "_Root Password"
+msgstr "Пароль _Root"
#: pyanaconda/ui/gui/spokes/root_password.py:128
msgid "Root password has been set."
@@ -2677,8 +2682,8 @@ msgid "Error checking software selection"
msgstr "Ошибка при проверке выбора программного обеспечения"
#: pyanaconda/ui/gui/spokes/software_selection.py:311
-msgid "Red Hat CDN requires registration."
-msgstr "Для Red Hat CDN требуется регистрация."
+msgid "MSVSphere CDN requires registration."
+msgstr "Для CDN МСВСфера требуется регистрация."
#: pyanaconda/ui/gui/spokes/software_selection.py:314
#: pyanaconda/ui/tui/spokes/software_selection.py:160
@@ -2749,7 +2754,7 @@ msgid ""
"of available space, including <b>%(software)s</b> for software and "
"<b>%(swap)s</b> for swap space."
msgstr ""
-"Для установки <b>%(product)s</b> требуется <b>%(total)s</b>, в том числе "
+"Для установки <b>операционной системы</b> требуется <b>%(total)s</b>, в том числе "
"<b>%(software)s</b> для программ и <b>%(swap)s</b> для подкачки."
#: pyanaconda/ui/gui/spokes/storage.py:115
@@ -2759,8 +2764,8 @@ msgid ""
"selection</a> requires <b>%(total)s</b> of available space, including "
"<b>%(software)s</b> for software and <b>%(swap)s</b> for swap space."
msgstr ""
-"Для <a href=\"\" title=\"%(tooltip)s\">программного обеспечения "
-"<b>%(product)s</b></a> требуется <b>%(total)s</b> пространства, в том числе "
+"Для <a href=\"\" title=\"%(tooltip)s\">установки "
+"<b>операционной системы</b></a> требуется <b>%(total)s</b> пространства, в том числе "
"<b>%(software)s</b> для программ и <b>%(swap)s</b> для подкачки."
#: pyanaconda/ui/gui/spokes/storage.py:166
@@ -2771,11 +2776,11 @@ msgstr "%s На выбранных дисках доступно:"
#: pyanaconda/ui/gui/spokes/storage.py:176
#, python-format
msgid ""
-"<b>You don't have enough space available to install %s</b>. You can shrink "
+"<b>You don't have enough space available to install %(name)s</b>. You can shrink "
"or remove existing partitions via our guided reclaim space tool, or you can "
"adjust your partitions on your own in the custom partitioning interface."
msgstr ""
-"<b>Недостаточно места для установки %s</b>. Можно уменьшить или удалить "
+"<b>Недостаточно места для установки операционной системы</b>. Можно уменьшить или удалить "
"существующие разделы с помощью помощника или самостоятельно выбрать размеры "
"разделов в окне настройки разделов."
@@ -2785,7 +2790,7 @@ msgid ""
" 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."
msgstr ""
-" Недостаточно места для установки <b>%(product)s</b>, даже если "
+" Недостаточно места для установки <b>операционной системы</b>, даже если "
"использовать все свободное место на выбранных дисках."
#: pyanaconda/ui/gui/spokes/storage.py:212
@@ -2796,16 +2801,16 @@ msgid ""
"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."
msgstr ""
-"<b>Недостаточно места для установки %(productName)s</b>, даже если "
+"<b>Недостаточно места для установки операционной системы</b>, даже если "
"использовать всё свободное место на выбранных дисках. Можно добавить ещё "
"диски, чтобы получить дополнительное место, изменить выбор программного "
-"обеспечения, чтобы установить меньший вариант <b>%(productName)s</b>, или "
+"обеспечения, чтобы уменьшить размер <b>системы</b>, или "
"покинуть программу установки."
#: pyanaconda/ui/gui/spokes/storage.py:238
msgctxt "GUI|Spoke"
msgid "Installation _Destination"
-msgstr "Установка _Destination"
+msgstr "Место _Установки"
#: pyanaconda/ui/gui/spokes/storage.py:349
msgid ""
@@ -2949,8 +2954,8 @@ msgstr "_ОК"
#: pyanaconda/ui/gui/spokes/subscription.py:73
msgctxt "GUI|Spoke"
-msgid "_Connect to Red Hat"
-msgstr "Под_ключиться к Red Hat"
+msgid "_Connect to MSVSphere"
+msgstr "Под_ключиться к МСВСфера"
#: pyanaconda/ui/gui/spokes/subscription.py:251
msgid "Activation key set."
@@ -3001,12 +3006,12 @@ msgid "Usage: {}"
msgstr "Применение: {}"
#: pyanaconda/ui/gui/spokes/subscription.py:1072
-msgid "Connected to Red Hat Insights"
-msgstr "Подключено к Red Hat Insights"
+msgid "Connected to MSVSphere Insights"
+msgstr "Подключено к МСВСфера Insights"
#: pyanaconda/ui/gui/spokes/subscription.py:1074
-msgid "Not connected to Red Hat Insights"
-msgstr "Не подключено к Red Hat Insights"
+msgid "Not connected to MSVSphere Insights"
+msgstr "Не подключено к МСВСфера Insights"
#: pyanaconda/ui/gui/spokes/subscription.py:1086
msgid "Subscribed in Simple Content Access mode."
@@ -3025,8 +3030,8 @@ msgid "{} subscriptions attached to the system"
msgstr "К системе прикреплено {} подписок"
#: pyanaconda/ui/gui/spokes/subscription.py:1133
-msgid "Please enable network access before connecting to Red Hat."
-msgstr "Перед подключением к Red Hat включите доступ к сети."
+msgid "Please enable network access before connecting to MSVSphere."
+msgstr "Перед подключением к МСВСфера включите доступ к сети."
#: pyanaconda/ui/gui/spokes/user.py:68
msgid "Invalid group name."
@@ -3055,7 +3060,37 @@ msgstr "Будет создан администратор %s"
msgid "User %s will be created"
msgstr "Будет создан пользователь %s"
-#: pyanaconda/ui/gui/spokes/welcome.py:255
+#: pyanaconda/ui/gui/spokes/welcome.py:259
+#, python-format
+msgid "WELCOME TO MSVSphere %(version)s Server"
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s Сервер"
+
+#: pyanaconda/ui/gui/spokes/welcome.py:261
+#, python-format
+msgid "WELCOME TO MSVSphere %(version)s ARM"
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s АРМ"
+
+#: pyanaconda/ui/gui/spokes/welcome.py:263
+#, python-format
+msgid "WELCOME TO MSVSphere %(version)s Cinnamon"
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s Cinnamon"
+
+#: pyanaconda/ui/gui/spokes/welcome.py:265
+#, python-format
+msgid "WELCOME TO MSVSphere %(version)s KDE"
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s KDE"
+
+#: pyanaconda/ui/gui/spokes/welcome.py:267
+#, python-format
+msgid "WELCOME TO MSVSphere %(version)s XFCE"
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s XFCE"
+
+#: pyanaconda/ui/gui/spokes/welcome.py:269
+#, python-format
+msgid "WELCOME TO MSVSphere %(version)s OS"
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s ОС"
+
+#: pyanaconda/ui/gui/spokes/welcome.py:271
#, python-format
msgid "WELCOME TO %(name)s %(version)s."
msgstr "ДОБРО ПОЖАЛОВАТЬ В %(name)s %(version)s."
@@ -4072,10 +4107,10 @@ msgstr "Не удается зашифровать пароль: неподде
#: pyanaconda/errors.py:264
msgid ""
-"An error occurred during Red Hat Insights configuration. Would you like to "
+"An error occurred during MSVSphere Insights configuration. Would you like to "
"ignore this and continue with installation?"
msgstr ""
-"Произошла ошибка при настройке Red Hat Insights. Игнорировать и продолжить "
+"Произошла ошибка при настройке МСВСфера Insights. Игнорировать и продолжить "
"установку?"
#: pyanaconda/errors.py:275
@@ -4095,16 +4130,16 @@ msgstr "Сведения об ошибке: "
#: pyanaconda/errors.py:289
msgid ""
-"Failed to enable Red Hat subscription on the installed system.\n"
+"Failed to enable MSVSphere subscription on the installed system.\n"
"\n"
-"Your Red Hat subscription might be invalid (such as due to an expired "
+"Your MSVSphere subscription might be invalid (such as due to an expired "
"developer subscription).\n"
"\n"
"Would you like to ignore this and continue with installation?"
msgstr ""
-"Не удалось включить подписку Red Hat на установленной системе.\n"
+"Не удалось включить подписку МСВСфера на установленной системе.\n"
"\n"
-"Возможно, ваша подписка Red Hat недействительна (например, из-за истекшей "
+"Возможно, ваша подписка МСВСфера недействительна (например, из-за истекшей "
"подписки разработчика).\n"
"\n"
"Хотите ли вы проигнорировать это и продолжить установку?"
@@ -4178,8 +4213,8 @@ msgid "Full name cannot contain colon characters"
msgstr "Полное имя не может содержать двоеточий"
#: pyanaconda/installation.py:87
-msgid "Configuring Red Hat subscription"
-msgstr "Настройка подписки Red Hat"
+msgid "Configuring MSVSphere subscription"
+msgstr "Настройка подписки МСВСфера"
#: pyanaconda/installation.py:94
msgid "Configuring installed system"
@@ -4349,7 +4384,37 @@ msgstr "Не подключено"
msgid "No network devices available"
msgstr "Сетевые устройства недоступны"
-#: pyanaconda/product.py:69
+#: pyanaconda/product.py:90
+#, python-format
+msgid "MSVSphere %(productVersion)s Server INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s Сервер"
+
+#: pyanaconda/product.py:92
+#, python-format
+msgid "MSVSphere %(productVersion)s ARM INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s АРМ"
+
+#: pyanaconda/product.py:94
+#, python-format
+msgid "MSVSphere %(productVersion)s Cinnamon INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s Cinnamon"
+
+#: pyanaconda/product.py:96
+#, python-format
+msgid "MSVSphere %(productVersion)s KDE INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s KDE"
+
+#: pyanaconda/product.py:98
+#, python-format
+msgid "MSVSphere %(productVersion)s XFCE INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s XFCE"
+
+#: pyanaconda/product.py:100
+#, python-format
+msgid "MSVSphere %(productVersion)s OS INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s ОС"
+
+#: pyanaconda/product.py:102
#, python-format
msgid "%(productName)s %(productVersion)s INSTALLATION"
msgstr "УСТАНОВКА %(productName)s %(productVersion)s"
@@ -4541,12 +4606,72 @@ msgstr "Для начала установки выполните ssh install@%s
msgid "Please ssh install@HOSTNAME to continue installation."
msgstr "Для продолжения установки выполните ssh install@HOSTNAME."
-#: pyanaconda/vnc.py:79
+#: pyanaconda/vnc.py:81
+#, python-format
+msgid "MSVSphere %(productVersion)s Server installation"
+msgstr "Установка МСВСфера %(productVersion)s Сервер"
+
+#: pyanaconda/vnc.py:83
+#, python-format
+msgid "MSVSphere %(productVersion)s ARM installation"
+msgstr "Установка МСВСфера %(productVersion)s АРМ"
+
+#: pyanaconda/vnc.py:85
+#, 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"
+msgstr "Установка МСВСфера %(productVersion)s ОС"
+
+#: pyanaconda/vnc.py:93
#, python-format
msgid "%(productName)s %(productVersion)s installation"
msgstr "Установка %(productName)s %(productVersion)s"
-#: pyanaconda/vnc.py:148
+#: pyanaconda/vnc.py:165
+#, python-format
+msgid "MSVSphere %(productVersion)s Server installation on host %(name)s"
+msgstr "Установка МСВСфера %(productVersion)s Сервер на %(name)s"
+
+#: pyanaconda/vnc.py:168
+#, python-format
+msgid "MSVSphere %(productVersion)s ARM installation on host %(name)s"
+msgstr "Установка МСВСфера %(productVersion)s АРМ на %(name)s"
+
+#: pyanaconda/vnc.py:171
+#, python-format
+msgid "MSVSphere %(productVersion)s Cinnamon installation on host %(name)s"
+msgstr "Установка МСВСфера %(productVersion)s Cinnamon на %(name)s"
+
+#: pyanaconda/vnc.py:174
+#, python-format
+msgid "MSVSphere %(productVersion)s KDE installation on host %(name)s"
+msgstr "Установка МСВСфера %(productVersion)s KDE на %(name)s"
+
+#: pyanaconda/vnc.py:177
+#, python-format
+msgid "MSVSphere %(productVersion)s XFCE installation on host %(name)s"
+msgstr "Установка МСВСфера %(productVersion)s XFCE на %(name)s"
+
+#: pyanaconda/vnc.py:180
+#, python-format
+msgid "MSVSphere %(productVersion)s OS installation on host %(name)s"
+msgstr "Установка МСВСфера %(productVersion)s ОС на %(name)s"
+
+#: pyanaconda/vnc.py:183
#, python-format
msgid "%(productName)s %(productVersion)s installation on host %(name)s"
msgstr "Установка %(productName)s %(productVersion)s на %(name)s"
@@ -6428,8 +6553,8 @@ msgstr "Установочный носитель через SE/_HMC"
#: pyanaconda/ui/gui/spokes/installation_source.glade:635
msgctxt "GUI|Software Source"
-msgid "Red Hat _CDN"
-msgstr "_CDN Red Hat"
+msgid "MSVSphere _CDN"
+msgstr "_CDN МСВСфера"
#: pyanaconda/ui/gui/spokes/installation_source.glade:654
msgctxt "GUI|Software Source"
@@ -7226,22 +7351,22 @@ msgid "Insights"
msgstr "Insights"
#: pyanaconda/ui/gui/spokes/subscription.glade:414
-msgctxt "GUI|Subscription|Red Hat Insights"
-msgid "Connect to Red Hat _Insights"
-msgstr "Подключиться к Red Hat _Insights"
+msgctxt "GUI|Subscription|MSVSphere Insights"
+msgid "Connect to MSVSphere _Insights"
+msgstr "Подключиться к МСВСфера _Insights"
#: pyanaconda/ui/gui/spokes/subscription.glade:418
msgid ""
-"Red Hat Insights aims to increase your IT efficiency and speed across hybrid "
+"MSVSphere Insights aims to increase your IT efficiency and speed across hybrid "
"infrastructures by identifying and prioritizing risks, managing "
"vulnerabilities, and compliance, and analyzing costs. For more information, "
-"visit the Red Hat Insights information page."
+"visit the MSVSphere Insights information page."
msgstr ""
-"Red Hat Insights направлена на повышение эффективности и скорости ИТ в "
+"МСВСфера Insights направлена на повышение эффективности и скорости ИТ в "
"гибридных инфраструктурах за счет выявления и приоритизации рисков, "
"управления уязвимостями, соблюдения нормативных требований и анализа затрат. "
-"Для получения дополнительной информации посетите информационную страницу Red "
-"Hat Insights."
+"Для получения дополнительной информации посетите информационную страницу МСВСфера "
+"Insights."
#: pyanaconda/ui/gui/spokes/subscription.glade:456
msgid "Custom base URL"
@@ -7436,8 +7561,8 @@ msgstr "Выход"
#: data/liveinst/gnome/rhel-welcome.desktop:3
#: data/liveinst/gnome/rhel-welcome.js:62
-msgid "Welcome to Red Hat Enterprise Linux"
-msgstr "Добро пожаловать в Red Hat Enterprise Linux"
+msgid "Welcome to MSVSphere ARM"
+msgstr "Добро пожаловать в МСВСфера АРМ"
#: data/liveinst/liveinst-setup.desktop:4
msgid "Liveinst Setup"
@@ -7456,17 +7581,18 @@ msgid "Install the live CD to your hard disk"
msgstr "Установить Live CD на жёсткий диск"
#: data/liveinst/gnome/rhel-welcome.js:91
-msgid "Try RHEL"
-msgstr "Попробуйте RHEL"
+msgid "Try MSVSphere ARM"
+msgstr "Попробуйте МСВСфера АРМ"
#: data/liveinst/gnome/rhel-welcome.js:107
msgid ""
-"You are currently running Red Hat Enterprise Linux from live media.\n"
-"You can install Red Hat Enterprise Linux now, or choose \"Install to Hard "
+"You are currently running MSVSphere ARM from live media.\n"
+"You can install MSVSphere ARM now, or choose \"Install to Hard "
"Drive\" in the Activities Overview at any later time."
msgstr ""
-"Вы можете установить Red Hat Enterprise Linux прямо сейчас или выбрать "
-"\"Установить на жесткий диск\" в обзоре деятельности в любое время позже."
+"МСВСфера АРМ запущена с установочного диска.\n"
+"Вы можете установить операционную систему прямо сейчас или выбрать "
+"«Установить на жесткий диск» в меню «Обзор»."
#: data/liveinst/gnome/rhel-welcome.js:127
msgid ""
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
index 1745ce2..6f6abd3 100644
--- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py
@@ -163,8 +163,8 @@ WARNING_SUPPORT_REMOVED = N_(
)
WARNING_HARDWARE_UNSUPPORTED = N_(
- "This hardware (or a combination thereof) is not supported by Red Hat. For more information "
- "on supported hardware, please refer to http://www.redhat.com/hardware."
+ "This hardware (or a combination thereof) is not supported by MSVSphere. For more information "
+ "on supported hardware, please refer to https://msvsphere-os.ru."
)
# Storage messages
@@ -183,7 +183,7 @@ WARNING_SMT_ENABLED_GUI = N_(
"improvements for certain workloads, but introduces several publicly "
"disclosed security issues. You have the option of disabling SMT, which "
"may impact performance. If you choose to leave SMT enabled, please read "
- "https://red.ht/rhel-smt to understand your potential risks and learn "
+ "https://docs.msvsphere-os.ru/knowledge-base/security/smt.html to understand your potential risks and learn "
"about other ways to mitigate these risks."
)
@@ -192,7 +192,7 @@ WARNING_SMT_ENABLED_TUI = N_(
"Simultaneous Multithreading (SMT) may improve performance for certain "
"workloads, but introduces several publicly disclosed security issues. "
"You can disable SMT, which may impact performance. Please read "
- "https://red.ht/rhel-smt to understand potential risks and learn about "
+ "https://docs.msvsphere-os.ru/knowledge-base/security/smt.html to understand potential risks and learn about "
"ways to mitigate these risks."
)
diff --git a/pyanaconda/errors.py b/pyanaconda/errors.py
index 884baca..a0ddd93 100644
--- a/pyanaconda/errors.py
+++ b/pyanaconda/errors.py
@@ -261,7 +261,7 @@ class ErrorHandler(object):
return ERROR_RAISE
def _insightsErrorHandler(self, exn):
- message = _("An error occurred during Red Hat Insights configuration. "
+ message = _("An error occurred during MSVSphere Insights configuration. "
"Would you like to ignore this and continue with "
"installation?")
message += "\n\n" + str(exn)
@@ -286,10 +286,10 @@ class ErrorHandler(object):
return ERROR_RAISE
def _subscriptionTokenTransferErrorHandler(self, exn):
- message = _("Failed to enable Red Hat subscription on the "
+ message = _("Failed to enable MSVSphere subscription on the "
"installed system."
"\n\n"
- "Your Red Hat subscription might be invalid "
+ "Your MSVSphere subscription might be invalid "
"(such as due to an expired developer subscription)."
"\n\n"
"Would you like to ignore this and continue with "
diff --git a/pyanaconda/installation.py b/pyanaconda/installation.py
index 6981562..269fdf5 100644
--- a/pyanaconda/installation.py
+++ b/pyanaconda/installation.py
@@ -84,7 +84,7 @@ def _prepare_configuration(payload, ksdata):
if is_module_available(SUBSCRIPTION):
# we only run the tasks if the Subscription module is available
subscription_config = TaskQueue("Subscription configuration",
- N_("Configuring Red Hat subscription"))
+ N_("Configuring MSVSphere subscription"))
subscription_proxy = SUBSCRIPTION.get_proxy()
subscription_dbus_tasks = subscription_proxy.InstallWithTasks()
subscription_config.append_dbus_tasks(SUBSCRIPTION, subscription_dbus_tasks)
diff --git a/pyanaconda/modules/payloads/source/cdn/cdn.py b/pyanaconda/modules/payloads/source/cdn/cdn.py
index 05c0e11..9e85c09 100644
--- a/pyanaconda/modules/payloads/source/cdn/cdn.py
+++ b/pyanaconda/modules/payloads/source/cdn/cdn.py
@@ -44,4 +44,4 @@ class CDNSourceModule(RepoFilesSourceModule):
@property
def description(self):
"""Get description of this source."""
- return _("Red Hat CDN")
+ return _("MSVSphere CDN")
diff --git a/pyanaconda/product.py b/pyanaconda/product.py
index 0f3e248..c8a7b61 100644
--- a/pyanaconda/product.py
+++ b/pyanaconda/product.py
@@ -19,6 +19,7 @@
import configparser
import os
+import re
from pyanaconda.core.i18n import _
@@ -64,7 +65,41 @@ def trim_product_version_for_ui(version):
productVersion = trim_product_version_for_ui(productVersion)
+if productName.startswith("MSVSphere"):
+ productBase = "MSVSphere"
+ if productName == "MSVSphere Server" or \
+ (productName == "MSVSphere" and productVariant == "Minimal"):
+ productFlavor = "Server"
+ elif productName == "MSVSphere" and productVariant == "BaseOS":
+ productFlavor = "OS"
+ elif productName == "MSVSphere":
+ os_release = open("/etc/os-release", "r")
+ for line in os_release:
+ match = re.match("VERSION=.*\((.*?)\)", line)
+ if match:
+ productFlavor = match.group(1)
+ else:
+ productFlavor = "OS"
+else:
+ productBase = productName
+ productFlavor = None
def distributionText():
- return _("%(productName)s %(productVersion)s INSTALLATION") % \
- {"productName": productName, "productVersion": productVersion}
+ if productBase == "MSVSphere" and productFlavor == "Server":
+ distro_text = _("MSVSphere %(productVersion)s Server INSTALLATION")
+ elif productBase == "MSVSphere" and productFlavor == "ARM":
+ 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":
+ distro_text = _("MSVSphere %(productVersion)s OS INSTALLATION")
+ else:
+ distro_text = _("%(productName)s %(productVersion)s INSTALLATION")
+ return distro_text % {
+ "productName": productName,
+ "productVersion": productVersion
+ }
diff --git a/pyanaconda/ui/gui/spokes/installation_progress.py b/pyanaconda/ui/gui/spokes/installation_progress.py
index 23ac6f6..1a58ac3 100644
--- a/pyanaconda/ui/gui/spokes/installation_progress.py
+++ b/pyanaconda/ui/gui/spokes/installation_progress.py
@@ -152,14 +152,14 @@ class ProgressSpoke(StandaloneSpoke):
# Set the reboot label.
if conf.target.is_hardware:
continue_text = _(
- "%s is now successfully installed and ready for you to use!\n"
+ "%(name)s is now successfully installed and ready for you to use!\n"
"Go ahead and reboot your system to start using it!"
- ) % productName
+ ) % {"name": productName}
else:
continue_text = _(
- "%s is now successfully installed and ready for you to use!\n"
+ "%(name)s is now successfully installed and ready for you to use!\n"
"Go ahead and quit the application to start using it!"
- ) % productName
+ ) % {"name": productName}
label = self.builder.get_object("rebootLabel")
label.set_text(continue_text)
diff --git a/pyanaconda/ui/gui/spokes/installation_source.glade b/pyanaconda/ui/gui/spokes/installation_source.glade
index e53fa23..7efe161 100644
--- a/pyanaconda/ui/gui/spokes/installation_source.glade
+++ b/pyanaconda/ui/gui/spokes/installation_source.glade
@@ -632,7 +632,7 @@
</child>
<child>
<object class="GtkRadioButton" id="cdnRadioButton">
- <property name="label" translatable="yes" context="GUI|Software Source">Red Hat _CDN</property>
+ <property name="label" translatable="yes" context="GUI|Software Source">MSVSphere _CDN</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
diff --git a/pyanaconda/ui/gui/spokes/lib/accordion.py b/pyanaconda/ui/gui/spokes/lib/accordion.py
index bed4a23..c1d89f6 100644
--- a/pyanaconda/ui/gui/spokes/lib/accordion.py
+++ b/pyanaconda/ui/gui/spokes/lib/accordion.py
@@ -565,7 +565,7 @@ class CreateNewPage(BasePage):
)
self._createBox.attach(label, 0, 6, 2, 1)
- checkbox = Gtk.CheckButton(label="Encrypt my data.")
+ checkbox = Gtk.CheckButton(label=_("Encrypt my data."))
checkbox.connect("toggled", encrypted_changed_cb)
checkbox.set_active(default_encryption)
checkbox.set_margin_start(18)
diff --git a/pyanaconda/ui/gui/spokes/software_selection.py b/pyanaconda/ui/gui/spokes/software_selection.py
index 1044d9b..ba4c5ec 100644
--- a/pyanaconda/ui/gui/spokes/software_selection.py
+++ b/pyanaconda/ui/gui/spokes/software_selection.py
@@ -308,7 +308,7 @@ class SoftwareSelectionSpoke(NormalSpoke):
subscribed = subscription_proxy.IsSubscriptionAttached
if cdn_source and not subscribed:
- return _("Red Hat CDN requires registration.")
+ return _("MSVSphere CDN requires registration.")
if not self.ready:
return _("Installation source not set up")
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index 1dc4aed..e502e68 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -174,10 +174,10 @@ class NeedSpaceDialog(InstallOptionsDialogBase):
self._set_free_space_labels(disk_free, fs_free)
label_text = _("<b>You don't have enough space available to install "
- "%s</b>. You can shrink or remove existing partitions "
+ "%(name)s</b>. You can shrink or remove existing partitions "
"via our guided reclaim space tool, or you can adjust your "
"partitions on your own in the custom partitioning "
- "interface.") % escape_markup(productName)
+ "interface.") % {"name": escape_markup(productName)}
self.builder.get_object("need_space_options_label").set_markup(label_text)
self._add_modify_watcher(label)
diff --git a/pyanaconda/ui/gui/spokes/subscription.glade b/pyanaconda/ui/gui/spokes/subscription.glade
index 53f61ca..28e8e45 100644
--- a/pyanaconda/ui/gui/spokes/subscription.glade
+++ b/pyanaconda/ui/gui/spokes/subscription.glade
@@ -411,11 +411,11 @@
</child>
<child>
<object class="GtkCheckButton" id="insights_checkbox">
- <property name="label" translatable="yes" context="GUI|Subscription|Red Hat Insights">Connect to Red Hat _Insights</property>
+ <property name="label" translatable="yes" context="GUI|Subscription|MSVSphere Insights">Connect to MSVSphere _Insights</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Red Hat Insights aims to increase your IT efficiency and speed across hybrid infrastructures by identifying and prioritizing risks, managing vulnerabilities, and compliance, and analyzing costs. For more information, visit the Red Hat Insights information page.</property>
+ <property name="tooltip_text" translatable="yes">MSVSphere Insights aims to increase your IT efficiency and speed across hybrid infrastructures by identifying and prioritizing risks, managing vulnerabilities, and compliance, and analyzing costs. For more information, visit the MSVSphere Insights information page.</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
diff --git a/pyanaconda/ui/gui/spokes/subscription.py b/pyanaconda/ui/gui/spokes/subscription.py
index 27d6b42..29367e2 100644
--- a/pyanaconda/ui/gui/spokes/subscription.py
+++ b/pyanaconda/ui/gui/spokes/subscription.py
@@ -70,7 +70,7 @@ class SubscriptionSpoke(NormalSpoke):
category = SoftwareCategory
icon = "application-certificate-symbolic"
- title = CN_("GUI|Spoke", "_Connect to Red Hat")
+ title = CN_("GUI|Spoke", "_Connect to MSVSphere")
# main notebook pages
REGISTRATION_PAGE = 0
@@ -1073,9 +1073,9 @@ class SubscriptionSpoke(NormalSpoke):
# the installation environment itself is not expected to be
# connected to Insights
if self._subscription_module.InsightsEnabled:
- insights_string = _("Connected to Red Hat Insights")
+ insights_string = _("Connected to MSVSphere Insights")
else:
- insights_string = _("Not connected to Red Hat Insights")
+ insights_string = _("Not connected to MSVSphere Insights")
self._insights_status_label.set_text(insights_string)
# get attached subscriptions as a list of structs
@@ -1134,7 +1134,7 @@ class SubscriptionSpoke(NormalSpoke):
# set a warning
log.debug("Subscription GUI: setting connectivity warning")
self.show_warning_message(
- _("Please enable network access before connecting to Red Hat.")
+ _("Please enable network access before connecting to MSVSphere.")
)
# remember state
self._network_connected_previously = network_connected
diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py
index ef59305..b1a643d 100644
--- a/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
from pyanaconda.ui.gui.spokes.lib.unsupported_hardware import UnsupportedHardwareDialog
from pyanaconda import localization
-from pyanaconda.product import distributionText, isFinal, productName, productVersion
+from pyanaconda.product import (
+ distributionText, isFinal, productName, productVersion, productBase,
+ productFlavor
+)
from pyanaconda import flags
from pyanaconda import geoloc
from pyanaconda.core.i18n import _, C_
@@ -252,7 +255,21 @@ class WelcomeLanguageSpoke(StandaloneSpoke, LangLocaleHandler):
# substituted.
welcomeLabel = self.builder.get_object("welcomeLabel")
- welcomeLabel.set_text(_("WELCOME TO %(name)s %(version)s.") %
+ if productBase == "MSVSphere" and productFlavor == "Server":
+ welcome_text = _("WELCOME TO MSVSphere %(version)s Server")
+ elif productBase == "MSVSphere" and productFlavor == "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":
+ welcome_text = _("WELCOME TO MSVSphere %(version)s OS")
+ else:
+ welcome_text = _("WELCOME TO %(name)s %(version)s")
+ welcomeLabel.set_text(welcome_text %
{"name" : productName.upper(), "version" : productVersion}) # pylint: disable=no-member
# Retranslate the language (filtering) entry's placeholder text
diff --git a/pyanaconda/vnc.py b/pyanaconda/vnc.py
index 54a45dd..eb3a078 100644
--- a/pyanaconda/vnc.py
+++ b/pyanaconda/vnc.py
@@ -76,7 +76,22 @@ class VncServer(object):
self.anaconda = None
self.log = get_stdout_logger()
- self.desktop = _("%(productName)s %(productVersion)s installation")\
+ is_sphere = product.productBase == "MSVSphere"
+ if is_sphere and product.productFlavor == "Server":
+ desktop_text = _("MSVSphere %(productVersion)s Server installation")
+ elif is_sphere and product.productFlavor == "ARM":
+ 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":
+ desktop_text = _("MSVSphere %(productVersion)s OS installation")
+ else:
+ desktop_text = _("%(productName)s %(productVersion)s installation")
+ self.desktop = desktop_text \
% {'productName': product.productName,
'productVersion': product.productVersion}
@@ -145,8 +160,29 @@ class VncServer(object):
# figure out product info
if host:
- self.desktop = _("%(productName)s %(productVersion)s installation "
- "on host %(name)s") \
+ is_sphere = product.productBase == "MSVSphere"
+ if is_sphere and product.productFlavor == "Server":
+ desktop_text = _("MSVSphere %(productVersion)s Server "
+ "installation on host %(name)s")
+ elif is_sphere and product.productFlavor == "ARM":
+ desktop_text = _("MSVSphere %(productVersion)s ARM "
+ "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":
+ desktop_text = _("MSVSphere %(productVersion)s OS "
+ "installation on host %(name)s")
+ else:
+ desktop_text = _("%(productName)s %(productVersion)s "
+ "installation on host %(name)s")
+ self.desktop = desktop_text \
% {'productName': product.productName,
'productVersion': product.productVersion,
'name': host}
--
2.39.3