From a076b78250bf23fa0396d85429bf25f44cea5bd5 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 12 May 2021 15:48:32 +0200 Subject: [PATCH] Implement review suggestions --- intel/filterlists/module.go | 2 +- intel/filterlists/updater.go | 4 ++-- profile/config-update.go | 2 +- updates/config.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/intel/filterlists/module.go b/intel/filterlists/module.go index 0bc0e3f1..e0908326 100644 --- a/intel/filterlists/module.go +++ b/intel/filterlists/module.go @@ -107,6 +107,6 @@ func warnAboutDisabledFilterLists() { module.Warning( filterlistsDisabled, "Filter Lists Are Initializing", - "The Filter Lists are waiting for update system to check for updates in order to retrieve the filter list data. Until the filter lists are fully initialized, the filter lists feature is disabled.", + "Filter lists are being downloaded and set up in the background. Until this initialization is finished, the filter lists are disabled and will not block anything.", ) } diff --git a/intel/filterlists/updater.go b/intel/filterlists/updater.go index 3e8829df..e3553a0b 100644 --- a/intel/filterlists/updater.go +++ b/intel/filterlists/updater.go @@ -30,7 +30,7 @@ func tryListUpdate(ctx context.Context) error { module.Warning( filterlistsUpdateFailed, "Filter Lists Update Failed", - fmt.Sprintf("The filter lists system failed to process an update. Depending on the previous state, the filtering capabilities are now either impaired or not given. Refer to the error for more details: %s", err.Error()), + fmt.Sprintf("The Portmaster failed to process a filter lists update. Filtering capabilities are currently either impaired or not available at all. Error: %s", err.Error()), ) } @@ -123,7 +123,7 @@ func performUpdate(ctx context.Context) error { module.Warning( filterlistsStaleDataSurvived, "Filter Lists May Overblock", - fmt.Sprintf("The filter lists system successfully applied an update, but failed to delete old data. This means that the filtering system performs as usual, but may block more entries than it should. Refer to the error for more details: %s", err.Error()), + fmt.Sprintf("The Portmaster failed to delete outdated filter list data. Filtering capabilities are fully available, but overblocking may occur. Error: %s", err.Error()), ) return fmt.Errorf("failed to cleanup stale cache records: %w", err) } diff --git a/profile/config-update.go b/profile/config-update.go index 5c78aae7..2e6a1af6 100644 --- a/profile/config-update.go +++ b/profile/config-update.go @@ -124,7 +124,7 @@ func updateGlobalConfigProfile(ctx context.Context, task *modules.Task) error { module.Warning( globalConfigProfileErrorID, "Internal Settings Failure", - fmt.Sprintf("The app settings layering system failed to process the global settings. This means that some global settings might not be applied correctly. You can try restarting the Portmaster to resolve this problem. Refer to the error for more details: %s", err), + fmt.Sprintf("Some global settings might not be applied correctly. You can try restarting the Portmaster to resolve this problem. Error: %s", err), ) } diff --git a/updates/config.go b/updates/config.go index 5c1742fb..169584c7 100644 --- a/updates/config.go +++ b/updates/config.go @@ -120,7 +120,7 @@ func updateRegistryConfig(_ context.Context, _ interface{}) error { notifications.NotifyWarn( updatesDisabledNotificationID, "Automatic Updates Disabled", - "The automatic update system is disabled through configuration. Please note that this is potentially dangerous, as this also affects security updates as well as the filter lists and threat intelligence feeds.", + "Automatic updates are disabled through configuration. Please note that this is potentially dangerous, as this also affects security updates as well as the filter lists and threat intelligence feeds.", notifications.Action{ ID: "change", Text: "Change",