Open
Conversation
Owner
|
Thank you for your PR, but you did it on the wrong repo ;) The correct repo is https://github.com/RequestPolicyContinued/requestpolicy. There are some differences between the base commit of your PRs and the actual current HEAD. Please create a new PR on the correct repo. Please also take care of the added strings. Thanks. FYI: Differences on diff --git a/src/locale/es-MX/requestpolicy.properties b/src/locale/es-MX/requestpolicy.properties
index bbb2ff7..231e33c 100644
--- a/src/locale/es-MX/requestpolicy.properties
+++ b/src/locale/es-MX/requestpolicy.properties
@@ -47,6 +47,7 @@ allowAddingNonTemporaryRulesInPBM=Al usar navegaci<C3><B3>n privada permitir poner sit
advancedPreferences=Advanced Preferences
linkPrefetching=Descarga anticipada de enlaces
dnsPrefetching=Descarga anticipada de DNS
+speculativePreConnections=Speculative pre-connections
enabled=Activado
disableOnStartup=Deshabilitar al inicio
restoreDefaultOnUninstall=Restaurar predeterminados cuando RequestPolicy es des-instalado
@@ -82,7 +83,7 @@ allowRequestsToTheSameDomain=Allow requests to the same domain (www.example.com
differentSubscriptionsAreAvailable=Changing your default rule means different subscriptions are available.
manageSubscriptions=Manage subscriptions.
subscriptionPolicies=Subscription Policies
-subscriptionPoliciesDefinition=Subscription policies are preset rules maintained by the community. These rules are updated automatically and can fulfil different needs, such as blocking known web browsing tracking sites, or allowing requests to allow certain sites to display/work properly.
+subscriptionPoliciesDefinition=Subscription policies are preset rules maintained by the community. These rules are updated automatically and can fulfil different needs, such as blocking known web browsing tracking sites, or allowing requests to allow certain sites to display/work properly. Subscription rules act as a supplement to user defined rules, that is, if no user defined rule applies, RequestPolicy will check if a subscription rule does.
learnMoreAboutSubscriptions=Learn more about subscriptions.
privacy=Privacy
usability=Usability
@@ -121,3 +122,5 @@ rp.menu.preferences=Preferencias
rp.menu.managePolicies=Manage Policies
rp.requestLog.title=Registro de peticiones
rp.requestLog.clear=Limpiar
+alwaysAsk=Always ask for confirmation
+siteInfo.confirm=You're about to ask for information about the "%1$S" site\nby submitting a query to %2$S.\nDo you want to continue?Differences on diff --git a/src/locale/en-US/requestpolicy.properties b/src/locale/en-US/requestpolicy.properties
index abb75fb..adf7d98 100644
--- a/src/locale/en-US/requestpolicy.properties
+++ b/src/locale/en-US/requestpolicy.properties
@@ -47,6 +47,7 @@ allowAddingNonTemporaryRulesInPBM=Allow adding non-temporary rules when using Pr
advancedPreferences=Advanced Preferences
linkPrefetching=Link Prefetching
dnsPrefetching=DNS Prefetching
+speculativePreConnections=Speculative pre-connections
enabled=Enabled
disableOnStartup=Disable on startup
restoreDefaultOnUninstall=Restore default when RequestPolicy is uninstalled
@@ -82,7 +83,7 @@ allowRequestsToTheSameDomain=Allow requests to the same domain (www.example.com
differentSubscriptionsAreAvailable=Changing your default rule means different subscriptions are available.
manageSubscriptions=Manage subscriptions.
subscriptionPolicies=Subscription Policies
-subscriptionPoliciesDefinition=Subscription policies are preset rules maintained by the community. These rules are updated automatically and can fulfil different needs, such as blocking known web browsing tracking sites, or allowing requests to allow certain sites to display/work properly.
+subscriptionPoliciesDefinition=Subscription policies are preset rules maintained by the community. These rules are updated automatically and can fulfil different needs, such as blocking known web browsing tracking sites, or allowing requests to allow certain sites to display/work properly. Subscription rules act as a supplement to user defined rules, that is, if no user defined rule applies, RequestPolicy will check if a subscription rule does.
learnMoreAboutSubscriptions=Learn more about subscriptions.
privacy=Privacy
usability=Usability
@@ -121,3 +122,5 @@ rp.menu.preferences=Preferences
rp.menu.managePolicies=Manage Policies
rp.requestLog.title=Request Log
rp.requestLog.clear=Clear
+alwaysAsk=Always ask for confirmation
+siteInfo.confirm=You're about to ask for information about the "%1$S" site\nby submitting a query to %2$S.\nDo you want to continue? |
Author
|
Oh, thank you!! :) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.