From 2b21daba6f04179b778e5da56b8efad26631f9b1 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 31 May 2024 17:52:28 +0600 Subject: [PATCH] Added status message for adding repeating package --- source/ubl-settings-repomanager.c | 6 + source/ubl-strings.h | 8 +- ubl-settings-repomanager.pot | 186 ++++++++++++++--------------- ubl-settings-repomanager_ru.po | 188 +++++++++++++++--------------- 4 files changed, 194 insertions(+), 194 deletions(-) diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index b13e273..3f82fe6 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -568,6 +568,9 @@ void on_add_accept(GtkWidget *self, dictionary *dict){ } gtk_list_store_append(window->PackagesList,&itar); gtk_list_store_set(window->PackagesList,&itar,1,name[0],2,current,3,1,-1); + } else { + yon_ubl_status_box_spawn(GTK_CONTAINER(dialog->StatusBox),ALREADY_EXIST_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); + return; } yon_char_parsed_free(name,name_size); } @@ -857,6 +860,9 @@ void on_move_add_accept(GtkWidget *self, dictionary *dict){ if (!yon_gtk_tree_model_check_exist(GTK_TREE_MODEL(window->PackagesList),&iter,name[0],1)){ gtk_list_store_append(window->PackagesList,&iter); gtk_list_store_set(window->PackagesList,&iter,1,name[0],2,path,-1); + } else { + yon_ubl_status_box_spawn(GTK_CONTAINER(dialog->StatusBox),ALREADY_EXIST_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); + return; } } diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 96144ae..ac934d2 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -33,9 +33,6 @@ #define UPDATE_LABEL _("Update") #define STORAGE_CONFIGURE_TOOLTIP_LABEL _("Configure storages") -#define ADD_PACKAGES_TOOLTP_LABEL _("Add packages") -#define MOVE_PACKAGES_TOOLTIP_LABEL _("Move packages") -#define REMOVE_PACKAGES_TOOLTIP_LABEL _("Remove packages") #define LAUNCH_UBL_SETTINGS_UPDATE_TOOLTIP_LABEL _("System update") #define EMPTY_IMPORTANT_LABEL _("Empty important field") @@ -75,7 +72,6 @@ #define ACCEPT_LABEL _("Accept") #define REPO_LABEL _("Repository:") -#define ARCH_LABEL _("Architecture:") #define SOURCE_LABEL _("Source") #define TARGET_LABEL _("Target") #define PACKAGE_SIGN_LABEL _("Packages sign:") @@ -108,8 +104,6 @@ #define ENABLE_DISABLE_REPO_LABEL _("Enable/disable repository publish") #define CHECK_REPO_LABEL _("Check dependences") #define SIGN_REPO_LABEL _("Sign ripository") -#define ADD_PACKAGE_REPO_LABEL _("Add package") -#define REMOVE_PACKAGE_REPO_LABEL _("Remove package") #define OPEN_LABEL _("Open") #define OPERATION_DONE_LABEL _("Operation done") @@ -135,7 +129,7 @@ #define PACKAGE_LABEL _("package") #define REPOSITORY_LABEL _("repository") -#define ALREADY_EXIST _("This package already exists in that repository") +#define ALREADY_EXIST_LABEL _("This package already has been added") #define REPO_ALREADY_EXISTS_LABEL _("This repository has already been added") #define CLOSE_LABEL _("Close") diff --git a/ubl-settings-repomanager.pot b/ubl-settings-repomanager.pot index e9ef5a5..63305f8 100644 --- a/ubl-settings-repomanager.pot +++ b/ubl-settings-repomanager.pot @@ -63,19 +63,19 @@ msgstr "" msgid "Choose folder" msgstr "" -#: source/ubl-strings.h:16 source/ubl-strings.h:36 +#: source/ubl-strings.h:16 msgid "Add packages" msgstr "" -#: source/ubl-strings.h:17 source/ubl-strings.h:37 +#: source/ubl-strings.h:17 msgid "Move packages" msgstr "" -#: source/ubl-strings.h:18 source/ubl-strings.h:38 +#: source/ubl-strings.h:18 msgid "Remove packages" msgstr "" -#: source/ubl-strings.h:20 source/ubl-strings.h:42 +#: source/ubl-strings.h:20 source/ubl-strings.h:39 msgid "Key creation" msgstr "" @@ -131,356 +131,356 @@ msgstr "" msgid "Configure storages" msgstr "" -#: source/ubl-strings.h:39 +#: source/ubl-strings.h:36 msgid "System update" msgstr "" -#: source/ubl-strings.h:41 +#: source/ubl-strings.h:38 msgid "Empty important field" msgstr "" -#: source/ubl-strings.h:44 +#: source/ubl-strings.h:41 msgid "Repository data has been loaded successfully" msgstr "" -#: source/ubl-strings.h:46 +#: source/ubl-strings.h:43 msgid "Saving has succeeded" msgstr "" -#: source/ubl-strings.h:48 +#: source/ubl-strings.h:45 msgid "General" msgstr "" -#: source/ubl-strings.h:49 +#: source/ubl-strings.h:46 msgid "Publication" msgstr "" -#: source/ubl-strings.h:50 +#: source/ubl-strings.h:47 msgid "Trusted repository" msgstr "" -#: source/ubl-strings.h:51 +#: source/ubl-strings.h:48 msgid "Server type:" msgstr "" -#: source/ubl-strings.h:52 +#: source/ubl-strings.h:49 msgid "IP adress:" msgstr "" -#: source/ubl-strings.h:53 +#: source/ubl-strings.h:50 msgid "Port:" msgstr "" -#: source/ubl-strings.h:54 +#: source/ubl-strings.h:51 msgid "Publish" msgstr "" -#: source/ubl-strings.h:55 +#: source/ubl-strings.h:52 msgid "Code name:" msgstr "" -#: source/ubl-strings.h:56 +#: source/ubl-strings.h:53 msgid "Branch:" msgstr "" -#: source/ubl-strings.h:57 source/ubl-strings.h:78 +#: source/ubl-strings.h:54 msgid "Architecture:" msgstr "" -#: source/ubl-strings.h:58 +#: source/ubl-strings.h:55 msgid "Components:" msgstr "" -#: source/ubl-strings.h:59 +#: source/ubl-strings.h:56 msgid "Signature:" msgstr "" -#: source/ubl-strings.h:60 +#: source/ubl-strings.h:57 msgid "Sign" msgstr "" -#: source/ubl-strings.h:62 +#: source/ubl-strings.h:59 msgid "Move" msgstr "" -#: source/ubl-strings.h:63 +#: source/ubl-strings.h:60 msgid "Remove" msgstr "" -#: source/ubl-strings.h:65 +#: source/ubl-strings.h:62 msgid "Sign repo" msgstr "" -#: source/ubl-strings.h:66 +#: source/ubl-strings.h:63 msgid "Remove repo" msgstr "" -#: source/ubl-strings.h:67 +#: source/ubl-strings.h:64 msgid "Manage storages" msgstr "" -#: source/ubl-strings.h:68 +#: source/ubl-strings.h:65 msgid "Storage:" msgstr "" -#: source/ubl-strings.h:69 +#: source/ubl-strings.h:66 msgid "Open existing" msgstr "" -#: source/ubl-strings.h:70 +#: source/ubl-strings.h:67 msgid "Create new" msgstr "" -#: source/ubl-strings.h:71 +#: source/ubl-strings.h:68 msgid "Disable" msgstr "" -#: source/ubl-strings.h:72 +#: source/ubl-strings.h:69 msgid "Delete" msgstr "" -#: source/ubl-strings.h:73 +#: source/ubl-strings.h:70 msgid "Add repository" msgstr "" -#: source/ubl-strings.h:74 +#: source/ubl-strings.h:71 msgid "Repository (-ies)" msgstr "" -#: source/ubl-strings.h:75 +#: source/ubl-strings.h:72 msgid "Accept" msgstr "" -#: source/ubl-strings.h:77 +#: source/ubl-strings.h:74 msgid "Repository:" msgstr "" -#: source/ubl-strings.h:79 +#: source/ubl-strings.h:75 msgid "Source" msgstr "" -#: source/ubl-strings.h:80 +#: source/ubl-strings.h:76 msgid "Target" msgstr "" -#: source/ubl-strings.h:81 +#: source/ubl-strings.h:77 msgid "Packages sign:" msgstr "" -#: source/ubl-strings.h:82 +#: source/ubl-strings.h:78 msgid "Repository sign:" msgstr "" -#: source/ubl-strings.h:83 +#: source/ubl-strings.h:79 msgid "Package (-s) to add" msgstr "" -#: source/ubl-strings.h:84 +#: source/ubl-strings.h:80 msgid "Package (-s) to remove" msgstr "" -#: source/ubl-strings.h:85 +#: source/ubl-strings.h:81 msgid "Package (-s) to move" msgstr "" -#: source/ubl-strings.h:86 +#: source/ubl-strings.h:82 msgid "Name" msgstr "" -#: source/ubl-strings.h:87 +#: source/ubl-strings.h:83 msgid "Path" msgstr "" -#: source/ubl-strings.h:88 source/ubl-strings.h:112 +#: source/ubl-strings.h:84 msgid "Remove package" msgstr "" -#: source/ubl-strings.h:89 source/ubl-strings.h:111 +#: source/ubl-strings.h:85 msgid "Add package" msgstr "" -#: source/ubl-strings.h:91 +#: source/ubl-strings.h:87 msgid "Repository sign failed - repository has no packages" msgstr "" -#: source/ubl-strings.h:92 +#: source/ubl-strings.h:88 msgid "Data has been loaded" msgstr "" -#: source/ubl-strings.h:93 +#: source/ubl-strings.h:89 msgid "Packages were added successfully" msgstr "" -#: source/ubl-strings.h:94 +#: source/ubl-strings.h:90 msgid "Packages were removed successfully" msgstr "" -#: source/ubl-strings.h:95 +#: source/ubl-strings.h:91 msgid "Packages were moved successfully" msgstr "" -#: source/ubl-strings.h:96 +#: source/ubl-strings.h:92 msgid "Storages were saved" msgstr "" -#: source/ubl-strings.h:97 +#: source/ubl-strings.h:93 msgid "Key was successfully created" msgstr "" -#: source/ubl-strings.h:98 +#: source/ubl-strings.h:94 msgid "Key creation failed" msgstr "" -#: source/ubl-strings.h:100 +#: source/ubl-strings.h:96 msgid "Choose" msgstr "" -#: source/ubl-strings.h:101 +#: source/ubl-strings.h:97 msgid "Cancel" msgstr "" -#: source/ubl-strings.h:103 +#: source/ubl-strings.h:99 msgid "Open or create repository" msgstr "" -#: source/ubl-strings.h:104 +#: source/ubl-strings.h:100 msgid "Open existing repository" msgstr "" -#: source/ubl-strings.h:105 +#: source/ubl-strings.h:101 msgid "Configure repository" msgstr "" -#: source/ubl-strings.h:106 +#: source/ubl-strings.h:102 msgid "Delete repository" msgstr "" -#: source/ubl-strings.h:107 +#: source/ubl-strings.h:103 msgid "" "Add/Remove repository from\n" "local package sources" msgstr "" -#: source/ubl-strings.h:108 +#: source/ubl-strings.h:104 msgid "Enable/disable repository publish" msgstr "" -#: source/ubl-strings.h:109 +#: source/ubl-strings.h:105 msgid "Check dependences" msgstr "" -#: source/ubl-strings.h:110 +#: source/ubl-strings.h:106 msgid "Sign ripository" msgstr "" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:107 msgid "Open" msgstr "" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:109 msgid "Operation done" msgstr "" -#: source/ubl-strings.h:117 +#: source/ubl-strings.h:111 msgid "Choose branch or pack in branch to add file!" msgstr "" -#: source/ubl-strings.h:118 +#: source/ubl-strings.h:112 msgid "Choose repository or branch!" msgstr "" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:113 msgid "Choose pack to delete!" msgstr "" -#: source/ubl-strings.h:120 +#: source/ubl-strings.h:114 msgid "Choose repository to delete!" msgstr "" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:115 msgid "Choose repository or package to sign" msgstr "" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:117 msgid "Name:" msgstr "" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:118 msgid "Branches:" msgstr "" -#: source/ubl-strings.h:125 +#: source/ubl-strings.h:119 msgid "< Type branch name >" msgstr "" -#: source/ubl-strings.h:126 +#: source/ubl-strings.h:120 msgid "Name must be filled!" msgstr "" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:121 msgid "Choose path for new repository" msgstr "" -#: source/ubl-strings.h:129 +#: source/ubl-strings.h:123 msgid "Choose repository folder" msgstr "" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:124 msgid "Choose repository" msgstr "" -#: source/ubl-strings.h:132 +#: source/ubl-strings.h:126 msgid "Absent" msgstr "" -#: source/ubl-strings.h:133 +#: source/ubl-strings.h:127 msgid "Dependences:" msgstr "" -#: source/ubl-strings.h:134 +#: source/ubl-strings.h:128 msgid "Digital signature" msgstr "" -#: source/ubl-strings.h:136 +#: source/ubl-strings.h:130 msgid "package" msgstr "" -#: source/ubl-strings.h:137 +#: source/ubl-strings.h:131 msgid "repository" msgstr "" -#: source/ubl-strings.h:138 -msgid "This package already exists in that repository" +#: source/ubl-strings.h:132 +msgid "This package already has been added" msgstr "" -#: source/ubl-strings.h:139 +#: source/ubl-strings.h:133 msgid "This repository has already been added" msgstr "" -#: source/ubl-strings.h:141 +#: source/ubl-strings.h:135 msgid "Close" msgstr "" -#: source/ubl-strings.h:143 +#: source/ubl-strings.h:137 msgid "Are you sure want to disable?" msgstr "" -#: source/ubl-strings.h:145 +#: source/ubl-strings.h:139 msgid "Are you sure want to remove?" msgstr "" -#: source/ubl-strings.h:147 +#: source/ubl-strings.h:141 msgid "Do not sign" msgstr "" -#: source/ubl-strings.h:149 +#: source/ubl-strings.h:143 msgid "Package name error - package has incorrect name pattern" msgstr "" -#: source/ubl-strings.h:151 +#: source/ubl-strings.h:145 msgid "Passwords do not match" msgstr "" -#: source/ubl-strings.h:153 +#: source/ubl-strings.h:147 msgid "Package search" msgstr "" diff --git a/ubl-settings-repomanager_ru.po b/ubl-settings-repomanager_ru.po index 8b7d27b..f4585fc 100644 --- a/ubl-settings-repomanager_ru.po +++ b/ubl-settings-repomanager_ru.po @@ -65,19 +65,19 @@ msgstr "Выбрать пакеты" msgid "Choose folder" msgstr "Выбрать директорию для репозитория" -#: source/ubl-strings.h:16 source/ubl-strings.h:36 +#: source/ubl-strings.h:16 msgid "Add packages" msgstr "Добавить пакеты" -#: source/ubl-strings.h:17 source/ubl-strings.h:37 +#: source/ubl-strings.h:17 msgid "Move packages" msgstr "Переместить пакеты" -#: source/ubl-strings.h:18 source/ubl-strings.h:38 +#: source/ubl-strings.h:18 msgid "Remove packages" msgstr "Удалить пакеты" -#: source/ubl-strings.h:20 source/ubl-strings.h:42 +#: source/ubl-strings.h:20 source/ubl-strings.h:39 msgid "Key creation" msgstr "Создание ключа" @@ -133,231 +133,231 @@ msgstr "Обновить" msgid "Configure storages" msgstr "Редактировать хранилища" -#: source/ubl-strings.h:39 +#: source/ubl-strings.h:36 msgid "System update" msgstr "Обновление системы" -#: source/ubl-strings.h:41 +#: source/ubl-strings.h:38 msgid "Empty important field" msgstr "Пустое важное поле" -#: source/ubl-strings.h:44 +#: source/ubl-strings.h:41 msgid "Repository data has been loaded successfully" msgstr "Информация о пакетах успешно загружена" -#: source/ubl-strings.h:46 +#: source/ubl-strings.h:43 msgid "Saving has succeeded" msgstr "Успешно сохранено" -#: source/ubl-strings.h:48 +#: source/ubl-strings.h:45 msgid "General" msgstr "Общие" -#: source/ubl-strings.h:49 +#: source/ubl-strings.h:46 msgid "Publication" msgstr "Публикация" -#: source/ubl-strings.h:50 +#: source/ubl-strings.h:47 msgid "Trusted repository" msgstr "Доверенный репозиторий" -#: source/ubl-strings.h:51 +#: source/ubl-strings.h:48 msgid "Server type:" msgstr "Тип сервера:" -#: source/ubl-strings.h:52 +#: source/ubl-strings.h:49 msgid "IP adress:" msgstr "IP-адрес:" -#: source/ubl-strings.h:53 +#: source/ubl-strings.h:50 msgid "Port:" msgstr "Порт:" -#: source/ubl-strings.h:54 +#: source/ubl-strings.h:51 msgid "Publish" msgstr "Опубликовать" -#: source/ubl-strings.h:55 +#: source/ubl-strings.h:52 msgid "Code name:" msgstr "Кодовое имя:" -#: source/ubl-strings.h:56 +#: source/ubl-strings.h:53 msgid "Branch:" msgstr "Ветка:" -#: source/ubl-strings.h:57 source/ubl-strings.h:78 +#: source/ubl-strings.h:54 msgid "Architecture:" msgstr "Архитектура:" -#: source/ubl-strings.h:58 +#: source/ubl-strings.h:55 msgid "Components:" msgstr "Компоненты" -#: source/ubl-strings.h:59 +#: source/ubl-strings.h:56 msgid "Signature:" msgstr "Подпись:" -#: source/ubl-strings.h:60 +#: source/ubl-strings.h:57 msgid "Sign" msgstr "Подписать" -#: source/ubl-strings.h:62 +#: source/ubl-strings.h:59 msgid "Move" msgstr "Переместить" -#: source/ubl-strings.h:63 +#: source/ubl-strings.h:60 msgid "Remove" msgstr "Удалить" -#: source/ubl-strings.h:65 +#: source/ubl-strings.h:62 msgid "Sign repo" msgstr "Подписать репозиторий" -#: source/ubl-strings.h:66 +#: source/ubl-strings.h:63 msgid "Remove repo" msgstr "Удалить репозиторий" -#: source/ubl-strings.h:67 +#: source/ubl-strings.h:64 msgid "Manage storages" msgstr "Управление хранилищами" -#: source/ubl-strings.h:68 +#: source/ubl-strings.h:65 msgid "Storage:" msgstr "Хранилище:" -#: source/ubl-strings.h:69 +#: source/ubl-strings.h:66 msgid "Open existing" msgstr "Открыть существующее хранилище" -#: source/ubl-strings.h:70 +#: source/ubl-strings.h:67 msgid "Create new" msgstr "Создать" -#: source/ubl-strings.h:71 +#: source/ubl-strings.h:68 msgid "Disable" msgstr "Отключить" -#: source/ubl-strings.h:72 +#: source/ubl-strings.h:69 msgid "Delete" msgstr "Удалить" -#: source/ubl-strings.h:73 +#: source/ubl-strings.h:70 msgid "Add repository" msgstr "Добавить репозиторий" -#: source/ubl-strings.h:74 +#: source/ubl-strings.h:71 msgid "Repository (-ies)" msgstr "Репозиторий (-ии)" -#: source/ubl-strings.h:75 +#: source/ubl-strings.h:72 msgid "Accept" msgstr "Принять" -#: source/ubl-strings.h:77 +#: source/ubl-strings.h:74 msgid "Repository:" msgstr "Репозиторий:" -#: source/ubl-strings.h:79 +#: source/ubl-strings.h:75 msgid "Source" msgstr "Источник" -#: source/ubl-strings.h:80 +#: source/ubl-strings.h:76 msgid "Target" msgstr "Назначение" -#: source/ubl-strings.h:81 +#: source/ubl-strings.h:77 msgid "Packages sign:" msgstr "Подпись пакетов:" -#: source/ubl-strings.h:82 +#: source/ubl-strings.h:78 msgid "Repository sign:" msgstr "Подпись репозитория:" -#: source/ubl-strings.h:83 +#: source/ubl-strings.h:79 msgid "Package (-s) to add" msgstr "Пакет(-ы) для добавления" -#: source/ubl-strings.h:84 +#: source/ubl-strings.h:80 msgid "Package (-s) to remove" msgstr "Пакет(-ы) для удаления" -#: source/ubl-strings.h:85 +#: source/ubl-strings.h:81 msgid "Package (-s) to move" msgstr "Пакет(-ы) для перемещения" -#: source/ubl-strings.h:86 +#: source/ubl-strings.h:82 msgid "Name" msgstr "Имя" -#: source/ubl-strings.h:87 +#: source/ubl-strings.h:83 msgid "Path" msgstr "Путь" -#: source/ubl-strings.h:88 source/ubl-strings.h:112 +#: source/ubl-strings.h:84 msgid "Remove package" msgstr "Удалить пакет" -#: source/ubl-strings.h:89 source/ubl-strings.h:111 +#: source/ubl-strings.h:85 msgid "Add package" msgstr "Добавить пакет" -#: source/ubl-strings.h:91 +#: source/ubl-strings.h:87 msgid "Repository sign failed - repository has no packages" msgstr "Ошибка подписи репозитория - репозиторий не содержит пакетов" -#: source/ubl-strings.h:92 +#: source/ubl-strings.h:88 msgid "Data has been loaded" msgstr "Данные загружены" -#: source/ubl-strings.h:93 +#: source/ubl-strings.h:89 msgid "Packages were added successfully" msgstr "Пакеты успешно добавлены" -#: source/ubl-strings.h:94 +#: source/ubl-strings.h:90 msgid "Packages were removed successfully" msgstr "Пакеты успешно удалены" -#: source/ubl-strings.h:95 +#: source/ubl-strings.h:91 msgid "Packages were moved successfully" msgstr "Пакеты успешно перемещены" -#: source/ubl-strings.h:96 +#: source/ubl-strings.h:92 msgid "Storages were saved" msgstr "Сохранено" -#: source/ubl-strings.h:97 +#: source/ubl-strings.h:93 msgid "Key was successfully created" msgstr "Ключ был успешно создан" -#: source/ubl-strings.h:98 +#: source/ubl-strings.h:94 msgid "Key creation failed" msgstr "Ошибка создания ключа" -#: source/ubl-strings.h:100 +#: source/ubl-strings.h:96 msgid "Choose" msgstr "Выбрать" -#: source/ubl-strings.h:101 +#: source/ubl-strings.h:97 msgid "Cancel" msgstr "Отмена" -#: source/ubl-strings.h:103 +#: source/ubl-strings.h:99 msgid "Open or create repository" msgstr "Открыть или создать репозиторий" -#: source/ubl-strings.h:104 +#: source/ubl-strings.h:100 msgid "Open existing repository" msgstr "Открыть и добавить репозиторий" -#: source/ubl-strings.h:105 +#: source/ubl-strings.h:101 msgid "Configure repository" msgstr "Редактировать репозиторий" -#: source/ubl-strings.h:106 +#: source/ubl-strings.h:102 msgid "Delete repository" msgstr "Удалить репозиторий" -#: source/ubl-strings.h:107 +#: source/ubl-strings.h:103 msgid "" "Add/Remove repository from\n" "local package sources" @@ -365,107 +365,107 @@ msgstr "" "Добавить/удалить репу из\n" " локальных источников пакетов" -#: source/ubl-strings.h:108 +#: source/ubl-strings.h:104 msgid "Enable/disable repository publish" msgstr "Включить/отключить публикацию" -#: source/ubl-strings.h:109 +#: source/ubl-strings.h:105 msgid "Check dependences" msgstr "Проверить на битые зависимости" -#: source/ubl-strings.h:110 +#: source/ubl-strings.h:106 msgid "Sign ripository" msgstr "Подпись пакетов" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:107 msgid "Open" msgstr "Открыть" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:109 msgid "Operation done" msgstr "Операция завершена" -#: source/ubl-strings.h:117 +#: source/ubl-strings.h:111 msgid "Choose branch or pack in branch to add file!" msgstr "Выберите ветку чтобы добавить пакет!" -#: source/ubl-strings.h:118 +#: source/ubl-strings.h:112 msgid "Choose repository or branch!" msgstr "Выберите репозиторий!" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:113 msgid "Choose pack to delete!" msgstr "Выберите пакет для удаления!" -#: source/ubl-strings.h:120 +#: source/ubl-strings.h:114 msgid "Choose repository to delete!" msgstr "Выберите репозиторий для удаления!" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:115 msgid "Choose repository or package to sign" msgstr "Выберите репозиторий или пакет для подписи" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:117 msgid "Name:" msgstr "Название:" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:118 msgid "Branches:" msgstr "Ветки:" -#: source/ubl-strings.h:125 +#: source/ubl-strings.h:119 msgid "< Type branch name >" msgstr "< Введите название ветки >" -#: source/ubl-strings.h:126 +#: source/ubl-strings.h:120 msgid "Name must be filled!" msgstr "Введите название!" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:121 msgid "Choose path for new repository" msgstr "Выбрать расположение нового репозитория" -#: source/ubl-strings.h:129 +#: source/ubl-strings.h:123 msgid "Choose repository folder" msgstr "Выбрать директорию для репозитория" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:124 msgid "Choose repository" msgstr "Выбрать репозиторий" -#: source/ubl-strings.h:132 +#: source/ubl-strings.h:126 msgid "Absent" msgstr "Отсутствует" -#: source/ubl-strings.h:133 +#: source/ubl-strings.h:127 msgid "Dependences:" msgstr "Зависит от:" -#: source/ubl-strings.h:134 +#: source/ubl-strings.h:128 msgid "Digital signature" msgstr "Цифровая подпись" -#: source/ubl-strings.h:136 +#: source/ubl-strings.h:130 msgid "package" msgstr "пакет" -#: source/ubl-strings.h:137 +#: source/ubl-strings.h:131 msgid "repository" msgstr "репозиторий" -#: source/ubl-strings.h:138 -msgid "This package already exists in that repository" -msgstr "Этот пакет уже присутствует в выбранном репозитории" +#: source/ubl-strings.h:132 +msgid "This package already has been added" +msgstr "Этот пакет уже был добавлен" -#: source/ubl-strings.h:139 +#: source/ubl-strings.h:133 msgid "This repository has already been added" msgstr "Этот репозиторий уже был добавлен" -#: source/ubl-strings.h:141 +#: source/ubl-strings.h:135 msgid "Close" msgstr "Закрыть" -#: source/ubl-strings.h:143 +#: source/ubl-strings.h:137 msgid "Are you sure want to disable?" msgstr "" "Внимание! Вы хотите отключить хранилище от управления менеджером " @@ -475,24 +475,24 @@ msgstr "" "Примечание: в дальнейшем Вы можете заново подключить хранилище и управлять " "им." -#: source/ubl-strings.h:145 +#: source/ubl-strings.h:139 msgid "Are you sure want to remove?" msgstr "" "Внимание! Вы ходите удалить хранилище При этом хранилище и вложенные " "репозитории будут безвозвратно удалены!" -#: source/ubl-strings.h:147 +#: source/ubl-strings.h:141 msgid "Do not sign" msgstr "Не подписывать" -#: source/ubl-strings.h:149 +#: source/ubl-strings.h:143 msgid "Package name error - package has incorrect name pattern" msgstr "Ошибка имени пакета - некорректное имя пакета" -#: source/ubl-strings.h:151 +#: source/ubl-strings.h:145 msgid "Passwords do not match" msgstr "Пароли не совпадают" -#: source/ubl-strings.h:153 +#: source/ubl-strings.h:147 msgid "Package search" msgstr "Поиск пакетов"