diff --git a/Makefile b/Makefile index 21263cf..19140d4 100644 --- a/Makefile +++ b/Makefile @@ -82,17 +82,17 @@ uninstall: $(RM) "$${PATH_FILE_MO}"; \ done @for SIZE in 16x16 32x32 48x48 scalable; do \ - $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ - $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \ + $(RM) "${DESTDIR}/usr/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ + $(RM) "${DESTDIR}/usr/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \ done @for FILE_SVG in $(wildcard *.svg); do \ for SIZE in 16x16 32x32 48x48 scalable; do \ - $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \ + $(RM) "${DESTDIR}/usr/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \ done; \ done @for FILE_ICON in $(wildcard icons/*/*.svg); do \ SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \ - $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/$${SUB_NAME}/$${FILE_ICON}"; \ + $(RM) "${DESTDIR}/usr/share/icons/hicolor/scalable/$${SUB_NAME}/$${FILE_ICON##*/}"; \ done @$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}" @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop" @@ -119,12 +119,12 @@ install: check uninstall msgfmt --verbose --use-fuzzy --output-file "$${PATH_FILE_MO}" - < <(msgcat --use-first --no-wrap $${PKGNAME_PO} ./locale/*_$${LANG}.po); \ done @for SIZE in 16 32 48; do \ - install -dm755 "${DESTDIR}${PREFIX}/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"; \ done @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}; \ + install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/$${SUB_NAME}" $${FILE_ICON}; \ done @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" @@ -137,10 +137,10 @@ install: check uninstall sed -e "s+/usr/bin+${PREFIX}/bin+" -e "s+\.run+$${PREFIX//\//-}\.run+g" -i "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \ fi @if [[ -z "${DESTDIR}" ]]; then \ - ldconfig -n ${DESTDIR}${PREFIX}/lib; \ - [[ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ]] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ + ldconfig -n ${DESTDIR}/usr/lib; \ + [ -d "${DESTDIR}/usr/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}/usr/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ - [[ -d "${DESTDIR}${PREFIX}/share/applications" ]] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \ + [ -d "${DESTDIR}/usr/share/applications" ] && touch "${DESTDIR}/usr/share/applications" &>/dev/null || true; \ fi @echo "Install: OK" diff --git a/icons/emblems/com.ublinux.ubinstall-gtk.install-advanced.svg b/icons/emblems/com.ublinux.ubinstall-gtk.install-advanced.svg new file mode 100644 index 0000000..14d6d67 --- /dev/null +++ b/icons/emblems/com.ublinux.ubinstall-gtk.install-advanced.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/icons/emblems/com.ublinux.ubinstall-gtk.install-common.svg b/icons/emblems/com.ublinux.ubinstall-gtk.install-common.svg new file mode 100644 index 0000000..db329d6 --- /dev/null +++ b/icons/emblems/com.ublinux.ubinstall-gtk.install-common.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/icons/emblems/com.ublinux.ubinstall-gtk.install-disk.svg b/icons/emblems/com.ublinux.ubinstall-gtk.install-disk.svg new file mode 100644 index 0000000..193851a --- /dev/null +++ b/icons/emblems/com.ublinux.ubinstall-gtk.install-disk.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/icons/emblems/com.ublinux.ubinstall-gtk.install-grub-update.svg b/icons/emblems/com.ublinux.ubinstall-gtk.install-grub-update.svg new file mode 100644 index 0000000..237eccb --- /dev/null +++ b/icons/emblems/com.ublinux.ubinstall-gtk.install-grub-update.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/icons/emblems/com.ublinux.ubinstall-gtk.install-grub.svg b/icons/emblems/com.ublinux.ubinstall-gtk.install-grub.svg new file mode 100644 index 0000000..0d727e7 --- /dev/null +++ b/icons/emblems/com.ublinux.ubinstall-gtk.install-grub.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/icons/emblems/com.ublinux.ubinstall-gtk.install-near.svg b/icons/emblems/com.ublinux.ubinstall-gtk.install-near.svg new file mode 100644 index 0000000..8ece2d9 --- /dev/null +++ b/icons/emblems/com.ublinux.ubinstall-gtk.install-near.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/icons/emblems/com.ublinux.ubinstall-gtk.install-part.svg b/icons/emblems/com.ublinux.ubinstall-gtk.install-part.svg new file mode 100644 index 0000000..c73e5bb --- /dev/null +++ b/icons/emblems/com.ublinux.ubinstall-gtk.install-part.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/icons/emblems/com.ublinux.ubinstall-gtk.install-recovery.svg b/icons/emblems/com.ublinux.ubinstall-gtk.install-recovery.svg new file mode 100644 index 0000000..4e19d26 --- /dev/null +++ b/icons/emblems/com.ublinux.ubinstall-gtk.install-recovery.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/icons/emblems/com.ublinux.ubinstall-gtk.install-system.svg b/icons/emblems/com.ublinux.ubinstall-gtk.install-system.svg new file mode 100644 index 0000000..6ad3205 --- /dev/null +++ b/icons/emblems/com.ublinux.ubinstall-gtk.install-system.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/icons/emblems/com.ublinux.ubinstall-gtk.install-user.svg b/icons/emblems/com.ublinux.ubinstall-gtk.install-user.svg new file mode 100644 index 0000000..5d6fcb7 --- /dev/null +++ b/icons/emblems/com.ublinux.ubinstall-gtk.install-user.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/icons/emblems/com.ublinux.ubinstall-gtk.license.svg b/icons/emblems/com.ublinux.ubinstall-gtk.license.svg new file mode 100644 index 0000000..2eae823 --- /dev/null +++ b/icons/emblems/com.ublinux.ubinstall-gtk.license.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/icons/emblems/com.ublinux.ubinstall-gtk.source.svg b/icons/emblems/com.ublinux.ubinstall-gtk.source.svg new file mode 100644 index 0000000..ff835f9 --- /dev/null +++ b/icons/emblems/com.ublinux.ubinstall-gtk.source.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/icons/emblems/com.ublinux.ubinstall-gtk.translation-symbolic.svg b/icons/emblems/com.ublinux.ubinstall-gtk.translation-symbolic.svg new file mode 100644 index 0000000..8ce058c --- /dev/null +++ b/icons/emblems/com.ublinux.ubinstall-gtk.translation-symbolic.svg @@ -0,0 +1,3 @@ + + + diff --git a/locale/ubinstall-gtk.pot b/locale/ubinstall-gtk.pot index 5d710b5..826fc2d 100644 --- a/locale/ubinstall-gtk.pot +++ b/locale/ubinstall-gtk.pot @@ -21,1531 +21,1538 @@ msgstr "" msgid "System installation" msgstr "" -#: source/ubl-strings.h:1 -msgid "https://wiki.ublinux.com/en/software/programs_and_utilities/all/ubinstall-gtk" +#: source/ubl-strings.h:3 +msgid "" +"https://wiki.ublinux.com/en/software/programs_and_utilities/all/ubinstall-gtk" msgstr "" -#: source/ubl-strings.h:3 +#: source/ubl-strings.h:5 msgid "" "This program will ask you few questions\n" "and help you install system on your computer" msgstr "" -#: source/ubl-strings.h:5 +#: source/ubl-strings.h:7 msgid "Open" msgstr "" -#: source/ubl-strings.h:8 +#: source/ubl-strings.h:10 msgid "Dry run; Installation will not start" msgstr "" -#: source/ubl-strings.h:9 +#: source/ubl-strings.h:11 msgid "Set ini file for configuration mode" msgstr "" -#: source/ubl-strings.h:12 source/ubl-strings.h:251 +#: source/ubl-strings.h:14 source/ubl-strings.h:253 msgid "Keyboard layout" msgstr "" -#: source/ubl-strings.h:13 +#: source/ubl-strings.h:15 msgid "New configuration file creation failed" msgstr "" -#: source/ubl-strings.h:15 +#: source/ubl-strings.h:17 msgid "Cancel" msgstr "" -#: source/ubl-strings.h:16 +#: source/ubl-strings.h:18 msgid "Back" msgstr "" -#: source/ubl-strings.h:17 +#: source/ubl-strings.h:19 msgid "Next" msgstr "" -#: source/ubl-strings.h:18 +#: source/ubl-strings.h:20 msgid "Root only" msgstr "" -#: source/ubl-strings.h:19 +#: source/ubl-strings.h:21 msgid "Welcome" msgstr "" -#: source/ubl-strings.h:20 +#: source/ubl-strings.h:22 msgid "" "Licence\n" "agreement" msgstr "" -#: source/ubl-strings.h:21 +#: source/ubl-strings.h:23 msgid "Sections" msgstr "" -#: source/ubl-strings.h:22 +#: source/ubl-strings.h:24 msgid "Installation" msgstr "" -#: source/ubl-strings.h:23 source/ubl-strings.h:37 source/ubl-strings.h:275 +#: source/ubl-strings.h:25 source/ubl-strings.h:39 source/ubl-strings.h:277 msgid "Location" msgstr "" -#: source/ubl-strings.h:24 +#: source/ubl-strings.h:26 msgid "Keyboard" msgstr "" -#: source/ubl-strings.h:25 +#: source/ubl-strings.h:27 msgid "Users" msgstr "" -#: source/ubl-strings.h:26 +#: source/ubl-strings.h:28 msgid "Deleting all data on the selected disk and then installing the system" msgstr "" -#: source/ubl-strings.h:27 +#: source/ubl-strings.h:29 msgid "Installation next to another system" msgstr "" -#: source/ubl-strings.h:28 +#: source/ubl-strings.h:30 msgid "Shrinking a partition and creating a new one for installing OS" msgstr "" -#: source/ubl-strings.h:29 +#: source/ubl-strings.h:31 msgid "Installation on the same partition as another system" msgstr "" -#: source/ubl-strings.h:30 +#: source/ubl-strings.h:32 msgid "Unpacking the file system into an existing system" msgstr "" -#: source/ubl-strings.h:31 source/ubl-strings.h:356 +#: source/ubl-strings.h:33 source/ubl-strings.h:360 msgid "" "Selecting additional software to install from the repository via the Internet" msgstr "" -#: source/ubl-strings.h:32 +#: source/ubl-strings.h:34 msgid "Chosen" msgstr "" -#: source/ubl-strings.h:33 +#: source/ubl-strings.h:35 msgid "Module name" msgstr "" -#: source/ubl-strings.h:34 +#: source/ubl-strings.h:36 msgid "Tag" msgstr "" -#: source/ubl-strings.h:35 source/ubl-strings.h:255 +#: source/ubl-strings.h:37 source/ubl-strings.h:257 msgid "Description" msgstr "" -#: source/ubl-strings.h:36 +#: source/ubl-strings.h:38 msgid "Installation completion" msgstr "" -#: source/ubl-strings.h:38 +#: source/ubl-strings.h:40 msgid "Region:" msgstr "" -#: source/ubl-strings.h:39 +#: source/ubl-strings.h:41 msgid "Zone:" msgstr "" -#: source/ubl-strings.h:40 +#: source/ubl-strings.h:42 msgid "Language:" msgstr "" -#: source/ubl-strings.h:41 source/ubl-strings.h:235 source/ubl-strings.h:244 +#: source/ubl-strings.h:43 source/ubl-strings.h:237 source/ubl-strings.h:246 msgid "Keyboard model:" msgstr "" -#: source/ubl-strings.h:42 +#: source/ubl-strings.h:44 msgid "Default layout (ru)" msgstr "" -#: source/ubl-strings.h:43 +#: source/ubl-strings.h:45 msgid "Define" msgstr "" -#: source/ubl-strings.h:44 +#: source/ubl-strings.h:46 msgid "Settings" msgstr "" -#: source/ubl-strings.h:45 +#: source/ubl-strings.h:47 msgid "Administrator name:" msgstr "" -#: source/ubl-strings.h:46 +#: source/ubl-strings.h:48 msgid "Administrator login:" msgstr "" -#: source/ubl-strings.h:47 +#: source/ubl-strings.h:49 msgid "Administrator password:" msgstr "" -#: source/ubl-strings.h:48 +#: source/ubl-strings.h:50 msgid "Default" msgstr "" -#: source/ubl-strings.h:49 +#: source/ubl-strings.h:51 msgid "Set a password" msgstr "" -#: source/ubl-strings.h:50 +#: source/ubl-strings.h:52 msgid "Do no set a password" msgstr "" -#: source/ubl-strings.h:51 +#: source/ubl-strings.h:53 msgid "Automatic login without password prompt" msgstr "" -#: source/ubl-strings.h:52 +#: source/ubl-strings.h:54 msgid "User root password:" msgstr "" -#: source/ubl-strings.h:53 +#: source/ubl-strings.h:55 msgid "Host name:" msgstr "" -#: source/ubl-strings.h:54 +#: source/ubl-strings.h:56 msgid "Automatically" msgstr "" -#: source/ubl-strings.h:55 source/ubl-strings.h:207 +#: source/ubl-strings.h:57 source/ubl-strings.h:209 msgid "User" msgstr "" -#: source/ubl-strings.h:56 +#: source/ubl-strings.h:58 msgid "Select device:" msgstr "" -#: source/ubl-strings.h:57 +#: source/ubl-strings.h:59 msgid "Choose a section:" msgstr "" -#: source/ubl-strings.h:58 +#: source/ubl-strings.h:60 msgid "" "Attention! The selected partition will be reduced and the next new " "partition will be created. The data will be saved in the selected partition. " "The new partition will be formatted." msgstr "" -#: source/ubl-strings.h:59 +#: source/ubl-strings.h:61 msgid "Device" msgstr "" -#: source/ubl-strings.h:60 +#: source/ubl-strings.h:62 msgid "Label" msgstr "" -#: source/ubl-strings.h:61 +#: source/ubl-strings.h:63 msgid "Size" msgstr "" -#: source/ubl-strings.h:62 +#: source/ubl-strings.h:64 msgid "Free" msgstr "" -#: source/ubl-strings.h:63 +#: source/ubl-strings.h:65 msgid "Specify the size of the new partition for system:" msgstr "" -#: source/ubl-strings.h:64 +#: source/ubl-strings.h:66 msgid "Tb" msgstr "" -#: source/ubl-strings.h:65 +#: source/ubl-strings.h:67 msgid "Gb" msgstr "" -#: source/ubl-strings.h:66 +#: source/ubl-strings.h:68 msgid "Mb" msgstr "" -#: source/ubl-strings.h:67 +#: source/ubl-strings.h:69 msgid "Available languages in the system:" msgstr "" -#: source/ubl-strings.h:68 source/ubl-strings.h:109 +#: source/ubl-strings.h:70 source/ubl-strings.h:111 msgid "Available languages in the system" msgstr "" -#: source/ubl-strings.h:70 +#: source/ubl-strings.h:72 msgid "No device were chosen" msgstr "" -#: source/ubl-strings.h:71 +#: source/ubl-strings.h:73 msgid "No partition were chosen" msgstr "" -#: source/ubl-strings.h:73 +#: source/ubl-strings.h:75 msgid "Installation parameters" msgstr "" -#: source/ubl-strings.h:75 +#: source/ubl-strings.h:77 msgid "Advanced installation mode" msgstr "" -#: source/ubl-strings.h:76 +#: source/ubl-strings.h:78 msgid "" "Installing OS files, user data on different partitions, creating RAID, etc." msgstr "" -#: source/ubl-strings.h:77 +#: source/ubl-strings.h:79 msgid "" "Attention! The selected system components will be installed\n" "separately into the selected partition." msgstr "" -#: source/ubl-strings.h:78 +#: source/ubl-strings.h:80 msgid "GRUB install" msgstr "" -#: source/ubl-strings.h:79 +#: source/ubl-strings.h:81 msgid "Install the GRUB bootloader" msgstr "" -#: source/ubl-strings.h:80 +#: source/ubl-strings.h:82 msgid "GRUB update" msgstr "" -#: source/ubl-strings.h:81 +#: source/ubl-strings.h:83 msgid "Update (reinstall) the GRUB bootloader" msgstr "" -#: source/ubl-strings.h:82 +#: source/ubl-strings.h:84 msgid "Separate installation" msgstr "" -#: source/ubl-strings.h:83 +#: source/ubl-strings.h:85 msgid "Installing OS components and user data on different disk partitions" msgstr "" -#: source/ubl-strings.h:84 +#: source/ubl-strings.h:86 msgid "OS only" msgstr "" -#: source/ubl-strings.h:85 +#: source/ubl-strings.h:87 msgid "Installing only OS components without user data" msgstr "" -#: source/ubl-strings.h:86 +#: source/ubl-strings.h:88 msgid "User data only" msgstr "" -#: source/ubl-strings.h:87 +#: source/ubl-strings.h:89 msgid "Installing only user data without OS components" msgstr "" -#: source/ubl-strings.h:89 source/ubl-strings.h:110 +#: source/ubl-strings.h:91 source/ubl-strings.h:112 msgid "Keyboard layout language" msgstr "" -#: source/ubl-strings.h:91 +#: source/ubl-strings.h:93 msgid "Region were not fullified" msgstr "" -#: source/ubl-strings.h:92 +#: source/ubl-strings.h:94 msgid "Zone were not fullified" msgstr "" -#: source/ubl-strings.h:93 +#: source/ubl-strings.h:95 msgid "Languages list is empty" msgstr "" -#: source/ubl-strings.h:94 +#: source/ubl-strings.h:96 msgid "System locale hasn't been chosen" msgstr "" -#: source/ubl-strings.h:95 +#: source/ubl-strings.h:97 msgid "Manual layouts has been chosen but empty" msgstr "" -#: source/ubl-strings.h:97 +#: source/ubl-strings.h:99 msgid "Password input" msgstr "" -#: source/ubl-strings.h:98 +#: source/ubl-strings.h:100 msgid "Password mismatch" msgstr "" -#: source/ubl-strings.h:99 +#: source/ubl-strings.h:101 msgid "Empty important field" msgstr "" -#: source/ubl-strings.h:100 +#: source/ubl-strings.h:102 msgid "Password must be at least" msgstr "" -#: source/ubl-strings.h:100 +#: source/ubl-strings.h:102 msgid "characters" msgstr "" -#: source/ubl-strings.h:102 +#: source/ubl-strings.h:104 msgid "Restart PC" msgstr "" -#: source/ubl-strings.h:103 +#: source/ubl-strings.h:105 msgid "Choose file system type for the section:" msgstr "" -#: source/ubl-strings.h:104 +#: source/ubl-strings.h:106 msgid "Section name:" msgstr "" -#: source/ubl-strings.h:105 +#: source/ubl-strings.h:107 msgid "Format" msgstr "" -#: source/ubl-strings.h:107 +#: source/ubl-strings.h:109 msgid "" "You have system installed on your computer.\n" "You can reboot and use your new system\n" "or continue working in the system Live environment." msgstr "" -#: source/ubl-strings.h:111 +#: source/ubl-strings.h:113 msgid "Apply" msgstr "" -#: source/ubl-strings.h:112 +#: source/ubl-strings.h:114 msgid "Success" msgstr "" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:115 msgid "Layout" msgstr "" -#: source/ubl-strings.h:114 source/ubl-strings.h:252 +#: source/ubl-strings.h:116 source/ubl-strings.h:254 msgid "Designation" msgstr "" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:117 msgid "Serial" msgstr "" -#: source/ubl-strings.h:116 +#: source/ubl-strings.h:118 msgid "Section" msgstr "" -#: source/ubl-strings.h:117 +#: source/ubl-strings.h:119 msgid "Capacity" msgstr "" -#: source/ubl-strings.h:118 +#: source/ubl-strings.h:120 msgid "Free space" msgstr "" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:121 msgid "File system" msgstr "" -#: source/ubl-strings.h:120 +#: source/ubl-strings.h:122 msgid "Default (L_Alt + L_Shift)" msgstr "" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:123 msgid "Default (Regular 105-key)" msgstr "" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:125 msgid "Installation configuration has ended" msgstr "" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:126 msgid "System installation is about to begin" msgstr "" -#: source/ubl-strings.h:126 +#: source/ubl-strings.h:128 msgid "Documentation" msgstr "" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:129 msgid "About" msgstr "" -#: source/ubl-strings.h:129 +#: source/ubl-strings.h:131 msgid "Would you like to read documentation in the Web?" msgstr "" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:132 msgid "" "You will be redirected to documentation website where documentation is\n" "translated and supported by community." msgstr "" -#: source/ubl-strings.h:131 +#: source/ubl-strings.h:133 msgid "Always redirect to online documentation" msgstr "" -#: source/ubl-strings.h:132 +#: source/ubl-strings.h:134 msgid "Open documentation" msgstr "" -#: source/ubl-strings.h:134 +#: source/ubl-strings.h:136 msgid "Installation error" msgstr "" -#: source/ubl-strings.h:135 +#: source/ubl-strings.h:137 msgid "" "Attention! The system will be installed on the selected partition with OS " "already installed. All user data will be saved." msgstr "" -#: source/ubl-strings.h:137 +#: source/ubl-strings.h:139 msgid "Installation options" msgstr "" -#: source/ubl-strings.h:139 +#: source/ubl-strings.h:141 msgid "Configuration mode" msgstr "" -#: source/ubl-strings.h:140 +#: source/ubl-strings.h:142 msgid "Attention! Configuration mode was enabled!" msgstr "" -#: source/ubl-strings.h:141 +#: source/ubl-strings.h:143 msgid "Configuration will be saved in configuration file" msgstr "" -#: source/ubl-strings.h:142 +#: source/ubl-strings.h:144 msgid "Error" msgstr "" -#: source/ubl-strings.h:143 +#: source/ubl-strings.h:145 msgid "Error has occured while installation process" msgstr "" -#: source/ubl-strings.h:145 +#: source/ubl-strings.h:147 msgid "Log exploration" msgstr "" -#: source/ubl-strings.h:146 +#: source/ubl-strings.h:148 msgid "Save" msgstr "" -#: source/ubl-strings.h:147 +#: source/ubl-strings.h:149 msgid "Load" msgstr "" -#: source/ubl-strings.h:150 +#: source/ubl-strings.h:152 msgid "Load global configuration" msgstr "" -#: source/ubl-strings.h:151 +#: source/ubl-strings.h:153 msgid "Load local configuration" msgstr "" -#: source/ubl-strings.h:152 +#: source/ubl-strings.h:154 msgid "Load from specific file" msgstr "" -#: source/ubl-strings.h:154 +#: source/ubl-strings.h:156 msgid "Save configuration" msgstr "" -#: source/ubl-strings.h:155 +#: source/ubl-strings.h:157 msgid "Save to global configuration" msgstr "" -#: source/ubl-strings.h:156 +#: source/ubl-strings.h:158 msgid "Save to local configuration" msgstr "" -#: source/ubl-strings.h:157 +#: source/ubl-strings.h:159 msgid "Save to specific file" msgstr "" -#: source/ubl-strings.h:159 +#: source/ubl-strings.h:161 msgid "Configuration" msgstr "" -#: source/ubl-strings.h:160 +#: source/ubl-strings.h:162 msgid "Installer configuration has been finished" msgstr "" -#: source/ubl-strings.h:161 +#: source/ubl-strings.h:163 msgid "Choose a save option on the header bar" msgstr "" -#: source/ubl-strings.h:163 +#: source/ubl-strings.h:165 msgid "Configuration has been saved" msgstr "" -#: source/ubl-strings.h:164 +#: source/ubl-strings.h:166 msgid "" "You can safely exit configurator or return and create new configuration file." msgstr "" -#: source/ubl-strings.h:166 +#: source/ubl-strings.h:168 msgid "Scroll to the end" msgstr "" -#: source/ubl-strings.h:167 +#: source/ubl-strings.h:169 msgid "Administrator" msgstr "" -#: source/ubl-strings.h:168 +#: source/ubl-strings.h:170 msgid "English, U.S.A.; Russian, Russia" msgstr "" -#: source/ubl-strings.h:170 +#: source/ubl-strings.h:172 msgid "Read installation log" msgstr "" -#: source/ubl-strings.h:171 +#: source/ubl-strings.h:173 msgid "Read progress log" msgstr "" -#: source/ubl-strings.h:173 +#: source/ubl-strings.h:175 msgid "Accept" msgstr "" -#: source/ubl-strings.h:174 +#: source/ubl-strings.h:176 msgid "Start GParted" msgstr "" -#: source/ubl-strings.h:176 +#: source/ubl-strings.h:178 msgid "Progress log" msgstr "" -#: source/ubl-strings.h:177 +#: source/ubl-strings.h:179 msgid "Installation log" msgstr "" -#: source/ubl-strings.h:179 +#: source/ubl-strings.h:181 msgid "Add layouts" msgstr "" -#: source/ubl-strings.h:180 source/ubl-strings.h:242 +#: source/ubl-strings.h:182 source/ubl-strings.h:244 msgid "Remove layout" msgstr "" -#: source/ubl-strings.h:182 +#: source/ubl-strings.h:184 msgid "System configuration..." msgstr "" -#: source/ubl-strings.h:184 +#: source/ubl-strings.h:186 msgid "Warning" msgstr "" -#: source/ubl-strings.h:186 +#: source/ubl-strings.h:188 msgid "" "Are you sure want to exit and\n" "interrupt installation process?" msgstr "" -#: source/ubl-strings.h:187 +#: source/ubl-strings.h:189 msgid "Are you sure want to interrupt installation process?" msgstr "" -#: source/ubl-strings.h:188 +#: source/ubl-strings.h:190 msgid "Are you sure want to reboot system?" msgstr "" -#: source/ubl-strings.h:190 source/ubl-strings.h:193 +#: source/ubl-strings.h:192 source/ubl-strings.h:195 msgid "Default (Use last succeeded)" msgstr "" -#: source/ubl-strings.h:191 +#: source/ubl-strings.h:193 msgid "Password encryption error" msgstr "" -#: source/ubl-strings.h:195 +#: source/ubl-strings.h:197 msgid "Launch" msgstr "" -#: source/ubl-strings.h:196 +#: source/ubl-strings.h:198 msgid "LTS" msgstr "" -#: source/ubl-strings.h:197 +#: source/ubl-strings.h:199 msgid "Reactive" msgstr "" -#: source/ubl-strings.h:198 +#: source/ubl-strings.h:200 msgid "Recomended" msgstr "" -#: source/ubl-strings.h:199 +#: source/ubl-strings.h:201 msgid "Hardened" msgstr "" -#: source/ubl-strings.h:200 +#: source/ubl-strings.h:202 msgid "RealTime" msgstr "" -#: source/ubl-strings.h:201 +#: source/ubl-strings.h:203 msgid "Stable" msgstr "" -#: source/ubl-strings.h:203 +#: source/ubl-strings.h:205 msgid "Are you sure want to remove service" msgstr "" -#: source/ubl-strings.h:203 +#: source/ubl-strings.h:205 msgid "from the list" msgstr "" -#: source/ubl-strings.h:204 +#: source/ubl-strings.h:206 msgid "Add service" msgstr "" -#: source/ubl-strings.h:205 +#: source/ubl-strings.h:207 msgid "Edit service" msgstr "" -#: source/ubl-strings.h:206 +#: source/ubl-strings.h:208 msgid "Remove service" msgstr "" -#: source/ubl-strings.h:207 +#: source/ubl-strings.h:209 msgid "is already exists. Do you really want to save user" msgstr "" -#: source/ubl-strings.h:210 +#: source/ubl-strings.h:212 msgid "Ip adress is incorrect" msgstr "" -#: source/ubl-strings.h:212 +#: source/ubl-strings.h:214 msgid "No kernel was enabled" msgstr "" -#: source/ubl-strings.h:214 +#: source/ubl-strings.h:216 msgid "Choose installation configuration file" msgstr "" -#: source/ubl-strings.h:215 +#: source/ubl-strings.h:217 msgid "Save and exit" msgstr "" -#: source/ubl-strings.h:216 +#: source/ubl-strings.h:218 msgid "No" msgstr "" -#: source/ubl-strings.h:221 +#: source/ubl-strings.h:223 msgid "About system installation" msgstr "" -#: source/ubl-strings.h:222 +#: source/ubl-strings.h:224 msgid "Repeating values" msgstr "" -#: source/ubl-strings.h:223 +#: source/ubl-strings.h:225 msgid "Source creation were not done" msgstr "" -#: source/ubl-strings.h:224 +#: source/ubl-strings.h:226 msgid "Configuration file does not exist. Create new configuration file?" msgstr "" -#: source/ubl-strings.h:225 +#: source/ubl-strings.h:227 msgid "" "Configuration file does not exist. Create new configuration file? New " "configuration file will be created at your user's home directory" msgstr "" -#: source/ubl-strings.h:226 +#: source/ubl-strings.h:228 msgid "" "Warning! Application was launched without root. Only configuration mode is " "allowed." msgstr "" -#: source/ubl-strings.h:227 +#: source/ubl-strings.h:229 msgid "Package were not found" msgstr "" -#: source/ubl-strings.h:228 +#: source/ubl-strings.h:230 msgid "Package information" msgstr "" -#: source/ubl-strings.h:229 +#: source/ubl-strings.h:231 msgid "Yes, I agree to the License Agreement" msgstr "" -#: source/ubl-strings.h:230 +#: source/ubl-strings.h:232 msgid "No, I do not agree" msgstr "" -#: source/ubl-strings.h:231 +#: source/ubl-strings.h:233 msgid "Add locales" msgstr "" -#: source/ubl-strings.h:232 +#: source/ubl-strings.h:234 msgid "Are you sure you want to remove current layout?" msgstr "" -#: source/ubl-strings.h:233 +#: source/ubl-strings.h:235 msgid "Layout deletion" msgstr "" -#: source/ubl-strings.h:234 source/ubl-strings.h:257 +#: source/ubl-strings.h:236 source/ubl-strings.h:259 msgid "Manual input:" msgstr "" -#: source/ubl-strings.h:237 +#: source/ubl-strings.h:239 msgid "Keyboard layouts:" msgstr "" -#: source/ubl-strings.h:239 +#: source/ubl-strings.h:241 msgid "Move layout up" msgstr "" -#: source/ubl-strings.h:240 +#: source/ubl-strings.h:242 msgid "Move layout down" msgstr "" -#: source/ubl-strings.h:241 +#: source/ubl-strings.h:243 msgid "Add layout" msgstr "" -#: source/ubl-strings.h:245 +#: source/ubl-strings.h:247 msgid "Layouts:" msgstr "" -#: source/ubl-strings.h:246 +#: source/ubl-strings.h:248 msgid "Default layout" msgstr "" -#: source/ubl-strings.h:247 +#: source/ubl-strings.h:249 msgid "Changing the layout:" msgstr "" -#: source/ubl-strings.h:248 +#: source/ubl-strings.h:250 msgid "Set Compose (Multi_Key) to the right Win key" msgstr "" -#: source/ubl-strings.h:249 +#: source/ubl-strings.h:251 msgid "Scroll Lock indication when switching layouts" msgstr "" -#: source/ubl-strings.h:250 +#: source/ubl-strings.h:252 msgid "NumLock:" msgstr "" -#: source/ubl-strings.h:253 +#: source/ubl-strings.h:255 msgid "Variant" msgstr "" -#: source/ubl-strings.h:254 source/ubl-strings.h:308 +#: source/ubl-strings.h:256 source/ubl-strings.h:312 msgid "Name" msgstr "" -#: source/ubl-strings.h:256 +#: source/ubl-strings.h:258 msgid "Options:" msgstr "" -#: source/ubl-strings.h:258 +#: source/ubl-strings.h:260 msgid "Specify your preferred keyboard settings" msgstr "" -#: source/ubl-strings.h:259 +#: source/ubl-strings.h:261 msgid "Available locales in the system:" msgstr "" -#: source/ubl-strings.h:260 +#: source/ubl-strings.h:262 msgid "System locale" msgstr "" -#: source/ubl-strings.h:261 +#: source/ubl-strings.h:263 msgid "Locale" msgstr "" -#: source/ubl-strings.h:262 source/ubl-strings.h:415 +#: source/ubl-strings.h:264 source/ubl-strings.h:418 msgid "System language" msgstr "" -#: source/ubl-strings.h:263 +#: source/ubl-strings.h:265 msgid "Territory" msgstr "" -#: source/ubl-strings.h:264 source/ubl-strings.h:416 +#: source/ubl-strings.h:266 source/ubl-strings.h:419 msgid "Specify your preferred system languages" msgstr "" -#: source/ubl-strings.h:265 +#: source/ubl-strings.h:267 msgid "Remove locale" msgstr "" -#: source/ubl-strings.h:266 +#: source/ubl-strings.h:268 msgid "New partition:" msgstr "" -#: source/ubl-strings.h:267 +#: source/ubl-strings.h:269 msgid "Personal" msgstr "" -#: source/ubl-strings.h:268 +#: source/ubl-strings.h:270 msgid "Hardware" msgstr "" -#: source/ubl-strings.h:269 +#: source/ubl-strings.h:271 msgid "System" msgstr "" -#: source/ubl-strings.h:270 +#: source/ubl-strings.h:272 msgid "Installing software by groups" msgstr "" -#: source/ubl-strings.h:271 +#: source/ubl-strings.h:273 msgid "Kernel" msgstr "" -#: source/ubl-strings.h:272 +#: source/ubl-strings.h:274 msgid "Kernel addons" msgstr "" -#: source/ubl-strings.h:273 +#: source/ubl-strings.h:275 msgid "Installing Modules" msgstr "" -#: source/ubl-strings.h:274 +#: source/ubl-strings.h:276 msgid "Installing Packages" msgstr "" -#: source/ubl-strings.h:276 -msgid "Startup services" +#: source/ubl-strings.h:278 +msgid "Autorun of services" msgstr "" -#: source/ubl-strings.h:277 -msgid "Autorun of services" +#: source/ubl-strings.h:279 +msgid "Autorun of applications" msgstr "" -#: source/ubl-strings.h:278 +#: source/ubl-strings.h:280 msgid "Boot load" msgstr "" -#: source/ubl-strings.h:279 +#: source/ubl-strings.h:281 msgid "Network" msgstr "" -#: source/ubl-strings.h:280 +#: source/ubl-strings.h:282 msgid "Enable VNC server" msgstr "" -#: source/ubl-strings.h:281 +#: source/ubl-strings.h:283 msgid "Enable RDP server" msgstr "" -#: source/ubl-strings.h:283 +#: source/ubl-strings.h:285 msgid "Autorun of application" msgstr "" -#: source/ubl-strings.h:284 +#: source/ubl-strings.h:286 msgid "Configuring autorun application" msgstr "" -#: source/ubl-strings.h:285 +#: source/ubl-strings.h:287 msgid "Application:" msgstr "" -#: source/ubl-strings.h:286 +#: source/ubl-strings.h:288 msgid "Group:" msgstr "" -#: source/ubl-strings.h:287 +#: source/ubl-strings.h:289 msgid "Application" msgstr "" -#: source/ubl-strings.h:288 +#: source/ubl-strings.h:290 msgid "Group" msgstr "" -#: source/ubl-strings.h:290 +#: source/ubl-strings.h:292 +msgid "Select your language:" +msgstr "" + +#: source/ubl-strings.h:293 +msgid "Selecting additional system kernel components" +msgstr "" + +#: source/ubl-strings.h:294 msgid "Package:" msgstr "" -#: source/ubl-strings.h:291 +#: source/ubl-strings.h:295 msgid "Module:" msgstr "" -#: source/ubl-strings.h:292 +#: source/ubl-strings.h:296 msgid "New section at" msgstr "" -#: source/ubl-strings.h:293 +#: source/ubl-strings.h:297 msgid "\"/ublinux-data/\" user data section" msgstr "" -#: source/ubl-strings.h:294 +#: source/ubl-strings.h:298 msgid "\"/ublinux/\" system section" msgstr "" -#: source/ubl-strings.h:295 +#: source/ubl-strings.h:299 msgid "Size:" msgstr "" -#: source/ubl-strings.h:296 +#: source/ubl-strings.h:300 msgid "Part label:" msgstr "" -#: source/ubl-strings.h:297 +#: source/ubl-strings.h:301 msgid "File system type:" msgstr "" -#: source/ubl-strings.h:298 +#: source/ubl-strings.h:302 msgid "File system label:" msgstr "" -#: source/ubl-strings.h:299 +#: source/ubl-strings.h:303 msgid "Encryption:" msgstr "" -#: source/ubl-strings.h:300 +#: source/ubl-strings.h:304 msgid "Off" msgstr "" -#: source/ubl-strings.h:301 +#: source/ubl-strings.h:305 msgid "Encryption password:" msgstr "" -#: source/ubl-strings.h:302 +#: source/ubl-strings.h:306 msgid "User name:" msgstr "" -#: source/ubl-strings.h:303 +#: source/ubl-strings.h:307 msgid "User password:" msgstr "" -#: source/ubl-strings.h:304 +#: source/ubl-strings.h:308 msgid "Add user" msgstr "" -#: source/ubl-strings.h:305 source/ubl-strings.h:325 +#: source/ubl-strings.h:309 source/ubl-strings.h:329 msgid "Choose a path for configuration file" msgstr "" -#: source/ubl-strings.h:306 +#: source/ubl-strings.h:310 msgid "File position:" msgstr "" -#: source/ubl-strings.h:307 +#: source/ubl-strings.h:311 msgid "Choose" msgstr "" -#: source/ubl-strings.h:309 +#: source/ubl-strings.h:313 msgid "Id" msgstr "" -#: source/ubl-strings.h:310 +#: source/ubl-strings.h:314 msgid "OS options were not found" msgstr "" -#: source/ubl-strings.h:311 +#: source/ubl-strings.h:315 msgid "Children options were not found" msgstr "" -#: source/ubl-strings.h:312 +#: source/ubl-strings.h:316 msgid "Connection type:" msgstr "" -#: source/ubl-strings.h:313 +#: source/ubl-strings.h:317 msgid "Enabled:" msgstr "" -#: source/ubl-strings.h:314 +#: source/ubl-strings.h:318 msgid "Automatically get IP adress with DHCP" msgstr "" -#: source/ubl-strings.h:315 +#: source/ubl-strings.h:319 msgid "IP adress:" msgstr "" -#: source/ubl-strings.h:316 +#: source/ubl-strings.h:320 msgid "Gateway:" msgstr "" -#: source/ubl-strings.h:317 +#: source/ubl-strings.h:321 msgid "Mask:" msgstr "" -#: source/ubl-strings.h:318 +#: source/ubl-strings.h:322 msgid "DNS-server:" msgstr "" -#: source/ubl-strings.h:319 +#: source/ubl-strings.h:323 msgid "Version" msgstr "" -#: source/ubl-strings.h:320 +#: source/ubl-strings.h:324 msgid "Unit:" msgstr "" -#: source/ubl-strings.h:321 +#: source/ubl-strings.h:325 msgid "Service:" msgstr "" -#: source/ubl-strings.h:322 +#: source/ubl-strings.h:326 msgid "Description:" msgstr "" -#: source/ubl-strings.h:323 +#: source/ubl-strings.h:327 msgid "Folder" msgstr "" -#: source/ubl-strings.h:324 +#: source/ubl-strings.h:328 msgid "ISO-image" msgstr "" -#: source/ubl-strings.h:326 +#: source/ubl-strings.h:330 msgid "Account name:" msgstr "" -#: source/ubl-strings.h:327 +#: source/ubl-strings.h:331 msgid "Login:" msgstr "" -#: source/ubl-strings.h:328 +#: source/ubl-strings.h:332 msgid "Password:" msgstr "" -#: source/ubl-strings.h:329 +#: source/ubl-strings.h:333 msgid "Recovery" msgstr "" -#: source/ubl-strings.h:330 +#: source/ubl-strings.h:334 msgid "Recovering bootloader, OS files, user data" msgstr "" -#: source/ubl-strings.h:331 +#: source/ubl-strings.h:335 msgid "Unpacking into an existing system" msgstr "" -#: source/ubl-strings.h:332 +#: source/ubl-strings.h:336 msgid "Device label" msgstr "" -#: source/ubl-strings.h:333 +#: source/ubl-strings.h:337 msgid "Partition:" msgstr "" -#: source/ubl-strings.h:334 +#: source/ubl-strings.h:338 msgid "Select partition:" msgstr "" -#: source/ubl-strings.h:335 +#: source/ubl-strings.h:339 msgid "Partition label:" msgstr "" -#: source/ubl-strings.h:336 +#: source/ubl-strings.h:340 msgid "Virtual device type:" msgstr "" -#: source/ubl-strings.h:337 +#: source/ubl-strings.h:341 msgid "Load type" msgstr "" -#: source/ubl-strings.h:338 +#: source/ubl-strings.h:342 msgid "BIOS boot sector" msgstr "" -#: source/ubl-strings.h:339 +#: source/ubl-strings.h:343 msgid "EFI section" msgstr "" -#: source/ubl-strings.h:340 +#: source/ubl-strings.h:344 msgid "Swap file" msgstr "" -#: source/ubl-strings.h:341 +#: source/ubl-strings.h:345 msgid "Corresponds to RAM size" msgstr "" -#: source/ubl-strings.h:342 +#: source/ubl-strings.h:346 msgid "Fixed size:" msgstr "" -#: source/ubl-strings.h:343 +#: source/ubl-strings.h:347 msgid "" "Attention! The system will be installed on the selected partition " "with OS already installed. All user data will be saved." msgstr "" -#: source/ubl-strings.h:344 +#: source/ubl-strings.h:348 msgid "" "Attention! The selected system components will be installed\n" "separately into the selected partition." msgstr "" -#: source/ubl-strings.h:345 +#: source/ubl-strings.h:349 msgid "Preparation" msgstr "" -#: source/ubl-strings.h:346 +#: source/ubl-strings.h:350 msgid "Additional" msgstr "" -#: source/ubl-strings.h:347 +#: source/ubl-strings.h:351 msgid "Completion" msgstr "" -#: source/ubl-strings.h:348 +#: source/ubl-strings.h:352 msgid "Licences" msgstr "" -#: source/ubl-strings.h:349 +#: source/ubl-strings.h:353 msgid "OS components" msgstr "" -#: source/ubl-strings.h:350 +#: source/ubl-strings.h:354 msgid "Configuration end" msgstr "" -#: source/ubl-strings.h:351 +#: source/ubl-strings.h:355 msgid "Choose system kernel" msgstr "" -#: source/ubl-strings.h:352 +#: source/ubl-strings.h:356 msgid "Install" msgstr "" -#: source/ubl-strings.h:353 +#: source/ubl-strings.h:357 msgid "Enable" msgstr "" -#: source/ubl-strings.h:354 +#: source/ubl-strings.h:358 msgid "Tags" msgstr "" -#: source/ubl-strings.h:355 +#: source/ubl-strings.h:359 msgid "Modules" msgstr "" -#: source/ubl-strings.h:357 +#: source/ubl-strings.h:361 msgid "Type" msgstr "" -#: source/ubl-strings.h:358 +#: source/ubl-strings.h:362 msgid "Additional components" msgstr "" -#: source/ubl-strings.h:359 +#: source/ubl-strings.h:363 msgid "Package name:" msgstr "" -#: source/ubl-strings.h:360 +#: source/ubl-strings.h:364 msgid "Accessed" msgstr "" -#: source/ubl-strings.h:361 +#: source/ubl-strings.h:365 msgid "Repository status:" msgstr "" -#: source/ubl-strings.h:362 +#: source/ubl-strings.h:366 msgid "Pacman software" msgstr "" -#: source/ubl-strings.h:363 +#: source/ubl-strings.h:367 msgid "Administrator password (root):" msgstr "" -#: source/ubl-strings.h:364 +#: source/ubl-strings.h:368 msgid "Add" msgstr "" -#: source/ubl-strings.h:365 +#: source/ubl-strings.h:369 msgid "Edit" msgstr "" -#: source/ubl-strings.h:366 +#: source/ubl-strings.h:370 msgid "Remove" msgstr "" -#: source/ubl-strings.h:367 +#: source/ubl-strings.h:371 msgid "Autostart" msgstr "" -#: source/ubl-strings.h:368 +#: source/ubl-strings.h:372 msgid "Unit" msgstr "" -#: source/ubl-strings.h:369 +#: source/ubl-strings.h:373 msgid "Service" msgstr "" -#: source/ubl-strings.h:370 +#: source/ubl-strings.h:374 msgid "Startup configuration" msgstr "" -#: source/ubl-strings.h:371 +#: source/ubl-strings.h:375 msgid "Boot selection menu timer:" msgstr "" -#: source/ubl-strings.h:372 +#: source/ubl-strings.h:376 msgid "seconds" msgstr "" -#: source/ubl-strings.h:373 +#: source/ubl-strings.h:377 msgid "Default OS:" msgstr "" -#: source/ubl-strings.h:374 +#: source/ubl-strings.h:378 msgid "Login without password request" msgstr "" -#: source/ubl-strings.h:375 +#: source/ubl-strings.h:379 msgid "Username" msgstr "" -#: source/ubl-strings.h:376 +#: source/ubl-strings.h:380 msgid "Password" msgstr "" -#: source/ubl-strings.h:377 +#: source/ubl-strings.h:381 msgid "Bootloader menu users" msgstr "" -#: source/ubl-strings.h:378 +#: source/ubl-strings.h:382 msgid "Bootloader" msgstr "" -#: source/ubl-strings.h:379 +#: source/ubl-strings.h:383 msgid "Domain name:" msgstr "" -#: source/ubl-strings.h:380 +#: source/ubl-strings.h:384 msgid "Domain administrator:" msgstr "" -#: source/ubl-strings.h:381 +#: source/ubl-strings.h:385 msgid "NTP Server:" msgstr "" -#: source/ubl-strings.h:382 +#: source/ubl-strings.h:386 msgid "Manual" msgstr "" -#: source/ubl-strings.h:383 +#: source/ubl-strings.h:387 msgid "Do not configure" msgstr "" -#: source/ubl-strings.h:384 +#: source/ubl-strings.h:388 msgid "auto" msgstr "" -#: source/ubl-strings.h:385 +#: source/ubl-strings.h:389 msgid "Net interfaces" msgstr "" -#: source/ubl-strings.h:386 +#: source/ubl-strings.h:390 msgid "Installation process" msgstr "" -#: source/ubl-strings.h:387 +#: source/ubl-strings.h:391 msgid "Completed" msgstr "" -#: source/ubl-strings.h:388 +#: source/ubl-strings.h:392 msgid "Configuration error" msgstr "" -#: source/ubl-strings.h:389 +#: source/ubl-strings.h:393 msgid "Configuration saved" msgstr "" -#: source/ubl-strings.h:390 +#: source/ubl-strings.h:394 msgid "Device label:" msgstr "" -#: source/ubl-strings.h:391 +#: source/ubl-strings.h:395 msgid "Common Installation" msgstr "" -#: source/ubl-strings.h:392 +#: source/ubl-strings.h:396 msgid "Select partiton:" msgstr "" -#: source/ubl-strings.h:393 +#: source/ubl-strings.h:397 msgid "Installation on same partition" msgstr "" -#: source/ubl-strings.h:394 +#: source/ubl-strings.h:398 msgid "Advanced section" msgstr "" -#: source/ubl-strings.h:395 +#: source/ubl-strings.h:399 msgid "Recovery section" msgstr "" -#: source/ubl-strings.h:396 +#: source/ubl-strings.h:400 msgid "Start installation scenario" msgstr "" -#: source/ubl-strings.h:397 +#: source/ubl-strings.h:401 msgid "Source" msgstr "" -#: source/ubl-strings.h:398 +#: source/ubl-strings.h:402 msgid "Skip configuration" msgstr "" -#: source/ubl-strings.h:400 +#: source/ubl-strings.h:404 msgid "" "You are now in the system setup program. This program will ask you a few " "questions and help you install the system." msgstr "" -#: source/ubl-strings.h:401 +#: source/ubl-strings.h:405 msgid "Licence agreement" msgstr "" -#: source/ubl-strings.h:402 +#: source/ubl-strings.h:406 msgid "Please read the license agreement before continuing the installation." msgstr "" -#: source/ubl-strings.h:403 +#: source/ubl-strings.h:407 msgid "Please specify what type of installation you want to perform" msgstr "" -#: source/ubl-strings.h:404 +#: source/ubl-strings.h:408 msgid "Selection of main components" msgstr "" -#: source/ubl-strings.h:405 +#: source/ubl-strings.h:409 msgid "Select modules found on the sources to be installed" msgstr "" -#: source/ubl-strings.h:406 +#: source/ubl-strings.h:410 msgid "Configuring the system" msgstr "" -#: source/ubl-strings.h:407 +#: source/ubl-strings.h:411 msgid "Configuring the parameters of the installed system" msgstr "" -#: source/ubl-strings.h:408 +#: source/ubl-strings.h:412 msgid "Selecting the system kernel" msgstr "" -#: source/ubl-strings.h:409 +#: source/ubl-strings.h:413 msgid "" "Selecting kernels for installation in the system and selecting the default " -"kernel. Internet access required" -msgstr "" - -#: source/ubl-strings.h:410 -msgid "Selecting additional system kernel components" +"kernel. Internet access is required to install additional kernels" msgstr "" -#: source/ubl-strings.h:411 +#: source/ubl-strings.h:414 msgid "" "Selecting additional kernel modules from the repository via the Internet" msgstr "" -#: source/ubl-strings.h:412 +#: source/ubl-strings.h:415 msgid "" "Search and select the software you need to install by package name. Internet " "access required" msgstr "" -#: source/ubl-strings.h:413 +#: source/ubl-strings.h:416 msgid "Chosen packages" msgstr "" -#: source/ubl-strings.h:414 +#: source/ubl-strings.h:417 msgid "Enter your time zone" msgstr "" -#: source/ubl-strings.h:417 +#: source/ubl-strings.h:420 msgid "Setting up system users" msgstr "" -#: source/ubl-strings.h:418 +#: source/ubl-strings.h:421 msgid "Startup" msgstr "" -#: source/ubl-strings.h:419 +#: source/ubl-strings.h:422 msgid "Configuring startup services" msgstr "" -#: source/ubl-strings.h:420 +#: source/ubl-strings.h:423 msgid "Starting the system" msgstr "" -#: source/ubl-strings.h:421 +#: source/ubl-strings.h:424 msgid "Setting up system boot" msgstr "" -#: source/ubl-strings.h:422 +#: source/ubl-strings.h:425 msgid "Setting up network access" msgstr "" -#: source/ubl-strings.h:423 +#: source/ubl-strings.h:426 msgid "Configuring the installation of additional components" msgstr "" -#: source/ubl-strings.h:424 +#: source/ubl-strings.h:427 msgid "Wait for the system to finish loading" msgstr "" -#: source/ubl-strings.h:425 -msgid "Selecting software from the installation media" -msgstr "" - -#: source/ubl-strings.h:426 +#: source/ubl-strings.h:428 msgid "Modules and packages" msgstr "" -#: source/ubl-strings.h:427 +#: source/ubl-strings.h:429 msgid "Setting the system" msgstr "" -#: source/ubl-strings.h:428 +#: source/ubl-strings.h:430 msgid "" "Selecting software packages to install from the repository. Internet access " "is required" msgstr "" -#: source/ubl-strings.h:429 +#: source/ubl-strings.h:431 msgid "" "Selecting software modules to install from the repository. Internet access " "is required" msgstr "" -#: source/ubl-strings.h:430 +#: source/ubl-strings.h:432 msgid "Language" msgstr "" -#: source/ubl-strings.h:431 +#: source/ubl-strings.h:433 msgid "On" msgstr "" -#: source/ubl-strings.h:432 +#: source/ubl-strings.h:434 msgid "" "Selecting the software group to install from the repository. Internet access " "is required" msgstr "" -#: source/ubl-strings.h:433 +#: source/ubl-strings.h:435 msgid "Recovery configuration has ended" msgstr "" -#: source/ubl-strings.h:434 +#: source/ubl-strings.h:436 msgid "System recovery is about to begin" msgstr "" -#: source/ubl-strings.h:435 +#: source/ubl-strings.h:437 msgid "System recovery" msgstr "" -#: source/ubl-strings.h:436 +#: source/ubl-strings.h:438 msgid "The process of restoring the system is underway..." msgstr "" -#: source/ubl-strings.h:437 +#: source/ubl-strings.h:439 msgid "System recovery successfully completed!" msgstr "" -#: source/ubl-strings.h:438 +#: source/ubl-strings.h:440 msgid "" "You can reboot the system and use the installed version or continue to work " "in the current system." msgstr "" -#: source/ubl-strings.h:440 +#: source/ubl-strings.h:441 +msgid "" +"Selecting additional system kernel components from the repository. Internet " +"access required" +msgstr "" + +#: source/ubl-strings.h:443 msgid "Product ecosystem" msgstr "" -#: source/ubl-strings.h:441 +#: source/ubl-strings.h:444 msgid "" "Developed by a team of professionals and successfully presented on the " "market.\n" @@ -1557,21 +1564,21 @@ msgid "" "- virtualization system" msgstr "" -#: source/ubl-strings.h:449 +#: source/ubl-strings.h:452 msgid "System Usage" msgstr "" -#: source/ubl-strings.h:450 +#: source/ubl-strings.h:453 msgid "" "It has been successfully used in both government agencies and commercial " "companies of various sizes." msgstr "" -#: source/ubl-strings.h:452 +#: source/ubl-strings.h:455 msgid "System Editions" msgstr "" -#: source/ubl-strings.h:453 +#: source/ubl-strings.h:456 msgid "" "- Desktop Enterprise for workstations (PCs, laptops, thin clients, " "dashboards, including interactive touchscreens and Multi-touch, industrial " @@ -1582,11 +1589,11 @@ msgid "" "- Desktop Basic for personal (home) use" msgstr "" -#: source/ubl-strings.h:459 +#: source/ubl-strings.h:462 msgid "Device Support" msgstr "" -#: source/ubl-strings.h:460 +#: source/ubl-strings.h:463 msgid "" "A wide range of devices is supported: printing equipment, scanners, webcams, " "etc.\n" @@ -1595,11 +1602,11 @@ msgid "" "simultaneous touch points" msgstr "" -#: source/ubl-strings.h:464 +#: source/ubl-strings.h:467 msgid "Modular secure architecture" msgstr "" -#: source/ubl-strings.h:465 +#: source/ubl-strings.h:468 msgid "" "- each OS component is represented by a separate module with a digital " "signature and integrity control\n" @@ -1608,11 +1615,11 @@ msgid "" "- ensures high performance and reliability of the system" msgstr "" -#: source/ubl-strings.h:470 +#: source/ubl-strings.h:473 msgid "Flexible Adaptation" msgstr "" -#: source/ubl-strings.h:471 +#: source/ubl-strings.h:474 msgid "" "By changing the system's modules, its capabilities are tailored to the needs " "of each user.\n" @@ -1622,59 +1629,59 @@ msgid "" "system capabilities." msgstr "" -#: source/ubl-strings.h:475 +#: source/ubl-strings.h:478 msgid "Domain architecture support" msgstr "" -#: source/ubl-strings.h:476 +#: source/ubl-strings.h:479 msgid "" "A domain controller allows you to:\n" +"- use group policies,\n" +"- centralized software deployment across your fleet,\n" +"- organize network resources and provide flexible access to them\n" "\n" -"use group policies,\n" -"centralized software deployment across your fleet,\n" -"organize network resources and provide flexible access to them\n" "Allows you to integrate your workstation with Microsoft Active Directory, " "FreeIPA, and Samba DC, applying the necessary domain settings to your " "workstation." msgstr "" -#: source/ubl-strings.h:483 +#: source/ubl-strings.h:486 msgid "Compatibility with Windows applications" msgstr "" -#: source/ubl-strings.h:484 +#: source/ubl-strings.h:487 msgid "" "Using Wine or the Winix integration module, you can launch and work with " "most Windows applications." msgstr "" -#: source/ubl-strings.h:486 +#: source/ubl-strings.h:489 msgid "High level of optimization" msgstr "" -#: source/ubl-strings.h:487 +#: source/ubl-strings.h:490 msgid "" "The system is lightweight. This allows for comfortable operation when " "booting from USB drives, on diskless workstations, and on thin clients. It " "also allows for the use of obsolete workstations with low performance" msgstr "" -#: source/ubl-strings.h:489 +#: source/ubl-strings.h:492 msgid "Intuitive interface" msgstr "" -#: source/ubl-strings.h:490 +#: source/ubl-strings.h:493 msgid "" "Support for XFCE, KDE Plasma, GNOME, MATE, LXQt, and other graphical " "environments allows you to choose and flexibly customize the most convenient " "desktop environment." msgstr "" -#: source/ubl-strings.h:492 +#: source/ubl-strings.h:495 msgid "Multi-workstation (multi-seat)" msgstr "" -#: source/ubl-strings.h:493 +#: source/ubl-strings.h:496 msgid "" "The ability for multiple users to work simultaneously at a single " "workstation.\n" @@ -1684,11 +1691,11 @@ msgid "" "for a separate graphics card" msgstr "" -#: source/ubl-strings.h:497 +#: source/ubl-strings.h:500 msgid "Application Software" msgstr "" -#: source/ubl-strings.h:498 +#: source/ubl-strings.h:501 msgid "" "The system comes with a comprehensive set of software out of the box to " "performing most common tasks.\n" @@ -1697,22 +1704,22 @@ msgid "" "additional software and hardware drivers" msgstr "" -#: source/ubl-strings.h:502 +#: source/ubl-strings.h:505 msgid "Corporate Services" msgstr "" -#: source/ubl-strings.h:503 +#: source/ubl-strings.h:506 msgid "" "The system allows you to deploy and manage or connect to a variety of " "centralized corporate services: email, group chats, video conferencing, " "collaboration systems, etc." msgstr "" -#: source/ubl-strings.h:505 +#: source/ubl-strings.h:508 msgid "Security and Resiliency, Sandbox Mode" msgstr "" -#: source/ubl-strings.h:506 +#: source/ubl-strings.h:509 msgid "" "A robust application package management system and built-in information " "security mechanisms ensure a high level of security and resiliency for the " @@ -1722,11 +1729,11 @@ msgid "" "operations. Upon reboot, the system will return to its default state." msgstr "" -#: source/ubl-strings.h:510 +#: source/ubl-strings.h:513 msgid "Custom repositories" msgstr "" -#: source/ubl-strings.h:511 +#: source/ubl-strings.h:514 msgid "" "- repositories are developed and maintained by the operating system " "developer,\n" @@ -1735,11 +1742,11 @@ msgid "" "create and adapt to their needs" msgstr "" -#: source/ubl-strings.h:515 +#: source/ubl-strings.h:518 msgid "Quick deployment" msgstr "" -#: source/ubl-strings.h:516 +#: source/ubl-strings.h:519 msgid "" "- System installation on modern hardware takes 3-5 minutes.\n" "- Ability to install the system over a network\n" @@ -1748,22 +1755,22 @@ msgid "" "required application software." msgstr "" -#: source/ubl-strings.h:520 +#: source/ubl-strings.h:523 msgid "Modular graphical administration interface" msgstr "" -#: source/ubl-strings.h:521 +#: source/ubl-strings.h:524 msgid "" "- A graphical administration interface that includes a comprehensive set of " "system utilities for system configuration\n" "- Web-based tools for administering local and remote workstations" msgstr "" -#: source/ubl-strings.h:524 +#: source/ubl-strings.h:527 msgid "UBPile Infrastructure Monitoring and Management System" msgstr "" -#: source/ubl-strings.h:525 +#: source/ubl-strings.h:528 msgid "" "Includes automation and orchestration mechanisms for comprehensive " "information infrastructure management.\n" @@ -1772,11 +1779,11 @@ msgid "" "as well as manage computing equipment." msgstr "" -#: source/ubl-strings.h:529 +#: source/ubl-strings.h:532 msgid "Server virtualization tools" msgstr "" -#: source/ubl-strings.h:530 +#: source/ubl-strings.h:533 msgid "" "The server and workstation virtualization system enables efficient " "deployment and management of virtual IT infrastructure in data centers.\n" @@ -1786,11 +1793,11 @@ msgid "" "- Backup, data protection, and VDI mechanisms." msgstr "" -#: source/ubl-strings.h:535 +#: source/ubl-strings.h:538 msgid "Professional technical support" msgstr "" -#: source/ubl-strings.h:536 +#: source/ubl-strings.h:539 msgid "" "You can choose the level of technical support for the system that most " "appropriate for your needs.\n" @@ -1798,22 +1805,22 @@ msgid "" "For more information, visit our website the \"Support Levels\" section." msgstr "" -#: source/ubl-strings.h:540 +#: source/ubl-strings.h:543 msgid "Interactive Knowledge Base" msgstr "" -#: source/ubl-strings.h:541 +#: source/ubl-strings.h:544 msgid "" "Continuously evolving and clearly describes the installation and " "configuration of the system, as well as the use of its features. Located at " "https://wiki.ublinux.com" msgstr "" -#: source/ubl-strings.h:543 +#: source/ubl-strings.h:546 msgid "Network Boot" msgstr "" -#: source/ubl-strings.h:544 +#: source/ubl-strings.h:547 msgid "" "Allows system booting for diskless and standard workstations over a local " "network or the Internet (even over slow connection channels)." diff --git a/locale/ubinstall-gtk_ru.po b/locale/ubinstall-gtk_ru.po index 346e727..230f158 100644 --- a/locale/ubinstall-gtk_ru.po +++ b/locale/ubinstall-gtk_ru.po @@ -21,59 +21,61 @@ msgstr "" msgid "System installation" msgstr "Программа установки" -#: source/ubl-strings.h:1 -msgid "https://wiki.ublinux.com/en/software/programs_and_utilities/all/ubinstall-gtk" -msgstr "https://wiki.ublinux.com/ru/software/programs_and_utilities/all/ubinstall-gtk" - #: source/ubl-strings.h:3 msgid "" +"https://wiki.ublinux.com/en/software/programs_and_utilities/all/ubinstall-gtk" +msgstr "" +"https://wiki.ublinux.com/ru/software/programs_and_utilities/all/ubinstall-gtk" + +#: source/ubl-strings.h:5 +msgid "" "This program will ask you few questions\n" "and help you install system on your computer" msgstr "" "Эта программа задаст вам несколько вопросов\n" "и поможет установить UBLinux на ваш компьютер" -#: source/ubl-strings.h:5 +#: source/ubl-strings.h:7 msgid "Open" msgstr "Открыть" -#: source/ubl-strings.h:8 +#: source/ubl-strings.h:10 msgid "Dry run; Installation will not start" msgstr "Пробный запуск; установка не начинается." -#: source/ubl-strings.h:9 +#: source/ubl-strings.h:11 msgid "Set ini file for configuration mode" msgstr "Выберите путь до файла конфигурации" -#: source/ubl-strings.h:12 source/ubl-strings.h:251 +#: source/ubl-strings.h:14 source/ubl-strings.h:253 msgid "Keyboard layout" msgstr "Раскладка клавиатуры" -#: source/ubl-strings.h:13 +#: source/ubl-strings.h:15 msgid "New configuration file creation failed" msgstr "Ошибка создания нового файла конфигурации" -#: source/ubl-strings.h:15 +#: source/ubl-strings.h:17 msgid "Cancel" msgstr "Отмена" -#: source/ubl-strings.h:16 +#: source/ubl-strings.h:18 msgid "Back" msgstr "Назад" -#: source/ubl-strings.h:17 +#: source/ubl-strings.h:19 msgid "Next" msgstr "Далее" -#: source/ubl-strings.h:18 +#: source/ubl-strings.h:20 msgid "Root only" msgstr "Только root" -#: source/ubl-strings.h:19 +#: source/ubl-strings.h:21 msgid "Welcome" msgstr "Добро пожаловать" -#: source/ubl-strings.h:20 +#: source/ubl-strings.h:22 msgid "" "Licence\n" "agreement" @@ -81,155 +83,155 @@ msgstr "" "Лицензионное\n" "соглашение" -#: source/ubl-strings.h:21 +#: source/ubl-strings.h:23 msgid "Sections" msgstr "Разделы" -#: source/ubl-strings.h:22 +#: source/ubl-strings.h:24 msgid "Installation" msgstr "Установка" -#: source/ubl-strings.h:23 source/ubl-strings.h:37 source/ubl-strings.h:275 +#: source/ubl-strings.h:25 source/ubl-strings.h:39 source/ubl-strings.h:277 msgid "Location" msgstr "Местоположение" -#: source/ubl-strings.h:24 +#: source/ubl-strings.h:26 msgid "Keyboard" msgstr "Клавиатура" -#: source/ubl-strings.h:25 +#: source/ubl-strings.h:27 msgid "Users" msgstr "Пользователи" -#: source/ubl-strings.h:26 +#: source/ubl-strings.h:28 msgid "Deleting all data on the selected disk and then installing the system" msgstr "" "Удаление всех данных на выбранном диске с последующей установкой системы " "UBLinux" -#: source/ubl-strings.h:27 +#: source/ubl-strings.h:29 msgid "Installation next to another system" msgstr "Установка рядом с другой системой" -#: source/ubl-strings.h:28 +#: source/ubl-strings.h:30 msgid "Shrinking a partition and creating a new one for installing OS" msgstr "Уменьшение раздела и создание нового для установки ОС" -#: source/ubl-strings.h:29 +#: source/ubl-strings.h:31 msgid "Installation on the same partition as another system" msgstr "Установка в раздел другой системы" -#: source/ubl-strings.h:30 +#: source/ubl-strings.h:32 msgid "Unpacking the file system into an existing system" msgstr "Распаковка файловой системы в существующую систему." -#: source/ubl-strings.h:31 source/ubl-strings.h:356 +#: source/ubl-strings.h:33 source/ubl-strings.h:360 msgid "" "Selecting additional software to install from the repository via the Internet" msgstr "" "Выбор дополнительного ПО для установки из репозитория через сеть Интернет" -#: source/ubl-strings.h:32 +#: source/ubl-strings.h:34 msgid "Chosen" msgstr "Выбран" -#: source/ubl-strings.h:33 +#: source/ubl-strings.h:35 msgid "Module name" msgstr "Название модуля" -#: source/ubl-strings.h:34 +#: source/ubl-strings.h:36 msgid "Tag" msgstr "Тэг" -#: source/ubl-strings.h:35 source/ubl-strings.h:255 +#: source/ubl-strings.h:37 source/ubl-strings.h:257 msgid "Description" msgstr "Описание" -#: source/ubl-strings.h:36 +#: source/ubl-strings.h:38 msgid "Installation completion" msgstr "Завершение установки" -#: source/ubl-strings.h:38 +#: source/ubl-strings.h:40 msgid "Region:" msgstr "Регион:" -#: source/ubl-strings.h:39 +#: source/ubl-strings.h:41 msgid "Zone:" msgstr "Зона:" -#: source/ubl-strings.h:40 +#: source/ubl-strings.h:42 msgid "Language:" msgstr "Язык:" -#: source/ubl-strings.h:41 source/ubl-strings.h:235 source/ubl-strings.h:244 +#: source/ubl-strings.h:43 source/ubl-strings.h:237 source/ubl-strings.h:246 msgid "Keyboard model:" msgstr "Модель клавиатуры:" -#: source/ubl-strings.h:42 +#: source/ubl-strings.h:44 msgid "Default layout (ru)" msgstr "Раскладка по умолчанию (ru)" -#: source/ubl-strings.h:43 +#: source/ubl-strings.h:45 msgid "Define" msgstr "Задать" -#: source/ubl-strings.h:44 +#: source/ubl-strings.h:46 msgid "Settings" msgstr "Настройки" -#: source/ubl-strings.h:45 +#: source/ubl-strings.h:47 msgid "Administrator name:" msgstr "Администратор" -#: source/ubl-strings.h:46 +#: source/ubl-strings.h:48 msgid "Administrator login:" msgstr "Администратор" -#: source/ubl-strings.h:47 +#: source/ubl-strings.h:49 msgid "Administrator password:" msgstr "Пароль администратора (root):" -#: source/ubl-strings.h:48 +#: source/ubl-strings.h:50 msgid "Default" msgstr "По умолчанию" -#: source/ubl-strings.h:49 +#: source/ubl-strings.h:51 msgid "Set a password" msgstr "Введите пароль" -#: source/ubl-strings.h:50 +#: source/ubl-strings.h:52 msgid "Do no set a password" msgstr "Пароль не требуется" -#: source/ubl-strings.h:51 +#: source/ubl-strings.h:53 msgid "Automatic login without password prompt" msgstr "Автоматический вход в систему без запроса пароля" -#: source/ubl-strings.h:52 +#: source/ubl-strings.h:54 msgid "User root password:" msgstr "Введите пароль" -#: source/ubl-strings.h:53 +#: source/ubl-strings.h:55 msgid "Host name:" msgstr "Имя компьютера:" -#: source/ubl-strings.h:54 +#: source/ubl-strings.h:56 msgid "Automatically" msgstr "Автоматически" -#: source/ubl-strings.h:55 source/ubl-strings.h:207 +#: source/ubl-strings.h:57 source/ubl-strings.h:209 msgid "User" msgstr "Пользователь" -#: source/ubl-strings.h:56 +#: source/ubl-strings.h:58 msgid "Select device:" msgstr "Выберите устройство:" -#: source/ubl-strings.h:57 +#: source/ubl-strings.h:59 msgid "Choose a section:" msgstr "Выберите раздел:" -#: source/ubl-strings.h:58 +#: source/ubl-strings.h:60 msgid "" "Attention! The selected partition will be reduced and the next new " "partition will be created. The data will be saved in the selected partition. " @@ -239,70 +241,70 @@ msgstr "" "новый раздел. На выбранном разделе данные будут сохранены. Новый раздел " "будет отформатирован." -#: source/ubl-strings.h:59 +#: source/ubl-strings.h:61 msgid "Device" msgstr "Устройство" -#: source/ubl-strings.h:60 +#: source/ubl-strings.h:62 msgid "Label" msgstr "Метка" -#: source/ubl-strings.h:61 +#: source/ubl-strings.h:63 msgid "Size" msgstr "Общий размер" -#: source/ubl-strings.h:62 +#: source/ubl-strings.h:64 msgid "Free" msgstr "Свободно" -#: source/ubl-strings.h:63 +#: source/ubl-strings.h:65 msgid "Specify the size of the new partition for system:" msgstr "Укажите размер нового раздела для ОС:" -#: source/ubl-strings.h:64 +#: source/ubl-strings.h:66 msgid "Tb" msgstr "Тб" -#: source/ubl-strings.h:65 +#: source/ubl-strings.h:67 msgid "Gb" msgstr "Гб" -#: source/ubl-strings.h:66 +#: source/ubl-strings.h:68 msgid "Mb" msgstr "Мб" -#: source/ubl-strings.h:67 +#: source/ubl-strings.h:69 msgid "Available languages in the system:" msgstr "Доступные языки в системе:" -#: source/ubl-strings.h:68 source/ubl-strings.h:109 +#: source/ubl-strings.h:70 source/ubl-strings.h:111 msgid "Available languages in the system" msgstr "Доступные языки в системе" -#: source/ubl-strings.h:70 +#: source/ubl-strings.h:72 msgid "No device were chosen" msgstr "Устройство не выбрано" -#: source/ubl-strings.h:71 +#: source/ubl-strings.h:73 msgid "No partition were chosen" msgstr "Раздел не выбран" -#: source/ubl-strings.h:73 +#: source/ubl-strings.h:75 msgid "Installation parameters" msgstr "Параметры установки" -#: source/ubl-strings.h:75 +#: source/ubl-strings.h:77 msgid "Advanced installation mode" msgstr "Расширенный режим установки" -#: source/ubl-strings.h:76 +#: source/ubl-strings.h:78 msgid "" "Installing OS files, user data on different partitions, creating RAID, etc." msgstr "" "Установка файлов ОС, пользовательских данных на разные разделы, создание " "RAID и др." -#: source/ubl-strings.h:77 +#: source/ubl-strings.h:79 msgid "" "Attention! The selected system components will be installed\n" "separately into the selected partition." @@ -310,108 +312,108 @@ msgstr "" "Внимание! В выбранный раздел будет произведена раздельная установка " "выбранных компонентов ОС." -#: source/ubl-strings.h:78 +#: source/ubl-strings.h:80 msgid "GRUB install" msgstr "Установка GRUB" -#: source/ubl-strings.h:79 +#: source/ubl-strings.h:81 msgid "Install the GRUB bootloader" msgstr "Установить загрузчик GRUB" -#: source/ubl-strings.h:80 +#: source/ubl-strings.h:82 msgid "GRUB update" msgstr "Обновление GRUB" -#: source/ubl-strings.h:81 +#: source/ubl-strings.h:83 msgid "Update (reinstall) the GRUB bootloader" msgstr "Обновить (переустановить) загрузчик GRUB" -#: source/ubl-strings.h:82 +#: source/ubl-strings.h:84 msgid "Separate installation" msgstr "Раздельная установка" -#: source/ubl-strings.h:83 +#: source/ubl-strings.h:85 msgid "Installing OS components and user data on different disk partitions" msgstr "" "Установка компонентов ОС и пользовательских данных на разные разделы диска" -#: source/ubl-strings.h:84 +#: source/ubl-strings.h:86 msgid "OS only" msgstr "Только ОС" -#: source/ubl-strings.h:85 +#: source/ubl-strings.h:87 msgid "Installing only OS components without user data" msgstr "Установка только компоненов ОС без пользовательских данных" -#: source/ubl-strings.h:86 +#: source/ubl-strings.h:88 msgid "User data only" msgstr "Только пользовательские данные" -#: source/ubl-strings.h:87 +#: source/ubl-strings.h:89 msgid "Installing only user data without OS components" msgstr "Установка только пользовательских данных без компонентов ОС" -#: source/ubl-strings.h:89 source/ubl-strings.h:110 +#: source/ubl-strings.h:91 source/ubl-strings.h:112 msgid "Keyboard layout language" msgstr "Раскладка клавиатуры" -#: source/ubl-strings.h:91 +#: source/ubl-strings.h:93 msgid "Region were not fullified" msgstr "Регион не был выбран" -#: source/ubl-strings.h:92 +#: source/ubl-strings.h:94 msgid "Zone were not fullified" msgstr "Зона не была выбрана" -#: source/ubl-strings.h:93 +#: source/ubl-strings.h:95 msgid "Languages list is empty" msgstr "Список доступных языков не был заполнен" -#: source/ubl-strings.h:94 +#: source/ubl-strings.h:96 msgid "System locale hasn't been chosen" msgstr "Язык системы не был выбран" -#: source/ubl-strings.h:95 +#: source/ubl-strings.h:97 msgid "Manual layouts has been chosen but empty" msgstr "Ручной выбор списка раскладок клавиатуры выбран, но список пуст" -#: source/ubl-strings.h:97 +#: source/ubl-strings.h:99 msgid "Password input" msgstr "Пароль" -#: source/ubl-strings.h:98 +#: source/ubl-strings.h:100 msgid "Password mismatch" msgstr "Пароли не совпадают" -#: source/ubl-strings.h:99 +#: source/ubl-strings.h:101 msgid "Empty important field" msgstr "Пустое важное поле" -#: source/ubl-strings.h:100 +#: source/ubl-strings.h:102 msgid "Password must be at least" msgstr "Пароль должен быть как минимум" -#: source/ubl-strings.h:100 +#: source/ubl-strings.h:102 msgid "characters" msgstr "символов" -#: source/ubl-strings.h:102 +#: source/ubl-strings.h:104 msgid "Restart PC" msgstr "Перезагрузка" -#: source/ubl-strings.h:103 +#: source/ubl-strings.h:105 msgid "Choose file system type for the section:" msgstr "Выберите тип файловой системы для раздела" -#: source/ubl-strings.h:104 +#: source/ubl-strings.h:106 msgid "Section name:" msgstr "Имя раздела:" -#: source/ubl-strings.h:105 +#: source/ubl-strings.h:107 msgid "Format" msgstr "Форматировать" -#: source/ubl-strings.h:107 +#: source/ubl-strings.h:109 msgid "" "You have system installed on your computer.\n" "You can reboot and use your new system\n" @@ -421,71 +423,71 @@ msgstr "" "Вы можете перезагрузить компьютер и использовать новую систему.\n" "или продолжить работу в среде Live системы." -#: source/ubl-strings.h:111 +#: source/ubl-strings.h:113 msgid "Apply" msgstr "Применить" -#: source/ubl-strings.h:112 +#: source/ubl-strings.h:114 msgid "Success" msgstr "Готово" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:115 msgid "Layout" msgstr "Раскладка клавиатуры" -#: source/ubl-strings.h:114 source/ubl-strings.h:252 +#: source/ubl-strings.h:116 source/ubl-strings.h:254 msgid "Designation" msgstr "Обозначение" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:117 msgid "Serial" msgstr "Серийный номер" -#: source/ubl-strings.h:116 +#: source/ubl-strings.h:118 msgid "Section" msgstr "Раздел" -#: source/ubl-strings.h:117 +#: source/ubl-strings.h:119 msgid "Capacity" msgstr "Объём" -#: source/ubl-strings.h:118 +#: source/ubl-strings.h:120 msgid "Free space" msgstr "Свободно" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:121 msgid "File system" msgstr "Файловая система" -#: source/ubl-strings.h:120 +#: source/ubl-strings.h:122 msgid "Default (L_Alt + L_Shift)" msgstr "По умолчанию (L_Alt + L_Shift)" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:123 msgid "Default (Regular 105-key)" msgstr "По умолчанию (Обычная 105-клавишная)" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:125 msgid "Installation configuration has ended" msgstr "Настройка установщика завершена" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:126 msgid "System installation is about to begin" msgstr "Начало установки системы" -#: source/ubl-strings.h:126 +#: source/ubl-strings.h:128 msgid "Documentation" msgstr "Справка" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:129 msgid "About" msgstr "О программе" -#: source/ubl-strings.h:129 +#: source/ubl-strings.h:131 msgid "Would you like to read documentation in the Web?" msgstr "Вы хотите прочитать документацию в Сети?" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:132 msgid "" "You will be redirected to documentation website where documentation is\n" "translated and supported by community." @@ -494,19 +496,19 @@ msgstr "" "переводится\n" "и поддерживается сообществом" -#: source/ubl-strings.h:131 +#: source/ubl-strings.h:133 msgid "Always redirect to online documentation" msgstr "Всегда перенаправлять" -#: source/ubl-strings.h:132 +#: source/ubl-strings.h:134 msgid "Open documentation" msgstr "Открыть документацию" -#: source/ubl-strings.h:134 +#: source/ubl-strings.h:136 msgid "Installation error" msgstr "Ошибка установки" -#: source/ubl-strings.h:135 +#: source/ubl-strings.h:137 msgid "" "Attention! The system will be installed on the selected partition with OS " "already installed. All user data will be saved." @@ -515,146 +517,146 @@ msgstr "" "Если не менять тип ФС и не форматировать, все данные на разделе будут " "сохранены." -#: source/ubl-strings.h:137 +#: source/ubl-strings.h:139 msgid "Installation options" msgstr "Параметры установки" -#: source/ubl-strings.h:139 +#: source/ubl-strings.h:141 msgid "Configuration mode" msgstr "Режим конфигурации" -#: source/ubl-strings.h:140 +#: source/ubl-strings.h:142 msgid "Attention! Configuration mode was enabled!" msgstr "Внимание! Включен режим конфигурации!" -#: source/ubl-strings.h:141 +#: source/ubl-strings.h:143 msgid "Configuration will be saved in configuration file" msgstr "Конфигурация будет сохранена в файл конфигурации" -#: source/ubl-strings.h:142 +#: source/ubl-strings.h:144 msgid "Error" msgstr "Ошибка" -#: source/ubl-strings.h:143 +#: source/ubl-strings.h:145 msgid "Error has occured while installation process" msgstr "Во время процесса установки произошла ошибка" -#: source/ubl-strings.h:145 +#: source/ubl-strings.h:147 msgid "Log exploration" msgstr "Просмотр лога" -#: source/ubl-strings.h:146 +#: source/ubl-strings.h:148 msgid "Save" msgstr "Сохранить" -#: source/ubl-strings.h:147 +#: source/ubl-strings.h:149 msgid "Load" msgstr "Загрузить" -#: source/ubl-strings.h:150 +#: source/ubl-strings.h:152 msgid "Load global configuration" msgstr "Загрузить глобальную конфигурацию" -#: source/ubl-strings.h:151 +#: source/ubl-strings.h:153 msgid "Load local configuration" msgstr "Загрузить локальную конфигурацию" -#: source/ubl-strings.h:152 +#: source/ubl-strings.h:154 msgid "Load from specific file" msgstr "Загрузить из файла" -#: source/ubl-strings.h:154 +#: source/ubl-strings.h:156 msgid "Save configuration" msgstr "Сохранить конфигурацию" -#: source/ubl-strings.h:155 +#: source/ubl-strings.h:157 msgid "Save to global configuration" msgstr "Сохранить глобальную конфигурацию" -#: source/ubl-strings.h:156 +#: source/ubl-strings.h:158 msgid "Save to local configuration" msgstr "Сохранить в локальную конфигурацию" -#: source/ubl-strings.h:157 +#: source/ubl-strings.h:159 msgid "Save to specific file" msgstr "Сохранить в файл" -#: source/ubl-strings.h:159 +#: source/ubl-strings.h:161 msgid "Configuration" msgstr "Конфигурация" -#: source/ubl-strings.h:160 +#: source/ubl-strings.h:162 msgid "Installer configuration has been finished" msgstr "Настройка конфигурации завершена" -#: source/ubl-strings.h:161 +#: source/ubl-strings.h:163 msgid "Choose a save option on the header bar" msgstr "Выберите опцию сохранения на верхней панели" -#: source/ubl-strings.h:163 +#: source/ubl-strings.h:165 msgid "Configuration has been saved" msgstr "Конфигурация сохранена" -#: source/ubl-strings.h:164 +#: source/ubl-strings.h:166 msgid "" "You can safely exit configurator or return and create new configuration file." msgstr "" "Вы можете выйти из настройки конфигурации или настроить другой файл " "конфигурации." -#: source/ubl-strings.h:166 +#: source/ubl-strings.h:168 msgid "Scroll to the end" msgstr "Прокрутить до конца" -#: source/ubl-strings.h:167 +#: source/ubl-strings.h:169 msgid "Administrator" msgstr "Администратор" -#: source/ubl-strings.h:168 +#: source/ubl-strings.h:170 msgid "English, U.S.A.; Russian, Russia" msgstr "Английский, США; Русский, Россия" -#: source/ubl-strings.h:170 +#: source/ubl-strings.h:172 msgid "Read installation log" msgstr "Открыть лог установки" -#: source/ubl-strings.h:171 +#: source/ubl-strings.h:173 msgid "Read progress log" msgstr "Открыть лог прогресса" -#: source/ubl-strings.h:173 +#: source/ubl-strings.h:175 msgid "Accept" msgstr "Принять" -#: source/ubl-strings.h:174 +#: source/ubl-strings.h:176 msgid "Start GParted" msgstr "Запустить GParted" -#: source/ubl-strings.h:176 +#: source/ubl-strings.h:178 msgid "Progress log" msgstr "Лог прогресса" -#: source/ubl-strings.h:177 +#: source/ubl-strings.h:179 msgid "Installation log" msgstr "Лог установки" -#: source/ubl-strings.h:179 +#: source/ubl-strings.h:181 msgid "Add layouts" msgstr "Добавить раскладки" -#: source/ubl-strings.h:180 source/ubl-strings.h:242 +#: source/ubl-strings.h:182 source/ubl-strings.h:244 msgid "Remove layout" msgstr "Удалить раскладку" -#: source/ubl-strings.h:182 +#: source/ubl-strings.h:184 msgid "System configuration..." msgstr "Конфигурация системы..." -#: source/ubl-strings.h:184 +#: source/ubl-strings.h:186 msgid "Warning" msgstr "Внимание" -#: source/ubl-strings.h:186 +#: source/ubl-strings.h:188 msgid "" "Are you sure want to exit and\n" "interrupt installation process?" @@ -662,112 +664,112 @@ msgstr "" "Вы уверены, что хотите закрыть программу и\n" "прервать процесс установки?" -#: source/ubl-strings.h:187 +#: source/ubl-strings.h:189 msgid "Are you sure want to interrupt installation process?" msgstr "Вы уверены, что хотите прервать процесс установки?" -#: source/ubl-strings.h:188 +#: source/ubl-strings.h:190 msgid "Are you sure want to reboot system?" msgstr "Вы уверены что хотите перезагрузить систему?" -#: source/ubl-strings.h:190 source/ubl-strings.h:193 +#: source/ubl-strings.h:192 source/ubl-strings.h:195 msgid "Default (Use last succeeded)" msgstr "По умолчанию (Использовать последний успешный)" -#: source/ubl-strings.h:191 +#: source/ubl-strings.h:193 msgid "Password encryption error" msgstr "Ошибка шифрования пароля" -#: source/ubl-strings.h:195 +#: source/ubl-strings.h:197 msgid "Launch" msgstr "Запустить" -#: source/ubl-strings.h:196 +#: source/ubl-strings.h:198 msgid "LTS" msgstr "LTS" -#: source/ubl-strings.h:197 +#: source/ubl-strings.h:199 msgid "Reactive" msgstr "Реактивное" -#: source/ubl-strings.h:198 +#: source/ubl-strings.h:200 msgid "Recomended" msgstr "Рекомендуется" -#: source/ubl-strings.h:199 +#: source/ubl-strings.h:201 msgid "Hardened" msgstr "Усиленная защита" -#: source/ubl-strings.h:200 +#: source/ubl-strings.h:202 msgid "RealTime" msgstr "Реальное время" -#: source/ubl-strings.h:201 +#: source/ubl-strings.h:203 msgid "Stable" msgstr "Стабильное" -#: source/ubl-strings.h:203 +#: source/ubl-strings.h:205 msgid "Are you sure want to remove service" msgstr "Вы уверены что хотите удалить службу?" -#: source/ubl-strings.h:203 +#: source/ubl-strings.h:205 msgid "from the list" msgstr "из списка" -#: source/ubl-strings.h:204 +#: source/ubl-strings.h:206 msgid "Add service" msgstr "Добавить службу" -#: source/ubl-strings.h:205 +#: source/ubl-strings.h:207 msgid "Edit service" msgstr "Изменить службу" -#: source/ubl-strings.h:206 +#: source/ubl-strings.h:208 msgid "Remove service" msgstr "Удалить службу" -#: source/ubl-strings.h:207 +#: source/ubl-strings.h:209 msgid "is already exists. Do you really want to save user" msgstr "уже существует. Вы уверены что хотите сохранить пользователя" -#: source/ubl-strings.h:210 +#: source/ubl-strings.h:212 msgid "Ip adress is incorrect" msgstr "Неверный Ip адрес" -#: source/ubl-strings.h:212 +#: source/ubl-strings.h:214 msgid "No kernel was enabled" msgstr "Ни одно ядро не было включено" -#: source/ubl-strings.h:214 +#: source/ubl-strings.h:216 msgid "Choose installation configuration file" msgstr "Выберите файл конфигурации установки" -#: source/ubl-strings.h:215 +#: source/ubl-strings.h:217 msgid "Save and exit" msgstr "Сохранить и выйти" -#: source/ubl-strings.h:216 +#: source/ubl-strings.h:218 msgid "No" msgstr "Нет" -#: source/ubl-strings.h:221 +#: source/ubl-strings.h:223 msgid "About system installation" msgstr "О Программе установки системы" -#: source/ubl-strings.h:222 +#: source/ubl-strings.h:224 msgid "Repeating values" msgstr "Повторяющиеся значения" -#: source/ubl-strings.h:223 +#: source/ubl-strings.h:225 msgid "Source creation were not done" msgstr "Создание источника не было выполнено." -#: source/ubl-strings.h:224 +#: source/ubl-strings.h:226 msgid "Configuration file does not exist. Create new configuration file?" msgstr "" "Файл конфигурации не существует. Нужно ли создать новый файл конфигурации?" -#: source/ubl-strings.h:225 +#: source/ubl-strings.h:227 msgid "" "Configuration file does not exist. Create new configuration file? New " "configuration file will be created at your user's home directory" @@ -775,7 +777,7 @@ msgstr "" "Файл конфигурации не существует. Создать новый файл конфигурации? Новый файл " "конфигурации будет создан в домашнем каталоге пользователя." -#: source/ubl-strings.h:226 +#: source/ubl-strings.h:228 msgid "" "Warning! Application was launched without root. Only configuration mode is " "allowed." @@ -783,411 +785,420 @@ msgstr "" "Внимание! Приложение запущено без прав root. Разрешен только режим " "конфигурации." -#: source/ubl-strings.h:227 +#: source/ubl-strings.h:229 msgid "Package were not found" msgstr "Пакеты не найдены" -#: source/ubl-strings.h:228 +#: source/ubl-strings.h:230 msgid "Package information" msgstr "Информация о пакете" -#: source/ubl-strings.h:229 +#: source/ubl-strings.h:231 msgid "Yes, I agree to the License Agreement" msgstr "Да, я согласен с лицензионным соглашением" -#: source/ubl-strings.h:230 +#: source/ubl-strings.h:232 msgid "No, I do not agree" msgstr "Нет, я не согласен" -#: source/ubl-strings.h:231 +#: source/ubl-strings.h:233 msgid "Add locales" msgstr "Добавить локаль" -#: source/ubl-strings.h:232 +#: source/ubl-strings.h:234 msgid "Are you sure you want to remove current layout?" msgstr "Вы уверены что хотите удалить данную раскладку?" -#: source/ubl-strings.h:233 +#: source/ubl-strings.h:235 msgid "Layout deletion" msgstr "Удаление раскладки" -#: source/ubl-strings.h:234 source/ubl-strings.h:257 +#: source/ubl-strings.h:236 source/ubl-strings.h:259 msgid "Manual input:" msgstr "Ручной выбор:" -#: source/ubl-strings.h:237 +#: source/ubl-strings.h:239 msgid "Keyboard layouts:" msgstr "Раскладки клавиатуры:" -#: source/ubl-strings.h:239 +#: source/ubl-strings.h:241 msgid "Move layout up" msgstr "Переместить раскладку выше" -#: source/ubl-strings.h:240 +#: source/ubl-strings.h:242 msgid "Move layout down" msgstr "Переместить раскладку ниже" -#: source/ubl-strings.h:241 +#: source/ubl-strings.h:243 msgid "Add layout" msgstr "Добавить раскладку" -#: source/ubl-strings.h:245 +#: source/ubl-strings.h:247 msgid "Layouts:" msgstr "Раскладки:" -#: source/ubl-strings.h:246 +#: source/ubl-strings.h:248 msgid "Default layout" msgstr "Раскладка по умолчанию" -#: source/ubl-strings.h:247 +#: source/ubl-strings.h:249 msgid "Changing the layout:" msgstr "Смена раскладки:" -#: source/ubl-strings.h:248 +#: source/ubl-strings.h:250 msgid "Set Compose (Multi_Key) to the right Win key" msgstr "Установить Compose (Multi_Key) на клавишу \"правая Win\"" -#: source/ubl-strings.h:249 +#: source/ubl-strings.h:251 msgid "Scroll Lock indication when switching layouts" msgstr "Индикация Scroll Lock при переключении раскладки" -#: source/ubl-strings.h:250 +#: source/ubl-strings.h:252 msgid "NumLock:" msgstr "NumLock:" -#: source/ubl-strings.h:253 +#: source/ubl-strings.h:255 msgid "Variant" msgstr "Вариант" -#: source/ubl-strings.h:254 source/ubl-strings.h:308 +#: source/ubl-strings.h:256 source/ubl-strings.h:312 msgid "Name" msgstr "Имя" -#: source/ubl-strings.h:256 +#: source/ubl-strings.h:258 msgid "Options:" msgstr "Опции:" -#: source/ubl-strings.h:258 +#: source/ubl-strings.h:260 msgid "Specify your preferred keyboard settings" msgstr "Укажите предпочитаемые настройки клавиатуры" -#: source/ubl-strings.h:259 +#: source/ubl-strings.h:261 msgid "Available locales in the system:" msgstr "Доступные языки системы:" -#: source/ubl-strings.h:260 +#: source/ubl-strings.h:262 msgid "System locale" msgstr "Язык системы" -#: source/ubl-strings.h:261 +#: source/ubl-strings.h:263 msgid "Locale" msgstr "Локаль" -#: source/ubl-strings.h:262 source/ubl-strings.h:415 +#: source/ubl-strings.h:264 source/ubl-strings.h:418 msgid "System language" msgstr "Язык системы" -#: source/ubl-strings.h:263 +#: source/ubl-strings.h:265 msgid "Territory" msgstr "Территория" -#: source/ubl-strings.h:264 source/ubl-strings.h:416 +#: source/ubl-strings.h:266 source/ubl-strings.h:419 msgid "Specify your preferred system languages" msgstr "Укажите предпочитаемый язык системы" -#: source/ubl-strings.h:265 +#: source/ubl-strings.h:267 msgid "Remove locale" msgstr "Удалить локаль" -#: source/ubl-strings.h:266 +#: source/ubl-strings.h:268 msgid "New partition:" msgstr "Новый раздел:" -#: source/ubl-strings.h:267 +#: source/ubl-strings.h:269 msgid "Personal" msgstr "Личные" -#: source/ubl-strings.h:268 +#: source/ubl-strings.h:270 msgid "Hardware" msgstr "Оборудование" -#: source/ubl-strings.h:269 +#: source/ubl-strings.h:271 msgid "System" msgstr "Система" -#: source/ubl-strings.h:270 +#: source/ubl-strings.h:272 msgid "Installing software by groups" msgstr "Установка программ по группам" -#: source/ubl-strings.h:271 +#: source/ubl-strings.h:273 msgid "Kernel" msgstr "Ядро" -#: source/ubl-strings.h:272 +#: source/ubl-strings.h:274 msgid "Kernel addons" msgstr "Дополнительные компоненты ядра" -#: source/ubl-strings.h:273 +#: source/ubl-strings.h:275 msgid "Installing Modules" msgstr "Установка модулей" -#: source/ubl-strings.h:274 +#: source/ubl-strings.h:276 msgid "Installing Packages" msgstr "Установка пакетов" -#: source/ubl-strings.h:276 -msgid "Startup services" -msgstr "Службы автозапуска" - -#: source/ubl-strings.h:277 +#: source/ubl-strings.h:278 msgid "Autorun of services" -msgstr "Службы автозапуска" +msgstr "Автозапуск служб" -#: source/ubl-strings.h:278 +#: source/ubl-strings.h:279 +msgid "Autorun of applications" +msgstr "Автозапуск приложений" + +#: source/ubl-strings.h:280 msgid "Boot load" msgstr "Загрузчик" -#: source/ubl-strings.h:279 +#: source/ubl-strings.h:281 msgid "Network" msgstr "Настройка сетевых интерфейсов" -#: source/ubl-strings.h:280 +#: source/ubl-strings.h:282 msgid "Enable VNC server" msgstr "Запустить VNC сервер" -#: source/ubl-strings.h:281 +#: source/ubl-strings.h:283 msgid "Enable RDP server" msgstr "Запустить RDP сервер" -#: source/ubl-strings.h:283 +#: source/ubl-strings.h:285 msgid "Autorun of application" msgstr "Автозапуск приложений" -#: source/ubl-strings.h:284 +#: source/ubl-strings.h:286 msgid "Configuring autorun application" msgstr "Настройка автозапуска приложений" -#: source/ubl-strings.h:285 +#: source/ubl-strings.h:287 msgid "Application:" msgstr "Приложение:" -#: source/ubl-strings.h:286 +#: source/ubl-strings.h:288 msgid "Group:" msgstr "Группа:" -#: source/ubl-strings.h:287 +#: source/ubl-strings.h:289 msgid "Application" msgstr "Приложение" -#: source/ubl-strings.h:288 +#: source/ubl-strings.h:290 msgid "Group" msgstr "Группа" -#: source/ubl-strings.h:290 +#: source/ubl-strings.h:292 +#, fuzzy +msgid "Select your language:" +msgstr "Выберете язык:" + +#: source/ubl-strings.h:293 +msgid "Selecting additional system kernel components" +msgstr "Выбор дополнительных компонентов ядра системы" + +#: source/ubl-strings.h:294 msgid "Package:" msgstr "Пакет:" -#: source/ubl-strings.h:291 +#: source/ubl-strings.h:295 msgid "Module:" msgstr "Модуль:" -#: source/ubl-strings.h:292 +#: source/ubl-strings.h:296 msgid "New section at" msgstr "Новый раздел на" -#: source/ubl-strings.h:293 +#: source/ubl-strings.h:297 msgid "\"/ublinux-data/\" user data section" msgstr "\"/ublinux-data/\" раздел данных пользователя" -#: source/ubl-strings.h:294 +#: source/ubl-strings.h:298 msgid "\"/ublinux/\" system section" msgstr "\"/ublinux/\" раздел системы" -#: source/ubl-strings.h:295 +#: source/ubl-strings.h:299 msgid "Size:" msgstr "Размер:" -#: source/ubl-strings.h:296 +#: source/ubl-strings.h:300 msgid "Part label:" msgstr "Метка раздела:" -#: source/ubl-strings.h:297 +#: source/ubl-strings.h:301 msgid "File system type:" msgstr "Тип ФС:" -#: source/ubl-strings.h:298 +#: source/ubl-strings.h:302 msgid "File system label:" msgstr "Метка ФС:" -#: source/ubl-strings.h:299 +#: source/ubl-strings.h:303 msgid "Encryption:" msgstr "Шифрование:" -#: source/ubl-strings.h:300 +#: source/ubl-strings.h:304 msgid "Off" msgstr "Выключить" -#: source/ubl-strings.h:301 +#: source/ubl-strings.h:305 msgid "Encryption password:" msgstr "Пароль шифрования:" -#: source/ubl-strings.h:302 +#: source/ubl-strings.h:306 msgid "User name:" msgstr "Имя пользователя:" -#: source/ubl-strings.h:303 +#: source/ubl-strings.h:307 msgid "User password:" msgstr "Паоль пользователя:" -#: source/ubl-strings.h:304 +#: source/ubl-strings.h:308 msgid "Add user" msgstr "Добавить пользователя" -#: source/ubl-strings.h:305 source/ubl-strings.h:325 +#: source/ubl-strings.h:309 source/ubl-strings.h:329 msgid "Choose a path for configuration file" msgstr "Выберите путь до файла конфигурации" -#: source/ubl-strings.h:306 +#: source/ubl-strings.h:310 msgid "File position:" msgstr "Расположение файла:" -#: source/ubl-strings.h:307 +#: source/ubl-strings.h:311 msgid "Choose" msgstr "Выбрать" -#: source/ubl-strings.h:309 +#: source/ubl-strings.h:313 msgid "Id" msgstr "Id" -#: source/ubl-strings.h:310 +#: source/ubl-strings.h:314 msgid "OS options were not found" msgstr "Регион не был выбран" -#: source/ubl-strings.h:311 +#: source/ubl-strings.h:315 msgid "Children options were not found" msgstr "Дочерние опции не найдены" -#: source/ubl-strings.h:312 +#: source/ubl-strings.h:316 msgid "Connection type:" msgstr "Тип соединения:" -#: source/ubl-strings.h:313 +#: source/ubl-strings.h:317 msgid "Enabled:" msgstr "Включен:" -#: source/ubl-strings.h:314 +#: source/ubl-strings.h:318 msgid "Automatically get IP adress with DHCP" msgstr "Автоматически получать IP через DHCP" -#: source/ubl-strings.h:315 +#: source/ubl-strings.h:319 msgid "IP adress:" msgstr "IP адрес:" -#: source/ubl-strings.h:316 +#: source/ubl-strings.h:320 msgid "Gateway:" msgstr "Шлюз:" -#: source/ubl-strings.h:317 +#: source/ubl-strings.h:321 msgid "Mask:" msgstr "Маска:" -#: source/ubl-strings.h:318 +#: source/ubl-strings.h:322 msgid "DNS-server:" msgstr "DNS-сервер:" -#: source/ubl-strings.h:319 +#: source/ubl-strings.h:323 msgid "Version" msgstr "Версия" -#: source/ubl-strings.h:320 +#: source/ubl-strings.h:324 msgid "Unit:" msgstr "Юнит:" -#: source/ubl-strings.h:321 +#: source/ubl-strings.h:325 msgid "Service:" msgstr "Служба:" -#: source/ubl-strings.h:322 +#: source/ubl-strings.h:326 msgid "Description:" msgstr "Описание:" -#: source/ubl-strings.h:323 +#: source/ubl-strings.h:327 msgid "Folder" msgstr "Каталог" -#: source/ubl-strings.h:324 +#: source/ubl-strings.h:328 msgid "ISO-image" msgstr "ISO-образ" -#: source/ubl-strings.h:326 +#: source/ubl-strings.h:330 msgid "Account name:" msgstr "Имя Вашей учётной записи:" -#: source/ubl-strings.h:327 +#: source/ubl-strings.h:331 msgid "Login:" msgstr "Логин для входа в систему:" -#: source/ubl-strings.h:328 +#: source/ubl-strings.h:332 msgid "Password:" msgstr "Пароль:" -#: source/ubl-strings.h:329 +#: source/ubl-strings.h:333 msgid "Recovery" msgstr "Восстановление" -#: source/ubl-strings.h:330 +#: source/ubl-strings.h:334 msgid "Recovering bootloader, OS files, user data" msgstr "Восстановление загрузчика, файлов ОС, пользовательских данных" -#: source/ubl-strings.h:331 +#: source/ubl-strings.h:335 msgid "Unpacking into an existing system" msgstr "Установить ОС в уже существующий раздел" -#: source/ubl-strings.h:332 +#: source/ubl-strings.h:336 msgid "Device label" msgstr "Метка устройства" -#: source/ubl-strings.h:333 +#: source/ubl-strings.h:337 msgid "Partition:" msgstr "Раздел:" -#: source/ubl-strings.h:334 +#: source/ubl-strings.h:338 msgid "Select partition:" msgstr "Выберите раздел:" -#: source/ubl-strings.h:335 +#: source/ubl-strings.h:339 msgid "Partition label:" msgstr "Метка раздела:" -#: source/ubl-strings.h:336 +#: source/ubl-strings.h:340 msgid "Virtual device type:" msgstr "Тип виртуального устройства:" -#: source/ubl-strings.h:337 +#: source/ubl-strings.h:341 msgid "Load type" msgstr "Тип загрузки" -#: source/ubl-strings.h:338 +#: source/ubl-strings.h:342 msgid "BIOS boot sector" msgstr "Bios Boot сектор" -#: source/ubl-strings.h:339 +#: source/ubl-strings.h:343 msgid "EFI section" msgstr "EFI раздел" -#: source/ubl-strings.h:340 +#: source/ubl-strings.h:344 msgid "Swap file" msgstr "Файл подкачки" -#: source/ubl-strings.h:341 +#: source/ubl-strings.h:345 msgid "Corresponds to RAM size" msgstr "Соответствует размеру ОЗУ" -#: source/ubl-strings.h:342 +#: source/ubl-strings.h:346 msgid "Fixed size:" msgstr "Фиксированный размер:" -#: source/ubl-strings.h:343 +#: source/ubl-strings.h:347 msgid "" "Attention! The system will be installed on the selected partition " "with OS already installed. All user data will be saved." @@ -1196,7 +1207,7 @@ msgstr "" "Если не менять тип ФС и не форматировать, все данные на разделе будут " "сохранены." -#: source/ubl-strings.h:344 +#: source/ubl-strings.h:348 msgid "" "Attention! The selected system components will be installed\n" "separately into the selected partition." @@ -1204,219 +1215,219 @@ msgstr "" "Внимание! В выбранный раздел будет произведена раздельная установка " "выбранных компонентов системы." -#: source/ubl-strings.h:345 +#: source/ubl-strings.h:349 msgid "Preparation" msgstr "Подготовка" -#: source/ubl-strings.h:346 +#: source/ubl-strings.h:350 msgid "Additional" msgstr "Дополнительный" -#: source/ubl-strings.h:347 +#: source/ubl-strings.h:351 msgid "Completion" msgstr "Завершение" -#: source/ubl-strings.h:348 +#: source/ubl-strings.h:352 msgid "Licences" msgstr "Лицензии" -#: source/ubl-strings.h:349 +#: source/ubl-strings.h:353 msgid "OS components" msgstr "Системные компоненты" -#: source/ubl-strings.h:350 +#: source/ubl-strings.h:354 msgid "Configuration end" msgstr "Завершение конфигурации" -#: source/ubl-strings.h:351 +#: source/ubl-strings.h:355 msgid "Choose system kernel" msgstr "Выбрать ядро системы" -#: source/ubl-strings.h:352 +#: source/ubl-strings.h:356 msgid "Install" msgstr "Установка" -#: source/ubl-strings.h:353 +#: source/ubl-strings.h:357 msgid "Enable" msgstr "Включено" -#: source/ubl-strings.h:354 +#: source/ubl-strings.h:358 msgid "Tags" msgstr "Тэги" -#: source/ubl-strings.h:355 +#: source/ubl-strings.h:359 msgid "Modules" msgstr "Модули" -#: source/ubl-strings.h:357 +#: source/ubl-strings.h:361 msgid "Type" msgstr "Тип" -#: source/ubl-strings.h:358 +#: source/ubl-strings.h:362 msgid "Additional components" msgstr "Дополнительные компоненты" -#: source/ubl-strings.h:359 +#: source/ubl-strings.h:363 msgid "Package name:" msgstr "Имя пакета:" -#: source/ubl-strings.h:360 +#: source/ubl-strings.h:364 msgid "Accessed" msgstr "Доступно" -#: source/ubl-strings.h:361 +#: source/ubl-strings.h:365 msgid "Repository status:" msgstr "Статус репозитория:" -#: source/ubl-strings.h:362 +#: source/ubl-strings.h:366 msgid "Pacman software" msgstr "компоненты pacman" -#: source/ubl-strings.h:363 +#: source/ubl-strings.h:367 msgid "Administrator password (root):" msgstr "Пароль администратора (root):" -#: source/ubl-strings.h:364 +#: source/ubl-strings.h:368 msgid "Add" msgstr "Добавить" -#: source/ubl-strings.h:365 +#: source/ubl-strings.h:369 msgid "Edit" msgstr "Редактировать" -#: source/ubl-strings.h:366 +#: source/ubl-strings.h:370 msgid "Remove" msgstr "Удалить" -#: source/ubl-strings.h:367 +#: source/ubl-strings.h:371 msgid "Autostart" msgstr "Автозапуск" -#: source/ubl-strings.h:368 +#: source/ubl-strings.h:372 msgid "Unit" msgstr "Юнит" -#: source/ubl-strings.h:369 +#: source/ubl-strings.h:373 msgid "Service" msgstr "Служба" -#: source/ubl-strings.h:370 +#: source/ubl-strings.h:374 msgid "Startup configuration" msgstr "настройка автозапуска" -#: source/ubl-strings.h:371 +#: source/ubl-strings.h:375 msgid "Boot selection menu timer:" msgstr "Таймер меню выбора варианта загрузки:" -#: source/ubl-strings.h:372 +#: source/ubl-strings.h:376 msgid "seconds" msgstr "секунд" -#: source/ubl-strings.h:373 +#: source/ubl-strings.h:377 msgid "Default OS:" msgstr "Щагрузка по умолчанию:" -#: source/ubl-strings.h:374 +#: source/ubl-strings.h:378 msgid "Login without password request" msgstr "Автоматический вход в систему без запроса пароля" -#: source/ubl-strings.h:375 +#: source/ubl-strings.h:379 msgid "Username" msgstr "Имя пользователя" -#: source/ubl-strings.h:376 +#: source/ubl-strings.h:380 msgid "Password" msgstr "Пароль" -#: source/ubl-strings.h:377 +#: source/ubl-strings.h:381 msgid "Bootloader menu users" msgstr "Пользователи меню загрузчика" -#: source/ubl-strings.h:378 +#: source/ubl-strings.h:382 msgid "Bootloader" msgstr "Загрузчик" -#: source/ubl-strings.h:379 +#: source/ubl-strings.h:383 msgid "Domain name:" msgstr "Имя домена:" -#: source/ubl-strings.h:380 +#: source/ubl-strings.h:384 msgid "Domain administrator:" msgstr "Администратор домена:" -#: source/ubl-strings.h:381 +#: source/ubl-strings.h:385 msgid "NTP Server:" msgstr "NTP сервер:" -#: source/ubl-strings.h:382 +#: source/ubl-strings.h:386 msgid "Manual" msgstr "Вручную" -#: source/ubl-strings.h:383 +#: source/ubl-strings.h:387 msgid "Do not configure" msgstr "Не настраивать" -#: source/ubl-strings.h:384 +#: source/ubl-strings.h:388 msgid "auto" msgstr "авто" -#: source/ubl-strings.h:385 +#: source/ubl-strings.h:389 msgid "Net interfaces" msgstr "Сетевые интерфейсы" -#: source/ubl-strings.h:386 +#: source/ubl-strings.h:390 msgid "Installation process" msgstr "Процесс установки" -#: source/ubl-strings.h:387 +#: source/ubl-strings.h:391 msgid "Completed" msgstr "Завершено" -#: source/ubl-strings.h:388 +#: source/ubl-strings.h:392 msgid "Configuration error" msgstr "Ошибка конфигурации" -#: source/ubl-strings.h:389 +#: source/ubl-strings.h:393 msgid "Configuration saved" msgstr "Конфигурация сохранена" -#: source/ubl-strings.h:390 +#: source/ubl-strings.h:394 msgid "Device label:" msgstr "Метка устройства:" -#: source/ubl-strings.h:391 +#: source/ubl-strings.h:395 msgid "Common Installation" msgstr "Установка" -#: source/ubl-strings.h:392 +#: source/ubl-strings.h:396 msgid "Select partiton:" msgstr "Выберите раздел:" -#: source/ubl-strings.h:393 +#: source/ubl-strings.h:397 msgid "Installation on same partition" msgstr "Установка рядом с другой системой в существующий раздел" -#: source/ubl-strings.h:394 +#: source/ubl-strings.h:398 msgid "Advanced section" msgstr "Расширенный режим установки" -#: source/ubl-strings.h:395 +#: source/ubl-strings.h:399 msgid "Recovery section" msgstr "Восстановление" -#: source/ubl-strings.h:396 +#: source/ubl-strings.h:400 msgid "Start installation scenario" msgstr "Приступить к установке по сценарию" -#: source/ubl-strings.h:397 +#: source/ubl-strings.h:401 msgid "Source" msgstr "Источник" -#: source/ubl-strings.h:398 +#: source/ubl-strings.h:402 msgid "Skip configuration" msgstr "Пропустить настройку" -#: source/ubl-strings.h:400 +#: source/ubl-strings.h:404 msgid "" "You are now in the system setup program. This program will ask you a few " "questions and help you install the system." @@ -1424,111 +1435,111 @@ msgstr "" "Вы находитесь в программе установки системы. Эта программа задаст вам " "несколько вопросов и поможет установить систему." -#: source/ubl-strings.h:401 +#: source/ubl-strings.h:405 msgid "Licence agreement" msgstr "Лицензионное соглашение" -#: source/ubl-strings.h:402 +#: source/ubl-strings.h:406 msgid "Please read the license agreement before continuing the installation." msgstr "Перед продолжением установки ознакомьтесь с лицензионным соглашением." -#: source/ubl-strings.h:403 +#: source/ubl-strings.h:407 msgid "Please specify what type of installation you want to perform" msgstr "Пожалуйста, укажите, какой тип установки вы хотите выполнить." -#: source/ubl-strings.h:404 +#: source/ubl-strings.h:408 msgid "Selection of main components" msgstr "Выбор основных компонентов" -#: source/ubl-strings.h:405 +#: source/ubl-strings.h:409 msgid "Select modules found on the sources to be installed" msgstr "Выберите модули, найденные на источниках, которые будут установлены" -#: source/ubl-strings.h:406 +#: source/ubl-strings.h:410 msgid "Configuring the system" msgstr "Настройка системы" -#: source/ubl-strings.h:407 +#: source/ubl-strings.h:411 msgid "Configuring the parameters of the installed system" msgstr "Настройка параметров установленной системы" -#: source/ubl-strings.h:408 +#: source/ubl-strings.h:412 msgid "Selecting the system kernel" msgstr "Выбор ядра системы" -#: source/ubl-strings.h:409 +#: source/ubl-strings.h:413 +#, fuzzy msgid "" "Selecting kernels for installation in the system and selecting the default " -"kernel. Internet access required" +"kernel. Internet access is required to install additional kernels" msgstr "" -"Выбор ядер для установки в систему и выбор ядра по умолчанию. Требуется доступ В Интернет." - -#: source/ubl-strings.h:410 -msgid "Selecting additional system kernel components" -msgstr "Выбор дополнительных компонентов ядра системы" +"Выбор ядер для установки в систему и выбор ядра по умолчанию. Требуется " +"доступ В Интернет." -#: source/ubl-strings.h:411 +#: source/ubl-strings.h:414 +#, fuzzy msgid "" -"Selecting additional system kernel components from the repository. Internet " -"access required" -msgstr "Выбор дополнительных модулей ядра из репозитория. Требуется доступ в Интернет" +"Selecting additional kernel modules from the repository via the Internet" +msgstr "" +"Выбор дополнительного ПО для установки из репозитория через сеть Интернет" -#: source/ubl-strings.h:412 +#: source/ubl-strings.h:415 msgid "" "Search and select the software you need to install by package name. Internet " "access required" msgstr "" -"Найдите и выберите необходимое программное обеспечение по названию пакета. Требуется доступ в Интернет" +"Найдите и выберите необходимое программное обеспечение по названию пакета. " +"Требуется доступ в Интернет" -#: source/ubl-strings.h:413 +#: source/ubl-strings.h:416 msgid "Chosen packages" msgstr "Выбранные пакеты" -#: source/ubl-strings.h:414 +#: source/ubl-strings.h:417 msgid "Enter your time zone" msgstr "Введите свой часовой пояс" -#: source/ubl-strings.h:417 +#: source/ubl-strings.h:420 msgid "Setting up system users" msgstr "Настройка пользователей системы" -#: source/ubl-strings.h:418 +#: source/ubl-strings.h:421 msgid "Startup" msgstr "Автозагрузка" -#: source/ubl-strings.h:419 +#: source/ubl-strings.h:422 msgid "Configuring startup services" msgstr "Настройка служб автозагрузки" -#: source/ubl-strings.h:420 +#: source/ubl-strings.h:423 msgid "Starting the system" msgstr "Запуск системы" -#: source/ubl-strings.h:421 +#: source/ubl-strings.h:424 msgid "Setting up system boot" msgstr "Настройка загрузки системы" -#: source/ubl-strings.h:422 +#: source/ubl-strings.h:425 msgid "Setting up network access" msgstr "Настройка доступа к сети" -#: source/ubl-strings.h:423 +#: source/ubl-strings.h:426 msgid "Configuring the installation of additional components" msgstr "Настройка установки дополнительных компонентов" -#: source/ubl-strings.h:424 +#: source/ubl-strings.h:427 msgid "Wait for the system to finish loading" msgstr "Дождитесь завершения загрузки системы" -#: source/ubl-strings.h:426 +#: source/ubl-strings.h:428 msgid "Modules and packages" msgstr "Модули и пакеты" -#: source/ubl-strings.h:427 +#: source/ubl-strings.h:429 msgid "Setting the system" msgstr "Настройка системы" -#: source/ubl-strings.h:428 +#: source/ubl-strings.h:430 msgid "" "Selecting software packages to install from the repository. Internet access " "is required" @@ -1536,7 +1547,7 @@ msgstr "" "Выбор пакетов программного обеспечения для установки из репозитория. " "Требуется доступ в Интернет" -#: source/ubl-strings.h:429 +#: source/ubl-strings.h:431 msgid "" "Selecting software modules to install from the repository. Internet access " "is required" @@ -1544,15 +1555,15 @@ msgstr "" "Выбор модулей программного обеспечения для установки из репозитория. " "Требуется доступ в Интернет" -#: source/ubl-strings.h:430 +#: source/ubl-strings.h:432 msgid "Language" msgstr "Язык" -#: source/ubl-strings.h:431 +#: source/ubl-strings.h:433 msgid "On" msgstr "Включить" -#: source/ubl-strings.h:432 +#: source/ubl-strings.h:434 msgid "" "Selecting the software group to install from the repository. Internet access " "is required" @@ -1560,37 +1571,46 @@ msgstr "" "Выбор группы программного обеспечения для установки из репозитория. " "Требуется доступ в Интернет" -#: source/ubl-strings.h:433 +#: source/ubl-strings.h:435 msgid "Recovery configuration has ended" msgstr "Настройка восстановления завершена" -#: source/ubl-strings.h:434 +#: source/ubl-strings.h:436 msgid "System recovery is about to begin" msgstr "Начало восстановления системы" -#: source/ubl-strings.h:435 +#: source/ubl-strings.h:437 msgid "System recovery" msgstr "Восстановление системы" -#: source/ubl-strings.h:436 +#: source/ubl-strings.h:438 msgid "The process of restoring the system is underway..." msgstr "Идёт процесс восстановления системы..." -#: source/ubl-strings.h:437 +#: source/ubl-strings.h:439 msgid "System recovery successfully completed!" msgstr "Воcстановление системы успешно завершено!" -#: source/ubl-strings.h:438 +#: source/ubl-strings.h:440 msgid "" "You can reboot the system and use the installed version or continue to work " "in the current system." -msgstr "Можно перезагрузить систему и использовать установленную версию, либо продолжить работать в текущей системе." +msgstr "" +"Можно перезагрузить систему и использовать установленную версию, либо " +"продолжить работать в текущей системе." -#: source/ubl-strings.h:440 +#: source/ubl-strings.h:441 +msgid "" +"Selecting additional system kernel components from the repository. Internet " +"access required" +msgstr "" +"Выбор дополнительных модулей ядра из репозитория. Требуется доступ в Интернет" + +#: source/ubl-strings.h:443 msgid "Product ecosystem" msgstr "Экосистема продуктов" -#: source/ubl-strings.h:441 +#: source/ubl-strings.h:444 msgid "" "Developed by a team of professionals and successfully presented on the " "market.\n" @@ -1610,11 +1630,11 @@ msgstr "" "систему управления ИТ-инфраструктурой,\n" "систему виртуализации" -#: source/ubl-strings.h:449 +#: source/ubl-strings.h:452 msgid "System Usage" msgstr "Использование системы" -#: source/ubl-strings.h:450 +#: source/ubl-strings.h:453 msgid "" "It has been successfully used in both government agencies and commercial " "companies of various sizes." @@ -1622,11 +1642,11 @@ msgstr "" "Успешно применяется как в государственных учреждениях, так и коммерческих " "компаниях различного масштаба" -#: source/ubl-strings.h:452 +#: source/ubl-strings.h:455 msgid "System Editions" msgstr "Редакции системы" -#: source/ubl-strings.h:453 +#: source/ubl-strings.h:456 msgid "" "- Desktop Enterprise for workstations (PCs, laptops, thin clients, " "dashboards, including interactive touchscreens and Multi-touch, industrial " @@ -1644,11 +1664,11 @@ msgstr "" "- редакция \"Education\" для образовательных учреждений,\n" "- редакция \"Desktop Basic\" для личного (домашнего) использования" -#: source/ubl-strings.h:459 +#: source/ubl-strings.h:462 msgid "Device Support" msgstr "Поддержка устройств" -#: source/ubl-strings.h:460 +#: source/ubl-strings.h:463 msgid "" "A wide range of devices is supported: printing equipment, scanners, webcams, " "etc.\n" @@ -1662,11 +1682,11 @@ msgstr "" "Поддержка сенсорных системам ввода (Multi-touch) с определением до 20 " "одновременных точек касания" -#: source/ubl-strings.h:464 +#: source/ubl-strings.h:467 msgid "Modular secure architecture" msgstr "Модульная защищённая архитектура" -#: source/ubl-strings.h:465 +#: source/ubl-strings.h:468 msgid "" "- each OS component is represented by a separate module with a digital " "signature and integrity control\n" @@ -1681,11 +1701,11 @@ msgstr "" "- позволяет гибко адаптировать систему, под рабочие процессы заказчика,\n" "- обеспечивает высокую производительность и надежность работы системы" -#: source/ubl-strings.h:470 +#: source/ubl-strings.h:473 msgid "Flexible Adaptation" msgstr "Гибкая адаптация" -#: source/ubl-strings.h:471 +#: source/ubl-strings.h:474 msgid "" "By changing the system's modules, its capabilities are tailored to the needs " "of each user.\n" @@ -1701,11 +1721,11 @@ msgstr "" "подключение к серверу), до конфигурации, содержащей весь перечень " "возможностей системы" -#: source/ubl-strings.h:475 +#: source/ubl-strings.h:478 msgid "Domain architecture support" msgstr "Поддержка доменной архитектуры" -#: source/ubl-strings.h:476 +#: source/ubl-strings.h:479 msgid "" "A domain controller allows you to:\n" "- use group policies,\n" @@ -1724,11 +1744,11 @@ msgstr "" "Позволяет интегрировать АРМ в Microsoft Active Directory, FreeIPA, Samba DC, " "применяя на АРМ необходимые доменные настройки" -#: source/ubl-strings.h:483 +#: source/ubl-strings.h:486 msgid "Compatibility with Windows applications" msgstr "Совместимость с Windows приложениями" -#: source/ubl-strings.h:484 +#: source/ubl-strings.h:487 msgid "" "Using Wine or the Winix integration module, you can launch and work with " "most Windows applications." @@ -1736,11 +1756,11 @@ msgstr "" "С помощью средств Wine, либо модуля интеграции Winix, можно запускать и " "работать с большинством приложений Windows" -#: source/ubl-strings.h:486 +#: source/ubl-strings.h:489 msgid "High level of optimization" msgstr "Высокий уровень оптимизации" -#: source/ubl-strings.h:487 +#: source/ubl-strings.h:490 msgid "" "The system is lightweight. This allows for comfortable operation when " "booting from USB drives, on diskless workstations, and on thin clients. It " @@ -1750,11 +1770,11 @@ msgstr "" "загрузке системы с USB накопителей, на бездисковых АРМ, тонких клиентах. А " "также использовать устаревшие рабочие места с низкой производительностью" -#: source/ubl-strings.h:489 +#: source/ubl-strings.h:492 msgid "Intuitive interface" msgstr "Интуитивно понятный интерфейс" -#: source/ubl-strings.h:490 +#: source/ubl-strings.h:493 msgid "" "Support for XFCE, KDE Plasma, GNOME, MATE, LXQt, and other graphical " "environments allows you to choose and flexibly customize the most convenient " @@ -1767,11 +1787,11 @@ msgstr "" "Позволяет пользователю легко начать работать с системой, в том числе при " "переходе с Windows" -#: source/ubl-strings.h:492 +#: source/ubl-strings.h:495 msgid "Multi-workstation (multi-seat)" msgstr "Мульти рабочее место (multiseat)" -#: source/ubl-strings.h:493 +#: source/ubl-strings.h:496 msgid "" "The ability for multiple users to work simultaneously at a single " "workstation.\n" @@ -1787,11 +1807,11 @@ msgstr "" "монитор, клавиатура/мышь. Можно реализовать на встроенных видео выходах без " "использования отдельной видеокарты" -#: source/ubl-strings.h:497 +#: source/ubl-strings.h:500 msgid "Application Software" msgstr "Прикладное программное обеспечение" -#: source/ubl-strings.h:498 +#: source/ubl-strings.h:501 msgid "" "The system comes with a comprehensive set of software out of the box to " "performing most common tasks.\n" @@ -1805,11 +1825,11 @@ msgstr "" "Графический пакетный менеджер позволяет быстро и интуитивно понятно " "устанавливать дополнительное ПО, драйверы для оборудования" -#: source/ubl-strings.h:502 +#: source/ubl-strings.h:505 msgid "Corporate Services" msgstr "Корпоративные сервисы" -#: source/ubl-strings.h:503 +#: source/ubl-strings.h:506 msgid "" "The system allows you to deploy and manage or connect to a variety of " "centralized corporate services: email, group chats, video conferencing, " @@ -1819,11 +1839,11 @@ msgstr "" "централизованных корпоративных сервисов: почта, групповые чаты, " "видеоконференции, системы совместной работы и т.д." -#: source/ubl-strings.h:505 +#: source/ubl-strings.h:508 msgid "Security and Resiliency, Sandbox Mode" msgstr "Безопасность и отказоустойчивость, режим \"песочницы\"" -#: source/ubl-strings.h:506 +#: source/ubl-strings.h:509 msgid "" "A robust application package management system and built-in information " "security mechanisms ensure a high level of security and resiliency for the " @@ -1840,11 +1860,11 @@ msgstr "" "некорректных действии. При перезагрузке система вернется к \"эталонному\" " "состоянию" -#: source/ubl-strings.h:510 +#: source/ubl-strings.h:513 msgid "Custom repositories" msgstr "Собственные репозитории" -#: source/ubl-strings.h:511 +#: source/ubl-strings.h:514 msgid "" "- repositories are developed and maintained by the operating system " "developer,\n" @@ -1857,11 +1877,11 @@ msgstr "" "Также поддерживается создание служебных репозиториев, которые пользователи " "могут создать и адаптировать под свои нужды" -#: source/ubl-strings.h:515 +#: source/ubl-strings.h:518 msgid "Quick deployment" msgstr "Быстрое развёртывание" -#: source/ubl-strings.h:516 +#: source/ubl-strings.h:519 msgid "" "- System installation on modern hardware takes 3-5 minutes.\n" "- Ability to install the system over a network\n" @@ -1874,11 +1894,11 @@ msgstr "" "ISO образ с одного из настроенных рабочих мест, включив в образ необходимые " "настройки, предустановленный набор необходимого прикладного ПО" -#: source/ubl-strings.h:520 +#: source/ubl-strings.h:523 msgid "Modular graphical administration interface" msgstr "Модульный графический интерфейс администрирования" -#: source/ubl-strings.h:521 +#: source/ubl-strings.h:524 msgid "" "- A graphical administration interface that includes a comprehensive set of " "system utilities for system configuration\n" @@ -1889,11 +1909,11 @@ msgstr "" "ориентированные средства для администрирования как локального, так и " "удаленных рабочих мест" -#: source/ubl-strings.h:524 +#: source/ubl-strings.h:527 msgid "UBPile Infrastructure Monitoring and Management System" msgstr "Система мониторинга и управления инфраструктурой UBPile" -#: source/ubl-strings.h:525 +#: source/ubl-strings.h:528 msgid "" "Includes automation and orchestration mechanisms for comprehensive " "information infrastructure management.\n" @@ -1907,11 +1927,11 @@ msgstr "" "Используется для автоматизации задач по развертыванию и конфигурации рабочих " "станций и серверов, управлению парком вычислительной техники." -#: source/ubl-strings.h:529 +#: source/ubl-strings.h:532 msgid "Server virtualization tools" msgstr "Инструменты виртуализации серверов" -#: source/ubl-strings.h:530 +#: source/ubl-strings.h:533 msgid "" "The server and workstation virtualization system enables efficient " "deployment and management of virtual IT infrastructure in data centers.\n" @@ -1928,11 +1948,11 @@ msgstr "" "FreeBSD\n" "Механизмы резервного копирования, защиты данных и VDI." -#: source/ubl-strings.h:535 +#: source/ubl-strings.h:538 msgid "Professional technical support" msgstr "Профессиональная техподдержка" -#: source/ubl-strings.h:536 +#: source/ubl-strings.h:539 msgid "" "You can choose the level of technical support for the system that most " "appropriate for your needs.\n" @@ -1944,11 +1964,11 @@ msgstr "" "\n" "Подробнее можно ознакомиться на нашем сайте в разделе \"Уровни поддержки\"" -#: source/ubl-strings.h:540 +#: source/ubl-strings.h:543 msgid "Interactive Knowledge Base" msgstr "Интерактивная база знаний" -#: source/ubl-strings.h:541 +#: source/ubl-strings.h:544 msgid "" "Continuously evolving and clearly describes the installation and " "configuration of the system, as well as the use of its features. Located at " @@ -1957,11 +1977,11 @@ msgstr "" "Постоянно развивается и наглядно описывает установку и настройку системы, " "использование ее возможностей. Расположена по адресу https://wiki.ublinux.com" -#: source/ubl-strings.h:543 +#: source/ubl-strings.h:546 msgid "Network Boot" msgstr "Загрузка по сети" -#: source/ubl-strings.h:544 +#: source/ubl-strings.h:547 msgid "" "Allows system booting for diskless and standard workstations over a local " "network or the Internet (even over slow connection channels)." diff --git a/source/ubinstall-gtk-bootloader.c b/source/ubinstall-gtk-bootloader.c index 4456896..395e6af 100644 --- a/source/ubinstall-gtk-bootloader.c +++ b/source/ubinstall-gtk-bootloader.c @@ -161,103 +161,113 @@ void on_bootloader_user_add(GtkWidget *, main_window *widgets){ gtk_widget_show(window->Window); } -void on_menu_chosen(GtkWidget *, yon_menu_item *item){ - if (strcmp(item->target,DEFAULT_MENU_ITEM_LABEL)){ - gtk_entry_set_text(GTK_ENTRY(item->widgets->BootloadDefaultOSEntry),item->target); - } else { - gtk_entry_set_text(GTK_ENTRY(item->widgets->BootloadDefaultOSEntry),DEFAULT_MENU_ITEM_LABEL); +void yon_menu_open_submenu(yon_menu_window *window, yon_menu_item *item){ + int size; + config_str options = yon_config_load(get_menus_entry_command,&size); + for (int i=1;i"); + int name_size; + config_str name_parsed = yon_char_parse(parsed[1],&name_size,">"); + if (yon_char_parsed_check_exist(id_parsed,id_size,item->id)==0){ + yon_menu_item *subitem = yon_menu_add_item(window,parsed[0],name_parsed[1],0); + gtk_list_box_insert(GTK_LIST_BOX(window->ChildrenListBox),subitem->MenuItemRow,-1); + gtk_widget_hide(subitem->ArrowImage); + + } + yon_char_parsed_free(id_parsed,id_size); + yon_char_parsed_free(name_parsed,name_size); + yon_char_parsed_free(parsed,parsed_size); } +} + +void yon_menu_ungrab(yon_menu_window *window){ GdkDisplay *display = gdk_display_get_default(); GdkSeat *seat = gdk_display_get_default_seat(display); - if (item->window->seat_grab) + if (window->seat_grab) gdk_seat_ungrab(seat); else - gtk_grab_remove(item->window->MenuWindow); - gtk_widget_destroy(item->window->MenuWindow); + gtk_grab_remove(window->MenuWindow); + gtk_widget_destroy(window->MenuWindow); +} + +void on_menu_chosen(GtkWidget *, GtkListBoxRow* row, yon_menu_window *window){ + yon_menu_item *item = g_object_get_data(G_OBJECT(row),"yon_menu_item"); + if (item->children){ + yon_menu_open_submenu(window,item); + gtk_widget_show(window->ChildrenRevealer); + gtk_widget_hide(window->ItemsRevealer); + gtk_revealer_set_reveal_child(GTK_REVEALER(window->ItemsRevealer),0); + gtk_revealer_set_reveal_child(GTK_REVEALER(window->ChildrenRevealer),1); + } else { + gtk_entry_set_text(GTK_ENTRY(window->target),item->name); + yon_config_register(GRUB_DEFAULT_parameter,GRUB_DEFAULT_parameter_command,item->id); + yon_menu_ungrab(window); + } } -void on_submenu_open(GtkWidget *,yon_menu_item *item){ - yon_menu_window *window = item->window; +yon_menu_item *yon_menu_add_item(yon_menu_window *target_menu,const char *id, const char *name, int children){ + yon_menu_item *item = yon_menu_item_new(); + item->window=target_menu; + item->children = children; + item->id = yon_char_new(id); + item->name = yon_char_new(name); + gtk_label_set_text(GTK_LABEL(item->MenuTextLabel),item->name); - dictionary *dact = NULL; - for_dictionaries(dact,item->children){ - yon_menu_item *child = yon_dictionary_get_data(dact,yon_menu_item*); - gtk_widget_hide(child->NextIconButton); - gtk_list_box_insert(GTK_LIST_BOX(window->ChildrenListBox),child->MenuItemBox,-1); - g_signal_connect(G_OBJECT(child->MenuButton),"clicked",G_CALLBACK(on_menu_chosen),dact->data); - - } - gtk_revealer_set_reveal_child(GTK_REVEALER(item->window->ItemsRevealer),0); - gtk_revealer_set_reveal_child(GTK_REVEALER(item->window->ChildrenRevealer),1); - gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->ChildrenRevealer)),window->ChildrenRevealer,1,1,0,GTK_PACK_START); - gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->ItemsRevealer)),window->ItemsRevealer,0,0,0,GTK_PACK_START); - yon_on_revealer_switched(window); - g_signal_connect(G_OBJECT(window->MenuWindow),"size-allocate",G_CALLBACK(on_menu_window_size_reallocated),window); + // g_signal_connect(G_OBJECT(item->MenuItemRow),"clicked",G_CALLBACK(on_menu_chosen),item); + + g_object_set_data(G_OBJECT(item->MenuItemRow),"yon_menu_item",item); + gtk_widget_show(item->MenuItemRow); + return item; } yon_menu_window *yon_menu_window_open(GtkWidget *, main_window *widgets){ yon_menu_window *window = yon_menu_window_new(); + window->target = widgets->BootloadDefaultOSEntry; + g_signal_connect(G_OBJECT(window->ItemsListBox),"row-activated",G_CALLBACK(on_menu_chosen),window); + g_signal_connect(G_OBJECT(window->ChildrenListBox),"row-activated",G_CALLBACK(on_menu_chosen),window); gtk_window_set_transient_for(GTK_WINDOW(window->MenuWindow),GTK_WINDOW(widgets->MainWindow)); { - yon_menu_item *item = yon_menu_item_new(); - item->widgets=widgets; - item->window=window; - item->children=NULL; - gtk_label_set_text(GTK_LABEL(item->MenuTextLabel),DEFAULT_MENU_ITEM_LABEL); - item->target=yon_char_new(DEFAULT_MENU_ITEM_LABEL); - gtk_list_box_insert(GTK_LIST_BOX(window->ItemsListBox),item->MenuItemBox,-1); - yon_dictionary_add_or_create_if_exists_with_data(window->menu_items,DEFAULT_MENU_ITEM_LABEL,item); - gtk_widget_show(item->MenuItemBox); - gtk_widget_hide(item->NextIconButton); - g_signal_connect(G_OBJECT(item->MenuButton),"clicked",G_CALLBACK(on_menu_chosen),item); + yon_menu_item *item = yon_menu_add_item(window,"",DEFAULT_MENU_ITEM_LABEL,0); + gtk_list_box_insert(GTK_LIST_BOX(window->ItemsListBox),item->MenuItemRow,-1); + gtk_widget_hide(item->ArrowImage); } + int size; - config_str parsed = yon_config_load(get_menus_entry_command,&size); - for (int i=0;i"); - dictionary * cur_item = NULL; - if (param_size==2&&(cur_item=yon_dictionary_get(&window->menu_items,parameter[0]))){ - yon_menu_item *item = (yon_menu_item*)cur_item->data; - yon_menu_item *item_child = yon_menu_item_new(); - gtk_widget_hide(item_child->NextIconButton); - gtk_label_set_text(GTK_LABEL(item_child->MenuTextLabel),parameter[1]); - item_child->target=yon_char_new(parsed[i]); - gtk_widget_show(item_child->MenuItemBox); - yon_dictionary_add_or_create_if_exists_with_data(item->children,parameter[1],item_child); - item_child->widgets=widgets; - item_child->window=window; - - } else { - yon_menu_item *item = yon_menu_item_new(); - item->widgets=widgets; - item->window=window; - gtk_label_set_text(GTK_LABEL(item->MenuTextLabel),parameter[0]); - item->target=yon_char_new(parsed[i]); - gtk_list_box_insert(GTK_LIST_BOX(window->ItemsListBox),item->MenuItemBox,-1); - yon_dictionary_add_or_create_if_exists_with_data(window->menu_items,parameter[0],item); - gtk_widget_show(item->MenuItemBox); - if (param_size==2){ - yon_menu_item *item_child = yon_menu_item_new(); - gtk_widget_show(item->NextIconButton); - gtk_widget_hide(item_child->NextIconButton); - gtk_label_set_text(GTK_LABEL(item_child->MenuTextLabel),parameter[1]); - item_child->target=yon_char_new(parsed[i]); - gtk_widget_show(item_child->MenuItemBox); - item_child->widgets=widgets; - item_child->window=window; - g_signal_connect(G_OBJECT(item->MenuButton),"clicked",G_CALLBACK(on_submenu_open),item); - yon_dictionary_add_or_create_if_exists_with_data(item->children,parameter[1],item_child); - } else { - gtk_widget_hide(item->NextIconButton); - g_signal_connect(G_OBJECT(item->MenuButton),"clicked",G_CALLBACK(on_menu_chosen),item); - } + config_str options = yon_config_load(get_menus_entry_command,&size); + GHashTable *created = g_hash_table_new(g_str_hash,g_str_equal); + for (int i=1;i"))){ + children_id[0]='\0'; + have_children=1; + } + char *children_name; + if ((children_name=strstr(parsed[1],">"))){ + children_name[0]='\0'; + have_children=1; } + if (!g_hash_table_contains(created,parsed[0])){ + g_hash_table_add(created,parsed[0]); + yon_menu_item *item = yon_menu_add_item(window,parsed[0],parsed[1],have_children); + gtk_list_box_insert(GTK_LIST_BOX(window->ItemsListBox),item->MenuItemRow,-1); + if (!have_children){ + gtk_widget_hide(item->ArrowImage); + } + } } + g_hash_table_unref(created); + yon_char_parsed_free(options,size); gtk_window_set_transient_for(GTK_WINDOW(window->MenuWindow), GTK_WINDOW(widgets->MainWindow)); int x,y,width; @@ -270,10 +280,11 @@ yon_menu_window *yon_menu_window_open(GtkWidget *, main_window *widgets){ gtk_window_get_position(GTK_WINDOW(widgets->MainWindow),&x,&y); gtk_window_move(GTK_WINDOW(window->MenuWindow),window->button_pos_x-width,window->button_pos_y); gtk_widget_show(window->MenuWindow); - GdkGrabStatus status = gdk_seat_grab(gdk_display_get_default_seat(gdk_display_get_default()),gtk_widget_get_window(window->MenuWindow),GDK_SEAT_CAPABILITY_POINTER,TRUE,NULL,NULL,NULL,NULL); + GdkGrabStatus status = GDK_GRAB_SUCCESS; + // GdkGrabStatus status = gdk_seat_grab(gdk_display_get_default_seat(gdk_display_get_default()),gtk_widget_get_window(window->MenuWindow),GDK_SEAT_CAPABILITY_POINTER,TRUE,NULL,NULL,NULL,NULL); if (status != GDK_GRAB_SUCCESS) { window->seat_grab=0; - gtk_grab_add(window->MenuWindow); + // gtk_grab_add(window->MenuWindow); } else { window->seat_grab=1; } @@ -285,14 +296,7 @@ gboolean on_menu_clicked(GtkWidget *, GdkEventButton *event, yon_menu_window *wi gtk_window_get_size(GTK_WINDOW(window->MenuWindow),&width,&height); gtk_window_get_position(GTK_WINDOW(window->MenuWindow),&x,&y); if (event->x_rooty_rootx_root>x+width||event->y_root>y+height){ - - GdkDisplay *display = gdk_display_get_default(); - GdkSeat *seat = gdk_display_get_default_seat(display); - if (window->seat_grab) - gdk_seat_ungrab(seat); - else - gtk_grab_remove(window->MenuWindow); - gtk_widget_destroy(window->MenuWindow); + yon_menu_ungrab(window); } return 1; @@ -359,11 +363,9 @@ void on_menu_window_size_reallocated(GtkWidget *self,GtkAllocation *,yon_menu_wi yon_menu_item *yon_menu_item_new(){ yon_menu_item *item = new(yon_menu_item); GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_menu_item); - item->MenuItemBox = yon_gtk_builder_get_widget(builder,"MenuItemBox"); - item->MenuButton = yon_gtk_builder_get_widget(builder,"MenuButton"); + item->MenuItemRow = yon_gtk_builder_get_widget(builder,"MenuItemRow"); item->MenuTextLabel = yon_gtk_builder_get_widget(builder,"MenuTextLabel"); - item->NextIconButton = yon_gtk_builder_get_widget(builder,"NextIconButton"); - item->children=NULL; + item->ArrowImage = yon_gtk_builder_get_widget(builder,"ArrowImage"); return item; } diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c index 6fed350..8abf6ab 100644 --- a/source/ubinstall-gtk-page-switch.c +++ b/source/ubinstall-gtk-page-switch.c @@ -149,6 +149,9 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){ break; case YON_PAGE_SECTIONS: gtk_widget_show(widgets->SourceButton); + gtk_widget_set_sensitive(widgets->BackButton,1); + gtk_widget_set_sensitive(widgets->NextButton,1); + gtk_widget_set_sensitive(widgets->CancelInstallButton,1); break; default: gtk_widget_set_sensitive(widgets->BackButton,1); @@ -482,48 +485,31 @@ void on_page_cancel_clicked(GtkWidget *, main_window *widgets){ data->action_text=INTERRUPT_TEXT_LABEL; data->title=WARNING_TITLE_LABEL; if (yon_confirmation_dialog_call(widgets->MainWindow,data)==GTK_RESPONSE_ACCEPT ){ - gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_LICENCE); - on_page_prev_clicked(NULL,widgets); - gtk_widget_hide(gtk_widget_get_parent(widgets->InstallationProgress)); - gtk_widget_hide(gtk_widget_get_parent(widgets->PackageInstallationProgress)); pthread_cancel((pthread_t)main_config.install_thread); - - gtk_widget_hide(widgets->BackButton); - gtk_widget_hide(widgets->SourceButton); - gtk_widget_show(widgets->NextButton); - gtk_widget_show(widgets->StartScenarioButton); - gtk_widget_set_sensitive(widgets->CancelInstallButton,0); - gtk_widget_set_sensitive(widgets->BackButton,1); - gtk_widget_set_sensitive(widgets->NextButton,1); - gtk_widget_set_sensitive(widgets->ConfigurationModeMenuItem,1); - gtk_widget_show(widgets->NextButton); - gtk_widget_show(widgets->BackButton); - gtk_button_set_label(GTK_BUTTON(widgets->NextButton),NEXT_LABEL); - GtkWidget *image = gtk_button_get_image(GTK_BUTTON(widgets->NextButton)); - gtk_image_set_from_icon_name(GTK_IMAGE(image),arrow_right_icon_path,GTK_ICON_SIZE_BUTTON); - yon_page_update(widgets); - main_config.save_done=0; - main_config.install_complete=0; - main_config.install_thread=0; } + } + // gtk_widget_hide(widgets->BackButton); + // gtk_widget_hide(widgets->SourceButton); + // gtk_widget_show(widgets->NextButton); + // gtk_widget_show(widgets->StartScenarioButton); + // gtk_widget_set_sensitive(widgets->CancelInstallButton,0); + // gtk_widget_set_sensitive(widgets->BackButton,1); + // gtk_widget_set_sensitive(widgets->NextButton,1); + // gtk_widget_set_sensitive(widgets->ConfigurationModeMenuItem,1); + // gtk_widget_show(widgets->NextButton); + // gtk_widget_show(widgets->BackButton); + gtk_button_set_label(GTK_BUTTON(widgets->NextButton),NEXT_LABEL); + GtkWidget *image = gtk_button_get_image(GTK_BUTTON(widgets->NextButton)); + gtk_image_set_from_icon_name(GTK_IMAGE(image),arrow_right_icon_path,GTK_ICON_SIZE_BUTTON); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->LicenseAgreeRadio))){ + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_SECTIONS); } else { - gtk_widget_hide(widgets->BackButton); - gtk_widget_hide(widgets->SourceButton); - gtk_widget_show(widgets->NextButton); - gtk_widget_show(widgets->StartScenarioButton); - gtk_widget_set_sensitive(widgets->CancelInstallButton,0); - gtk_widget_set_sensitive(widgets->BackButton,1); - gtk_widget_set_sensitive(widgets->NextButton,1); - gtk_widget_set_sensitive(widgets->ConfigurationModeMenuItem,1); - gtk_widget_show(widgets->NextButton); - gtk_widget_show(widgets->BackButton); - gtk_button_set_label(GTK_BUTTON(widgets->NextButton),NEXT_LABEL); - GtkWidget *image = gtk_button_get_image(GTK_BUTTON(widgets->NextButton)); - gtk_image_set_from_icon_name(GTK_IMAGE(image),arrow_right_icon_path,GTK_ICON_SIZE_BUTTON); - yon_page_update(widgets); - gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_LICENCE); - on_page_prev_clicked(NULL,widgets); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_WELCOME); } + yon_page_update(widgets); + main_config.save_done=0; + main_config.install_complete=0; + main_config.install_thread=0; } void on_additional_page_clicked(GtkWidget *, main_window *widgets){ diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 2a16d55..4365993 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -604,7 +604,6 @@ void yon_main_window_create(main_window *widgets){ widgets->Notebook = yon_gtk_builder_get_widget(builder,"Notebook"); widgets->MainSpinner=yon_gtk_builder_get_widget(builder,"MainSpinner"); widgets->LicenseAgreeRadio = yon_gtk_builder_get_widget(builder,"LicenseAgreeRadio"); - widgets->LicenseDisgreeRadio = yon_gtk_builder_get_widget(builder,"LicenseDisgreeRadio"); widgets->DocumentationMenuItem = yon_ubl_menu_item_documentation_new(DOCUMENTATION_LABEL); widgets->AboutMenuItem = yon_ubl_menu_item_about_new(ABOUT_LABEL); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 063a202..bc29dcc 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -905,6 +905,7 @@ typedef struct GtkWidget *ItemsListBox; GtkWidget *ChildrenRevealer; GtkWidget *ChildrenListBox; + GtkWidget *target; int seat_grab; dictionary *menu_items; @@ -915,17 +916,15 @@ typedef struct typedef struct { - GtkWidget *MenuItemBox; - GtkWidget *MenuButton; + GtkWidget *MenuItemRow; GtkWidget *MenuTextLabel; - GtkWidget *NextIconButton; + GtkWidget *ArrowImage; - char *target; - - main_window *widgets; yon_menu_window *window; - - dictionary *children; + + char *name; + char *id; + int children; } yon_menu_item; @@ -1277,7 +1276,6 @@ gboolean yon_on_revealer_switched(yon_menu_window *window); gboolean on_menu_clicked(GtkWidget *, GdkEventButton *event, yon_menu_window *window); yon_menu_window *yon_menu_window_open(GtkWidget *, main_window *widgets); void on_submenu_open(GtkWidget *, yon_menu_item *item); -void on_menu_chosen(GtkWidget *, yon_menu_item *item); void yon_kernel_setup(main_window *widgets); void yon_kernel_row_setup(kernel_row *row, char *name, char *modules, char *package, char *tags, char *description); void yon_kernel_row_setup_tags(kernel_row *row, char *tags); @@ -1457,4 +1455,8 @@ void on_startup_app_add(GtkWidget *, main_window *widgets); void on_startup_app_edit(GtkWidget *, main_window *widgets); int yon_startup_app_save(main_window *widgets); void yon_on_about(GtkWidget *, main_window *); -void on_gparted_update(GtkWidget *, main_window *widgets); \ No newline at end of file +void on_gparted_update(GtkWidget *, main_window *widgets); +void yon_menu_open_submenu(yon_menu_window *window, yon_menu_item *item); +yon_menu_item *yon_menu_add_item(yon_menu_window *target_menu,const char *id, const char *name, int children); +void yon_menu_ungrab(yon_menu_window *window); +void on_menu_chosen(GtkWidget *, GtkListBoxRow* row, yon_menu_window *window); \ No newline at end of file diff --git a/source/ubl-strings.h b/source/ubl-strings.h index f524907..c5b1f1c 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -275,8 +275,8 @@ NULL) #define SOFTWARE_LABEL _("Installing Modules") #define PACMAN_SOFTWARE_LABEL _("Installing Packages") #define REGION_ICON_LABEL _("Location") -#define STARTUP_LABEL _("Startup services") -#define STARTUP_APP_LABEL _("Autorun of services") +#define STARTUP_LABEL _("Autorun of services") +#define STARTUP_APP_LABEL _("Autorun of applications") #define BOOTLOADER_LABEL _("Boot load") #define NETWORK_LABEL _("Network") #define ENABLE_VNC_LABEL _("Enable VNC server") @@ -289,6 +289,7 @@ NULL) #define APP_TABLE_LABEL _("Application") #define GROUP_TABLE_LABEL _("Group") +// #define _LABEL _("Select your language:") // #define _LABEL _("Selecting additional system kernel components") // #define _LABEL _("Package:") // #define _LABEL _("Module:") @@ -437,6 +438,7 @@ NULL) // #define _LABEL _("The process of restoring the system is underway...") // #define _LABEL _("System recovery successfully completed!") // #define _LABEL _("You can reboot the system and use the installed version or continue to work in the current system.") +// #define _LABEL _("Selecting additional system kernel components from the repository. Internet access required") #define slide_1_title _("Product ecosystem") #define slide_1_text _("Developed by a team of professionals and successfully presented on the market.\n\ diff --git a/ubinstall-gtk-menu-item.glade b/ubinstall-gtk-menu-item.glade index c9d988a..8e9e6fd 100644 --- a/ubinstall-gtk-menu-item.glade +++ b/ubinstall-gtk-menu-item.glade @@ -1,73 +1,41 @@ - + - + True - False + True - + True - True - True + False + 5 - + True False - 5 - - - True - False - label - - - False - True - 0 - - - - - True - True - False - True - menu1 - right - - - - - - - False - True - end - 1 - - + label + + False + True + 0 + + + + + True + False + com.ublinux.libublsettingsui-gtk3.pan-right-symbolic + + + False + True + 1 + - - - True - True - 0 - - - True - False - diff --git a/ubinstall-gtk-menu.glade b/ubinstall-gtk-menu.glade index a4205a7..ba2ded6 100644 --- a/ubinstall-gtk-menu.glade +++ b/ubinstall-gtk-menu.glade @@ -1,8 +1,13 @@ - + - + + + True + False + com.ublinux.libublsettingsui-gtk3.pan-left-symbolic + 450 250 @@ -78,6 +83,7 @@ + True False none @@ -88,50 +94,11 @@ 5 + Back True True True - - - True - False - 5 - - - True - True - False - True - left - - - - - - - False - True - 0 - - - - - True - False - Back - - - False - True - 1 - - - - + image1