diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 42384a7..7fe8d74 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -24,7 +24,7 @@ #define COMPLETION_TAB_LABEL _("Completion") #define COMMON_INSTALL_INFO_LABEL _("Deleting all data on the selected disk and then installing the UBLinux 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 UBLinux") +#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 ADDITIONAL_INSTALL_INFO_LABEL _("Selecting additional software to install from the repository via the Internet") @@ -57,7 +57,7 @@ #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 UBLinux OS will be\ninstalled.") #define DEVICE_LABEL _("Device") #define MARK_LABEL _("Mark") #define SIZE_LABEL _("Size") diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index 2988de9..b908df2 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -884,7 +884,7 @@ and help you install UBLinux on your computer True False - Shrinking a partition and creating a new one for installing UBLinux + Shrinking a partition and creating a new one for installing OS 0 @@ -960,7 +960,7 @@ and help you install UBLinux on your computer True False - Unpacking the UBLinux file system into an existing system + Unpacking into an existing system 0 @@ -3283,7 +3283,7 @@ or continue working in the UBLinux Live environment. True False - Shrinking a partition and creating a new one for installing UBLinux + Shrinking a partition and creating a new one for installing OS 0 @@ -3310,8 +3310,9 @@ or continue working in the UBLinux Live environment. True False - 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 + <b>Attention!</b> 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 installed. + True True 0 0 @@ -3884,7 +3885,7 @@ installed. True False - Unpacking the UBLinux file system into an existing system + Unpacking into an existing system 0 @@ -3911,7 +3912,8 @@ installed. True False - Attention! The UBLinux OS will be installed on the selected partition with OS already installed. All user data will be saved. + <b>Attention!</b> The UBLinux OS will be installed on the selected partition with OS already installed. All user data will be saved. + True True 0 0 diff --git a/ubinstall-gtk.pot b/ubinstall-gtk.pot index 77968d2..336bfbd 100644 --- a/ubinstall-gtk.pot +++ b/ubinstall-gtk.pot @@ -143,7 +143,7 @@ msgid "Installation next to another system" msgstr "" #: source/ubl-strings.h:24 -msgid "Shrinking a partition and creating a new one for installing UBLinux" +msgid "Shrinking a partition and creating a new one for installing OS" msgstr "" #: source/ubl-strings.h:25 @@ -151,7 +151,7 @@ msgid "Installation on the same partition as another system" msgstr "" #: source/ubl-strings.h:26 -msgid "Unpacking the UBLinux file system into an existing system" +msgid "Unpacking into an existing system" msgstr "" #: source/ubl-strings.h:27 @@ -261,7 +261,7 @@ msgstr "" #: source/ubl-strings.h:56 msgid "" -"Attention! The selected partition will be modified: the size will be " +"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" "installed." @@ -326,7 +326,7 @@ msgstr "" #: source/ubl-strings.h:73 msgid "" -"Attention! The selected OC UBLinux components will be installed\n" +"Attention! The selected OC UBLinux components will be installed\n" "separately into the selected partition." msgstr "" @@ -529,7 +529,7 @@ msgstr "" #: source/ubl-strings.h:132 msgid "" -"Attention! The UBLinux OS will be installed on the selected partition with " +"Attention! The UBLinux OS will be installed on the selected partition with " "OS already installed. All user data will be saved." msgstr "" diff --git a/ubinstall-gtk_ru.po b/ubinstall-gtk_ru.po index 598c542..1f7041e 100644 --- a/ubinstall-gtk_ru.po +++ b/ubinstall-gtk_ru.po @@ -153,16 +153,16 @@ msgid "Installation next to another system" msgstr "Установка рядом с другой системой" #: source/ubl-strings.h:24 -msgid "Shrinking a partition and creating a new one for installing UBLinux" -msgstr "Уменьшение раздела и создание нового для установки UBLinux" +msgid "Shrinking a partition and creating a new one for installing OS" +msgstr "Уменьшение раздела и создание нового для установки ОС" #: source/ubl-strings.h:25 msgid "Installation on the same partition as another system" msgstr "Установка в раздел другой системы" #: source/ubl-strings.h:26 -msgid "Unpacking the UBLinux file system into an existing system" -msgstr "Установить систему UBLinux в уже существующую систему" +msgid "Unpacking into an existing system" +msgstr "Установка в раздел другой системы" #: source/ubl-strings.h:27 msgid "" @@ -264,7 +264,7 @@ msgstr "Пользователь" #: source/ubl-strings.h:54 msgid "Select device:" -msgstr "Выберите устройство хранения:" +msgstr "Выберите устройство:" #: source/ubl-strings.h:55 msgid "Choose a section:" @@ -272,14 +272,14 @@ msgstr "Выберите раздел:" #: source/ubl-strings.h:56 msgid "" -"Attention! The selected partition will be modified: the size will be " +"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" "installed." msgstr "" -"Внимание! Выбранный раздел будет модифицирован: размер будет уменьшен. В " +"Внимание! Выбранный раздел будет модифицирован: размер будет уменьшен. В " "полученном свободном пространстве будет создан раздел, в который будет " -"произведена установка ОС UBLinux" +"произведена установка ОС." #: source/ubl-strings.h:57 msgid "Device" @@ -338,11 +338,11 @@ msgstr "" #: source/ubl-strings.h:73 msgid "" -"Attention! The selected OC UBLinux components will be installed\n" +"Attention! The selected OC UBLinux components will be installed\n" "separately into the selected partition." msgstr "" -"Внимание! В выбранный раздел будет произведена раздельная установка " -"выбранных компонентов ОС UBLinux/" +"Внимание! В выбранный раздел будет произведена раздельная установка " +"выбранных компонентов ОС UBLinux." #: source/ubl-strings.h:74 msgid "GRUB install" @@ -550,11 +550,11 @@ msgstr "Ошибка установки" #: source/ubl-strings.h:132 msgid "" -"Attention! The UBLinux OS will be installed on the selected partition with " +"Attention! The UBLinux OS will be installed on the selected partition with " "OS already installed. All user data will be saved." msgstr "" -"Внимание! ОС UBLinux будет установлена в выбранный раздел. Если не менять " -"тип ФС и не форматировать, все данные на разделе будут сохранены" +"Внимание! В выбранный раздел будет произведена установка системы. Если не менять " +"тип ФС и не форматировать, все данные на разделе будут сохранены." #: source/ubl-strings.h:134 msgid "Installation options"