|
|
|
|
@ -1,18 +1,18 @@
|
|
|
|
|
From 9af79df7a7c2cd36e1b5967f862fb67394269a46 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From b8b9f50e29372aa35a0c7e7a0b329b5561f2e834 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Eugene Zamriy <evgeniy.zamriy@softline.com>
|
|
|
|
|
Date: Thu, 18 May 2023 11:38:45 +0300
|
|
|
|
|
Subject: [PATCH] Add MSVSphere identification support
|
|
|
|
|
Subject: [PATCH 11/11] Add MSVSphere identification support
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
data/liveinst/gnome/fedora-welcome.desktop | 4 +-
|
|
|
|
|
data/liveinst/gnome/fedora-welcome.js | 2 +-
|
|
|
|
|
po/ru.po | 196 ++++++++++++++----
|
|
|
|
|
po/ru.po | 200 ++++++++++++++----
|
|
|
|
|
pyanaconda/product.py | 36 +++-
|
|
|
|
|
.../ui/gui/spokes/installation_progress.py | 8 +-
|
|
|
|
|
.../ui/gui/spokes/lib/storage_dialogs.py | 4 +-
|
|
|
|
|
pyanaconda/ui/gui/spokes/welcome.py | 21 +-
|
|
|
|
|
pyanaconda/vnc.py | 42 +++-
|
|
|
|
|
8 files changed, 260 insertions(+), 53 deletions(-)
|
|
|
|
|
8 files changed, 264 insertions(+), 53 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/fedora-welcome.desktop
|
|
|
|
|
index 90f5678..abbbff3 100644
|
|
|
|
|
@ -41,7 +41,7 @@ index 4c0a66a..120d718 100755
|
|
|
|
|
this.window.connect('key-press-event', Lang.bind(this,
|
|
|
|
|
function(w, event) {
|
|
|
|
|
diff --git a/po/ru.po b/po/ru.po
|
|
|
|
|
index c478f3f..85e830e 100644
|
|
|
|
|
index c478f3f..85c8dc7 100644
|
|
|
|
|
--- a/po/ru.po
|
|
|
|
|
+++ b/po/ru.po
|
|
|
|
|
@@ -375,7 +375,37 @@ msgid ""
|
|
|
|
|
@ -149,7 +149,18 @@ index c478f3f..85e830e 100644
|
|
|
|
|
"Вы можете:"
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/accordion.py:479
|
|
|
|
|
@@ -2024,7 +2084,7 @@ msgid ""
|
|
|
|
|
@@ -1976,6 +2036,10 @@ msgstr ""
|
|
|
|
|
"_Автоматически созданные точки монтирования могут быть зашифрованы по "
|
|
|
|
|
"умолчанию:"
|
|
|
|
|
|
|
|
|
|
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:547
|
|
|
|
|
+msgid "Encrypt my data."
|
|
|
|
|
+msgstr "Зашифровать данные."
|
|
|
|
|
+
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/network_secret_agent.py:180
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/network_secret_agent.glade:95
|
|
|
|
|
msgid "Authentication required by wireless network"
|
|
|
|
|
@@ -2024,7 +2088,7 @@ msgid ""
|
|
|
|
|
"of available space, including <b>%(software)s</b> for software and <b>"
|
|
|
|
|
"%(swap)s</b> for swap space."
|
|
|
|
|
msgstr ""
|
|
|
|
|
@ -158,7 +169,7 @@ index c478f3f..85e830e 100644
|
|
|
|
|
"%(software)s</b> для программ и <b>%(swap)s</b> для подкачки."
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:81
|
|
|
|
|
@@ -2035,7 +2095,7 @@ msgid ""
|
|
|
|
|
@@ -2035,7 +2099,7 @@ msgid ""
|
|
|
|
|
"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Для <a href=\"\" title=\"%(tooltip)s\">программного обеспечения <b>"
|
|
|
|
|
@ -167,7 +178,7 @@ index c478f3f..85e830e 100644
|
|
|
|
|
"%(software)s</b> для программ и <b>%(swap)s</b> для подкачки."
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:132
|
|
|
|
|
@@ -2046,11 +2106,11 @@ msgstr "%s На выбранных дисках доступно:"
|
|
|
|
|
@@ -2046,11 +2110,11 @@ msgstr "%s На выбранных дисках доступно:"
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:142
|
|
|
|
|
#, python-format
|
|
|
|
|
msgid ""
|
|
|
|
|
@ -181,7 +192,7 @@ index c478f3f..85e830e 100644
|
|
|
|
|
"существующие разделы с помощью помощника или самостоятельно выбрать размеры "
|
|
|
|
|
"разделов в окне настройки разделов."
|
|
|
|
|
|
|
|
|
|
@@ -2060,7 +2120,7 @@ msgid ""
|
|
|
|
|
@@ -2060,7 +2124,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 ""
|
|
|
|
|
@ -190,7 +201,7 @@ index c478f3f..85e830e 100644
|
|
|
|
|
"использовать все свободное место на выбранных дисках."
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:178
|
|
|
|
|
@@ -2071,10 +2131,10 @@ msgid ""
|
|
|
|
|
@@ -2071,10 +2135,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 ""
|
|
|
|
|
@ -203,7 +214,7 @@ index c478f3f..85e830e 100644
|
|
|
|
|
"покинуть программу установки."
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/detailederror.py:48
|
|
|
|
|
@@ -2272,20 +2332,20 @@ msgstr "_Завершить установку"
|
|
|
|
|
@@ -2272,20 +2336,20 @@ msgstr "_Завершить установку"
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/installation_progress.py:158
|
|
|
|
|
#, python-format
|
|
|
|
|
msgid ""
|
|
|
|
|
@ -230,7 +241,7 @@ index c478f3f..85e830e 100644
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/software_selection.py:66
|
|
|
|
|
msgctxt "GUI|Spoke"
|
|
|
|
|
@@ -2448,7 +2508,7 @@ msgid ""
|
|
|
|
|
@@ -2448,7 +2512,7 @@ msgid ""
|
|
|
|
|
"you'll be able to view their details here."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Здесь будет показана информация о созданных точках монтирования для "
|
|
|
|
|
@ -239,7 +250,7 @@ index c478f3f..85e830e 100644
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/custom_storage.py:615
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/advstorage/nvdimm.glade:178
|
|
|
|
|
@@ -2868,7 +2928,7 @@ msgid ""
|
|
|
|
|
@@ -2868,7 +2932,7 @@ msgid ""
|
|
|
|
|
"recommended for a normal %(productName)s install."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Размер раздела %(mount)s меньше %(size)s, что меньше рекомендованного "
|
|
|
|
|
@ -248,7 +259,7 @@ index c478f3f..85e830e 100644
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/modules/storage/checker/utils.py:131
|
|
|
|
|
#, python-format
|
|
|
|
|
@@ -3548,7 +3608,7 @@ msgstr "Не удалось продолжить установку."
|
|
|
|
|
@@ -3548,7 +3612,7 @@ msgstr "Не удалось продолжить установку."
|
|
|
|
|
#: pyanaconda/modules/storage/partitioning/interactive/utils.py:213
|
|
|
|
|
#, python-brace-format
|
|
|
|
|
msgid "New {name} {version} Installation"
|
|
|
|
|
@ -257,7 +268,7 @@ index c478f3f..85e830e 100644
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/modules/storage/partitioning/interactive/utils.py:275
|
|
|
|
|
msgid "Cannot set label on file system."
|
|
|
|
|
@@ -3959,13 +4019,13 @@ msgstr ""
|
|
|
|
|
@@ -3959,13 +4023,13 @@ msgstr ""
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/core/constants.py:159
|
|
|
|
|
msgid ""
|
|
|
|
|
@ -277,7 +288,7 @@ index c478f3f..85e830e 100644
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/core/constants.py:165
|
|
|
|
|
msgid ""
|
|
|
|
|
@@ -4303,12 +4363,72 @@ msgstr "не настроено"
|
|
|
|
|
@@ -4303,12 +4367,72 @@ msgstr "не настроено"
|
|
|
|
|
msgid "Full name cannot contain colon characters"
|
|
|
|
|
msgstr "Полное имя не может содержать двоеточий"
|
|
|
|
|
|
|
|
|
|
@ -352,7 +363,7 @@ index c478f3f..85e830e 100644
|
|
|
|
|
#, python-format
|
|
|
|
|
msgid "%(productName)s %(productVersion)s installation on host %(name)s"
|
|
|
|
|
msgstr "Установка %(productName)s %(productVersion)s на %(name)s"
|
|
|
|
|
@@ -7556,22 +7676,22 @@ msgstr "Установить Live CD на жёсткий диск"
|
|
|
|
|
@@ -7556,22 +7680,22 @@ msgstr "Установить Live CD на жёсткий диск"
|
|
|
|
|
|
|
|
|
|
#: data/liveinst/gnome/fedora-welcome.desktop:3
|
|
|
|
|
#: data/liveinst/gnome/fedora-welcome.js:65
|
|
|
|
|
@ -385,7 +396,7 @@ index c478f3f..85e830e 100644
|
|
|
|
|
#: data/liveinst/gnome/fedora-welcome.js:130
|
|
|
|
|
msgid ""
|
|
|
|
|
diff --git a/pyanaconda/product.py b/pyanaconda/product.py
|
|
|
|
|
index 9dbfe1f..4feea0a 100644
|
|
|
|
|
index 9dbfe1f..140dbee 100644
|
|
|
|
|
--- a/pyanaconda/product.py
|
|
|
|
|
+++ b/pyanaconda/product.py
|
|
|
|
|
@@ -19,6 +19,7 @@
|
|
|
|
|
|
