|
|
|
|
@ -1,19 +1,19 @@
|
|
|
|
|
From ae15c24f836bfa5d461dcb31da7409b1bf612634 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From 79f77cd1eb7ff8ee94b9dd71868b3c93530b7f02 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: tigro <tigro@msvsphere-os.ru>
|
|
|
|
|
Date: Sun, 13 Oct 2024 16:30:38 +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 | 40 +++-
|
|
|
|
|
.../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 | 23 +-
|
|
|
|
|
pyanaconda/vnc.py | 47 ++++-
|
|
|
|
|
9 files changed, 284 insertions(+), 42 deletions(-)
|
|
|
|
|
pyanaconda/vnc.py | 47 +++-
|
|
|
|
|
9 files changed, 286 insertions(+), 44 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/fedora-welcome.desktop
|
|
|
|
|
index 90f5678..5bfd5a5 100644
|
|
|
|
|
@ -42,7 +42,7 @@ index 4c0a66a..a1cc6e3 100755
|
|
|
|
|
this.window.connect('key-press-event', Lang.bind(this,
|
|
|
|
|
function(w, event) {
|
|
|
|
|
diff --git a/po/ru.po b/po/ru.po
|
|
|
|
|
index 315ee3c..07273fa 100644
|
|
|
|
|
index 315ee3c..02bf92b 100644
|
|
|
|
|
--- a/po/ru.po
|
|
|
|
|
+++ b/po/ru.po
|
|
|
|
|
@@ -212,7 +212,7 @@ msgid ""
|
|
|
|
|
@ -180,8 +180,12 @@ index 315ee3c..07273fa 100644
|
|
|
|
|
#, python-format
|
|
|
|
|
msgid "%(productName)s %(productVersion)s installation on host %(name)s"
|
|
|
|
|
msgstr "Установка %(productName)s %(productVersion)s на %(name)s"
|
|
|
|
|
@@ -400,8 +505,8 @@ msgid ""
|
|
|
|
|
"%s is now successfully installed and ready for you to use!\n"
|
|
|
|
|
@@ -397,20 +502,20 @@ msgstr "Нет %s. Настройка сетевого экрана невозм
|
|
|
|
|
#: 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"
|
|
|
|
|
"Go ahead and quit the application to start using it!"
|
|
|
|
|
msgstr ""
|
|
|
|
|
-"%s успешно установлено и готово к использованию!\n"
|
|
|
|
|
@ -191,8 +195,9 @@ index 315ee3c..07273fa 100644
|
|
|
|
|
|
|
|
|
|
#: pyanaconda/ui/gui/spokes/installation_progress.py:158
|
|
|
|
|
#, python-format
|
|
|
|
|
@@ -409,8 +514,8 @@ msgid ""
|
|
|
|
|
"%s is now successfully installed and ready for you to use!\n"
|
|
|
|
|
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"
|
|
|
|
|
"Go ahead and reboot your system to start using it!"
|
|
|
|
|
msgstr ""
|
|
|
|
|
-"%s успешно установлена и готова к использованию!\n"
|
|
|
|
|
@ -223,7 +228,7 @@ index 315ee3c..07273fa 100644
|
|
|
|
|
"adjust your partitions on your own in the custom partitioning interface."
|
|
|
|
|
msgstr ""
|
|
|
|
|
-"<b>Недостаточно места для установки %s</b>. Можно уменьшить или удалить "
|
|
|
|
|
+"<b>Недостаточно места для установки %(name)s</b>. Можно уменьшить или удалить "
|
|
|
|
|
+"<b>Недостаточно места для установки МСВСфера ОС</b>. Можно уменьшить или удалить "
|
|
|
|
|
"существующие разделы с помощью помощника или самостоятельно выбрать размеры "
|
|
|
|
|
"разделов в окне настройки разделов."
|
|
|
|
|
|
|
|
|
|
|
