Merge pull request 'master' (#41) from YanTheKaller/libublsettingsui-gtk3:master into master

Reviewed-on: #41

libublsettingsui-gtk3.pot

@@ -69,240 +69,244 @@ msgstr ""
 msgid "Reset application settings"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:318
+#: source/libublsettingsui-gtk3.h:318 source/libublsettingsui-gtk3.h:326
+msgid "About"
+msgstr ""
+
+#: source/libublsettingsui-gtk3.h:320
 msgid "Operation succeeded"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:319
+#: source/libublsettingsui-gtk3.h:321
+msgid "Operation failed"
+msgstr ""
+
+#: source/libublsettingsui-gtk3.h:322
 msgid ""
 "Warning! Application was launched without root - root-dependent actions are "
 "locked"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:321 source/libublsettingsui-gtk3.h:322
+#: source/libublsettingsui-gtk3.h:324 source/libublsettingsui-gtk3.h:325
 msgid "Default"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:323
-msgid "About"
-msgstr ""
-
-#: source/libublsettingsui-gtk3.h:324
+#: source/libublsettingsui-gtk3.h:327
 msgid "Documentation"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:326
+#: source/libublsettingsui-gtk3.h:329
 msgid "Save to specific file"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:327
+#: source/libublsettingsui-gtk3.h:330
 msgid "Save to local configuration"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:328
+#: source/libublsettingsui-gtk3.h:331
 msgid "Save to global configuration"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:329
+#: source/libublsettingsui-gtk3.h:332
 msgid "Save configuration"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:330
+#: source/libublsettingsui-gtk3.h:333
 msgid "Save"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:331
+#: source/libublsettingsui-gtk3.h:334
 msgid "Saving..."
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:333
+#: source/libublsettingsui-gtk3.h:336
 msgid "Load from specific file"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:334
+#: source/libublsettingsui-gtk3.h:337
 msgid "Load local configuration"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:335
+#: source/libublsettingsui-gtk3.h:338
 msgid "Load global configuration"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:336
+#: source/libublsettingsui-gtk3.h:339
 msgid "Load"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:337
+#: source/libublsettingsui-gtk3.h:340
 msgid "Load file"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:339
+#: source/libublsettingsui-gtk3.h:342
 msgid "Cancel"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:340
+#: source/libublsettingsui-gtk3.h:343
 msgid "Accept"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:341
+#: source/libublsettingsui-gtk3.h:344
 msgid "Open"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:342
+#: source/libublsettingsui-gtk3.h:345
 msgid "Create directory"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:343
+#: source/libublsettingsui-gtk3.h:346
 msgid "Select directory"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:345
+#: source/libublsettingsui-gtk3.h:348
 msgid "Would you like to read documentation in the Web?"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:346
+#: source/libublsettingsui-gtk3.h:349
 msgid ""
 "You will be redirected to documentation website where documentation is\n"
 "translated and supported by community."
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:347
+#: source/libublsettingsui-gtk3.h:350
 msgid "Always redirect to online documentation"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:348
+#: source/libublsettingsui-gtk3.h:351
 msgid "Open documentation"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:349
+#: source/libublsettingsui-gtk3.h:352
 msgid "Project Home Page"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:350
+#: source/libublsettingsui-gtk3.h:353
 msgid "Nothing were chosen"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:351
+#: source/libublsettingsui-gtk3.h:354
 msgid "Copyright © 2022 - 2023, UBSoft LLC"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:354
+#: source/libublsettingsui-gtk3.h:357
 msgid "Global configuration loading succeeded."
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:355
+#: source/libublsettingsui-gtk3.h:358
 msgid "Local configuration loading succeeded."
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:356
+#: source/libublsettingsui-gtk3.h:359
 msgid "Config loading failed"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:358
+#: source/libublsettingsui-gtk3.h:361
 msgid "Local and global configuration saving succeeded."
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:359
+#: source/libublsettingsui-gtk3.h:362
 msgid "Global configuration saving succeeded."
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:360
+#: source/libublsettingsui-gtk3.h:363
 msgid "Local configuration saving succeeded."
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:361
+#: source/libublsettingsui-gtk3.h:364
 msgid "Configuration saving succeeded."
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:363
+#: source/libublsettingsui-gtk3.h:366
 msgid "Parameter"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:364
+#: source/libublsettingsui-gtk3.h:367
 msgid "Old value"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:365
+#: source/libublsettingsui-gtk3.h:368
 msgid "New value"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:366
+#: source/libublsettingsui-gtk3.h:369
 msgid ""
 "Value\n"
 "(Old/New)"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:368
+#: source/libublsettingsui-gtk3.h:371
 msgid "Nothing to save"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:369
+#: source/libublsettingsui-gtk3.h:372
 msgid "Saving into local configuration"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:370
+#: source/libublsettingsui-gtk3.h:373
 msgid "Saving into global configuration"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:371
+#: source/libublsettingsui-gtk3.h:374
 msgid "Saving into global and local configuration"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:372
+#: source/libublsettingsui-gtk3.h:375
 msgid "Saving into custom configuration at"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:377
+#: source/libublsettingsui-gtk3.h:380
 msgid "Full saving mode"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:378
+#: source/libublsettingsui-gtk3.h:381
 msgid "Saving into module"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:379
+#: source/libublsettingsui-gtk3.h:382
 msgid "Sandbox mode"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:380
+#: source/libublsettingsui-gtk3.h:383
 msgid "Sandbox with profile saving"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:381
+#: source/libublsettingsui-gtk3.h:384
 msgid "HDD sandbox"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:382
+#: source/libublsettingsui-gtk3.h:385
 msgid "HDD sandbox with profile saving"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:383
+#: source/libublsettingsui-gtk3.h:386
 msgid "New configuration file creation failed"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:384
+#: source/libublsettingsui-gtk3.h:387
 msgid "Upgrade to root"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:385
+#: source/libublsettingsui-gtk3.h:388
 msgid "Settings"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:387
+#: source/libublsettingsui-gtk3.h:390
 msgid "Application settigs"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:389
+#: source/libublsettingsui-gtk3.h:392
 msgid "Invalid email adress"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:390
+#: source/libublsettingsui-gtk3.h:393
 msgid "Invalid path"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:392
+#: source/libublsettingsui-gtk3.h:395
 msgid "Choose path"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:395
+#: source/libublsettingsui-gtk3.h:398
 msgid "Choose directory instead of file"
 msgstr ""

libublsettingsui-gtk3_ru.po

@@ -69,11 +69,19 @@ msgstr "Заблокировать загрузку глобальную кон
 msgid "Reset application settings"
 msgstr "Сбросить настройки программы"
 
-#: source/libublsettingsui-gtk3.h:318
+#: source/libublsettingsui-gtk3.h:318 source/libublsettingsui-gtk3.h:326
+msgid "About"
+msgstr "О программе"
+
+#: source/libublsettingsui-gtk3.h:320
 msgid "Operation succeeded"
 msgstr "Операция завершена"
 
-#: source/libublsettingsui-gtk3.h:319
+#: source/libublsettingsui-gtk3.h:321
+msgid "Operation failed"
+msgstr "Операция завершена с ошибкой"
+
+#: source/libublsettingsui-gtk3.h:322
 msgid ""
 "Warning! Application was launched without root - root-dependent actions are "
 "locked"
@@ -81,87 +89,83 @@ msgstr ""
 "Внимание! Приложение было запущено без прав суперпользователя - действия, "
 "требующие их наличия заблокированы"
 
-#: source/libublsettingsui-gtk3.h:321 source/libublsettingsui-gtk3.h:322
+#: source/libublsettingsui-gtk3.h:324 source/libublsettingsui-gtk3.h:325
 msgid "Default"
 msgstr "По умолчанию"
 
-#: source/libublsettingsui-gtk3.h:323
-msgid "About"
-msgstr "О программе"
-
-#: source/libublsettingsui-gtk3.h:324
+#: source/libublsettingsui-gtk3.h:327
 msgid "Documentation"
 msgstr "Справка"
 
-#: source/libublsettingsui-gtk3.h:326
+#: source/libublsettingsui-gtk3.h:329
 msgid "Save to specific file"
 msgstr "Сохранить в файл"
 
-#: source/libublsettingsui-gtk3.h:327
+#: source/libublsettingsui-gtk3.h:330
 msgid "Save to local configuration"
 msgstr "Сохранить в локальную конфигурацию"
 
-#: source/libublsettingsui-gtk3.h:328
+#: source/libublsettingsui-gtk3.h:331
 msgid "Save to global configuration"
 msgstr "Сохранить в глобальную конфигурацию"
 
-#: source/libublsettingsui-gtk3.h:329
+#: source/libublsettingsui-gtk3.h:332
 msgid "Save configuration"
 msgstr "Сохранить конфигурацию"
 
-#: source/libublsettingsui-gtk3.h:330
+#: source/libublsettingsui-gtk3.h:333
 msgid "Save"
 msgstr "Сохранить"
 
-#: source/libublsettingsui-gtk3.h:331
+#: source/libublsettingsui-gtk3.h:334
 msgid "Saving..."
 msgstr "Сохранение..."
 
-#: source/libublsettingsui-gtk3.h:333
+#: source/libublsettingsui-gtk3.h:336
 msgid "Load from specific file"
 msgstr "Загрузить из файла"
 
-#: source/libublsettingsui-gtk3.h:334
+#: source/libublsettingsui-gtk3.h:337
 msgid "Load local configuration"
 msgstr "Загрузить локальную конфигурацию"
 
-#: source/libublsettingsui-gtk3.h:335
+#: source/libublsettingsui-gtk3.h:338
 msgid "Load global configuration"
 msgstr "Загрузить глобальную конфигурацию"
 
-#: source/libublsettingsui-gtk3.h:336
+#: source/libublsettingsui-gtk3.h:339
 msgid "Load"
 msgstr "Загрузить"
 
-#: source/libublsettingsui-gtk3.h:337
+#: source/libublsettingsui-gtk3.h:340
 msgid "Load file"
 msgstr "Загрузить файл"
 
-#: source/libublsettingsui-gtk3.h:339
+#: source/libublsettingsui-gtk3.h:342
 msgid "Cancel"
 msgstr "Отмена"
 
-#: source/libublsettingsui-gtk3.h:340
+#: source/libublsettingsui-gtk3.h:343
 msgid "Accept"
 msgstr "Принять"
 
-#: source/libublsettingsui-gtk3.h:341
+#: source/libublsettingsui-gtk3.h:344
 msgid "Open"
 msgstr "Открыть"
 
-#: source/libublsettingsui-gtk3.h:342
+#: source/libublsettingsui-gtk3.h:345
 msgid "Create directory"
 msgstr "Создать файл"
 
-#: source/libublsettingsui-gtk3.h:343
+#: source/libublsettingsui-gtk3.h:346
 msgid "Select directory"
 msgstr "Выбрать папку"
 
-#: source/libublsettingsui-gtk3.h:345
+#: source/libublsettingsui-gtk3.h:348
 msgid "Would you like to read documentation in the Web?"
 msgstr "Вы хотите прочитать справку в Сети?"
 
-#: source/libublsettingsui-gtk3.h:346
+#: source/libublsettingsui-gtk3.h:349
 msgid ""
 "You will be redirected to documentation website where documentation is\n"
 "translated and supported by community."
@@ -169,67 +173,67 @@ msgstr ""
 "Вы будете перенаправлены на сайт с документацией, где страницы помощи\n"
 "переводятся и поддерживаются сообществом."
 
-#: source/libublsettingsui-gtk3.h:347
+#: source/libublsettingsui-gtk3.h:350
 msgid "Always redirect to online documentation"
 msgstr "Всегда перенаправлять"
 
-#: source/libublsettingsui-gtk3.h:348
+#: source/libublsettingsui-gtk3.h:351
 msgid "Open documentation"
 msgstr "Прочитать справку"
 
-#: source/libublsettingsui-gtk3.h:349
+#: source/libublsettingsui-gtk3.h:352
 msgid "Project Home Page"
 msgstr "Домашняя страница проекта"
 
-#: source/libublsettingsui-gtk3.h:350
+#: source/libublsettingsui-gtk3.h:353
 msgid "Nothing were chosen"
 msgstr "Ничего не было выбрано"
 
-#: source/libublsettingsui-gtk3.h:351
+#: source/libublsettingsui-gtk3.h:354
 msgid "Copyright © 2022 - 2023, UBSoft LLC"
 msgstr "Copyright © 2022 - 2023, ООО «Юбисофт»"
 
-#: source/libublsettingsui-gtk3.h:354
+#: source/libublsettingsui-gtk3.h:357
 msgid "Global configuration loading succeeded."
 msgstr "Успешно загружена глобальная конфигурация"
 
-#: source/libublsettingsui-gtk3.h:355
+#: source/libublsettingsui-gtk3.h:358
 msgid "Local configuration loading succeeded."
 msgstr "Успешно загружена локальная конфигурация"
 
-#: source/libublsettingsui-gtk3.h:356
+#: source/libublsettingsui-gtk3.h:359
 msgid "Config loading failed"
 msgstr "Ошибка загрузки конфига"
 
-#: source/libublsettingsui-gtk3.h:358
+#: source/libublsettingsui-gtk3.h:361
 msgid "Local and global configuration saving succeeded."
 msgstr "Успешно записаны локальная и глобальная конфигурация"
 
-#: source/libublsettingsui-gtk3.h:359
+#: source/libublsettingsui-gtk3.h:362
 msgid "Global configuration saving succeeded."
 msgstr "Успешно записана глобальная конфигурация"
 
-#: source/libublsettingsui-gtk3.h:360
+#: source/libublsettingsui-gtk3.h:363
 msgid "Local configuration saving succeeded."
 msgstr "Успешно записана локальная конфигурация"
 
-#: source/libublsettingsui-gtk3.h:361
+#: source/libublsettingsui-gtk3.h:364
 msgid "Configuration saving succeeded."
 msgstr "Успешно записана конфигурация"
 
-#: source/libublsettingsui-gtk3.h:363
+#: source/libublsettingsui-gtk3.h:366
 msgid "Parameter"
 msgstr "Параметр"
 
-#: source/libublsettingsui-gtk3.h:364
+#: source/libublsettingsui-gtk3.h:367
 msgid "Old value"
 msgstr "Старое значение"
 
-#: source/libublsettingsui-gtk3.h:365
+#: source/libublsettingsui-gtk3.h:368
 msgid "New value"
 msgstr "Новое значение"
 
-#: source/libublsettingsui-gtk3.h:366
+#: source/libublsettingsui-gtk3.h:369
 msgid ""
 "Value\n"
 "(Old/New)"
@@ -237,78 +241,78 @@ msgstr ""
 "Значение\n"
 "(Старое/Новое)"
 
-#: source/libublsettingsui-gtk3.h:368
+#: source/libublsettingsui-gtk3.h:371
 msgid "Nothing to save"
 msgstr "Нечего сохранять"
 
-#: source/libublsettingsui-gtk3.h:369
+#: source/libublsettingsui-gtk3.h:372
 msgid "Saving into local configuration"
 msgstr "Сохранение в локальный конфигурационный файл"
 
-#: source/libublsettingsui-gtk3.h:370
+#: source/libublsettingsui-gtk3.h:373
 msgid "Saving into global configuration"
 msgstr "Сохранение в глобальный конфигурационный файл"
 
-#: source/libublsettingsui-gtk3.h:371
+#: source/libublsettingsui-gtk3.h:374
 msgid "Saving into global and local configuration"
 msgstr "Сохранение в глобальный и локальный конфигурационный файл"
 
-#: source/libublsettingsui-gtk3.h:372
+#: source/libublsettingsui-gtk3.h:375
 msgid "Saving into custom configuration at"
 msgstr "Сохранение в конфигурационный файл по пути"
 
-#: source/libublsettingsui-gtk3.h:377
+#: source/libublsettingsui-gtk3.h:380
 msgid "Full saving mode"
 msgstr "Полное сохранение"
 
-#: source/libublsettingsui-gtk3.h:378
+#: source/libublsettingsui-gtk3.h:381
 msgid "Saving into module"
 msgstr "Сохранение в модуль"
 
-#: source/libublsettingsui-gtk3.h:379
+#: source/libublsettingsui-gtk3.h:382
 msgid "Sandbox mode"
 msgstr "Полная песочница в ОЗУ"
 
-#: source/libublsettingsui-gtk3.h:380
+#: source/libublsettingsui-gtk3.h:383
 msgid "Sandbox with profile saving"
 msgstr "Песочница с сохранением профиля пользователя"
 
-#: source/libublsettingsui-gtk3.h:381
+#: source/libublsettingsui-gtk3.h:384
 msgid "HDD sandbox"
 msgstr "Полная песочница на HDD"
 
-#: source/libublsettingsui-gtk3.h:382
+#: source/libublsettingsui-gtk3.h:385
 msgid "HDD sandbox with profile saving"
 msgstr "Полная песочница на HDD с сохранением профиля пользователя"
 
-#: source/libublsettingsui-gtk3.h:383
+#: source/libublsettingsui-gtk3.h:386
 msgid "New configuration file creation failed"
 msgstr "Ошибка создания нового файла конфигурации"
 
-#: source/libublsettingsui-gtk3.h:384
+#: source/libublsettingsui-gtk3.h:387
 msgid "Upgrade to root"
 msgstr "Повысить права до root"
 
-#: source/libublsettingsui-gtk3.h:385
+#: source/libublsettingsui-gtk3.h:388
 msgid "Settings"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:387
+#: source/libublsettingsui-gtk3.h:390
 msgid "Application settigs"
 msgstr "Настройки"
 
-#: source/libublsettingsui-gtk3.h:389
+#: source/libublsettingsui-gtk3.h:392
 msgid "Invalid email adress"
 msgstr "Неверный email-адрес"
 
-#: source/libublsettingsui-gtk3.h:390
+#: source/libublsettingsui-gtk3.h:393
 msgid "Invalid path"
 msgstr "Неправильный путь"
 
-#: source/libublsettingsui-gtk3.h:392
+#: source/libublsettingsui-gtk3.h:395
 msgid "Choose path"
 msgstr "Выбор пути"
 
-#: source/libublsettingsui-gtk3.h:395
+#: source/libublsettingsui-gtk3.h:398
 msgid "Choose directory instead of file"
 msgstr "Выбрать папку вместо вайла"

source/libublsettingsui-gtk3.c

@@ -115,12 +115,13 @@ void on_about(GtkWidget *self, char *version_application){
     gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(window),template_app_information.app_title);
     gtk_about_dialog_set_logo_icon_name(GTK_ABOUT_DIALOG(window),yon_char_append("com.ublinux.",template_app_information.app_tech_name));
     gtk_window_set_icon_name(GTK_WINDOW(window),yon_char_append("com.ublinux.",template_app_information.app_tech_name));
-    gtk_window_set_title(GTK_WINDOW(window),about_label(template_app_information.app_title));
+    char *title_str = about_label(template_app_information.app_title);
     gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(window),template_app_information.app_tech_name);
     gtk_label_set_text(GTK_LABEL(title),template_app_information.app_title);
     g_signal_connect(G_OBJECT(window),"activate-link",G_CALLBACK(on_link),NULL);
     gtk_widget_set_visible(hideButtonBox,0);
     gtk_widget_destroy(hideButtonBox);
+    gtk_window_set_title(GTK_WINDOW(window),title_str);
     gtk_widget_show(window);
 }
 

source/libublsettingsui-gtk3.h

@@ -315,9 +315,10 @@ char *yon_custom_config_init();
     #define template_ui_LocalePath "/usr/share/locale" 
     #define template_ui_LocaleName "libublsettingsui-gtk3"
 
-    #define about_label(target) yon_char_unite(_("About")," ",target,NULL)
+    #define about_label(target) yon_char_unite(yon_char_get_localised_from_lib(_("About"))," ",target,NULL)
 
     #define SUCCESS_LABEL _("Operation succeeded")
+    #define FAIL_LABEL _("Operation failed")
     #define ROOT_WARNING_LABEL _("Warning! Application was launched without root - root-dependent actions are locked")
 
     #define DEFAULT_LABEL _("Default")