master #64

Merged
asmeron merged 2 commits from YanTheKaller/ubl-settings-system:master into master 6 months ago

@ -417,7 +417,6 @@ void on_language_changed(GtkComboBox *self, main_window *widgets){
void on_terminal_command_ended(VteTerminal *terminal, gint status, domain_info_window *window){ void on_terminal_command_ended(VteTerminal *terminal, gint status, domain_info_window *window){
textdomain(template_ui_LocaleName); textdomain(template_ui_LocaleName);
// yon_ubl_status_box_despawn_infinite(GTK_CONTAINER(window->StatusBox)); // yon_ubl_status_box_despawn_infinite(GTK_CONTAINER(window->StatusBox));
printf("%d\n",status);
if (!status) if (!status)
yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),"success",yon_char_get_localised_from_lib(SUCCESS_LABEL),BACKGROUND_IMAGE_SUCCESS_TYPE); yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),"success",yon_char_get_localised_from_lib(SUCCESS_LABEL),BACKGROUND_IMAGE_SUCCESS_TYPE);
else { else {

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.40.0 --> <!-- Generated with glade 3.38.2 -->
<interface domain="ubl-settings-system"> <interface domain="ubl-settings-system">
<requires lib="gtk+" version="3.24"/> <requires lib="gtk+" version="3.24"/>
<!-- interface-css-provider-path ubl-settings-system.css --> <!-- interface-css-provider-path ubl-settings-system.css -->
@ -517,7 +517,7 @@
<object class="GtkLabel" id="HeadLabel"> <object class="GtkLabel" id="HeadLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Connect to domain</property> <property name="label" translatable="yes">Connecting to domain</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -544,7 +544,7 @@
</child> </child>
<child> <child>
<object class="GtkButton" id="SaveButton"> <object class="GtkButton" id="SaveButton">
<property name="label" translatable="yes">Connect</property> <property name="label" translatable="yes">Join</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.40.0 --> <!-- Generated with glade 3.38.2 -->
<interface domain="ubl-settings-system"> <interface domain="ubl-settings-system">
<requires lib="gtk+" version="3.24"/> <requires lib="gtk+" version="3.24"/>
<!-- interface-css-provider-path ubl-settings-system.css --> <!-- interface-css-provider-path ubl-settings-system.css -->
@ -215,7 +215,7 @@
<object class="GtkLabel" id="HeadLabel"> <object class="GtkLabel" id="HeadLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Disconnect from domain</property> <property name="label" translatable="yes">Disconnecting from domain</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -242,7 +242,7 @@
</child> </child>
<child> <child>
<object class="GtkButton" id="SaveButton"> <object class="GtkButton" id="SaveButton">
<property name="label" translatable="yes">Disconnect</property> <property name="label" translatable="yes">Leave</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>

@ -208,11 +208,11 @@ msgstr "Показать все домены"
#: source/ubl-strings.h:58 #: source/ubl-strings.h:58
msgid "Connecting to domain" msgid "Connecting to domain"
msgstr "Подключение к домену" msgstr "Присоединиться к домену"
#: source/ubl-strings.h:59 #: source/ubl-strings.h:59
msgid "Disconnecting from domain" msgid "Disconnecting from domain"
msgstr "Отключение от домена" msgstr "Отсоединиться от домена"
#: source/ubl-strings.h:60 #: source/ubl-strings.h:60
msgid "Join" msgid "Join"
@ -232,7 +232,7 @@ msgstr "Не подключен к домену"
#: source/ubl-strings.h:66 #: source/ubl-strings.h:66
msgid "Loading..." msgid "Loading..."
msgstr "Загрузка..." msgstr "Выполнение..."
#: source/ubl-strings.h:67 #: source/ubl-strings.h:67
msgid "Check" msgid "Check"

Loading…
Cancel
Save