diff --git a/locale/ubl-settings-bootloader.pot b/locale/ubl-settings-bootloader.pot index 8155bc4..b876a89 100644 --- a/locale/ubl-settings-bootloader.pot +++ b/locale/ubl-settings-bootloader.pot @@ -25,226 +25,232 @@ msgstr "" msgid "Configuring system boot parameters" msgstr "" -#: source/ubl-strings.h:5 -msgid "Boot menu" +#: source/ubl-strings.h:4 +msgid "" +"https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/" +"ubl-settings-bootloader" msgstr "" #: source/ubl-strings.h:6 -msgid "Boot selection menu timer:" +msgid "Boot menu" msgstr "" #: source/ubl-strings.h:7 -msgid "seconds" +msgid "Boot selection menu timer:" msgstr "" #: source/ubl-strings.h:8 -msgid "Default" +msgid "seconds" msgstr "" #: source/ubl-strings.h:9 -msgid "Default OS:" +msgid "Default" msgstr "" #: source/ubl-strings.h:10 -msgid "Load screen display mode:" +msgid "Default OS:" msgstr "" #: source/ubl-strings.h:11 -msgid "Boot Menu Users" +msgid "Load screen display mode:" msgstr "" #: source/ubl-strings.h:12 -msgid "Startup ringtone" +msgid "Boot Menu Users" msgstr "" #: source/ubl-strings.h:13 -msgid "Parameters passed to the kernel" +msgid "Startup ringtone" msgstr "" #: source/ubl-strings.h:14 -msgid "Command line parameters:" +msgid "Parameters passed to the kernel" msgstr "" #: source/ubl-strings.h:15 -msgid "Input terminal" +msgid "Command line parameters:" msgstr "" #: source/ubl-strings.h:16 +msgid "Input terminal" +msgstr "" + +#: source/ubl-strings.h:17 msgid "Output terminal" msgstr "" -#: source/ubl-strings.h:18 source/ubl-strings.h:56 +#: source/ubl-strings.h:19 source/ubl-strings.h:57 msgid "Administrator" msgstr "" -#: source/ubl-strings.h:19 +#: source/ubl-strings.h:20 msgid "Name" msgstr "" -#: source/ubl-strings.h:20 +#: source/ubl-strings.h:21 source/ubl-strings.h:61 msgid "User" msgstr "" -#: source/ubl-strings.h:21 +#: source/ubl-strings.h:22 msgid "Password" msgstr "" -#: source/ubl-strings.h:22 +#: source/ubl-strings.h:23 msgid "Melody code" msgstr "" -#: source/ubl-strings.h:23 +#: source/ubl-strings.h:24 msgid "Option" msgstr "" -#: source/ubl-strings.h:24 +#: source/ubl-strings.h:25 msgid "Description" msgstr "" -#: source/ubl-strings.h:26 +#: source/ubl-strings.h:27 msgid "Add" msgstr "" -#: source/ubl-strings.h:27 +#: source/ubl-strings.h:28 msgid "Edit" msgstr "" -#: source/ubl-strings.h:28 +#: source/ubl-strings.h:29 msgid "Remove" msgstr "" -#: source/ubl-strings.h:30 +#: source/ubl-strings.h:31 msgid "Accept" msgstr "" -#: source/ubl-strings.h:31 +#: source/ubl-strings.h:32 msgid "Cancel" msgstr "" -#: source/ubl-strings.h:33 +#: source/ubl-strings.h:34 msgid "Boot animation with log" msgstr "" -#: source/ubl-strings.h:34 +#: source/ubl-strings.h:35 msgid "Boot animation without log" msgstr "" -#: source/ubl-strings.h:35 +#: source/ubl-strings.h:36 msgid "No boot animation with log" msgstr "" -#: source/ubl-strings.h:36 +#: source/ubl-strings.h:37 msgid "No boot animation with shortened log" msgstr "" -#: source/ubl-strings.h:37 +#: source/ubl-strings.h:38 msgid "Back" msgstr "" -#: source/ubl-strings.h:38 +#: source/ubl-strings.h:39 msgid "Default (Use last succeeded)" msgstr "" -#: source/ubl-strings.h:40 +#: source/ubl-strings.h:41 msgid "Password input" msgstr "" -#: source/ubl-strings.h:41 source/ubl-strings.h:48 +#: source/ubl-strings.h:42 source/ubl-strings.h:49 msgid "Repeat password:" msgstr "" -#: source/ubl-strings.h:42 source/ubl-strings.h:50 +#: source/ubl-strings.h:43 source/ubl-strings.h:51 msgid "Password hash:" msgstr "" -#: source/ubl-strings.h:43 source/ubl-strings.h:49 +#: source/ubl-strings.h:44 source/ubl-strings.h:50 msgid "Do not encrypt password" msgstr "" -#: source/ubl-strings.h:44 +#: source/ubl-strings.h:45 msgid "Password contain special symbols" msgstr "" -#: source/ubl-strings.h:45 +#: source/ubl-strings.h:46 msgid "Empty important field" msgstr "" -#: source/ubl-strings.h:46 +#: source/ubl-strings.h:47 msgid "Password mismatch" msgstr "" -#: source/ubl-strings.h:47 +#: source/ubl-strings.h:48 msgid "Password:" msgstr "" -#: source/ubl-strings.h:51 +#: source/ubl-strings.h:52 msgid "Password must be at least" msgstr "" -#: source/ubl-strings.h:51 +#: source/ubl-strings.h:52 msgid "characters" msgstr "" -#: source/ubl-strings.h:53 +#: source/ubl-strings.h:54 msgid "Add user" msgstr "" -#: source/ubl-strings.h:54 +#: source/ubl-strings.h:55 msgid "Edit user" msgstr "" -#: source/ubl-strings.h:55 +#: source/ubl-strings.h:56 msgid "Delete user" msgstr "" -#: source/ubl-strings.h:57 +#: source/ubl-strings.h:58 msgid "User name:" msgstr "" -#: source/ubl-strings.h:58 +#: source/ubl-strings.h:59 msgid "User password:" msgstr "" -#: source/ubl-strings.h:59 +#: source/ubl-strings.h:60 msgid "Are you sure you want to remove user" msgstr "" -#: source/ubl-strings.h:59 +#: source/ubl-strings.h:60 msgid "from boot menu users" msgstr "" -#: source/ubl-strings.h:60 +#: source/ubl-strings.h:61 msgid "is already exists. Do you really want to save user" msgstr "" -#: source/ubl-strings.h:62 +#: source/ubl-strings.h:63 msgid "Add ringtone" msgstr "" -#: source/ubl-strings.h:63 +#: source/ubl-strings.h:64 msgid "Edit ringtone" msgstr "" -#: source/ubl-strings.h:64 +#: source/ubl-strings.h:65 msgid "Delete ringtone" msgstr "" -#: source/ubl-strings.h:65 +#: source/ubl-strings.h:66 msgid "Chosen" msgstr "" -#: source/ubl-strings.h:66 +#: source/ubl-strings.h:67 msgid "Name:" msgstr "" -#: source/ubl-strings.h:67 +#: source/ubl-strings.h:68 msgid "Melody code:" msgstr "" -#: source/ubl-strings.h:68 +#: source/ubl-strings.h:69 msgid "Are you sure you want to remove ringtone" msgstr "" -#: source/ubl-strings.h:69 +#: source/ubl-strings.h:70 msgid "This ringtone name is already used by standard ringtone" msgstr "" diff --git a/locale/ubl-settings-bootloader_ru.po b/locale/ubl-settings-bootloader_ru.po index 5c4b348..7558c4f 100644 --- a/locale/ubl-settings-bootloader_ru.po +++ b/locale/ubl-settings-bootloader_ru.po @@ -25,226 +25,232 @@ msgstr "Загрузка системы" msgid "Configuring system boot parameters" msgstr "Настройка параметров загрузки системы" -#: source/ubl-strings.h:5 +#: source/ubl-strings.h:4 +msgid "" +"https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/" +"ubl-settings-bootloader" +msgstr "" + +#: source/ubl-strings.h:6 msgid "Boot menu" msgstr "Меню загрузки" -#: source/ubl-strings.h:6 +#: source/ubl-strings.h:7 msgid "Boot selection menu timer:" msgstr "Таймер меню выбора варианта загрузки:" -#: source/ubl-strings.h:7 +#: source/ubl-strings.h:8 msgid "seconds" msgstr "секунд" -#: source/ubl-strings.h:8 +#: source/ubl-strings.h:9 msgid "Default" msgstr "По умолчанию" -#: source/ubl-strings.h:9 +#: source/ubl-strings.h:10 msgid "Default OS:" msgstr "Загрузка по умолчанию:" -#: source/ubl-strings.h:10 +#: source/ubl-strings.h:11 msgid "Load screen display mode:" msgstr "Режим отображения экрана загрузки:" -#: source/ubl-strings.h:11 +#: source/ubl-strings.h:12 msgid "Boot Menu Users" msgstr "Пользователи меню загрузчика" -#: source/ubl-strings.h:12 +#: source/ubl-strings.h:13 msgid "Startup ringtone" msgstr "Мелодия при запуске" -#: source/ubl-strings.h:13 +#: source/ubl-strings.h:14 msgid "Parameters passed to the kernel" msgstr "Параметры, передаваемые ядру" -#: source/ubl-strings.h:14 +#: source/ubl-strings.h:15 msgid "Command line parameters:" msgstr "Параметры командной строки:" -#: source/ubl-strings.h:15 +#: source/ubl-strings.h:16 msgid "Input terminal" msgstr "Терминал для ввода" -#: source/ubl-strings.h:16 +#: source/ubl-strings.h:17 msgid "Output terminal" msgstr "Терминал для вывода" -#: source/ubl-strings.h:18 source/ubl-strings.h:56 +#: source/ubl-strings.h:19 source/ubl-strings.h:57 msgid "Administrator" msgstr "Администратор" -#: source/ubl-strings.h:19 +#: source/ubl-strings.h:20 msgid "Name" msgstr "Название" -#: source/ubl-strings.h:20 +#: source/ubl-strings.h:21 source/ubl-strings.h:61 msgid "User" msgstr "Пользователь" -#: source/ubl-strings.h:21 +#: source/ubl-strings.h:22 msgid "Password" msgstr "Пароль" -#: source/ubl-strings.h:22 +#: source/ubl-strings.h:23 msgid "Melody code" msgstr "Код мелодии" -#: source/ubl-strings.h:23 +#: source/ubl-strings.h:24 msgid "Option" msgstr "Опция" -#: source/ubl-strings.h:24 +#: source/ubl-strings.h:25 msgid "Description" msgstr "Описание" -#: source/ubl-strings.h:26 +#: source/ubl-strings.h:27 msgid "Add" msgstr "Добавить" -#: source/ubl-strings.h:27 +#: source/ubl-strings.h:28 msgid "Edit" msgstr "Редактировать" -#: source/ubl-strings.h:28 +#: source/ubl-strings.h:29 msgid "Remove" msgstr "Удалить" -#: source/ubl-strings.h:30 +#: source/ubl-strings.h:31 msgid "Accept" msgstr "Принять" -#: source/ubl-strings.h:31 +#: source/ubl-strings.h:32 msgid "Cancel" msgstr "Отменить" -#: source/ubl-strings.h:33 +#: source/ubl-strings.h:34 msgid "Boot animation with log" msgstr "Анимация загрузки с журналом" -#: source/ubl-strings.h:34 +#: source/ubl-strings.h:35 msgid "Boot animation without log" msgstr "Анимация загрузки без журнала" -#: source/ubl-strings.h:35 +#: source/ubl-strings.h:36 msgid "No boot animation with log" msgstr "Отсутствие анимации загрузки с выводом журнала" -#: source/ubl-strings.h:36 +#: source/ubl-strings.h:37 msgid "No boot animation with shortened log" msgstr "Отсутствие анимации загрузки с выводом сокращённого журнала" -#: source/ubl-strings.h:37 +#: source/ubl-strings.h:38 msgid "Back" msgstr "Назад" -#: source/ubl-strings.h:38 +#: source/ubl-strings.h:39 msgid "Default (Use last succeeded)" msgstr "По умолчанию (Последняя удачная загрузка)" -#: source/ubl-strings.h:40 +#: source/ubl-strings.h:41 msgid "Password input" msgstr "Ввод пароля" -#: source/ubl-strings.h:41 source/ubl-strings.h:48 +#: source/ubl-strings.h:42 source/ubl-strings.h:49 msgid "Repeat password:" msgstr "Подтвердите ввод пароля:" -#: source/ubl-strings.h:42 source/ubl-strings.h:50 +#: source/ubl-strings.h:43 source/ubl-strings.h:51 msgid "Password hash:" msgstr "Хэш пароля" -#: source/ubl-strings.h:43 source/ubl-strings.h:49 +#: source/ubl-strings.h:44 source/ubl-strings.h:50 msgid "Do not encrypt password" msgstr "Не шифровать пароль" -#: source/ubl-strings.h:44 +#: source/ubl-strings.h:45 msgid "Password contain special symbols" msgstr "Пароль содержит специальные символы" -#: source/ubl-strings.h:45 +#: source/ubl-strings.h:46 msgid "Empty important field" msgstr "Пустое важное поле" -#: source/ubl-strings.h:46 +#: source/ubl-strings.h:47 msgid "Password mismatch" msgstr "Пароли не совпадают" -#: source/ubl-strings.h:47 +#: source/ubl-strings.h:48 msgid "Password:" msgstr "Пароль:" -#: source/ubl-strings.h:51 +#: source/ubl-strings.h:52 msgid "Password must be at least" msgstr "Пароль состоять из по крайней мере" -#: source/ubl-strings.h:51 +#: source/ubl-strings.h:52 msgid "characters" msgstr "символов" -#: source/ubl-strings.h:53 +#: source/ubl-strings.h:54 msgid "Add user" msgstr "Добавить пользователя" -#: source/ubl-strings.h:54 +#: source/ubl-strings.h:55 msgid "Edit user" msgstr "Редактировать пользователя" -#: source/ubl-strings.h:55 +#: source/ubl-strings.h:56 msgid "Delete user" msgstr "Удалить пользователя" -#: source/ubl-strings.h:57 +#: source/ubl-strings.h:58 msgid "User name:" msgstr "Имя пользователя:" -#: source/ubl-strings.h:58 +#: source/ubl-strings.h:59 msgid "User password:" msgstr "Пароль пользователя:" -#: source/ubl-strings.h:59 +#: source/ubl-strings.h:60 msgid "Are you sure you want to remove user" msgstr "Вы уверены, что хотите удалить пользователя" -#: source/ubl-strings.h:59 +#: source/ubl-strings.h:60 msgid "from boot menu users" msgstr "из пользователей меню загрузчика" -#: source/ubl-strings.h:60 +#: source/ubl-strings.h:61 msgid "is already exists. Do you really want to save user" msgstr "уже существует. Вы действительно хотите сохранить пользователя" -#: source/ubl-strings.h:62 +#: source/ubl-strings.h:63 msgid "Add ringtone" msgstr "Добавить мелодию" -#: source/ubl-strings.h:63 +#: source/ubl-strings.h:64 msgid "Edit ringtone" msgstr "Изменение мелодии" -#: source/ubl-strings.h:64 +#: source/ubl-strings.h:65 msgid "Delete ringtone" msgstr "Удалить мелодию" -#: source/ubl-strings.h:65 +#: source/ubl-strings.h:66 msgid "Chosen" msgstr "Выбран" -#: source/ubl-strings.h:66 +#: source/ubl-strings.h:67 msgid "Name:" msgstr "Название:" -#: source/ubl-strings.h:67 +#: source/ubl-strings.h:68 msgid "Melody code:" msgstr "Код мелодии:" -#: source/ubl-strings.h:68 +#: source/ubl-strings.h:69 msgid "Are you sure you want to remove ringtone" msgstr "Вы уверены, что хотите удалить мелодию" -#: source/ubl-strings.h:69 +#: source/ubl-strings.h:70 msgid "This ringtone name is already used by standard ringtone" msgstr "Название этой мелодии уже используется для одной из стандартных" diff --git a/source/ubl-settings-bootloader.c b/source/ubl-settings-bootloader.c index d4d7786..54cedad 100644 --- a/source/ubl-settings-bootloader.c +++ b/source/ubl-settings-bootloader.c @@ -57,7 +57,6 @@ void on_config_local_save(GtkWidget *, main_window *){ if (window){ yon_save_window_hide_passwords(window); }; - } void on_config_global_save(GtkWidget *, main_window *){ @@ -66,7 +65,6 @@ void on_config_global_save(GtkWidget *, main_window *){ if (window){ yon_save_window_hide_passwords(window); }; - } void on_config_custom_save(GtkWidget *, main_window *){ @@ -78,16 +76,15 @@ void on_config_custom_save(GtkWidget *, main_window *){ } void on_config_local_load(GtkWidget *,main_window *widgets){ - yon_load_proceed(YON_CONFIG_LOCAL); - yon_interface_update(widgets); - main_config.load_mode=YON_CONFIG_LOCAL; + yon_load_proceed(YON_CONFIG_LOCAL); + yon_interface_update(widgets); + main_config.load_mode=YON_CONFIG_LOCAL; } void on_config_global_load(GtkWidget *,main_window *widgets){ - yon_load_proceed(YON_CONFIG_GLOBAL); - yon_interface_update(widgets); - main_config.load_mode=YON_CONFIG_GLOBAL; - + yon_load_proceed(YON_CONFIG_GLOBAL); + yon_interface_update(widgets); + main_config.load_mode=YON_CONFIG_GLOBAL; } void on_config_custom_load(GtkWidget *,main_window *widgets){