From 00c65db73aed1025e76d4edb4e6e59828f970bf6 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 22 Sep 2023 16:03:45 +0600 Subject: [PATCH] Localisation error fixes --- source/ubl-settings-system.c | 8 ++++---- source/ubl-strings.h | 10 +++++----- ubl-settings-system.pot | 10 +++++----- ubl-settings-system_ru.po | 10 +++++----- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index 78685fd..fb20852 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -126,7 +126,7 @@ void yon_config_local_load(GtkWidget *self, main_window *widgets){ gtk_list_store_set(widgets->languagelist,&iter,2,0,-1); } char *id = yon_config_get_by_key(id_parameter); - if (!strcmp(id,"Random")) + if (!strcmp(id,"random")) gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->IDCombo),1); else if (!strcmp(id,"hardware")) gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->IDCombo),2); @@ -186,7 +186,7 @@ void yon_config_global_load(GtkWidget *self, main_window *widgets){ gtk_list_store_set(widgets->languagelist,&iter,2,0,-1); } char *id = yon_config_get_by_key(id_parameter); - if (!strcmp(id,"Random")) + if (!strcmp(id,"random")) gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->IDCombo),1); else if (!strcmp(id,"hardware")) gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->IDCombo),2); @@ -311,9 +311,9 @@ void on_id_combo_toggled(GtkComboBox *self, main_window *widgets){ int id = gtk_combo_box_get_active(self); if (id==2||id==1){ if (yon_config_get_by_key(id_parameter)){ - yon_config_set(id_parameter, id == 1 ? "Random" : "hardware"); + yon_config_set(id_parameter, id == 1 ? "random" : "hardware"); } else { - yon_config_register(id_parameter,"config", id == 1 ? "Random":"hardware"); + yon_config_register(id_parameter,"config", id == 1 ? "random":"hardware"); } } if (id<3){ diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 6703f05..6b98513 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -29,13 +29,13 @@ #define NOTHING_CHOSEN_LABEL _("Nothing were chosen") -#define GLOBAL_LOAD_SUCCESS_LABEL _("Global configuration loading succseeded") -#define LOCAL_LOAD_SUCCESS_LABEL _("Local configuration loading succseeded") +#define GLOBAL_LOAD_SUCCESS_LABEL _("Global configuration loading succeeded") +#define LOCAL_LOAD_SUCCESS_LABEL _("Local configuration loading succeeded") #define LOAD_FAILED_LABEL _("Config loading failed") -#define GLOBAL_LOCAL_SAVE_SUCCESS_LABEL _("Local and global configuration saving succseeded") -#define GLOBAL_SAVE_SUCCESS_LABEL _("Global configuration saving succseeded") -#define LOCAL_SAVE_SUCCESS_LABEL _("Local configuration saving succseeded") +#define GLOBAL_LOCAL_SAVE_SUCCESS_LABEL _("Local and global configuration saving succeeded") +#define GLOBAL_SAVE_SUCCESS_LABEL _("Global configuration saving succeeded") +#define LOCAL_SAVE_SUCCESS_LABEL _("Local configuration saving succeeded") #define SAVE_WARNING_LABEL _("Warning! New machine ID will apply after system reboot") #define HOSTNAME_LABEL _("Hostname:") diff --git a/ubl-settings-system.pot b/ubl-settings-system.pot index 7c33049..87f9db9 100644 --- a/ubl-settings-system.pot +++ b/ubl-settings-system.pot @@ -150,11 +150,11 @@ msgid "Nothing were chosen" msgstr "" #: source/ubl-strings.h:32 -msgid "Global configuration loading succseeded" +msgid "Global configuration loading succeeded" msgstr "" #: source/ubl-strings.h:33 -msgid "Local configuration loading succseeded" +msgid "Local configuration loading succeeded" msgstr "" #: source/ubl-strings.h:34 @@ -162,15 +162,15 @@ msgid "Config loading failed" msgstr "" #: source/ubl-strings.h:36 -msgid "Local and global configuration saving succseeded" +msgid "Local and global configuration saving succeeded" msgstr "" #: source/ubl-strings.h:37 -msgid "Global configuration saving succseeded" +msgid "Global configuration saving succeeded" msgstr "" #: source/ubl-strings.h:38 -msgid "Local configuration saving succseeded" +msgid "Local configuration saving succeeded" msgstr "" #: source/ubl-strings.h:39 diff --git a/ubl-settings-system_ru.po b/ubl-settings-system_ru.po index 4b1e79c..0e5cec3 100644 --- a/ubl-settings-system_ru.po +++ b/ubl-settings-system_ru.po @@ -154,11 +154,11 @@ msgid "Nothing were chosen" msgstr "Ничего не было выбрано" #: source/ubl-strings.h:32 -msgid "Global configuration loading succseeded" +msgid "Global configuration loading succeeded" msgstr "Успешно загружена глобальная конфигурация" #: source/ubl-strings.h:33 -msgid "Local configuration loading succseeded" +msgid "Local configuration loading succeeded" msgstr "Успешно загружена локальная конфигурация" #: source/ubl-strings.h:34 @@ -166,15 +166,15 @@ msgid "Config loading failed" msgstr "Ошибка загрузки конфигурации" #: source/ubl-strings.h:36 -msgid "Local and global configuration saving succseeded" +msgid "Local and global configuration saving succeeded" msgstr "Успешно записаны локальная и глобальная конфигурация" #: source/ubl-strings.h:37 -msgid "Global configuration saving succseeded" +msgid "Global configuration saving succeeded" msgstr "Успешно записана глобальная конфигурация" #: source/ubl-strings.h:38 -msgid "Local configuration saving succseeded" +msgid "Local configuration saving succeeded" msgstr "Успешно записана локальная конфигурация" #: source/ubl-strings.h:39