|
|
@ -0,0 +1,160 @@
|
|
|
|
|
|
|
|
From f28728f85b810f291666ef6334b4c3dbf1347ef2 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
|
|
From: Eugene Zamriy <ezamriy@msvsphere.ru>
|
|
|
|
|
|
|
|
Date: Thu, 30 Mar 2023 00:09:57 +0300
|
|
|
|
|
|
|
|
Subject: [PATCH 5/6] Change Fedora references to MSVSphere
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
|
|
|
data/liveinst/gnome/fedora-welcome.desktop | 2 +-
|
|
|
|
|
|
|
|
data/liveinst/gnome/fedora-welcome.js | 6 ++---
|
|
|
|
|
|
|
|
docs/intro.rst | 4 ++--
|
|
|
|
|
|
|
|
docs/iscsi.rst | 2 +-
|
|
|
|
|
|
|
|
po/ru.po | 28 +++++++++++-----------
|
|
|
|
|
|
|
|
pyanaconda/core/constants.py | 4 ++--
|
|
|
|
|
|
|
|
6 files changed, 23 insertions(+), 23 deletions(-)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/fedora-welcome.desktop
|
|
|
|
|
|
|
|
index 60e5c38..8b6fefb 100644
|
|
|
|
|
|
|
|
--- a/data/liveinst/gnome/fedora-welcome.desktop
|
|
|
|
|
|
|
|
+++ b/data/liveinst/gnome/fedora-welcome.desktop
|
|
|
|
|
|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
|
|
|
|
[Desktop Entry]
|
|
|
|
|
|
|
|
-Name=Welcome to Fedora
|
|
|
|
|
|
|
|
+Name=Welcome to MSVSphere
|
|
|
|
|
|
|
|
Exec=/usr/share/anaconda/gnome/fedora-welcome
|
|
|
|
|
|
|
|
Terminal=false
|
|
|
|
|
|
|
|
Type=Application
|
|
|
|
|
|
|
|
diff --git a/data/liveinst/gnome/fedora-welcome.js b/data/liveinst/gnome/fedora-welcome.js
|
|
|
|
|
|
|
|
index 0520557..4c0a66a 100755
|
|
|
|
|
|
|
|
--- a/data/liveinst/gnome/fedora-welcome.js
|
|
|
|
|
|
|
|
+++ b/data/liveinst/gnome/fedora-welcome.js
|
|
|
|
|
|
|
|
@@ -62,7 +62,7 @@ const WelcomeWindow = new Lang.Class({
|
|
|
|
|
|
|
|
default_width: 600,
|
|
|
|
|
|
|
|
default_height: 550,
|
|
|
|
|
|
|
|
skip_taskbar_hint: true,
|
|
|
|
|
|
|
|
- title: _("Welcome to Fedora"),
|
|
|
|
|
|
|
|
+ title: _("Welcome to MSVSphere"),
|
|
|
|
|
|
|
|
window_position: Gtk.WindowPosition.CENTER });
|
|
|
|
|
|
|
|
this.window.connect('key-press-event', Lang.bind(this,
|
|
|
|
|
|
|
|
function(w, event) {
|
|
|
|
|
|
|
|
@@ -91,7 +91,7 @@ const WelcomeWindow = new Lang.Class({
|
|
|
|
|
|
|
|
spacing: 16 });
|
|
|
|
|
|
|
|
tryContent.add(new Gtk.Image({ icon_name: 'media-optical',
|
|
|
|
|
|
|
|
pixel_size: 256 }));
|
|
|
|
|
|
|
|
- tryContent.add(makeLabel(_("Try Fedora"), true));
|
|
|
|
|
|
|
|
+ tryContent.add(makeLabel(_("Try MSVSphere"), true));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let tryButton = new Gtk.Button({ child: tryContent });
|
|
|
|
|
|
|
|
buttonBox.add(tryButton);
|
|
|
|
|
|
|
|
@@ -107,7 +107,7 @@ const WelcomeWindow = new Lang.Class({
|
|
|
|
|
|
|
|
let installButton = new Gtk.Button({ child: installContent });
|
|
|
|
|
|
|
|
buttonBox.add(installButton);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- this._label = makeLabel(_("You are currently running Fedora from live media.\nYou can install Fedora now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."), false);
|
|
|
|
|
|
|
|
+ this._label = makeLabel(_("You are currently running MSVSphere from live media.\nYou can install MSVSphere 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..65a1a35 100644
|
|
|
|
|
|
|
|
--- a/docs/intro.rst
|
|
|
|
|
|
|
|
+++ b/docs/intro.rst
|
|
|
|
|
|
|
|
@@ -1,8 +1,8 @@
|
|
|
|
|
|
|
|
Introduction to Anaconda
|
|
|
|
|
|
|
|
========================
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-Anaconda is the installation program used by Fedora, Red Hat Enterprise Linux
|
|
|
|
|
|
|
|
-and some other distributions.
|
|
|
|
|
|
|
|
+Anaconda is the installation program used by Fedora, Red Hat Enterprise Linux,
|
|
|
|
|
|
|
|
+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 e461fe9..51b1b34 100644
|
|
|
|
|
|
|
|
--- a/po/ru.po
|
|
|
|
|
|
|
|
+++ b/po/ru.po
|
|
|
|
|
|
|
|
@@ -1477,13 +1477,13 @@ msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/core/constants.py:159
|
|
|
|
|
|
|
|
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.ru."
|
|
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
-"Это аппаратное обеспечение (или их комбинация) не поддерживается Red Hat. "
|
|
|
|
|
|
|
|
-"Для получения дополнительной информации о поддерживаемом оборудовании см. "
|
|
|
|
|
|
|
|
-"http://www.redhat.com/hardware."
|
|
|
|
|
|
|
|
+"Это аппаратное обеспечение (или их комбинация) не поддерживается ОС "
|
|
|
|
|
|
|
|
+"МСВСфера. Для получения дополнительной информации о поддерживаемом "
|
|
|
|
|
|
|
|
+"оборудовании см. https://msvsphere.ru."
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/core/constants.py:165
|
|
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
|
|
@@ -7442,25 +7442,25 @@ msgstr "Установить Live CD на жёсткий диск"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: data/liveinst/gnome/fedora-welcome.desktop:3
|
|
|
|
|
|
|
|
#: data/liveinst/gnome/fedora-welcome.js:65
|
|
|
|
|
|
|
|
-msgid "Welcome to Fedora"
|
|
|
|
|
|
|
|
-msgstr "Добро пожаловать в Fedora"
|
|
|
|
|
|
|
|
+msgid "Welcome to MSVSphere"
|
|
|
|
|
|
|
|
+msgstr "Добро пожаловать в ОС МСВСфера"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: data/liveinst/liveinst-setup.desktop:4
|
|
|
|
|
|
|
|
msgid "Liveinst Setup"
|
|
|
|
|
|
|
|
msgstr "Настройка Liveinst"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: data/liveinst/gnome/fedora-welcome.js:94
|
|
|
|
|
|
|
|
-msgid "Try Fedora"
|
|
|
|
|
|
|
|
-msgstr "Попробуйте Fedora"
|
|
|
|
|
|
|
|
+msgid "Try MSVSphere"
|
|
|
|
|
|
|
|
+msgstr "Попробуйте ОС МСВСфера"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: data/liveinst/gnome/fedora-welcome.js:110
|
|
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
|
|
-"You are currently running Fedora from live media.\n"
|
|
|
|
|
|
|
|
-"You can install Fedora now, or choose \"Install to Hard Drive\" in the "
|
|
|
|
|
|
|
|
+"You are currently running MSVSphere from live media.\n"
|
|
|
|
|
|
|
|
+"You can install MSVSphere now, or choose \"Install to Hard Drive\" in the "
|
|
|
|
|
|
|
|
"Activities Overview at any later time."
|
|
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
-"Fedora запущена с установочного диска.\n"
|
|
|
|
|
|
|
|
-"Вы можете установить Fedora сейчас или в любое время выбрать «Установить на "
|
|
|
|
|
|
|
|
+"ОС МСВСфера запущена с установочного диска.\n"
|
|
|
|
|
|
|
|
+"Вы можете установить ОС МСВСфера сейчас или в любое время выбрать «Установить на "
|
|
|
|
|
|
|
|
"жесткий диск» в меню «Обзор»."
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: data/liveinst/gnome/fedora-welcome.js:130
|
|
|
|
|
|
|
|
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
|
|
|
|
|
|
|
|
index 874c785..fc4df60 100644
|
|
|
|
|
|
|
|
--- a/pyanaconda/core/constants.py
|
|
|
|
|
|
|
|
+++ b/pyanaconda/core/constants.py
|
|
|
|
|
|
|
|
@@ -157,8 +157,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.ru."
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Storage messages
|
|
|
|
|
|
|
|
--
|
|
|
|
|
|
|
|
2.39.2
|
|
|
|
|
|
|
|
|