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 b1ed185051
commit 5e72d8120c
19 changed files with 60 additions and 28 deletions
Show Stats Download Patch File Download Diff File

6
Makefile
Unescape View File

@ -112,15 +112,15 @@ uninstall:
install: check uninstall install: check uninstall
@echo "Install ..." @echo "Install ..."
@for LANG in $$(find ./locale -iname "*.po" -print | sed -En "s/.+_([[:alpha:]]+)\.po/\1/p" | sort -u); do \ @for LANG in $$(find ./locale -iname "*.po" -print | sed -En "s/.+_([[:alpha:]]+)\.po/\1/p" | sort -u); do \
install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \ install -dm755 "${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES"; \
# PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \ # PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \
PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \ PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \
PKGNAME_PO="./locale/${PKGNAME}_$${LANG}.po"; [[ -f "$${PKGNAME_PO}" ]] || PKGNAME_PO= ; \ PKGNAME_PO="./locale/${PKGNAME}_$${LANG}.po"; [[ -f "$${PKGNAME_PO}" ]] || PKGNAME_PO= ; \
msgfmt --verbose --use-fuzzy --output-file "$${PATH_FILE_MO}" - < <(msgcat --use-first --no-wrap $${PKGNAME_PO} ./locale/*_$${LANG}.po); \ msgfmt --verbose --use-fuzzy --output-file "$${PATH_FILE_MO}" - < <(msgcat --use-first --no-wrap $${PKGNAME_PO} ./locale/*_$${LANG}.po); \
done done
@for SIZE in 16 32 48; do \ @for SIZE in 16 32 48; do \
install -dm755 "${DESTDIR}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ install -dm755 "${DESTDIR}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "icons/apps/com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "icons/apps/com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
done done
@for FILE_ICON in $(wildcard icons/*/*.svg); do \ @for FILE_ICON in $(wildcard icons/*/*.svg); do \
SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \ SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \

9
locale/applications-list.pot
Unescape View File

@ -0,0 +1,9 @@
msgid "Universal macOS-style dock-panel"
msgstr ""
msgid "System monitor"
msgstr ""
msgid "Check the internet is alive"
msgstr ""

27
locale/applications-list_ru.po
Unescape View File

@ -0,0 +1,27 @@
# Language translations for ubinstal package.
# Copyright (C) 2022, UBTech LLC
# This file is distributed under the same license as the ubinstal package.
# UBLinux Team <info@ublinux.com>, 2022
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ubinstal 1.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-05-22 16:12+0600\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
msgid "Universal macOS-style dock-panel"
msgstr "Универсальная панель Dock в стиле macOS"
msgid "System monitor"
msgstr "Системный монитор"
msgid "Check the internet is alive"
msgstr "Проверка наличия интернет-соединения"

5
locale/ubinstall-gtk_ru.po
Unescape View File

@ -982,7 +982,6 @@ msgid "Group"
msgstr "Группа" msgstr "Группа"
#: source/ubl-strings.h:292 #: source/ubl-strings.h:292
#, fuzzy
msgid "Select your language:" msgid "Select your language:"
msgstr "Выберете язык:" msgstr "Выберете язык:"
@ -1321,7 +1320,7 @@ msgstr "секунд"
#: source/ubl-strings.h:377 #: source/ubl-strings.h:377
msgid "Default OS:" msgid "Default OS:"
msgstr "Щагрузка по умолчанию:" msgstr "Загрузка по умолчанию:"
#: source/ubl-strings.h:378 #: source/ubl-strings.h:378
msgid "Login without password request" msgid "Login without password request"
@ -1464,7 +1463,6 @@ msgid "Selecting the system kernel"
msgstr "Выбор ядра системы" msgstr "Выбор ядра системы"
#: source/ubl-strings.h:413 #: source/ubl-strings.h:413
#, fuzzy
msgid "" msgid ""
"Selecting kernels for installation in the system and selecting the default " "Selecting kernels for installation in the system and selecting the default "
"kernel. Internet access is required to install additional kernels" "kernel. Internet access is required to install additional kernels"
@ -1473,7 +1471,6 @@ msgstr ""
"доступ В Интернет." "доступ В Интернет."
#: source/ubl-strings.h:414 #: source/ubl-strings.h:414
#, fuzzy
msgid "" msgid ""
"Selecting additional kernel modules from the repository via the Internet" "Selecting additional kernel modules from the repository via the Internet"
msgstr "" msgstr ""

4
source/ubinstall-gtk-bootloader.c
Unescape View File

@ -76,12 +76,12 @@ void on_bootloader_user_accept(GtkWidget *, bootloader_user_window *window){
} }
const char *password = gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry)); const char *password = gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry));
if (yon_char_is_empty(username)){ if (yon_char_is_empty(username)){
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);
yon_ubl_status_highlight_incorrect(window->UsernameEntry); yon_ubl_status_highlight_incorrect(window->UsernameEntry);
return; return;
} }
if (yon_char_is_empty(password)){ if (yon_char_is_empty(password)){
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);
yon_ubl_status_highlight_incorrect(window->PasswordEntry); yon_ubl_status_highlight_incorrect(window->PasswordEntry);
return; return;
} }

2
source/ubinstall-gtk-keyboard.c
Unescape View File

@ -6,7 +6,7 @@ int yon_keyboard_save(main_window *widgets){
} else { } else {
GtkTreeIter iter; GtkTreeIter iter;
if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->LayoutsList),&iter)){ if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->LayoutsList),&iter)){
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),yon_char_get_localised_from_lib(EMPTY_IMPORTANT_LABEL),5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),yon_char_get_localised_from_lib(_EMPTY_IMPORTANT_LABEL),5,BACKGROUND_IMAGE_FAIL_TYPE);
yon_ubl_status_highlight_incorrect(widgets->KeyboardLayoutTree); yon_ubl_status_highlight_incorrect(widgets->KeyboardLayoutTree);
return 0; return 0;
} }

8
source/ubinstall-gtk-network.c
Unescape View File

@ -152,7 +152,7 @@ int yon_network_save(main_window *widgets){
if (gtk_switch_get_active(GTK_SWITCH(widgets->NetworkDomainSwitch))){ if (gtk_switch_get_active(GTK_SWITCH(widgets->NetworkDomainSwitch))){
const char *domain_name = gtk_entry_get_text(GTK_ENTRY(widgets->NetworkDomainNameEntry)); const char *domain_name = gtk_entry_get_text(GTK_ENTRY(widgets->NetworkDomainNameEntry));
if (yon_char_is_empty(domain_name)){ if (yon_char_is_empty(domain_name)){
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),_EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
yon_ubl_status_highlight_incorrect(widgets->NetworkDomainNameEntry); yon_ubl_status_highlight_incorrect(widgets->NetworkDomainNameEntry);
return 0; return 0;
} }
@ -161,7 +161,7 @@ int yon_network_save(main_window *widgets){
if (!yon_char_is_empty(domain_name)) yon_config_register(DOMAIN_parameter,DOMAIN_parameter_command,(char*)domain_name); if (!yon_char_is_empty(domain_name)) yon_config_register(DOMAIN_parameter,DOMAIN_parameter_command,(char*)domain_name);
else yon_config_remove_by_key(DOMAIN_parameter); else yon_config_remove_by_key(DOMAIN_parameter);
if ((!yon_char_is_empty(domain_admin)&&yon_char_is_empty(domain_password))||(yon_char_is_empty(domain_admin)&&!yon_char_is_empty(domain_password))){ if ((!yon_char_is_empty(domain_admin)&&yon_char_is_empty(domain_password))||(yon_char_is_empty(domain_admin)&&!yon_char_is_empty(domain_password))){
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),_EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
yon_ubl_status_highlight_incorrect(widgets->NetworkDomainAdminEntry); yon_ubl_status_highlight_incorrect(widgets->NetworkDomainAdminEntry);
yon_ubl_status_highlight_incorrect(widgets->NetworkDomainPasswordEntry); yon_ubl_status_highlight_incorrect(widgets->NetworkDomainPasswordEntry);
return 0; return 0;
@ -200,7 +200,7 @@ int yon_network_save(main_window *widgets){
case 4: case 4:
char *value = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->NetworkNTPEntry)); char *value = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->NetworkNTPEntry));
if (yon_char_is_empty(value)) { if (yon_char_is_empty(value)) {
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),_EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
yon_ubl_status_highlight_incorrect(widgets->NetworkNTPEntry); yon_ubl_status_highlight_incorrect(widgets->NetworkNTPEntry);
return 0; return 0;
} }
@ -219,7 +219,7 @@ int yon_network_save(main_window *widgets){
hostname = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->HotnameEntry)); hostname = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->HotnameEntry));
} }
if (yon_char_is_empty(hostname)){ if (yon_char_is_empty(hostname)){
yon_ubl_status_box_render(EMPTY_IMPORTANT_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_render(_EMPTY_IMPORTANT_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
yon_ubl_status_highlight_incorrect(widgets->HotnameEntry); yon_ubl_status_highlight_incorrect(widgets->HotnameEntry);
return 0; return 0;
} }

6
source/ubinstall-gtk-source.c
Unescape View File

@ -91,7 +91,7 @@ void yon_source_update(source_window *window){
void on_source_add(GtkWidget *,source_window *window){ void on_source_add(GtkWidget *,source_window *window){
const char *path = gtk_widget_get_visible(window->PathEntry)?gtk_entry_get_text(GTK_ENTRY(window->PathEntry)):gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(window->DeviceCombo)); const char *path = gtk_widget_get_visible(window->PathEntry)?gtk_entry_get_text(GTK_ENTRY(window->PathEntry)):gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(window->DeviceCombo));
if (yon_char_is_empty(path)){ if (yon_char_is_empty(path)){
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);
yon_ubl_status_highlight_incorrect(gtk_widget_get_visible(window->PathEntry)?window->PathEntry:window->DeviceCombo); yon_ubl_status_highlight_incorrect(gtk_widget_get_visible(window->PathEntry)?window->PathEntry:window->DeviceCombo);
return; return;
} }
@ -176,7 +176,7 @@ void on_source_accept(GtkWidget *,source_window *window){
case 1:{ case 1:{
char *cur = (char*)gtk_entry_get_text(GTK_ENTRY(element->PathEntry)); char *cur = (char*)gtk_entry_get_text(GTK_ENTRY(element->PathEntry));
if (yon_char_is_empty(cur)){ if (yon_char_is_empty(cur)){
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);
yon_ubl_status_highlight_incorrect(element->PathEntry); yon_ubl_status_highlight_incorrect(element->PathEntry);
return; return;
} }
@ -219,7 +219,7 @@ void on_source_accept(GtkWidget *,source_window *window){
yon_char_parsed_add_or_create_if_exists(paths,&size,dict->key); yon_char_parsed_add_or_create_if_exists(paths,&size,dict->key);
} }
if (!size){ if (!size){
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);
yon_ubl_status_highlight_incorrect(window->PathEntry); yon_ubl_status_highlight_incorrect(window->PathEntry);
return; return;
} }

2
source/ubinstall-gtk-startup-apps.c
Unescape View File

@ -51,7 +51,7 @@ void yon_startup_apps_setup(main_window *widgets){
config_str parsed = yon_char_parse(apps[i],&parsed_size,";"); config_str parsed = yon_char_parse(apps[i],&parsed_size,";");
if (parsed_size&&!yon_char_is_empty(parsed[0])){ if (parsed_size&&!yon_char_is_empty(parsed[0])){
gtk_list_store_append(widgets->StartupAppsList,&iter); gtk_list_store_append(widgets->StartupAppsList,&iter);
gtk_list_store_set(widgets->StartupAppsList,&iter,0,1,1,parsed[0],2,yon_char_return_if_exist(parsed[1],""),3,yon_char_return_if_exist(parsed[2],""),-1); gtk_list_store_set(widgets->StartupAppsList,&iter,0,1,1,parsed[0],2,yon_char_return_if_exist(parsed[1],""),3,yon_char_return_if_exist(_(parsed[2]),""),-1);
} }
} }
} }

2
source/ubinstall-gtk-startup-services.c
Unescape View File

@ -52,7 +52,7 @@ void yon_startup_services_setup(main_window *widgets){
config_str parsed = yon_char_parse(services[i],&parsed_size,";"); config_str parsed = yon_char_parse(services[i],&parsed_size,";");
if (parsed_size&&!yon_char_is_empty(parsed[0])){ if (parsed_size&&!yon_char_is_empty(parsed[0])){
gtk_list_store_append(widgets->StartupList,&iter); gtk_list_store_append(widgets->StartupList,&iter);
gtk_list_store_set(widgets->StartupList,&iter,0,1,1,parsed[0],2,yon_char_return_if_exist(parsed[1],""),3,yon_char_return_if_exist(parsed[2],""),-1); gtk_list_store_set(widgets->StartupList,&iter,0,1,1,parsed[0],2,yon_char_return_if_exist(parsed[1],""),3,yon_char_return_if_exist(_(parsed[2]),""),-1);
} }
} }
} }

1
source/ubl-strings.h
Unescape View File

@ -98,7 +98,6 @@ NULL)
#define PASSWORD_TITLE_LABEL _("Password input") #define PASSWORD_TITLE_LABEL _("Password input")
#define PASSWORD_MISMATCH_LABEL _("Password mismatch") #define PASSWORD_MISMATCH_LABEL _("Password mismatch")
#define EMPTY_IMPORTANT_LABEL _("Empty important field")
#define PASSWORD_SHORT_LABEL(min_size_char) yon_char_unite(_("Password must be at least")," ", min_size_char," ",_("characters")) #define PASSWORD_SHORT_LABEL(min_size_char) yon_char_unite(_("Password must be at least")," ", min_size_char," ",_("characters"))
#define RESTART_LABEL _("Restart PC") #define RESTART_LABEL _("Restart PC")

2
ubinstall-gtk-bootloader-user.glade
Unescape View File

@ -195,7 +195,7 @@
</child> </child>
<child> <child>
<object class="GtkButton" id="AcceptButton"> <object class="GtkButton" id="AcceptButton">
<property name="label" translatable="yes">Accept</property> <property name="label" translatable="yes">Ok</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>

2
ubinstall-gtk-keyboard-layouts.glade
Unescape View File

@ -103,7 +103,7 @@
</child> </child>
<child> <child>
<object class="GtkButton" id="AcceptButton"> <object class="GtkButton" id="AcceptButton">
<property name="label" translatable="yes">Accept</property> <property name="label" translatable="yes">Ok</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>

2
ubinstall-gtk-keyboard.glade
Unescape View File

@ -145,7 +145,7 @@
</child> </child>
<child> <child>
<object class="GtkButton" id="SaveButton"> <object class="GtkButton" id="SaveButton">
<property name="label" translatable="yes">Apply</property> <property name="label" translatable="yes">Ok</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>

2
ubinstall-gtk-language.glade
Unescape View File

@ -191,7 +191,7 @@
</child> </child>
<child> <child>
<object class="GtkButton" id="SaveButton"> <object class="GtkButton" id="SaveButton">
<property name="label" translatable="yes">Apply</property> <property name="label" translatable="yes">Ok</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>

2
ubinstall-gtk-layouts.glade
Unescape View File

@ -218,7 +218,7 @@
</child> </child>
<child> <child>
<object class="GtkButton" id="AcceptButton"> <object class="GtkButton" id="AcceptButton">
<property name="label" translatable="yes">Apply</property> <property name="label" translatable="yes">Ok</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>

2
ubinstall-gtk-service-window.glade
Unescape View File

@ -195,7 +195,7 @@
</child> </child>
<child> <child>
<object class="GtkButton" id="AcceptButton"> <object class="GtkButton" id="AcceptButton">
<property name="label" translatable="yes">Accept</property> <property name="label" translatable="yes">Ok</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>

2
ubinstall-gtk-source.glade
Unescape View File

@ -322,7 +322,7 @@
</child> </child>
<child> <child>
<object class="GtkButton" id="AcceptButton"> <object class="GtkButton" id="AcceptButton">
<property name="label" translatable="yes">Choose</property> <property name="label" translatable="yes">Ok</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>

2
ubinstall-gtk-warning.glade
Unescape View File

@ -129,7 +129,7 @@ interrupt installation process?</property>
</child> </child>
<child> <child>
<object class="GtkButton" id="AcceptButton"> <object class="GtkButton" id="AcceptButton">
<property name="label" translatable="yes">Accept</property> <property name="label" translatable="yes">Ok</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>

Write Preview
Loading…
Cancel
Save