New subwindow titles; Russian localisation adjustments

pull/28/head
parent f526c7a255
commit fa7f7bd70b

@ -614,6 +614,8 @@ void on_system_info_clicked(GtkWidget *self, main_window *widgets){
char *name;
gtk_tree_model_get(model,&iter,5,&name,-1);
log_window *window = yon_log_window_new();
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_STATE_TITLE_LABEL(name));
gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_STATE_TITLE_LABEL(name));
window->target = service_info_command(name);
yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window);
@ -631,6 +633,8 @@ void on_system_log_clicked(GtkWidget *self, main_window *widgets){
char *name;
gtk_tree_model_get(model,&iter,5,&name,-1);
log_window *window = yon_log_window_new();
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_LOG_TITLE_LABEL(name));
gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_LOG_TITLE_LABEL(name));
window->target = get_log_command(name);
yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window);
@ -670,6 +674,8 @@ void on_system_edit_clicked(GtkWidget *self, main_window *widgets){
char *name;
gtk_tree_model_get(model,&iter,5,&name,-1);
log_window *window = yon_log_window_new();
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_UNIT_EDIT_TITLE_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_UNIT_EDIT_TITLE_LABEL);
gtk_widget_show(window->SaveButton);
window->target=show_source_command(name);
yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL);
@ -695,6 +701,8 @@ void on_system_status_clicked(GtkWidget *self, main_window *widgets){
char *name;
gtk_tree_model_get(model,&iter,5,&name,-1);
log_window *window = yon_log_window_new();
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),PROPERTIES_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),PROPERTIES_LABEL);
window->target = properties_command(name);
yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window);
@ -738,6 +746,8 @@ void on_user_info_clicked(GtkWidget *self, main_window *widgets){
char *name;
gtk_tree_model_get(model,&iter,5,&name,-1);
log_window *window = yon_log_window_new();
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_STATE_TITLE_LABEL(name));
gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_STATE_TITLE_LABEL(name));
window->target = user_service_info_command(name);
yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window);
@ -755,6 +765,8 @@ void on_user_log_clicked(GtkWidget *self, main_window *widgets){
char *name;
gtk_tree_model_get(model,&iter,5,&name,-1);
log_window *window = yon_log_window_new();
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_LOG_TITLE_LABEL(name));
gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_LOG_TITLE_LABEL(name));
window->target = user_get_log_command(name);
yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window);
@ -772,6 +784,8 @@ void on_user_edit_clicked(GtkWidget *self, main_window *widgets){
char *name;
gtk_tree_model_get(model,&iter,5,&name,-1);
log_window *window = yon_log_window_new();
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_UNIT_EDIT_TITLE_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_UNIT_EDIT_TITLE_LABEL);
gtk_widget_show(window->SaveButton);
window->target=user_show_source_command(name);
yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL);
@ -797,6 +811,8 @@ void on_user_status_clicked(GtkWidget *self, main_window *widgets){
char *name;
gtk_tree_model_get(model,&iter,5,&name,-1);
log_window *window = yon_log_window_new();
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),PROPERTIES_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),PROPERTIES_LABEL);
window->target = user_properties_command(name);
yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window);
@ -829,6 +845,8 @@ void on_config_edit_clicked(GtkWidget *self, main_window *widgets){
GtkTreeModel *model = GTK_TREE_MODEL(widgets->ConfigList);
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->ConfigMainTree)),&model,&iter)){
log_window *window = yon_log_window_new();
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),EDIT_CONFIG_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),EDIT_CONFIG_LABEL);
gtk_widget_hide(gtk_widget_get_parent(window->SystemTerminal));
gtk_widget_show(gtk_widget_get_parent(window->TextEditor));
gtk_widget_show(window->SaveButton);
@ -851,6 +869,8 @@ void on_system_services_status(GtkWidget *self, main_window *widgets){
if (self){}
if (widgets){
log_window *window = yon_log_window_new();
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SYSTEM_STATUS_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),SYSTEM_STATUS_LABEL);
window->target = system_services_status_command;
yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window);
@ -863,6 +883,8 @@ void on_user_services_status(GtkWidget *self, main_window *widgets){
if (self){}
if (widgets){
log_window *window = yon_log_window_new();
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),USER_STATUS_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),USER_STATUS_LABEL);
window->target = user_services_status_command;
yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window);
@ -875,6 +897,8 @@ void on_units_status(GtkWidget *self, main_window *widgets){
if (self){}
if (widgets){
log_window *window = yon_log_window_new();
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),INSTALLED_UNIT_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),INSTALLED_UNIT_LABEL);
window->target = installed_units_states_command;
yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window);
@ -887,6 +911,8 @@ void on_units_list_status(GtkWidget *self, main_window *widgets){
if (self){}
if (widgets){
log_window *window = yon_log_window_new();
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),UNITS_LIST_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),UNITS_LIST_LABEL);
window->target = list_of_units_states_command;
yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window);
@ -899,6 +925,8 @@ void on_sockets_list_status(GtkWidget *self, main_window *widgets){
if (self){}
if (widgets){
log_window *window = yon_log_window_new();
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SOCKETS_LIST_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),SOCKETS_LIST_LABEL);
window->target = list_of_sockets_states_command;
yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window);
@ -911,6 +939,8 @@ void on_timers_list_status(GtkWidget *self, main_window *widgets){
if (self){}
if (widgets){
log_window *window = yon_log_window_new();
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),TIMERS_LIST_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),TIMERS_LIST_LABEL);
window->target = list_of_timers_states_command;
yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window);

@ -92,6 +92,8 @@
#define SHOW_SERVICE_PROPERTIES_LABEL _("Show service properties")
#define SHOW_LABEL _("Show...")
#define EDIT_CONFIG_LABEL _("Edit configuration file")
#define SHOW_INACTIVE_LABEL _("Show inactive")
#define SHOW_UNLOADED_LABEL _("Show unloaded")
@ -126,4 +128,8 @@
#define STATE_PLUGGED_LABEL _("plugged")
#define STATE_ABANDONED_LABEL _("abandoned")
#define ROOT_CHECK_LABEL _("Upgrade to root")
#define ROOT_CHECK_LABEL _("Upgrade to root")
#define SERVICE_STATE_TITLE_LABEL(target) yon_char_append(_("State of "),target)
#define SERVICE_LOG_TITLE_LABEL(target) yon_char_unite(_("View")," ",target," ",_("log"),NULL)
#define SERVICE_UNIT_EDIT_TITLE_LABEL _("Edit unit file")

@ -1345,6 +1345,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Edit configuration file</property>
<property name="image">image12</property>
<style>
<class name="thin"/>

@ -310,117 +310,137 @@ msgid "Show..."
msgstr ""
#: source/ubl-strings.h:95
msgid "Edit configuration file"
msgstr ""
#: source/ubl-strings.h:97
msgid "Show inactive"
msgstr ""
#: source/ubl-strings.h:96
#: source/ubl-strings.h:98
msgid "Show unloaded"
msgstr ""
#: source/ubl-strings.h:98
#: source/ubl-strings.h:100
msgid "File"
msgstr ""
#: source/ubl-strings.h:99
#: source/ubl-strings.h:101
msgid "Change date"
msgstr ""
#: source/ubl-strings.h:100
#: source/ubl-strings.h:102
msgid "Description"
msgstr ""
#: source/ubl-strings.h:101
#: source/ubl-strings.h:103
msgid "Edit"
msgstr ""
#: source/ubl-strings.h:103
#: source/ubl-strings.h:105
msgid "Session ID"
msgstr ""
#: source/ubl-strings.h:104
#: source/ubl-strings.h:106
msgid "User ID"
msgstr ""
#: source/ubl-strings.h:105
#: source/ubl-strings.h:107
msgid "User name"
msgstr ""
#: source/ubl-strings.h:106
#: source/ubl-strings.h:108
msgid "Seat ID"
msgstr ""
#: source/ubl-strings.h:108
#: source/ubl-strings.h:110
msgid "Start session"
msgstr ""
#: source/ubl-strings.h:109
#: source/ubl-strings.h:111
msgid "Stop session"
msgstr ""
#: source/ubl-strings.h:110
#: source/ubl-strings.h:112
msgid "Lock session"
msgstr ""
#: source/ubl-strings.h:112
#: source/ubl-strings.h:114
msgid "Timer"
msgstr ""
#: source/ubl-strings.h:113
#: source/ubl-strings.h:115
msgid "Next"
msgstr ""
#: source/ubl-strings.h:114
#: source/ubl-strings.h:116
msgid "Left"
msgstr ""
#: source/ubl-strings.h:115
#: source/ubl-strings.h:117
msgid "Last"
msgstr ""
#: source/ubl-strings.h:116
#: source/ubl-strings.h:118
msgid "Passed"
msgstr ""
#: source/ubl-strings.h:117
#: source/ubl-strings.h:119
msgid "Activates"
msgstr ""
#: source/ubl-strings.h:119
#: source/ubl-strings.h:121
msgid "active"
msgstr ""
#: source/ubl-strings.h:120
#: source/ubl-strings.h:122
msgid "dead"
msgstr ""
#: source/ubl-strings.h:121
#: source/ubl-strings.h:123
msgid "waiting"
msgstr ""
#: source/ubl-strings.h:122
#: source/ubl-strings.h:124
msgid "running"
msgstr ""
#: source/ubl-strings.h:123
#: source/ubl-strings.h:125
msgid "listening"
msgstr ""
#: source/ubl-strings.h:124
#: source/ubl-strings.h:126
msgid "exited"
msgstr ""
#: source/ubl-strings.h:125
#: source/ubl-strings.h:127
msgid "mounted"
msgstr ""
#: source/ubl-strings.h:126
#: source/ubl-strings.h:128
msgid "plugged"
msgstr ""
#: source/ubl-strings.h:127
#: source/ubl-strings.h:129
msgid "abandoned"
msgstr ""
#: source/ubl-strings.h:129
#: source/ubl-strings.h:131
msgid "Upgrade to root"
msgstr ""
#: source/ubl-strings.h:133
msgid "State of "
msgstr ""
#: source/ubl-strings.h:134
msgid "View"
msgstr ""
#: source/ubl-strings.h:134
msgid "log"
msgstr ""
#: source/ubl-strings.h:135
msgid "Edit unit file"
msgstr ""

@ -311,117 +311,138 @@ msgid "Show..."
msgstr "Показать..."
#: source/ubl-strings.h:95
#, fuzzy
msgid "Edit configuration file"
msgstr "Остановлено в конфигурации"
#: source/ubl-strings.h:97
msgid "Show inactive"
msgstr "Показать неактивные"
#: source/ubl-strings.h:96
#: source/ubl-strings.h:98
msgid "Show unloaded"
msgstr "Показать незагруженные"
#: source/ubl-strings.h:98
#: source/ubl-strings.h:100
msgid "File"
msgstr "Файл"
#: source/ubl-strings.h:99
#: source/ubl-strings.h:101
msgid "Change date"
msgstr "Изменён"
#: source/ubl-strings.h:100
#: source/ubl-strings.h:102
msgid "Description"
msgstr "Описание"
#: source/ubl-strings.h:101
#: source/ubl-strings.h:103
msgid "Edit"
msgstr "Редактировать"
#: source/ubl-strings.h:103
#: source/ubl-strings.h:105
msgid "Session ID"
msgstr "ID сессии"
#: source/ubl-strings.h:104
#: source/ubl-strings.h:106
msgid "User ID"
msgstr "ID пользователя"
#: source/ubl-strings.h:105
#: source/ubl-strings.h:107
msgid "User name"
msgstr "Имя пользователя"
#: source/ubl-strings.h:106
#: source/ubl-strings.h:108
msgid "Seat ID"
msgstr "Seat ID"
#: source/ubl-strings.h:108
#: source/ubl-strings.h:110
msgid "Start session"
msgstr "Запустить сессию"
#: source/ubl-strings.h:109
#: source/ubl-strings.h:111
msgid "Stop session"
msgstr "Остановить сессию"
#: source/ubl-strings.h:110
#: source/ubl-strings.h:112
msgid "Lock session"
msgstr "Заблокировать сессию"
#: source/ubl-strings.h:112
#: source/ubl-strings.h:114
msgid "Timer"
msgstr "Таймер"
#: source/ubl-strings.h:113
#: source/ubl-strings.h:115
msgid "Next"
msgstr "Следующий"
#: source/ubl-strings.h:114
#: source/ubl-strings.h:116
msgid "Left"
msgstr "Осталось времени"
#: source/ubl-strings.h:115
#: source/ubl-strings.h:117
msgid "Last"
msgstr "Последний"
#: source/ubl-strings.h:116
#: source/ubl-strings.h:118
msgid "Passed"
msgstr "Пройденный"
#: source/ubl-strings.h:117
#: source/ubl-strings.h:119
msgid "Activates"
msgstr "Активируется"
#: source/ubl-strings.h:119
#: source/ubl-strings.h:121
msgid "active"
msgstr "активен"
#: source/ubl-strings.h:120
#: source/ubl-strings.h:122
msgid "dead"
msgstr "остановлен"
#: source/ubl-strings.h:121
#: source/ubl-strings.h:123
msgid "waiting"
msgstr "ожидание"
#: source/ubl-strings.h:122
#: source/ubl-strings.h:124
msgid "running"
msgstr "работает"
#: source/ubl-strings.h:123
#: source/ubl-strings.h:125
msgid "listening"
msgstr "прослушивание"
#: source/ubl-strings.h:124
#: source/ubl-strings.h:126
msgid "exited"
msgstr "завершён"
#: source/ubl-strings.h:125
#: source/ubl-strings.h:127
msgid "mounted"
msgstr "примонтирован"
#: source/ubl-strings.h:126
#: source/ubl-strings.h:128
msgid "plugged"
msgstr "подключен"
#: source/ubl-strings.h:127
#: source/ubl-strings.h:129
msgid "abandoned"
msgstr "заброшен"
#: source/ubl-strings.h:129
#: source/ubl-strings.h:131
msgid "Upgrade to root"
msgstr "Повысить права до root"
#: source/ubl-strings.h:133
msgid "State of "
msgstr "Состояние сервиса "
#: source/ubl-strings.h:134
msgid "View"
msgstr "Просмотр"
#: source/ubl-strings.h:134
msgid "log"
msgstr "лога"
#: source/ubl-strings.h:135
msgid "Edit unit file"
msgstr "Редактировать юнит-файл"

Loading…
Cancel
Save