diff --git a/locale/ubinstall-gtk.pot b/locale/ubinstall-gtk.pot index 2ead469..7c1778a 100644 --- a/locale/ubinstall-gtk.pot +++ b/locale/ubinstall-gtk.pot @@ -388,7 +388,7 @@ msgid "Restore missing or corrupted system files. Users data is not affected" msgstr "" #: source/ubl-strings.h:88 -msgid "User data restore" +msgid "User data only" msgstr "" #: source/ubl-strings.h:89 @@ -482,12 +482,8 @@ msgstr "" msgid "Section" msgstr "" -#: source/ubl-strings.h:119 -msgid "Capacity" -msgstr "" - #: source/ubl-strings.h:120 -msgid "Free space" +msgid "Free (%)" msgstr "" #: source/ubl-strings.h:121 diff --git a/locale/ubinstall-gtk_ru.po b/locale/ubinstall-gtk_ru.po index 5e1fee9..202c5a0 100644 --- a/locale/ubinstall-gtk_ru.po +++ b/locale/ubinstall-gtk_ru.po @@ -401,7 +401,7 @@ msgid "Restore missing or corrupted system files. Users data is not affected" msgstr "Восстановление отсутствующих или поврежденных системных файлов. Данные пользователей не затрагиваются" #: source/ubl-strings.h:88 -msgid "User data restore" +msgid "User data only" msgstr "Только пользовательские данные" #: source/ubl-strings.h:89 @@ -502,13 +502,10 @@ msgstr "Серийный номер" msgid "Section" msgstr "Раздел" -#: source/ubl-strings.h:119 -msgid "Capacity" -msgstr "Размер" #: source/ubl-strings.h:120 -msgid "Free space" -msgstr "Свободно" +msgid "Free (%)" +msgstr "Свободно (%)" #: source/ubl-strings.h:121 msgid "File system" diff --git a/source/ubinstall-gtk-kernel.c b/source/ubinstall-gtk-kernel.c index a5ac137..8b7a3c2 100644 --- a/source/ubinstall-gtk-kernel.c +++ b/source/ubinstall-gtk-kernel.c @@ -68,7 +68,8 @@ int yon_tag_add(GtkBox *target,char *tag_label, char *tag_style, char *icon_name void yon_kernel_row_setup_tags(kernel_row *row, char *tags){ int size; config_str parsed = yon_char_parse(tags,&size,", "); - for (int i=0;i=0;i--){ char *passw = parsed[i][0]==' '?yon_char_divide(parsed[i],0):NULL; if (passw) free(passw); char *tag_name = _(parsed[i]); diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 7a91c44..64c2b99 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -82,7 +82,7 @@ NULL) #define SEPARATE_INSTALL_LABEL _("Installing OS components and user data on different disk partitions") #define OS_ONLY_HEAD_LABEL _("System restore") #define OS_ONLY_LABEL _("Restore missing or corrupted system files. Users data is not affected") -#define USER_DATA_HEAD_LABEL _("User data restore") +#define USER_DATA_HEAD_LABEL _("User data only") #define USER_DATA_LABEL _("Installing only user data without OS components") #define KEYBOARD__LABEL _("Keyboard layout language") @@ -113,7 +113,6 @@ NULL) #define DESIGNATION_LABEL _("Designation") #define SERIAL_LABEL _("Serial") #define SECTION_LABEL _("Section") -#define CAPACITY_LABEL _("Capacity") #define FREE_SPACE_LABEL _("Free space") #define FS_LABEL _("File system") #define DEFAULTSWITCHING_LABEL _("Default (L_Alt + L_Shift)") diff --git a/ubinstall-gtk-os-row.glade b/ubinstall-gtk-os-row.glade index 87ca83a..9590bb8 100644 --- a/ubinstall-gtk-os-row.glade +++ b/ubinstall-gtk-os-row.glade @@ -208,12 +208,13 @@ True False - center + start 5 True False + start Size: 0 diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index d7ff9c1..391d423 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -8352,7 +8352,7 @@ or continue working in the system Live environment. - Free space + Free (%) @@ -9093,7 +9093,7 @@ or continue working in the system Live environment. - Free space + Free (%) @@ -9849,7 +9849,7 @@ separately into the selected partition. - Free space + Free (%) @@ -10876,7 +10876,7 @@ separately into the selected partition. True False - User data restore + User data only 0 @@ -11315,7 +11315,7 @@ separately into the selected partition. - Free space + Free (%) @@ -11761,7 +11761,7 @@ separately into the selected partition. - Free space + Free (%) @@ -12200,7 +12200,7 @@ separately into the selected partition. - Free space + Free (%) @@ -13041,7 +13041,7 @@ separately into the selected partition. - Free space + Free (%)