diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index 103ff54..a31ad31 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -705,6 +705,7 @@ repo_add_window *yon_repo_add_window_new(){ window->RemoveButton = yon_gtk_builder_get_widget(builder,"RemoveButton"); window->PackagesTree = yon_gtk_builder_get_widget(builder,"PackagesTree"); window->InfoLabel = yon_gtk_builder_get_widget(builder,"InfoLabel"); + window->PackagesToAddLabel = yon_gtk_builder_get_widget(builder,"PackagesToAddLabel"); window->AddButton = yon_gtk_builder_get_widget(builder,"AddButton"); window->CancelButton = yon_gtk_builder_get_widget(builder,"CancelButton"); window->PackagesList = GTK_LIST_STORE(gtk_builder_get_object(builder,"PackagesList")); @@ -912,6 +913,7 @@ void on_move_clicked(GtkWidget *self, main_window *widgets){ yon_gtk_window_setup(GTK_WINDOW(window->MainWindow),GTK_WINDOW(widgets->Window),MOVE_PACKAGES_TITLE_LABEL,icon_path,"move-repo-window"); gtk_label_set_text(GTK_LABEL(window->HeadLabel),MOVE_PACKAGES_TITLE_LABEL); gtk_button_set_label(GTK_BUTTON(window->AddButton),MOVE_LABEL); + gtk_label_set_text(GTK_LABEL(window->PackagesToAddLabel),MOVE_PACKAGES_LABEL); gtk_widget_show(window->MoveSourceFrame); gtk_widget_show(window->MoveTargetFrame); gtk_widget_hide(gtk_widget_get_parent(window->PackageSignCombo)); @@ -1049,6 +1051,7 @@ void on_remove_clicked(GtkWidget *self, main_window *widgets){ gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(window->StorageCombo),path,current); } } + gtk_label_set_text(GTK_LABEL(window->PackagesToAddLabel),REMOVE_PACKAGES_LABEL); yon_sign_list_update(); yon_combo_box_text_set_signs(GTK_COMBO_BOX_TEXT(window->RepoSignCombo)); yon_combo_box_text_set_signs(GTK_COMBO_BOX_TEXT(window->PackageSignCombo)); diff --git a/source/ubl-settings-repomanager.h b/source/ubl-settings-repomanager.h index 5251265..5fb8e0d 100644 --- a/source/ubl-settings-repomanager.h +++ b/source/ubl-settings-repomanager.h @@ -134,6 +134,7 @@ typedef struct { GtkWidget *MainWindow; GtkWidget *StatusBox; GtkWidget *HeadLabel; + GtkWidget *PackagesToAddLabel; GtkWidget *CancelButton; GtkWidget *AddButton; GtkWidget *MoveSourceFrame; diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 8114203..96144ae 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -81,6 +81,8 @@ #define PACKAGE_SIGN_LABEL _("Packages sign:") #define REPO_SIGN_LABEL _("Repository sign:") #define ADD_PACKAGES_LABEL _("Package (-s) to add") +#define REMOVE_PACKAGES_LABEL _("Package (-s) to remove") +#define MOVE_PACKAGES_LABEL _("Package (-s) to move") #define NAME_COLUMN_LABEL _("Name") #define PATH_COLUMN_LABEL _("Path") #define REMOVE_PACKAGE_LABEL _("Remove package") diff --git a/ubl-settings-repomanager-add.glade b/ubl-settings-repomanager-add.glade index 2377c20..4fb707e 100644 --- a/ubl-settings-repomanager-add.glade +++ b/ubl-settings-repomanager-add.glade @@ -574,7 +574,7 @@ - + True False Package (-s) to add diff --git a/ubl-settings-repomanager.pot b/ubl-settings-repomanager.pot index 3be4526..e9ef5a5 100644 --- a/ubl-settings-repomanager.pot +++ b/ubl-settings-repomanager.pot @@ -276,203 +276,211 @@ msgid "Package (-s) to add" msgstr "" #: source/ubl-strings.h:84 -msgid "Name" +msgid "Package (-s) to remove" msgstr "" #: source/ubl-strings.h:85 +msgid "Package (-s) to move" +msgstr "" + +#: source/ubl-strings.h:86 +msgid "Name" +msgstr "" + +#: source/ubl-strings.h:87 msgid "Path" msgstr "" -#: source/ubl-strings.h:86 source/ubl-strings.h:110 +#: source/ubl-strings.h:88 source/ubl-strings.h:112 msgid "Remove package" msgstr "" -#: source/ubl-strings.h:87 source/ubl-strings.h:109 +#: source/ubl-strings.h:89 source/ubl-strings.h:111 msgid "Add package" msgstr "" -#: source/ubl-strings.h:89 +#: source/ubl-strings.h:91 msgid "Repository sign failed - repository has no packages" msgstr "" -#: source/ubl-strings.h:90 +#: source/ubl-strings.h:92 msgid "Data has been loaded" msgstr "" -#: source/ubl-strings.h:91 +#: source/ubl-strings.h:93 msgid "Packages were added successfully" msgstr "" -#: source/ubl-strings.h:92 +#: source/ubl-strings.h:94 msgid "Packages were removed successfully" msgstr "" -#: source/ubl-strings.h:93 +#: source/ubl-strings.h:95 msgid "Packages were moved successfully" msgstr "" -#: source/ubl-strings.h:94 +#: source/ubl-strings.h:96 msgid "Storages were saved" msgstr "" -#: source/ubl-strings.h:95 +#: source/ubl-strings.h:97 msgid "Key was successfully created" msgstr "" -#: source/ubl-strings.h:96 +#: source/ubl-strings.h:98 msgid "Key creation failed" msgstr "" -#: source/ubl-strings.h:98 +#: source/ubl-strings.h:100 msgid "Choose" msgstr "" -#: source/ubl-strings.h:99 +#: source/ubl-strings.h:101 msgid "Cancel" msgstr "" -#: source/ubl-strings.h:101 +#: source/ubl-strings.h:103 msgid "Open or create repository" msgstr "" -#: source/ubl-strings.h:102 +#: source/ubl-strings.h:104 msgid "Open existing repository" msgstr "" -#: source/ubl-strings.h:103 +#: source/ubl-strings.h:105 msgid "Configure repository" msgstr "" -#: source/ubl-strings.h:104 +#: source/ubl-strings.h:106 msgid "Delete repository" msgstr "" -#: source/ubl-strings.h:105 +#: source/ubl-strings.h:107 msgid "" "Add/Remove repository from\n" "local package sources" msgstr "" -#: source/ubl-strings.h:106 +#: source/ubl-strings.h:108 msgid "Enable/disable repository publish" msgstr "" -#: source/ubl-strings.h:107 +#: source/ubl-strings.h:109 msgid "Check dependences" msgstr "" -#: source/ubl-strings.h:108 +#: source/ubl-strings.h:110 msgid "Sign ripository" msgstr "" -#: source/ubl-strings.h:111 +#: source/ubl-strings.h:113 msgid "Open" msgstr "" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:115 msgid "Operation done" msgstr "" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:117 msgid "Choose branch or pack in branch to add file!" msgstr "" -#: source/ubl-strings.h:116 +#: source/ubl-strings.h:118 msgid "Choose repository or branch!" msgstr "" -#: source/ubl-strings.h:117 +#: source/ubl-strings.h:119 msgid "Choose pack to delete!" msgstr "" -#: source/ubl-strings.h:118 +#: source/ubl-strings.h:120 msgid "Choose repository to delete!" msgstr "" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:121 msgid "Choose repository or package to sign" msgstr "" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:123 msgid "Name:" msgstr "" -#: source/ubl-strings.h:122 +#: source/ubl-strings.h:124 msgid "Branches:" msgstr "" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:125 msgid "< Type branch name >" msgstr "" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:126 msgid "Name must be filled!" msgstr "" -#: source/ubl-strings.h:125 +#: source/ubl-strings.h:127 msgid "Choose path for new repository" msgstr "" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:129 msgid "Choose repository folder" msgstr "" -#: source/ubl-strings.h:128 +#: source/ubl-strings.h:130 msgid "Choose repository" msgstr "" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:132 msgid "Absent" msgstr "" -#: source/ubl-strings.h:131 +#: source/ubl-strings.h:133 msgid "Dependences:" msgstr "" -#: source/ubl-strings.h:132 +#: source/ubl-strings.h:134 msgid "Digital signature" msgstr "" -#: source/ubl-strings.h:134 +#: source/ubl-strings.h:136 msgid "package" msgstr "" -#: source/ubl-strings.h:135 +#: source/ubl-strings.h:137 msgid "repository" msgstr "" -#: source/ubl-strings.h:136 +#: source/ubl-strings.h:138 msgid "This package already exists in that repository" msgstr "" -#: source/ubl-strings.h:137 +#: source/ubl-strings.h:139 msgid "This repository has already been added" msgstr "" -#: source/ubl-strings.h:139 +#: source/ubl-strings.h:141 msgid "Close" msgstr "" -#: source/ubl-strings.h:141 +#: source/ubl-strings.h:143 msgid "Are you sure want to disable?" msgstr "" -#: source/ubl-strings.h:143 +#: source/ubl-strings.h:145 msgid "Are you sure want to remove?" msgstr "" -#: source/ubl-strings.h:145 +#: source/ubl-strings.h:147 msgid "Do not sign" msgstr "" -#: source/ubl-strings.h:147 +#: source/ubl-strings.h:149 msgid "Package name error - package has incorrect name pattern" msgstr "" -#: source/ubl-strings.h:149 +#: source/ubl-strings.h:151 msgid "Passwords do not match" msgstr "" -#: source/ubl-strings.h:151 +#: source/ubl-strings.h:153 msgid "Package search" msgstr "" diff --git a/ubl-settings-repomanager_ru.po b/ubl-settings-repomanager_ru.po index 2f7ca0a..d39701d 100644 --- a/ubl-settings-repomanager_ru.po +++ b/ubl-settings-repomanager_ru.po @@ -58,12 +58,10 @@ msgid "Information" msgstr "Информация" #: source/ubl-strings.h:14 -#, fuzzy msgid "Choose package(-s)" msgstr "Переместить пакеты" #: source/ubl-strings.h:15 -#, fuzzy msgid "Choose folder" msgstr "Выбрать директорию для репозитория" @@ -280,78 +278,88 @@ msgid "Package (-s) to add" msgstr "Пакет(-ы) для добавления" #: source/ubl-strings.h:84 +#, fuzzy +msgid "Package (-s) to remove" +msgstr "Пакет(-ы) для удаления" + +#: source/ubl-strings.h:85 +#, fuzzy +msgid "Package (-s) to move" +msgstr "Пакет(-ы) для перемещения" + +#: source/ubl-strings.h:86 msgid "Name" msgstr "Имя" -#: source/ubl-strings.h:85 +#: source/ubl-strings.h:87 msgid "Path" msgstr "Путь" -#: source/ubl-strings.h:86 source/ubl-strings.h:110 +#: source/ubl-strings.h:88 source/ubl-strings.h:112 msgid "Remove package" msgstr "Удалить пакет" -#: source/ubl-strings.h:87 source/ubl-strings.h:109 +#: source/ubl-strings.h:89 source/ubl-strings.h:111 msgid "Add package" msgstr "Добавить пакет" -#: source/ubl-strings.h:89 +#: source/ubl-strings.h:91 msgid "Repository sign failed - repository has no packages" msgstr "Ошибка подписи репозитория - репозиторий не содержит пакетов" -#: source/ubl-strings.h:90 +#: source/ubl-strings.h:92 msgid "Data has been loaded" msgstr "Данные загружены" -#: source/ubl-strings.h:91 +#: source/ubl-strings.h:93 msgid "Packages were added successfully" msgstr "Пакеты успешно добавлены" -#: source/ubl-strings.h:92 +#: source/ubl-strings.h:94 msgid "Packages were removed successfully" msgstr "Пакеты успешно удалены" -#: source/ubl-strings.h:93 +#: source/ubl-strings.h:95 msgid "Packages were moved successfully" msgstr "Пакеты успешно перемещены" -#: source/ubl-strings.h:94 +#: source/ubl-strings.h:96 msgid "Storages were saved" msgstr "Сохранено" -#: source/ubl-strings.h:95 +#: source/ubl-strings.h:97 msgid "Key was successfully created" msgstr "Ключ был успешно создан" -#: source/ubl-strings.h:96 +#: source/ubl-strings.h:98 msgid "Key creation failed" msgstr "Ошибка создания ключа" -#: source/ubl-strings.h:98 +#: source/ubl-strings.h:100 msgid "Choose" msgstr "Выбрать" -#: source/ubl-strings.h:99 +#: source/ubl-strings.h:101 msgid "Cancel" msgstr "Отмена" -#: source/ubl-strings.h:101 +#: source/ubl-strings.h:103 msgid "Open or create repository" msgstr "Открыть или создать репозиторий" -#: source/ubl-strings.h:102 +#: source/ubl-strings.h:104 msgid "Open existing repository" msgstr "Открыть и добавить репозиторий" -#: source/ubl-strings.h:103 +#: source/ubl-strings.h:105 msgid "Configure repository" msgstr "Редактировать репозиторий" -#: source/ubl-strings.h:104 +#: source/ubl-strings.h:106 msgid "Delete repository" msgstr "Удалить репозиторий" -#: source/ubl-strings.h:105 +#: source/ubl-strings.h:107 msgid "" "Add/Remove repository from\n" "local package sources" @@ -359,107 +367,107 @@ msgstr "" "Добавить/удалить репу из\n" " локальных источников пакетов" -#: source/ubl-strings.h:106 +#: source/ubl-strings.h:108 msgid "Enable/disable repository publish" msgstr "Включить/отключить публикацию" -#: source/ubl-strings.h:107 +#: source/ubl-strings.h:109 msgid "Check dependences" msgstr "Проверить на битые зависимости" -#: source/ubl-strings.h:108 +#: source/ubl-strings.h:110 msgid "Sign ripository" msgstr "Подпись пакетов" -#: source/ubl-strings.h:111 +#: source/ubl-strings.h:113 msgid "Open" msgstr "Открыть" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:115 msgid "Operation done" msgstr "Операция завершена" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:117 msgid "Choose branch or pack in branch to add file!" msgstr "Выберите ветку чтобы добавить пакет!" -#: source/ubl-strings.h:116 +#: source/ubl-strings.h:118 msgid "Choose repository or branch!" msgstr "Выберите репозиторий!" -#: source/ubl-strings.h:117 +#: source/ubl-strings.h:119 msgid "Choose pack to delete!" msgstr "Выберите пакет для удаления!" -#: source/ubl-strings.h:118 +#: source/ubl-strings.h:120 msgid "Choose repository to delete!" msgstr "Выберите репозиторий для удаления!" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:121 msgid "Choose repository or package to sign" msgstr "Выберите репозиторий или пакет для подписи" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:123 msgid "Name:" msgstr "Название:" -#: source/ubl-strings.h:122 +#: source/ubl-strings.h:124 msgid "Branches:" msgstr "Ветки:" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:125 msgid "< Type branch name >" msgstr "< Введите название ветки >" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:126 msgid "Name must be filled!" msgstr "Введите название!" -#: source/ubl-strings.h:125 +#: source/ubl-strings.h:127 msgid "Choose path for new repository" msgstr "Выбрать расположение нового репозитория" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:129 msgid "Choose repository folder" msgstr "Выбрать директорию для репозитория" -#: source/ubl-strings.h:128 +#: source/ubl-strings.h:130 msgid "Choose repository" msgstr "Выбрать репозиторий" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:132 msgid "Absent" msgstr "Отсутствует" -#: source/ubl-strings.h:131 +#: source/ubl-strings.h:133 msgid "Dependences:" msgstr "Зависит от:" -#: source/ubl-strings.h:132 +#: source/ubl-strings.h:134 msgid "Digital signature" msgstr "Цифровая подпись" -#: source/ubl-strings.h:134 +#: source/ubl-strings.h:136 msgid "package" msgstr "пакет" -#: source/ubl-strings.h:135 +#: source/ubl-strings.h:137 msgid "repository" msgstr "репозиторий" -#: source/ubl-strings.h:136 +#: source/ubl-strings.h:138 msgid "This package already exists in that repository" msgstr "Этот пакет уже присутствует в выбранном репозитории" -#: source/ubl-strings.h:137 +#: source/ubl-strings.h:139 msgid "This repository has already been added" msgstr "Этот репозиторий уже был добавлен" -#: source/ubl-strings.h:139 +#: source/ubl-strings.h:141 msgid "Close" msgstr "Закрыть" -#: source/ubl-strings.h:141 +#: source/ubl-strings.h:143 msgid "Are you sure want to disable?" msgstr "" "Внимание! Вы хотите отключить хранилище от управления менеджером " @@ -469,24 +477,24 @@ msgstr "" "Примечание: в дальнейшем Вы можете заново подключить хранилище и управлять " "им." -#: source/ubl-strings.h:143 +#: source/ubl-strings.h:145 msgid "Are you sure want to remove?" msgstr "" "Внимание! Вы ходите удалить хранилище При этом хранилище и вложенные " "репозитории будут безвозвратно удалены!" -#: source/ubl-strings.h:145 +#: source/ubl-strings.h:147 msgid "Do not sign" msgstr "Не подписывать" -#: source/ubl-strings.h:147 +#: source/ubl-strings.h:149 msgid "Package name error - package has incorrect name pattern" msgstr "Ошибка имени пакета - некорректное имя пакета" -#: source/ubl-strings.h:149 +#: source/ubl-strings.h:151 msgid "Passwords do not match" msgstr "Пароли не совпадают" -#: source/ubl-strings.h:151 +#: source/ubl-strings.h:153 msgid "Package search" msgstr "Поиск пакетов"