diff --git a/app/ui/dialogs.glade b/app/ui/dialogs.glade index a4426006..5164c5f1 100644 --- a/app/ui/dialogs.glade +++ b/app/ui/dialogs.glade @@ -1797,7 +1797,7 @@ dmitry.v.yefremov@gmail.com - + True False Loading data... diff --git a/app/ui/dialogs.py b/app/ui/dialogs.py index 3eee74f5..be427c2a 100644 --- a/app/ui/dialogs.py +++ b/app/ui/dialogs.py @@ -21,10 +21,12 @@ class DialogType(Enum): class WaitDialog: - def __init__(self, transient): + def __init__(self, transient, text=None): builder, dialog = get_dialog_from_xml(DialogType.WAIT, transient) self._dialog = dialog self._dialog.set_transient_for(transient) + if text is not None: + builder.get_object("wait_dialog_label").set_text(text) def show(self): self._dialog.show() @@ -33,6 +35,10 @@ class WaitDialog: def hide(self): self._dialog.hide() + @run_idle + def destroy(self): + self._dialog.destroy() + def show_dialog(dialog_type: DialogType, transient, text=None, options=None, action_type=None, file_filter=None): """ Shows dialogs by name """ diff --git a/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo b/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo index d7f04b3a..b290ee13 100644 Binary files a/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo and b/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo differ diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade index 4071cb3a..14bd86dc 100644 --- a/app/ui/main_window.glade +++ b/app/ui/main_window.glade @@ -194,7 +194,7 @@ - Create bouquet + Create bouquet True False False diff --git a/deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo b/deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo index d7f04b3a..b290ee13 100644 Binary files a/deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo and b/deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo differ diff --git a/po/ru/demon-editor.mo b/po/ru/demon-editor.mo index d7f04b3a..b290ee13 100644 Binary files a/po/ru/demon-editor.mo and b/po/ru/demon-editor.mo differ diff --git a/po/ru/demon-editor.po b/po/ru/demon-editor.po index 71ce0115..389e39a0 100644 --- a/po/ru/demon-editor.po +++ b/po/ru/demon-editor.po @@ -85,9 +85,6 @@ msgstr "Пропустить" msgid "Hide/Skip On/Off Ctrl + H" msgstr "Скрыть/Пропустить Вкл/Выкл Ctrl + H" -msgid "IPTV" -msgstr "" - msgid "Add IPTV or stream service" msgstr "Добавить IPTV или поток" @@ -115,15 +112,33 @@ msgstr "Новый" msgid "New bouquet" msgstr "Новый букет" +msgid "Create bouquet" +msgstr "Создать букет" + +msgid "For current satellite" +msgstr "Для текущего спутника" + +msgid "For current package" +msgstr "Для текущего пакета" + +msgid "For current type" +msgstr "Для текущего типа" + +msgid "For each satellite" +msgstr "Для каждого спутника" + +msgid "For each package" +msgstr "Для каждого пакета" + +msgid "For each type" +msgstr "Для каждого типа" + msgid "Open" msgstr "Открыть" msgid "Parent lock On/Off Ctrl + L" msgstr "Родительский замок Вкл/Выкл Ctrl + L" -msgid "Paste" -msgstr "" - msgid "Picons" msgstr "Пиконы" @@ -160,9 +175,6 @@ msgstr "Фильтр сервисов" msgid "Settings" msgstr "Настройки" -msgid "TV" -msgstr "" - msgid "Up" msgstr "Переместить вверх"