Applications
/
ubinstall-gtk
8
0
Fork 1
Code Issues 11 Pull Requests 1 Packages Projects Releases Wiki Activity

Localisation fixes

Browse Source
pull/196/head
Ivan Dmitrievich Yartsev 4 months ago
parent 15b49786c5
commit 424671607c
6 changed files with 38 additions and 47 deletions
Show Stats Download Patch File Download Diff File

12
locale/ubinstall-gtk.pot
Unescape View File

@ -1547,13 +1547,13 @@ msgstr ""
#: source/ubl-strings.h:451
msgid ""
"- UBLinux Desktop Enterprise for workstations (PCs, laptops, thin clients, "
"- Desktop Enterprise for workstations (PCs, laptops, thin clients, "
"dashboards, including interactive touchscreens and Multi-touch, industrial "
"computers, hardware and software complex),\n"
"- UBLinux Server for server hardware and storage systems,\n"
"- UBLinux Network for network equipment,\n"
"- UBLinux Education for educational institutions,\n"
"- UBLinux Desktop Basic for personal (home) use"
"- Server for server hardware and storage systems,\n"
"- Network for network equipment,\n"
"- Education for educational institutions,\n"
"- Desktop Basic for personal (home) use"
msgstr ""
#: source/ubl-strings.h:457
@ -1747,7 +1747,7 @@ msgid ""
msgstr ""
#: source/ubl-strings.h:527
msgid "UBLinux Server virtualization tools"
msgid "Server virtualization tools"
msgstr ""
#: source/ubl-strings.h:528

42
locale/ubinstall-gtk_ru.po
Unescape View File

@ -19,11 +19,7 @@ msgstr ""
#: source/ubl-strings.h:1
msgid "System installation"
msgstr "Программа установки UBLinux"
#: source/ubl-strings.h:3
msgid "Welcome to system installation"
msgstr "Добро пожаловать в установку UBLinux"
msgstr "Программа установки"
#: source/ubl-strings.h:4
msgid ""
@ -257,7 +253,7 @@ msgstr "Свободно"
#: source/ubl-strings.h:64
msgid "Specify the size of the new partition for system:"
msgstr "Укажите размер нового раздела для ОС UBLinux:"
msgstr "Укажите размер нового раздела для ОС:"
#: source/ubl-strings.h:65
msgid "Tb"
@ -308,7 +304,7 @@ msgid ""
"separately into the selected partition."
msgstr ""
"<b>Внимание!</b> В выбранный раздел будет произведена раздельная установка "
"выбранных компонентов ОС UBLinux."
"выбранных компонентов ОС."
#: source/ubl-strings.h:79
msgid "GRUB install"
@ -1525,11 +1521,6 @@ msgstr "Выбор дополнительных компонентов"
msgid "Wait for the system to finish loading"
msgstr "Дождитесь завершения загрузки системы"
#: source/ubl-strings.h:426
#, fuzzy
msgid "Selecting software from the installation media"
msgstr "Добро пожаловать в установку UBLinux"
#: source/ubl-strings.h:427
msgid "Modules and packages"
msgstr "Модули и пакеты"
@ -1614,13 +1605,13 @@ msgstr "Редакции системы"
#: source/ubl-strings.h:451
msgid ""
"- UBLinux Desktop Enterprise for workstations (PCs, laptops, thin clients, "
"- Desktop Enterprise for workstations (PCs, laptops, thin clients, "
"dashboards, including interactive touchscreens and Multi-touch, industrial "
"computers, hardware and software complex),\n"
"- UBLinux Server for server hardware and storage systems,\n"
"- UBLinux Network for network equipment,\n"
"- UBLinux Education for educational institutions,\n"
"- UBLinux Desktop Basic for personal (home) use"
"- Server for server hardware and storage systems,\n"
"- Network for network equipment,\n"
"- Education for educational institutions,\n"
"- Desktop Basic for personal (home) use"
msgstr ""
"редакция \"Desktop Enterprise\" для рабочих мест (ПК, ноутбуки, тонкие "
"клиенты, информационные панели, в т.ч. интерактивные с сенсорным экраном и "
@ -1895,8 +1886,8 @@ msgstr ""
"станций и серверов, управлению парком вычислительной техники."
#: source/ubl-strings.h:527
msgid "UBLinux Server virtualization tools"
msgstr "Инструменты виртуализации серверов UBLinux"
msgid "Server virtualization tools"
msgstr "Инструменты виртуализации серверов"
#: source/ubl-strings.h:528
msgid ""
@ -1955,16 +1946,3 @@ msgid ""
msgstr ""
"Позволяет загрузку системы для бездисковых и обычных рабочих станций через "
"локальную сеть или Интернет (даже используя \"слабые\" каналы связи)"
#~ msgid ""
#~ "<b>Attention!</b> The selected partition will be modified: the size will "
#~ "be reduced. In the resulting free space, a partition will be created into "
#~ "which the system will be\n"
#~ "installed."
#~ msgstr ""
#~ "<b>Внимание!</b> Выбранный раздел будет модифицирован: размер будет "
#~ "уменьшен. В полученном свободном пространстве будет создан раздел, в "
#~ "который будет произведена установка ОС."
#~ msgid "Region"
#~ msgstr "Регион"

12
source/ubinstall-gtk.c
Unescape View File

@ -343,7 +343,16 @@ void config_init(){
main_config.slides = NULL;
main_config.chosen_slide = NULL;
main_config.os_name = NULL;
{
int size;
config_str ret = yon_config_load(os_name_get_command,&size);
if (size){
yon_char_remove_last_symbol(ret[0],'\n');
main_config.os_name = yon_char_new(ret[0]);
yon_char_parsed_free(ret,size);
}
}
main_config.languages = g_hash_table_new(g_str_hash,g_str_equal);
int size;
config_str languages = yon_config_load(languages_command,&size);
@ -1017,6 +1026,7 @@ void yon_main_window_create(main_window *widgets){
g_signal_connect(G_OBJECT(widgets->AboutMenuItem),"activate",G_CALLBACK(on_about),widgets);
g_signal_connect(G_OBJECT(widgets->DocumentationMenuItem),"activate",G_CALLBACK(on_open_documentation_confirmation),WIKI_LINK);
yon_gtk_window_setup(GTK_WINDOW(widgets->MainWindow),NULL,TITLE_LABEL,icon_path,NULL);
gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(widgets->InstallerCountryFilter),(GtkTreeModelFilterVisibleFunc)on_country_filter,widgets,NULL);

3
source/ubinstall-gtk.h
Unescape View File

@ -145,6 +145,7 @@ layout && /description:/ {\
}\
\" | sort -u\
"
#define os_name_get_command "sed -En 's/^PRETTY_NAME=[\"]*([^\"]+)[\"]*/\\1/p' /etc/os-release"
#define get_keyboard_layout_change_command "grep \"grp:\" /usr/share/X11/xkb/rules/base.lst | awk '{$1=$1; sub(/^!.*$/, \"\"); if ($1 ~ /^grp:/) {opt=$1; $1=\"\"; print opt \"|\" substr($0,2)}}'"
@ -446,6 +447,8 @@ typedef struct {
GList *slides;
GList *chosen_slide;
char *os_name;
} config;
extern config main_config;

15
source/ubl-strings.h
Unescape View File

@ -1,6 +1,5 @@
#define TITLE_LABEL _("System installation")
#define TITLE_LABEL yon_char_unite(_("System installation")," ",main_config.os_name,NULL)
#define WELCOME_LABEL _("Welcome to system installation")
#define WELCOME_BOTTOM_LABEL _("This program will ask you few questions\nand help you install system on your computer")
#define OPEN_LABEL _("Open")
@ -445,11 +444,11 @@ Includes:\n\
#define slide_2_text _("It has been successfully used in both government agencies and commercial companies of various sizes.")
#define slide_3_title _("System Editions")
#define slide_3_text _("- UBLinux Desktop Enterprise for workstations (PCs, laptops, thin clients, dashboards, including interactive touchscreens and Multi-touch, industrial computers, hardware and software complex),\n\
- UBLinux Server for server hardware and storage systems,\n\
- UBLinux Network for network equipment,\n\
- UBLinux Education for educational institutions,\n\
- UBLinux Desktop Basic for personal (home) use")
#define slide_3_text _("- Desktop Enterprise for workstations (PCs, laptops, thin clients, dashboards, including interactive touchscreens and Multi-touch, industrial computers, hardware and software complex),\n\
- Server for server hardware and storage systems,\n\
- Network for network equipment,\n\
- Education for educational institutions,\n\
- Desktop Basic for personal (home) use")
#define slide_4_title _("Device Support")
#define slide_4_text _("A wide range of devices is supported: printing equipment, scanners, webcams, etc.\n\
@ -521,7 +520,7 @@ The creation of custom repositories is also supported, which users can create an
\n\
Used to automate deployment and configuration of workstations and servers, as well as manage computing equipment.")
#define slide_19_title _("UBLinux Server virtualization tools")
#define slide_19_title _("Server virtualization tools")
#define slide_19_text _("The server and workstation virtualization system enables efficient deployment and management of virtual IT infrastructure in data centers.\n\
\n\
- Supports Microsoft Windows, GNU/Linux, and FreeBSD guest operating systems\n\

1
ubinstall-gtk.glade
Unescape View File

@ -785,6 +785,7 @@ agreement</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="tab-pos">left</property>
<property name="show-tabs">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>

Write Preview
Loading…
Cancel
Save