diff --git a/locale/ubinstall-gtk.pot b/locale/ubinstall-gtk.pot index fef5a1d..395ba9f 100644 --- a/locale/ubinstall-gtk.pot +++ b/locale/ubinstall-gtk.pot @@ -18,17 +18,17 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: source/ubl-strings.h:2 -msgid "UBLinux installation" +msgid "System installation" msgstr "" #: source/ubl-strings.h:4 -msgid "Welcome to UBLinux installation" +msgid "Welcome to system installation" msgstr "" #: source/ubl-strings.h:5 msgid "" "This program will ask you few questions\n" -"and help you install UBLinux on your computer" +"and help you install system on your computer" msgstr "" #: source/ubl-strings.h:7 @@ -96,7 +96,7 @@ msgstr "" #: source/ubl-strings.h:24 msgid "" -"Deleting all data on the selected disk and then installing the UBLinux system" +"Deleting all data on the selected disk and then installing the system" msgstr "" #: source/ubl-strings.h:25 @@ -112,7 +112,7 @@ msgid "Installation on the same partition as another system" msgstr "" #: source/ubl-strings.h:28 -msgid "Unpacking the UBLinux file system into an existing system" +msgid "Unpacking the file system into an existing system" msgstr "" #: source/ubl-strings.h:29 source/ubl-strings.h:281 @@ -224,7 +224,7 @@ msgstr "" msgid "" "Attention! The selected partition will be modified: the size will be " "reduced. In the resulting free space, a partition will be created into which " -"the UBLinux OS will be\n" +"the system will be\n" "installed." msgstr "" @@ -245,7 +245,7 @@ msgid "Free" msgstr "" #: source/ubl-strings.h:64 -msgid "Specify the size of the new partition for UBLinux OS:" +msgid "Specify the size of the new partition for system:" msgstr "" #: source/ubl-strings.h:65 @@ -287,7 +287,7 @@ msgstr "" #: source/ubl-strings.h:77 msgid "" -"Attention! The selected OS UBLinux components will be installed\n" +"Attention! The selected system components will be installed\n" "separately into the selected partition." msgstr "" @@ -393,9 +393,9 @@ msgstr "" #: source/ubl-strings.h:107 msgid "" -"You have UBLinux installed on your computer.\n" +"You have system installed on your computer.\n" "You can reboot and use your new system\n" -"or continue working in the UBLinux Live environment." +"or continue working in the system Live environment." msgstr "" #: source/ubl-strings.h:111 @@ -447,7 +447,7 @@ msgid "Installation configuration has ended" msgstr "" #: source/ubl-strings.h:124 -msgid "UBLinux OS installation is about to begin" +msgid "system installation is about to begin" msgstr "" #: source/ubl-strings.h:126 @@ -482,7 +482,7 @@ msgstr "" #: source/ubl-strings.h:135 msgid "" -"Attention! The UBLinux OS will be installed on the selected partition with " +"Attention! The system will be installed on the selected partition with " "OS already installed. All user data will be saved." msgstr "" @@ -911,13 +911,13 @@ msgstr "" #: source/ubl-strings.h:267 msgid "" -"Attention! The UBLinux OS will be installed on the selected partition " +"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:268 msgid "" -"Attention! The selected OS UBLinux components will be installed\n" +"Attention! The selected system components will be installed\n" "separately into the selected partition." msgstr "" @@ -1174,5 +1174,5 @@ msgid "Are you sure want to exit and\ninterrupt installation process?" msgstr "" #: source/ubl-strings.h:331 -msgid "About UBLinux installation" +msgid "About system installation" msgstr "" \ No newline at end of file diff --git a/locale/ubinstall-gtk_ru.po b/locale/ubinstall-gtk_ru.po index d8fc7ad..977278f 100644 --- a/locale/ubinstall-gtk_ru.po +++ b/locale/ubinstall-gtk_ru.po @@ -18,17 +18,17 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: source/ubl-strings.h:2 -msgid "UBLinux installation" +msgid "System installation" msgstr "Программа установки UBLinux" #: source/ubl-strings.h:4 -msgid "Welcome to UBLinux installation" +msgid "Welcome to system installation" msgstr "Добро пожаловать в установку UBLinux" #: source/ubl-strings.h:5 msgid "" "This program will ask you few questions\n" -"and help you install UBLinux on your computer" +"and help you install system on your computer" msgstr "" "Эта программа задаст вам несколько вопросов\n" "и поможет установить UBLinux на ваш компьютер" @@ -102,7 +102,7 @@ msgstr "Завершение установки" #: source/ubl-strings.h:24 msgid "" -"Deleting all data on the selected disk and then installing the UBLinux system" +"Deleting all data on the selected disk and then installing the system" msgstr "" "Удаление всех данных на выбранном диске с последующей установкой системы " "UBLinux" @@ -120,7 +120,7 @@ msgid "Installation on the same partition as another system" msgstr "Установка в раздел другой системы" #: source/ubl-strings.h:28 -msgid "Unpacking the UBLinux file system into an existing system" +msgid "Unpacking the system into an existing system" msgstr "Установить ОС в уже существующий раздел" #: source/ubl-strings.h:29 source/ubl-strings.h:281 @@ -233,7 +233,7 @@ msgstr "Выберите раздел:" msgid "" "Attention! The selected partition will be modified: the size will be " "reduced. In the resulting free space, a partition will be created into which " -"the UBLinux OS will be\n" +"the system will be\n" "installed." msgstr "" "Внимание! Выбранный раздел будет модифицирован: размер будет " @@ -257,7 +257,7 @@ msgid "Free" msgstr "Свободно" #: source/ubl-strings.h:64 -msgid "Specify the size of the new partition for UBLinux OS:" +msgid "Specify the size of the new partition for system:" msgstr "Укажите размер нового раздела для ОС UBLinux:" #: source/ubl-strings.h:65 @@ -301,7 +301,7 @@ msgstr "" #: source/ubl-strings.h:77 msgid "" -"Attention! The selected OS UBLinux components will be installed\n" +"Attention! The selected system components will be installed\n" "separately into the selected partition." msgstr "" "Внимание! В выбранный раздел будет произведена раздельная установка " @@ -410,13 +410,13 @@ msgstr "Форматировать" #: source/ubl-strings.h:107 msgid "" -"You have UBLinux installed on your computer.\n" +"You have system installed on your computer.\n" "You can reboot and use your new system\n" -"or continue working in the UBLinux Live environment." +"or continue working in the environment, booted from the Live image." msgstr "" -"На вашем компьютере установлена система UBLinux.\n" +"На вашем компьютере установлена система.\n" "Вы можете перезагрузить и использовать свою новую систему\n" -"или продолжить работу в среде UBLinux Live." +"или продолжить работу в среде системы, загруженной с Live образа." #: source/ubl-strings.h:111 msgid "Apply" @@ -467,8 +467,8 @@ msgid "Installation configuration has ended" msgstr "Настройка установщика завершена" #: source/ubl-strings.h:124 -msgid "UBLinux OS installation is about to begin" -msgstr "Начало установки ОС UBLinux" +msgid "system installation is about to begin" +msgstr "Начало установки системы" #: source/ubl-strings.h:126 msgid "Documentation" @@ -505,7 +505,7 @@ msgstr "Ошибка установки" #: source/ubl-strings.h:135 msgid "" -"Attention! The UBLinux OS will be installed on the selected partition with " +"Attention! The system will be installed on the selected partition with " "OS already installed. All user data will be saved." msgstr "" "Внимание! В выбранный раздел будет произведена установка системы. " @@ -941,7 +941,7 @@ msgstr "Фиксированный размер:" #: source/ubl-strings.h:267 msgid "" -"Attention! The UBLinux OS will be installed on the selected partition " +"Attention! The system will be installed on the selected partition " "with OS already installed. All user data will be saved." msgstr "" "Внимание! В выбранный раздел будет произведена установка системы. " @@ -950,11 +950,11 @@ msgstr "" #: source/ubl-strings.h:268 msgid "" -"Attention! The selected OS UBLinux components will be installed\n" +"Attention! The selected system components will be installed\n" "separately into the selected partition." msgstr "" "Внимание! В выбранный раздел будет произведена раздельная установка " -"выбранных компонентов ОС UBLinux." +"выбранных компонентов системы." #: source/ubl-strings.h:269 msgid "Enable VNC server" @@ -1214,8 +1214,8 @@ msgstr "" "сохранены." #: source/ubl-strings.h:331 -msgid "About UBLinux installation" -msgstr "О Программе установки UBLinux" +msgid "About system installation" +msgstr "О Программе установки системы" msgid "Exit" msgstr "Выйти" diff --git a/source/ubl-strings.h b/source/ubl-strings.h index afc8c9e..e21887c 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -1,8 +1,8 @@ -#define TITLE_LABEL _("UBLinux installation") +#define TITLE_LABEL _("System installation") -#define WELCOME_LABEL _("Welcome to UBLinux installation") -#define WELCOME_BOTTOM_LABEL _("This program will ask you few questions\nand help you install UBLinux on your computer") +#define WELCOME_LABEL _("Welcome to system installation") +#define WELCOME_BOTTOM_LABEL _("This program will ask you few questions\nand help you install system on your computer") #define OPEN_LABEL _("Open") @@ -26,11 +26,11 @@ NULL) #define KEYBOARD_TAB_LABEL _("Keyboard") #define USERS_TAB_LABEL _("Users") #define COMPLETION_TAB_LABEL _("Installation completion") -#define COMMON_INSTALL_INFO_LABEL _("Deleting all data on the selected disk and then installing the UBLinux system") +#define COMMON_INSTALL_INFO_LABEL _("Deleting all data on the selected disk and then installing the system") #define NEAR_INSTALL_LABEL _("Installation next to another system") #define NEAR_INSTALL_INFO_LABEL _("Shrinking a partition and creating a new one for installing OS") #define SHRINK_SECTION_INSTALL_LABEL _("Installation on the same partition as another system") -#define SHRINK_SECTION_INSTALL_INFO_LABEL _("Unpacking the UBLinux file system into an existing system") +#define SHRINK_SECTION_INSTALL_INFO_LABEL _("Unpacking the file system into an existing system") #define ADDITIONAL_INSTALL_INFO_LABEL _("Selecting additional software to install from the repository via the Internet") #define CHOSEN_LABEL _("Chosen") #define MODULE_NAME_LABEL _("Module name") @@ -61,12 +61,12 @@ NULL) #define INSTALLATION_COMPLETION_LABEL _("Installation completion") #define SELECT_DEVICE_LABEL _("Select device:") #define CHOOSE_SECTION_LABEL _("Choose a section:") -#define ATTENSION_LABEL _("Attention! The selected partition will be modified: the size will be reduced. In the resulting free space, a partition will be created into which the UBLinux OS will be\ninstalled.") +#define ATTENSION_LABEL _("Attention! The selected partition will be modified: the size will be reduced. In the resulting free space, a partition will be created into which the system will be\ninstalled.") #define DEVICE_LABEL _("Device") #define MARK_LABEL _("Label") #define SIZE_LABEL _("Size") #define FREE_LABEL _("Free") -#define SPECIFY_LABEL _("Specify the size of the new partition for UBLinux OS:") +#define SPECIFY_LABEL _("Specify the size of the new partition for system:") #define TB_LABEL _("Tb") #define GB_LABEL _("Gb") #define MB_LABEL _("Mb") @@ -79,7 +79,7 @@ NULL) #define ADVANCED_INSTALLATION_HEAD_LABEL _("Advanced installation mode") #define ADVANCED_INSTALLATION_LABEL _("Installing OS files, user data on different partitions, creating RAID, etc.") -#define ADVANCED_INSTALLATION_ATTENTION_LABEL _("Attention! The selected OS UBLinux components will be installed\nseparately into the selected partition.") +#define ADVANCED_INSTALLATION_ATTENTION_LABEL _("Attention! The selected system components will be installed\nseparately into the selected partition.") #define GRUB_INSTALL_HEAD_LABEL _("GRUB install") #define GRUB_INSTALL_LABEL _("Install the GRUB bootloader") #define GRUB_UPDATE_HEAD_LABEL _("GRUB update") @@ -109,7 +109,7 @@ NULL) #define SECTION_NAME_LABEL _("Section name:") #define FORMAT_LABEL _("Format") -#define INSTALL_SUCCESS_LABEL _("You have UBLinux installed on your computer.\nYou can reboot and use your new system\nor continue working in the UBLinux Live environment.") +#define INSTALL_SUCCESS_LABEL _("You have system installed on your computer.\nYou can reboot and use your new system\nor continue working in the system Live environment.") #define LANGUAGES_TITLE_LABEL _("Available languages in the system") #define LAYOUTS_TITLE_LABEL _("Keyboard layout language") @@ -126,7 +126,7 @@ NULL) #define DEFAULT_MODEL_LABEL _("Default (Regular 105-key)") #define INSTALL_BEGIN_HEADER_LABEL _("Installation configuration has ended") -#define INSTALL_BEGIN_LABEL _("UBLinux OS installation is about to begin") +#define INSTALL_BEGIN_LABEL _("System installation is about to begin") #define DOCUMENTATION_LABEL _("Documentation") #define ABOUT_LABEL _("About") @@ -137,7 +137,7 @@ NULL) #define OPEN_DOCUMENTATION_LABEL _("Open documentation") #define INSTALLATION_ERROR _("Installation error") -#define ATTENTION_NEXT_LABEL _("Attention! The UBLinux OS will be installed on the selected partition with OS already installed. All user data will be saved.") +#define ATTENTION_NEXT_LABEL _("Attention! The system will be installed on the selected partition with OS already installed. All user data will be saved.") #define INSTALLATION_OPTIONS_LABEL _("Installation options") @@ -222,7 +222,7 @@ NULL) #define PARITY_INVALID_LABEL(target) yon_char_unite(_("Cu"),target,NULL) #define COUNT_INVALID_LABEL(target) yon_char_unite(_("Cues"),target,NULL) -#define ABOUT_TITLE_LABEL _("About UBLinux installation") +#define ABOUT_TITLE_LABEL _("About system installation") #define VALUE_REPEAT_LABEL _("Repeating values") #define SOURCE_CREATE_ONGOING_ERROR_LABEL _("Source creation were not done") // #define _LABEL _("New section at") @@ -276,8 +276,8 @@ NULL) // #define _LABEL _("Swap file") // #define _LABEL _("Corresponds to RAM size") // #define _LABEL _("Fixed size:") -// #define _LABEL _("Attention! The UBLinux OS will be installed on the selected partition with OS already installed. All user data will be saved.") -// #define _LABEL _("Attention! The selected OS UBLinux components will be installed\nseparately into the selected partition.") +// #define _LABEL _("Attention! The system will be installed on the selected partition with OS already installed. All user data will be saved.") +// #define _LABEL _("Attention! The selected system components will be installed\nseparately into the selected partition.") // #define _LABEL _("Enable VNC server") // #define _LABEL _("Preparation") // #define _LABEL _("Additional") diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index 35168c2..bfa86cb 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -781,7 +781,7 @@ agreement True False center - Welcome to UBLinux installation + Welcome to system installation True @@ -800,7 +800,7 @@ agreement False center This program will ask you few questions -and help you install UBLinux on your computer +and help you install system on your computer center True @@ -1123,7 +1123,7 @@ and help you install UBLinux on your computer True False 5 - Deleting all data on the selected disk and then installing the UBLinux system + Deleting all data on the selected disk and then installing the system 0 @@ -1684,7 +1684,7 @@ and help you install UBLinux on your computer True False start - UBLinux OS installation is about to begin + System installation is about to begin @@ -4657,9 +4657,9 @@ and help you install UBLinux on your computer True False start - You have UBLinux installed on your computer. + You have system installed on your computer. You can reboot and use your new system -or continue working in the UBLinux Live environment. +or continue working in the environment, booted from the Live image. center True @@ -5116,7 +5116,7 @@ or continue working in the UBLinux Live environment. True False - Deleting all data on the selected disk and then installing the UBLinux system + Deleting all data on the selected disk and then installing the system 0 @@ -6256,7 +6256,7 @@ or continue working in the UBLinux Live environment. True False - <b>Attention!</b> The UBLinux OS will be installed on the selected partition with OS already installed. All user data will be saved. + <b>Attention!</b> The system will be installed on the selected partition with OS already installed. All user data will be saved. True True 0 @@ -6860,7 +6860,7 @@ or continue working in the UBLinux Live environment. True False - <b>Attention!</b> The selected OS UBLinux components will be installed + <b>Attention!</b> The selected system components will be installed separately into the selected partition. True 0 @@ -7920,7 +7920,7 @@ separately into the selected partition. True False - <b>Attention!</b> The selected OS UBLinux components will be installed + <b>Attention!</b> The selected system components will be installed separately into the selected partition. True 0 @@ -10762,7 +10762,7 @@ separately into the selected partition. 5 5 2 - UBLinux installation + System installation