|
|
|
|
@ -1,35 +1,35 @@
|
|
|
|
|
From c4ce2dc3afb422937a85a4a2e888b1a3a282672b Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
|
|
|
|
|
Date: Tue, 24 Oct 2023 12:41:45 +0300
|
|
|
|
|
Subject: [PATCH 11/11] Add MSVSphere identification support
|
|
|
|
|
From ac748f0754c8689d5261e00ecfcba9778388a028 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Alexey Lyubimov <a.lyubimov@softline.com>
|
|
|
|
|
Date: Wed, 3 Apr 2024 13:42:06 +0300
|
|
|
|
|
Subject: [PATCH] Add MSVSphere identification support
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
data/liveinst/gnome/fedora-welcome.desktop | 4 +-
|
|
|
|
|
data/liveinst/gnome/fedora-welcome.js | 2 +-
|
|
|
|
|
po/ru.po | 190 +++++++++++++++---
|
|
|
|
|
po/ru.po | 187 +++++++++++++++---
|
|
|
|
|
pyanaconda/product.py | 36 +++-
|
|
|
|
|
.../ui/gui/spokes/installation_progress.py | 8 +-
|
|
|
|
|
pyanaconda/ui/gui/spokes/lib/accordion.py | 2 +-
|
|
|
|
|
.../ui/gui/spokes/lib/storage_dialogs.py | 4 +-
|
|
|
|
|
pyanaconda/ui/gui/spokes/welcome.py | 21 +-
|
|
|
|
|
pyanaconda/vnc.py | 42 +++-
|
|
|
|
|
9 files changed, 260 insertions(+), 49 deletions(-)
|
|
|
|
|
9 files changed, 258 insertions(+), 48 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/fedora-welcome.desktop
|
|
|
|
|
index 90f5678..abbbff3 100644
|
|
|
|
|
index 90f5678..8ca72a7 100644
|
|
|
|
|
--- a/data/liveinst/gnome/fedora-welcome.desktop
|
|
|
|
|
+++ b/data/liveinst/gnome/fedora-welcome.desktop
|
|
|
|
|
@@ -1,6 +1,6 @@
|
|
|
|
|
[Desktop Entry]
|
|
|
|
|
-Name=Welcome to MSVSphere
|
|
|
|
|
-Name[ru]=Добро пожаловать в МСВСфера
|
|
|
|
|
+Name=Welcome to MSVSphere ARM 9.3
|
|
|
|
|
+Name[ru]=Добро пожаловать в МСВСфера АРМ 9.3
|
|
|
|
|
+Name=Welcome to MSVSphere ARM 9.4
|
|
|
|
|
+Name[ru]=Добро пожаловать в МСВСфера АРМ 9.4
|
|
|
|
|
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 4c0a66a..120d718 100755
|
|
|
|
|
index 4c0a66a..0a494c8 100755
|
|
|
|
|
--- a/data/liveinst/gnome/fedora-welcome.js
|
|
|
|
|
+++ b/data/liveinst/gnome/fedora-welcome.js
|
|
|
|
|
@@ -62,7 +62,7 @@ const WelcomeWindow = new Lang.Class({
|
|
|
|
|
@ -37,81 +37,188 @@ index 4c0a66a..120d718 100755
|
|
|
|
|
default_height: 550,
|
|
|
|
|
skip_taskbar_hint: true,
|
|
|
|
|
- title: _("Welcome to MSVSphere"),
|
|
|
|
|
+ title: _("Welcome to MSVSphere ARM 9.3"),
|
|
|
|
|
+ title: _("Welcome to MSVSphere ARM 9.4"),
|
|
|
|
|
window_position: Gtk.WindowPosition.CENTER });
|
|
|
|
|
this.window.connect('key-press-event', Lang.bind(this,
|
|
|
|
|
function(w, event) {
|
|
|
|
|
diff --git a/po/ru.po b/po/ru.po
|
|
|
|
|
index 8340e9e..7eed72b 100644
|
|
|
|
|
index 1edb03d..78125d5 100644
|
|
|
|
|
--- a/po/ru.po
|
|
|
|
|
+++ b/po/ru.po
|
|
|
|
|
@@ -461,13 +461,13 @@ msgstr ""
|
|
|
|
|
@@ -288,12 +288,72 @@ msgstr "Сервера NTP:"
|
|
|
|
|
msgid "not configured"
|
|
|
|
|
msgstr "не настроено"
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/core/constants.py:157
|
|
|
|
|
+#: 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:79
|
|
|
|
|
#, 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"
|
|
|
|
|
@@ -748,17 +808,16 @@ msgstr ""
|
|
|
|
|
"Проверьте раздел удаленных функциональных возможностей в примечаниях к "
|
|
|
|
|
"выпуску."
|
|
|
|
|
|
|
|
|
|
-#: pyanaconda/core/constants.py:157
|
|
|
|
|
+#: pyanaconda/core/constants.py:163
|
|
|
|
|
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."
|
|
|
|
|
+"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. "
|
|
|
|
|
-"Для получения дополнительной информации о поддерживаемом оборудовании см. "
|
|
|
|
|
+"Это аппаратное обеспечение (или их комбинация) не поддерживается МСВСфера. "
|
|
|
|
|
"Для получения дополнительной информации о поддерживаемом оборудовании см. "
|
|
|
|
|
-"http://www.redhat.com/hardware."
|
|
|
|
|
+"Это аппаратное обеспечение (или их комбинация) не поддерживается "
|
|
|
|
|
+"МСВСфера ОС. Для получения дополнительной информации о поддерживаемом "
|
|
|
|
|
+"оборудовании см. https://msvsphere-os.ru."
|
|
|
|
|
+"https://msvsphere-os.ru."
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/core/constants.py:163
|
|
|
|
|
-#: pyanaconda/core/constants.py:163
|
|
|
|
|
+#: pyanaconda/core/constants.py:169
|
|
|
|
|
msgid ""
|
|
|
|
|
@@ -932,6 +932,36 @@ msgstr "Заполните отмеченные секции, прежде че
|
|
|
|
|
msgid "What language would you like to use during the installation process?"
|
|
|
|
|
msgstr "Какой язык вы хотите использовать в процессе установки?"
|
|
|
|
|
"No disks detected. Please shut down the computer, connect at least one "
|
|
|
|
|
"disk, and restart to complete installation."
|
|
|
|
|
@@ -1507,7 +1566,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."
|
|
|
|
|
@@ -1937,7 +1996,7 @@ msgid ""
|
|
|
|
|
"recommended for a normal %(productName)s install."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Размер раздела %(mount)s меньше %(size)s, что меньше рекомендованного "
|
|
|
|
|
-"размера для обычной установки %(productName)s."
|
|
|
|
|
+"размера для обычной установки МСВСфера ОС."
|
|
|
|
|
|
|
|
|
|
+#: pyanaconda/ui/gui/spokes/welcome.py:278
|
|
|
|
|
#: pyanaconda/modules/storage/checker/utils.py:131
|
|
|
|
|
#, python-format
|
|
|
|
|
@@ -3282,6 +3341,36 @@ msgstr "Форматирование устройств DASD"
|
|
|
|
|
msgid "Probing storage"
|
|
|
|
|
msgstr "Проверка устройств хранения"
|
|
|
|
|
|
|
|
|
|
+#: pyanaconda/product.py:90
|
|
|
|
|
+#, python-format
|
|
|
|
|
+msgid "WELCOME TO MSVSphere %(version)s Server"
|
|
|
|
|
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s Сервер"
|
|
|
|
|
+msgid "MSVSphere %(productVersion)s Server INSTALLATION"
|
|
|
|
|
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s Сервер"
|
|
|
|
|
+
|
|
|
|
|
+#: pyanaconda/ui/gui/spokes/welcome.py:280
|
|
|
|
|
+#: pyanaconda/product.py:92
|
|
|
|
|
+#, python-format
|
|
|
|
|
+msgid "WELCOME TO MSVSphere %(version)s ARM"
|
|
|
|
|
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s АРМ"
|
|
|
|
|
+msgid "MSVSphere %(productVersion)s ARM INSTALLATION"
|
|
|
|
|
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s АРМ"
|
|
|
|
|
+
|
|
|
|
|
+#: pyanaconda/ui/gui/spokes/welcome.py:282
|
|
|
|
|
+#: pyanaconda/product.py:94
|
|
|
|
|
+#, python-format
|
|
|
|
|
+msgid "WELCOME TO MSVSphere %(version)s Cinnamon"
|
|
|
|
|
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s Cinnamon"
|
|
|
|
|
+msgid "MSVSphere %(productVersion)s Cinnamon INSTALLATION"
|
|
|
|
|
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s Cinnamon"
|
|
|
|
|
+
|
|
|
|
|
+#: pyanaconda/ui/gui/spokes/welcome.py:284
|
|
|
|
|
+#: pyanaconda/product.py:96
|
|
|
|
|
+#, python-format
|
|
|
|
|
+msgid "WELCOME TO MSVSphere %(version)s KDE"
|
|
|
|
|
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s KDE"
|
|
|
|
|
+msgid "MSVSphere %(productVersion)s KDE INSTALLATION"
|
|
|
|
|
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s KDE"
|
|
|
|
|
+
|
|
|
|
|
+#: pyanaconda/ui/gui/spokes/welcome.py:286
|
|
|
|
|
+#: pyanaconda/product.py:98
|
|
|
|
|
+#, python-format
|
|
|
|
|
+msgid "WELCOME TO MSVSphere %(version)s XFCE"
|
|
|
|
|
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s XFCE"
|
|
|
|
|
+msgid "MSVSphere %(productVersion)s XFCE INSTALLATION"
|
|
|
|
|
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s XFCE"
|
|
|
|
|
+
|
|
|
|
|
+#: pyanaconda/ui/gui/spokes/welcome.py:288
|
|
|
|
|
+#: pyanaconda/product.py:100
|
|
|
|
|
+#, python-format
|
|
|
|
|
+msgid "WELCOME TO MSVSphere %(version)s OS"
|
|
|
|
|
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s ОС"
|
|
|
|
|
+msgid "MSVSphere %(productVersion)s OS INSTALLATION"
|
|
|
|
|
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s ОС"
|
|
|
|
|
+
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/welcome.py:209
|
|
|
|
|
#, python-format
|
|
|
|
|
msgid "WELCOME TO %(name)s %(version)s."
|
|
|
|
|
@@ -1834,7 +1864,7 @@ msgid ""
|
|
|
|
|
"you'll be able to view their details here."
|
|
|
|
|
#: pyanaconda/ui/lib/space.py:103
|
|
|
|
|
msgid ""
|
|
|
|
|
"Not enough space in file systems for the current software selection. An "
|
|
|
|
|
@@ -3455,7 +3544,7 @@ msgid ""
|
|
|
|
|
"You haven't created any mount points for your %(product)s %(version)s "
|
|
|
|
|
"installation yet. You can:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Здесь будет показана информация о созданных точках монтирования для "
|
|
|
|
|
-"установки %(name)s %(version)s."
|
|
|
|
|
+"установки МСВСфера %(version)s OC."
|
|
|
|
|
-"Вы еще не создали точки монтирования для установки %(product)s %(version)s. "
|
|
|
|
|
+"Вы еще не создали точки монтирования для установки МСВСфера %(version)s OC. "
|
|
|
|
|
"Вы можете:"
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/custom_storage.py:615
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/advstorage/nvdimm.glade:178
|
|
|
|
|
@@ -1931,7 +1961,7 @@ msgid ""
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/accordion.py:479
|
|
|
|
|
@@ -3487,6 +3576,10 @@ msgstr ""
|
|
|
|
|
"_Автоматически созданные точки монтирования могут быть зашифрованы по "
|
|
|
|
|
"умолчанию:"
|
|
|
|
|
|
|
|
|
|
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:547
|
|
|
|
|
+msgid "Encrypt my data."
|
|
|
|
|
+msgstr "Зашифровать данные."
|
|
|
|
|
+
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:69
|
|
|
|
|
msgid "Please wait... software metadata still loading."
|
|
|
|
|
msgstr "Подождите… Всё ещё загружаются метаданные ПО."
|
|
|
|
|
@@ -3498,7 +3591,7 @@ msgid ""
|
|
|
|
|
"of available space, including <b>%(software)s</b> for software and "
|
|
|
|
|
"<b>%(swap)s</b> for swap space."
|
|
|
|
|
msgstr ""
|
|
|
|
|
@ -120,7 +227,7 @@ index 8340e9e..7eed72b 100644
|
|
|
|
|
"<b>%(software)s</b> для программ и <b>%(swap)s</b> для подкачки."
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:81
|
|
|
|
|
@@ -1942,7 +1972,7 @@ msgid ""
|
|
|
|
|
@@ -3509,7 +3602,7 @@ msgid ""
|
|
|
|
|
"<b>%(software)s</b> for software and <b>%(swap)s</b> for swap space."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Для <a href=\"\" title=\"%(tooltip)s\">программного обеспечения "
|
|
|
|
|
@ -129,7 +236,7 @@ index 8340e9e..7eed72b 100644
|
|
|
|
|
"<b>%(software)s</b> для программ и <b>%(swap)s</b> для подкачки."
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:132
|
|
|
|
|
@@ -1953,11 +1983,11 @@ msgstr "%s На выбранных дисках доступно:"
|
|
|
|
|
@@ -3520,11 +3613,11 @@ msgstr "%s На выбранных дисках доступно:"
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:142
|
|
|
|
|
#, python-format
|
|
|
|
|
msgid ""
|
|
|
|
|
@ -143,7 +250,7 @@ index 8340e9e..7eed72b 100644
|
|
|
|
|
"существующие разделы с помощью помощника или самостоятельно выбрать размеры "
|
|
|
|
|
"разделов в окне настройки разделов."
|
|
|
|
|
|
|
|
|
|
@@ -1967,7 +1997,7 @@ msgid ""
|
|
|
|
|
@@ -3534,7 +3627,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 ""
|
|
|
|
|
@ -152,7 +259,7 @@ index 8340e9e..7eed72b 100644
|
|
|
|
|
"использовать все свободное место на выбранных дисках."
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:178
|
|
|
|
|
@@ -1978,10 +2008,10 @@ msgid ""
|
|
|
|
|
@@ -3545,10 +3638,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 ""
|
|
|
|
|
@ -164,28 +271,54 @@ index 8340e9e..7eed72b 100644
|
|
|
|
|
+"обеспечения, чтобы установить меньший вариант <b>МСВСфера ОС</b>, или "
|
|
|
|
|
"покинуть программу установки."
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/network_secret_agent.py:180
|
|
|
|
|
@@ -2041,7 +2071,7 @@ msgid ""
|
|
|
|
|
"You haven't created any mount points for your %(product)s %(version)s "
|
|
|
|
|
"installation yet. You can:"
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/subscription.py:66
|
|
|
|
|
@@ -4096,7 +4189,7 @@ msgid ""
|
|
|
|
|
"you'll be able to view their details here."
|
|
|
|
|
msgstr ""
|
|
|
|
|
-"Вы еще не создали точки монтирования для установки %(product)s %(version)s. "
|
|
|
|
|
+"Вы еще не создали точки монтирования для установки МСВСфера %(version)s OC. "
|
|
|
|
|
"Вы можете:"
|
|
|
|
|
"Здесь будет показана информация о созданных точках монтирования для "
|
|
|
|
|
-"установки %(name)s %(version)s."
|
|
|
|
|
+"установки МСВСфера %(version)s OC."
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/accordion.py:479
|
|
|
|
|
@@ -2073,6 +2103,10 @@ msgstr ""
|
|
|
|
|
"_Автоматически созданные точки монтирования могут быть зашифрованы по "
|
|
|
|
|
"умолчанию:"
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/custom_storage.py:615
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/advstorage/nvdimm.glade:178
|
|
|
|
|
@@ -4431,6 +4524,36 @@ msgstr "Рабочий сервер NTP не настроен"
|
|
|
|
|
msgid "What language would you like to use during the installation process?"
|
|
|
|
|
msgstr "Какой язык вы хотите использовать в процессе установки?"
|
|
|
|
|
|
|
|
|
|
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:547
|
|
|
|
|
+msgid "Encrypt my data."
|
|
|
|
|
+msgstr "Зашифровать данные."
|
|
|
|
|
+#: pyanaconda/ui/gui/spokes/welcome.py:213
|
|
|
|
|
+#, python-format
|
|
|
|
|
+msgid "WELCOME TO MSVSphere %(version)s Server"
|
|
|
|
|
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s Сервер"
|
|
|
|
|
+
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/subscription.py:66
|
|
|
|
|
msgid "Other ({})"
|
|
|
|
|
msgstr "Другой ({})"
|
|
|
|
|
@@ -2370,8 +2404,8 @@ msgid ""
|
|
|
|
|
+#: pyanaconda/ui/gui/spokes/welcome.py:215
|
|
|
|
|
+#, python-format
|
|
|
|
|
+msgid "WELCOME TO MSVSphere %(version)s ARM"
|
|
|
|
|
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s АРМ"
|
|
|
|
|
+
|
|
|
|
|
+#: pyanaconda/ui/gui/spokes/welcome.py:217
|
|
|
|
|
+#, python-format
|
|
|
|
|
+msgid "WELCOME TO MSVSphere %(version)s Cinnamon"
|
|
|
|
|
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s Cinnamon"
|
|
|
|
|
+
|
|
|
|
|
+#: pyanaconda/ui/gui/spokes/welcome.py:219
|
|
|
|
|
+#, python-format
|
|
|
|
|
+msgid "WELCOME TO MSVSphere %(version)s KDE"
|
|
|
|
|
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s KDE"
|
|
|
|
|
+
|
|
|
|
|
+#: pyanaconda/ui/gui/spokes/welcome.py:221
|
|
|
|
|
+#, python-format
|
|
|
|
|
+msgid "WELCOME TO MSVSphere %(version)s XFCE"
|
|
|
|
|
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s XFCE"
|
|
|
|
|
+
|
|
|
|
|
+#: pyanaconda/ui/gui/spokes/welcome.py:223
|
|
|
|
|
+#, python-format
|
|
|
|
|
+msgid "WELCOME TO MSVSphere %(version)s OS"
|
|
|
|
|
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s ОС"
|
|
|
|
|
+
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/welcome.py:209
|
|
|
|
|
#, python-format
|
|
|
|
|
msgid "WELCOME TO %(name)s %(version)s."
|
|
|
|
|
@@ -4482,8 +4605,8 @@ msgid ""
|
|
|
|
|
"%s is now successfully installed and ready for you to use!\n"
|
|
|
|
|
"Go ahead and reboot your system to start using it!"
|
|
|
|
|
msgstr ""
|
|
|
|
|
@ -196,7 +329,7 @@ index 8340e9e..7eed72b 100644
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/installation_progress.py:163
|
|
|
|
|
#, python-format
|
|
|
|
|
@@ -2379,8 +2413,8 @@ msgid ""
|
|
|
|
|
@@ -4491,8 +4614,8 @@ msgid ""
|
|
|
|
|
"%s is now successfully installed and ready for you to use!\n"
|
|
|
|
|
"Go ahead and quit the application to start using it!"
|
|
|
|
|
msgstr ""
|
|
|
|
|
@ -205,148 +338,16 @@ index 8340e9e..7eed72b 100644
|
|
|
|
|
+"МСВСфера ОС установлена и готова к работе.\n"
|
|
|
|
|
+"Необходимо выйти из приложения чтобы приступить к использованию."
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/__init__.py:365 widgets/src/BaseWindow.c:151
|
|
|
|
|
msgid "Help!"
|
|
|
|
|
@@ -3183,7 +3217,37 @@ msgstr "Форматирование устройств DASD"
|
|
|
|
|
msgid "Probing storage"
|
|
|
|
|
msgstr "Проверка устройств хранения"
|
|
|
|
|
|
|
|
|
|
-#: pyanaconda/product.py:69
|
|
|
|
|
+#: pyanaconda/product.py:83
|
|
|
|
|
+#, python-format
|
|
|
|
|
+msgid "MSVSphere %(productVersion)s Server INSTALLATION"
|
|
|
|
|
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s Сервер"
|
|
|
|
|
+
|
|
|
|
|
+#: pyanaconda/product.py:85
|
|
|
|
|
+#, python-format
|
|
|
|
|
+msgid "MSVSphere %(productVersion)s ARM INSTALLATION"
|
|
|
|
|
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s АРМ"
|
|
|
|
|
+
|
|
|
|
|
+#: pyanaconda/product.py:87
|
|
|
|
|
+#, 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"
|
|
|
|
|
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s ОС"
|
|
|
|
|
+
|
|
|
|
|
+#: pyanaconda/product.py:95
|
|
|
|
|
#, python-format
|
|
|
|
|
msgid "%(productName)s %(productVersion)s INSTALLATION"
|
|
|
|
|
msgstr "УСТАНОВКА %(productName)s %(productVersion)s"
|
|
|
|
|
@@ -3422,7 +3486,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
|
|
|
|
|
@@ -3839,7 +3903,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."
|
|
|
|
|
@@ -4452,12 +4516,72 @@ msgstr "Для установки необходимо выбрать хотя
|
|
|
|
|
msgid "Invalid time source."
|
|
|
|
|
msgstr "Неверный источник времени."
|
|
|
|
|
|
|
|
|
|
-#: 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:159
|
|
|
|
|
+#, python-format
|
|
|
|
|
+msgid "MSVSphere %(productVersion)s Server installation on host %(name)s"
|
|
|
|
|
+msgstr "Установка МСВСфера %(productVersion)s Сервер на %(name)s"
|
|
|
|
|
+
|
|
|
|
|
+#: pyanaconda/vnc.py:162
|
|
|
|
|
+#, python-format
|
|
|
|
|
+msgid "MSVSphere %(productVersion)s ARM installation on host %(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
|
|
|
|
|
+#, python-format
|
|
|
|
|
+msgid "MSVSphere %(productVersion)s OS installation on host %(name)s"
|
|
|
|
|
+msgstr "Установка МСВСфера %(productVersion)s ОС на %(name)s"
|
|
|
|
|
+
|
|
|
|
|
+#: pyanaconda/vnc.py:168
|
|
|
|
|
#, python-format
|
|
|
|
|
msgid "%(productName)s %(productVersion)s installation on host %(name)s"
|
|
|
|
|
msgstr "Установка %(productName)s %(productVersion)s на %(name)s"
|
|
|
|
|
@@ -7619,22 +7743,22 @@ msgstr "Настройка Liveinst"
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/installation_source.py:73
|
|
|
|
|
msgid "Setting up installation source..."
|
|
|
|
|
@@ -7614,22 +7737,22 @@ msgstr "Настройка Liveinst"
|
|
|
|
|
|
|
|
|
|
#: data/liveinst/gnome/fedora-welcome.desktop:3
|
|
|
|
|
#: data/liveinst/gnome/fedora-welcome.js:65
|
|
|
|
|
-msgid "Welcome to Fedora"
|
|
|
|
|
-msgstr "Добро пожаловать в Fedora"
|
|
|
|
|
+msgid "Welcome to MSVSphere ARM 9.3"
|
|
|
|
|
+msgstr "Добро пожаловать в МСВСфера АРМ 9.3"
|
|
|
|
|
+msgid "Welcome to MSVSphere ARM 9.4"
|
|
|
|
|
+msgstr "Добро пожаловать в МСВСфера АРМ 9.4"
|
|
|
|
|
|
|
|
|
|
#: data/liveinst/gnome/fedora-welcome.js:94
|
|
|
|
|
-msgid "Try Fedora"
|
|
|
|
|
@ -580,5 +581,5 @@ index 5fadcde..c349de8 100644
|
|
|
|
|
'productVersion': product.productVersion,
|
|
|
|
|
'name': host}
|
|
|
|
|
--
|
|
|
|
|
2.41.0
|
|
|
|
|
2.44.0
|
|
|
|
|
|
|
|
|
|
|
Alexey Lyubimov