From a605e404d1db99f72ce9d1a8c2b84ae19c911e47 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 15 Jul 2024 10:52:34 +0600 Subject: [PATCH] Added error page --- source/ubinstall-gtk.c | 8 +- source/ubinstall-gtk.h | 4 +- source/ubl-strings.h | 4 +- ubinstall-gtk.glade | 1680 +++++----------------------------------- ubinstall-gtk.pot | 158 +--- ubinstall-gtk_ru.po | 44 +- 6 files changed, 233 insertions(+), 1665 deletions(-) diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 58b1a49..15168cc 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -322,7 +322,8 @@ void *on_config_save(void *data){ fclose(file); char *command = save_config_command(yon_char_parsed_to_string(parameters,size," ")); if (system(command)){ - yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),INSTALLATION_ERROR,5,BACKGROUND_IMAGE_FAIL_TYPE); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALL_ERROR); + // yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),INSTALLATION_ERROR,5,BACKGROUND_IMAGE_FAIL_TYPE); }; main_config.install_thread=NULL; main_config.install_complete=1; @@ -437,6 +438,7 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){ case YON_PAGE_USERS: gtk_widget_set_sensitive(widgets->NextButton,1); break; + case YON_PAGE_INSTALL_ERROR: case YON_PAGE_COMPLETION:{ gtk_widget_set_sensitive(widgets->BackButton,0); gtk_widget_hide(gtk_widget_get_parent(widgets->PackageInstallationProgress)); @@ -449,10 +451,6 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){ gtk_button_set_label(GTK_BUTTON(widgets->NextButton),RESTART_LABEL); gtk_button_set_label(GTK_BUTTON(widgets->CancelInstallButton),EXIT_LABEL); gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(GTK_BUTTON(widgets->NextButton))),"com.ublinux.libublsettingsui-gtk3.sync-symbolic",GTK_ICON_SIZE_BUTTON); - // gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(GTK_BUTTON(widgets->CancelInstallButton))),"com.ublinux.libublsettingsui-gtk3.reset-symbolic",GTK_ICON_SIZE_BUTTON); - - // pthread_t tid; - // pthread_create(&tid,NULL,on_config_save,widgets); } break; case YON_PAGE_INSTALL_COMMON: diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index b81f2c3..05f90b4 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -150,7 +150,9 @@ enum YON_PAGES { YON_PAGE_COMPLETED, YON_PAGE_INSTALL_COMMON, YON_PAGE_INSTALL_SEPARATE, - YON_PAGE_INSTALL_SAME_PARTITION + YON_PAGE_INSTALL_SAME_PARTITION, + YON_PAGE_INSTALL_OPTIONS, + YON_PAGE_INSTALL_ERROR }; typedef struct { diff --git a/source/ubl-strings.h b/source/ubl-strings.h index e8cd942..26914b2 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -115,4 +115,6 @@ #define DOCUMENTATION_CHECK_LABEL _("Always redirect to online documentation") #define OPEN_DOCUMENTATION_LABEL _("Open documentation") -#define INSTALLATION_ERROR _("Installation error") \ No newline at end of file +#define INSTALLATION_ERROR_LABEL _("Installation error") +#define ERROR_TOPIC_LABEL _("Error") +#define ERROR_LABEL _("Error has occured during installation process.") \ No newline at end of file diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index e8c9147..2c029a7 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -91,26 +91,11 @@ False com.ublinux.libublsettingsui-gtk3.trash-symbolic - - True - False - com.ublinux.libublsettingsui-gtk3.properties-symbolic - - - True - False - com.ublinux.libublsettingsui-gtk3.properties-symbolic - True False com.ublinux.libublsettingsui-gtk3.properties-symbolic - - True - False - com.ublinux.libublsettingsui-gtk3.properties-symbolic - True False @@ -1087,6 +1072,9 @@ and help you install UBLinux on your computer True AdditionalSoftwareList 0 + + + Chosen @@ -1215,6 +1203,9 @@ and help you install UBLinux on your computer True AdditionalSoftwareList 0 + + + Chosen @@ -1865,6 +1856,9 @@ and help you install UBLinux on your computer True LayoutsFilter 0 + + + Layout @@ -2616,6 +2610,9 @@ or continue working in the UBLinux Live environment. True DevicesList 0 + + + Device @@ -2994,6 +2991,9 @@ installed. True DevicesList 0 + + + Device @@ -3095,6 +3095,9 @@ installed. True PartitionsList 0 + + + Section @@ -3549,6 +3552,9 @@ installed. True DevicesList 0 + + + Device @@ -3639,6 +3645,9 @@ installed. True PartitionsList 0 + + + Section @@ -3834,7 +3843,7 @@ installed. True False - Installation with Linux + Installation on same part 14 @@ -3847,29 +3856,29 @@ installed. False vertical 5 + + + True + False + Installation options + + + + + + + + False + True + 0 + + True False vertical 5 - - - True - False - Installation parameters - - - - - - - - False - True - 0 - - True @@ -3897,7 +3906,7 @@ installed. True False - Installation next to another system + Additional installation options 0 @@ -3913,7 +3922,7 @@ installed. True False - Shrinking a partition and creating a new one for installing UBLinux + Separate installation of bootloader, system files, user data, etc. 0 @@ -3933,30 +3942,28 @@ installed. False True - 1 + 0 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 -installed. - True + Attention! The selected OC UBLinux components will be installed +separately into the selected partition. 0 - 0 False True - 2 + 1 False True - 0 + 1 @@ -3966,22 +3973,22 @@ installed. vertical 5 - + True - False - vertical - 5 + True + False + True + True True False 5 - + True False - Select device: - 0 + gtk-missing-image False @@ -3990,80 +3997,49 @@ installed. - - True - True - image2 - - - - False - True - end - 1 - - - - - False - True - 0 - - - - - True - True - in - 128 - - + True - True - DevicesList - 0 - - - Device - - - - - - - - Mark - - - - - + False + vertical + 5 - - Capacity - - - + + True + False + Installing GRUB + 0 + + + + + + False + True + 0 + - - Location - - - + + True + False + Install the GRUB bootloader + 0 + + False + True + 1 + + + True + True + 1 + - - False - True - 1 - @@ -4073,74 +4049,73 @@ installed. - + True - False - vertical + True + False + True + True - + True False - Choose a section: - 0 - - - False - True - 0 - - - - - True - True - in - 128 + 5 - + True - True - PartitionsList - - - Section - - - - - - - - Capacity - - - - - + False + gtk-missing-image + + + False + True + 0 + + + + + True + False + vertical + 5 - - Free space - - - + + True + False + GRUB update + 0 + + + + + + False + True + 0 + - - System - - - + + True + False + Update (reinstall) the GRUB bootloader + 0 + + False + True + 1 + + + True + True + 1 + - - False - True - 1 - @@ -4149,204 +4124,6 @@ installed. 1 - - - True - False - 5 - - - True - False - Specify the size of the new partition for UBLinux OS: - - - False - True - 0 - - - - - True - True - 0 - adjustment1 - - - False - True - 1 - - - - - True - False - - Mb - Gb - Tb - - - - False - True - 2 - - - - - False - True - 2 - - - - - False - True - 1 - - - - - 15 - - - - - True - False - Installation with Windows - - - 15 - False - - - - - True - False - vertical - 5 - - - True - False - Installation options - - - - - - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - 5 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - Additional installation options - 0 - - - - - - False - True - 0 - - - - - True - False - Separate installation of bootloader, system files, user data, etc. - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - False - True - 0 - - - - - True - False - Attention! The selected OC UBLinux components will be installed -separately into the selected partition. - 0 - - - False - True - 1 - - - - - False - True - 1 - - - - - True - False - vertical - 5 True @@ -4381,7 +4158,7 @@ separately into the selected partition. True False - Installing GRUB + Separate installation 0 @@ -4398,7 +4175,7 @@ separately into the selected partition. True False - Install the GRUB bootloader + Installing OS components and user data on different disk partitions 0 @@ -4420,7 +4197,7 @@ separately into the selected partition. False True - 0 + 2 @@ -4457,7 +4234,7 @@ separately into the selected partition. True False - GRUB update + OS only 0 @@ -4474,7 +4251,7 @@ separately into the selected partition. True False - Update (reinstall) the GRUB bootloader + Installing only OS components without user data 0 @@ -4496,7 +4273,7 @@ separately into the selected partition. False True - 1 + 3 @@ -4533,7 +4310,7 @@ separately into the selected partition. True False - Separate installation + User data only 0 @@ -4550,7 +4327,7 @@ separately into the selected partition. True False - Installing OS components and user data on different disk partitions + Installing only user data without OS components 0 @@ -4572,159 +4349,7 @@ separately into the selected partition. False True - 2 - - - - - True - True - False - True - True - - - True - False - 5 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - OS only - 0 - - - - - - - False - True - 0 - - - - - True - False - Installing only OS components without user data - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - - - False - True - 3 - - - - - True - True - False - True - True - - - True - False - 5 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - User data only - 0 - - - - - - - False - True - 0 - - - - - True - False - Installing only user data without OS components - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - - - False - True - 4 + 4 @@ -4736,7 +4361,7 @@ separately into the selected partition. - 16 + 15 @@ -4746,7 +4371,7 @@ separately into the selected partition. Install with more options - 16 + 15 False @@ -4760,9 +4385,10 @@ separately into the selected partition. True False - Installation parameters + Installation error + @@ -4774,1021 +4400,63 @@ separately into the selected partition. - - True + False - vertical - 5 - - - True - False - 5 - 10 - 5 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - Installing GRUB - 0 - - - - - - - False - True - 0 - - - - - True - False - Install the GRUB bootloader - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - False - True - 0 - - - - - True - False - Choose device: - 0 - - - False - True - 1 - - - - - True - True - in - 128 - - - True - True - DevicesList - 0 - - - Device - - - - - - - - Mark - - - - - - - - Capacity - - - - - - - - Location - - - - - - - - - - False - True - 2 - - - False + True True 1 - - - 17 - - - - - True - False - GRUB install - - - 17 - False - - - - - True - False - vertical - 5 True False - Installation parameters + end + Error - - + - False + True True - 0 + 2 - - True - False - vertical - 5 - - - True - False - 5 - 10 - 5 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - GRUB update - 0 - - - - - - - False - True - 0 - - - - - True - False - Update (reinstall) the GRUB bootloader - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - False - True - 0 - - - - - True - False - Choose device: - 0 - - - False - True - 1 - - - - - True - True - in - 128 - - - True - True - DevicesList - 0 - - - Device - - - - - - - - Mark - - - - - - - - Capacity - - - - - - - - Location - - - - - - - - - - False - True - 2 - - - - - False - True - 1 - - - - - 18 - - - - - True - False - GRUB update - - - 18 - False - - - - - True - False - vertical - 5 - - - True - False - vertical - 5 - - - True - False - Installation parameters - - - - - - - - False - True - 0 - - - - - True - False - 5 - 10 - 5 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - Separate installation - 0 - - - - - - - False - True - 0 - - - - - True - False - Installing OS components and user data on different disk partitions - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - False - True - 1 - - - - - True - False - Attention! The UBLinux OS will be installed on the selected partition with Linux OS already installed. All user data will be saved. - True - 0 - 0 - - - False - True - 2 - - - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - vertical - 5 - - - True - False - 5 - - - True - False - Select device: - 0 - - - False - True - 0 - - - - - True - True - True - image3 - - - - False - True - end - 1 - - - - - False - True - 0 - - - - - True - True - in - 128 - - - True - True - DevicesList - 0 - - - Device - - - - - - - - Mark - - - - - - - - Capacity - - - - - - - - Location - - - - - - - - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - vertical - - - True - False - Choose a section: - 0 - - - False - True - 0 - - - - - True - True - in - 128 - - - True - True - PartitionsList - - - Section - - - - - - - - Capacity - - - - - - - - Free space - - - - - - - - System - - - - - - - - - - False - True - 1 - - - - - False - True - 1 - - - - - False - True - 1 - - - - - 19 - - - - - True - False - Separate installation - - - 19 - False - - - - - True - False - vertical - 5 - - - True - False - vertical - 5 - - - True - False - Installation parameters - - - - - - - - False - True - 0 - - - - - True - False - 5 - 10 - 5 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - vertical - 5 - - - True - False - OS only - 0 - - - - - - - False - True - 0 - - - - - True - False - Installing only OS components without user data - 0 - - - False - True - 1 - - - - - True - True - 1 - - - - - False - True - 1 - - - - - True - False - Attention! The UBLinux OS will be installed on the selected partition with Linux OS already installed. All user data will be saved. - True - 0 - 0 - - - False - True - 2 - - - - - False - True - 0 - - - - + True False - vertical - 5 - - - True - False - vertical - 5 - - - True - False - 5 - - - True - False - Select device: - 0 - - - False - True - 0 - - - - - True - True - True - image4 - - - - False - True - end - 1 - - - - - False - True - 0 - - - - - True - True - in - 128 - - - True - True - DevicesList - 0 - - - Device - - - - - - - - Mark - - - - - - - - Capacity - - - - - - - - Location - - - - - - - - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - vertical - - - True - False - Choose a section: - 0 - - - False - True - 0 - - - - - True - True - in - 128 - - - True - True - PartitionsList - - - Section - - - - - - - - Capacity - - - - - - - - Free space - - - - - - - - System - - - - - - - - - - False - True - 1 - - - - - False - True - 1 - - + start + Error has occured during installation process. + center + True + + + - False + True True - 1 + 3 - 20 + 16 True False - OS only + Error - 20 + 16 False diff --git a/ubinstall-gtk.pot b/ubinstall-gtk.pot index bdbfe9d..d115a28 100644 --- a/ubinstall-gtk.pot +++ b/ubinstall-gtk.pot @@ -462,6 +462,18 @@ msgstr "" msgid "Open documentation" msgstr "" +#: source/ubl-strings.h:102 +msgid "Installation error" +msgstr "" + +#: source/ubl-strings.h:102 +msgid "Error" +msgstr "" + +#: source/ubl-strings.h:102 +msgid "Error has occured during installation process." +msgstr "" + msgid "Afrikaans" msgstr "" @@ -2675,18 +2687,12 @@ msgstr "" msgid "Uzbek (Afghanistan)" msgstr "" -msgid "Albanian" -msgstr "" - msgid "Albanian (Plisi)" msgstr "" msgid "Albanian (Veqilharxhi)" msgstr "" -msgid "Armenian" -msgstr "" - msgid "Armenian (alt. eastern)" msgstr "" @@ -2726,9 +2732,6 @@ msgstr "" msgid "APL symbols (unified)" msgstr "" -msgid "Arabic" -msgstr "" - msgid "Arabic (AZERTY)" msgstr "" @@ -2780,15 +2783,9 @@ msgstr "" msgid "English (Australian)" msgstr "" -msgid "Azerbaijani" -msgstr "" - msgid "Azerbaijani (Cyrillic)" msgstr "" -msgid "Bosnian" -msgstr "" - msgid "Bosnian (with guillemets)" msgstr "" @@ -2828,9 +2825,6 @@ msgstr "" msgid "Belgian (Wang 724 AZERTY)" msgstr "" -msgid "Bulgarian" -msgstr "" - msgid "Bulgarian (new phonetic)" msgstr "" @@ -2885,9 +2879,6 @@ msgstr "" msgid "Tswana" msgstr "" -msgid "Belarusian" -msgstr "" - msgid "Belarusian (intl.)" msgstr "" @@ -2981,9 +2972,6 @@ msgstr "" msgid "Cameroon Multilingual (QWERTY, intl.)" msgstr "" -msgid "Chinese" -msgstr "" - msgid "Hanyu Pinyin Letters (with AltGr dead keys)" msgstr "" @@ -3020,10 +3008,7 @@ msgstr "" msgid "A user-defined custom Layout" msgstr "" -msgid "Czech" -msgstr "" - -msgid "Czech (with <\" +msgid "Czech (with <\\" msgstr "" msgid "Czech (coder)" @@ -3059,9 +3044,6 @@ msgstr "" msgid "Czech (UCW, only accented letters)" msgstr "" -msgid "German" -msgstr "" - msgid "German (Aus der Neo-Welt)" msgstr "" @@ -3155,9 +3137,6 @@ msgstr "" msgid "German (US)" msgstr "" -msgid "Danish" -msgstr "" - msgid "Danish (Dvorak)" msgstr "" @@ -3194,9 +3173,6 @@ msgstr "" msgid "Kabyle (QWERTY, US, with dead keys)" msgstr "" -msgid "Estonian" -msgstr "" - msgid "Estonian (Dvorak)" msgstr "" @@ -3218,9 +3194,6 @@ msgstr "" msgid "Esperanto (legacy)" msgstr "" -msgid "Spanish" -msgstr "" - msgid "Asturian (Spain, with bottom-dot H and L)" msgstr "" @@ -3251,9 +3224,6 @@ msgstr "" msgid "EurKEY (US)" msgstr "" -msgid "Finnish" -msgstr "" - msgid "Finnish (classic)" msgstr "" @@ -3284,9 +3254,6 @@ msgstr "" msgid "Faroese (no dead keys)" msgstr "" -msgid "French" -msgstr "" - msgid "French (AZERTY, AFNOR)" msgstr "" @@ -3383,9 +3350,6 @@ msgstr "" msgid "English (UK, Sun Type 6/7)" msgstr "" -msgid "Georgian" -msgstr "" - msgid "Georgian (ergonomic)" msgstr "" @@ -3428,9 +3392,6 @@ msgstr "" msgid "N'Ko (AZERTY)" msgstr "" -msgid "Greek" -msgstr "" - msgid "Greek (Colemak)" msgstr "" @@ -3449,9 +3410,6 @@ msgstr "" msgid "Greek (Sun Type 6/7)" msgstr "" -msgid "Croatian" -msgstr "" - msgid "Croatian (with guillemets)" msgstr "" @@ -3464,9 +3422,6 @@ msgstr "" msgid "Croatian (US)" msgstr "" -msgid "Hungarian" -msgstr "" - msgid "Hungarian (QWERTY, 101-key, comma, dead keys)" msgstr "" @@ -3554,9 +3509,6 @@ msgstr "" msgid "Irish (UnicodeExpert)" msgstr "" -msgid "Hebrew" -msgstr "" - msgid "Hebrew (Biblical, Tiro)" msgstr "" @@ -3569,9 +3521,6 @@ msgstr "" msgid "Hebrew (phonetic)" msgstr "" -msgid "Indian" -msgstr "" - msgid "Bangla (India, Baishakhi)" msgstr "" @@ -3599,9 +3548,6 @@ msgstr "" msgid "English (India, with rupee)" msgstr "" -msgid "Gujarati" -msgstr "" - msgid "Punjabi (Gurmukhi)" msgstr "" @@ -3620,18 +3566,12 @@ msgstr "" msgid "Kannada (KaGaPa, phonetic)" msgstr "" -msgid "Kannada" -msgstr "" - msgid "Malayalam (enhanced InScript, with rupee)" msgstr "" msgid "Malayalam (Lalitha)" msgstr "" -msgid "Malayalam" -msgstr "" - msgid "Marathi (enhanced InScript)" msgstr "" @@ -3647,9 +3587,6 @@ msgstr "" msgid "Oriya (Bolnagri)" msgstr "" -msgid "Oriya" -msgstr "" - msgid "Oriya (Wx)" msgstr "" @@ -3680,9 +3617,6 @@ msgstr "" msgid "Telugu (Sarala)" msgstr "" -msgid "Telugu" -msgstr "" - msgid "Urdu (Navees)" msgstr "" @@ -3731,9 +3665,6 @@ msgstr "" msgid "Persian (with Persian keypad)" msgstr "" -msgid "Icelandic" -msgstr "" - msgid "Icelandic (Dvorak)" msgstr "" @@ -3743,9 +3674,6 @@ msgstr "" msgid "Icelandic (Macintosh, legacy)" msgstr "" -msgid "Italian" -msgstr "" - msgid "Italian (Dvorak)" msgstr "" @@ -3782,9 +3710,6 @@ msgstr "" msgid "Italian (Windows)" msgstr "" -msgid "Japanese" -msgstr "" - msgid "Japanese (Dvorak)" msgstr "" @@ -3827,18 +3752,12 @@ msgstr "" msgid "Khmer (Cambodia)" msgstr "" -msgid "Korean" -msgstr "" - msgid "Korean (101/104-key compatible)" msgstr "" msgid "Korean (Sun Type 6/7)" msgstr "" -msgid "Kazakh" -msgstr "" - msgid "Kazakh (extended)" msgstr "" @@ -3887,9 +3806,6 @@ msgstr "" msgid "Sinhala (US)" msgstr "" -msgid "Lithuanian" -msgstr "" - msgid "Lithuanian (IBM LST 1205-92)" msgstr "" @@ -3917,9 +3833,6 @@ msgstr "" msgid "Lithuanian (US)" msgstr "" -msgid "Latvian" -msgstr "" - msgid "Latvian (adapted)" msgstr "" @@ -4028,9 +3941,6 @@ msgstr "" msgid "Montenegrin (Latin, QWERTY)" msgstr "" -msgid "Macedonian" -msgstr "" - msgid "Macedonian (no dead keys)" msgstr "" @@ -4067,9 +3977,6 @@ msgstr "" msgid "Mongolian" msgstr "" -msgid "Maltese" -msgstr "" - msgid "Maltese (UK, with AltGr overrides)" msgstr "" @@ -4100,9 +4007,6 @@ msgstr "" msgid "Yoruba" msgstr "" -msgid "Dutch" -msgstr "" - msgid "Dutch (Macintosh)" msgstr "" @@ -4196,9 +4100,6 @@ msgstr "" msgid "Urdu (Pakistan, NLA)" msgstr "" -msgid "Polish" -msgstr "" - msgid "Polish (Colemak-DH)" msgstr "" @@ -4244,9 +4145,6 @@ msgstr "" msgid "Silesian" msgstr "" -msgid "Portuguese" -msgstr "" - msgid "Portuguese (Colemak)" msgstr "" @@ -4271,9 +4169,6 @@ msgstr "" msgid "Portuguese (Sun Type 6/7)" msgstr "" -msgid "Romanian" -msgstr "" - msgid "Crimean Tatar (Dobruja Q)" msgstr "" @@ -4289,9 +4184,6 @@ msgstr "" msgid "Romanian (Windows)" msgstr "" -msgid "Serbian" -msgstr "" - msgid "Serbian (Cyrillic, with guillemets)" msgstr "" @@ -4319,9 +4211,6 @@ msgstr "" msgid "Serbian (Cyrillic, ZE and ZHE swapped)" msgstr "" -msgid "Russian" -msgstr "" - msgid "Bashkirian" msgstr "" @@ -4418,9 +4307,6 @@ msgstr "" msgid "Kalmyk" msgstr "" -msgid "Swedish" -msgstr "" - msgid "Swedish (Dvorak A5)" msgstr "" @@ -4460,18 +4346,12 @@ msgstr "" msgid "Swedish (US)" msgstr "" -msgid "Slovenian" -msgstr "" - msgid "Slovenian (with guillemets)" msgstr "" msgid "Slovenian (US)" msgstr "" -msgid "Slovak" -msgstr "" - msgid "Slovak (ACC layout, only accented letters)" msgstr "" @@ -4511,9 +4391,6 @@ msgstr "" msgid "French (Togo)" msgstr "" -msgid "Thai" -msgstr "" - msgid "Thai (Pattachote)" msgstr "" @@ -4538,9 +4415,6 @@ msgstr "" msgid "International Phonetic Alphabet (QWERTY)" msgstr "" -msgid "Turkish" -msgstr "" - msgid "Turkish (Alt-Q)" msgstr "" @@ -4589,9 +4463,6 @@ msgstr "" msgid "Swahili (Tanzania)" msgstr "" -msgid "Ukrainian" -msgstr "" - msgid "Crimean Tatar (Turkish Alt-Q)" msgstr "" @@ -4775,9 +4646,6 @@ msgstr "" msgid "Uzbek (Latin)" msgstr "" -msgid "Vietnamese" -msgstr "" - msgid "Vietnamese (AÐERTY)" msgstr "" diff --git a/ubinstall-gtk_ru.po b/ubinstall-gtk_ru.po index bf87102..c3001c7 100644 --- a/ubinstall-gtk_ru.po +++ b/ubinstall-gtk_ru.po @@ -468,8 +468,13 @@ msgid "Would you like to read documentation in the Web?" msgstr "Вы хотите прочитать документацию в Сети?" #: source/ubl-strings.h:102 -msgid "You will be redirected to documentation website where documentation is\ntranslated and supported by community." -msgstr "Вы будете перенаправлены на сайт с документацией, где документация переводится\nи поддерживается сообществом" +msgid "" +"You will be redirected to documentation website where documentation is\n" +"translated and supported by community." +msgstr "" +"Вы будете перенаправлены на сайт с документацией, где документация " +"переводится\n" +"и поддерживается сообществом" #: source/ubl-strings.h:102 msgid "Always redirect to online documentation" @@ -479,6 +484,18 @@ msgstr "Всегда перенаправлять" msgid "Open documentation" msgstr "Открыть документацию" +#: source/ubl-strings.h:102 +msgid "Installation error" +msgstr "Ошибка установки" + +#: source/ubl-strings.h:102 +msgid "Error" +msgstr "Ошибка" + +#: source/ubl-strings.h:102 +msgid "Error has occured during installation process." +msgstr "Во время процесса установки произошла ошибка." + msgid "Afrikaans" msgstr "Африканский" @@ -3025,7 +3042,7 @@ msgstr "Уйгурский" msgid "A user-defined custom Layout" msgstr "Пользовательский макет" -msgid "Czech (with <\"" +msgid "Czech (with <\\" msgstr "Чешский (с <\")" msgid "Czech (coder)" @@ -4450,6 +4467,15 @@ msgstr "Курдский (Турция, F)" msgid "Kurdish (Turkey, Latin Q)" msgstr "Курдский (Турция, латиница Q)" +msgid "Ottoman (F)" +msgstr "Османская (F)" + +msgid "Old Turkic (F)" +msgstr "Старый тюркский (F)" + +msgid "Old Turkic" +msgstr "Старый тюркский" + msgid "Ottoman (Q)" msgstr "Османская (Q)" @@ -4541,13 +4567,16 @@ msgid "English (Carpalx)" msgstr "Английский (Carpalx)" msgid "English (Carpalx, full optimization, intl., with AltGr dead keys)" -msgstr "Английский (Carpalx, полная оптимизация, международный, с мёртвыми клавишами AltGr)" +msgstr "" +"Английский (Carpalx, полная оптимизация, международный, с мёртвыми клавишами " +"AltGr)" msgid "English (Carpalx, full optimization)" msgstr "Английский (Carpalx, полная оптимизация)" msgid "English (Carpalx, full optimization, intl., with dead keys)" -msgstr "Английский (Carpalx, полная оптимизация, международный, с мёртвыми клавишами)" +msgstr "" +"Английский (Carpalx, полная оптимизация, международный, с мёртвыми клавишами)" msgid "English (Carpalx, intl., with dead keys)" msgstr "Английский (Carpalx, международный, с мёртвыми клавишами)" @@ -4571,7 +4600,8 @@ msgid "Czech Slovak and German (US)" msgstr "Чешский, словацкий и немецкий (США)" msgid "Czech, Slovak, Polish, Spanish, Finnish, Swedish and German (US)" -msgstr "Чешский, словацкий, польский, испанский, финский, шведский и немецкий (США)" +msgstr "" +"Чешский, словацкий, польский, испанский, финский, шведский и немецкий (США)" msgid "German, Swedish and Finnish (US)" msgstr "Немецкий, шведский и финский (США)" @@ -4667,4 +4697,4 @@ msgid "Vietnamese (US)" msgstr "Вьетнамский (США)" msgid "English (South Africa)" -msgstr "Английский (Южная Африка)" \ No newline at end of file +msgstr "Английский (Южная Африка)"