Russian localisation

2 years ago · aac60c6c3c
parent 075617d495
commit aac60c6c3c
9 changed files with 242 additions and 138 deletions
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@ -57,6 +57,8 @@ add_custom_target(
    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C}
 )

+add_definitions(-DVTE_INCLUDE)
+
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
 	-O2 -pipe -fno-plt -fexceptions \
        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
--- a/source/ubl-settings-services.c
+++ b/source/ubl-settings-services.c
@ -36,6 +36,58 @@ void on_config_global_save(){
    
 }

+
+static void child_ready(VteTerminal *terminal, GPid pid, GError *error, gpointer user_data)
+{
+    if (error){};
+    if (!terminal) return;
+    if (pid == -1) printf("Error\n\n\n");
+    else vte_terminal_feed_child(VTE_TERMINAL(terminal),(char*)user_data,strlen((char*)user_data));
+}
+
+void yon_terminal_integrated_start(GtkWidget *terminal, char* command, void *endwork_function, void* endwork_function_argument){
+    char **commands=new_arr(char*,2);
+    gchar **envp = g_get_environ();
+    commands[0]=(gchar *)g_strdup(g_environ_getenv(envp, "SHELL"));
+    commands[1]=NULL;
+    char **env=new_arr(char*,2);
+    env[0]="";
+    env[1]=NULL;
+    vte_terminal_set_size(VTE_TERMINAL(terminal),10,15);
+    VtePty *pty = vte_pty_new_sync(VTE_PTY_DEFAULT,NULL,NULL);
+    vte_terminal_set_pty(VTE_TERMINAL(terminal),pty);
+    char *install_command=yon_char_unite("clear;tput cup 0 0 && tput ed; ",command,"  ; sleep 5; stty -echo; unset PS1","\n",NULL); 
+    if(endwork_function)
+        g_signal_connect(G_OBJECT(terminal), "child-exited", G_CALLBACK(endwork_function), endwork_function_argument);
+     vte_terminal_spawn_async(VTE_TERMINAL(terminal),
+        VTE_PTY_DEFAULT,
+        NULL,   
+        commands,   
+        NULL,  
+        0,      
+        NULL, NULL,
+        NULL,   
+        -1, 
+        NULL, 
+        child_ready,    
+        install_command); 
+    vte_pty_spawn_async(pty,
+        NULL,        
+        commands,      
+        NULL,         
+        0,            
+        NULL, NULL,   
+        NULL,         
+        -1,           
+        NULL,         
+        NULL,           
+        NULL);        
+        vte_terminal_set_scrollback_lines(VTE_TERMINAL(terminal), -1);
+        vte_terminal_set_scroll_on_output(VTE_TERMINAL(terminal), TRUE);
+        vte_terminal_set_scroll_on_keystroke(VTE_TERMINAL(terminal), TRUE);
+        gtk_widget_show_all(terminal);
+    }
+
 // standard functions

 void on_config_autostart_clicked(GtkWidget *self, main_window *widgets){
--- a/source/ubl-settings-services.h
+++ b/source/ubl-settings-services.h
@ -7,6 +7,7 @@
 #include <libintl.h> 
 #include <getopt.h> 
 #include <libintl.h>
+#include <vte/vte.h>
 #include <libublsettings.h> 
 #include <libublsettings-gtk3.h>
 #include <libublsettingsui-gtk3.h> 
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@ -1,5 +1,5 @@
 #define VERSION_LABEL yon_char_unite(_("Version:")," ",version_application,"\n",NULL)
-#define HELP_LABEL yon_char_unite(_("ubl-settings-services version:")," ", version_application,"\n",_("ubl-settings-services"),"\n",_("Usage:"), " ubl-settings-services ",_("[OPTIONS]"),"\n",_("Options:"),"\n\t--help, -h\t\t\t",_("Show this help"),"\n\t--version, -V\t\t\t",_("Show package version"),"\n\t--lock-help\t\t\t",_("Lock this help menu"),"\n\t--lock-save\t\t\t",_("Lock configuration saving"),"\n\t--lock-save-local\t\t",_("Lock local configration saving"),"\n\t--lock-save-global\t\t",_("Lock global configration saving"),"\n\t--lock-load-global\t\t",_("Lock global configration loading"),"\n\t--clear-config\t\t\t",_("Reset application settings"),"\n",NULL)
+#define HELP_LABEL yon_char_unite(_("ubl-settings-services version:")," ", version_application,"\n",TITLE_LABEL,"\n",_("Usage:"), " ubl-settings-services ",_("[OPTIONS]"),"\n",_("Options:"),"\n\t--help, -h\t\t\t",_("Show this help"),"\n\t--version, -V\t\t\t",_("Show package version"),"\n\t--lock-help\t\t\t",_("Lock this help menu"),"\n\t--lock-save\t\t\t",_("Lock configuration saving"),"\n\t--lock-save-local\t\t",_("Lock local configration saving"),"\n\t--lock-save-global\t\t",_("Lock global configration saving"),"\n\t--lock-load-global\t\t",_("Lock global configration loading"),"\n\t--clear-config\t\t\t",_("Reset application settings"),"\n",NULL)

 #define TITLE_LABEL _("Services and processes systemd")
 #define TITLE_INFO_LABEL _("System services and processes configuration")
@ -13,3 +13,35 @@
 #define LAUNCHED_LABEL _("Launched")
 #define SERVICE_RELOAD_LABEL _("Reload")
 #define STATUS_LABEL _("Show status")
+#define UPDATE_LABEL _("Update")
+
+#define ALL_SERIVCES_LABEL _("All services")
+#define SYSTEM_SERVICES_LABEL _("System services only")
+#define USER_SERVICES_LABEL _("User services only")
+
+#define ALL_LABEL _("All")
+#define SERVICES_LABEL _("Services")
+#define SOCKETS_LABEL _("Sockets")
+#define AUTOLAUNCH_CONFIG_LABEL _("Autolaunch in configuration")
+#define STOPPED_CONFIG_LABEL _("Stopped in configuration")
+#define BLOCKED_CONFIG_LABEL _("Blocked in configuration")
+
+#define AUTOSTART_TOGGLE_LABEL _("Toggle autostart at configuration")
+#define AUTOSTOP_TOGGLE_LABEL _("Toggle autostop at configuration")
+#define BLOCK_TOGGLE_LABEL _("Toggle service blocking at configuration")
+#define SYSTEM_AUTOSTART_TOGGLE_LABEL _("Toggle autostart at system")
+#define SYSTEM_LAUNCH_TOGGLE_LABEL _("Launch service")
+#define CHECKSTATUS_LABEL _("Check service status")
+#define LOG_LABEL _("Check service log")
+
+#define SERVICE_LABEL _("Service:")
+#define DESCRIPTION_LABEL _("Description:")
+
+#define CONFIGURE_CONFIGURATION_LABEL _("Configure in configuration")
+#define CONFIGURE_SYSTEM_LABEL _("Configure in system")
+#define SERVICE_NAME_LABEL _("Service")
+
+#define AUTOSTART_LABEL _("Autostart")
+#define AUTOSTOP_LABEL _("Autostop")
+#define BLOCK_LABEL _("Block")
+#define LAUNCHED_LABEL _("Launched")
--- a/ubl-settings-services-terminal.glade
+++ b/ubl-settings-services-terminal.glade
@ -39,6 +39,7 @@
                <property name="visible">True</property>
                <property name="can-focus">True</property>
                <property name="receives-default">True</property>
+                <property name="tooltip-text" translatable="yes">Update</property>
                <property name="image">image1</property>
                <style>
                  <class name="thin"/>
--- a/ubl-settings-services.desktop
+++ b/ubl-settings-services.desktop
@ -1,14 +1,14 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Services and processes systemd
-Name[ru]=TEMPLATE
-GenericName=ubl-settings-TEMPLATE
-GenericName[ru]=TEMPLATE
+Name=Службы и процесссы systemd
+Name[ru]=Настройка процессов systemd
+GenericName=ubl-settings-service
+GenericName[ru]=Службы и процесссы systemd
 Comment=System vervices and processes configuration
-Comment[ru]=Приложение для TEMPLATE
+Comment[ru]=Настройка работы служб и процессов системы
 Type=Application
-Exec=pkexec ubl-settings-TEMPLATE
-Icon=com.ublinux.ubl-settings-TEMPLATE
+Exec=pkexec ubl-settings-service
+Icon=com.ublinux.libublsettingsui-gtk3
 Terminal=false
 X-XfcePluggable=true
 X-UBLPluggable=true
--- a/ubl-settings-services.glade
+++ b/ubl-settings-services.glade
@ -148,6 +148,7 @@
                        <property name="visible">True</property>
                        <property name="can-focus">True</property>
                        <property name="receives-default">True</property>
+                        <property name="tooltip-text" translatable="yes">Update</property>
                        <property name="image">image8</property>
                        <style>
                          <class name="thin"/>
@ -267,6 +268,7 @@
                            <property name="visible">True</property>
                            <property name="can-focus">True</property>
                            <property name="receives-default">True</property>
+                            <property name="tooltip-text" translatable="yes">Check service status</property>
                            <property name="image">image6</property>
                            <style>
                              <class name="thin"/>
@ -283,6 +285,7 @@
                            <property name="visible">True</property>
                            <property name="can-focus">True</property>
                            <property name="receives-default">True</property>
+                            <property name="tooltip-text" translatable="yes">Check service log</property>
                            <property name="image">image7</property>
                            <style>
                              <class name="thin"/>
@ -515,7 +518,7 @@
                          <object class="GtkLabel">
                            <property name="visible">True</property>
                            <property name="can-focus">False</property>
-                            <property name="label" translatable="yes">Description</property>
+                            <property name="label" translatable="yes">Description:</property>
                          </object>
                          <packing>
                            <property name="expand">False</property>
--- a/ubl-settings-services.pot
+++ b/ubl-settings-services.pot
@ -1,12 +1,12 @@
-# Language translations for ubl-settings-TEMPLATE package.
+# Language translations for ubl-settings-services package.
 # Copyright (C) 2022, UBTech LLC
-# This file is distributed under the same license as the ubl-settings-TEMPLATE package.
+# This file is distributed under the same license as the ubl-settings-services package.
 # UBLinux Team <info@ublinux.com>, 2022
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ubl-settings-TEMPLATE 1.0\n"
+"Project-Id-Version: ubl-settings-services 1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-05-22 16:12+0600\n"
 "PO-Revision-Date: \n"
@ -22,7 +22,7 @@ msgid "Version:"
 msgstr ""

 #: source/ubl-strings.h:2
-msgid "ubl-settings-TEMPLATE version:"
+msgid "ubl-settings-services version:"
 msgstr ""

 #: source/ubl-strings.h:2
@ -66,121 +66,129 @@ msgid "Lock global configration loading"
 msgstr ""

 #: source/ubl-strings.h:2
-msgid "Clear application configuration"
+msgid "Reset application settings"
 msgstr ""

 #: source/ubl-strings.h:4
-msgid "ubl-settings-TEMPLATE"
+msgid "Services and processes systemd"
 msgstr ""

 #: source/ubl-strings.h:5
-msgid "TEMPLATE configuration"
+msgid "System services and processes configuration"
 msgstr ""

-#: source/ubl-strings.h:7
-msgid "Operation succeeded"
+#: source/ubl-strings.h:6
+msgid "Services and processes - service information"
 msgstr ""

-#: source/ubl-strings.h:8
-msgid "Nothing were chosen"
+#: source/ubl-strings.h:8 source/ubl-strings.h:40
+msgid "Configure in configuration"
 msgstr ""

-#: source/ubl-strings.h:9
-msgid ""
-"Warning! Application was launched without root - root-dependent actions are "
-"locked"
+#: source/ubl-strings.h:9 source/ubl-strings.h:44
+msgid "Autostart"
+msgstr ""
+
+#: source/ubl-strings.h:10 source/ubl-strings.h:45
+msgid "Autostop"
+msgstr ""
+
+#: source/ubl-strings.h:11 source/ubl-strings.h:46
+msgid "Block"
 msgstr ""

-#: source/ubl-strings.h:11
-msgid "About"
+#: source/ubl-strings.h:12 source/ubl-strings.h:41
+msgid "Configure in system"
 msgstr ""

-#: source/ubl-strings.h:12
-msgid "Documentation"
+#: source/ubl-strings.h:13 source/ubl-strings.h:47
+msgid "Launched"
 msgstr ""

 #: source/ubl-strings.h:14
-msgid "Save to local configuration"
+msgid "Reload"
 msgstr ""

 #: source/ubl-strings.h:15
-msgid "Save to global configuration"
+msgid "Show status"
 msgstr ""

 #: source/ubl-strings.h:16
-msgid "Save to global and local configuration"
+msgid "Update"
 msgstr ""

-#: source/ubl-strings.h:17
-msgid "Save"
+#: source/ubl-strings.h:18
+msgid "All services"
 msgstr ""

 #: source/ubl-strings.h:19
-msgid "Load local configuration"
+msgid "System services only"
 msgstr ""

 #: source/ubl-strings.h:20
-msgid "Load global configuration"
+msgid "User services only"
 msgstr ""

-#: source/ubl-strings.h:21
-msgid "Load"
+#: source/ubl-strings.h:22
+msgid "All"
 msgstr ""

 #: source/ubl-strings.h:23
-msgid "Cancel"
+msgid "Services"
 msgstr ""

 #: source/ubl-strings.h:24
-msgid "Close"
+msgid "Sockets"
 msgstr ""

 #: source/ubl-strings.h:25
-msgid "Apply"
+msgid "Autolaunch in configuration"
 msgstr ""

-#: source/ubl-strings.h:27
-msgid "Would you like to read documentation in the Web?"
+#: source/ubl-strings.h:26
+msgid "Stopped in configuration"
 msgstr ""

-#: source/ubl-strings.h:28
-msgid ""
-"You will be redirected to documentation website, where documentation is\n"
-"translated and supported by community."
+#: source/ubl-strings.h:27
+msgid "Blocked in configuration"
 msgstr ""

 #: source/ubl-strings.h:29
-msgid "Always redirect to online documentation"
+msgid "Toggle autostart at configuration"
 msgstr ""

 #: source/ubl-strings.h:30
-msgid "Open documentation"
+msgid "Toggle autostop at configuration"
 msgstr ""

 #: source/ubl-strings.h:31
-msgid "Project Home Page"
+msgid "Toggle service blocking at configuration"
+msgstr ""
+
+#: source/ubl-strings.h:32
+msgid "Toggle autostart at system"
 msgstr ""

 #: source/ubl-strings.h:33
-msgid "Global configuration loading succeeded."
+msgid "Launch service"
 msgstr ""

 #: source/ubl-strings.h:34
-msgid "Local configuration loading succeeded."
+msgid "Check service status"
 msgstr ""

 #: source/ubl-strings.h:35
-msgid "Config loading failed"
+msgid "Check service log"
 msgstr ""

 #: source/ubl-strings.h:37
-msgid "Local and global configuration saving succeeded."
+msgid "Service:"
 msgstr ""

 #: source/ubl-strings.h:38
-msgid "Global configuration saving succeeded."
+msgid "Description:"
 msgstr ""

-#: source/ubl-strings.h:39
-msgid "Local configuration saving succeeded."
+#: source/ubl-strings.h:42
+msgid "Service"
 msgstr ""
--- a/ubl-settings-services_ru.po
+++ b/ubl-settings-services_ru.po
@ -1,12 +1,12 @@
-# Russian translations for ubl-settings-TEMPLATE package.
+# Russian translations for ubl-settings-services package.
 # Copyright (C) 2022, UBTech LLC
-# This file is distributed under the same license as the ubl-settings-TEMPLATE package.
+# This file is distributed under the same license as the ubl-settings-services package.
 # UBLinux Team <info@ublinux.com>, 2022
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ubl-settings-TEMPLATE 1.0\n"
+"Project-Id-Version: ubl-settings-services 1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-05-22 16:12+0600\n"
 "PO-Revision-Date: 2023-01-01 00:00+0600\n"
@ -22,8 +22,8 @@ msgid "Version:"
 msgstr "Версия:"

 #: source/ubl-strings.h:2
-msgid "ubl-settings-TEMPLATE version:"
-msgstr "Версия ubl-settings-TEMPLATE: "
+msgid "ubl-settings-services version:"
+msgstr "Версия ubl-settings-services: "

 #: source/ubl-strings.h:2
 msgid "Usage:"
@ -66,125 +66,130 @@ msgid "Lock global configration loading"
 msgstr "Блокировка загрузки глобальной конфигурации"

 #: source/ubl-strings.h:2
-msgid "Clear application configuration"
-msgstr "Удалить конфигурацию приложения"
+msgid "Reset application settings"
+msgstr "Сбросить настройки утилиты"

 #: source/ubl-strings.h:4
-msgid "ubl-settings-TEMPLATE"
-msgstr "Настройки TEMPLATE"
+msgid "Services and processes systemd"
+msgstr "Сервисы и процессы systemd"

 #: source/ubl-strings.h:5
-msgid "TEMPLATE configuration"
-msgstr "Настройки TEMPLATE"
+msgid "System services and processes configuration"
+msgstr "Настройка работы служб и процессов системы"

-#: source/ubl-strings.h:7
-msgid "Operation succeeded"
-msgstr "Операция завершена"
+#: source/ubl-strings.h:6
+msgid "Services and processes - service information"
+msgstr "Сервисы и процессы - статус"

-#: source/ubl-strings.h:8
-msgid "Nothing were chosen"
-msgstr "Ничего не было выбрано"
+#: source/ubl-strings.h:8 source/ubl-strings.h:40
+msgid "Configure in configuration"
+msgstr "Настройка в конфигурации"

-#: source/ubl-strings.h:9
-msgid ""
-"Warning! Application was launched without root - root-dependent actions are "
-"locked"
-msgstr ""
-"Внимание! Приложение было запущено без прав суперпользователя - действия, "
-"требующие их наличия заблокированы"
+#: source/ubl-strings.h:9 source/ubl-strings.h:44
+msgid "Autostart"
+msgstr "Автостарт"
+
+#: source/ubl-strings.h:10 source/ubl-strings.h:45
+msgid "Autostop"
+msgstr "Автостоп"

-#: source/ubl-strings.h:11
-msgid "About"
-msgstr "О программе"
+#: source/ubl-strings.h:11 source/ubl-strings.h:46
+msgid "Block"
+msgstr "Блокировать"

-#: source/ubl-strings.h:12
-msgid "Documentation"
-msgstr "Справка"
+#: source/ubl-strings.h:12 source/ubl-strings.h:41
+msgid "Configure in system"
+msgstr "Настройка в системе"
+
+#: source/ubl-strings.h:13 source/ubl-strings.h:47
+msgid "Launched"
+msgstr "Запущено"

 #: source/ubl-strings.h:14
-msgid "Save to local configuration"
-msgstr "Сохранить в локальную конфигурацию"
+msgid "Reload"
+msgstr "Перезагрузить"

 #: source/ubl-strings.h:15
-msgid "Save to global configuration"
-msgstr "Сохранить в глобальную конфигурацию"
+msgid "Show status"
+msgstr "Показать статус"

 #: source/ubl-strings.h:16
-msgid "Save to global and local configuration"
-msgstr "Сохранить в глобальную и локальную конфигурацию"
+msgid "Update"
+msgstr "Обновить"

-#: source/ubl-strings.h:17
-msgid "Save"
-msgstr "Сохранить"
+#: source/ubl-strings.h:18
+msgid "All services"
+msgstr "Все сервисы"

 #: source/ubl-strings.h:19
-msgid "Load local configuration"
-msgstr "Загрузить локальную конфигурацию"
+msgid "System services only"
+msgstr "Только системные сервисы"

 #: source/ubl-strings.h:20
-msgid "Load global configuration"
-msgstr "Загрузить глобальную конфигурацию"
+msgid "User services only"
+msgstr "Только сервисы пользователя"

-#: source/ubl-strings.h:21
-msgid "Load"
-msgstr "Загрузить"
+#: source/ubl-strings.h:22
+msgid "All"
+msgstr "Все"

 #: source/ubl-strings.h:23
-msgid "Cancel"
-msgstr "Отмена"
+msgid "Services"
+msgstr "Сервисы"

 #: source/ubl-strings.h:24
-msgid "Close"
-msgstr "Закрыть"
+msgid "Sockets"
+msgstr "Сокеты"

 #: source/ubl-strings.h:25
-msgid "Apply"
-msgstr "Применить"
+msgid "Autolaunch in configuration"
+msgstr "Автозапуск в конфигурации"

-#: source/ubl-strings.h:27
-msgid "Would you like to read documentation in the Web?"
-msgstr "Вы хотите прочитать справку в Сети?"
+#: source/ubl-strings.h:26
+msgid "Stopped in configuration"
+msgstr "Остановлено в конфигурации"

-#: source/ubl-strings.h:28
-msgid ""
-"You will be redirected to documentation website, where documentation is\n"
-"translated and supported by community."
-msgstr ""
-"Вы будете перенаправлены на сайт с документацией, где страницы помощи\n"
-"переводятся и поддерживаются сообществом."
+#: source/ubl-strings.h:27
+msgid "Blocked in configuration"
+msgstr "Заблокированные в конфигурации"

 #: source/ubl-strings.h:29
-msgid "Always redirect to online documentation"
-msgstr "Всегда перенаправлять"
+msgid "Toggle autostart at configuration"
+msgstr "Переключить автозапуск в конфигурации"

 #: source/ubl-strings.h:30
-msgid "Open documentation"
-msgstr "Прочитать справку"
+msgid "Toggle autostop at configuration"
+msgstr "Переключить автостоп в конфигурации"

 #: source/ubl-strings.h:31
-msgid "Project Home Page"
-msgstr "Домашняя страница проекта"
+msgid "Toggle service blocking at configuration"
+msgstr "Переключить блокирование в конфигурации"
+
+#: source/ubl-strings.h:32
+msgid "Toggle autostart at system"
+msgstr "Переключить автозапуск в системе"

 #: source/ubl-strings.h:33
-msgid "Global configuration loading succeeded."
-msgstr "Успешно загружена глобальная конфигурация"
+msgid "Launch service"
+msgstr "Запустить сервис"

 #: source/ubl-strings.h:34
-msgid "Local configuration loading succeeded."
-msgstr "Успешно загружена локальная конфигурация"
+msgid "Check service status"
+msgstr "Проверить статус сервиса"

 #: source/ubl-strings.h:35
-msgid "Config loading failed"
-msgstr "Ошибка загрузки конфигурации"
+msgid "Check service log"
+msgstr "Открыть лог сервиса"

 #: source/ubl-strings.h:37
-msgid "Local and global configuration saving succeeded."
-msgstr "Успешно записаны локальная и глобальная конфигурация"
+msgid "Service:"
+msgstr "Сервис:"

 #: source/ubl-strings.h:38
-msgid "Global configuration saving succeeded."
-msgstr "Успешно записана глобальная конфигурация"
+#, fuzzy
+msgid "Description:"
+msgstr "Описание:"

-#: source/ubl-strings.h:39
-msgid "Local configuration saving succeeded."
-msgstr "Успешно записана локальная конфигурация"
+#: source/ubl-strings.h:42
+msgid "Service"
+msgstr "Сервис"