|
|
|
@ -1,16 +1,15 @@
|
|
|
|
From e02c546fc470816562c2572313a623fc313ca25f Mon Sep 17 00:00:00 2001
|
|
|
|
From 35f26b9d5cc7cad04f2dd981fe445170a6f36c9b Mon Sep 17 00:00:00 2001
|
|
|
|
From: Eugene Zamriy <eugene@zamriy.info>
|
|
|
|
From: Eugene Zamriy <eugene@zamriy.info>
|
|
|
|
Date: Fri, 14 Apr 2023 18:23:29 +0300
|
|
|
|
Date: Fri, 14 Apr 2023 18:23:29 +0300
|
|
|
|
Subject: [PATCH 8/9] Replace Fedora references and update translations
|
|
|
|
Subject: [PATCH 1/2] Replace Fedora references and update translations
|
|
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
---
|
|
|
|
data/liveinst/gnome/fedora-welcome.desktop | 3 +-
|
|
|
|
data/liveinst/gnome/fedora-welcome.desktop | 3 ++-
|
|
|
|
data/liveinst/gnome/fedora-welcome.js | 6 +--
|
|
|
|
data/liveinst/gnome/fedora-welcome.js | 6 +++---
|
|
|
|
docs/intro.rst | 4 +-
|
|
|
|
docs/intro.rst | 4 ++--
|
|
|
|
docs/iscsi.rst | 2 +-
|
|
|
|
docs/iscsi.rst | 2 +-
|
|
|
|
po/ru.po | 46 +++++++++++-----------
|
|
|
|
pyanaconda/core/constants.py | 4 ++--
|
|
|
|
pyanaconda/core/constants.py | 4 +-
|
|
|
|
5 files changed, 10 insertions(+), 9 deletions(-)
|
|
|
|
6 files changed, 33 insertions(+), 32 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 60e5c38..90f5678 100644
|
|
|
|
index 60e5c38..90f5678 100644
|
|
|
|
@ -83,142 +82,11 @@ index 847078d..6d9c4b3 100644
|
|
|
|
and so the issues can often be reproduced and debugged.
|
|
|
|
and so the issues can often be reproduced and debugged.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/po/ru.po b/po/ru.po
|
|
|
|
|
|
|
|
index e461fe9..fcf49d1 100644
|
|
|
|
|
|
|
|
--- a/po/ru.po
|
|
|
|
|
|
|
|
+++ b/po/ru.po
|
|
|
|
|
|
|
|
@@ -987,7 +987,7 @@ msgid ""
|
|
|
|
|
|
|
|
"recommended for a normal %(productName)s install."
|
|
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
"Размер раздела %(mount)s меньше %(size)s, что меньше рекомендованного "
|
|
|
|
|
|
|
|
-"размера для обычной установки %(productName)s."
|
|
|
|
|
|
|
|
+"размера для обычной установки МСВСфера."
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/modules/storage/checker/utils.py:131
|
|
|
|
|
|
|
|
#, python-format
|
|
|
|
|
|
|
|
@@ -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 ""
|
|
|
|
|
|
|
|
@@ -2027,12 +2027,12 @@ msgstr "Сетевые устройства недоступны"
|
|
|
|
|
|
|
|
#: pyanaconda/vnc.py:79
|
|
|
|
|
|
|
|
#, python-format
|
|
|
|
|
|
|
|
msgid "%(productName)s %(productVersion)s installation"
|
|
|
|
|
|
|
|
-msgstr "Установка %(productName)s %(productVersion)s"
|
|
|
|
|
|
|
|
+msgstr "Установка МСВСфера %(productVersion)s"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/vnc.py:148
|
|
|
|
|
|
|
|
#, python-format
|
|
|
|
|
|
|
|
msgid "%(productName)s %(productVersion)s installation on host %(name)s"
|
|
|
|
|
|
|
|
-msgstr "Установка %(productName)s %(productVersion)s на %(name)s"
|
|
|
|
|
|
|
|
+msgstr "Установка МСВСфера %(productVersion)s на %(name)s"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/vnc.py:167
|
|
|
|
|
|
|
|
#, python-format
|
|
|
|
|
|
|
|
@@ -2153,7 +2153,7 @@ msgstr ""
|
|
|
|
|
|
|
|
#: pyanaconda/product.py:69
|
|
|
|
|
|
|
|
#, python-format
|
|
|
|
|
|
|
|
msgid "%(productName)s %(productVersion)s INSTALLATION"
|
|
|
|
|
|
|
|
-msgstr "УСТАНОВКА %(productName)s %(productVersion)s"
|
|
|
|
|
|
|
|
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/payload/live/payload_base.py:73
|
|
|
|
|
|
|
|
#: pyanaconda/payload/live/payload_liveos.py:93
|
|
|
|
|
|
|
|
@@ -2261,7 +2261,7 @@ msgid ""
|
|
|
|
|
|
|
|
"\"\">Click for details.</a>"
|
|
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
"Предупреждение: в процессоре включена одновременная многопоточность (SMT). "
|
|
|
|
|
|
|
|
-"<a href=\"\">Нжмите для получения дополнительной информации.</a>"
|
|
|
|
|
|
|
|
+"<a href=\"\">Нажмите для получения дополнительной информации.</a>"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/hubs/summary.py:103
|
|
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
|
|
@@ -2286,7 +2286,7 @@ msgstr "Заполните отмеченные секции, прежде че
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/welcome.py:274
|
|
|
|
|
|
|
|
#, python-format
|
|
|
|
|
|
|
|
msgid "WELCOME TO %(name)s %(version)s."
|
|
|
|
|
|
|
|
-msgstr "ДОБРО ПОЖАЛОВАТЬ В %(name)s %(version)s."
|
|
|
|
|
|
|
|
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s."
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/user.py:68
|
|
|
|
|
|
|
|
msgid "Invalid group name."
|
|
|
|
|
|
|
|
@@ -2456,10 +2456,10 @@ 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/lib/accordion.py:423
|
|
|
|
|
|
|
|
@@ -3699,7 +3699,7 @@ msgstr[2] "Выбраны {} устройств _хранения"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/__init__.py:365 widgets/src/BaseWindow.c:151
|
|
|
|
|
|
|
|
msgid "Help!"
|
|
|
|
|
|
|
|
-msgstr "Помогите!"
|
|
|
|
|
|
|
|
+msgstr "Справка"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/__init__.py:870
|
|
|
|
|
|
|
|
msgctxt "GUI|Yes No Dialog"
|
|
|
|
|
|
|
|
@@ -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
|
|
|
|
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
|
|
|
|
index 5122035..b3c574c 100644
|
|
|
|
index 2f62cce..446fa0b 100644
|
|
|
|
--- a/pyanaconda/core/constants.py
|
|
|
|
--- a/pyanaconda/core/constants.py
|
|
|
|
+++ b/pyanaconda/core/constants.py
|
|
|
|
+++ b/pyanaconda/core/constants.py
|
|
|
|
@@ -157,8 +157,8 @@ WARNING_SUPPORT_REMOVED = N_(
|
|
|
|
@@ -156,8 +156,8 @@ WARNING_SUPPORT_REMOVED = N_(
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
WARNING_HARDWARE_UNSUPPORTED = N_(
|
|
|
|
WARNING_HARDWARE_UNSUPPORTED = N_(
|
|
|
|
|
