Style fixes; localisation fixes

pull/228/head
parent db32acf42c
commit b59ab8775c

@ -388,7 +388,7 @@ msgid "Restore missing or corrupted system files. Users data is not affected"
msgstr "" msgstr ""
#: source/ubl-strings.h:88 #: source/ubl-strings.h:88
msgid "User data restore" msgid "User data only"
msgstr "" msgstr ""
#: source/ubl-strings.h:89 #: source/ubl-strings.h:89
@ -482,12 +482,8 @@ msgstr ""
msgid "Section" msgid "Section"
msgstr "" msgstr ""
#: source/ubl-strings.h:119
msgid "Capacity"
msgstr ""
#: source/ubl-strings.h:120 #: source/ubl-strings.h:120
msgid "Free space" msgid "Free (%)"
msgstr "" msgstr ""
#: source/ubl-strings.h:121 #: source/ubl-strings.h:121

@ -401,7 +401,7 @@ msgid "Restore missing or corrupted system files. Users data is not affected"
msgstr "Восстановление отсутствующих или поврежденных системных файлов. Данные пользователей не затрагиваются" msgstr "Восстановление отсутствующих или поврежденных системных файлов. Данные пользователей не затрагиваются"
#: source/ubl-strings.h:88 #: source/ubl-strings.h:88
msgid "User data restore" msgid "User data only"
msgstr "Только пользовательские данные" msgstr "Только пользовательские данные"
#: source/ubl-strings.h:89 #: source/ubl-strings.h:89
@ -502,13 +502,10 @@ msgstr "Серийный номер"
msgid "Section" msgid "Section"
msgstr "Раздел" msgstr "Раздел"
#: source/ubl-strings.h:119
msgid "Capacity"
msgstr "Размер"
#: source/ubl-strings.h:120 #: source/ubl-strings.h:120
msgid "Free space" msgid "Free (%)"
msgstr "Свободно" msgstr "Свободно (%)"
#: source/ubl-strings.h:121 #: source/ubl-strings.h:121
msgid "File system" msgid "File system"

@ -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){ void yon_kernel_row_setup_tags(kernel_row *row, char *tags){
int size; int size;
config_str parsed = yon_char_parse(tags,&size,", "); config_str parsed = yon_char_parse(tags,&size,", ");
for (int i=0;i<size;i++){ if (!size) return;
for (int i=size-1;i>=0;i--){
char *passw = parsed[i][0]==' '?yon_char_divide(parsed[i],0):NULL; char *passw = parsed[i][0]==' '?yon_char_divide(parsed[i],0):NULL;
if (passw) free(passw); if (passw) free(passw);
char *tag_name = _(parsed[i]); char *tag_name = _(parsed[i]);

@ -82,7 +82,7 @@ NULL)
#define SEPARATE_INSTALL_LABEL _("Installing OS components and user data on different disk partitions") #define SEPARATE_INSTALL_LABEL _("Installing OS components and user data on different disk partitions")
#define OS_ONLY_HEAD_LABEL _("System restore") #define OS_ONLY_HEAD_LABEL _("System restore")
#define OS_ONLY_LABEL _("Restore missing or corrupted system files. Users data is not affected") #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 USER_DATA_LABEL _("Installing only user data without OS components")
#define KEYBOARD__LABEL _("Keyboard layout language") #define KEYBOARD__LABEL _("Keyboard layout language")
@ -113,7 +113,6 @@ NULL)
#define DESIGNATION_LABEL _("Designation") #define DESIGNATION_LABEL _("Designation")
#define SERIAL_LABEL _("Serial") #define SERIAL_LABEL _("Serial")
#define SECTION_LABEL _("Section") #define SECTION_LABEL _("Section")
#define CAPACITY_LABEL _("Capacity")
#define FREE_SPACE_LABEL _("Free space") #define FREE_SPACE_LABEL _("Free space")
#define FS_LABEL _("File system") #define FS_LABEL _("File system")
#define DEFAULTSWITCHING_LABEL _("Default (L_Alt + L_Shift)") #define DEFAULTSWITCHING_LABEL _("Default (L_Alt + L_Shift)")

@ -208,12 +208,13 @@
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="valign">center</property> <property name="valign">start</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="valign">start</property>
<property name="label" translatable="yes">Size:</property> <property name="label" translatable="yes">Size:</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>

@ -8352,7 +8352,7 @@ or continue working in the system Live environment.</property>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Free space</property> <property name="title" translatable="yes">Free (%)</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
@ -9093,7 +9093,7 @@ or continue working in the system Live environment.</property>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Free space</property> <property name="title" translatable="yes">Free (%)</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
@ -9849,7 +9849,7 @@ separately into the selected partition.</property>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Free space</property> <property name="title" translatable="yes">Free (%)</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
@ -10876,7 +10876,7 @@ separately into the selected partition.</property>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">User data restore</property> <property name="label" translatable="yes">User data only</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
@ -11315,7 +11315,7 @@ separately into the selected partition.</property>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Free space</property> <property name="title" translatable="yes">Free (%)</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
@ -11761,7 +11761,7 @@ separately into the selected partition.</property>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Free space</property> <property name="title" translatable="yes">Free (%)</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
@ -12200,7 +12200,7 @@ separately into the selected partition.</property>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Free space</property> <property name="title" translatable="yes">Free (%)</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
@ -13041,7 +13041,7 @@ separately into the selected partition.</property>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Free space</property> <property name="title" translatable="yes">Free (%)</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>

Loading…
Cancel
Save