diff --git a/Makefile b/Makefile index 96706b7..21263cf 100644 --- a/Makefile +++ b/Makefile @@ -120,12 +120,8 @@ install: check uninstall done @for SIZE in 16 32 48; do \ install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ - rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "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}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ done - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" \ - "com.ublinux.${PKGNAME}.checked.svg" \ - "com.ublinux.${PKGNAME}.warning.svg" @for FILE_ICON in $(wildcard icons/*/*.svg); do \ SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \ install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/$${SUB_NAME}" $${FILE_ICON}; \ diff --git a/com.ublinux.ubl-settings-bootloader.checked.svg b/com.ublinux.ubl-settings-bootloader.checked.svg deleted file mode 100644 index e3cab42..0000000 --- a/com.ublinux.ubl-settings-bootloader.checked.svg +++ /dev/null @@ -1,327 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/com.ublinux.ubl-settings-bootloader.warning.svg b/com.ublinux.ubl-settings-bootloader.warning.svg deleted file mode 100644 index 9a90dba..0000000 --- a/com.ublinux.ubl-settings-bootloader.warning.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/gresource.xml b/gresource.xml index ef6c431..bda515b 100644 --- a/gresource.xml +++ b/gresource.xml @@ -11,11 +11,8 @@ ubl-settings-bootloader.css - - ubl-settings-bootloader-banner.png - - grub-parameters.csv + grub-cmdline-linux.csv grub-terminal-input.csv grub-terminal-output.csv grub-melody.csv diff --git a/grub-cmdline-linux.csv b/grub-cmdline-linux.csv new file mode 100644 index 0000000..75946bf --- /dev/null +++ b/grub-cmdline-linux.csv @@ -0,0 +1,37 @@ +OPTION;DESCRIPTION +noplymouth;Disable Plymouth +rd.plymouth=0;Disable Plymouth +plymouth.enable=0;Disable Plymouth +plymouth.debug;Write debug output into /var/log/plymouth-debug.log +acpi=off;Disable ACPI +noapic;Disable APIC +nolapic;Disable local APIC +single;Single User Mode +nomodeset;Disable kernel selection and loading of video drivers +nouveau.modeset=0;Enable driver (default: auto, 0 = disabled, 1 = enabled, 2 = headless) (int) +nouveau.noaccel;Disable kernel/abi16 acceleration (int) +i915.modeset=1;Use kernel modesetting [KMS] (0=disable, 1=on, -1=force vga console preference [default]) (int) +i915.enable_fbc=0;Enable frame buffer compression for power savings (default: -1 (use per-chip default)) (int) +i915.enable_dc=0;Enable power-saving display C-states. (-1=auto [default], 0=disable, 1=up to DC5, 2=up to DC6, 3=up to DC5 with DC3CO, 4=up to DC6 with DC3CO) (int) +i915.enable_psr=0;Enable PSR (0=disabled, 1=enabled) (int) +i915.disable_power_well=1;Disable display power wells when possible (-1=auto [default], 0=power wells always on, 1=power wells disabled when possible) (int) +i915.enable_ips=N;Enable IPS (default: true) (int) +i915.fastboot=1;Try to skip unnecessary mode sets at boot time (0=disabled, 1=enabled) Default: -1 (use per-chip default) (int) +i915.disable_display=Y;Disable display (default: false) (bool) +i915.enable_guc=0;Enable GuC load for GuC submission and/or HuC load. Required functionality can be selected using bitmask values. (-1=auto [default], 0=disable, 1=GuC submission, 2=HuC load) (int) +i915.enable_dp_mst=N;Enable multi-stream transport (MST) for new DisplayPort sinks. (default: true) (bool) +i915.enable_gvt=Y;Enable support for Intel GVT-g graphics virtualization host support (default:false) (bool) +ahci.marvell_enable=1;Marvell SATA via AHCI (1 = enabled) (int) +ahci.mobile_lpm_policy=1;Default LPM policy for mobile chipsets (default:-1) (int) +snd-intel-dspcfg.dsp_driver=1;Force the DSP driver for Intel DSP (0=auto, 1=legacy, 2=SST, 3=SOF) (int) +intel_idle.no_acpi=Y;Do not use ACPI _CST for building the idle states list (default:N) (bool) +intel_idle.use_acpi=Y;Use ACPI _CST for building the idle states list (default:N) (bool) +intel_idle.max_cstate=1;Prevents the processor from going into a deep sleep state (default:9) (int) +intel_idle.max_cstate=2;Eliminates flickering laptop display on Ultra Voltage processors (int) +intel_idle.max_cstate=3;Eliminates flickering laptop display on Ultra Voltage processors (int) +intel_idle.max_cstate=4;Eliminates flickering laptop display on Ultra Voltage processors (int) +intel_idle.states_off=1;Mask of disabled idle states (0=disabled, 1=enabled) Default: 0 (uint) +usbcore.autosuspend=-1;Default autosuspend delay (-1=disabled) (int) +modprobe.blacklist=nouveau;Force dont`t load nouveau driver video for Nvidia +libata.noacpi=1;Disabling ACPI support for libata driver +loglevel=3;Displays only errors and higher priority messages \ No newline at end of file diff --git a/grub-melody.csv b/grub-melody.csv index 070f201..661100d 100644 --- a/grub-melody.csv +++ b/grub-melody.csv @@ -1,2 +1,2 @@ -Option|Tone code -ubbeep|480 900 2 1000 2 800 2 400 2 600 3 \ No newline at end of file +OPTION;TONE_CODE +ubbeep;480 900 2 1000 2 800 2 400 2 600 3 \ No newline at end of file diff --git a/grub-parameters.csv b/grub-parameters.csv deleted file mode 100644 index db8a5d4..0000000 --- a/grub-parameters.csv +++ /dev/null @@ -1,35 +0,0 @@ -Option|Description -noplymouth|Disable Plymouth -rd.plymouth=0|Disable Plymouth -plymouth.enable=0|Disable Plymouth -plymouth.debug|Write debug output into /var/log/plymouth-debug.log -acpi=off|Disable ACPI -noapic|Disable APIC -nolapic|Disable local APIC -single|Single User Mode -nomodeset|Disable kernel selection and loading of video drivers -nouveau.modeset=0|Enable driver (default: auto, 0 = disabled, 1 = enabled, 2 = headless) (int) -nouveau.noaccel|Disable kernel/abi16 acceleration (int) -i915.modeset=1|Use kernel modesetting [KMS] (0=disable, 1=on, -1=force vga console preference [default]) (int) -i915.enable_fbc=0|Enable frame buffer compression for power savings (default: -1 (use per-chip default)) (int) -i915.enable_dc=0|Enable power-saving display C-states. (-1=auto [default]; 0=disable; 1=up to DC5; 2=up to DC6; 3=up to DC5 with DC3CO; 4=up to DC6 with DC3CO) (int) -i915.enable_psr=0|Enable PSR (0=disabled, 1=enabled) (int) -i915.disable_power_well=1|Disable display power wells when possible (-1=auto [default], 0=power wells always on, 1=power wells disabled when possible) (int) -i915.enable_ips=N|Enable IPS (default: true) (int) -i915.fastboot=1|Try to skip unnecessary mode sets at boot time (0=disabled, 1=enabled) Default: -1 (use per-chip default) (int) -i915.disable_display=Y|Disable display (default: false) (bool) -i915.enable_guc=0|Enable GuC load for GuC submission and/or HuC load. Required functionality can be selected using bitmask values. (-1=auto [default], 0=disable, 1=GuC submission, 2=HuC load) (int) -i915.enable_dp_mst=N|Enable multi-stream transport (MST) for new DisplayPort sinks. (default: true) (bool) -i915.enable_gvt=Y|Enable support for Intel GVT-g graphics virtualization host support (default:false) (bool) -ahci.marvell_enable=1|Marvell SATA via AHCI (1 = enabled) (int) -ahci.mobile_lpm_policy=1|Default LPM policy for mobile chipsets (default:-1) (int) -snd-intel-dspcfg.dsp_driver=1|Force the DSP driver for Intel DSP (0=auto, 1=legacy, 2=SST, 3=SOF) (int) -intel_idle.no_acpi=Y|Do not use ACPI _CST for building the idle states list (default:N) (bool) -intel_idle.use_acpi=Y|Use ACPI _CST for building the idle states list (default:N) (bool) -intel_idle.max_cstate=1|Prevents the processor from going into a deep sleep state (default:9) (int) -intel_idle.max_cstate=2|Eliminates flickering laptop display on Ultra Voltage processors (int) -intel_idle.max_cstate=3|Eliminates flickering laptop display on Ultra Voltage processors (int) -intel_idle.max_cstate=4|Eliminates flickering laptop display on Ultra Voltage processors (int) -intel_idle.states_off=1|Mask of disabled idle states (0=disabled, 1=enabled) Default: 0 (uint) -usbcore.autosuspend=-1|Default autosuspend delay (-1=disabled) (int) -modprobe.blacklist=nouveau|Force dont`t load nouveau driver video for Nvidia \ No newline at end of file diff --git a/grub-terminal-input.csv b/grub-terminal-input.csv index 46fac01..b4cfc9b 100644 --- a/grub-terminal-input.csv +++ b/grub-terminal-input.csv @@ -1,6 +1,6 @@ -Option|Description -console|PC BIOS & EFI console -serial|Serial terminal -ofconsole|Open Firmware Console -at_keyboard|PC AT Keyboard (Coreboot) -usb_keyboard|USB Keyboard (HID Boot protocol) \ No newline at end of file +OPTION;DESCRIPTION +console;PC BIOS & EFI Console +serial;Serial Terminal +ofconsole;Console Open Firmware +at_keyboard;PC AT Keyboard (Coreboot) +usb_keyboard;USB Keyboard (HID Boot protocol) \ No newline at end of file diff --git a/grub-terminal-output.csv b/grub-terminal-output.csv index 0f5eabd..bbfb92f 100644 --- a/grub-terminal-output.csv +++ b/grub-terminal-output.csv @@ -1,6 +1,6 @@ -Option|Description -console|PC BIOS & EFI console -serial|Serial terminal -ofconsole|Open Firmware Console -gfxterm|Output in graphical mode -vga_text|VGA text output (Coreboot) \ No newline at end of file +OPTION;DESCRIPTION +console;PC BIOS & EFI Console +serial;Serial Terminal +ofconsole;Console Open Firmware +gfxterm;Output in graphics mode +vga_text;VGA text output (Coreboot) \ No newline at end of file diff --git a/com.ublinux.ubl-settings-bootloader.svg b/icons/apps/com.ublinux.ubl-settings-bootloader.svg similarity index 100% rename from com.ublinux.ubl-settings-bootloader.svg rename to icons/apps/com.ublinux.ubl-settings-bootloader.svg diff --git a/locale/grub-parameters.pot b/locale/grub-cmdline-linux.pot similarity index 97% rename from locale/grub-parameters.pot rename to locale/grub-cmdline-linux.pot index 058276b..517b2d6 100644 --- a/locale/grub-parameters.pot +++ b/locale/grub-cmdline-linux.pot @@ -144,3 +144,9 @@ msgstr "" #: grub-parameters.csv:35 msgid "Force dont`t load nouveau driver video for Nvidia" msgstr "" + +msgid "Disabling ACPI support for libata driver" +msgstr "" + +msgid "Displays only errors and higher priority messages" +msgstr "" \ No newline at end of file diff --git a/locale/grub-cmdline-linux_ru.po b/locale/grub-cmdline-linux_ru.po new file mode 100644 index 0000000..e1c782d --- /dev/null +++ b/locale/grub-cmdline-linux_ru.po @@ -0,0 +1,114 @@ +# Russian translations for ubl-settings-bootloader package. +# Copyright (C) 2025, UBTech LLC +# This file is distributed under the same license as the ubl-settings-bootloader package. +# UBLinux Team , 2025 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: ubl-settings-bootloader_grub-parameters.csv 1.0\n" +"Report-Msgid-Bugs-To: support@ublinux.com\n" +"POT-Creation-Date: 2025-04-25 15:27+0600\n" +"PO-Revision-Date: 2025-02-22 23:28+0600\n" +"Last-Translator: ublinux \n" +"Language-Team: Russian - UBLinux Team \n" +"Language: Russian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "Disable Plymouth" +msgstr "Отключить Plymouth" + +msgid "Write debug output into /var/log/plymouth-debug.log" +msgstr "Записывать вывод отладки в /var/log/plymouth-debug.log" + +msgid "Disable ACPI" +msgstr "Отключить ACPI" + +msgid "Disable APIC" +msgstr "Отключить APIC" + +msgid "Disable local APIC" +msgstr "Отключить локальный APIC" + +msgid "Single User Mode" +msgstr "Однопользовательский режим" + +msgid "Disable kernel selection and loading of video drivers" +msgstr "Отключить выбор ядра и загрузку видеодрайверов" + +msgid "Enable driver (default: auto, 0 = disabled, 1 = enabled, 2 = headless) (int)" +msgstr "Включить драйвер (по умолчанию: auto, 0 = отключено, 1 = включено, 2 = без интерфеса) (int)" + +msgid "Disable kernel/abi16 acceleration (int)" +msgstr "Отключить ускорение ядра/abi16 (int)" + +msgid "Use kernel modesetting [KMS] (0=disable, 1=on, -1=force vga console preference [default]) (int)" +msgstr "Использовать установку режима ядра [KMS] (0=выключить, 1=включить, -1=принудительно использовать предпочтение VGA консоли [по умолчанию]) (int)" + +msgid "Enable frame buffer compression for power savings (default: -1 (use per-chip default)) (int)" +msgstr "Включить сжатие кадрового буфера для экономии энергии (по умолчанию: -1 (использовать значение по умолчанию для чипа)) (int)" + +msgid "Enable power-saving display C-states. (-1=auto [default], 0=disable, 1=up to DC5, 2=up to DC6, 3=up to DC5 with DC3CO, 4=up to DC6 with DC3CO) (int)" +msgstr "Включить режимы энергосбережения для дисплея C-состояний. (-1=авто [по умолчанию], 0=выключить, 1=до DC5, 2=до DC6, 3=до DC5 с DC3CO, 4=до DC6 с DC3CO) (int)" + +msgid "Enable PSR (0=disabled, 1=enabled) (int)" +msgstr "Включить PSR (0=выключено, 1=включено) (int)" + +msgid "Disable display power wells when possible (-1=auto [default], 0=power wells always on, 1=power wells disabled when possible) (int)" +msgstr "Отключить энергоснабжение дисплея при возможности (-1=авто [по умолчанию], 0=подача энергии всегда включена, 1=подача энергии отключена при возможности) (int)" + +msgid "Enable IPS (default: true) (int)" +msgstr "Включить IPS (по умолчанию: true) (int)" + +msgid "Try to skip unnecessary mode sets at boot time (0=disabled, 1=enabled) Default: -1 (use per-chip default) (int)" +msgstr "Попробовать пропустить ненужные установки режима при загрузке (0=выключено, 1=включено) По умолчанию: -1 (использовать значение по умолчанию для чипа) (int)" + +msgid "Disable display (default: false) (bool)" +msgstr "Отключить дисплей (по умолчанию: false) (bool)" + +msgid "Enable GuC load for GuC submission and/or HuC load. Required functionality can be selected using bitmask values. (-1=auto [default], 0=disable, 1=GuC submission, 2=HuC load) (int)" +msgstr "Включить загрузку GuC для подачи GuC и/или загрузки HuC. Необходимую функциональность можно выбрать с помощью значений битовой маски. (-1=авто [по умолчанию], 0=выключить, 1=подача GuC, 2=загрузка HuC) (int)" + +msgid "Enable multi-stream transport (MST) for new DisplayPort sinks. (default: true) (bool)" +msgstr "Включить многопотоковую передачу (MST) для новых дисплеев DisplayPort. (по умолчанию: true) (bool)" + +msgid "Enable support for Intel GVT-g graphics virtualization host support (default:false) (bool)" +msgstr "Включить поддержку виртуализации графики Intel GVT-g для хостов (по умолчанию: false) (bool)" + +msgid "Marvell SATA via AHCI (1 = enabled) (int)" +msgstr "Marvell SATA через AHCI (1 = включено) (int)" + +msgid "Default LPM policy for mobile chipsets (default:-1) (int)" +msgstr "Политика LPM по умолчанию для мобильных чипсетов (по умолчанию: -1) (int)" + +msgid "Force the DSP driver for Intel DSP (0=auto, 1=legacy, 2=SST, 3=SOF) (int)" +msgstr "Принудительно включить драйвер DSP для Intel DSP (0=авто, 1=legacy, 2=SST, 3=SOF) (int)" + +msgid "Do not use ACPI _CST for building the idle states list (default:N) (bool)" +msgstr "Не использовать ACPI _CST для построения списка состояний простоя (по умолчанию: N) (bool)" + +msgid "Use ACPI _CST for building the idle states list (default:N) (bool)" +msgstr "Использовать ACPI _CST для построения списка состояний простоя (по умолчанию: N) (bool)" + +msgid "Prevents the processor from going into a deep sleep state (default:9) (int)" +msgstr "Предотвращает переход процессора в глубокое состояние сна (по умолчанию: 9) (int)" + +msgid "Eliminates flickering laptop display on Ultra Voltage processors (int)" +msgstr "Устраняет мерцание дисплея ноутбука на процессорах с Ultra Voltage (int)" + +msgid "Mask of disabled idle states (0=disabled, 1=enabled) Default: 0 (uint)" +msgstr "Маска отключенных состояний простоя (0=выключено, 1=включено) По умолчанию: 0 (uint)" + +msgid "Default autosuspend delay (-1=disabled) (int)" +msgstr "Задержка автоматической приостановки по умолчанию (-1=выключено) (int)" + +msgid "Force dont`t load nouveau driver video for Nvidia" +msgstr "Принудительно не загружать видеодрайвер nouveau для Nvidia" + +msgid "Disabling ACPI support for libata driver" +msgstr "Отключение поддержки ACPI для драйвера libata" + +msgid "Displays only errors and higher priority messages" +msgstr "Отображать только ошибки и сообщения более высокого приоритета" diff --git a/locale/grub-parameters_ru.po b/locale/grub-parameters_ru.po deleted file mode 100644 index 8a7b8be..0000000 --- a/locale/grub-parameters_ru.po +++ /dev/null @@ -1,142 +0,0 @@ -# Russian translations grub-parameters.csv for ubl-settings-bootloader package. -# Copyright (C) 2025, UBTech LLC -# This file is distributed under the same license as the ubl-settings-bootloader package. -# UBLinux Team , 2025 -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: ubl-settings-bootloader_grub-parameters.csv 1.0\n" -"Report-Msgid-Bugs-To: support@ublinux.com\n" -"POT-Creation-Date: 2023-01-01 00:00+0600\n" -"PO-Revision-Date: 2025-04-17 23:28+0600\n" -"Last-Translator: ublinux \n" -"Language-Team: Russian - UBLinux Team \n" -"Language: Russian\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: grub-parameters.csv:3 -#: grub-parameters.csv:4 -#: grub-parameters.csv:2 -msgid "Disable Plymouth" -msgstr "Отключить Plymouth" - -#: grub-parameters.csv:5 -msgid "Write debug output into /var/log/plymouth-debug.log" -msgstr "Записать отладочный вывод в /var/log/plywright-debug.log" - -#: grub-parameters.csv:6 -msgid "Disable ACPI" -msgstr "Отключить ACPI" - -#: grub-parameters.csv:7 -msgid "Disable APIC" -msgstr "Отключить APIC" - -#: grub-parameters.csv:8 -msgid "Disable local APIC" -msgstr "Отключить локальный APIC" - -#: grub-parameters.csv:9 -msgid "Single User Mode" -msgstr "Однопользовательский режим" - -#: grub-parameters.csv:10 -msgid "Disable kernel selection and loading of video drivers" -msgstr "Отключить выбор ядра и загрузку видеодрайверов" - -#: grub-parameters.csv:11 -msgid "Enable driver (default: auto, 0 = disabled, 1 = enabled, 2 = headless) (int)" -msgstr "Включить драйвер (по умолчанию: auto, 0 = отключен, 1 = включен, 2 = headless) (int)" - -#: grub-parameters.csv:12 -msgid "Disable kernel/abi16 acceleration (int)" -msgstr "Отключить ускорение ядра/abi16 (int)" - -#: grub-parameters.csv:13 -msgid "Use kernel modesetting [KMS] (0=disable, 1=on, -1=force vga console preference [default]) (int)" -msgstr "Использовать режим настройки ядра [KMS] (0 = отключить, 1 = включить, -1 = принудительно использовать предпочтение консоли VGA [по умолчанию]) (int)" - -#: grub-parameters.csv:14 -msgid "Enable frame buffer compression for power savings (default: -1 (use per-chip default)) (int)" -msgstr "Включить сжатие буфера кадра для экономии энергии (по умолчанию: -1 (использовать настройки для каждого чипа)) (int)" - -#: grub-parameters.csv:15 -msgid "Enable power-saving display C-states. (-1=auto [default]; 0=disable; 1=up to DC5; 2=up to DC6; 3=up to DC5 with DC3CO; 4=up to DC6 with DC3CO) (int)" -msgstr "Включить энергосберегающие режимы C-состояния дисплея. (-1 = auto [по умолчанию], 0 = отключить, 1 = до DC5, 2 = до DC6, 3 = до DC5 с DC3CO, 4 = до DC6 с DC3CO) (int)" - -#: grub-parameters.csv:16 -msgid "Enable PSR (0=disabled, 1=enabled) (int)" -msgstr "Включить PSR (0 = отключен, 1 = включен) (int)" - -#: grub-parameters.csv:17 -msgid "Disable display power wells when possible (-1=auto [default], 0=power wells always on, 1=power wells disabled when possible) (int)" -msgstr "Отключить питание дисплея, когда возможно (-1 = auto [по умолчанию], 0 = питание всегда включено, 1 = питание отключено, когда возможно) (int)" - -#: grub-parameters.csv:18 -msgid "Enable IPS (default: true) (int)" -msgstr "Включить IPS (по умолчанию: true) (int)" - -#: grub-parameters.csv:19 -msgid "Try to skip unnecessary mode sets at boot time (0=disabled, 1=enabled) Default: -1 (use per-chip default) (int)" -msgstr "Попытаться пропустить ненужные настройки режима при загрузке (0 = отключено, 1 = включено) По умолчанию: -1 (использовать настройки для каждого чипа) (int)" - -#: grub-parameters.csv:20 -msgid "Disable display (default: false) (bool)" -msgstr "Отключить дисплей (по умолчанию: false) (bool)" - -#: grub-parameters.csv:21 -msgid "Enable GuC load for GuC submission and/or HuC load. Required functionality can be selected using bitmask values. (-1=auto [default], 0=disable, 1=GuC submission, 2=HuC load) (int)" -msgstr "Включить загрузку GuC для отправки GuC и/или загрузки HuC. Необходимую функциональность можно выбрать с помощью битовой маски. (-1 = auto [по умолчанию], 0 = отключить, 1 = отправка GuC, 2 = загрузка HuC) (int)" - -#: grub-parameters.csv:22 -msgid "Enable multi-stream transport (MST) for new DisplayPort sinks. (default: true) (bool)" -msgstr "Включить мультипотоковую передачу (MST) для новых устройств DisplayPort (по умолчанию: true) (bool)" - -#: grub-parameters.csv:23 -msgid "Enable support for Intel GVT-g graphics virtualization host support (default:false) (bool)" -msgstr "Включить поддержку виртуализации графики Intel GVT-g (по умолчанию: false) (bool)" - -#: grub-parameters.csv:24 -msgid "Marvell SATA via AHCI (1 = enabled) (int)" -msgstr "Marvell SATA через AHCI (1 = включено) (int)" - -#: grub-parameters.csv:25 -msgid "Default LPM policy for mobile chipsets (default:-1) (int)" -msgstr "Политика LPM по умолчанию для мобильных чипсетов (по умолчанию: -1) (int)" - -#: grub-parameters.csv:26 -msgid "Force the DSP driver for Intel DSP (0=auto, 1=legacy, 2=SST, 3=SOF) (int)" -msgstr "Принудительно использовать драйвер DSP для Intel DSP (0 = auto, 1 = legacy, 2 = SST, 3 = SOF) (int)" - -#: grub-parameters.csv:27 -msgid "Do not use ACPI _CST for building the idle states list (default:N) (bool)" -msgstr "Не использовать ACPI _CST для построения списка состояний бездействия (по умолчанию: N) (bool)" - -#: grub-parameters.csv:28 -msgid "Use ACPI _CST for building the idle states list (default:N) (bool)" -msgstr "Использовать ACPI _CST для построения списка состояний бездействия (по умолчанию: N) (bool)" - -#: grub-parameters.csv:29 -msgid "Prevents the processor from going into a deep sleep state (default:9) (int)" -msgstr "Предотвратить переход процессора в глубокий режим сна (по умолчанию: 9) (int)" - -#: grub-parameters.csv:30 -#: grub-parameters.csv:31 -#: grub-parameters.csv:32 -msgid "Eliminates flickering laptop display on Ultra Voltage processors (int)" -msgstr "Устранить мерцание экрана ноутбука на процессорах Ultra Voltage (int)" - -#: grub-parameters.csv:33 -msgid "Mask of disabled idle states (0=disabled, 1=enabled) Default: 0 (uint)" -msgstr "Маска отключенных состояний бездействия (0 = отключено, 1 = включено) По умолчанию: 0 (uint)" - -#: grub-parameters.csv:34 -msgid "Default autosuspend delay (-1=disabled) (int)" -msgstr "Задержка автоотключения по умолчанию (-1 = отключено) (int)" - -#: grub-parameters.csv:35 -msgid "Force dont`t load nouveau driver video for Nvidia" -msgstr "Принудительно не загружать драйвер nouveau для видео Nvidia" diff --git a/locale/grub-terminal-input.pot b/locale/grub-terminal-input.pot index ea36fea..da85254 100644 --- a/locale/grub-terminal-input.pot +++ b/locale/grub-terminal-input.pot @@ -1,4 +1,4 @@ -# Language translations grub-terminal-input.csv for ubl-settings-bootloader package. +# Language translations for ubl-settings-bootloader package. # Copyright (C) 2025, UBTech LLC # This file is distributed under the same license as the ubl-settings-bootloader package. # UBLinux Team , 2025 @@ -8,35 +8,26 @@ msgid "" msgstr "" "Project-Id-Version: ubl-settings-bootloader_grub-terminal-input.csv 1.0\n" "Report-Msgid-Bugs-To: support@ublinux.com\n" -"POT-Creation-Date: 2023-01-01 00:00+0600\n" -"PO-Revision-Date: 2025-01-01 00:00+0600\n" -"Last-Translator: ublinux \n" +"POT-Creation-Date: 2025-05-21 00:00+0600\n" +"PO-Revision-Date: 2025-05-21 00:00+0600\n" +"Last-Translator: UBLinux Team \n" "Language-Team: UBLinux Team \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: grub-terminal-input.csv:1 -msgid "Description" +msgid "PC BIOS & EFI Console" msgstr "" -#: grub-terminal-input.csv:2 -msgid "PC BIOS & EFI console" +msgid "Serial Terminal" msgstr "" -#: grub-terminal-input.csv:3 -msgid "Serial terminal" +msgid "Console Open Firmware" msgstr "" -#: grub-terminal-input.csv:4 -msgid "Open Firmware Console" -msgstr "" - -#: grub-terminal-input.csv:5 msgid "PC AT Keyboard (Coreboot)" msgstr "" -#: grub-terminal-input.csv:6 msgid "USB Keyboard (HID Boot protocol)" msgstr "" diff --git a/locale/grub-terminal-input_ru.po b/locale/grub-terminal-input_ru.po index 1290a1f..9bffd26 100644 --- a/locale/grub-terminal-input_ru.po +++ b/locale/grub-terminal-input_ru.po @@ -1,4 +1,4 @@ -# Russian translations grub-terminal-input.csv for ubl-settings-bootloader package. +# Russian translations for ubl-settings-bootloader package. # Copyright (C) 2025, UBTech LLC # This file is distributed under the same license as the ubl-settings-bootloader package. # UBLinux Team , 2025 @@ -8,19 +8,26 @@ msgid "" msgstr "" "Project-Id-Version: ubl-settings-bootloader_grub-terminal-input.csv 1.0\n" "Report-Msgid-Bugs-To: support@ublinux.com\n" -"POT-Creation-Date: 2023-01-01 00:00+0600\n" -"PO-Revision-Date: 2025-04-17 23:28+0600\n" -"Last-Translator: ublinux \n" -"Language-Team: Russian - UBLinux Team \n" +"POT-Creation-Date: 2025-05-21 00:00+0600\n" +"PO-Revision-Date: 2025-05-21 00:00+0600\n" +"Last-Translator: ublinux \n" +"Language-Team: Russian - UBLinux Team \n" "Language: Russian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: grub-terminal-input.csv:5 +msgid "PC BIOS & EFI Console" +msgstr "PC BIOS & консоль EFI" + +msgid "Serial Terminal" +msgstr "Последовательный терминал" + +msgid "Console Open Firmware" +msgstr "Консоль Open Firmware" + msgid "PC AT Keyboard (Coreboot)" msgstr "Клавиатура PC AT (Coreboot)" -#: grub-terminal-input.csv:6 msgid "USB Keyboard (HID Boot protocol)" -msgstr "USB клавиатура (HID протокол загрузки)" +msgstr "USB клавиатура (HID протокол загрузки)" \ No newline at end of file diff --git a/locale/grub-terminal-output.pot b/locale/grub-terminal-output.pot index 4172777..66cb1a8 100644 --- a/locale/grub-terminal-output.pot +++ b/locale/grub-terminal-output.pot @@ -1,4 +1,4 @@ -# Language translations grub-terminal-output.csv for ubl-settings-bootloader package. +# Language translations for ubl-settings-bootloader package. # Copyright (C) 2025, UBTech LLC # This file is distributed under the same license as the ubl-settings-bootloader package. # UBLinux Team , 2025 @@ -8,35 +8,26 @@ msgid "" msgstr "" "Project-Id-Version: ubl-settings-bootloader_grub-terminal-output.csv 1.0\n" "Report-Msgid-Bugs-To: support@ublinux.com\n" -"POT-Creation-Date: 2023-01-01 00:00+0600\n" -"PO-Revision-Date: 2025-01-01 00:00+0600\n" -"Last-Translator: ublinux \n" +"POT-Creation-Date: 2025-05-21 00:00+0600\n" +"PO-Revision-Date: 2025-05-21 00:00+0600\n" +"Last-Translator: UBLinux Team \n" "Language-Team: UBLinux Team \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: grub-terminal-output.csv:1 -msgid "Description" +msgid "PC BIOS & EFI Console" msgstr "" -#: grub-terminal-output.csv:2 -msgid "PC BIOS & EFI console" +msgid "Serial Terminal" msgstr "" -#: grub-terminal-output.csv:3 -msgid "Serial terminal" +msgid "Console Open Firmware" msgstr "" -#: grub-terminal-output.csv:4 -msgid "Open Firmware Console" +msgid "Output in graphics mode" msgstr "" -#: grub-terminal-output.csv:5 -msgid "Output in graphical mode" -msgstr "" - -#: grub-terminal-output.csv:6 msgid "VGA text output (Coreboot)" -msgstr "" +msgstr "" \ No newline at end of file diff --git a/locale/grub-terminal-output_ru.po b/locale/grub-terminal-output_ru.po index 19ab053..18c028a 100644 --- a/locale/grub-terminal-output_ru.po +++ b/locale/grub-terminal-output_ru.po @@ -1,4 +1,4 @@ -# Russian translations grub-terminal-output.csv for ubl-settings-bootloader package. +# Russian translations for ubl-settings-bootloader package. # Copyright (C) 2025, UBTech LLC # This file is distributed under the same license as the ubl-settings-bootloader package. # UBLinux Team , 2025 @@ -8,31 +8,26 @@ msgid "" msgstr "" "Project-Id-Version: ubl-settings-bootloader_grub-terminal-output.csv 1.0\n" "Report-Msgid-Bugs-To: support@ublinux.com\n" -"POT-Creation-Date: 2023-01-01 00:00+0600\n" -"PO-Revision-Date: 2025-04-17 23:28+0600\n" -"Last-Translator: ublinux \n" -"Language-Team: Russian - UBLinux Team \n" +"POT-Creation-Date: 2025-05-21 00:00+0600\n" +"PO-Revision-Date: 2025-05-21 00:00+0600\n" +"Last-Translator: ublinux \n" +"Language-Team: Russian - UBLinux Team \n" "Language: Russian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: grub-terminal-output.csv:2 -msgid "PC BIOS & EFI console" -msgstr "PC BIOS & EFI консоль" +msgid "PC BIOS & EFI Console" +msgstr "PC BIOS & консоль EFI" -#: grub-terminal-output.csv:3 -msgid "Serial terminal" -msgstr "Терминал Serial" +msgid "Serial Terminal" +msgstr "Последовательный терминал" -#: grub-terminal-output.csv:4 -msgid "Open Firmware Console" +msgid "Console Open Firmware" msgstr "Консоль Open Firmware" -#: grub-terminal-output.csv:5 -msgid "Output in graphical mode" +msgid "Output in graphics mode" msgstr "Вывод в графическом режиме" -#: grub-terminal-output.csv:6 msgid "VGA text output (Coreboot)" -msgstr "Текстовый вывод VGA (Coreboot)" +msgstr "Текстовый вывод VGA (Coreboot)" \ No newline at end of file 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/logo-background.png b/logo-background.png deleted file mode 100644 index 8eb67cb..0000000 Binary files a/logo-background.png and /dev/null differ diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 37dad89..e1d0565 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -37,12 +37,11 @@ set(DEPENDFILES ../ubl-settings-bootloader-ringtone.glade ../ubl-settings-bootloader-menu.glade ../ubl-settings-bootloader-menu-item.glade - ../grub-parameters.csv + ../grub-cmdline-linux.csv ../grub-terminal-input.csv ../grub-terminal-output.csv ../grub-melody.csv ../gresource.xml - ../ubl-settings-bootloader-banner.png ../ubl-settings-bootloader.css ) diff --git a/source/ubl-settings-bootloader.c b/source/ubl-settings-bootloader.c index d4d7786..9d10b6d 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){ @@ -233,7 +230,7 @@ void yon_interface_update(main_window *widgets){ config_str parameters = yon_char_parse(parameter,&size," "); for (int i=1;iKernelParametersList,&iter); gtk_list_store_set(widgets->KernelParametersList,&iter,0,yon_char_parsed_check_exist(parameters,size,cur_parameter)>-1,1,cur_parameter,2,_(description),-1); } @@ -248,7 +245,7 @@ void yon_interface_update(main_window *widgets){ config_str parameters = yon_char_parse(parameter,&size," "); for (int i=1;iInputTerminalList,&iter); gtk_list_store_set(widgets->InputTerminalList,&iter,0,yon_char_parsed_check_exist(parameters,size,cur_parameter)>-1,1,cur_parameter,2,_(description),-1); } @@ -263,7 +260,7 @@ void yon_interface_update(main_window *widgets){ config_str parameters = yon_char_parse(parameter,&size," "); for (int i=1;iOutputTerminalList,&iter); gtk_list_store_set(widgets->OutputTerminalList,&iter,0,yon_char_parsed_check_exist(parameters,size,cur_parameter)>-1,1,cur_parameter,2,_(description),-1); } diff --git a/source/ubl-settings-bootloader.h b/source/ubl-settings-bootloader.h index b435921..3eef6a1 100644 --- a/source/ubl-settings-bootloader.h +++ b/source/ubl-settings-bootloader.h @@ -15,8 +15,6 @@ #endif #include "ubl-strings.h" -#define WIKI_LINK "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-bootloader" - #define _(String) gettext(String) #define glade_path "/com/ublinux/ui/ubl-settings-bootloader.glade" @@ -29,7 +27,7 @@ #define CssPath "/com/ublinux/css/ubl-settings-bootloader.css" #define config_path yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL) #define icon_path "com.ublinux.ubl-settings-bootloader" -#define kernel_options_path "resource:///com/ublinux/csv/grub-parameters.csv" +#define kernel_options_path "resource:///com/ublinux/csv/grub-cmdline-linux.csv" #define terminal_input_path "resource:///com/ublinux/csv/grub-terminal-input.csv" #define terminal_output_path "resource:///com/ublinux/csv/grub-terminal-output.csv" #define melody_path "resource:///com/ublinux/csv/grub-melody.csv" diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 930f63a..38408e6 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -1,6 +1,7 @@ #define TITLE_LABEL _("System boot") #define TITLE_INFO_LABEL _("Configuring system boot parameters") +#define WIKI_LINK _("https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-bootloader") #define BOOT_MENU_LABEL _("Boot menu") #define BOOT_SELECTION_LABEL _("Boot selection menu timer:") diff --git a/ubl-settings-bootloader-banner.png b/ubl-settings-bootloader-banner.png deleted file mode 100644 index 8eb67cb..0000000 Binary files a/ubl-settings-bootloader-banner.png and /dev/null differ