diff --git a/libublsettingsui-gtk3.glade b/libublsettingsui-gtk3.glade index 2e204d8..9285bbb 100644 --- a/libublsettingsui-gtk3.glade +++ b/libublsettingsui-gtk3.glade @@ -231,7 +231,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 440 False 1024 - 720 com.ublinux.libublsettingsui-gtk3 diff --git a/libublsettingsui-gtk3.pot b/libublsettingsui-gtk3.pot index 9bad71f..b59e95f 100644 --- a/libublsettingsui-gtk3.pot +++ b/libublsettingsui-gtk3.pot @@ -17,248 +17,260 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: source/libublsettingsui-gtk3.h:34 +#: source/libublsettingsui-gtk3.h:253 msgid "Version:" msgstr "" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid " version:" msgstr "" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Usage:" msgstr "" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "[OPTIONS]" msgstr "" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Options:" msgstr "" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Show this help" msgstr "" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Show package version" msgstr "" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Lock this help menu" msgstr "" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Lock configuration saving" msgstr "" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Lock local configration saving" msgstr "" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Lock global configration saving" msgstr "" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Lock global configration loading" msgstr "" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Reset application settings" msgstr "" -#: source/libublsettingsui-gtk3.h:40 +#: source/libublsettingsui-gtk3.h:259 msgid "Operation succeeded" msgstr "" -#: source/libublsettingsui-gtk3.h:41 +#: source/libublsettingsui-gtk3.h:260 msgid "" "Warning! Application was launched without root - root-dependent actions are " "locked" msgstr "" -#: source/libublsettingsui-gtk3.h:43 +#: source/libublsettingsui-gtk3.h:262 +msgid "Default" +msgstr "" + +#: source/libublsettingsui-gtk3.h:263 msgid "About" msgstr "" -#: source/libublsettingsui-gtk3.h:44 +#: source/libublsettingsui-gtk3.h:264 msgid "Documentation" msgstr "" -#: source/libublsettingsui-gtk3.h:46 +#: source/libublsettingsui-gtk3.h:266 msgid "Save to specific file" msgstr "" -#: source/libublsettingsui-gtk3.h:47 +#: source/libublsettingsui-gtk3.h:267 msgid "Save to local configuration" msgstr "" -#: source/libublsettingsui-gtk3.h:48 +#: source/libublsettingsui-gtk3.h:268 msgid "Save to global configuration" msgstr "" -#: source/libublsettingsui-gtk3.h:49 +#: source/libublsettingsui-gtk3.h:269 msgid "Save configuration" msgstr "" -#: source/libublsettingsui-gtk3.h:50 +#: source/libublsettingsui-gtk3.h:270 msgid "Save" msgstr "" -#: source/libublsettingsui-gtk3.h:51 +#: source/libublsettingsui-gtk3.h:271 msgid "Saving..." msgstr "" -#: source/libublsettingsui-gtk3.h:53 +#: source/libublsettingsui-gtk3.h:273 msgid "Load from specific file" msgstr "" -#: source/libublsettingsui-gtk3.h:54 +#: source/libublsettingsui-gtk3.h:274 msgid "Load local configuration" msgstr "" -#: source/libublsettingsui-gtk3.h:55 +#: source/libublsettingsui-gtk3.h:275 msgid "Load global configuration" msgstr "" -#: source/libublsettingsui-gtk3.h:56 +#: source/libublsettingsui-gtk3.h:276 msgid "Load" msgstr "" -#: source/libublsettingsui-gtk3.h:58 +#: source/libublsettingsui-gtk3.h:278 msgid "Cancel" msgstr "" -#: source/libublsettingsui-gtk3.h:59 +#: source/libublsettingsui-gtk3.h:279 msgid "Accept" msgstr "" -#: source/libublsettingsui-gtk3.h:60 +#: source/libublsettingsui-gtk3.h:280 msgid "Open" msgstr "" -#: source/libublsettingsui-gtk3.h:62 +#: source/libublsettingsui-gtk3.h:282 msgid "Would you like to read documentation in the Web?" msgstr "" -#: source/libublsettingsui-gtk3.h:63 +#: source/libublsettingsui-gtk3.h:283 msgid "" "You will be redirected to documentation website where documentation is\n" "translated and supported by community." msgstr "" -#: source/libublsettingsui-gtk3.h:64 +#: source/libublsettingsui-gtk3.h:284 msgid "Always redirect to online documentation" msgstr "" -#: source/libublsettingsui-gtk3.h:65 +#: source/libublsettingsui-gtk3.h:285 msgid "Open documentation" msgstr "" -#: source/libublsettingsui-gtk3.h:66 +#: source/libublsettingsui-gtk3.h:286 msgid "Project Home Page" msgstr "" -#: source/libublsettingsui-gtk3.h:67 +#: source/libublsettingsui-gtk3.h:287 msgid "Nothing were chosen" msgstr "" -#: source/libublsettingsui-gtk3.h:68 +#: source/libublsettingsui-gtk3.h:288 msgid "Copyright © 2022 - 2023, UBSoft LLC" msgstr "" -#: source/libublsettingsui-gtk3.h:71 +#: source/libublsettingsui-gtk3.h:291 msgid "Global configuration loading succeeded." msgstr "" -#: source/libublsettingsui-gtk3.h:72 +#: source/libublsettingsui-gtk3.h:292 msgid "Local configuration loading succeeded." msgstr "" -#: source/libublsettingsui-gtk3.h:73 +#: source/libublsettingsui-gtk3.h:293 msgid "Config loading failed" msgstr "" -#: source/libublsettingsui-gtk3.h:75 +#: source/libublsettingsui-gtk3.h:295 msgid "Local and global configuration saving succeeded." msgstr "" -#: source/libublsettingsui-gtk3.h:76 +#: source/libublsettingsui-gtk3.h:296 msgid "Global configuration saving succeeded." msgstr "" -#: source/libublsettingsui-gtk3.h:77 +#: source/libublsettingsui-gtk3.h:297 msgid "Local configuration saving succeeded." msgstr "" -#: source/libublsettingsui-gtk3.h:79 +#: source/libublsettingsui-gtk3.h:298 +msgid "Configuration saving succeeded." +msgstr "" + +#: source/libublsettingsui-gtk3.h:300 msgid "Parameter" msgstr "" -#: source/libublsettingsui-gtk3.h:80 +#: source/libublsettingsui-gtk3.h:301 msgid "Old value" msgstr "" -#: source/libublsettingsui-gtk3.h:81 +#: source/libublsettingsui-gtk3.h:302 msgid "New value" msgstr "" -#: source/libublsettingsui-gtk3.h:82 +#: source/libublsettingsui-gtk3.h:303 msgid "" "Value\n" "(Old/New)" msgstr "" -#: source/libublsettingsui-gtk3.h:84 +#: source/libublsettingsui-gtk3.h:305 msgid "Nothing to save" msgstr "" -#: source/libublsettingsui-gtk3.h:85 +#: source/libublsettingsui-gtk3.h:306 msgid "Saving into local configuration" msgstr "" -#: source/libublsettingsui-gtk3.h:86 +#: source/libublsettingsui-gtk3.h:307 msgid "Saving into global configuration" msgstr "" -#: source/libublsettingsui-gtk3.h:87 +#: source/libublsettingsui-gtk3.h:308 msgid "Saving into global and local configuration" msgstr "" -#: source/libublsettingsui-gtk3.h:88 +#: source/libublsettingsui-gtk3.h:309 msgid "Saving into custom configuration at" msgstr "" -#: source/libublsettingsui-gtk3.h:93 +#: source/libublsettingsui-gtk3.h:314 msgid "Full saving mode" msgstr "" -#: source/libublsettingsui-gtk3.h:94 +#: source/libublsettingsui-gtk3.h:315 msgid "Saving into module" msgstr "" -#: source/libublsettingsui-gtk3.h:95 +#: source/libublsettingsui-gtk3.h:316 msgid "Sandbox mode" msgstr "" -#: source/libublsettingsui-gtk3.h:96 +#: source/libublsettingsui-gtk3.h:317 msgid "Sandbox with profile saving" msgstr "" -#: source/libublsettingsui-gtk3.h:97 +#: source/libublsettingsui-gtk3.h:318 msgid "HDD sandbox" msgstr "" -#: source/libublsettingsui-gtk3.h:98 +#: source/libublsettingsui-gtk3.h:319 msgid "HDD sandbox with profile saving" msgstr "" -#: source/libublsettingsui-gtk3.h:99 +#: source/libublsettingsui-gtk3.h:320 msgid "New configuration file creation failed" msgstr "" -#: source/libublsettingsui-gtk3.h:100 +#: source/libublsettingsui-gtk3.h:321 msgid "Upgrade to root" msgstr "" + +#: source/libublsettingsui-gtk3.h:322 +msgid "Settings" +msgstr "" diff --git a/libublsettingsui-gtk3_ru.po b/libublsettingsui-gtk3_ru.po index 59ce55b..3ee7d2e 100644 --- a/libublsettingsui-gtk3_ru.po +++ b/libublsettingsui-gtk3_ru.po @@ -17,63 +17,63 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: source/libublsettingsui-gtk3.h:34 +#: source/libublsettingsui-gtk3.h:253 msgid "Version:" msgstr "Версия:" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid " version:" msgstr " версия:" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Usage:" msgstr "Использование:" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "[OPTIONS]" msgstr "[АРГУМЕНТЫ]" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Options:" msgstr "Аргументы:" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Show this help" msgstr "Показать эту подсказку" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Show package version" msgstr "Показать версию пакета" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Lock this help menu" msgstr "Заблокировать это меню помощи" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Lock configuration saving" msgstr "Успешно записана локальная конфигурация" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Lock local configration saving" msgstr "Заблокировать сохранение локальной конфигурации" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Lock global configration saving" msgstr "Заблокировать сохранение глобальной конфигурации" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Lock global configration loading" msgstr "Заблокировать загрузку глобальную конфигурацию" -#: source/libublsettingsui-gtk3.h:35 +#: source/libublsettingsui-gtk3.h:254 msgid "Reset application settings" msgstr "Сбросить настройки программы" -#: source/libublsettingsui-gtk3.h:40 +#: source/libublsettingsui-gtk3.h:259 msgid "Operation succeeded" msgstr "Операция завершена" -#: source/libublsettingsui-gtk3.h:41 +#: source/libublsettingsui-gtk3.h:260 msgid "" "Warning! Application was launched without root - root-dependent actions are " "locked" @@ -81,71 +81,75 @@ msgstr "" "Внимание! Приложение было запущено без прав суперпользователя - действия, " "требующие их наличия заблокированы" -#: source/libublsettingsui-gtk3.h:43 +#: source/libublsettingsui-gtk3.h:262 +msgid "Default" +msgstr "По умолчанию" + +#: source/libublsettingsui-gtk3.h:263 msgid "About" msgstr "О программе" -#: source/libublsettingsui-gtk3.h:44 +#: source/libublsettingsui-gtk3.h:264 msgid "Documentation" msgstr "Справка" -#: source/libublsettingsui-gtk3.h:46 +#: source/libublsettingsui-gtk3.h:266 msgid "Save to specific file" msgstr "Сохранить в файл" -#: source/libublsettingsui-gtk3.h:47 +#: source/libublsettingsui-gtk3.h:267 msgid "Save to local configuration" msgstr "Сохранить в локальную конфигурацию" -#: source/libublsettingsui-gtk3.h:48 +#: source/libublsettingsui-gtk3.h:268 msgid "Save to global configuration" msgstr "Сохранить в глобальную конфигурацию" -#: source/libublsettingsui-gtk3.h:49 +#: source/libublsettingsui-gtk3.h:269 msgid "Save configuration" msgstr "Сохранить конфигурацию" -#: source/libublsettingsui-gtk3.h:50 +#: source/libublsettingsui-gtk3.h:270 msgid "Save" msgstr "Сохранить" -#: source/libublsettingsui-gtk3.h:51 +#: source/libublsettingsui-gtk3.h:271 msgid "Saving..." msgstr "Сохранение..." -#: source/libublsettingsui-gtk3.h:53 +#: source/libublsettingsui-gtk3.h:273 msgid "Load from specific file" msgstr "Загрузить из файла" -#: source/libublsettingsui-gtk3.h:54 +#: source/libublsettingsui-gtk3.h:274 msgid "Load local configuration" msgstr "Загрузить локальную конфигурацию" -#: source/libublsettingsui-gtk3.h:55 +#: source/libublsettingsui-gtk3.h:275 msgid "Load global configuration" msgstr "Загрузить глобальную конфигурацию" -#: source/libublsettingsui-gtk3.h:56 +#: source/libublsettingsui-gtk3.h:276 msgid "Load" msgstr "Загрузить" -#: source/libublsettingsui-gtk3.h:58 +#: source/libublsettingsui-gtk3.h:278 msgid "Cancel" msgstr "Отмена" -#: source/libublsettingsui-gtk3.h:59 +#: source/libublsettingsui-gtk3.h:279 msgid "Accept" msgstr "Принять" -#: source/libublsettingsui-gtk3.h:60 +#: source/libublsettingsui-gtk3.h:280 msgid "Open" msgstr "Открыть" -#: source/libublsettingsui-gtk3.h:62 +#: source/libublsettingsui-gtk3.h:282 msgid "Would you like to read documentation in the Web?" msgstr "Вы хотите прочитать справку в Сети?" -#: source/libublsettingsui-gtk3.h:63 +#: source/libublsettingsui-gtk3.h:283 msgid "" "You will be redirected to documentation website where documentation is\n" "translated and supported by community." @@ -153,63 +157,67 @@ msgstr "" "Вы будете перенаправлены на сайт с документацией, где страницы помощи\n" "переводятся и поддерживаются сообществом." -#: source/libublsettingsui-gtk3.h:64 +#: source/libublsettingsui-gtk3.h:284 msgid "Always redirect to online documentation" msgstr "Всегда перенаправлять" -#: source/libublsettingsui-gtk3.h:65 +#: source/libublsettingsui-gtk3.h:285 msgid "Open documentation" msgstr "Прочитать справку" -#: source/libublsettingsui-gtk3.h:66 +#: source/libublsettingsui-gtk3.h:286 msgid "Project Home Page" msgstr "Домашняя страница проекта" -#: source/libublsettingsui-gtk3.h:67 +#: source/libublsettingsui-gtk3.h:287 msgid "Nothing were chosen" msgstr "Ничего не было выбрано" -#: source/libublsettingsui-gtk3.h:68 +#: source/libublsettingsui-gtk3.h:288 msgid "Copyright © 2022 - 2023, UBSoft LLC" msgstr "Copyright © 2022 - 2023, ООО «Юбисофт»" -#: source/libublsettingsui-gtk3.h:71 +#: source/libublsettingsui-gtk3.h:291 msgid "Global configuration loading succeeded." msgstr "Успешно загружена глобальная конфигурация" -#: source/libublsettingsui-gtk3.h:72 +#: source/libublsettingsui-gtk3.h:292 msgid "Local configuration loading succeeded." msgstr "Успешно загружена локальная конфигурация" -#: source/libublsettingsui-gtk3.h:73 +#: source/libublsettingsui-gtk3.h:293 msgid "Config loading failed" msgstr "Ошибка загрузки конфига" -#: source/libublsettingsui-gtk3.h:75 +#: source/libublsettingsui-gtk3.h:295 msgid "Local and global configuration saving succeeded." msgstr "Успешно записаны локальная и глобальная конфигурация" -#: source/libublsettingsui-gtk3.h:76 +#: source/libublsettingsui-gtk3.h:296 msgid "Global configuration saving succeeded." msgstr "Успешно записана глобальная конфигурация" -#: source/libublsettingsui-gtk3.h:77 +#: source/libublsettingsui-gtk3.h:297 msgid "Local configuration saving succeeded." msgstr "Успешно записана локальная конфигурация" -#: source/libublsettingsui-gtk3.h:79 +#: source/libublsettingsui-gtk3.h:298 +msgid "Configuration saving succeeded." +msgstr "Успешно записана конфигурация" + +#: source/libublsettingsui-gtk3.h:300 msgid "Parameter" msgstr "Параметр" -#: source/libublsettingsui-gtk3.h:80 +#: source/libublsettingsui-gtk3.h:301 msgid "Old value" msgstr "Старое значение" -#: source/libublsettingsui-gtk3.h:81 +#: source/libublsettingsui-gtk3.h:302 msgid "New value" msgstr "Новое значение" -#: source/libublsettingsui-gtk3.h:82 +#: source/libublsettingsui-gtk3.h:303 msgid "" "Value\n" "(Old/New)" @@ -217,54 +225,58 @@ msgstr "" "Значение\n" "(Старое/Новое)" -#: source/libublsettingsui-gtk3.h:84 +#: source/libublsettingsui-gtk3.h:305 msgid "Nothing to save" msgstr "Нечего сохранять" -#: source/libublsettingsui-gtk3.h:85 +#: source/libublsettingsui-gtk3.h:306 msgid "Saving into local configuration" msgstr "Сохранение в локальный конфигурационный файл" -#: source/libublsettingsui-gtk3.h:86 +#: source/libublsettingsui-gtk3.h:307 msgid "Saving into global configuration" msgstr "Сохранение в глобальный конфигурационный файл" -#: source/libublsettingsui-gtk3.h:87 +#: source/libublsettingsui-gtk3.h:308 msgid "Saving into global and local configuration" msgstr "Сохранение в глобальный и локальный конфигурационный файл" -#: source/libublsettingsui-gtk3.h:88 +#: source/libublsettingsui-gtk3.h:309 msgid "Saving into custom configuration at" msgstr "Сохранение в конфигурационный файл по пути" -#: source/libublsettingsui-gtk3.h:93 +#: source/libublsettingsui-gtk3.h:314 msgid "Full saving mode" msgstr "Полное сохранение" -#: source/libublsettingsui-gtk3.h:94 +#: source/libublsettingsui-gtk3.h:315 msgid "Saving into module" msgstr "Сохранение в модуль" -#: source/libublsettingsui-gtk3.h:95 +#: source/libublsettingsui-gtk3.h:316 msgid "Sandbox mode" msgstr "Полная песочница в ОЗУ" -#: source/libublsettingsui-gtk3.h:96 +#: source/libublsettingsui-gtk3.h:317 msgid "Sandbox with profile saving" msgstr "Песочница с сохранением профиля пользователя" -#: source/libublsettingsui-gtk3.h:97 +#: source/libublsettingsui-gtk3.h:318 msgid "HDD sandbox" msgstr "Полная песочница на HDD" -#: source/libublsettingsui-gtk3.h:98 +#: source/libublsettingsui-gtk3.h:319 msgid "HDD sandbox with profile saving" msgstr "Полная песочница на HDD с сохранением профиля пользователя" -#: source/libublsettingsui-gtk3.h:99 +#: source/libublsettingsui-gtk3.h:320 msgid "New configuration file creation failed" msgstr "Ошибка создания нового файла конфигурации" -#: source/libublsettingsui-gtk3.h:100 +#: source/libublsettingsui-gtk3.h:321 msgid "Upgrade to root" msgstr "Повысить права до root" + +#: source/libublsettingsui-gtk3.h:322 +msgid "Settings" +msgstr "" diff --git a/source/libublsettingsui-gtk3-save.c b/source/libublsettingsui-gtk3-save.c index ea4e035..bc396f3 100644 --- a/source/libublsettingsui-gtk3-save.c +++ b/source/libublsettingsui-gtk3-save.c @@ -557,4 +557,14 @@ template_saving_window *yon_saving_window_new(){ g_signal_connect(G_OBJECT(window->SaveButton),"clicked", G_CALLBACK(on_save_parameters),window); g_signal_connect(G_OBJECT(window->ToggleCell),"toggled", G_CALLBACK(on_save_window_parameter_switched),window); return window; +} +#define default_config_command(target, data) yon_char_unite("ubconfig --source default --raw get ",target," ",data,NULL) +char *yon_get_default_label_with_parameter(char *section, char *parameter){ + int size; + config_str parsed = yon_config_load(default_config_command(section,parameter),&size); + if (parsed){ + yon_char_remove_last_symbol(parsed[0],'\n'); + char *default_string = yon_char_unite(DEFAULT_LABEL," ","(",parsed[0],")",NULL); + return default_string; + } } \ No newline at end of file diff --git a/source/libublsettingsui-gtk3.h b/source/libublsettingsui-gtk3.h index 65acbd2..cc6c15d 100644 --- a/source/libublsettingsui-gtk3.h +++ b/source/libublsettingsui-gtk3.h @@ -245,6 +245,8 @@ void yon_save_window_set_postsave_function(void *function, void *data); void yon_save_window_set_postsave_failure_function(void *function, void *data); +char *yon_get_default_label_with_parameter(char *section, char *parameter); + template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...); @@ -257,6 +259,7 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...); #define SUCCESS_LABEL _("Operation succeeded") #define ROOT_WARNING_LABEL _("Warning! Application was launched without root - root-dependent actions are locked") + #define DEFAULT_LABEL _("Default") #define ABOUT_LABEL _("About") #define DOCUMENTATION_LABEL _("Documentation") @@ -292,6 +295,7 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...); #define GLOBAL_LOCAL_SAVE_SUCCESS_LABEL _("Local and global configuration saving succeeded.") #define GLOBAL_SAVE_SUCCESS_LABEL _("Global configuration saving succeeded.") #define LOCAL_SAVE_SUCCESS_LABEL _("Local configuration saving succeeded.") + #define SAVE_SUCCESS_LABEL _("Configuration saving succeeded.") #define PARAMETER_LABEL _("Parameter") #define OLD_VALUE_LABEL _("Old value")