From e4dc86024f2343fda328d789531020ebf1237151 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 30 Oct 2023 10:25:58 +0600 Subject: [PATCH] Localisation updates --- journals_list.csv | 24 +++++++-------- logging_services.csv | 8 ++--- source/ubl-settings-logging.c | 4 +-- ubl-settings-logging.glade | 2 +- ubl-settings-logging.pot | 45 ++++++++++++++++++++++++++++ ubl-settings-logging_ru.po | 56 +++++++++++++++++++++++++++++++---- 6 files changed, 115 insertions(+), 24 deletions(-) diff --git a/journals_list.csv b/journals_list.csv index 8d3533b..37454f0 100644 --- a/journals_list.csv +++ b/journals_list.csv @@ -1,13 +1,13 @@ Service_Name;Path_Log;Service_Description -Acpid;/var/log/acpid;Журнал работы и обращений к Acpid -Apache2;/var/log/apache2/error.log,/var/log/apache2/access.log;Журнал работы и обращений к веб-серверу -Audit;/var/log/audit/audit.log;Журнал аудита (audit) -Authlog;/var/log/auth.log;Журнал процедур авторизации -Cron;/var/log/syslog;Журнал работы планировщика заданий (cron) -CUPS;/var/log/cups/access_log,/var/log/cups/page_log,/var/log/cups/cups-pdf_log;Журнал работы и обращений к серверу печати (cups) -Daemonlog;/var/log/daemon.log;Журнал работы и обращения к службам системы -Samba;/var/log/samba/log.smbd,/var/log/samba/log.localhost,/var/log/samba/log.127.0.0.1,/var/log/samba/log.nmbd;Журнал работы и обращения к Samba -Postfix;/var/log/mail.log,/var/log/mail.info,/var/log/mail.warn,/var/log/mail.err;Журнал почтового сервера Postfix -Syslog;/var/log/syslog;Системный журнал -Xorg;/var/log/Xorg.0.log;Журнал работы дисплейного сервера X.org -Xsession;~/.xsession-errors;Журнал сеансов графической системы X \ No newline at end of file +Acpid;/var/log/acpid;Log of work and requests to Acpid +Apache2;/var/log/apache2/error.log,/var/log/apache2/access.log;Log of work and requests to the web server +Audit;/var/log/audit/audit.log;Audit log +Authlog;/var/log/auth.log;Log of authorization procedures +Cron;/var/log/syslog;Job scheduler log (cron) +CUPS;/var/log/cups/access_log,/var/log/cups/page_log,/var/log/cups/cups-pdf_log;Log of work and calls to the print server (cups) +Daemonlog;/var/log/daemon.log;Log of operation and access to system services +Samba;/var/log/samba/log.smbd,/var/log/samba/log.localhost,/var/log/samba/log.127.0.0.1,/var/log/samba/log.nmbd;Log of work and access to Samba +Postfix;/var/log/mail.log,/var/log/mail.info,/var/log/mail.warn,/var/log/mail.err;Postfix mail server log +Syslog;/var/log/syslog;System log +Xorg;/var/log/Xorg.0.log;X.org display server log +Xsession;~/.xsession-errors;Graphics X session log \ No newline at end of file diff --git a/logging_services.csv b/logging_services.csv index 74f8d0c..c64afa1 100644 --- a/logging_services.csv +++ b/logging_services.csv @@ -1,5 +1,5 @@ Service_Name;Service_Description;command_start;command_stop;command_enable;command_disable;command_status -journald;Системный журнал событий;systemctl start systemd-journald.service;systemctl stop systemd-journald.service;ubconfig set config SERVICESSTART+=systemd-journald.service;ubconfig set config SERVICESSTART-=systemd-journald.service;systemctl status systemd-journald.service -logrotate;Служба ротации системных журналов событий;systemctl start logrotate.service;systemctl stop logrotate.service;ubconfig set config SERVICESSTART+=logrotate.service;ubconfig set config SERVICESSTART-=logrotate.service;systemctl status logrotate.service -#metalog;Системный журнал событий;systemctl start metalog.service;systemctl stop metalog.service;ubconfig set config SERVICESSTART+=metalog.service;ubconfig set config SERVICESSTART-=metalog.service;systemctl status metalog.service -#syslog-ng;Сервис сбора сообщений системных событий активных сетевых устройств;systemctl start syslog-ng.service;systemctl stop syslog-ng.service;ubconfig set config SERVICESSTART+=syslog-ng.service;ubconfig set config SERVICESSTART-=syslog-ng.service;systemctl status syslog-ng.service \ No newline at end of file +journald;System event log;systemctl start systemd-journald.service;systemctl stop systemd-journald.service;ubconfig set config SERVICESSTART+=systemd-journald.service;ubconfig set config SERVICESSTART-=systemd-journald.service;systemctl status systemd-journald.service +logrotate;System event log rotation service;systemctl start logrotate.service;systemctl stop logrotate.service;ubconfig set config SERVICESSTART+=logrotate.service;ubconfig set config SERVICESSTART-=logrotate.service;systemctl status logrotate.service +#metalog;System event log;systemctl start metalog.service;systemctl stop metalog.service;ubconfig set config SERVICESSTART+=metalog.service;ubconfig set config SERVICESSTART-=metalog.service;systemctl status metalog.service +#syslog-ng;Service for collecting messages from system events of active network devices;systemctl start syslog-ng.service;systemctl stop syslog-ng.service;ubconfig set config SERVICESSTART+=syslog-ng.service;ubconfig set config SERVICESSTART-=syslog-ng.service;systemctl status syslog-ng.service \ No newline at end of file diff --git a/source/ubl-settings-logging.c b/source/ubl-settings-logging.c index ae512d5..a788af8 100644 --- a/source/ubl-settings-logging.c +++ b/source/ubl-settings-logging.c @@ -1654,7 +1654,7 @@ main_window *setup_window(){ config_str log = yon_char_parse(journals[i],&log_size,";"); log[1] = yon_char_replace(log[1],",","\n"); gtk_list_store_append(widgets->list,&iter); - gtk_list_store_set(widgets->list,&iter,0,log[0],1,log[1],2,log[2],3,-1,4,-1,5,-1,6,-1,7,-1,-1); + gtk_list_store_set(widgets->list,&iter,0,log[0],1,log[1],2,_(log[2]),3,-1,4,-1,5,-1,6,-1,7,-1,-1); } config_str services = yon_file_open(services_list_path,&service_size); for (int i=1;iServicesList,&iter); // yon_config_load - gtk_list_store_set(widgets->ServicesList,&iter,0,1,1,1,2,log[0],3,log[1],4,log[2],5,log[3],6,log[4],7,log[5],8,log[6],-1); + gtk_list_store_set(widgets->ServicesList,&iter,0,1,1,1,2,log[0],3,_(log[1]),4,log[2],5,log[3],6,log[4],7,log[5],8,log[6],-1); } } config_str dirs = yon_config_load(logrotate_config_command,&dirs_size); diff --git a/ubl-settings-logging.glade b/ubl-settings-logging.glade index 98912f6..b86e205 100644 --- a/ubl-settings-logging.glade +++ b/ubl-settings-logging.glade @@ -478,7 +478,7 @@ translated and supported by community. journald /var/log/journal/ - System events journal + System event log 0 0 0 diff --git a/ubl-settings-logging.pot b/ubl-settings-logging.pot index 4f011cd..f9b2a68 100644 --- a/ubl-settings-logging.pot +++ b/ubl-settings-logging.pot @@ -682,3 +682,48 @@ msgstr "" #: source/ubl-strings.h:183 msgid "Log file" msgstr "" + +msgid "System event log rotation service" +msgstr "" + +msgid "System event log" +msgstr "" + +msgid "Service for collecting messages from system events of active network devices" +msgstr "" + +msgid "Log of work and requests to Acpid" +msgstr "" + +msgid "Log of work and requests to the web server" +msgstr "" + +msgid "Audit log" +msgstr "" + +msgid "Log of authorization procedures" +msgstr "" + +msgid "Job scheduler log (cron)" +msgstr "" + +msgid "Log of work and calls to the print server (cups)" +msgstr "" + +msgid "Log of operation and access to system services" +msgstr "" + +msgid "Log of work and access to Samba" +msgstr "" + +msgid "Postfix mail server log" +msgstr "" + +msgid "System log" +msgstr "" + +msgid "X.org display server log" +msgstr "" + +msgid "Graphics X session log" +msgstr "" diff --git a/ubl-settings-logging_ru.po b/ubl-settings-logging_ru.po index ddc3ef2..e3e13b7 100644 --- a/ubl-settings-logging_ru.po +++ b/ubl-settings-logging_ru.po @@ -378,24 +378,24 @@ msgstr "Гб" #: source/ubl-strings.h:97 msgid "Minutes" -msgstr "Минута" +msgstr "Минут" #: source/ubl-strings.h:98 msgid "Hours" -msgstr "Час" +msgstr "Часов" #: source/ubl-strings.h:99 msgid "Days" -msgstr "День" +msgstr "Дней" #: source/ubl-strings.h:100 #, fuzzy msgid "Weeks" -msgstr "Неделя" +msgstr "Недель" #: source/ubl-strings.h:101 msgid "Years" -msgstr "Год" +msgstr "Лет" #: source/ubl-strings.h:104 msgid "Log/Journal:" @@ -694,3 +694,49 @@ msgstr "Управление:" #: source/ubl-strings.h:183 msgid "Log file" msgstr "Файл лога" + +msgid "System event log rotation service" +msgstr "Служба ротации системных журналов событий" + +msgid "System event log" +msgstr "Системный журнал событий" + +msgid "" +"Service for collecting messages from system events of active network devices" +msgstr "Сервис сбора сообщений системных событий активных сетевых устройств" + +msgid "Log of work and requests to Acpid" +msgstr "Журнал работы и обращений к Acpid" + +msgid "Log of work and requests to the web server" +msgstr "Журнал работы и обращений к веб-серверу" + +msgid "Audit log" +msgstr "Журнал аудита (audit)" + +msgid "Log of authorization procedures" +msgstr "Журнал процедур авторизации" + +msgid "Job scheduler log (cron)" +msgstr "Журнал работы планировщика заданий (cron)" + +msgid "Log of work and calls to the print server (cups)" +msgstr "Журнал работы и обращений к серверу печати (cups)" + +msgid "Log of operation and access to system services" +msgstr "Журнал работы и обращения к службам системы" + +msgid "Log of work and access to Samba" +msgstr "Журнал работы и обращения к Samba" + +msgid "Postfix mail server log" +msgstr "Журнал почтового сервера Postfix" + +msgid "System log" +msgstr "Системный журнал" + +msgid "X.org display server log" +msgstr "Журнал работы дисплейного сервера X.org" + +msgid "Graphics X session log" +msgstr "Журнал сеансов графической системы X"