diff --git a/source/ubl-settings-update.c b/source/ubl-settings-update.c index 1211675..2e919df 100644 --- a/source/ubl-settings-update.c +++ b/source/ubl-settings-update.c @@ -810,7 +810,8 @@ void on_repo_edit(GtkWidget *,main_window *widgets){ void on_web_publish_edit(GtkWidget *,main_window *widgets){ web_publication_add_window *window = yon_web_publication_add_window_new(); - yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),ADD_REPO_LABEL,icon_path,"web_publish_window"); + gtk_label_set_text(GTK_LABEL(window->HeadLabel),EDIT_WEB_LABEL); + yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),ADD_WEB_LABEL,icon_path,"web_publish_window"); dictionary *dict = NULL; yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets); @@ -877,7 +878,8 @@ void on_web_publish_edit(GtkWidget *,main_window *widgets){ void on_mirror_edit(GtkWidget *,main_window *widgets){ mirror_add_window *window = yon_mirror_add_window_new(); - yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),ADD_REPO_LABEL,icon_path,"mirror_window"); + gtk_label_set_text(GTK_LABEL(window->HeadLabel),EDIT_WEB_LABEL); + yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),ADD_WEB_LABEL,icon_path,"mirror_window"); dictionary *dict = NULL; yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets); @@ -886,7 +888,8 @@ void on_mirror_edit(GtkWidget *,main_window *widgets){ char *target; GtkTreeIter iter; - gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->MirrorTree)),NULL,&iter); + GtkTreeModel *model; + gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->MirrorTree)),&model,&iter); gtk_tree_model_get(GTK_TREE_MODEL(widgets->MirrorList),&iter,0,&target,-1); gtk_entry_set_text(GTK_ENTRY(window->NameEntry),target); window->name = target; @@ -900,12 +903,10 @@ void on_mirror_edit(GtkWidget *,main_window *widgets){ yon_ubl_status_highlight_incorrect(window->TypeEntry); return; } - char *type = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->TypeCombo)); - char *full_name = yon_char_unite(type,"@",target,NULL); gtk_entry_set_text(GTK_ENTRY(window->TypeEntry),""); GtkBuilder *builder = gtk_builder_new_from_resource(glade_mirror_path_add_path); gtk_box_pack_start(GTK_BOX(window->PathBox),yon_gtk_builder_get_widget(builder,"PathRemovalBox"),0,0,2); - gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder,"PathEntry")),full_name); + gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder,"PathEntry")),target); g_signal_connect(gtk_builder_get_object(builder,"PathEditButton"),"clicked",G_CALLBACK(on_mirror_path_edit),gtk_builder_get_object(builder,"PathRemovalBox")); g_signal_connect(gtk_builder_get_object(builder,"PathRemoveButton"),"clicked",G_CALLBACK(on_mirror_path_removed),gtk_builder_get_object(builder,"PathRemovalBox")); g_object_unref(G_OBJECT(builder)); diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 5e8d107..f54d4a2 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -10,123 +10,125 @@ #define REMOVE_REPO_WARNING_LABEL _("Are you sure want to remove repository?") #define NO_SHARED_REPOS_LABEL _("No repositories were chosen to share") + #define ADD_WEB_LABEL _("Add repository for publication") + #define EDIT_WEB_LABEL _("Edit repository for publication") + #define PASSWORD_MISMATCH_LABEL _("passwords do not match") -/* #define _LABEL _("file://\t\t- Directory URL prefix for repository\n\ + #define REPO_TOOLTIP_LABEL _("file://\t\t- Directory URL prefix for repository\n\ ftp://\t\t- FTP URL prefix for repository\n\ http://\t\t- HTTP URL prefix for repository\n\ https://\t\t- HTTPS URL prefix for repository\n\ -Configuration - configuration path") */ -/* #define _LABEL _("url - web-link for repository. It is allowed to write multiple, separating with comma (,)\n\ +Configuration - configuration path") + #define MIRROR_TOOLTIP_LABEL _("url - web-link for repository. It is allowed to write multiple, separating with comma (,)\n\ http_proxy - proxy-server for repository, replaces 'http_proxy'. Single parameter per repository\n\ -mirrorlist - mirrors file, make sure server URL is not included in this file! Single parameter per repository") */ -// #define _LABEL _("The full URL of where to find the database, packages, and signatures (if available) for this repository. Multiple can be specified, separated by commas (,)") -// #define _LABEL _("Update") -// #define _LABEL _("Repositories") -// #define _LABEL _("Publication") -// #define _LABEL _("WEB-publication") -// #define _LABEL _("Mirror publication") -// #define _LABEL _("Date of last automatic update: ") -// #define _LABEL _("Automatic update") -// #define _LABEL _("First update all modules and then the system") -// #define _LABEL _("Update only modules") -// #define _LABEL _("Update everything in the order of the specified repositories") -// #define _LABEL _("Update mode:") -// #define _LABEL _("Update interval:") -// #define _LABEL _("Boot") -// #define _LABEL _("Minutes") -// #define _LABEL _("Hours") -// #define _LABEL _("Days") -// #define _LABEL _("Months") -// #define _LABEL _("Repositories from which the update will occur") -// #define _LABEL _("Repositories list:") -// #define _LABEL _("Default") -// #define _LABEL _("Choose") -// #define _LABEL _("Chosen") -// #define _LABEL _("Repository") -// #define _LABEL _("Manage repository list") -// #define _LABEL _("Disable system repositories") -// #define _LABEL _("Update") -// #define _LABEL _("Move up") -// #define _LABEL _("Move down") -// #define _LABEL _("Add") -// #define _LABEL _("Edit") -// #define _LABEL _("Remove") -// #define _LABEL _("Enabled") -// #define _LABEL _("Source") -// #define _LABEL _("Signature level") -// #define _LABEL _("Usage level") -// #define _LABEL _("Repository connection configuration") -// #define _LABEL _("Setting up a connection to a distributed repository network and publishing your repositories") -// #define _LABEL _("Connect and publish") -// #define _LABEL _("Recieve DB packages from shared network") -// #define _LABEL _("Repositories for publishing") -// #define _LABEL _("Repositories list:") -// #define _LABEL _("All repositories") -// #define _LABEL _("Choose") -// #define _LABEL _("Accept") -// #define _LABEL _("Repository name") -// #define _LABEL _("Setting up publication of storage and/or repositories as a local WEB resource") -// #define _LABEL _("Authorization parameters") -// #define _LABEL _("Storage") -// #define _LABEL _("Chosen repositories") -// #define _LABEL _("Reviewer") -// #define _LABEL _("Port") -// #define _LABEL _("Name") -// #define _LABEL _("Password/Hash type") -// #define _LABEL _("Password/Password hash") -// #define _LABEL _("Setting up publication of a lazy mirror of connected repositories as a local WEB resource") -// #define _LABEL _("Publish lazy mirror") -// #define _LABEL _("Type") -// #define _LABEL _("Resource URL") -// #define _LABEL _("Configure") -// #define _LABEL _("Mirror publish configuration") -// #define _LABEL _("Service port:") -// #define _LABEL _("Cache directory:") -// #define _LABEL _("Duration of inactivity (in seconds):") -// #define _LABEL _("Timeout (in seconds) for loading internel cache:") -// #define _LABEL _("Work through proxy:") -// #define _LABEL _("User agent:") -// #define _LABEL _("Standard expression for cron:") -// #define _LABEL _("The number of consecutie days that systems on the network have not been updated:") -// #define _LABEL _("The number of consecutive days wthout an update requested:") -// #define _LABEL _("Add mirror") -// #define _LABEL _("Repository name:") -// #define _LABEL _("Repository type:") -// #define _LABEL _("WEB link") -// #define _LABEL _("Proxy server") -// #define _LABEL _("Mirrors file") -// #define _LABEL _("Source:") -// #define _LABEL _("Configuration") -// #define _LABEL _("Sign level:") -// #define _LABEL _("Enable repository update") -// #define _LABEL _("Enable repository search") -// #define _LABEL _("Enable installation of packages from this repository during --sync operation") -// #define _LABEL _("Allow this repository to be a valid source of packages when running --sysupgrade") -// #define _LABEL _("Add repository for publication") -// #define _LABEL _("Enable publishing of local repository as WEB resource") -// #define _LABEL _("Path to publication directory:") -// #define _LABEL _("Port:") -// #define _LABEL _("Publishing parameters") -// #define _LABEL _("Enable WEB file browser") -// #define _LABEL _("Authorization parameters") -// #define _LABEL _("Set") -// #define _LABEL _("Username:") -// #define _LABEL _("User password:") -// #define _LABEL _("Not encrypted") -// #define _LABEL _("Encrypted with SHA256") -// #define _LABEL _("Encrypted with SHA512") -// #define _LABEL _("System") -// #define _LABEL _("Minutes") -// #define _LABEL _("Hours") -// #define _LABEL _("Days") -// #define _LABEL _("Months") -// #define _LABEL _("Sign level") -// #define _LABEL _("Password input") -// #define _LABEL _("Password:") -// #define _LABEL _("Repeat password:") -// #define _LABEL _("Entryption:") -// #define _LABEL _("Do not encrypt password") -// #define _LABEL _("Password hash:") +mirrorlist - mirrors file, make sure server URL is NOT included in this file! Single parameter per repository") + // #define _LABEL _("The full URL of where to find the database, packages, and signatures (if available) for this repository. Multiple can be specified, separated by commas (,)") + // #define _LABEL _("Update") + // #define _LABEL _("Repositories") + // #define _LABEL _("Publication") + // #define _LABEL _("WEB-publication") + // #define _LABEL _("Mirror publication") + // #define _LABEL _("Date of last automatic update: ") + // #define _LABEL _("Automatic update") + // #define _LABEL _("First update all modules and then the system") + // #define _LABEL _("Update only modules") + // #define _LABEL _("Update everything in the order of the specified repositories") + // #define _LABEL _("Update mode:") + // #define _LABEL _("Update interval:") + // #define _LABEL _("Boot") + // #define _LABEL _("Minutes") + // #define _LABEL _("Hours") + // #define _LABEL _("Days") + // #define _LABEL _("Months") + // #define _LABEL _("Repositories from which the update will occur") + // #define _LABEL _("Repositories list:") + // #define _LABEL _("Default") + // #define _LABEL _("Choose") + // #define _LABEL _("Chosen") + // #define _LABEL _("Repository") + // #define _LABEL _("Manage repository list") + // #define _LABEL _("Disable system repositories") + // #define _LABEL _("Update") + // #define _LABEL _("Move up") + // #define _LABEL _("Move down") + // #define _LABEL _("Add") + // #define _LABEL _("Edit") + // #define _LABEL _("Remove") + // #define _LABEL _("Enabled") + // #define _LABEL _("Source") + // #define _LABEL _("Signature level") + // #define _LABEL _("Usage level") + // #define _LABEL _("Repository connection configuration") + // #define _LABEL _("Setting up a connection to a distributed repository network and publishing your repositories") + // #define _LABEL _("Connect and publish") + // #define _LABEL _("Recieve DB packages from shared network") + // #define _LABEL _("Repositories for publishing") + // #define _LABEL _("Repositories list:") + // #define _LABEL _("All repositories") + // #define _LABEL _("Choose") + // #define _LABEL _("Accept") + // #define _LABEL _("Repository name") + // #define _LABEL _("Setting up publication of storage and/or repositories as a local WEB resource") + // #define _LABEL _("Authorization parameters") + // #define _LABEL _("Storage") + // #define _LABEL _("Chosen repositories") + // #define _LABEL _("Reviewer") + // #define _LABEL _("Port") + // #define _LABEL _("Name") + // #define _LABEL _("Password/Hash type") + // #define _LABEL _("Password/Password hash") + // #define _LABEL _("Setting up publication of a lazy mirror of connected repositories as a local WEB resource") + // #define _LABEL _("Publish lazy mirror") + // #define _LABEL _("Type") + // #define _LABEL _("Resource URL") + // #define _LABEL _("Configure") + // #define _LABEL _("Mirror publish configuration") + // #define _LABEL _("Service port:") + // #define _LABEL _("Cache directory:") + // #define _LABEL _("Duration of inactivity (in seconds):") + // #define _LABEL _("Timeout (in seconds) for loading internel cache:") + // #define _LABEL _("Work through proxy:") + // #define _LABEL _("User agent:") + // #define _LABEL _("Standard expression for cron:") + // #define _LABEL _("The number of consecutie days that systems on the network have not been updated:") + // #define _LABEL _("The number of consecutive days wthout an update requested:") + // #define _LABEL _("Add mirror") + // #define _LABEL _("Repository name:") + // #define _LABEL _("Repository type:") + // #define _LABEL _("WEB link") + // #define _LABEL _("Proxy server") + // #define _LABEL _("Mirrors file") + // #define _LABEL _("Source:") + // #define _LABEL _("Configuration") + // #define _LABEL _("Sign level:") + // #define _LABEL _("Enable repository update") + // #define _LABEL _("Enable repository search") + // #define _LABEL _("Enable installation of packages from this repository during --sync operation") + // #define _LABEL _("Allow this repository to be a valid source of packages when running --sysupgrade") + // #define _LABEL _("Enable publishing of local repository as WEB resource") + // #define _LABEL _("Path to publication directory:") + // #define _LABEL _("Port:") + // #define _LABEL _("Publishing parameters") + // #define _LABEL _("Enable WEB file browser") + // #define _LABEL _("Authorization parameters") + // #define _LABEL _("Set") + // #define _LABEL _("Username:") + // #define _LABEL _("User password:") + // #define _LABEL _("Not encrypted") + // #define _LABEL _("Encrypted with SHA256") + // #define _LABEL _("Encrypted with SHA512") + // #define _LABEL _("System") + // #define _LABEL _("Minutes") + // #define _LABEL _("Hours") + // #define _LABEL _("Days") + // #define _LABEL _("Months") + // #define _LABEL _("Sign level") + // #define _LABEL _("Password input") + // #define _LABEL _("Password:") + // #define _LABEL _("Repeat password:") + // #define _LABEL _("Entryption:") + // #define _LABEL _("Do not encrypt password") + // #define _LABEL _("Password hash:") #endif \ No newline at end of file diff --git a/ubl-settings-update.pot b/ubl-settings-update.pot index 453e670..ab698f3 100644 --- a/ubl-settings-update.pot +++ b/ubl-settings-update.pot @@ -50,10 +50,18 @@ msgid "No repositories were chosen to share" msgstr "" #: source/ubl-strings.h:13 +msgid "Add repository for publication" +msgstr "" + +#: source/ubl-strings.h:14 +msgid "Edit repository for publication" +msgstr "" + +#: source/ubl-strings.h:16 msgid "passwords do not match" msgstr "" -#: source/ubl-strings.h:15 +#: source/ubl-strings.h:18 msgid "" "file://\t\t- Directory URL prefix for repository\n" "ftp://\t\t- FTP URL prefix for repository\n" @@ -62,415 +70,459 @@ msgid "" "Configuration - configuration path" msgstr "" -#: source/ubl-strings.h:20 +#: source/ubl-strings.h:23 +msgid "" +"url - web-link for repository. It is allowed to write multiple, separating " +"with comma (,)\n" +"http_proxy - proxy-server for repository, replaces 'http_proxy'. Single " +"parameter per repository\n" +"mirrorlist - mirrors file, make sure server URL is NOT included in this " +"file! Single parameter per repository" +msgstr "" + +#: source/ubl-strings.h:26 msgid "" "The full URL of where to find the database, packages, and signatures (if " "available) for this repository. Multiple can be specified, separated by " "commas (,)" msgstr "" -#: source/ubl-strings.h:21 source/ubl-strings.h:46 +#: source/ubl-strings.h:27 source/ubl-strings.h:52 msgid "Update" msgstr "" -#: source/ubl-strings.h:22 +#: source/ubl-strings.h:28 msgid "Repositories" msgstr "" -#: source/ubl-strings.h:23 +#: source/ubl-strings.h:29 msgid "Publication" msgstr "" -#: source/ubl-strings.h:24 +#: source/ubl-strings.h:30 msgid "WEB-publication" msgstr "" -#: source/ubl-strings.h:25 +#: source/ubl-strings.h:31 msgid "Mirror publication" msgstr "" -#: source/ubl-strings.h:26 +#: source/ubl-strings.h:32 msgid "Date of last automatic update: " msgstr "" -#: source/ubl-strings.h:27 +#: source/ubl-strings.h:33 msgid "Automatic update" msgstr "" -#: source/ubl-strings.h:28 +#: source/ubl-strings.h:34 msgid "First update all modules and then the system" msgstr "" -#: source/ubl-strings.h:29 +#: source/ubl-strings.h:35 msgid "Update only modules" msgstr "" -#: source/ubl-strings.h:30 +#: source/ubl-strings.h:36 msgid "Update everything in the order of the specified repositories" msgstr "" -#: source/ubl-strings.h:31 +#: source/ubl-strings.h:37 msgid "Update mode:" msgstr "" -#: source/ubl-strings.h:32 +#: source/ubl-strings.h:38 msgid "Update interval:" msgstr "" -#: source/ubl-strings.h:33 +#: source/ubl-strings.h:39 msgid "Boot" msgstr "" -#: source/ubl-strings.h:34 source/ubl-strings.h:117 +#: source/ubl-strings.h:40 source/ubl-strings.h:122 msgid "Minutes" msgstr "" -#: source/ubl-strings.h:35 source/ubl-strings.h:118 +#: source/ubl-strings.h:41 source/ubl-strings.h:123 msgid "Hours" msgstr "" -#: source/ubl-strings.h:36 source/ubl-strings.h:119 +#: source/ubl-strings.h:42 source/ubl-strings.h:124 msgid "Days" msgstr "" -#: source/ubl-strings.h:37 source/ubl-strings.h:120 +#: source/ubl-strings.h:43 source/ubl-strings.h:125 msgid "Months" msgstr "" -#: source/ubl-strings.h:38 +#: source/ubl-strings.h:44 msgid "Repositories from which the update will occur" msgstr "" -#: source/ubl-strings.h:39 source/ubl-strings.h:61 +#: source/ubl-strings.h:45 source/ubl-strings.h:67 msgid "Repositories list:" msgstr "" -#: source/ubl-strings.h:40 +#: source/ubl-strings.h:46 msgid "Default" msgstr "" -#: source/ubl-strings.h:41 source/ubl-strings.h:63 +#: source/ubl-strings.h:47 source/ubl-strings.h:69 msgid "Choose" msgstr "" -#: source/ubl-strings.h:42 +#: source/ubl-strings.h:48 msgid "Chosen" msgstr "" -#: source/ubl-strings.h:43 +#: source/ubl-strings.h:49 msgid "Repository" msgstr "" -#: source/ubl-strings.h:44 +#: source/ubl-strings.h:50 msgid "Manage repository list" msgstr "" -#: source/ubl-strings.h:45 +#: source/ubl-strings.h:51 msgid "Disable system repositories" msgstr "" -#: source/ubl-strings.h:47 +#: source/ubl-strings.h:53 msgid "Move up" msgstr "" -#: source/ubl-strings.h:48 +#: source/ubl-strings.h:54 msgid "Move down" msgstr "" -#: source/ubl-strings.h:49 +#: source/ubl-strings.h:55 msgid "Add" msgstr "" -#: source/ubl-strings.h:50 +#: source/ubl-strings.h:56 msgid "Edit" msgstr "" -#: source/ubl-strings.h:51 +#: source/ubl-strings.h:57 msgid "Remove" msgstr "" -#: source/ubl-strings.h:52 +#: source/ubl-strings.h:58 msgid "Enabled" msgstr "" -#: source/ubl-strings.h:53 +#: source/ubl-strings.h:59 msgid "Source" msgstr "" -#: source/ubl-strings.h:54 +#: source/ubl-strings.h:60 msgid "Signature level" msgstr "" -#: source/ubl-strings.h:55 +#: source/ubl-strings.h:61 msgid "Usage level" msgstr "" -#: source/ubl-strings.h:56 +#: source/ubl-strings.h:62 msgid "Repository connection configuration" msgstr "" -#: source/ubl-strings.h:57 +#: source/ubl-strings.h:63 msgid "" "Setting up a connection to a distributed repository network and publishing " "your repositories" msgstr "" -#: source/ubl-strings.h:58 +#: source/ubl-strings.h:64 msgid "Connect and publish" msgstr "" -#: source/ubl-strings.h:59 +#: source/ubl-strings.h:65 msgid "Recieve DB packages from shared network" msgstr "" -#: source/ubl-strings.h:60 +#: source/ubl-strings.h:66 msgid "Repositories for publishing" msgstr "" -#: source/ubl-strings.h:62 +#: source/ubl-strings.h:68 msgid "All repositories" msgstr "" -#: source/ubl-strings.h:64 +#: source/ubl-strings.h:70 msgid "Accept" msgstr "" -#: source/ubl-strings.h:65 +#: source/ubl-strings.h:71 msgid "Repository name" msgstr "" -#: source/ubl-strings.h:66 +#: source/ubl-strings.h:72 msgid "" "Setting up publication of storage and/or repositories as a local WEB resource" msgstr "" -#: source/ubl-strings.h:67 source/ubl-strings.h:109 +#: source/ubl-strings.h:73 source/ubl-strings.h:114 msgid "Authorization parameters" msgstr "" -#: source/ubl-strings.h:68 +#: source/ubl-strings.h:74 msgid "Storage" msgstr "" -#: source/ubl-strings.h:69 +#: source/ubl-strings.h:75 msgid "Chosen repositories" msgstr "" -#: source/ubl-strings.h:70 +#: source/ubl-strings.h:76 msgid "Reviewer" msgstr "" -#: source/ubl-strings.h:71 +#: source/ubl-strings.h:77 msgid "Port" msgstr "" -#: source/ubl-strings.h:72 +#: source/ubl-strings.h:78 msgid "Name" msgstr "" -#: source/ubl-strings.h:73 +#: source/ubl-strings.h:79 msgid "Password/Hash type" msgstr "" -#: source/ubl-strings.h:74 +#: source/ubl-strings.h:80 msgid "Password/Password hash" msgstr "" -#: source/ubl-strings.h:75 +#: source/ubl-strings.h:81 msgid "" "Setting up publication of a lazy mirror of connected repositories as a local " "WEB resource" msgstr "" -#: source/ubl-strings.h:76 +#: source/ubl-strings.h:82 msgid "Publish lazy mirror" msgstr "" -#: source/ubl-strings.h:77 +#: source/ubl-strings.h:83 msgid "Type" msgstr "" -#: source/ubl-strings.h:78 +#: source/ubl-strings.h:84 msgid "Resource URL" msgstr "" -#: source/ubl-strings.h:79 +#: source/ubl-strings.h:85 msgid "Configure" msgstr "" -#: source/ubl-strings.h:80 +#: source/ubl-strings.h:86 msgid "Mirror publish configuration" msgstr "" -#: source/ubl-strings.h:81 +#: source/ubl-strings.h:87 msgid "Service port:" msgstr "" -#: source/ubl-strings.h:82 +#: source/ubl-strings.h:88 msgid "Cache directory:" msgstr "" -#: source/ubl-strings.h:83 +#: source/ubl-strings.h:89 msgid "Duration of inactivity (in seconds):" msgstr "" -#: source/ubl-strings.h:84 +#: source/ubl-strings.h:90 msgid "Timeout (in seconds) for loading internel cache:" msgstr "" -#: source/ubl-strings.h:85 +#: source/ubl-strings.h:91 msgid "Work through proxy:" msgstr "" -#: source/ubl-strings.h:86 +#: source/ubl-strings.h:92 msgid "User agent:" msgstr "" -#: source/ubl-strings.h:87 +#: source/ubl-strings.h:93 msgid "Standard expression for cron:" msgstr "" -#: source/ubl-strings.h:88 +#: source/ubl-strings.h:94 msgid "" "The number of consecutie days that systems on the network have not been " "updated:" msgstr "" -#: source/ubl-strings.h:89 +#: source/ubl-strings.h:95 msgid "The number of consecutive days wthout an update requested:" msgstr "" -#: source/ubl-strings.h:90 +#: source/ubl-strings.h:96 msgid "Add mirror" msgstr "" -#: source/ubl-strings.h:91 +#: source/ubl-strings.h:97 msgid "Repository name:" msgstr "" -#: source/ubl-strings.h:92 +#: source/ubl-strings.h:98 msgid "Repository type:" msgstr "" -#: source/ubl-strings.h:93 +#: source/ubl-strings.h:99 msgid "WEB link" msgstr "" -#: source/ubl-strings.h:94 +#: source/ubl-strings.h:100 msgid "Proxy server" msgstr "" -#: source/ubl-strings.h:95 +#: source/ubl-strings.h:101 msgid "Mirrors file" msgstr "" -#: source/ubl-strings.h:96 +#: source/ubl-strings.h:102 msgid "Source:" msgstr "" -#: source/ubl-strings.h:97 +#: source/ubl-strings.h:103 msgid "Configuration" msgstr "" -#: source/ubl-strings.h:98 +#: source/ubl-strings.h:104 msgid "Sign level:" msgstr "" -#: source/ubl-strings.h:99 +#: source/ubl-strings.h:105 msgid "Enable repository update" msgstr "" -#: source/ubl-strings.h:100 +#: source/ubl-strings.h:106 msgid "Enable repository search" msgstr "" -#: source/ubl-strings.h:101 +#: source/ubl-strings.h:107 msgid "" "Enable installation of packages from this repository during --sync operation" msgstr "" -#: source/ubl-strings.h:102 +#: source/ubl-strings.h:108 msgid "" "Allow this repository to be a valid source of packages when running --" "sysupgrade" msgstr "" -#: source/ubl-strings.h:103 -msgid "Add repository for publication" -msgstr "" - -#: source/ubl-strings.h:104 +#: source/ubl-strings.h:109 msgid "Enable publishing of local repository as WEB resource" msgstr "" -#: source/ubl-strings.h:105 +#: source/ubl-strings.h:110 msgid "Path to publication directory:" msgstr "" -#: source/ubl-strings.h:106 +#: source/ubl-strings.h:111 msgid "Port:" msgstr "" -#: source/ubl-strings.h:107 +#: source/ubl-strings.h:112 msgid "Publishing parameters" msgstr "" -#: source/ubl-strings.h:108 +#: source/ubl-strings.h:113 msgid "Enable WEB file browser" msgstr "" -#: source/ubl-strings.h:110 +#: source/ubl-strings.h:115 msgid "Set" msgstr "" -#: source/ubl-strings.h:111 +#: source/ubl-strings.h:116 msgid "Username:" msgstr "" -#: source/ubl-strings.h:112 +#: source/ubl-strings.h:117 msgid "User password:" msgstr "" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:118 msgid "Not encrypted" msgstr "" -#: source/ubl-strings.h:114 +#: source/ubl-strings.h:119 msgid "Encrypted with SHA256" msgstr "" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:120 msgid "Encrypted with SHA512" msgstr "" -#: source/ubl-strings.h:116 +#: source/ubl-strings.h:121 msgid "System" msgstr "" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:126 msgid "Sign level" msgstr "" -#: source/ubl-strings.h:122 +#: source/ubl-strings.h:127 msgid "Password input" msgstr "" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:128 msgid "Password:" msgstr "" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:129 msgid "Repeat password:" msgstr "" -#: source/ubl-strings.h:125 +#: source/ubl-strings.h:130 msgid "Entryption:" msgstr "" -#: source/ubl-strings.h:126 +#: source/ubl-strings.h:131 msgid "Do not encrypt password" msgstr "" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:132 msgid "Password hash:" msgstr "" + + +msgid "Check system updates at system startup" +msgstr "" + +msgid "days" +msgstr "" + +msgid "Cancel" +msgstr "" + +msgid "Signature verification will not be performed" +msgstr "" + +msgid "For packages only" +msgstr "" + +msgid "For database only" +msgstr "" + +msgid "" +"Signatures will be checked if present, but unsigned databases and " +"packages will also be accepted" +msgstr "" + +msgid "Signatures will be required for all packages and databases" +msgstr "" + +msgid "" +"If the signature is verified for packages and the database, it must be in " +"the keyring and be fully trusted" +msgstr "" + +msgid "If the signature is verified only for packets" +msgstr "" + +msgid "If the signature is verified only for the database" +msgstr "" diff --git a/ubl-settings-update_ru.po b/ubl-settings-update_ru.po index 16a9a2b..f148dfb 100644 --- a/ubl-settings-update_ru.po +++ b/ubl-settings-update_ru.po @@ -31,7 +31,7 @@ msgstr "Ничего не выбрано" #: source/ubl-strings.h:7 msgid "Empty important field!" -msgstr "" +msgstr "Поле не заполнено!" #: source/ubl-strings.h:8 msgid "Add repository" @@ -50,10 +50,19 @@ msgid "No repositories were chosen to share" msgstr "Репозитории для публикации не были выбраны" #: source/ubl-strings.h:13 +msgid "Add repository for publication" +msgstr "Добавление репозиториев на публикацию" + +#: source/ubl-strings.h:14 +#, fuzzy +msgid "Edit repository for publication" +msgstr "Редактирование репозитория для публикации" + +#: source/ubl-strings.h:16 msgid "passwords do not match" -msgstr "" +msgstr "Пароли не совпадают" -#: source/ubl-strings.h:15 +#: source/ubl-strings.h:18 msgid "" "file://\t\t- Directory URL prefix for repository\n" "ftp://\t\t- FTP URL prefix for repository\n" @@ -67,156 +76,170 @@ msgstr "" "https://\t\t- URL префикс для репозитория HTTPS\n" "Конфигурация - путь до конфигурации" -#: source/ubl-strings.h:20 +#: source/ubl-strings.h:23 +msgid "" +"url - web-link for repository. It is allowed to write multiple, separating " +"with comma (,)\n" +"http_proxy - proxy-server for repository, replaces 'http_proxy'. Single " +"parameter per repository\n" +"mirrorlist - mirrors file, make sure server URL is NOT included in this " +"file! Single parameter per repository" +msgstr "url - web-ссылка на репозиторий. Допускается нескольк через запятую (,)\n" +"http_proxy - прокси-сервер для репозитория, заменяет 'http_proxy'. Допускается только один параметр на репозиторий\n" +"mirrorlist - файл зерка, убедитесь что URL текущего сервера НЕ включен в этот файл! Допускается только один параметр на репозиторий" + +#: source/ubl-strings.h:26 msgid "" "The full URL of where to find the database, packages, and signatures (if " "available) for this repository. Multiple can be specified, separated by " "commas (,)" -msgstr "Полный адрес места, где можно найти базу данных, пакеты и подписа (если доступны) для этого репозитория. Возможно указать несколько через запятую (,)" +msgstr "" +"Полный адрес места, где можно найти базу данных, пакеты и подписа (если " +"доступны) для этого репозитория. Возможно указать несколько через запятую (,)" -#: source/ubl-strings.h:21 source/ubl-strings.h:46 +#: source/ubl-strings.h:27 source/ubl-strings.h:52 msgid "Update" msgstr "Обновить" -#: source/ubl-strings.h:22 +#: source/ubl-strings.h:28 msgid "Repositories" msgstr "Репозитории" -#: source/ubl-strings.h:23 +#: source/ubl-strings.h:29 msgid "Publication" msgstr "Публикация" -#: source/ubl-strings.h:24 +#: source/ubl-strings.h:30 msgid "WEB-publication" msgstr "WEB-публикация" -#: source/ubl-strings.h:25 +#: source/ubl-strings.h:31 msgid "Mirror publication" msgstr "Публикация зеркала" -#: source/ubl-strings.h:26 +#: source/ubl-strings.h:32 #, fuzzy msgid "Date of last automatic update: " msgstr "Дата последнего автообновления:" -#: source/ubl-strings.h:27 +#: source/ubl-strings.h:33 msgid "Automatic update" msgstr "Автоматическое обновление" -#: source/ubl-strings.h:28 +#: source/ubl-strings.h:34 msgid "First update all modules and then the system" msgstr "Вначале обновлять все модули и после систему" -#: source/ubl-strings.h:29 +#: source/ubl-strings.h:35 msgid "Update only modules" msgstr "Обновлять только модули" -#: source/ubl-strings.h:30 +#: source/ubl-strings.h:36 msgid "Update everything in the order of the specified repositories" msgstr "Обновлять всё в порядке указанных репозиториев" -#: source/ubl-strings.h:31 +#: source/ubl-strings.h:37 msgid "Update mode:" msgstr "Режим обновления:" -#: source/ubl-strings.h:32 +#: source/ubl-strings.h:38 msgid "Update interval:" msgstr "Интервал обновлений" -#: source/ubl-strings.h:33 +#: source/ubl-strings.h:39 msgid "Boot" msgstr "Запуск" -#: source/ubl-strings.h:34 source/ubl-strings.h:117 +#: source/ubl-strings.h:40 source/ubl-strings.h:122 msgid "Minutes" msgstr "минут" -#: source/ubl-strings.h:35 source/ubl-strings.h:118 +#: source/ubl-strings.h:41 source/ubl-strings.h:123 msgid "Hours" msgstr "часов" -#: source/ubl-strings.h:36 source/ubl-strings.h:119 +#: source/ubl-strings.h:42 source/ubl-strings.h:124 msgid "Days" msgstr "дней" -#: source/ubl-strings.h:37 source/ubl-strings.h:120 +#: source/ubl-strings.h:43 source/ubl-strings.h:125 msgid "Months" msgstr "месяцев" -#: source/ubl-strings.h:38 +#: source/ubl-strings.h:44 msgid "Repositories from which the update will occur" msgstr "Репозитории с которых будет происходить обновление" -#: source/ubl-strings.h:39 source/ubl-strings.h:61 +#: source/ubl-strings.h:45 source/ubl-strings.h:67 #, fuzzy msgid "Repositories list:" msgstr "Список репозиториев" -#: source/ubl-strings.h:40 +#: source/ubl-strings.h:46 msgid "Default" msgstr "По умолчанию" -#: source/ubl-strings.h:41 source/ubl-strings.h:63 +#: source/ubl-strings.h:47 source/ubl-strings.h:69 msgid "Choose" msgstr "Выбрать" -#: source/ubl-strings.h:42 +#: source/ubl-strings.h:48 msgid "Chosen" msgstr "Выбран" -#: source/ubl-strings.h:43 +#: source/ubl-strings.h:49 msgid "Repository" msgstr "Репозиторий" -#: source/ubl-strings.h:44 +#: source/ubl-strings.h:50 msgid "Manage repository list" msgstr "Управление списком репозиториев" -#: source/ubl-strings.h:45 +#: source/ubl-strings.h:51 msgid "Disable system repositories" msgstr "Отключить системные репозитории" -#: source/ubl-strings.h:47 +#: source/ubl-strings.h:53 msgid "Move up" msgstr "Переместить выше" -#: source/ubl-strings.h:48 +#: source/ubl-strings.h:54 msgid "Move down" msgstr "Переместить ниже" -#: source/ubl-strings.h:49 +#: source/ubl-strings.h:55 msgid "Add" msgstr "Добавить" -#: source/ubl-strings.h:50 +#: source/ubl-strings.h:56 msgid "Edit" msgstr "Изменить" -#: source/ubl-strings.h:51 +#: source/ubl-strings.h:57 msgid "Remove" msgstr "Удалить" -#: source/ubl-strings.h:52 +#: source/ubl-strings.h:58 msgid "Enabled" msgstr "Включен" -#: source/ubl-strings.h:53 +#: source/ubl-strings.h:59 msgid "Source" msgstr "Источник" -#: source/ubl-strings.h:54 +#: source/ubl-strings.h:60 msgid "Signature level" msgstr "Уровень подписи" -#: source/ubl-strings.h:55 +#: source/ubl-strings.h:61 msgid "Usage level" msgstr "Уровень использования" -#: source/ubl-strings.h:56 +#: source/ubl-strings.h:62 msgid "Repository connection configuration" msgstr "Настройки подключения репозитория" -#: source/ubl-strings.h:57 +#: source/ubl-strings.h:63 msgid "" "Setting up a connection to a distributed repository network and publishing " "your repositories" @@ -224,31 +247,31 @@ msgstr "" "Настройки подключения к распределённой сети репозиториев и публикация своих " "репозиториев" -#: source/ubl-strings.h:58 +#: source/ubl-strings.h:64 msgid "Connect and publish" msgstr "Подключиться и опубликовать" -#: source/ubl-strings.h:59 +#: source/ubl-strings.h:65 msgid "Recieve DB packages from shared network" msgstr "Получать БД пакетов из распределённой сети" -#: source/ubl-strings.h:60 +#: source/ubl-strings.h:66 msgid "Repositories for publishing" msgstr "Репозитории для публикации" -#: source/ubl-strings.h:62 +#: source/ubl-strings.h:68 msgid "All repositories" msgstr "Все репозитории" -#: source/ubl-strings.h:64 +#: source/ubl-strings.h:70 msgid "Accept" msgstr "Принять" -#: source/ubl-strings.h:65 +#: source/ubl-strings.h:71 msgid "Repository name" msgstr "Имя репозитория" -#: source/ubl-strings.h:66 +#: source/ubl-strings.h:72 #, fuzzy msgid "" "Setting up publication of storage and/or repositories as a local WEB resource" @@ -256,39 +279,39 @@ msgstr "" "Настройка публикации хранилища и/или репозиториев в виде локального WEB " "ресурса" -#: source/ubl-strings.h:67 source/ubl-strings.h:109 +#: source/ubl-strings.h:73 source/ubl-strings.h:114 msgid "Authorization parameters" msgstr "Параметры авторизации" -#: source/ubl-strings.h:68 +#: source/ubl-strings.h:74 msgid "Storage" msgstr "Хранилище" -#: source/ubl-strings.h:69 +#: source/ubl-strings.h:75 msgid "Chosen repositories" msgstr "Выбранные репозитории" -#: source/ubl-strings.h:70 +#: source/ubl-strings.h:76 msgid "Reviewer" msgstr "Обозреватель" -#: source/ubl-strings.h:71 +#: source/ubl-strings.h:77 msgid "Port" msgstr "Порт" -#: source/ubl-strings.h:72 +#: source/ubl-strings.h:78 msgid "Name" msgstr "Имя пользователя" -#: source/ubl-strings.h:73 +#: source/ubl-strings.h:79 msgid "Password/Hash type" msgstr "Пароль/Тип хэша" -#: source/ubl-strings.h:74 +#: source/ubl-strings.h:80 msgid "Password/Password hash" msgstr "Пароль/Хэш пароля" -#: source/ubl-strings.h:75 +#: source/ubl-strings.h:81 msgid "" "Setting up publication of a lazy mirror of connected repositories as a local " "WEB resource" @@ -296,117 +319,117 @@ msgstr "" "Настройка публикации ленивого зеркала подключенных репозиториев в виде " "локального WEB ресурса" -#: source/ubl-strings.h:76 +#: source/ubl-strings.h:82 msgid "Publish lazy mirror" msgstr "Опубликовать ленивое зеркало" -#: source/ubl-strings.h:77 +#: source/ubl-strings.h:83 msgid "Type" msgstr "Тип" -#: source/ubl-strings.h:78 +#: source/ubl-strings.h:84 msgid "Resource URL" msgstr "Ресурс URL" -#: source/ubl-strings.h:79 +#: source/ubl-strings.h:85 msgid "Configure" msgstr "Настроить" -#: source/ubl-strings.h:80 +#: source/ubl-strings.h:86 msgid "Mirror publish configuration" msgstr "Параметры публикации зеркала" -#: source/ubl-strings.h:81 +#: source/ubl-strings.h:87 msgid "Service port:" msgstr "Порт сервиса:" -#: source/ubl-strings.h:82 +#: source/ubl-strings.h:88 msgid "Cache directory:" msgstr "Каталог кеша:" -#: source/ubl-strings.h:83 +#: source/ubl-strings.h:89 msgid "Duration of inactivity (in seconds):" msgstr "Продолжительность бездействия (в секундах):" -#: source/ubl-strings.h:84 +#: source/ubl-strings.h:90 msgid "Timeout (in seconds) for loading internel cache:" msgstr "Таймаут (в секундах) для загрузки интернет-кэша:" -#: source/ubl-strings.h:85 +#: source/ubl-strings.h:91 msgid "Work through proxy:" msgstr "Работать через прокси:" -#: source/ubl-strings.h:86 +#: source/ubl-strings.h:92 msgid "User agent:" msgstr "Пользовательский агент:" -#: source/ubl-strings.h:87 +#: source/ubl-strings.h:93 msgid "Standard expression for cron:" msgstr "Стандартное выражение cron:" -#: source/ubl-strings.h:88 +#: source/ubl-strings.h:94 msgid "" "The number of consecutie days that systems on the network have not been " "updated:" msgstr "" "Количество дней подряд, в течение которых не обновляются системы в сети:" -#: source/ubl-strings.h:89 +#: source/ubl-strings.h:95 msgid "The number of consecutive days wthout an update requested:" msgstr "" "Количество дней подряд, в течение которых не было запрошено обновление:" -#: source/ubl-strings.h:90 +#: source/ubl-strings.h:96 msgid "Add mirror" msgstr "Добавить зеркало" -#: source/ubl-strings.h:91 +#: source/ubl-strings.h:97 msgid "Repository name:" msgstr "Имя репозитория:" -#: source/ubl-strings.h:92 +#: source/ubl-strings.h:98 msgid "Repository type:" msgstr "Тип репозитория:" -#: source/ubl-strings.h:93 +#: source/ubl-strings.h:99 msgid "WEB link" msgstr "Вэб ссылка" -#: source/ubl-strings.h:94 +#: source/ubl-strings.h:100 msgid "Proxy server" msgstr "Прокси-сервер" -#: source/ubl-strings.h:95 +#: source/ubl-strings.h:101 msgid "Mirrors file" msgstr "Файл зеркал" -#: source/ubl-strings.h:96 +#: source/ubl-strings.h:102 msgid "Source:" msgstr "Источник:" -#: source/ubl-strings.h:97 +#: source/ubl-strings.h:103 msgid "Configuration" msgstr "Конфигурация" -#: source/ubl-strings.h:98 +#: source/ubl-strings.h:104 msgid "Sign level:" msgstr "Уровень подписи:" -#: source/ubl-strings.h:99 +#: source/ubl-strings.h:105 msgid "Enable repository update" msgstr "Включать обновления для этого репозитория" -#: source/ubl-strings.h:100 +#: source/ubl-strings.h:106 msgid "Enable repository search" msgstr "Включать поиск этого репозитория" -#: source/ubl-strings.h:101 +#: source/ubl-strings.h:107 msgid "" "Enable installation of packages from this repository during --sync operation" msgstr "" "Включать установку пакетов из этого репозитория во время операции --sync" -#: source/ubl-strings.h:102 +#: source/ubl-strings.h:108 msgid "" "Allow this repository to be a valid source of packages when running --" "sysupgrade" @@ -414,83 +437,79 @@ msgstr "" "Позволить этому репозиторию быть действительным источником пакетов при " "выполнении --sysupgrade" -#: source/ubl-strings.h:103 -msgid "Add repository for publication" -msgstr "Добавление репозиториев на публикацию" - -#: source/ubl-strings.h:104 +#: source/ubl-strings.h:109 msgid "Enable publishing of local repository as WEB resource" msgstr "Включить публикацию локального репозитория в виде WEB ресурса" -#: source/ubl-strings.h:105 +#: source/ubl-strings.h:110 msgid "Path to publication directory:" msgstr "Хранилище:" -#: source/ubl-strings.h:106 +#: source/ubl-strings.h:111 msgid "Port:" msgstr "Порт:" -#: source/ubl-strings.h:107 +#: source/ubl-strings.h:112 msgid "Publishing parameters" msgstr "Параметры публикации" -#: source/ubl-strings.h:108 +#: source/ubl-strings.h:113 msgid "Enable WEB file browser" msgstr "Включить WEB обозреватель файлов" -#: source/ubl-strings.h:110 +#: source/ubl-strings.h:115 msgid "Set" msgstr "Задать" -#: source/ubl-strings.h:111 +#: source/ubl-strings.h:116 msgid "Username:" msgstr "Имя пользователя:" -#: source/ubl-strings.h:112 +#: source/ubl-strings.h:117 msgid "User password:" msgstr "Пароль:" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:118 msgid "Not encrypted" msgstr "Пароль не требуется" -#: source/ubl-strings.h:114 +#: source/ubl-strings.h:119 msgid "Encrypted with SHA256" -msgstr "" +msgstr "Шфировать с SHA256" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:120 msgid "Encrypted with SHA512" -msgstr "" +msgstr "Шифровать с SHA512" -#: source/ubl-strings.h:116 +#: source/ubl-strings.h:121 msgid "System" msgstr "Система" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:126 msgid "Sign level" msgstr "Уровень подписи:" -#: source/ubl-strings.h:122 +#: source/ubl-strings.h:127 msgid "Password input" msgstr "Ввод пароля" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:128 msgid "Password:" msgstr "Пароль:" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:129 msgid "Repeat password:" msgstr "Подтвердите ввод пароля:" -#: source/ubl-strings.h:125 +#: source/ubl-strings.h:130 msgid "Entryption:" msgstr "Алгоритм шифрования пароля:" -#: source/ubl-strings.h:126 +#: source/ubl-strings.h:131 msgid "Do not encrypt password" msgstr "Не шифровать пароль" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:132 msgid "Password hash:" msgstr "Пароль/Хэш пароля"