|
|
|
|
@ -1,18 +1,19 @@
|
|
|
|
|
From 31fd3d6f3236392daec629ccc1b1ee384349fed2 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From b7f30317ce1bdbb6976dd3d780758ff193190b54 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
|
|
|
|
|
Date: Mon, 23 Oct 2023 09:51:56 +0300
|
|
|
|
|
Date: Tue, 24 Oct 2023 12:41:45 +0300
|
|
|
|
|
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 | 190 ++++++++++++++----
|
|
|
|
|
po/ru.po | 188 +++++++++++++++---
|
|
|
|
|
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 +++-
|
|
|
|
|
8 files changed, 257 insertions(+), 50 deletions(-)
|
|
|
|
|
9 files changed, 259 insertions(+), 48 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/fedora-welcome.desktop
|
|
|
|
|
index 90f5678..abbbff3 100644
|
|
|
|
|
@ -41,7 +42,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 8340e9e..dc0dd5d 100644
|
|
|
|
|
index 8340e9e..df19fb0 100644
|
|
|
|
|
--- a/po/ru.po
|
|
|
|
|
+++ b/po/ru.po
|
|
|
|
|
@@ -461,13 +461,13 @@ msgstr ""
|
|
|
|
|
@ -128,12 +129,7 @@ index 8340e9e..dc0dd5d 100644
|
|
|
|
|
"<b>%(software)s</b> для программ и <b>%(swap)s</b> для подкачки."
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:132
|
|
|
|
|
@@ -1953,11 +1983,11 @@ msgstr "%s На выбранных дисках доступно:"
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:142
|
|
|
|
|
#, 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 "
|
|
|
|
|
@@ -1957,7 +1987,7 @@ msgid ""
|
|
|
|
|
"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 ""
|
|
|
|
|
@ -173,12 +169,19 @@ index 8340e9e..dc0dd5d 100644
|
|
|
|
|
"Вы можете:"
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/accordion.py:479
|
|
|
|
|
@@ -2367,20 +2397,20 @@ msgstr "_Завершить установку"
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/installation_progress.py:158
|
|
|
|
|
#, 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"
|
|
|
|
|
@@ -2073,6 +2103,10 @@ msgstr ""
|
|
|
|
|
"_Автоматически созданные точки монтирования могут быть зашифрованы по "
|
|
|
|
|
"умолчанию:"
|
|
|
|
|
|
|
|
|
|
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:547
|
|
|
|
|
+msgid "Encrypt my data."
|
|
|
|
|
+msgstr "Зашифровать данные."
|
|
|
|
|
+
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/lib/subscription.py:66
|
|
|
|
|
msgid "Other ({})"
|
|
|
|
|
msgstr "Другой ({})"
|
|
|
|
|
@@ -2370,8 +2404,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 ""
|
|
|
|
|
-"%s успешно установлена и готова к использованию!\n"
|
|
|
|
|
@ -188,9 +191,8 @@ index 8340e9e..dc0dd5d 100644
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/installation_progress.py:163
|
|
|
|
|
#, 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"
|
|
|
|
|
@@ -2379,8 +2413,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 ""
|
|
|
|
|
-"%s успешно установлено и готово к использованию!\n"
|
|
|
|
|
@ -200,7 +202,7 @@ index 8340e9e..dc0dd5d 100644
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/__init__.py:365 widgets/src/BaseWindow.c:151
|
|
|
|
|
msgid "Help!"
|
|
|
|
|
@@ -3183,7 +3213,37 @@ msgstr "Форматирование устройств DASD"
|
|
|
|
|
@@ -3183,7 +3217,37 @@ msgstr "Форматирование устройств DASD"
|
|
|
|
|
msgid "Probing storage"
|
|
|
|
|
msgstr "Проверка устройств хранения"
|
|
|
|
|
|
|
|
|
|
@ -239,7 +241,7 @@ index 8340e9e..dc0dd5d 100644
|
|
|
|
|
#, python-format
|
|
|
|
|
msgid "%(productName)s %(productVersion)s INSTALLATION"
|
|
|
|
|
msgstr "УСТАНОВКА %(productName)s %(productVersion)s"
|
|
|
|
|
@@ -3422,7 +3482,7 @@ msgid ""
|
|
|
|
|
@@ -3422,7 +3486,7 @@ msgid ""
|
|
|
|
|
"recommended for a normal %(productName)s install."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Размер раздела %(mount)s меньше %(size)s, что меньше рекомендованного "
|
|
|
|
|
@ -248,7 +250,7 @@ index 8340e9e..dc0dd5d 100644
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/modules/storage/checker/utils.py:131
|
|
|
|
|
#, python-format
|
|
|
|
|
@@ -3839,7 +3899,7 @@ msgstr "Не удалось сменить устройство."
|
|
|
|
|
@@ -3839,7 +3903,7 @@ msgstr "Не удалось сменить устройство."
|
|
|
|
|
#: pyanaconda/modules/storage/partitioning/interactive/utils.py:213
|
|
|
|
|
#, python-brace-format
|
|
|
|
|
msgid "New {name} {version} Installation"
|
|
|
|
|
@ -257,7 +259,7 @@ index 8340e9e..dc0dd5d 100644
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/modules/storage/partitioning/interactive/utils.py:275
|
|
|
|
|
msgid "Cannot set label on file system."
|
|
|
|
|
@@ -4452,12 +4512,72 @@ msgstr "Для установки необходимо выбрать хотя
|
|
|
|
|
@@ -4452,12 +4516,72 @@ msgstr "Для установки необходимо выбрать хотя
|
|
|
|
|
msgid "Invalid time source."
|
|
|
|
|
msgstr "Неверный источник времени."
|
|
|
|
|
|
|
|
|
|
@ -332,7 +334,7 @@ index 8340e9e..dc0dd5d 100644
|
|
|
|
|
#, python-format
|
|
|
|
|
msgid "%(productName)s %(productVersion)s installation on host %(name)s"
|
|
|
|
|
msgstr "Установка %(productName)s %(productVersion)s на %(name)s"
|
|
|
|
|
@@ -7619,22 +7739,22 @@ msgstr "Настройка Liveinst"
|
|
|
|
|
@@ -7619,22 +7743,22 @@ msgstr "Настройка Liveinst"
|
|
|
|
|
|
|
|
|
|
#: data/liveinst/gnome/fedora-welcome.desktop:3
|
|
|
|
|
#: data/liveinst/gnome/fedora-welcome.js:65
|
|
|
|
|
@ -443,6 +445,19 @@ index c2dfbaf..de1fe76 100644
|
|
|
|
|
|
|
|
|
|
label = self.builder.get_object("rebootLabel")
|
|
|
|
|
label.set_text(continue_text)
|
|
|
|
|
diff --git a/pyanaconda/ui/gui/spokes/lib/accordion.py b/pyanaconda/ui/gui/spokes/lib/accordion.py
|
|
|
|
|
index 32801df..5e2e2b1 100644
|
|
|
|
|
--- a/pyanaconda/ui/gui/spokes/lib/accordion.py
|
|
|
|
|
+++ b/pyanaconda/ui/gui/spokes/lib/accordion.py
|
|
|
|
|
@@ -544,7 +544,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/lib/storage_dialogs.py b/pyanaconda/ui/gui/spokes/lib/storage_dialogs.py
|
|
|
|
|
index 2f8338b..e330641 100644
|
|
|
|
|
--- a/pyanaconda/ui/gui/spokes/lib/storage_dialogs.py
|
|
|
|
|
@ -560,5 +575,5 @@ index 5fadcde..c349de8 100644
|
|
|
|
|
'productVersion': product.productVersion,
|
|
|
|
|
'name': host}
|
|
|
|
|
--
|
|
|
|
|
2.41.0
|
|
|
|
|
2.39.3
|
|
|
|
|
|
|
|
|
|
|
