diff --git a/Makefile b/Makefile index a1c489d..9751fcd 100644 --- a/Makefile +++ b/Makefile @@ -78,6 +78,11 @@ build: depend prepare uninstall: @echo "Uninstall ..." + @for LANG in $$(find ./ -iname "*.po" -print | sed -En "s/.+_([[:alpha:]]+)\.po/\1/p" | sort -u); do \ +# PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \ + PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \ + $(RM) "$${PATH_FILE_MO}"; \ + done @for FILE_PO in $(wildcard *.po); do \ LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ diff --git a/icons/status/com.ublinux.libublsettingsui-gtk3.toggled-symbolic.svg b/icons/status/com.ublinux.libublsettingsui-gtk3.toggled-symbolic.svg new file mode 100644 index 0000000..96dc956 --- /dev/null +++ b/icons/status/com.ublinux.libublsettingsui-gtk3.toggled-symbolic.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + diff --git a/icons/status/com.ublinux.libublsettingsui-gtk3.untoggled-symbolic.svg b/icons/status/com.ublinux.libublsettingsui-gtk3.untoggled-symbolic.svg new file mode 100644 index 0000000..abc7ca7 --- /dev/null +++ b/icons/status/com.ublinux.libublsettingsui-gtk3.untoggled-symbolic.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + diff --git a/libublsettingsui-gtk3.pot b/libublsettingsui-gtk3.pot index c226b19..32e384a 100644 --- a/libublsettingsui-gtk3.pot +++ b/libublsettingsui-gtk3.pot @@ -388,3 +388,7 @@ msgstr "" #: source/libublsettingsui-gtk3.h:493 msgid "Access to file denied" msgstr "" + +#: source/libublsettingsui-gtk3.h:493 +msgid "The configuration file contains incorrect parameters." +msgstr "" \ No newline at end of file diff --git a/libublsettingsui-gtk3_ru.po b/libublsettingsui-gtk3_ru.po index 1767057..51807fd 100644 --- a/libublsettingsui-gtk3_ru.po +++ b/libublsettingsui-gtk3_ru.po @@ -394,4 +394,7 @@ msgstr "Выход" #: source/libublsettingsui-gtk3.h:493 msgid "Access to file denied" -msgstr "Отказано в доступе к файлу" \ No newline at end of file +msgstr "Отказано в доступе к файлу" + +msgid "The configuration file contains incorrect parameters." +msgstr "Файл конфигурации содержит некорректные параметры" \ No newline at end of file diff --git a/source/libublsettingsui-gtk3-save.c b/source/libublsettingsui-gtk3-save.c index 2a3b9b3..4e28174 100644 --- a/source/libublsettingsui-gtk3-save.c +++ b/source/libublsettingsui-gtk3-save.c @@ -384,8 +384,8 @@ void yon_save_window_compared_config_init_unfound(template_saving_window *window int yon_config_parameter_prepare_elements(config_str target, int *size){ int success = 0; for (int i=0;i<(*size);i++){ - char *start_bracket_replaced_string = yon_char_replace(target[i],"[","[\""); - char *end_bracket_replaced_string = yon_char_replace(start_bracket_replaced_string,"]","\"]"); + char *start_bracket_replaced_string = yon_char_replace(target[i],"[","[\'"); + char *end_bracket_replaced_string = yon_char_replace(start_bracket_replaced_string,"]","\']"); target[i] = end_bracket_replaced_string; } return success; @@ -487,32 +487,21 @@ void yon_loaded_config_set_sections_from_sections_dictionary(struct loaded_confi struct loaded_config *yon_config_get_compared(char *command){ if (command){ int size; - config_str config = yon_config_load(command,&size); + config_str config_p = yon_config_load(command,&size); config_str temporary = NULL; int temp_size=0; - if (config&&size>0){ + if (config_p&&size>0){ for (int i=0;ipw_uid,user->pw_gid); free(command_creation); if (access(file,0)!=F_OK){ yon_ubl_status_box_render(CUSTOM_CONFIG_CREATION_ERROR_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); @@ -557,9 +548,9 @@ char *yon_custom_config_init(GtkFileChooserAction type){ } /* - ============ - init section - ============ + =========================================================== + init section + =========================================================== */ void on_save_parameters(GtkWidget *self, template_saving_window *window){ diff --git a/source/libublsettingsui-gtk3.h b/source/libublsettingsui-gtk3.h index 9708ff7..ae64072 100644 --- a/source/libublsettingsui-gtk3.h +++ b/source/libublsettingsui-gtk3.h @@ -620,4 +620,5 @@ yon_password_window *yon_password_open(GtkEntry *target); #define _INCORRECT_HASH_LABEL yon_char_get_localised_from_lib("Invalid hash") #define _ENCRYPTION_DEFAULT_LABEL yon_char_get_localised_from_lib("Default (None)") #define ACCESS_DENIED_LABEL(target) yon_char_unite(yon_char_get_localised_from_lib("Access to file denied"),": ", target,NULL) + #define CONFIG_INVALID_LABEL yon_char_get_localised_from_lib("The configuration file contains incorrect parameters.") #endif \ No newline at end of file