New label and its localisation

pull/62/head
parent 022cc54b02
commit cc51f66b50

@ -716,6 +716,7 @@ void on_logrotate_save(GtkWidget *self, dictionary *dict){
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
return; return;
} }
GtkTreeIter *lastiter;
for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(window->list),&iter)){ for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(window->list),&iter)){
char *cur_path; char *cur_path;
gtk_tree_model_get(GTK_TREE_MODEL(window->list),&iter,0,&cur_path,-1); gtk_tree_model_get(GTK_TREE_MODEL(window->list),&iter,0,&cur_path,-1);
@ -724,10 +725,11 @@ void on_logrotate_save(GtkWidget *self, dictionary *dict){
} }
path_amount++; path_amount++;
paths = yon_char_unite(paths,strcmp(paths,"") ? "," : "", cur_path,NULL); paths = yon_char_unite(paths,strcmp(paths,"") ? "," : "", cur_path,NULL);
lastiter=gtk_tree_iter_copy(&iter);
} }
if(!window->paths) { if(!window->paths) {
if (matched==path_amount) { if (matched==path_amount) {
yon_ubl_status_highlight_incorrect(gtk_widget_get_parent(window->LogPathsTree)); yon_ubl_status_list_store_highlight_incorrect(window->list,lastiter);
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),REPEATED_PATHS_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),REPEATED_PATHS_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
return; return;
} }
@ -1797,7 +1799,7 @@ void on_log_save(GtkWidget *self, dictionary *dict){
} }
gtk_list_store_set(widgets->list,&iter,0,name,1,pathse,2,&desc ? desc : "",-1); gtk_list_store_set(widgets->list,&iter,0,name,1,pathse,2,&desc ? desc : "",-1);
} else { } else {
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),WRITE_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
yon_ubl_status_highlight_incorrect(window->NameEntry); yon_ubl_status_highlight_incorrect(window->NameEntry);
return; return;
} }

@ -178,6 +178,7 @@
#define REPEATED_PATHS_LABEL _("Same record already exists") #define REPEATED_PATHS_LABEL _("Same record already exists")
#define EMPTY_IMPORTANT_LABEL _("Empty important field") #define EMPTY_IMPORTANT_LABEL _("Empty important field")
#define REPEAT_PATHS_LABEL _("Repeating paths") #define REPEAT_PATHS_LABEL _("Repeating paths")
#define WRITE_IMPORTANT_LABEL _("Write down all important fields")
//ubl-settings-logging-logrotate-table.glade //ubl-settings-logging-logrotate-table.glade
#define SYSTEM_CONFIGURATION_LABEL _("System configuration") #define SYSTEM_CONFIGURATION_LABEL _("System configuration")

@ -92,6 +92,10 @@
<columns> <columns>
<!-- column-name gchararray1 --> <!-- column-name gchararray1 -->
<column type="gchararray"/> <column type="gchararray"/>
<!-- column-name gchararray2 -->
<column type="gchararray"/>
<!-- column-name gchararray3 -->
<column type="gchararray"/>
</columns> </columns>
</object> </object>
<object class="GtkWindow" id="MainWindow"> <object class="GtkWindow" id="MainWindow">
@ -327,6 +331,8 @@
<child> <child>
<object class="GtkCellRendererText" id="PathCell"/> <object class="GtkCellRendererText" id="PathCell"/>
<attributes> <attributes>
<attribute name="background">2</attribute>
<attribute name="foreground">1</attribute>
<attribute name="text">0</attribute> <attribute name="text">0</attribute>
</attributes> </attributes>
</child> </child>

@ -703,59 +703,63 @@ msgstr ""
msgid "Repeating paths" msgid "Repeating paths"
msgstr "" msgstr ""
#: source/ubl-strings.h:183 #: source/ubl-strings.h:181
msgid "System configuration" msgid "Write down all important fields"
msgstr "" msgstr ""
#: source/ubl-strings.h:184 #: source/ubl-strings.h:184
msgid "System configuration"
msgstr ""
#: source/ubl-strings.h:185
msgid "Applications configuration" msgid "Applications configuration"
msgstr "" msgstr ""
#: source/ubl-strings.h:187 #: source/ubl-strings.h:188
msgid "Path (-s):" msgid "Path (-s):"
msgstr "" msgstr ""
#: source/ubl-strings.h:188 #: source/ubl-strings.h:189
msgid "Control:" msgid "Control:"
msgstr "" msgstr ""
#: source/ubl-strings.h:189 #: source/ubl-strings.h:190
msgid "Log file" msgid "Log file"
msgstr "" msgstr ""
#: source/ubl-strings.h:190 #: source/ubl-strings.h:191
msgid "Name:" msgid "Name:"
msgstr "" msgstr ""
#: source/ubl-strings.h:193 #: source/ubl-strings.h:194
msgid "Owner rules" msgid "Owner rules"
msgstr "" msgstr ""
#: source/ubl-strings.h:194 #: source/ubl-strings.h:195
msgid "Group rules" msgid "Group rules"
msgstr "" msgstr ""
#: source/ubl-strings.h:195 #: source/ubl-strings.h:196
msgid "Public rules" msgid "Public rules"
msgstr "" msgstr ""
#: source/ubl-strings.h:196 #: source/ubl-strings.h:197
msgid "Read" msgid "Read"
msgstr "" msgstr ""
#: source/ubl-strings.h:197 #: source/ubl-strings.h:198
msgid "Write" msgid "Write"
msgstr "" msgstr ""
#: source/ubl-strings.h:198 #: source/ubl-strings.h:199
msgid "Execute" msgid "Execute"
msgstr "" msgstr ""
#: source/ubl-strings.h:199 #: source/ubl-strings.h:200
msgid "Value:" msgid "Value:"
msgstr "" msgstr ""
#: source/ubl-strings.h:202 #: source/ubl-strings.h:203
msgid ": no such file(s)" msgid ": no such file(s)"
msgstr "" msgstr ""

@ -717,59 +717,64 @@ msgstr "Важное поле не заполнено"
msgid "Repeating paths" msgid "Repeating paths"
msgstr "Повторяющиеся пути" msgstr "Повторяющиеся пути"
#: source/ubl-strings.h:183 #: source/ubl-strings.h:181
#, fuzzy
msgid "Write down all important fields"
msgstr "Введите все необходимые поля"
#: source/ubl-strings.h:184
msgid "System configuration" msgid "System configuration"
msgstr "Настройки системы" msgstr "Настройки системы"
#: source/ubl-strings.h:184 #: source/ubl-strings.h:185
msgid "Applications configuration" msgid "Applications configuration"
msgstr "Настройки приложений" msgstr "Настройки приложений"
#: source/ubl-strings.h:187 #: source/ubl-strings.h:188
msgid "Path (-s):" msgid "Path (-s):"
msgstr "Путь (-и):" msgstr "Путь (-и):"
#: source/ubl-strings.h:188 #: source/ubl-strings.h:189
msgid "Control:" msgid "Control:"
msgstr "Управление:" msgstr "Управление:"
#: source/ubl-strings.h:189 #: source/ubl-strings.h:190
msgid "Log file" msgid "Log file"
msgstr "Файл лога" msgstr "Файл лога"
#: source/ubl-strings.h:190 #: source/ubl-strings.h:191
msgid "Name:" msgid "Name:"
msgstr "Имя:" msgstr "Имя:"
#: source/ubl-strings.h:193 #: source/ubl-strings.h:194
msgid "Owner rules" msgid "Owner rules"
msgstr "Правила владельца" msgstr "Правила владельца"
#: source/ubl-strings.h:194 #: source/ubl-strings.h:195
msgid "Group rules" msgid "Group rules"
msgstr "Правила группы" msgstr "Правила группы"
#: source/ubl-strings.h:195 #: source/ubl-strings.h:196
msgid "Public rules" msgid "Public rules"
msgstr "Правила остальных" msgstr "Правила остальных"
#: source/ubl-strings.h:196 #: source/ubl-strings.h:197
msgid "Read" msgid "Read"
msgstr "Чтение" msgstr "Чтение"
#: source/ubl-strings.h:197 #: source/ubl-strings.h:198
msgid "Write" msgid "Write"
msgstr "Запись" msgstr "Запись"
#: source/ubl-strings.h:198 #: source/ubl-strings.h:199
msgid "Execute" msgid "Execute"
msgstr "Исполнение" msgstr "Исполнение"
#: source/ubl-strings.h:199 #: source/ubl-strings.h:200
msgid "Value:" msgid "Value:"
msgstr "Значение:" msgstr "Значение:"
#: source/ubl-strings.h:202 #: source/ubl-strings.h:203
msgid ": no such file(s)" msgid ": no such file(s)"
msgstr ": файл(ы) не найден(ы)" msgstr ": файл(ы) не найден(ы)"

Loading…
Cancel
Save