From f42ce950fd95d55990747e068f0f567af039c7df Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 5 Apr 2023 12:55:01 +0000 Subject: [PATCH 1/5] Localisation added, all menus are now accessible --- .gitignore | 2 + source/ubl-settings-update.c | 185 ++++++++++++++++++++++++++++++++-- source/ubl-settings-update.h | 89 ++++++++++++++++- ubl-settings-update.glade | 128 +++++++++++++----------- ubl-settings-update.pot | 184 ++++++++++++++++++++++++++++++++++ ubl-settings-update_ru.po | 189 +++++++++++++++++++++++++++++++++++ 6 files changed, 710 insertions(+), 67 deletions(-) create mode 100644 ubl-settings-update.pot create mode 100644 ubl-settings-update_ru.po diff --git a/.gitignore b/.gitignore index 561563a..57ab3b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ .vscode/ ubl-settings-update.glade~ ubl-settings-update +ubl-settings-update_ru.po~ +build/ diff --git a/source/ubl-settings-update.c b/source/ubl-settings-update.c index 27b104c..0ee60fc 100644 --- a/source/ubl-settings-update.c +++ b/source/ubl-settings-update.c @@ -1,19 +1,186 @@ #include #include "ubl-settings-update.h" -int main(int argc, char *argv[]){ - gtk_init(&argc,&argv); +void on_repo_window_open(GtkWidget *self){ + repo_window *widgets=setup_repo_window(); +} + +void on_close_subwindow(GtkWidget *self){ + gtk_widget_destroy(gtk_widget_get_toplevel(self)); +} +void on_about(){ GtkBuilder *builder=gtk_builder_new_from_file(glade_path); - GtkWidget *window=GTK_WIDGET(gtk_builder_get_object(builder,"MainWindow")); - GtkWidget *Header = yon_gtk_builder_get_widget(builder,"boxColor"); - GtkWidget *Image = yon_gtk_builder_get_widget(builder,"HeadBackgroundImage"); - GtkWidget *Overlay = yon_gtk_builder_get_widget(builder,"HeadOverlay"); - GtkWidget *UnderNoteOverlay = yon_gtk_builder_get_widget(builder,"UnderNoteOverlay"); - GtkWidget *checkForUpdatesButton = yon_gtk_builder_get_widget(builder,"checkForUpdatesButton"); + GtkWidget *window=yon_gtk_builder_get_widget(builder,"AboutWindow"); + GtkWidget *hideButtonBox=yon_gtk_builder_get_widget(builder,"buttonBoxHide"); + gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(window),_("UBlinux System update")); + gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(window),version_application); + gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(window),_("Project Home Page")); + gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(window),_("Update configurator")); + gtk_widget_set_visible(hideButtonBox,0); + gtk_widget_show(window); +} + +repo_window *setup_repo_window(){ + repo_window *widgets=NULL; + widgets=malloc(sizeof(repo_window)); + widgets->builder= gtk_builder_new_from_file(glade_path); + widgets->window=yon_gtk_builder_get_widget(widgets->builder, "RepoWindow"); + + widgets->repoTypeLabel=yon_gtk_builder_get_widget(widgets->builder, "repoTypeLabel"); + widgets->repoTypeEntry=yon_gtk_builder_get_widget(widgets->builder, "repoTypeEntry"); + widgets->repoURILabel=yon_gtk_builder_get_widget(widgets->builder, "repoURILabel"); + widgets->repoURIMeanLabel=yon_gtk_builder_get_widget(widgets->builder, "repoURIMeanLabel"); + widgets->repoDistributionLabel=yon_gtk_builder_get_widget(widgets->builder, "repoDistributionLabel"); + widgets->repoDistributionMeanLabel=yon_gtk_builder_get_widget(widgets->builder, "repoDistributionMeanLabel"); + widgets->repoSectionsLabel=yon_gtk_builder_get_widget(widgets->builder, "repoSectionsLabel"); + widgets->repoSectionsMeanlabel=yon_gtk_builder_get_widget(widgets->builder, "repoSectionsMeanlabel"); + + widgets->repoCancelButton=yon_gtk_builder_get_widget(widgets->builder, "repoCancelButton"); + widgets->repoAcceptButton=yon_gtk_builder_get_widget(widgets->builder, "repoAcceptButton"); + + g_signal_connect(G_OBJECT(widgets->repoCancelButton), "clicked", G_CALLBACK(on_close_subwindow), NULL); + g_signal_connect(G_OBJECT(widgets->repoAcceptButton), "clicked", G_CALLBACK(on_close_subwindow), NULL); + + + gtk_window_set_title(GTK_WINDOW(widgets->window),_("System update")); + + gtk_label_set_text(GTK_LABEL(widgets->repoTypeLabel),_("Type: ")); + gtk_label_set_text(GTK_LABEL(widgets->repoURILabel),_("URI: ")); + gtk_label_set_text(GTK_LABEL(widgets->repoURIMeanLabel),_(" ")); + gtk_label_set_text(GTK_LABEL(widgets->repoDistributionLabel),_("Distribution: ")); + gtk_label_set_text(GTK_LABEL(widgets->repoDistributionMeanLabel),_(" ")); + gtk_label_set_text(GTK_LABEL(widgets->repoSectionsLabel),_("Sections: ")); + gtk_label_set_text(GTK_LABEL(widgets->repoSectionsMeanlabel),_(" ")); + + gtk_button_set_label(GTK_BUTTON(widgets->repoCancelButton),_("Cancel")); + gtk_button_set_label(GTK_BUTTON(widgets->repoAcceptButton),_("Save")); + gtk_widget_show_all(widgets->window); +} + +main_window *setup_window(){ + main_window *widgets=NULL; + widgets=malloc(sizeof(main_window)); + widgets->builder=gtk_builder_new_from_file(glade_path); + widgets->window=yon_gtk_builder_get_widget(widgets->builder,"MainWindow"); + + widgets->HeaderTopic=yon_gtk_builder_get_widget(widgets->builder,"headerTopic"); + + widgets->generalSettingsTabLabel=yon_gtk_builder_get_widget(widgets->builder,"generalTabLabel"); + widgets->repositoriesSettingsTabLabel=yon_gtk_builder_get_widget(widgets->builder,"repositoriesTabLabel"); + widgets->extraSettingsTabLabel=yon_gtk_builder_get_widget(widgets->builder,"extraTabLabel"); + + widgets->generalSettingsHideNoUpdatesCheck=yon_gtk_builder_get_widget(widgets->builder,"hideIfNoUpdatesCheck"); + widgets->generalSettingsUpdatesCheckFreqLabel=yon_gtk_builder_get_widget(widgets->builder,"UpdateCheckFreqLabel"); + widgets->generalSettingsUpdatesCheckFreqCombo=yon_gtk_builder_get_widget(widgets->builder,"UpdateCheckFreqCombo"); + widgets->generalSettingsDownloadAutoCheck=yon_gtk_builder_get_widget(widgets->builder,"DownloadAutoCheck"); + + widgets->repositoriesSettingsActivateAURCheck=yon_gtk_builder_get_widget(widgets->builder,"AcivateAURCheck"); + widgets->repositoriesSettingsActivateUBURCheck=yon_gtk_builder_get_widget(widgets->builder,"AcivateUBURCheck"); + widgets->repositoriesSettingsMoveUpButton=yon_gtk_builder_get_widget(widgets->builder,"MoveUpButton"); + widgets->repositoriesSettingsMoveDownButton=yon_gtk_builder_get_widget(widgets->builder,"MoveDownButton"); + widgets->repositoriesSettingsCreateButton=yon_gtk_builder_get_widget(widgets->builder,"CreateButton"); + widgets->repositoriesSettingsEditButton=yon_gtk_builder_get_widget(widgets->builder,"EditButton"); + widgets->repositoriesSettingsDeleteButton=yon_gtk_builder_get_widget(widgets->builder,"DeleteButton"); + widgets->repositoriesSettingsRepositoriesTreeView=yon_gtk_builder_get_widget(widgets->builder,"RepositoriesTreeView"); + widgets->repositoriesSettingsEnabledColumn=GTK_TREE_VIEW_COLUMN(gtk_builder_get_object(widgets->builder,"EnabledColumn")); + widgets->repositoriesSettingsURIColumn=GTK_TREE_VIEW_COLUMN(gtk_builder_get_object(widgets->builder,"URIColumn")); + + widgets->extraSettingsPackageManagerLabel=yon_gtk_builder_get_widget(widgets->builder,"PackageManagerLabel"); + widgets->extraSettingsPackageManagerEntry=yon_gtk_builder_get_widget(widgets->builder,"PackageManagerEntry"); + widgets->extraSettingsUpdateCommandLabel=yon_gtk_builder_get_widget(widgets->builder,"UpdateCommandLabel"); + widgets->extraSettingsUpdateCommandEntry=yon_gtk_builder_get_widget(widgets->builder,"UpdateCommandEntry"); + widgets->extraSettingsCacheCleanlabel=yon_gtk_builder_get_widget(widgets->builder,"CleanCommandLabel"); + widgets->extraSettingsCacheCleanEntry=yon_gtk_builder_get_widget(widgets->builder,"CleanCommandEntry"); + widgets->extraSettingsLaunchPackageManagerButton=yon_gtk_builder_get_widget(widgets->builder,"LaunchPackageManagerButton"); + + widgets->headerLoadConfigLabel=yon_gtk_builder_get_widget(widgets->builder,"headerLoadConfigLabel"); + widgets->headerLoadGlobalConfigButton=yon_gtk_builder_get_widget(widgets->builder,"LoadGlobalConfigurationMenuItem"); + widgets->headerLoadLocalConfigButton=yon_gtk_builder_get_widget(widgets->builder,"LoadLocalConfigurationMenuItem"); + + widgets->headerSaveConfigLabel=yon_gtk_builder_get_widget(widgets->builder,"headerSaveConfigLabel"); + widgets->headerSaveGlobalLocalConfigButton=yon_gtk_builder_get_widget(widgets->builder,"SaveGlobalLocalConfigurationMenuItem"); + widgets->headerSaveGlobalConfigButton=yon_gtk_builder_get_widget(widgets->builder,"SaveGlobalConfigurationMenuItem"); + widgets->headerSaveLocalConfigButton=yon_gtk_builder_get_widget(widgets->builder,"SaveLocalConfigurationMenuItem"); + + widgets->headerDocumentationButton=yon_gtk_builder_get_widget(widgets->builder,"DocumentationMenuItem"); + widgets->headerAboutButton=yon_gtk_builder_get_widget(widgets->builder,"AboutMenuItem"); + + widgets->mainCheckForUpdatesButton=yon_gtk_builder_get_widget(widgets->builder,"checkForUpdatesButton"); + + gtk_window_set_title(GTK_WINDOW(widgets->window),_("System update")); + + gtk_label_set_text(GTK_LABEL(widgets->HeaderTopic),_("System update")); + + gtk_label_set_text(GTK_LABEL(widgets->generalSettingsTabLabel),_("General")); + gtk_label_set_text(GTK_LABEL(widgets->repositoriesSettingsTabLabel),_("Repositories")); + gtk_label_set_text(GTK_LABEL(widgets->extraSettingsTabLabel),_("Extra")); + + gtk_label_set_text(GTK_LABEL(widgets->generalSettingsUpdatesCheckFreqLabel),_("Update checking frequency")); + gtk_button_set_label(GTK_BUTTON(widgets->generalSettingsHideNoUpdatesCheck),_("Hide icon of no updates found")); + gtk_button_set_label(GTK_BUTTON(widgets->generalSettingsDownloadAutoCheck),_("Download updates automatically")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets->generalSettingsUpdatesCheckFreqCombo),_("Every 1 hour")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets->generalSettingsUpdatesCheckFreqCombo),_("Every 2 hours")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets->generalSettingsUpdatesCheckFreqCombo),_("Every 3 hours")); + + gtk_button_set_label(GTK_BUTTON(widgets->repositoriesSettingsActivateAURCheck),_("Activate AUR")); + gtk_button_set_label(GTK_BUTTON(widgets->repositoriesSettingsActivateUBURCheck),_("Activate UBUR")); + gtk_button_set_label(GTK_BUTTON(widgets->repositoriesSettingsCreateButton),_("Create")); + gtk_button_set_label(GTK_BUTTON(widgets->repositoriesSettingsEditButton),_("Edit")); + gtk_button_set_label(GTK_BUTTON(widgets->repositoriesSettingsDeleteButton),_("Delete")); + gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(widgets->repositoriesSettingsEnabledColumn),_("Enabled")); + gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(widgets->repositoriesSettingsURIColumn),_("URI")); + + gtk_label_set_text(GTK_LABEL(widgets->extraSettingsPackageManagerLabel),_("Package manager: ")); + gtk_label_set_text(GTK_LABEL(widgets->extraSettingsUpdateCommandLabel),_("Update command: ")); + gtk_label_set_text(GTK_LABEL(widgets->extraSettingsCacheCleanlabel),_("Cache clean command: ")); + gtk_button_set_label(GTK_BUTTON(widgets->extraSettingsLaunchPackageManagerButton),_("Launch package manager")); + + gtk_label_set_text(GTK_LABEL(widgets->headerLoadConfigLabel),_("load")); + gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerLoadGlobalConfigButton),_("Load global configuration")); + gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerLoadLocalConfigButton),_("Load local configuration")); + + gtk_label_set_text(GTK_LABEL(widgets->headerSaveConfigLabel),_("Save")); + gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerSaveGlobalLocalConfigButton),_("Save to global and local configuration")); + gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerSaveGlobalConfigButton),_("Save to global configuration")); + gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerSaveLocalConfigButton),_("Save to local configuration")); + + gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerDocumentationButton),_("Documentation")); + gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerAboutButton),_("About")); + + gtk_button_set_label(GTK_BUTTON(widgets->mainCheckForUpdatesButton),_("Check for updates")); + + + + + GtkWidget *Header = yon_gtk_builder_get_widget(widgets->builder,"boxColor"); + GtkWidget *Image = yon_gtk_builder_get_widget(widgets->builder,"HeadBackgroundImage"); + GtkWidget *Overlay = yon_gtk_builder_get_widget(widgets->builder,"HeadOverlay"); + + GtkWidget *UnderNoteOverlay = yon_gtk_builder_get_widget(widgets->builder,"UnderNoteOverlay"); + GtkWidget *checkForUpdatesButton = yon_gtk_builder_get_widget(widgets->builder,"checkForUpdatesButton"); + GtkWidget *headLabel = yon_gtk_builder_get_widget(widgets->builder,"headLabel"); yon_ubl_header_setup(Overlay,Header,Image,image_path); gtk_overlay_add_overlay(GTK_OVERLAY(UnderNoteOverlay),checkForUpdatesButton); - gtk_widget_show_all(window); + + gtk_label_set_text(GTK_LABEL(headLabel),_("System update parameter configuration")); + gtk_widget_show_all(widgets->window); + + + g_signal_connect(G_OBJECT(widgets->repositoriesSettingsCreateButton), "clicked", G_CALLBACK(on_repo_window_open), NULL); + g_signal_connect(G_OBJECT(widgets->repositoriesSettingsEditButton), "clicked", G_CALLBACK(on_repo_window_open), NULL); + + g_signal_connect(G_OBJECT(widgets->headerAboutButton), "activate", G_CALLBACK(on_about), NULL); + + g_signal_connect(G_OBJECT(widgets->window), "destroy", G_CALLBACK(gtk_main_quit), NULL); +} + + +int main(int argc, char *argv[]){ + local=setlocale(LC_ALL, ""); + textdomain (LocaleName); + gtk_init(&argc,&argv); + main_window *widgets = setup_window(); GtkCssProvider *css=gtk_css_provider_new(); gtk_css_provider_load_from_path(css,CssPath,NULL); gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), diff --git a/source/ubl-settings-update.h b/source/ubl-settings-update.h index 2112054..0bd21e6 100644 --- a/source/ubl-settings-update.h +++ b/source/ubl-settings-update.h @@ -1,5 +1,92 @@ #include "ubl-utils.h" +#include +#include +#include +#include +#include + +#define _(String) gettext(String) + #define glade_path "/usr/share/ubl-settings-update/ui/ubl-settings-update.glade" #define image_path "/usr/share/ubl-settings-update/ui/ubl-settings-update-banner.png" -#define CssPath "/usr/share/ubl-settings-update/css/ubl-settings-update.css" \ No newline at end of file +#define CssPath "/usr/share/ubl-settings-update/css/ubl-settings-update.css" + +#define LocalePath "/usr/share/locale" +#define LocaleName "ubl-settings-update" +typedef char* string; +string version_application = "1.2"; + +char *local; + +typedef struct { + GtkWidget *window; + GtkBuilder *builder; + + GtkWidget *HeaderTopic; + + GtkWidget *generalSettingsTabLabel; + GtkWidget *repositoriesSettingsTabLabel; + GtkWidget *extraSettingsTabLabel; + + GtkWidget *generalSettingsHideNoUpdatesCheck; + GtkWidget *generalSettingsUpdatesCheckFreqLabel; + GtkWidget *generalSettingsUpdatesCheckFreqCombo; + GtkWidget *generalSettingsDownloadAutoCheck; + + GtkWidget *repositoriesSettingsActivateAURCheck; + GtkWidget *repositoriesSettingsActivateUBURCheck; + GtkWidget *repositoriesSettingsMoveUpButton; + GtkWidget *repositoriesSettingsMoveDownButton; + GtkWidget *repositoriesSettingsCreateButton; + GtkWidget *repositoriesSettingsEditButton; + GtkWidget *repositoriesSettingsDeleteButton; + GtkWidget *repositoriesSettingsRepositoriesTreeView; + GtkTreeViewColumn *repositoriesSettingsEnabledColumn; + GtkTreeViewColumn *repositoriesSettingsURIColumn; + + GtkWidget *extraSettingsPackageManagerLabel; + GtkWidget *extraSettingsPackageManagerEntry; + GtkWidget *extraSettingsUpdateCommandLabel; + GtkWidget *extraSettingsUpdateCommandEntry; + GtkWidget *extraSettingsCacheCleanlabel; + GtkWidget *extraSettingsCacheCleanEntry; + GtkWidget *extraSettingsLaunchPackageManagerButton; + + GtkWidget *headerLoadConfigLabel; + GtkWidget *headerLoadGlobalConfigButton; + GtkWidget *headerLoadLocalConfigButton; + + GtkWidget *headerSaveConfigLabel; + GtkWidget *headerSaveGlobalLocalConfigButton; + GtkWidget *headerSaveGlobalConfigButton; + GtkWidget *headerSaveLocalConfigButton; + + GtkWidget *headerDocumentationButton; + GtkWidget *headerAboutButton; + + GtkWidget *mainCheckForUpdatesButton; + +} main_window; + +typedef struct { + GtkWidget *window; + GtkBuilder *builder; + + GtkWidget *repoTypeLabel; + GtkWidget *repoTypeEntry; + GtkWidget *repoURILabel; + GtkWidget *repoURIMeanLabel; + GtkWidget *repoDistributionLabel; + GtkWidget *repoDistributionMeanLabel; + GtkWidget *repoSectionsLabel; + GtkWidget *repoSectionsMeanlabel; + + GtkWidget *repoCancelButton; + GtkWidget *repoAcceptButton; +} repo_window; + +void on_repo_window_open(GtkWidget *self); + +main_window *setup_window(); +repo_window *setup_repo_window(); \ No newline at end of file diff --git a/ubl-settings-update.glade b/ubl-settings-update.glade index 3054889..2cfba93 100644 --- a/ubl-settings-update.glade +++ b/ubl-settings-update.glade @@ -31,7 +31,7 @@ vertical 2 - + False end @@ -41,15 +41,13 @@ 1 - - - True False + True True @@ -83,7 +81,7 @@ 6 6 69 - com.ublinux.ubl-settings-quotas + com.ublinux.ubl-settings-update False @@ -156,9 +154,10 @@ False emblem-ok-symbolic - + False System update + True com.ublinux.ubl-settings-update @@ -176,7 +175,7 @@ False 5 - + True False Type: @@ -189,7 +188,7 @@ - + True True @@ -218,7 +217,7 @@ False 5 - + True False URI: @@ -231,7 +230,7 @@ - + True False 0 @@ -255,7 +254,7 @@ False 5 - + True False Distribution: @@ -268,7 +267,7 @@ - + True False 0 @@ -292,7 +291,7 @@ False 5 - + True False Sections: @@ -305,7 +304,7 @@ - + True False 0 @@ -352,7 +351,7 @@ 5 True - + Cancel True True @@ -366,7 +365,7 @@ - + Save True True @@ -400,10 +399,10 @@ - - - - + + + + @@ -438,14 +437,14 @@ True False - + True False Load from global configuration - + True False Load from local configuration @@ -458,7 +457,15 @@ False False - + + True + False + Documentation + True + + + + True False About @@ -472,21 +479,21 @@ True False - + True False Save to global and local documentation - + True False Save to global configuration - + True False Save to local configuration @@ -495,7 +502,9 @@ False - com.ublinux.ubl-settings-quotas + 800 + 600 + com.ublinux.ubl-settings-update True @@ -574,11 +583,12 @@ vertical 5 - + Hide icon if no updates found True True False + 0 True @@ -593,7 +603,7 @@ False 5 - + True False Update checking frequency @@ -606,7 +616,7 @@ - + True False @@ -624,11 +634,12 @@ - + Download updates automatically True True False + 0 True @@ -665,7 +676,7 @@ False 5 - + Activate AUR True True @@ -679,7 +690,7 @@ - + Activate UBUR True True @@ -705,7 +716,7 @@ False 5 - + True True liststore1 @@ -713,7 +724,7 @@ - + Enabled @@ -724,7 +735,7 @@ - + URI @@ -745,15 +756,16 @@ True False + center vertical - 5 + 25 True True True - + True False True @@ -785,7 +797,7 @@ True True - + True False True @@ -828,9 +840,11 @@ True False + 5 + 5 5 - + Create True True @@ -843,7 +857,7 @@ - + Edit True True @@ -856,7 +870,7 @@ - + Delete True True @@ -882,7 +896,7 @@ - + True False Repositories @@ -908,7 +922,7 @@ False 5 - + True False Package manager: @@ -921,7 +935,7 @@ - + True True @@ -944,7 +958,7 @@ False 5 - + True False Update command: @@ -957,7 +971,7 @@ - + True True @@ -980,7 +994,7 @@ False 5 - + True False Cache clean command: @@ -993,7 +1007,7 @@ - + True True @@ -1019,7 +1033,7 @@ - + Launch package manager True True @@ -1047,7 +1061,7 @@ - + True False Extra @@ -1116,7 +1130,7 @@ 6 6 32 - com.ublinux.ubl-settings-quotas + com.ublinux.ubl-settings-update @@ -1153,7 +1167,7 @@ True False - + True False Load @@ -1195,7 +1209,7 @@ True False - + True False Save @@ -1234,9 +1248,9 @@ - - - + + + diff --git a/ubl-settings-update.pot b/ubl-settings-update.pot new file mode 100644 index 0000000..92dc6f6 --- /dev/null +++ b/ubl-settings-update.pot @@ -0,0 +1,184 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-04-05 12:44+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: source/ubl-settings-update.c:16 +msgid "UBlinux System update" +msgstr "" + +#: source/ubl-settings-update.c:18 +msgid "Project Home Page" +msgstr "" + +#: source/ubl-settings-update.c:19 +msgid "Update configurator" +msgstr "" + +#: source/ubl-settings-update.c:46 source/ubl-settings-update.c:111 +#: source/ubl-settings-update.c:113 +msgid "System update" +msgstr "" + +#: source/ubl-settings-update.c:48 +msgid "Type: " +msgstr "" + +#: source/ubl-settings-update.c:49 +msgid "URI: " +msgstr "" + +#: source/ubl-settings-update.c:50 source/ubl-settings-update.c:52 +#: source/ubl-settings-update.c:54 +msgid " " +msgstr "" + +#: source/ubl-settings-update.c:51 +msgid "Distribution: " +msgstr "" + +#: source/ubl-settings-update.c:53 +msgid "Sections: " +msgstr "" + +#: source/ubl-settings-update.c:56 +msgid "Cancel" +msgstr "" + +#: source/ubl-settings-update.c:57 source/ubl-settings-update.c:143 +msgid "Save" +msgstr "" + +#: source/ubl-settings-update.c:115 +msgid "General" +msgstr "" + +#: source/ubl-settings-update.c:116 +msgid "Repositories" +msgstr "" + +#: source/ubl-settings-update.c:117 +msgid "Extra" +msgstr "" + +#: source/ubl-settings-update.c:119 +msgid "Update checking frequency" +msgstr "" + +#: source/ubl-settings-update.c:120 +msgid "Hide icon of no updates found" +msgstr "" + +#: source/ubl-settings-update.c:121 +msgid "Download updates automatically" +msgstr "" + +#: source/ubl-settings-update.c:122 +msgid "Every 1 hour" +msgstr "" + +#: source/ubl-settings-update.c:123 +msgid "Every 2 hours" +msgstr "" + +#: source/ubl-settings-update.c:124 +msgid "Every 3 hours" +msgstr "" + +#: source/ubl-settings-update.c:126 +msgid "Activate AUR" +msgstr "" + +#: source/ubl-settings-update.c:127 +msgid "Activate UBUR" +msgstr "" + +#: source/ubl-settings-update.c:128 +msgid "Create" +msgstr "" + +#: source/ubl-settings-update.c:129 +msgid "Edit" +msgstr "" + +#: source/ubl-settings-update.c:130 +msgid "Delete" +msgstr "" + +#: source/ubl-settings-update.c:131 +msgid "Enabled" +msgstr "" + +#: source/ubl-settings-update.c:132 +msgid "URI" +msgstr "" + +#: source/ubl-settings-update.c:134 +msgid "Package manager: " +msgstr "" + +#: source/ubl-settings-update.c:135 +msgid "Update command: " +msgstr "" + +#: source/ubl-settings-update.c:136 +msgid "Cache clean command: " +msgstr "" + +#: source/ubl-settings-update.c:137 +msgid "Launch package manager" +msgstr "" + +#: source/ubl-settings-update.c:139 +msgid "load" +msgstr "" + +#: source/ubl-settings-update.c:140 +msgid "Load global configuration" +msgstr "" + +#: source/ubl-settings-update.c:141 +msgid "Load local configuration" +msgstr "" + +#: source/ubl-settings-update.c:144 +msgid "Save to global and local configuration" +msgstr "" + +#: source/ubl-settings-update.c:145 +msgid "Save to global configuration" +msgstr "" + +#: source/ubl-settings-update.c:146 +msgid "Save to local configuration" +msgstr "" + +#: source/ubl-settings-update.c:148 +msgid "Documentation" +msgstr "" + +#: source/ubl-settings-update.c:149 +msgid "About" +msgstr "" + +#: source/ubl-settings-update.c:151 +msgid "Check for updates" +msgstr "" + +#: source/ubl-settings-update.c:166 +msgid "System update parameter configuration" +msgstr "" diff --git a/ubl-settings-update_ru.po b/ubl-settings-update_ru.po new file mode 100644 index 0000000..0e669b6 --- /dev/null +++ b/ubl-settings-update_ru.po @@ -0,0 +1,189 @@ +# Language translations for ubl-settings-manager package. +# Copyright (C) 2022, UBTech LLC +# This file is distributed under the same license as the ubl-settings-manager package. +# UBLinux Team , 2022 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: ubl-settings-update 1.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-04-05 12:44+0000\n" +"PO-Revision-Date: 2023-01-01 00:00+0600\n" +"Last-Translator: UBLinux Team \n" +"Language-Team: UBLinux Team \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: source/ubl-settings-update.c:16 +#, fuzzy +msgid "UBlinux System update" +msgstr "Обновление системы" + +#: source/ubl-settings-update.c:18 +#, fuzzy +msgid "Project Home Page" +msgstr "Домашняя страница проекта" + +#: source/ubl-settings-update.c:19 +#, fuzzy +msgid "Update configurator" +msgstr "Загрузить локальную конфигурацию" + +#: source/ubl-settings-update.c:46 source/ubl-settings-update.c:111 +#: source/ubl-settings-update.c:113 +msgid "System update" +msgstr "Обновление системы" + +#: source/ubl-settings-update.c:48 +msgid "Type: " +msgstr "Тип: " + +#: source/ubl-settings-update.c:49 +msgid "URI: " +msgstr "URI: " + +#: source/ubl-settings-update.c:50 source/ubl-settings-update.c:52 +#: source/ubl-settings-update.c:54 +msgid " " +msgstr " " + +#: source/ubl-settings-update.c:51 +msgid "Distribution: " +msgstr "Дистрибутив: " + +#: source/ubl-settings-update.c:53 +msgid "Sections: " +msgstr "Разделы: " + +#: source/ubl-settings-update.c:56 +msgid "Cancel" +msgstr "Отмена" + +#: source/ubl-settings-update.c:57 source/ubl-settings-update.c:143 +msgid "Save" +msgstr "Сохранить" + +#: source/ubl-settings-update.c:115 +msgid "General" +msgstr "Общие настройки" + +#: source/ubl-settings-update.c:116 +msgid "Repositories" +msgstr "Репозитории" + +#: source/ubl-settings-update.c:117 +msgid "Extra" +msgstr "Дополнительно" + +#: source/ubl-settings-update.c:119 +msgid "Update checking frequency" +msgstr "Частота проверки обновлений" + +#: source/ubl-settings-update.c:120 +msgid "Hide icon of no updates found" +msgstr "Скрыть значок в трее при отсутствии обновлений" + +#: source/ubl-settings-update.c:121 +msgid "Download updates automatically" +msgstr "Автоматически скачивать обновления" + +#: source/ubl-settings-update.c:122 +msgid "Every 1 hour" +msgstr "Каждый час" + +#: source/ubl-settings-update.c:123 +msgid "Every 2 hours" +msgstr "Каждые 2 часа" + +#: source/ubl-settings-update.c:124 +msgid "Every 3 hours" +msgstr "Каждые 3 часа" + +#: source/ubl-settings-update.c:126 +msgid "Activate AUR" +msgstr "Активировать AUR" + +#: source/ubl-settings-update.c:127 +msgid "Activate UBUR" +msgstr "Активировать UBUR" + +#: source/ubl-settings-update.c:128 +msgid "Create" +msgstr "Создать" + +#: source/ubl-settings-update.c:129 +msgid "Edit" +msgstr "Изменить" + +#: source/ubl-settings-update.c:130 +msgid "Delete" +msgstr "Удалить" + +#: source/ubl-settings-update.c:131 +msgid "Enabled" +msgstr "Включен" + +#: source/ubl-settings-update.c:132 +#, fuzzy +msgid "URI" +msgstr "URI" + +#: source/ubl-settings-update.c:134 +msgid "Package manager: " +msgstr "Менеджер пакетов: " + +#: source/ubl-settings-update.c:135 +msgid "Update command: " +msgstr "Команда обновления: " + +#: source/ubl-settings-update.c:136 +msgid "Cache clean command: " +msgstr "Команда очистки кеша пакетов: " + +#: source/ubl-settings-update.c:137 +msgid "Launch package manager" +msgstr "Запустить менеджер пакетов" + +#: source/ubl-settings-update.c:139 +msgid "load" +msgstr "Загрузить" + +#: source/ubl-settings-update.c:140 +msgid "Load global configuration" +msgstr "Загрузить глобальную конфигурацию" + +#: source/ubl-settings-update.c:141 +msgid "Load local configuration" +msgstr "Загрузить локальную конфигурацию" + +#: source/ubl-settings-update.c:144 +msgid "Save to global and local configuration" +msgstr "Сохранить в глобальную и локальную конфигурацию" + +#: source/ubl-settings-update.c:145 +msgid "Save to global configuration" +msgstr "Сохранить в глобальную конфигурацию" + +#: source/ubl-settings-update.c:146 +msgid "Save to local configuration" +msgstr "Сохранить в локальную конфигурацию" + +#: source/ubl-settings-update.c:148 +msgid "Documentation" +msgstr "Справка" + +#: source/ubl-settings-update.c:149 +msgid "About" +msgstr "О программе" + +#: source/ubl-settings-update.c:151 +msgid "Check for updates" +msgstr "Проверить обновления" + +#: source/ubl-settings-update.c:166 +#, fuzzy +msgid "System update parameter configuration" +msgstr "настройка параметров обновления системы" From 6003a36029c27dcd95117b1725d60a68eeabfcc1 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 28 Apr 2023 12:14:18 +0600 Subject: [PATCH 2/5] Localisation file information fixes, icons for status bar --- com.ublinux.ubl-settings-video.checked.svg | 327 +++++++++++++++++++++ com.ublinux.ubl-settings-video.warning.svg | 55 ++++ ubl-settings-update.pot | 24 +- ubl-settings-update_ru.po | 12 +- 4 files changed, 400 insertions(+), 18 deletions(-) create mode 100644 com.ublinux.ubl-settings-video.checked.svg create mode 100644 com.ublinux.ubl-settings-video.warning.svg diff --git a/com.ublinux.ubl-settings-video.checked.svg b/com.ublinux.ubl-settings-video.checked.svg new file mode 100644 index 0000000..e3cab42 --- /dev/null +++ b/com.ublinux.ubl-settings-video.checked.svg @@ -0,0 +1,327 @@ + + + + + + + + + + + + + + + + diff --git a/com.ublinux.ubl-settings-video.warning.svg b/com.ublinux.ubl-settings-video.warning.svg new file mode 100644 index 0000000..9a90dba --- /dev/null +++ b/com.ublinux.ubl-settings-video.warning.svg @@ -0,0 +1,55 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/ubl-settings-update.pot b/ubl-settings-update.pot index 92dc6f6..7ee8f2e 100644 --- a/ubl-settings-update.pot +++ b/ubl-settings-update.pot @@ -1,20 +1,20 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# language translations for ubl-settings-manager package. +# Copyright (C) 2022, UBTech LLC +# This file is distributed under the same license as the ubl-settings-manager package. +# UBLinux Team , 2022 # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-05 12:44+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" +"Project-Id-Version: ubl-settings-manager 1.0\n" +"Report-Msgid-Bugs-To: info@ublinux.com\n" +"POT-Creation-Date: 2023-04-21 12:33+0000\n" +"PO-Revision-Date: 2023-01-01 00:00+0600\n" +"Last-Translator: UBLinux Team \n" +"Language-Team: Russian - UBLinux Team \n" +"Language: Russian\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: source/ubl-settings-update.c:16 diff --git a/ubl-settings-update_ru.po b/ubl-settings-update_ru.po index 0e669b6..fe04db6 100644 --- a/ubl-settings-update_ru.po +++ b/ubl-settings-update_ru.po @@ -1,4 +1,4 @@ -# Language translations for ubl-settings-manager package. +# Russian translations for ubl-settings-manager package. # Copyright (C) 2022, UBTech LLC # This file is distributed under the same license as the ubl-settings-manager package. # UBLinux Team , 2022 @@ -6,13 +6,13 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ubl-settings-update 1.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-05 12:44+0000\n" +"Project-Id-Version: ubl-settings-manager 1.0\n" +"Report-Msgid-Bugs-To: info@ublinux.com\n" +"POT-Creation-Date: 2023-04-21 12:33+0000\n" "PO-Revision-Date: 2023-01-01 00:00+0600\n" "Last-Translator: UBLinux Team \n" -"Language-Team: UBLinux Team \n" -"Language: \n" +"Language-Team: Russian - UBLinux Team \n" +"Language: Russian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" From 51b5253765b0b1965171bc350ceb5064dc49afe3 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 28 Apr 2023 12:15:13 +0600 Subject: [PATCH 3/5] Makefile changes - moved pictures to images folder --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index aaee618..dab2c5d 100644 --- a/Makefile +++ b/Makefile @@ -86,6 +86,7 @@ uninstall: @$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}" @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop" @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg" + @$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/${PKGNAME}-banner.png" @$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}" @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ @@ -108,6 +109,8 @@ install: check uninstall install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ done + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" @install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" @@ -117,7 +120,8 @@ install: check uninstall @install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images} @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}.glade" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/css/" "${PKGNAME}.css" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}-banner.png" + @install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}/images" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "${PKGNAME}-banner.png" @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ From 196d48e3d2098ac81df78d8eb0b670378be23942 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 28 Apr 2023 12:16:56 +0600 Subject: [PATCH 4/5] path to banner updated --- source/ubl-settings-update.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-update.h b/source/ubl-settings-update.h index 0bd21e6..e5129f0 100644 --- a/source/ubl-settings-update.h +++ b/source/ubl-settings-update.h @@ -9,7 +9,7 @@ #define _(String) gettext(String) #define glade_path "/usr/share/ubl-settings-update/ui/ubl-settings-update.glade" -#define image_path "/usr/share/ubl-settings-update/ui/ubl-settings-update-banner.png" +#define image_path "/usr/share/ubl-settings-update/images/ubl-settings-update-banner.png" #define CssPath "/usr/share/ubl-settings-update/css/ubl-settings-update.css" #define LocalePath "/usr/share/locale" From cf3337431bb3d2b9dab20400c9c4d1b07f745435 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 28 Apr 2023 12:35:44 +0600 Subject: [PATCH 5/5] Fixed icon names --- Makefile | 6 +++--- ...ecked.svg => com.ublinux.ubl-settings-update.checked.svg | 0 ...rning.svg => com.ublinux.ubl-settings-update.warning.svg | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename com.ublinux.ubl-settings-video.checked.svg => com.ublinux.ubl-settings-update.checked.svg (100%) rename com.ublinux.ubl-settings-video.warning.svg => com.ublinux.ubl-settings-update.warning.svg (100%) diff --git a/Makefile b/Makefile index dab2c5d..aef26b5 100644 --- a/Makefile +++ b/Makefile @@ -109,8 +109,6 @@ install: check uninstall install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ done - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" @install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" @@ -120,8 +118,10 @@ install: check uninstall @install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images} @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}.glade" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/css/" "${PKGNAME}.css" - @install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}/images" + @install -dm755 -d "${DESTDIR}${PREFIX}/share/${PKGNAME}/images" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "${PKGNAME}-banner.png" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ diff --git a/com.ublinux.ubl-settings-video.checked.svg b/com.ublinux.ubl-settings-update.checked.svg similarity index 100% rename from com.ublinux.ubl-settings-video.checked.svg rename to com.ublinux.ubl-settings-update.checked.svg diff --git a/com.ublinux.ubl-settings-video.warning.svg b/com.ublinux.ubl-settings-update.warning.svg similarity index 100% rename from com.ublinux.ubl-settings-video.warning.svg rename to com.ublinux.ubl-settings-update.warning.svg