diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 92bfd87a1dd..fa490098e78 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ The _Low-level settings_ section is for expert users. [Read more about low-level This section allows you to manage HTTPS filtering settings, filters, and userscripts, and set up a proxy server. -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filters @@ -57,11 +57,19 @@ If you activate too many filters, some websites may work incorrectly. [Read more about filters](https://adguard.com/en/blog/what-are-filters.html) -### Userscripts +### Extensions + +Extensions allow you to add userscripts and userstyles. + +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 5e75a51f1e8..b5525cd735c 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 24b41b032ca..8f7344f7ade 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index da99768471a..0341d942127 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: How to protect AdGuard from being disabled by the system -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 7367e63cef9..784a7c9587c 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ You can access it by navigating to *Statistics* → *Battery usage*. Inside you will find a chart that shows the AdGuard battery resource consumption within the last 24 hours, with an option to get more detailed hour-to-hour data by tapping on the chart. Besides that, there’s also a numeric breakdown of the relevant data and a short technical explanation. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### How much battery resource does AdGuard really consume? First, let us lay down a bit of theory and links with necessary data. diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 6f1876d0079..0563d2a0336 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index d98274a0489..c77491236e7 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index deebee15677..c716cc3ed93 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Manual installation of the security certificate into the Firefox browser -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index c5b7755321a..05d28c3b6ea 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 54b325ec582..52016424603 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 79723d1f221..b9f70d23922 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problems caused by multiple user profiles -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 6b9fddc4500..f95d206303e 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: How to set up outbound proxy -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index b9e9396152a..4ae364e8290 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 96b31c31295..25de8d83319 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index adfd7139869..5d8aa06bad9 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: How to block ads in the YouTube app -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 43c9e9aee82..67126401ab4 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,23 +5,25 @@ sidebar_position: 2 ## Install AdGuard for Linux -To install AdGuard, enter: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` @@ -35,37 +37,97 @@ You can verify the signature to prove it’s an official version of AdGuard by u ::: -## Activate license +## Initial setup -AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don't have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -To log in or create an account, enter: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -To reset your license, enter: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -To view the license info, enter: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Initial setup +4. After activation, you can continue to work with the program: -To get AdGuard up and running, complete the initial setup. This includes installing the AdGuard CA certificate, enabling the necessary filters, and selecting the proxy mode. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -To run the configuration wizard, enter: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). ## Uninstall AdGuard for Linux @@ -73,19 +135,19 @@ To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 85de0186c4f..2487dcaac3b 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Settings and protection management sidebar_position: 3 --- +## Available commands + To get a list of all available AdGuard commands, enter: -``` +```sh adguard-cli --help-all ``` ## Enable and disable protection +### Enable protection + To enable protection, enter: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + To disable protection, enter: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + To view the protection status, enter: -``` +```sh adguard-cli status ``` -## Check for updates +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Check for updates To check for updates, enter: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + To update AdGuard for Linux, enter: -``` +```sh adguard-cli update ``` +### Update script output + To view the update script output, enter: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Use the `config` command to configure AdGuard for Linux. Subcommands: - `show`: Show the current configuration in `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configure an option in `proxy.yaml` - `listen_ports.http_proxy`: HTTP listening port - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `get`: Get the current status of the above options ## Manage filters @@ -64,8 +90,32 @@ Use the `config` command to configure AdGuard for Linux. Subcommands: Use the `filters` command to configure AdGuard for Linux. Subcommands: - `list`: List installed filters + - `--all`: View all filters + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Install a filter. Enter the URL of the filter you want to install + - `enable`: Enable a filter. Enter the name or ID of the filter + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Disable a filter. Enter the name or ID of the filter + - `update`: Update filters + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index 412685edf25..86c048ff7a0 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ This page describes the features and details of AdGuard’s central management o ## 1. Download the MSI {#msi-download} -Download the [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi) +Download the [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Download the [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi) +Download the [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configure the settings for your network {#settings-configuring} diff --git a/i18n/be/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/be/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index cf76ff7fe89..24b6011caf1 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + is converted to + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-ff]: #what-product "AdGuard Browser Extension for Firefox" diff --git a/i18n/be/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/be/docusaurus-plugin-content-docs/current/general/license/legacy.md index 6b1c2a74395..1e68e937061 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: Legacy licenses FAQ sidebar_position: 6 --- -We have written this article to avoid confusion and explain in detail how you can renew/upgrade an outdated (legacy) AdGuard license. +We have written this article to avoid confusion and explain in detail how you can renew/upgrade a legacy AdGuard license. -## About the outdated licenses +## About legacy licenses Initially licenses of the following types were available to activate AdGuard products: @@ -27,54 +27,52 @@ For all types (Standard, Mobile, Premium) there were options for a Yearly and Li In October 2019 AdGuard switched to the new licensing system: from then on, licenses can still be purchased for 1 year or Lifetime, but their types have become **Personal** (for up to 3 devices) or **Family** (for up to 9 devices). -One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal license can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet.** +Another change is that the **new types of license keys can now be used on any device, in any combination**. For example, a Personal license can be used on Android, Mac and iOS, as well as on two Windows computers and an Apple tablet. -## What happened to the outdated licenses? +## What happened to the legacy licenses? -Standard were automatically made universal, which means that they can be activated on any devices. +**Standard licenses** were automatically made **universal**, which means that they can be activated on any device. -Mobile licenses remained unchanged and platform-limited (they can still only be used on phones or tablets). +**Mobile licenses** remained unchanged and platform-limited (they can still only be used on phones or tablets). -Premium licenses also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. +**Premium licenses** also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. For example, this is how the 1+1 key looks like: -![1+1 key](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 key](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *But despite the total number of devices (2) it can be activated on 1 desktop and 1 mobile device.* > All the outdated licenses have a "legacy" badge in the AdGuard account. And they are automatically converted to a new type when you either renew or upgrade them. But there are some nuances. Let's see which licenses can be converted to a new type and how to do it. -## I have an outdated (legacy) key. What renewal/upgrade options are available for me? +## How to renew or upgrade a legacy key -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +You can extend/renew or upgrade a legacy license in your [AdGuard account](https://adguardaccount.com) or on the [Extend or upgrade page](https://adguard.com/renew.html). -![Upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Go to "My licenses" tab and check what actions are available to you for each specific key. Below we will explain with specific examples. +To extend/renew or upgrade a legacy license in your AdGuard account, go to the *Licenses* tab, find the license you need, and select one of the available options. -### Licenses for 1/2/3 devices +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Yearly** licenses for 1, 2, 3 devices can be converted to either Personal or Family: +Or go to the [Extend or upgrade page](https://adguard.com/renew.html), enter your license, and click *Apply*. On the new page, select one of the available options. -![Upgrade or renew](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Choose based on how many devices you need to protect. +### Licenses for 1/2/3 devices -Instead of renewal you can switch to Lifetime: +Mobile Yearly licenses for 3 devices can be converted to Personal licenses or upgraded to Family ones: -![Lifetime](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Upgrade Yearly licenses for 1, 2, 3 devices](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Lifetime** licenses can only be converted to Family (9 devices) due to technical limitations: +> If you have a **Standard license for 3 devices**, it already works as a **Personal** license. If you renew your **Mobile license** for 3 devices, you will be able to use it on a **different set of device**s, not just phones. -![Lifetime upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +You can also upgrade your license to Lifetime: -### Licenses for 4+ devices (up to 9) +![Upgrade to Lifetime](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Yearly** keys of this configuration can only be converted into a Family license: +**Lifetime** licenses can only be upgraded to Family (9 devices) due to technical limitations. -![Yearly license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licenses for 4+ devices (up to 9) -**Lifetime** licenses for 4 or more devices cannot be upgraded due to technical limitation: +**Yearly** licenses for 4 or more devices can be upgraded to Family and Lifetime licenses. -![Lifetime license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +However, if you already have a **Lifetime** license, it cannot be upgraded due to technical limitations. ### Licenses for 9+ devices diff --git a/i18n/be/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/be/docusaurus-plugin-content-docs/current/general/license/what-is.md index a3b22328a24..fd9fa685ce2 100644 --- a/i18n/be/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/be/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ There are also licenses that the user can purchase from other sources or get for - **Distributor licenses** and **gifted licenses** can be both time-limited and non-time limited. Licenses with an expiration date can only be renewed manually - Personal — up to 3 devices - Family — up to 9 devices -- **The AdGuard Pro for iOS license** is purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 92bfd87a1dd..fa490098e78 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ The _Low-level settings_ section is for expert users. [Read more about low-level This section allows you to manage HTTPS filtering settings, filters, and userscripts, and set up a proxy server. -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filters @@ -57,11 +57,19 @@ If you activate too many filters, some websites may work incorrectly. [Read more about filters](https://adguard.com/en/blog/what-are-filters.html) -### Userscripts +### Extensions + +Extensions allow you to add userscripts and userstyles. + +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 5e75a51f1e8..b5525cd735c 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 24b41b032ca..8f7344f7ade 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index da99768471a..0341d942127 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: How to protect AdGuard from being disabled by the system -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 7367e63cef9..784a7c9587c 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ You can access it by navigating to *Statistics* → *Battery usage*. Inside you will find a chart that shows the AdGuard battery resource consumption within the last 24 hours, with an option to get more detailed hour-to-hour data by tapping on the chart. Besides that, there’s also a numeric breakdown of the relevant data and a short technical explanation. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### How much battery resource does AdGuard really consume? First, let us lay down a bit of theory and links with necessary data. diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 6f1876d0079..0563d2a0336 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index d98274a0489..c77491236e7 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index deebee15677..c716cc3ed93 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Manual installation of the security certificate into the Firefox browser -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index c5b7755321a..05d28c3b6ea 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 54b325ec582..52016424603 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 79723d1f221..b9f70d23922 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problems caused by multiple user profiles -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 6b9fddc4500..f95d206303e 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: How to set up outbound proxy -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index b9e9396152a..4ae364e8290 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 96b31c31295..25de8d83319 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index adfd7139869..5d8aa06bad9 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: How to block ads in the YouTube app -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 43c9e9aee82..67126401ab4 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,23 +5,25 @@ sidebar_position: 2 ## Install AdGuard for Linux -To install AdGuard, enter: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` @@ -35,37 +37,97 @@ You can verify the signature to prove it’s an official version of AdGuard by u ::: -## Activate license +## Initial setup -AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don't have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -To log in or create an account, enter: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -To reset your license, enter: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -To view the license info, enter: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Initial setup +4. After activation, you can continue to work with the program: -To get AdGuard up and running, complete the initial setup. This includes installing the AdGuard CA certificate, enabling the necessary filters, and selecting the proxy mode. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -To run the configuration wizard, enter: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). ## Uninstall AdGuard for Linux @@ -73,19 +135,19 @@ To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 4ede8a490a1..2487dcaac3b 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Settings and protection management sidebar_position: 3 --- +## Available commands + To get a list of all available AdGuard commands, enter: -``` +```sh adguard-cli --help-all ``` ## Enable and disable protection +### Enable protection + To enable protection, enter: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + To disable protection, enter: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + To view the protection status, enter: -``` +```sh adguard-cli status ``` -## Check for updates +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Check for updates To check for updates, enter: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + To update AdGuard for Linux, enter: -``` +```sh adguard-cli update ``` +### Update script output + To view the update script output, enter: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Use the `config` command to configure AdGuard for Linux. Subcommands: - `show`: Show the current configuration in `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configure an option in `proxy.yaml` - - `listen_ports.http_proxy`: HTTP listening port - - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `listen_ports.http_proxy`: HTTP listening port + - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `get`: Get the current status of the above options ## Manage filters @@ -64,8 +90,32 @@ Use the `config` command to configure AdGuard for Linux. Subcommands: Use the `filters` command to configure AdGuard for Linux. Subcommands: - `list`: List installed filters - - `--all`: View all filters + + - `--all`: View all filters + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Install a filter. Enter the URL of the filter you want to install + - `enable`: Enable a filter. Enter the name or ID of the filter + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Disable a filter. Enter the name or ID of the filter + - `update`: Update filters + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index 412685edf25..86c048ff7a0 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ This page describes the features and details of AdGuard’s central management o ## 1. Download the MSI {#msi-download} -Download the [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi) +Download the [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Download the [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi) +Download the [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configure the settings for your network {#settings-configuring} diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/bn/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index cf76ff7fe89..24b6011caf1 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + is converted to + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-ff]: #what-product "AdGuard Browser Extension for Firefox" diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/bn/docusaurus-plugin-content-docs/current/general/license/legacy.md index 6b1c2a74395..1e68e937061 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: Legacy licenses FAQ sidebar_position: 6 --- -We have written this article to avoid confusion and explain in detail how you can renew/upgrade an outdated (legacy) AdGuard license. +We have written this article to avoid confusion and explain in detail how you can renew/upgrade a legacy AdGuard license. -## About the outdated licenses +## About legacy licenses Initially licenses of the following types were available to activate AdGuard products: @@ -27,54 +27,52 @@ For all types (Standard, Mobile, Premium) there were options for a Yearly and Li In October 2019 AdGuard switched to the new licensing system: from then on, licenses can still be purchased for 1 year or Lifetime, but their types have become **Personal** (for up to 3 devices) or **Family** (for up to 9 devices). -One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal license can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet.** +Another change is that the **new types of license keys can now be used on any device, in any combination**. For example, a Personal license can be used on Android, Mac and iOS, as well as on two Windows computers and an Apple tablet. -## What happened to the outdated licenses? +## What happened to the legacy licenses? -Standard were automatically made universal, which means that they can be activated on any devices. +**Standard licenses** were automatically made **universal**, which means that they can be activated on any device. -Mobile licenses remained unchanged and platform-limited (they can still only be used on phones or tablets). +**Mobile licenses** remained unchanged and platform-limited (they can still only be used on phones or tablets). -Premium licenses also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. +**Premium licenses** also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. For example, this is how the 1+1 key looks like: -![1+1 key](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 key](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *But despite the total number of devices (2) it can be activated on 1 desktop and 1 mobile device.* > All the outdated licenses have a "legacy" badge in the AdGuard account. And they are automatically converted to a new type when you either renew or upgrade them. But there are some nuances. Let's see which licenses can be converted to a new type and how to do it. -## I have an outdated (legacy) key. What renewal/upgrade options are available for me? +## How to renew or upgrade a legacy key -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +You can extend/renew or upgrade a legacy license in your [AdGuard account](https://adguardaccount.com) or on the [Extend or upgrade page](https://adguard.com/renew.html). -![Upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Go to "My licenses" tab and check what actions are available to you for each specific key. Below we will explain with specific examples. +To extend/renew or upgrade a legacy license in your AdGuard account, go to the *Licenses* tab, find the license you need, and select one of the available options. -### Licenses for 1/2/3 devices +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Yearly** licenses for 1, 2, 3 devices can be converted to either Personal or Family: +Or go to the [Extend or upgrade page](https://adguard.com/renew.html), enter your license, and click *Apply*. On the new page, select one of the available options. -![Upgrade or renew](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Choose based on how many devices you need to protect. +### Licenses for 1/2/3 devices -Instead of renewal you can switch to Lifetime: +Mobile Yearly licenses for 3 devices can be converted to Personal licenses or upgraded to Family ones: -![Lifetime](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Upgrade Yearly licenses for 1, 2, 3 devices](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Lifetime** licenses can only be converted to Family (9 devices) due to technical limitations: +> If you have a **Standard license for 3 devices**, it already works as a **Personal** license. If you renew your **Mobile license** for 3 devices, you will be able to use it on a **different set of device**s, not just phones. -![Lifetime upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +You can also upgrade your license to Lifetime: -### Licenses for 4+ devices (up to 9) +![Upgrade to Lifetime](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Yearly** keys of this configuration can only be converted into a Family license: +**Lifetime** licenses can only be upgraded to Family (9 devices) due to technical limitations. -![Yearly license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licenses for 4+ devices (up to 9) -**Lifetime** licenses for 4 or more devices cannot be upgraded due to technical limitation: +**Yearly** licenses for 4 or more devices can be upgraded to Family and Lifetime licenses. -![Lifetime license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +However, if you already have a **Lifetime** license, it cannot be upgraded due to technical limitations. ### Licenses for 9+ devices diff --git a/i18n/bn/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/bn/docusaurus-plugin-content-docs/current/general/license/what-is.md index a3b22328a24..fd9fa685ce2 100644 --- a/i18n/bn/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/bn/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ There are also licenses that the user can purchase from other sources or get for - **Distributor licenses** and **gifted licenses** can be both time-limited and non-time limited. Licenses with an expiration date can only be renewed manually - Personal — up to 3 devices - Family — up to 9 devices -- **The AdGuard Pro for iOS license** is purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/features/features.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/features/features.md index 6199c649007..9812e5539cc 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/features/features.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/features/features.md @@ -35,9 +35,9 @@ Obecná, pokročilá a nízkoúrovňová nastavení, která umožňují vybrat j ## Průvodce nízkoúrovňových nastavení -Descriptions of the low-level settings available in AdGuard v4.3 for Android and later. +Popisy nízkoúrovňových nastavení dostupných v aplikaci AdGuard v4.3 pro Android a novější. -[Low-level settings guide](/adguard-for-android/features/low-level-settings.md) +[Průvodce nízkoúrovňovým nastavením](/adguard-for-android/features/low-level-settings.md) ## Assistant diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md index 7e29e3fbf20..4e4c9bc93ad 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md @@ -17,7 +17,7 @@ Změna nízkoúrovňových nastavení může způsobit problémy s výkonem AdGu ::: -To access _Low-level settings_, open the AdGuard app and tap the gear icon in the lower-right corner of the screen. Then select _General → Advanced → Low-level settings_. +Chcete-li přejít na _Nízkoúrovňová nastavení_, otevřete aplikaci AdGuard a klepněte na ikonu ozubeného kola v pravém dolním rohu obrazovky. Poté zvolte Obecné → Pokročilé → Nízkoůrovňová nastavení\*. ## Nízkoúrovňová nastavení @@ -29,9 +29,9 @@ Ve verzi AdGuard v4.x pro Android jsme zcela přepracovali nízkoúrovňová nas Zde můžete zadat záložní DNS řešitel, který se použije v případě nedostupnosti nakonfigurovaného serveru. Dostupné možnosti: -- _Automatic DNS_: Select this option if you want to use the system DNS or AdGuard DNS. -- _None_: Select this option if you do not want to have any fallback. -- _Custom DNS_: Select this option and enter plain DNS server IPv4 or IPv6 addresses, one per line. Tyto adresy budou použity jako upstreamy. +- _Automatický DNS_: Tuto možnost vyberte, pokud chcete použít systémový DNS nebo AdGuard DNS. +- _Nic_: Tuto možnost vyberte, pokud nechcete mít žádnou záložní možnost. +- _Vlastní DNS_: Tuto možnost vyberte a zadejte adresy běžného DNS IPv4 nebo IPv6, jednu na řádek. Tyto adresy budou použity jako upstreamy. #### Záložní domény @@ -45,25 +45,24 @@ Pokud je tato možnost povolena, AdGuard zjistí vyhledávací domény a automat Bootstrap DNS pro šifrované upstream DNS, například servery DoH, DoT a DoQ. Dostupné možnosti: -- _Automatic DNS_: Select this option if you want to use the system DNS or AdGuard DNS. Tato možnost je ve výchozím nastavení vybrána. -- _Custom DNS_: Select this option and enter plain DNS server IPv4 or IPv6 addresses, one per line. Tyto adresy budou použity jako bootstrap upstreamy. +- _Automatický DNS_: Tuto možnost vyberte, pokud chcete použít systémový DNS nebo AdGuard DNS. Tato možnost je ve výchozím nastavení vybrána. +- _Vlastní DNS_: Tuto možnost vyberte a zadejte adresy běžného DNS IPv4 nebo IPv6, jednu na řádek. Tyto adresy budou použity jako bootstrap upstreamy. #### Režim blokování pro pravidla stylu adblock -Here you can specify the response type for domains blocked by DNS rules based on adblock rule syntax (for example, `||example.org^`). Dostupné možnosti: +Zde můžete zadat typ odpovědi pro domény blokované DNS pravidly na základě syntaxe pravidla adblock (například `||example.org^`). Dostupné možnosti: -- _REFUSED_: Respond with REFUSED -- _NXDOMAIN_: Respond with NXDOMAIN -- _Custom IP address_: Select this option to respond with a custom IP address. Pro blokované požadavky A je třeba zadat adresu IPv4 a pro blokované požadavky AAAA adresu IPv6. +- _REFUSED_: Odezva pomocí REFUSED +- _NXDOMAIN_: Odezva pomocí NXDOMAIN +- _Vlastní IP adresa_: Tuto možnost vyberte, chcete-li odpovědět pomocí vlastní IP adresy. Pro blokované požadavky A je třeba zadat adresu IPv4 a pro blokované požadavky AAAA adresu IPv6. #### Režim blokování pro pravidla hosts -Here you can specify the response type for domains blocked by DNS rules based on hosts rule syntax -(for example, ` 0.0.0.0 example.com`). +Zde můžete zadat typ odpovědi pro domény blokované DNS pravidly na základě syntaxe pravidla hosts (například ` 0.0.0.0 example.com`). -- _REFUSED_: Respond with REFUSED -- _NXDOMAIN_: Respond with NXDOMAIN -- _Custom IP address_: Select this option to respond with a custom IP address. Pro blokované požadavky A je třeba zadat adresu IPv4 a pro blokované požadavky AAAA adresu IPv6. +- _REFUSED_: Odezva pomocí REFUSED +- _NXDOMAIN_: Odezva pomocí NXDOMAIN +- _Vlastní IP adresa_: Tuto možnost vyberte, chcete-li odpovědět pomocí vlastní IP adresy. Pro blokované požadavky A je třeba zadat adresu IPv4 a pro blokované požadavky AAAA adresu IPv6. #### Časový limit DNS požadavku @@ -104,9 +103,9 @@ Pokud je toto nastavení povoleno, bude AdGuard kromě běžných požadavků DN Toto nastavení má dva režimy: -- **Filter on the fly**. V tomto režimu bude AdGuard filtrovat přenosy DNS-over-HTTPS bez přesměrování na místní proxy server DNS. Použije server DNS zadaný v nastavení prohlížeče. +- **Filtrování za chodu**. V tomto režimu bude AdGuard filtrovat přenosy DNS-over-HTTPS bez přesměrování na místní proxy server DNS. Použije server DNS zadaný v nastavení prohlížeče. -- **Redirect to DNS proxy**. V tomto režimu AdGuard přesměruje požadavky DNS-over-HTTPS na místní proxy server DNS za účelem filtrování. Použije server DNS vybraný v nastavení DNS aplikace AdGuard. +- **Přesměrování na DNS proxy**. V tomto režimu AdGuard přesměruje požadavky DNS-over-HTTPS na místní proxy server DNS za účelem filtrování. Použije server DNS vybraný v nastavení DNS aplikace AdGuard. ### Filtrování @@ -122,7 +121,7 @@ Toto nastavení může zpomalit zařízení. Používejte jej pouze pro účely Pokud je toto nastavení povoleno, bude AdGuard v případě potřeby šifrovat soubory ClientHellos. Tato funkce vyžaduje, aby bylo povoleno filtrování HTTPS. Tato funkce používá místní proxy server DNS k vyhledání konfigurace ECH pro danou doménu. Pokud je nalezen, paket ClientHello bude zašifrován. Ujistěte se, že s touto funkcí používáte šifrovaný server DNS. -**About ClientHellos and ECH**: Every encrypted Internet connection has an unencrypted part. Jedná se o první paket, který obsahuje název serveru, ke kterému se připojujete. Technologie Encrypted Client Hello je navržena tak, aby tento problém řešila šifrováním tohoto paketu. +**O ClientHello and ECH**: Každé šifrované internetové připojení má i nešifrovanou část. Jedná se o první paket, který obsahuje název serveru, ke kterému se připojujete. Technologie Encrypted Client Hello je navržena tak, aby tento problém řešila šifrováním tohoto paketu. #### Kontrola OCSP @@ -136,23 +135,23 @@ Pokud ověření trvá příliš dlouho, AdGuard připojení povolí a zároveň Pokud je toto nastavení povoleno, bude AdGuard filtrovat kromě jiných typů požadavků také požadavky odeslané skrze HTTP/3. Tato funkce vyžaduje, aby bylo povoleno filtrování HTTPS. -**About HTTP/3**: This is the latest version of the HTTP protocol, based on QUIC. +**O HTTP/3**: Jedná se o nejnovější verzi protokolu HTTP založenou na protokolu QUIC. ### Odchozí proxy #### Zobrazit nastavení Filtrovat požadavky DNS -When this setting is enabled, the _Filter DNS requests_ switch is displayed in the _Add proxy server_ dialog. To access the dialog, open **Settings**, then go to **Filtering** → **Network** → **Proxy** → **Proxy server**, and click _+ Add proxy server_. Zapnutím tohoto přepínače povolíte filtrování DNS požadavků procházejících přes zadaný odchozí proxy server. +Je-li toto nastavení povoleno, zobrazí se v dialogu _Přidat proxy server_ přepínač _Filtrovat požadavky DNS_. Chcete-li otevřít dialogové okno, otevřete **Nastavení**, přejděte na **Filtrování** → **Síť** → **Proxy** → **Proxy server** a klikněte na _+ Přidat proxy_. Zapnutím tohoto přepínače povolíte filtrování DNS požadavků procházejících přes zadaný odchozí proxy server. ### Ochrana #### Rozsahy portů -Toto nastavení umožňuje zadat rozsahy portů, které mají být filtrovány. Zadejte rozsahy portů, jeden rozsah na řádek. Use `..` to specify the range. For example, `80..5221`. +Toto nastavení umožňuje zadat rozsahy portů, které mají být filtrovány. Zadejte rozsahy portů, jeden rozsah na řádek. Rozsah zadejte pomocí `..`. Např. `80..5221`. #### Zaznamenat odstraněné HTML události -If this setting is enabled, AdGuard will write information about blocked HTML elements to _Recent activity_. To access the logs, go to go to **Statistics** → **Recent activity**. +Pokud je toto nastavení povoleno, bude AdGuard zapisovat informace o blokovaných prvcích HTML do _Nedávné aktivity_. Chcete-li získat přístup k protokolům, přejděte do **Statistika** → **Nedávná aktivita**. #### Ladění skripletů @@ -160,15 +159,15 @@ Pokud je toto nastavení povoleno, aplikace bude zobrazovat informace o ladění #### Vyloučené aplikace -Toto nastavení umožňuje zobrazit seznam balíčků a identifikátorů UID, které mají být vyloučeny z ochrany AdGuardem. Zadejte názvy balíčků, nebo UID, jeden na řádek. You can use `//` for comments. +Toto nastavení umožňuje zobrazit seznam balíčků a identifikátorů UID, které mají být vyloučeny z ochrany AdGuardem. Zadejte názvy balíčků, nebo UID, jeden na řádek. Pro komentáře můžete použít `//`. #### Obcházení balíčků QUIC -Zde můžete zadat názvy balíčků, pro které má AdGuard obejít provoz QUIC. Zadejte názvy balíčků, jeden na řádek. You can use `//` for comments. +Zde můžete zadat názvy balíčků, pro které má AdGuard obejít provoz QUIC. Zadejte názvy balíčků, jeden na řádek. Pro komentáře můžete použít `//`. #### Překonfigurovat automatický proxy při změně sítě -Pokud je toto nastavení povoleno, ochrana AdGuardem se po připojení zařízení k jiné síti znovu spustí a znovu nakonfiguruje automatické parametry proxy. This setting only applies when _Routing mode_ is set to _Automatic proxy_. +Pokud je toto nastavení povoleno, ochrana AdGuardem se po připojení zařízení k jiné síti znovu spustí a znovu nakonfiguruje automatické parametry proxy. Toto nastavení platí pouze v případě, že je _Režim směrování_ nastaven na _Automatický proxy_. #### Filtrování IPv6 @@ -176,11 +175,11 @@ Pokud je toto nastavení povoleno, bude AdGuard filtrovat sítě IPv6, pokud je #### Rozsahy IPv4 vyloučené z filtrování -Zde můžete uvést rozsahy IPv4, které chcete z filtrování vyloučit. Na každý řádek zadejte jeden rozsah IP. You can use `//` for comments. +Zde můžete uvést rozsahy IPv4, které chcete z filtrování vyloučit. Na každý řádek zadejte jeden rozsah IP. Pro komentáře můžete použít `//`. #### Rozsahy IPv6 vyloučené z filtrování -Zde můžete uvést rozsahy IPv6, které chcete z filtrování vyloučit. Na každý řádek zadejte jeden rozsah IP. You can use `//` for comments. +Zde můžete uvést rozsahy IPv6, které chcete z filtrování vyloučit. Na každý řádek zadejte jeden rozsah IP. Pro komentáře můžete použít `//`. #### Zachování záznamů TCP pro odchozí sokety @@ -188,8 +187,8 @@ Pokud je toto nastavení povoleno, AdGuard po uplynutí zadané doby odešle udr Toto nastavení vám umožňuje zadat: -- **Idle time**, in seconds, before sending TCP keepalive probes to outgoing sockets. Výchozí hodnota je 0. Pokud máte problémy s NAT, nastavte tuto hodnotu na 20. -- **Time between keepalive probes** for an unresponsive peer. Výchozí hodnota je 0 swkund. +- **Dobu nečinnosti** v sekundách před odesláním sond TCP keepalive odchozím soketům. Výchozí hodnota je 0. Pokud máte problémy s NAT, nastavte tuto hodnotu na 20. +- **Dobu mezi sondami keepalive** pro neodpovídajícího partnera. Výchozí hodnota je 0 swkund. ### Nastavení lokální VPN @@ -211,7 +210,7 @@ Pokud je toto nastavení povoleno, lokální VPN AdGuardu se po vypnutí z důvo #### Zachycování paketů (PCAP) -Toto nastavení povoluje protokolování rozhraní TUN. When enabled, AdGuard creates a file `timestamp.pcap`, such as 1682599851461.pcap, in the app cache directory. Tento soubor obsahuje seznam všech síťových paketů přenášených prostřednictvím sítě VPN a lze jej analyzovat pomocí nástroje Wireshark. +Toto nastavení povoluje protokolování rozhraní TUN. Je-li tato funkce povolena, vytvoří AdGuard v adresáři mezipaměti aplikace soubor `timestamp.pcap`, například 1682599851461.pcap. Tento soubor obsahuje seznam všech síťových paketů přenášených prostřednictvím sítě VPN a lze jej analyzovat pomocí nástroje Wireshark. #### Zahrnout bránu Wi-Fi v trasách VPN @@ -219,28 +218,28 @@ Pokud je toto nastavení povoleno, budou IP adresy brány přidány do tras VPN #### Adresa IPv4 -Zde můžete zadat IP adresu, která bude použita pro vytvoření rozhraní TUN. The default value is `172.18.11.218`. +Zde můžete zadat IP adresu, která bude použita pro vytvoření rozhraní TUN. Výchozí hodnota je `172.18.11.218`. #### Vynucené směrování LAN IPv4 -If this setting is enabled, AdGuard will filter all LAN connections, including local IPv4 network traffic, even if the _Route all LAN IPv4 connections_ option is enabled. +Pokud je toto nastavení povoleno, bude AdGuard filtrovat všechna připojení LAN, včetně místního síťového provozu IPv4, i když je povolena možnost _Směrovat všechna připojení LAN IPv4_. #### Nucené směrování všech LAN IPv4 -Pokud je toto nastavení povoleno, AdGuard vyloučí připojení LAN z filtrování pro jednoduché sítě. To nemusí fungovat pro složité sítě. This setting only applies if _Forcibly route LAN IPv4_ is disabled. +Pokud je toto nastavení povoleno, AdGuard vyloučí připojení LAN z filtrování pro jednoduché sítě. To nemusí fungovat pro složité sítě. Toto nastavení platí pouze v případě, že je zakázána možnost _Vynutit směrování LAN IPv4_. #### Adresa IPv6 -Zde můžete zadat IP adresu, která bude použita pro vytvoření rozhraní TUN. The default value is `2001:db8:ad:0:ff::`. +Zde můžete zadat IP adresu, která bude použita pro vytvoření rozhraní TUN. Výchozí hodnota je `2001:db8:ad:0:ff::`. ### Různé #### Zobrazit nástroje pro vývojáře na hlavní obrazovce -If this setting is enabled, AdGuard will display the **Developer tools** icon in the upper right corner of the app’s home screen. +Pokud je toto nastavení povoleno, zobrazí AdGuard v pravém horním rohu domovské obrazovky aplikace ikonu **Nástroje vývojáře**. -**Developer tools** is a specialized section available in AdGuard for Android v4.3 and later, designed for quick navigation and switching between features. Umožňuje rychle povolit nebo zakázat vlastní filtry, přístup k protokolům, povolit různé protokoly a další funkce. +**Nástroje vývojáře** je specializovaná sekce dostupná v aplikaci AdGuard pro Android v4.3 a novější, která je určena pro rychlou navigaci a přepínání mezi funkcemi. Umožňuje rychle povolit nebo zakázat vlastní filtry, přístup k protokolům, povolit různé protokoly a další funkce. #### Detekce Samsung Pay -Pokud je toto nastavení povoleno, ochrana AdGuard se při otevření aplikace Samsung Pay pozastaví. Korean users require this feature as they experience [issues with Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea) when AdGuard is enabled. +Pokud je toto nastavení povoleno, ochrana AdGuard se při otevření aplikace Samsung Pay pozastaví. Korejští uživatelé tuto funkci vyžadují, protože se u nich při zapnutém AdGuardu objevují [problémy se Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea). diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 9ee5c148a11..d40e6d55fc3 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -31,7 +31,7 @@ _Úroveň záznamu_ definuje, jaká data o provozu aplikace by měla být zaznam ![Advanced \*mobile_border](https://cdn.adtidy.org/blog/new/vshfnadvanced.png) -Sekce _Nízkoúrovňová nastavení_ je určena pro zkušené uživatele. [Read more about low-level settings](/adguard-for-android/features/low-level-settings/) +Sekce _Nízkoúrovňová nastavení_ je určena pro zkušené uživatele. [Přečtěte si více o Nízkoúrovňových nastavení](/adguard-for-android/features/low-level-settings/) ![Low-level settings \*mobile_border](https://cdn.adtidy.org/blog/new/n9ztplow_level.png) @@ -39,7 +39,7 @@ Sekce _Nízkoúrovňová nastavení_ je určena pro zkušené uživatele. [Read Tato sekce umožňuje spravovat nastavení HTTPS filtrování, filtry a uživatelské skripty a nastavit proxy server. -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filtry @@ -57,11 +57,19 @@ Pokud aktivujete příliš mnoho filtrů, mohou některé webové stránky fungo [Více informací o filtrech](https://adguard.com/en/blog/what-are-filters.html) -### Uživatelské skripty +### Rozšíření + +Rozšíření umožňují přidávat uživatelské skripty a uživatelské styly. + +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) Uživatelské skripty jsou miniprogramy napsané v jazyce JavaScript, které rozšiřují funkčnost jedné nebo více webových stránek. K instalaci uživatelských skriptů potřebujete speciální správce uživatelských skriptů. AdGuard takovou funkci má a umožňuje přidávat uživatelské skripty pomocí URL nebo ze souboru. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +Uživatelské styly jsou podobné uživatelským skriptům, které umožňují měnit vzhled webových stránek v prohlížeči, aniž by se měnil jejich obsah. Fungují tak, že přidávají styly CSS ke stávajícím stylům webových stránek. Pokud například chcete tmavý motiv na webu, který ho nenabízí, můžete k tomu použít uživatelský styl. + +Chcete-li přidat uživatelský styl, přejděte do _Nastavení_ → _Filtrování_ → _Rozšíření_→ _Přidat rozšíření_ → _Importovat ze souboru nebo URL_. Hotové uživatelské styly najdete [online](https://userstyles.world/). + +Chcete-li vytvořit vlastní styl, klepněte na _Přidat rozšíření_ → _Vytvořit uživatelský styl_. #### AdGuard Extra diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 382a09a595e..14ed735cb7f 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: Jak nainstalovat AdGuard pro Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 1703ebfe774..5a21810b5bf 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: Jak zakázat funkci Samsung Auto Blocker -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index 639e28faac2..cf2e7c4a7a5 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: Jak chránit AdGuard před ukončením systémem -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 918171a75b3..bcb54cc3c17 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ Přístup k ní získáte v sekci *Statistiky* → *Využití baterie*. Uvnitř najdete graf, který zobrazuje spotřebu zdrojů baterie AdGuard za posledních 24 hodin s možností získat podrobnější údaje po jednotlivých hodinách klepnutím v grafu. Kromě toho je zde také číselný rozpis příslušných údajů a krátké technické vysvětlení. +Pod grafem je několik dalších parametrů: *CPU na popředí*, *CPU na pozadí*, *Použití mobilních dat* a *Použití Wi-Fi dat*. + +*CPU na popředí* a *CPU na pozadí* ukazují, jak dlouho CPU využívá AdGuard, když je aplikace aktivní nebo běží na pozadí. + +A s *využitím mobilních dat* a *využitím Wi-Fi dat* můžete vidět, kolik provozu AdGuard použil, když váš telefon používal mobilní internet nebo byl připojen k Wi-Fi. + ### Kolik prostředků baterie AdGuard skutečně spotřebovává? Nejprve si řekneme něco málo z teorie a uvedeme si souvislosti s potřebnými údaji. diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 79a13d1aa80..831bd75ab03 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Známé problémy kompatibility s aplikacemi pro Android -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index aeff76e60c3..ca5d3a5c074 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problémy způsobené rozšířením omezených nastavení -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ Tento článek popisuje AdGuard pro Android, multifunkční blokátor reklam, kt ::: -Ve snaze zlepšit soukromí uživatelů rozšířila společnost Google nastavení omezení v systému Android 15. Další nastavení, například _Přístup k používání aplikací_ nyní vyžadují povolení dalšího oprávnění. Vzhledem k tomu, že _[Firewall](/adguard-for-android/features/protection/firewall)_ a _[Detekce Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ vyžadují pro správnou funkci nastavení _Přístup k používání aplikací_, mohlo dojít k problémům při jejich používání. Chcete-li tyto problémy vyřešit, postupujte podle následujících kroků: +Ve snaze zlepšit soukromí uživatelů rozšířila společnost Google nastavení omezení v systému Android 15. Další nastavení, například _Přístup k používání aplikací_ nyní vyžadují povolení dalšího oprávnění. Vzhledem k tomu, že _[Firewall](/adguard-for-android/features/protection/firewall)_ a _[Detekce Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ vyžadují pro správnou funkci nastavení _Přístup k používání aplikací_, mohlo dojít k problémům při jejich používání. Chcete-li tyto problémy vyřešit, postupujte podle následujících kroků. :::note @@ -17,13 +17,15 @@ AdGuard uplatňuje přísné zásady žádných záznamů aktivit, což znamená ::: -1. V zařízení Android otevřete **Nastavení**. +## Základní pokyny + +1. Ve svém zařízení Android otevřete **Nastavení**. 2. Klepněte na **Aplikace**. 3. Klepněte na **AdGuard** ![AdGuard in Apps \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted1.png) -Pokud to nemůžete najít, klepněte nejprve na možnost **Zobrazit všechny aplikace** nebo **Informace o aplikaci**. +Pokud to nemůžete najít, klepněte nejprve na **Zobrazit všechny aplikace** nebo **Informace o aplikaci**. 1. Klepněte na **Další** (⁝) → _Povolit omezená nastavení_. @@ -34,3 +36,25 @@ Postupujte podle pokynů na obrazovce. Vše je hotovo! Nyní budou funkce _Firewall_ a _Detekce Samsung Pay_ fungovat správně. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## Pro uživatele OneUI 7.0 + +V zařízeních Samsung s OneUI 7.0 se nastavení oprávnění aplikací liší. Podle následujících kroků nakonfigurujte přístup k používání aplikací: + +1. Otevřete _Systémová nastavení_ → _Aplikace_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Klepněte na ikonu nabídky (⋮) v pravém horním rohu a poté vyberte možnost _Speciální přístup_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Vyberte _Přístup k datům o využití_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Vyhledejte a povolte _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +Vše je hotovo! diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index bfc51057903..c467712e662 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Ruční instalace bezpečnostního certifikátu do prohlížeče Firefox -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index 3c7470705cb..dfcc744fcf2 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Přesunutí certifikátu CA do systémového úložiště na zařízeních s root přístupem -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 8b84cb97c86..3768ea82461 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Instalace certifikátu na zařízeních se systémem Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 17ffa502b3d..fdd7cf26156 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problémy způsobené více uživatelskými profily -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 7ed520bb365..030bcf386b6 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: Jak nastavit odchozí proxy -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index 9a2ac4a9ad6..dba35dc3dd3 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: Jak používat Samsung Pay s AdGuardem v Jižní Korei -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 54c7d2c67e8..76b48694c27 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Instalace certifikátu do Zabezpečené složky -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index 50d8be29d09..78038026f56 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: Jak blokovat reklamy v YouTube -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 8d98c69317c..30e5df266fd 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,23 +5,25 @@ sidebar_position: 2 ## Instalace AdGuardu pro Linux -Chcete-li nainstalovat AdGuard, zadejte: +Otevřete příkazový řádek v počítači. V systému Linux použijte klávesovou zkratku _Ctrl+Alt+T_. V počítači Mac zadejte do vyhledávacího pole _Terminal_. -Hlavní +Chcete-li nainstalovat AdGuard, vyberte verzi, která vám lépe vyhovuje (hlavní, beta nebo nightly), a zadejte příslušný příkaz. -``` +**Hlavní**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` @@ -35,37 +37,97 @@ Podpis můžete ověřit pomocí nástroje `gpg`, abyste prokázali, že se jedn ::: -## Aktivace licence +## Počáteční nastavení -AdGuard pro Linux vyžaduje [licenci AdGuardu](https://adguard.com/license.html). Pokud ještě nemáte licenci, můžete se přihlásit nebo si vytvořit účet a získat 14denní zkušební verzi zdarma. Pokud již licenci máte, přihlaste se a aktivujte ji. +AdGuard pro Linux vyžaduje [licenci AdGuardu](https://adguard.com/license.html). Pokud ještě nemáte licenci, můžete se přihlásit nebo si vytvořit účet a získat 14denní zkušební verzi zdarma. Pokud již licenci máte, přihlaste se a aktivujte ji. Postupujte podle tohoto průvodce krok za krokem: -Chcete-li se přihlásit nebo si vytvořit účet, zadejte: +1. Po instalaci zadejte: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -Chcete-li obnovit licenci, zadejte: +2. Poté vyberte požadovanou možnost: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -Chcete-li zobrazit informace o licenci, zadejte: +3. Po získání licence pokračujte v aktivaci pomocí poskytnutého odkazu: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Počáteční nastavení +4. Po aktivaci můžete s programem dále pracovat: -Chcete-li AdGuard zprovoznit, proveďte počáteční nastavení. To zahrnuje instalaci certifikátu AdGuard CA, povolení potřebných filtrů a výběr režimu proxy serveru. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -Chcete-li spustit průvodce konfigurací, zadejte: +5. Licenci můžete obnovit také zadáním: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + nebo zobrazit informace o licenci zadáním + + ```sh + adguard-cli license + ``` + +6. Nyní je třeba nastavit rozhraní AdGuard CLI. Chcete-li spustit průvodce konfigurací, zadejte: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + Průvodce se zeptá na základní otázky potřebné pro počáteční nastavení. + +7. Poté můžete spustit ochranu AdGuardem zadáním příkazu + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. Stav ochrany můžete zkontrolovat pomocí: + + ```sh + adguard-cli status + ``` + + a zastavit pomocí: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. Chcete-li zkontrolovat aktuální konfiguraci, zadejte: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + Zobrazí se také cesta ke konfiguračnímu souboru, který můžete a měli byste přímo upravit. Obsahuje popisy všech dalších možností. + + Alternativně můžete použít příkazy: + + ```sh + adguard-cli config get + ``` + + nebo: + + ```sh + adguard-cli config set + ``` + + Jsou však primárně určeny pro skriptování. + +Další informace o dostupných příkazech naleznete v [Nastavení a správa ochrany] (https://adguard.com/kb/adguard-for-linux/settings/). ## Odinstalace AdGuardu pro Linux @@ -73,19 +135,19 @@ Chcete-li odinstalovat AdGuard, zadejte: Hlavní -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index a208cc904ab..8b79251557a 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Sparáva nastavení a ochrany sidebar_position: 3 --- +## Dostupné příkazy + Chcete-li získat seznam všech dostupných příkazů AdGuardu, zadejte: -``` +```sh adguard-cli --help-all ``` ## Povolení a zakázání ochrany +### Zapnout ochranu + Chcete-li povolit ochranu, zadejte: -``` +```sh adguard-cli start ``` +Tento příkaz se pokusí nakonfigurovat přesměrování na proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Vypnout ochranu + Chcete-li povolit zakázat, zadejte: -``` +```sh adguard-cli stop ``` +Tento příkaz nejen zastaví proxy, ale také zastaví přesměrování na něj. + +### Zkontrolovat stav ochrany + Chcete-li zobrazit stav ochrany, zadejte: -``` +```sh adguard-cli status ``` -## Zkontrolovat aktualizace +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Aktualizace + +### Zkontrolovat aktualizace Chcete-li zkontrolovat aktualizace, zadejte: -``` +```sh adguard-cli check-update ``` +### Aktualizace AdGuardu pro Linux + Chcete-li aktualizovat AdGuard pro Linux, zadejte: -``` +```sh adguard-cli update ``` +### Aktualizace výstupu skriptu + Chcete-li zobrazit výstup skriptu aktualizace, zadejte: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Pro konfiguraci AdGuardu pro Linux použijte příkaz `config`. Dílčí příkazy: - `show`: Zobrazení aktuální konfigurace v souboru `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Konfigurace volby v souboru `proxy.yaml` - `listen_ports.http_proxy`: Naslouchací port HTTP - `proxy_mode`: Režim proxy (`manuální` nebo `automatický`) + - `get`: Zjištění aktuálního stavu výše uvedených možností ## Správa filtrů @@ -64,8 +90,32 @@ Pro konfiguraci AdGuardu pro Linux použijte příkaz `config`. Dílčí příka Pro konfiguraci AdGuardu pro Linux použijte příkaz `filters`. Dílčí příkazy: - `list`: Seznam nainstalovaných filtrů + - `--all`: Zobrazení všech filtrů + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Instalace filtru. Zadejte adresu URL filtru, který chcete nainstalovat + - `enable`: Povolení filtru. Zadejte název nebo ID filtru + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Zakázání filtrování. Zadejte název nebo ID filtru + - `update`: Aktualizace filtrů + +## Změna poslechové adresy proxy v režimu ručního proxy + +Ve výchozím nastavení naslouchá proxy na `127.0.0.1` — adrese zpětného síťového rozhraní. +Existují dva způsoby, jak zajistit, aby proxy naslouchal na jiném rozhraní: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/cs/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/cs/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index 1204d42ee29..70d1a0ddb8d 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ Ve výchozím nastavení tato pravidla pro žádosti o dokumenty nefungují. To - `https://example.org/banner/img` -### Modifikátory základních pravidel {#basic-rule-modifiers} +### Modifikátory základních pravidel {#basic-rule-modifiers-examples} Pravidla filtrování podporují řadu modifikátorů, které umožňují doladit chování pravidla. Zde je příklad pravidla s několika jednoduchými modifikátory. @@ -232,7 +232,7 @@ Safari Converter podporuje podstatnou podmnožinu [základních pravidel](#basic - `$replace` - `$urltransform` -#### Kosmetická pravidla +#### Kosmetická pravidla {#cosmetic-rules-safari-limitations} Safari Converter podporuje většinu [kosmetických pravidel](#cosmetic-rules) ačkoli jsou nativně podporována pouze pravidla skrývání prvků se základními selektory CSS prostřednictvím blokování obsahu v Safari, vše ostatní je třeba interpretovat dalším rozšířením. @@ -256,7 +256,7 @@ Pro pravidla scriplet je **velmi důležité** spustit je co nejdříve po načt ::: -#### HTML pravidla filtrování +#### HTML pravidla filtrování {#html-filtering-rules-safari-limitations} [Pravidla filtrování HTML](#html-filtering-rules) **nejsou**, a v budoucnu nebudou podporována. Safari bohužel neposkytuje potřebné technické možnosti pro jejich implementaci. @@ -396,8 +396,8 @@ Následující modifikátory jsou nejjednodušší a nejčastěji používané. | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,8 +405,7 @@ Následující modifikátory jsou nejjednodušší a nejčastěji používané. - ✅ — plně podporováno - ✅ * — podporováno, ale spolehlivost se může lišit nebo se mohou vyskytnout omezení; více informací naleznete v popisu modifikátoru -- ⏳ - funkce, jejíž implementace se plánuje, ale zatím není k dispozici v žádném produktu -- ❌ — nepodporováno +- ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari nepodporuje současné použití povolených a zakázaných domén, takž :::info Kompatibilita -Pravidla s regulárními výrazy v modifikátoru `$domain` jsou podporována AdGuardem pro Windows, AdGuardem pro Mac a AdGuardem pro Android s [CoreLibs][] v1.11 nebo novějším a rozšířením prohlížeče AdGuard s [TSUrlFilter][] v3.0.0 nebo novějším. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. V AdGuardu pro Windows, Mac a Android s [CoreLibs][] v1.12 nebo novějším může být modifikátor `$domain` alternativně zapsán jako `$from`. @@ -617,13 +616,14 @@ kde: :::caution Omezení 1. Modifikátor `$header` lze použít pouze při příjmu záhlaví. Pokud je tedy požadavek zablokován nebo přesměrován v dřívější fázi, nelze modifikátor použít. -1. V rozšíření prohlížeče AdGuard je `$header` modifikátor kompatibilní pouze s [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), a [`$badfilter`](#badfilter-modifier). + +1. V Rozšíření prohlížeče AdGuard je modifikátor `$header` kompatibilní poze s [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (pouze hlavičky odpovědí), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier) s [content-type modifiers](#content-type-modifiers) jako [`$script`](#script-modifier) a [`$stylesheet`](#stylesheet-modifier). Pravidla s jinými modifikátory jsou považována za neplatná a budou vyřazena. ::: :::info Kompatibilita -Pravidla s modifikátorem `$header` jsou podporována AdGuardem pro Windows, AdGuardem pro Mac a AdGuardem pro Android s [CoreLibs][] v1.11 nebo novějším a rozšířením prohlížeče AdGuard s [TSUrlFilter][] v3.0.0 nebo novějším. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Pravidla se smíšenými negovanými a negovanými hodnotami jsou považována z :::info Kompatibilita -Pravidla s modifikátorem `$method` jsou podporována AdGuardem pro Windows, Mac a Android s [CoreLibs][] v1.12 nebo novější a Rozšířením prohlížeče AdGuard pro Chrome, Firefox a Edge s filtrem [TSUrlFilter][] v2.1.1 nebo novějším. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard se pokusí zavřít kartu prohlížeče s jakoukoli adresou, která odpo 1. Modifikátor `$popup` funguje nejlépe v rozšíření prohlížeče AdGuard pro prohlížeče založené na Chromiu a Firefox. 1. V pravidlech [AdGuard pro Chrome MV3][ext-mv3] s modifikátorem [`$popup`][popup-in-mv3] by nefungovaly, proto jsme zakázali jejich převod na deklarativní pravidla. Pokusíme se je použít pouze v našem enginu [TSUrlFilter][] a zavírat nové karty programově. 1. V AdGuardu pro Safari a AdGuardu pro iOS, pravidla `$popup` stránku jednoduše a okamžitě zablokují. -1. V AdGuardu pro Windows, Mac a Android nemusí modifikátor `$popup` v některých případech detekovat vyskakovací okno a nebude zablokováno. Modifikátor `$popup` použije typ obsahu `document` se speciálním příznakem, který je předán blokovací stránce. Samotná blokovací stránka může provést některé kontroly a zavřít okno, pokud se skutečně jedná o vyskakovací okno. V opačném případě by se stránka měla načíst. Lze jej kombinovat s dalšími modifikátory typu požadavku, například `$third-party`, `$strict-third-party`, `$strict-first-party` a `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. Modifikátor `$popup` použije typ obsahu `document` se speciálním příznakem, který je předán blokovací stránce. Samotná blokovací stránka může provést některé kontroly a zavřít okno, pokud se skutečně jedná o vyskakovací okno. V opačném případě by se stránka měla načíst. Lze jej kombinovat s dalšími modifikátory typu požadavku, například `$third-party`, `$strict-third-party`, `$strict-first-party` a `$important`. ::: @@ -727,7 +727,7 @@ Místo plného názvu modifikátoru můžete použít kratší název (alias): ` :::info Kompatibilita -Pravidla s modifikátorem `$strict-first-party` jsou podporována AdGuardem pro Windows, Mac a Android s [CoreLibs][] v1.16 nebo novější. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ Místo plného názvu modifikátoru můžete použít kratší název (alias): ` :::info Kompatibilita -Pravidla s modifikátorem `$strict-third-party` jsou podporována AdGuardem pro Windows, Mac a Android s [CoreLibs][] v1.16 nebo novější. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ Místo plného názvu modifikátoru můžete použít kratší název (alias): ` :::info Kompatibilita -Pravidla s modifikátorem `$to` jsou podporována AdGuardem pro Windows, AdGuardem pro Mac a AdGuardem pro Android s [CoreLibs][] v1.12 nebo novějším a rozšířením prohlížeče AdGuard s [TSUrlFilter][] v2.1.3 nebo novějším. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -843,7 +843,7 @@ V tom, jak AdGuard určuje typ obsahu na různých platformách, je velký rozd - ✅ — plně podporováno - ✅ * — podporováno, ale spolehlivost se může lišit nebo se mohou vyskytnout omezení; více informací naleznete v popisu modifikátoru -- ❌ — nepodporováno +- ❌ — not supported - 🚫 — odstraněno a již nepodporováno ::: @@ -1043,7 +1043,7 @@ Doporučujeme také seznámit se s [přehledem filtrů Adblock Plus](https://adb - ✅ — plně podporováno - ✅ * — podporováno, ale spolehlivost se může lišit nebo se mohou vyskytnout omezení; více informací naleznete v popisu modifikátoru -- ❌ — nepodporováno +- ❌ — not supported ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Kompatibilita - Pouze AdGuard pro Windows, Mac a Android jsou technicky schopné používat pravidla s modifikátorem `$extension`. -- Pravidla s modifikátorem `$extension` s konkrétním názvem uživatelského skriptu jsou podporována AdGuardem pro Windows, AdGuardem pro Mac a AdGuardem pro Android s [CoreLibs][] v1.13 nebo novější. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blokování cookies a odstranění sledovacích parametrů se provádí pomocí :::info Kompatibilita - Ochrana před sledováním (dříve Režim utajení) je k dispozici v AdGuardu pro Windows, AdGuardu pro macOS, AdGuardu pro Android a Rozšíření prohlížeče AdGuard pro Firefox a prohlížeče založené na Chromium, kromě AdGuardu pro Chrome Manifest MV3. Všechny ostatní produkty budou ignorovat pravidla s modifikátorem `$stealth`. -- Pravidla s modifikátorem `$stealth` jsou podporována AdGuardem pro Windows, AdGuardem pro Mac a AdGuardem pro Android s [CoreLibs][] v1.10 nebo novějším a Rozšířením prohlížeče AdGuard s [TSUrlFilter][] v3.0.0 nebo novějším. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,37 +1326,36 @@ Tyto modifikátory mohou zcela změnit chování základních pravidel. -| Modifikátor \ Produkty | [Aplikace CoreLibs][cl-apps] | [AdGuard pro Chromium][ext-chr] | [AdGuard pro Chrome MV3][ext-mv3] | [AdGuard pro Firefox][ext-ff] | [AdGuard pro iOS][ios-app] | [AdGuard pro Safari][ext-saf] | [Blokátor obsahu AdGuard][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifikátor \ Produkty | [Aplikace CoreLibs][cl-apps] | [AdGuard pro Chromium][ext-chr] | [AdGuard pro Chrome MV3][ext-mv3] | [AdGuard pro Firefox][ext-ff] | [AdGuard pro iOS][ios-app] | [AdGuard pro Safari][ext-saf] | [Blokátor obsahu AdGuard][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — plně podporováno - ✅ * — podporováno, ale spolehlivost se může lišit nebo se mohou vyskytnout omezení; více informací naleznete v popisu modifikátoru -- ⏳ - funkce, jejíž implementace se plánuje, ale zatím není k dispozici v žádném produktu -- ❌ — nepodporováno -- 👎 — zastaralé; stále podporovano, ale v budoucnu bude odstraněno +- ❌ — not supported +- 👎 — deprecated; still supported but will be removed in the future ::: @@ -1670,7 +1669,7 @@ preroll.ts :::info Kompatibilita -Pravidla s modifikátorem `$hls` jsou podporována AdGuardem pro Windows, Mac a Android s [CoreLibs][] v1.10 nebo novější. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ V AdGuardu pro Windows, Mac a Android s [CoreLibs][] v1.11 nebo novější, lze :::info Kompatibilita -Pravidla s modifikátorem `$jsonprune` jsou podporována AdGuardem pro Windows, Mac a Android s [CoreLibs][] v1.10 nebo novější. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ Když je více pravidel `$xmlprune` odpovídá stejnému požadavku, jsou použi :::info Kompatibilita -Pravidla s modifikátorem `$xmlprune` jsou podporována AdGuardem pro Windows, Mac a Android s [CoreLibs][] v1.15 nebo novější. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignoruje záhlaví `Permissions-Policy`. Další informace naleznete v [ :::info Kompatibilita -- Pravidla s modifikátorem `$permissions` jsou podporována AdGuardem pro Windows, AdGuardem pro Mac a AdGuardem pro Android s [CoreLibs][] v1.11 nebo novějším a rozšířením prohlížeče AdGuard s [TSUrlFilter][] v3.0.0 nebo novějším. -- Oddělovač `|` místo uvozené čárky je podporován AdGuardem pro Windows, AdGuardem pro macOS a AdGuardem pro Android s [CoreLibs][] v1.14 nebo novějším a rozšířením prohlížeče AdGuard s [TSUrlFilter][] v3.0.0 nebo novějším. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ Pokud požadavek odpovídá více pravidlům `$referrerpolicy`, která nejsou za :::info Kompatibilita -Pravidla s modifikátorem `$referrerpolicy` jsou podporována AdGuardem pro Windows, Mac a Android s [CoreLibs][] v1.12 nebo novější. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ V případě, že jednomu požadavku odpovídá více pravidel `$removeheader`, @@||example.org/path/$removeheader ``` +##### omezení modifikátoru `$removeheader` {#removeheader-modifier-limitations} + +:::caution Omezení + +[AdGuard pro Chrome MV3][ext-mv3] má některá omezení: + +- Pravidla negace a seznamu povolených nejsou podporována. +- Skupina podobných `$removeheader` pravidel bude sloučena do jednoho dekorativního pravidla. Např: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + je převedeno na + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Omezení Tento typ pravidel lze použít [**pouze v důvěryhodných filtrech**](#trusted-filters). @@ -2497,7 +2564,7 @@ Pravidla typu regexp se vztahují na název i hodnotu parametru. Pro minimalizac **Odebrat všechny parametry dotazu** -Chcete-li odstranit všechny parametry dotazu, zadejte samostatně `$removeparam`: +Chcete-li odebrat všechny parametry dotazu, zadejte samostatně `$removeparam`: - `||example.org^$removeparam` — odstraní všechny parametry dotazu z adres URL odpovídajících `||example.org^`. @@ -2572,7 +2639,7 @@ Pravidla `$removeparam` lze také zakázat pravidly výjimek `$document` a `$url [AdGuard pro Chrome MV3][ext-mv3] má některá omezení: -- Regulární výrazy, negace a pravidla seznamu povolených položek nejsou podporovány. +- Regulární výrazy, negace a pravidla seznamu povolených nejsou podporovány. - Skupina podobných `$removeparam` budou sloučena do jedné. Příklad: ```bash @@ -2646,7 +2713,7 @@ Pravidla `$removeparam` lze také zakázat pravidly výjimek `$document` a `$url :::info Kompatibilita -- Pravidla s modifikátorem `$removeparam` jsou podporována AdGuardem pro Windows, AdGuardem pro macOS a AdGuardem pro Android s [CoreLibs][] v1.7 nebo novější a Rozšířením prohlížeče AdGuard v3.6 nebo novějším. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - Syntaxe `$removeparam` pro regulární výrazy je podporována AdGuardem pro Windows, AdGuardem pro macOS a AdGuardem pro Android s [CoreLibs][] v1.8 nebo novější a Rozšířením prohlížeče AdGuard v4.0 nebo novějším. - Typy požadavků `POST` podporuje pouze AdGuard pro Windows, Mac a Android s [CoreLibs][] v1.10 nebo novější a rozšíření prohlížeče AdGuard s [TSWebExtension][] v0.4.6 nebo novější. @@ -2760,7 +2827,7 @@ V hodnotě `$urltransform` musí být dva znaky uvozeny: čárka `,` a znak dola :::info Kompatibilita -Tato část platí pouze pro AdGuard pro Windows, AdGuard pro Mac a AdGuard pro Android s [CoreLibs][] v1.17 nebo novější. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ požadavek na `https://example.com/firstpath` bude zablokován. Pravidla `$urltransform` lze také zakázat pravidly výjimek `$document` a `$urlblock`. Základní pravidla pro výjimky bez modifikátorů to však nedělají. Např. `@@||example.com^` nezakáže `$urltransform=/X/Y/` pro požadavky na **example.com**, ale `@@||example.com^$urlblock` ano. +**Příklad pravidla pro čištění partnerských odkazů** + +Mnoho webových stránek používá sledovací URL ke sledování kliknutí před přesměrováním na skutečný cíl. Tyto URL obsahují marketingové parametry a analytické tokeny, které lze odstranit, aby se zvýšila ochrana osobních údajů. + +Níže je uveden příklad, jak získat čistý odkaz na cíl, abyste obešli sledovací webové stránky a přešli přímo na cíl. + +V našem příkladu: + + 1. Počáteční URL (se sledováním kliknutí): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Sledování URL po dekódování speciálních znaků: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. Webové stránky, které chcete navštívit: `https://www.somestore.com` + +Abychom mohli vyčistit URL, musíme nejprve dekódovat speciální znaky (jako `%3A` → `:`, `%2F` → `/`, atd.) a získat skutečnou URL z parametrů sledování. K tomu použijeme modifikátor `$urltransform`. Následující 4 pravidla nahrazují symboly URL jejich skutečnými znaky: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +Poté musíme napsat pravidlo, které zablokuje sledovací webovou stránku a přesměruje vás přímo na cílovou adresu (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Sledovací odkazy se nyní automaticky vyčistí a umožní přímou navigaci na cílovou webovou stránku bez sledování. + :::caution Omezení Pravidla s modifikátorem `$urltransform` lze použít [**pouze v důvěryhodných filtrech**](#trusted-filters). @@ -2815,7 +2904,7 @@ Pravidla s modifikátorem `$urltransform` lze použít [**pouze v důvěryhodný :::info Kompatibilita -Pravidla s modifikátorem `$urltransform` jsou podporována AdGuardem pro Windows, Mac a Android s [CoreLibs][] v1.15 nebo novější. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -3090,7 +3179,7 @@ Základní pravidla však nemusí k blokování reklam stačit. Někdy potřebuj :::note - ✅ — plně podporováno -- ❌ — nepodporováno +- ❌ — not supported ::: @@ -3333,7 +3422,7 @@ Použití pseudo-třídy `:has()` je v [některých případech omezeno (2, 3)]( - zakazuje `:has()` uvnitř pseudo akceptující pouze složené selektory; - zakazuje `:has()` po běžných pseudoprvcích. -Nativní pseudo-třída `:has()` neumožňuje použití argumentů `:has()`, `:is()`, `:where()` uvnitř argumentu `:has()`, aby se nezvyšovala složitost zneplatnění `:has()`[(případ 1)](https://bugs.chromium.org/p/chromium/issues/detail?id=669058#c54). ExtendedCss však dříve takové omezení nemělo a seznamy filtrů již taková pravidla obsahují, proto jsme toto omezení do ExtendedCss nepřidali a umožnili jsme používat `:has()` uvnitř `:has()`, jak to bylo možné dříve. Chcete-li to použít, stačí vynutit použití ExtendedCss nastavením znaku pravidla `#?#`/`#$?#`. +Nativní pseudo-třída `:has()` neumožňuje použití argumentů `:has()`, `:is()`, `:where()` uvnitř argumentu `:has()`, aby se nezvyšovala složitost zneplatnění `:has()`[(případ 1](https://bugs.chromium.org/p/chromium/issues/detail?id=669058#c54)). ExtendedCss však dříve takové omezení nemělo a seznamy filtrů již taková pravidla obsahují, proto jsme toto omezení do ExtendedCss nepřidali a umožnili jsme používat `:has()` uvnitř `:has()`, jak to bylo možné dříve. Chcete-li to použít, stačí vynutit použití ExtendedCss nastavením znaku pravidla `#?#`/`#$?#`. Nativní implementace neumožňuje žádné použití `:scope` uvnitř argumentu `:has()` ([[1]](https://github.com/w3c/csswg-drafts/issues/7211), [[2]](https://github.com/w3c/csswg-drafts/issues/6399)). Přesto v seznamech filtrů některá taková pravidla existují: `div:has(:scope a)`, která nadále podporujeme tím, že je jednoduše převedeme na `div:has(> a)`, jak se to dělalo dříve. @@ -3948,7 +4037,7 @@ pseudoClasses = pseudoClass *pseudoClass - **`attributes`** — seznam atributů, které limitují výběr prvků. `name` — název atributu, `value` — podřetězec, který je obsažen v hodnotě atributu. - **`pseudoName`** — název pseudotřídy. - **`pseudoArgs`** — argumenty pseudotřídy typu funkce. -- **`combinator`**— operátor, který funguje podobně jako podřízený kombinátor [CSS](https://developer.mozilla.org/en-US/docs/Web/CSS/Child_combinator): to znamená, že `selector` napravo od `combinator` bude odpovídat pouze prvku, jehož přímý původce odpovídá `selector` vlevo z `combinator`. +- **`combinator`** — operátor, který funguje podobně jako podřízený kombinátor [CSS](https://developer.mozilla.org/en-US/docs/Web/CSS/Child_combinator): to znamená, že `selector` napravo od `combinator` bude odpovídat pouze prvku, jehož přímý původce odpovídá `selector` vlevo z `combinator`. ### Příklady @@ -4006,7 +4095,7 @@ Speciální atribut `tag-content` se nesmí objevit v selektoru nalevo od kombin :::caution Upozornění na vyřazení -Tento speciální atribut může být v budoucnu nepodporován. Raději použijte pseudotřídu `:contains()`, pokud je k dispozici. +Tento speciální atribut může být v budoucnu nepodporován. Raději použijte pseudo-třídu `:contains()`, pokud je k dispozici. ::: @@ -4284,7 +4373,7 @@ Další informace o skriptletech najdete [na GitHubu](https://github.com/Adguard Skriplety nejsou Blokátorem obsahu AdGuard podporovány. -Úplná syntaxe pravidel pro výjimky skriptletů je podporována AdGuardem pro Windows, AdGuardem pro Mac a AdGuardem pro Android s [CoreLibs][] v1.16 nebo novějšími a rozšířením prohlížeče AdGuard pro Chrome, Firefox a Edge s [TSUrlFilter][] v3.0 nebo novějším. Předchozí verze podporují pouze pravidla výjimek, která zakazují konkrétní skriptlety. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Předchozí verze podporují pouze pravidla výjimek, která zakazují konkrétní skriptlety. ::: @@ -4343,7 +4432,7 @@ V modifikátorech musí být uvozeny hodnoty následujících znaků: `[`, `]`, - ✅ — plně podporováno - ✅ * — podporováno, ale spolehlivost se může lišit nebo se mohou vyskytnout omezení; více informací naleznete v popisu modifikátoru -- ❌ — nepodporováno +- ❌ — not supported ::: @@ -4360,7 +4449,7 @@ Modifikátor `$app` umožňuje zúžit pokrytí pravidla na konkrétní aplikaci :::info Kompatibilita -Taková pravidla s modifikátorem `$app` podporuje AdGuard pro Windows, Mac a Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4391,7 +4480,7 @@ Vzhledem k tomu, že nezákladní modifikátor `$domain` funguje stejně jako z :::info Kompatibilita -Pravidla s modifikátorem `$domain` podporuje AdGuard pro Windows, AdGuard pro macOS, AdGuard pro Android, Rozšíření prohlížeče AdGuard pro Chrome, Firefox a Edge. +Pravidla s modifikátorem `$domain` podporuje AdGuard pro Windows, AdGuard pro macOS, AdGuard pro Android, Rozšíření prohlížeče AdGuard pro Chrome, Chrome MV3, Firefox a Edge. ::: @@ -4458,7 +4547,7 @@ V rozšíření prohlížeče AdGuard, nezákladní `$url` modifikátor není ko :::info Kompatibilita -Pravidla s modifikátorem `$url` jsou podporována AdGuardem pro Windows, AdGuardem pro Mac a AdGuardem pro Android s [CoreLibs][] v1.11 nebo novějším a rozšířením prohlížeče AdGuard s [TSUrlFilter][] v3.0.0 nebo novějším. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4472,7 +4561,7 @@ Poskytujeme preprocesorové direktivy, které mohou být použity správci filtr - [zahrnutý soubor](#include-directive) - [použití pravidel podmíněně podle typu blokátoru reklam](#conditions-directive) -- [zadání blokátor obsahu pro pravidla platná v Safari](#safari-affinity-directive) +- [zadání blokátoru obsahu pro pravidla platná v Safari](#safari-affinity-directive) :::note @@ -4558,18 +4647,19 @@ kde: - konstanty specifické pro daný produkt pro případy, kdy potřebujete, aby pravidlo fungovalo (nebo nefungovalo — pak je třeba před konstantou použít `!`) pouze v konkrétním produktu: - `adguard_app_windows` — AdGuard pro Windows - `adguard_app_mac` — AdGuard pro Mac - - `adguard_app_android` — AdGuard pro Android - - `adguard_app_ios` — AdGuard pro iOS - - `adguard_ext_safari` — AdGuard pro Safari - - `adguard_ext_chromium` — Rozšíření prohlížeče AdGuard pro Chrome (a prohlížeče založené na chromium, např. nový Microsoft Edge.) - - `adguard_ext_chromium_mv3` — [AdGuard pro Chrome MV3][ext-mv3] - - `adguard_ext_firefox` — Rozšíření prohlížeče AdGuard pro Firefox - - `adguard_ext_edge` — Rozšíření prohlížeče AdGuard pro starší Edge - - `adguard_ext_opera` — Rozšíření prohlížeče AdGuard pro Operu - - `adguard_ext_android_cb` — Blokátor obsahu AdGuard pro mobilní prohlížeče Samsung a Yandex - - `ext_ublock` — speciální případ; ten je deklarován, když je verze filtru uBlock kompilována pomocí [FiltersRegistry][] - - `cap_html_filtering` — produkty, které podporují pravidla filtrování HTML: AdGuard pro Windows, AdGuard pro macOS a AdGuard pro Android -- `!#else` — začátek blokování při nesplnění podmínek + - `adguard_app_cli` — AdGuard for Linux + - `adguard_app_android` — AdGuard for Android + - `adguard_app_ios` — AdGuard for iOS + - `adguard_ext_safari` — AdGuard for Safari + - `adguard_ext_chromium` — AdGuard Browser Extension for Chrome (and chromium-based browsers, e.g. new Microsoft Edge) + - `adguard_ext_chromium_mv3` — [AdGuard for Chrome MV3][ext-mv3] + - `adguard_ext_firefox` — AdGuard Browser Extension for Firefox + - `adguard_ext_edge` — AdGuard Browser Extension for Edge Legacy + - `adguard_ext_opera` — AdGuard Browser Extension for Opera + - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers + - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux +- `!#else` — začátek bloku při nesplnění podmínek - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — seznamy pravidel - `!#endif` — konec blokování @@ -4733,25 +4823,27 @@ Slouží k zadání platforem pro použití pravidel. Seznam existujících plat - `windows` — AdGuard pro Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard pro Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard pro Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) -- `android` — AdGuard pro Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) +- `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) -- `ios` — AdGuard pro iOS — [https://filters.adtidy.org/ios/filters/2.txt](https://filters.adtidy.org/ios/filters/2.txt) +- `ios` — AdGuard for iOS — [https://filters.adtidy.org/ios/filters/2.txt](https://filters.adtidy.org/ios/filters/2.txt) -- `ext_chromium` — Rozšíření prohlížeče AdGuard pro Chrome — [https://filters.adtidy.org/extension/chromium/filters/2.txt](https://filters.adtidy.org/extension/chromium/filters/2.txt) +- `ext_chromium` — AdGuard Browser Extension for Chrome — [https://filters.adtidy.org/extension/chromium/filters/2.txt](https://filters.adtidy.org/extension/chromium/filters/2.txt) -- `ext_chromium_mv3` — Rozšíření prohlížeče AdGuard pro Chrome MV3 — [https://filters.adtidy.org/extension/chromium-mv3/filters/2.txt](https://filters.adtidy.org/extension/chromium-mv3/filters/2.txt) +- `ext_chromium_mv3` — AdGuard Browser Extension for Chrome MV3 — [https://filters.adtidy.org/extension/chromium-mv3/filters/2.txt](https://filters.adtidy.org/extension/chromium-mv3/filters/2.txt) -- `ext_ff` — Rozšíření prohlížeče AdGuard pro Firefox — [https://filters.adtidy.org/extension/firefox/filters/2.txt](https://filters.adtidy.org/extension/firefox/filters/2.txt) +- `ext_ff` — AdGuard Browser Extension for Firefox — [https://filters.adtidy.org/extension/firefox/filters/2.txt](https://filters.adtidy.org/extension/firefox/filters/2.txt) -- `ext_edge` — Rozšíření prohlížeče AdGuard pro Edge — [https://filters.adtidy.org/extension/edge/filters/2.txt](https://filters.adtidy.org/extension/edge/filters/2.txt) +- `ext_edge` — AdGuard Browser Extension for Edge — [https://filters.adtidy.org/extension/edge/filters/2.txt](https://filters.adtidy.org/extension/edge/filters/2.txt) -- `ext_opera` — Rozšíření prohlížeče AdGuard pro Operu — [https://filters.adtidy.org/extension/opera/filters/2.txt](https://filters.adtidy.org/extension/opera/filters/2.txt) +- `ext_opera` — AdGuard Browser Extension for Opera — [https://filters.adtidy.org/extension/opera/filters/2.txt](https://filters.adtidy.org/extension/opera/filters/2.txt) -- `ext_safari` — AdGuard pro Safari — [https://filters.adtidy.org/extension/safari/filters/2.txt](https://filters.adtidy.org/extension/safari/filters/2.txt) +- `ext_safari` — AdGuard for Safari — [https://filters.adtidy.org/extension/safari/filters/2.txt](https://filters.adtidy.org/extension/safari/filters/2.txt) -- `ext_android_cb` — Blokátor obsahu AdGuard — [https://filters.adtidy.org/extension/android-content-blocker/filters/2.txt](https://filters.adtidy.org/extension/android-content-blocker/filters/2.txt) +- `ext_android_cb` — AdGuard Content Blocker — [https://filters.adtidy.org/extension/android-content-blocker/filters/2.txt](https://filters.adtidy.org/extension/android-content-blocker/filters/2.txt) - `ext_ublock` — uBlock Origin — [https://filters.adtidy.org/extension/ublock/filters/2.txt](https://filters.adtidy.org/extension/ublock/filters/2.txt) @@ -4771,6 +4863,17 @@ S výjimkou AdGuardu pro Safari, Blokátoru obsahu AdGuard a AdGuardu pro iOS je ||example.org^ ``` +#### `NOT_VALIDATE` + +Tato nápověda slouží k přeskočení validace pravidla. Je to užitečné pro pravidla, pro která dosud nebyla do překladače filtrů přidána podpora, nebo pro pravidla, která jsou nesprávně vyřazena. + +**Pokud chcete přidat pravidlo, které by nemělo být validováno, použijte nápovědu `NOT_VALIDATE`:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## Jak ladit pravidla filtrování Jednoduchá pravidla filtrování je možné vytvořit "v hlavě", ale pro cokoli alespoň trochu složitějšího budete potřebovat další nástroje pro jejich ladění a iteraci. Existují nástroje, které vám s tím pomohou. V prohlížeči Chrome a jeho analogiích v ostatních prohlížečích můžete použít nástroj DevTools, ale většina produktů AdGuardu nabízí ještě jeden — Záznam filtrování. @@ -4886,7 +4989,7 @@ Následující skriptlety lze také použít pro účely ladění: ### Zkratky produktů {#what-product} -1. `aplikací CoreLibs` — [AdGuard pro Windows](/adguard-for-windows/features/home-screen), [AdGuard pro Mac](/adguard-for-mac/features/main) a [AdGuard pro Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard pro Chromium` — [Rozšíření prohlížeče AdGuard](/adguard-browser-extension/availability) pro Chrome a další prohlížeče založené na Chromium, např. nový Microsoft Edge a Opera 1. `Adguard pro Chrome MV3` — [Rozšíření prohlížeče AdGuard pro Chrome MV3](/adguard-browser-extension/mv3-version) 1. `Adguard pro Firefox` — [Rozšíření prohlížeče AdGuard](/adguard-browser-extension/availability) pro Firefox @@ -4902,8 +5005,8 @@ Následující skriptlety lze také použít pro účely ladění: - ✅ * — podporováno, ale spolehlivost se může lišit nebo se mohou vyskytnout omezení; více informací naleznete v popisu modifikátoru - 🧩 — může být již implementováno ve verzích nightly nebo beta, ale není ještě podporováno ve verzích pro vydání - ⏳ - funkce, jejíž implementace se plánuje, ale zatím není k dispozici v žádném produktu -- ❌ — nepodporováno -- 👎 — zastaralé; stále podporovano, ale v budoucnu bude odstraněno +- ❌ — not supported +- 👎 — deprecated; still supported but will be removed in the future - 🚫 — odstraněno a již nepodporováno ::: @@ -4918,13 +5021,14 @@ Následující skriptlety lze také použít pro účely ladění: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "Rozšíření prohlížeče AdGuard pro Chrome MV3" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-mv3]: #what-product "Rozšíření prohlížeče AdGuard pro Chrome MV3" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" +[ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-ff]: #what-product "AdGuard Browser Extension for Firefox" [ios-app]: #what-product "AdGuard for iOS and AdGuard Pro for iOS" [ios-app]: #what-product "AdGuard for iOS and AdGuard Pro for iOS" diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/cs/docusaurus-plugin-content-docs/current/general/license/legacy.md index 99a007c28c8..f93799120e2 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -5,7 +5,7 @@ sidebar_position: 6 Tento článek jsme napsali, abychom předešli zmatkům a podrobně vysvětlili, jak můžete obnovit/upgradovat zastaralou (starší) licenci AdGuardu. -## Informace o zastaralých licencích +## Informace o sterších licencích Zpočátku byly k aktivaci produktů AdGuard k dispozici následující typy licencí: @@ -27,54 +27,52 @@ U všech typů (Standardní, Mobilní, Prémiová) byly možnosti pro roční a V říjnu 2019 přešel AdGuard na nový systém licencování: od té doby lze stále zakoupit licence na 1 rok nebo doživotní licence, ale jejich typy se změnily na **Osobní** (až pro 3 zařízení) nebo **Rodinnou** (až pro 9 zařízení). -Ještě jedna změna: **licenční klíče nového typu lze nyní používat na jakémkoli zařízení a v libovolné kombinaci. Osobní licenci lze například použít pro Android, Mac a iOS, stejně jako pro dva počítače s Windows, tablet Apple atd.** +Další změnou je, že **nové typy licenčních klíčů lze nyní používat na libovolném zařízení v libovolné kombinaci**. Osobní licenci lze například použít pro Android, Mac a iOS, stejně jako pro dva počítače s Windows, tablet Apple atd. -## Co se stalo se zastaralými licencemi? +## Co se stalo se staršími licencemi? -Standardní byly automaticky změněny na univerzální, což znamená, že je lze aktivovat na jakémkoli zařízení. +**Standardní licence** byly automaticky změněny na **univerzální**, což znamená, že je lze aktivovat na jakémkoli zařízení. -Mobilní zůstaly nezměněny a omezeny na platformu (lze je stále používat pouze na telefonech nebo tabletech). +**Mobilní licence** zůstaly nezměněny a omezeny na platformu (lze je stále používat pouze na telefonech nebo tabletech). -Prémiové licence zůstaly také beze změny a s omezením na platformu. A i když se nyní na vašem osobním účtu zobrazují **Prémiové licencí podle celkového počtu zařízení**, stále je lze aktivovat na sadě stolních a mobilních zařízení. +**Prémiové licence** zůstaly také beze změny a s omezením na platformu. A i když se nyní na vašem osobním účtu zobrazují **Prémiové licencí podle celkového počtu zařízení**, stále je lze aktivovat na sadě stolních a mobilních zařízení. Takto například vypadá klíč 1+1: -![1+1 key](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 key](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *Ale navzdory celkovému počtu zařízení (2) ji lze aktivovat na 1 stolním počítači a 1 mobilním zařízení.* > Všechny zastaralé licence mají v účtu AdGuard odznak "starší". Při obnově nebo upgrade se automaticky převedou na nový typ. Existují však určité nuance. Podívejme se, které licence lze převést na nový typ a jak to provést. -## Mám zastaralý (starší) klíč. Jaké možnosti obnovení/upgrade mám k dispozici? +## Jak obnovit nebo upgradovat starší klíč -Můžete to zkontrolovat na [stránce obnovení](https://adguard.com/renew.html) nebo ve svém [AdGuard účtu](https://adguardaccount.com/main.html): +Starší licenci můžete prodloužit/obnovit nebo upgradovat ve svém [účtu AdGuard](https://adguardaccount.com) nebo na [stránce Prodloužit nebo upgradovat](https://adguard.com/renew.html). -![Upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Přejděte na kartu "Moje licence" a zkontrolujte, jaké akce máte k dispozici pro každý konkrétní klíč. Níže to vysvětlíme na konkrétních příkladech. +Chcete-li prodloužit/obnovit nebo upgradovat starší licenci ve svém účtu AdGuard, přejděte na kartu *Licence*, vyhledejte potřebnou licenci a vyberte jednu z dostupných možností. -### Licence pro 1/2/3 zařízení +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Roční licence** pro 1, 2 nebo 3 zařízení lze převést na Osobní nebo Rodinné: +Nebo přejděte na [stránku Prodloužit nebo upgradovat](https://adguard.com/renew.html), zadejte licenci a klikněte na tlačítko *Použít*. Na nové stránce vyberte jednu z dostupných možností. -![Upgrade or renew](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Vyberte si podle toho, kolik zařízení potřebujete chránit. +### Licence pro 1/2/3 zařízení -Místo obnovení můžete přejít na doživotní: +Mobilní roční licence pro 3 zařízení lze převést na osobní licence nebo upgradovat na rodinné licence: -![Lifetime](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Lifetime](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Doživotní licence** lze z důvodu technických omezení převést pouze na Rodinné (9 zařízení): +> Pokud máte **licenci Standard pro 3 zařízení**, funguje již jako licence **Osobní**. Pokud si obnovíte licenci **Mobilní licebci** pro 3 zařízení, budete ji moci používat na **různých zařízeních**, nejen na telefonech. -![Lifetime upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +Licenci můžete také upgradovat na doživotní: -### Licence pro více než 4 zařízení (až 9) +![Lifetime upgrade](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Roční** klíče této konfigurace lze převést pouze na Rodinnou licenci: +**Doživotní licence** lze kvůli technickým omezením upgradovat pouze na Rodinnou (9 zařízení). -![Yearly license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licence pro více než 4 zařízení (až 9) -**Doživotní** licence pro 4 a více zařízení nelze upgradovat z důvodu technického omezení: +**Roční licence** pro 4 a více zařízení lze upgradovat na Rodinné a Doživotní licence. -![Lifetime license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +Pokud již máte **doživotní** licenci, nelze ji z technických důvodů upgradovat. ### Licence pro 9 a více zařízení diff --git a/i18n/cs/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/cs/docusaurus-plugin-content-docs/current/general/license/what-is.md index ca9d42c9007..22252d290c6 100644 --- a/i18n/cs/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/cs/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ Existují také licence, které si uživatel může zakoupit z jiných zdrojů n - **Distributorské licence** a **Darované licence** mohou být časově omezené i časově neomezené. Licence s datem vypršení platnosti lze obnovit pouze ručně - Osobní — až pro 3 zařízení - Rodinná — až pro 9 zařízení -- **Licence AdGuard Pro pro iOS** je zakoupena a spravována prostřednictvím App Store a lze ji používat pouze na zařízeních se systémem iOS a iPadOS se stejným Apple ID +- **Licence AdGuard Pro pro iOS** a **AdGuard Pro** jsou zakoupeny a spravovány prostřednictvím App Store a lze je používat pouze na zařízeních se systémem iOS a iPadOS se stejným Apple ID :::tip diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 92bfd87a1dd..fa490098e78 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ The _Low-level settings_ section is for expert users. [Read more about low-level This section allows you to manage HTTPS filtering settings, filters, and userscripts, and set up a proxy server. -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filters @@ -57,11 +57,19 @@ If you activate too many filters, some websites may work incorrectly. [Read more about filters](https://adguard.com/en/blog/what-are-filters.html) -### Userscripts +### Extensions + +Extensions allow you to add userscripts and userstyles. + +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 5e75a51f1e8..b5525cd735c 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 24b41b032ca..8f7344f7ade 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index da99768471a..0341d942127 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: How to protect AdGuard from being disabled by the system -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 7367e63cef9..784a7c9587c 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ You can access it by navigating to *Statistics* → *Battery usage*. Inside you will find a chart that shows the AdGuard battery resource consumption within the last 24 hours, with an option to get more detailed hour-to-hour data by tapping on the chart. Besides that, there’s also a numeric breakdown of the relevant data and a short technical explanation. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### How much battery resource does AdGuard really consume? First, let us lay down a bit of theory and links with necessary data. diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 6f1876d0079..0563d2a0336 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index d98274a0489..c77491236e7 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index deebee15677..c716cc3ed93 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Manual installation of the security certificate into the Firefox browser -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index c5b7755321a..05d28c3b6ea 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 54b325ec582..52016424603 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 79723d1f221..b9f70d23922 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problems caused by multiple user profiles -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 6b9fddc4500..f95d206303e 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: How to set up outbound proxy -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index b9e9396152a..4ae364e8290 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 96b31c31295..25de8d83319 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index adfd7139869..5d8aa06bad9 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: How to block ads in the YouTube app -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 43c9e9aee82..67126401ab4 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,23 +5,25 @@ sidebar_position: 2 ## Install AdGuard for Linux -To install AdGuard, enter: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` @@ -35,37 +37,97 @@ You can verify the signature to prove it’s an official version of AdGuard by u ::: -## Activate license +## Initial setup -AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don't have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -To log in or create an account, enter: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -To reset your license, enter: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -To view the license info, enter: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Initial setup +4. After activation, you can continue to work with the program: -To get AdGuard up and running, complete the initial setup. This includes installing the AdGuard CA certificate, enabling the necessary filters, and selecting the proxy mode. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -To run the configuration wizard, enter: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). ## Uninstall AdGuard for Linux @@ -73,19 +135,19 @@ To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 85de0186c4f..2487dcaac3b 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Settings and protection management sidebar_position: 3 --- +## Available commands + To get a list of all available AdGuard commands, enter: -``` +```sh adguard-cli --help-all ``` ## Enable and disable protection +### Enable protection + To enable protection, enter: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + To disable protection, enter: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + To view the protection status, enter: -``` +```sh adguard-cli status ``` -## Check for updates +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Check for updates To check for updates, enter: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + To update AdGuard for Linux, enter: -``` +```sh adguard-cli update ``` +### Update script output + To view the update script output, enter: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Use the `config` command to configure AdGuard for Linux. Subcommands: - `show`: Show the current configuration in `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configure an option in `proxy.yaml` - `listen_ports.http_proxy`: HTTP listening port - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `get`: Get the current status of the above options ## Manage filters @@ -64,8 +90,32 @@ Use the `config` command to configure AdGuard for Linux. Subcommands: Use the `filters` command to configure AdGuard for Linux. Subcommands: - `list`: List installed filters + - `--all`: View all filters + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Install a filter. Enter the URL of the filter you want to install + - `enable`: Enable a filter. Enter the name or ID of the filter + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Disable a filter. Enter the name or ID of the filter + - `update`: Update filters + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index 412685edf25..86c048ff7a0 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ This page describes the features and details of AdGuard’s central management o ## 1. Download the MSI {#msi-download} -Download the [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi) +Download the [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Download the [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi) +Download the [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configure the settings for your network {#settings-configuring} diff --git a/i18n/da/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/da/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index cf76ff7fe89..24b6011caf1 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + is converted to + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-ff]: #what-product "AdGuard Browser Extension for Firefox" diff --git a/i18n/da/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/da/docusaurus-plugin-content-docs/current/general/license/legacy.md index 6b1c2a74395..1e68e937061 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: Legacy licenses FAQ sidebar_position: 6 --- -We have written this article to avoid confusion and explain in detail how you can renew/upgrade an outdated (legacy) AdGuard license. +We have written this article to avoid confusion and explain in detail how you can renew/upgrade a legacy AdGuard license. -## About the outdated licenses +## About legacy licenses Initially licenses of the following types were available to activate AdGuard products: @@ -27,54 +27,52 @@ For all types (Standard, Mobile, Premium) there were options for a Yearly and Li In October 2019 AdGuard switched to the new licensing system: from then on, licenses can still be purchased for 1 year or Lifetime, but their types have become **Personal** (for up to 3 devices) or **Family** (for up to 9 devices). -One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal license can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet.** +Another change is that the **new types of license keys can now be used on any device, in any combination**. For example, a Personal license can be used on Android, Mac and iOS, as well as on two Windows computers and an Apple tablet. -## What happened to the outdated licenses? +## What happened to the legacy licenses? -Standard were automatically made universal, which means that they can be activated on any devices. +**Standard licenses** were automatically made **universal**, which means that they can be activated on any device. -Mobile licenses remained unchanged and platform-limited (they can still only be used on phones or tablets). +**Mobile licenses** remained unchanged and platform-limited (they can still only be used on phones or tablets). -Premium licenses also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. +**Premium licenses** also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. For example, this is how the 1+1 key looks like: -![1+1 key](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 key](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *But despite the total number of devices (2) it can be activated on 1 desktop and 1 mobile device.* > All the outdated licenses have a "legacy" badge in the AdGuard account. And they are automatically converted to a new type when you either renew or upgrade them. But there are some nuances. Let's see which licenses can be converted to a new type and how to do it. -## I have an outdated (legacy) key. What renewal/upgrade options are available for me? +## How to renew or upgrade a legacy key -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +You can extend/renew or upgrade a legacy license in your [AdGuard account](https://adguardaccount.com) or on the [Extend or upgrade page](https://adguard.com/renew.html). -![Upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Go to "My licenses" tab and check what actions are available to you for each specific key. Below we will explain with specific examples. +To extend/renew or upgrade a legacy license in your AdGuard account, go to the *Licenses* tab, find the license you need, and select one of the available options. -### Licenses for 1/2/3 devices +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Yearly** licenses for 1, 2, 3 devices can be converted to either Personal or Family: +Or go to the [Extend or upgrade page](https://adguard.com/renew.html), enter your license, and click *Apply*. On the new page, select one of the available options. -![Upgrade or renew](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Choose based on how many devices you need to protect. +### Licenses for 1/2/3 devices -Instead of renewal you can switch to Lifetime: +Mobile Yearly licenses for 3 devices can be converted to Personal licenses or upgraded to Family ones: -![Lifetime](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Upgrade Yearly licenses for 1, 2, 3 devices](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Lifetime** licenses can only be converted to Family (9 devices) due to technical limitations: +> If you have a **Standard license for 3 devices**, it already works as a **Personal** license. If you renew your **Mobile license** for 3 devices, you will be able to use it on a **different set of device**s, not just phones. -![Lifetime upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +You can also upgrade your license to Lifetime: -### Licenses for 4+ devices (up to 9) +![Upgrade to Lifetime](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Yearly** keys of this configuration can only be converted into a Family license: +**Lifetime** licenses can only be upgraded to Family (9 devices) due to technical limitations. -![Yearly license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licenses for 4+ devices (up to 9) -**Lifetime** licenses for 4 or more devices cannot be upgraded due to technical limitation: +**Yearly** licenses for 4 or more devices can be upgraded to Family and Lifetime licenses. -![Lifetime license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +However, if you already have a **Lifetime** license, it cannot be upgraded due to technical limitations. ### Licenses for 9+ devices diff --git a/i18n/da/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/da/docusaurus-plugin-content-docs/current/general/license/what-is.md index a3b22328a24..fd9fa685ce2 100644 --- a/i18n/da/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/da/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ There are also licenses that the user can purchase from other sources or get for - **Distributor licenses** and **gifted licenses** can be both time-limited and non-time limited. Licenses with an expiration date can only be renewed manually - Personal — up to 3 devices - Family — up to 9 devices -- **The AdGuard Pro for iOS license** is purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 9fd91793839..af5ce35de4f 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ Der Abschnitt _Low-Level-Einstellungen_ ist für erfahrene Benutzer:innen gedach In diesem Abschnitt können Sie die Einstellungen für die HTTPS-Filterung, Filter und Benutzerskripte verwalten und einen Proxyserver einrichten. -![Filtern \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filter @@ -57,102 +57,110 @@ Wenn Sie zu viele Filter aktivieren, kann es sein, dass einige Websites nicht ri [Lesen Sie mehr über Filter](https://adguard.com/en/blog/what-are-filters.html) -### Benutzerskripte +### Erweiterungen -Benutzerskripte sind in JavaScript geschriebene Miniprogramme, die die Funktionalität einer oder mehrerer Websites erweitern. Um ein Benutzerskript zu installieren, benötigen Sie einen speziellen Benutzerskript-Manager. AdGuard verfügt über eine solche Funktion und ermöglicht das Hinzufügen von Benutzerskripten per URL oder aus einer Datei. +Extensions allow you to add userscripts and userstyles. -![Benutzerskripte \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) + +Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. + +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra -AdGuard Extra ist ein benutzerdefiniertes Skript, das komplexe Werbung und Mechanismen, die Werbung auf Websites einschleusen, blockiert. +AdGuard Extra is a custom userscript that blocks complex ads and mechanisms that reinject ads to websites. -#### AMP deaktivieren +#### Disable AMP -„AMP deaktivieren“ ist ein Benutzerskript, das [Accelerated Mobile Pages](https://de.wikipedia.org/wiki/Accelerated_Mobile_Pages) auf der Google-Suchergebnisseite deaktiviert. +Disable AMP is a userscript that disables [Accelerated mobile pages](https://en.wikipedia.org/wiki/Accelerated_Mobile_Pages) on the Google search results page. ### Netzwerk #### HTTPS-Filterung -Um Werbung und Tracker auf den meisten Websites und in den meisten Apps zu blockieren, muss AdGuard deren HTTPS-Datenverkehr filtern. [Lesen Sie mehr über HTTPS-Filterung](/general/https-filtering/what-is-https-filtering) +To block ads and trackers on most websites and in most apps, AdGuard needs to filter their HTTPS traffic. [Read more about HTTPS filtering](/general/https-filtering/what-is-https-filtering) -##### Sicherheitszertifikate +##### Security certificates -Um den verschlüsselten Datenverkehr zu verwalten, installiert AdGuard sein CA-Zertifikat auf Ihrem Gerät. Es ist sicher: Der Datenverkehr wird lokal gefiltert und AdGuard prüft die Sicherheit der Verbindung. +To manage encrypted traffic, AdGuard installs its CA certificate on your device. It's safe: the traffic is filtered locally and AdGuard verifies the security of the connection. -Bei älteren Android-Versionen wird das Zertifikat automatisch installiert. Unter Android 11 und höher müssen Sie es manuell installieren. [Installationsanweisungen](/adguard-for-android/solving-problems/manual-certificate/) +On older versions of Android, the certificate is installed automatically. On Android 11 and later, you need to install it manually. [Installation instructions](/adguard-for-android/solving-problems/manual-certificate/) -Das CA-Zertifikat im Benutzerspeicher reicht aus, um den HTTPS-Datenverkehr in Browsern und einigen Apps zu filtern. Es gibt jedoch Apps, die nur Zertifikaten aus dem Systemspeicher vertrauen. Um dort HTTPS-Verkehr zu filtern, müssen Sie das CA-Zertifikat von AdGuard im Systemspeicher installieren. [Anleitung](/adguard-for-android/solving-problems/https-certificate-for-rooted/) +The CA certificate in the user store is enough to filter HTTPS traffic in browsers and some apps. However, there are apps that only trust certificates from the system store. To filter HTTPS traffic there, you need to install AdGuard's CA certificate into the system store. [Instructions](/adguard-for-android/solving-problems/https-certificate-for-rooted/) -##### HTTPS-gefilterte Apps +##### HTTPS-filtered apps -Dieser Abschnitt enthält die Liste der Apps, für die AdGuard HTTPS-Datenverkehr filtert. Bitte beachten Sie, dass diese Einstellung nur dann auf alle Apps angewendet werden kann, wenn sich die CA-Zertifikate sowohl im Benutzerspeicher als auch im Systemspeicher befinden. +This section contains the list of apps for which AdGuard filters HTTPS traffic. Please note that the setting can be applied for all apps only if you have CA certificates both in the user store and in the system store. -##### HTTPS-gefilterte Websites +##### HTTPS-filtered websites -Mit dieser Einstellung können Sie Websites verwalten, für die AdGuard HTTPS-Verkehr filtern soll. +This setting allows you to manage websites for which AdGuard should filter HTTPS traffic. -Die HTTPS-Filterung ermöglicht es AdGuard, den Inhalt von Anfragen und Antworten zu filtern, aber es werden keine Daten gesammelt oder gespeichert. Um jedoch die Sicherheit zu erhöhen, [schließen wir Websites, die potenziell sensible Informationen enthalten, von der HTTPS-Filterung aus](/general/https-filtering/what-is-https-filtering/#financial-websites-and-websites-with-sensitive-personal-data). +HTTPS filtering allows AdGuard to filter the content of requests and responses, but we never collect or store this data. However, to increase security, we [exclude websites that contain potentially sensitive information from HTTPS filtering](/general/https-filtering/what-is-https-filtering/#financial-websites-and-websites-with-sensitive-personal-data). -Sie können auch Websites, die Sie für notwendig erachten, zu den Ausschlüssen hinzufügen, indem Sie einen der Modi auswählen: +You can also add websites that you consider necessary to exclusions by selecting one of the modes: -- Bestimmte Websites von der HTTPS-Filterung ausschließen -- Filtert HTTPS-Datenverkehr nur auf den Websites, die zu den Ausschlüssen hinzugefügt wurden +- Exclude specific websites from HTTPS filtering +- Filter HTTPS traffic only on the websites added to exclusions -Standardmäßig werden auch keine Websites mit Extended Validation (EV)-Zertifikaten gefiltert, wie z. B. Finanzseiten. Falls erforderlich, können Sie die Option _Websites mit EV-Zertifikaten filtern_ aktivieren. +By default, we also do not filter websites with Extended Validation (EV) certificates, such as financial websites. Falls erforderlich, können Sie die Option _Websites mit EV-Zertifikaten filtern_ aktivieren. #### Proxy -Sie können AdGuard so einrichten, dass der gesamte Datenverkehr Ihres Geräts über Ihren Proxy-Server geleitet wird. [So richten Sie einen Outbound-Proxy ein](/adguard-for-android/solving-problems/outbound-proxy) +You can set up AdGuard to route all your device's traffic through your proxy server. [How to set up an outbound proxy](/adguard-for-android/solving-problems/outbound-proxy) -In diesem Abschnitt können Sie auch ein VPN eines Drittanbieters für die Verwendung mit AdGuard einrichten, sofern Ihr VPN-Anbieter dies zulässt. +In this section, you can also set up a third-party VPN to work with AdGuard, if your VPN provider allows it. -Unter _Über Proxy geleitete Apps_, können Sie Apps auswählen, die ihren Datenverkehr über den von Ihnen angegebenen Proxy leiten sollen. Wenn Sie _Integration mit AdGuard VPN_ aktiviert haben, übernimmt diese Einstellung die Rolle der App-Ausschlüsse von AdGuard VPN: Sie können hier Apps angeben, die durch den AdGuard VPN-Tunnel geleitet werden sollen. +Under _Apps operating through proxy_, you can select apps that will route their traffic through your specified proxy. If you have _Integration with AdGuard VPN_ enabled, this setting plays the role of AdGuard VPN's app exclusions: it allows you to specify apps to be routed through the AdGuard VPN tunnel. -#### Routing-Modus +#### Routing mode -In diesem Abschnitt können Sie die Methode zur Filterung des Datenverkehrs auswählen. +This section allows you to select the traffic filtering method. -- _Lokales VPN_ filtert den Datenverkehr durch ein lokal eingerichtetes VPN. Dies ist der zuverlässigste Modus. Aufgrund der Android-Einschränkungen ist dies auch die einzige systemweite Methode zur Filterung des Datenverkehrs, die auf nicht gerooteten Geräten verfügbar ist. +- _Local VPN_ filters traffic through a locally created VPN. This is the most reliable mode. Due to Android restrictions, it is also the only system-wide traffic filtering method available on non-rooted devices. :::note -Der Modus _Lokales VPN_ erlaubt es nicht, AdGuard gleichzeitig mit anderen VPNs zu verwenden. Um ein anderes VPN mit AdGuard zu verwenden, müssen Sie es für den Proxy-Modus umkonfigurieren und einen ausgehenden Proxy im AdGuard einrichten. Bei AdGuard VPN geschieht dies automatisch mit Hilfe des [_Integrierten Modus_](/adguard-for-android/features/integration-with-vpn). +The _Local VPN_ mode doesn't allow AdGuard to be used simultaneously with other VPNs. To use another VPN with AdGuard, you need to reconfigure it to work in proxy mode and set up an outbound proxy in AdGuard. For AdGuard VPN, this is done automatically with the help of the [_Integrated mode_](/adguard-for-android/features/integration-with-vpn). ::: -- Der _Automatische Proxy_ ist eine alternative Methode zur Weiterleitung des Datenverkehrs, die keine Verwendung eines VPNs erfordert. Ein wesentlicher Vorteil ist, dass er parallel zu einem VPN betrieben werden kann. Dieser Modus erfordert Root-Zugriff. +- _Automatic proxy_ is an alternative traffic routing method that does not require the use of a VPN. One significant advantage is that it can be run in parallel with a VPN. This mode requires root access. -- Beim _Manuellen Proxy_ wird ein Proxyserver an einem bestimmten Port eingerichtet, der dann in den WLAN-Einstellungen konfiguriert werden kann. Dieser Modus erfordert Root-Zugriff für Android 10 und höher. +- _Manual proxy_ involves setting up a proxy server on a specific port, which can then be configured in Wi-Fi settings. This mode requires root access for Android 10 and above. ## Lizenz -In diesem Abschnitt finden Sie Informationen über Ihre Lizenz und können sie verwalten: +In this section, you can find information about your license and manage it: -- Eine AdGuard-Lizenz kaufen, um [die Funktionen der Vollversion](/adguard-for-android/features/free-vs-full) zu aktivieren -- Sich bei Ihrem AdGuard-Konto anmelden oder den Lizenzschlüssel eingeben, um Ihre Lizenz zu aktivieren -- Sich anmelden, um Ihren 7-tägigen Testzeitraum zu aktivieren, falls Sie ihn noch nicht genutzt haben -- Aktualisieren Sie den Lizenzstatus über das Menü mit den drei Punkten (⋮) -- Das AdGuard-Konto öffnen und Ihre Lizenz dort verwalten -- Ihre Lizenz zurücksetzen — zum Beispiel, wenn Sie das Gerätelimit für diese Lizenz erreicht haben und eine andere Lizenz beantragen möchten +- Buy an AdGuard license to activate [the full version's features](/adguard-for-android/features/free-vs-full) +- Log in to your AdGuard account or enter the license key to activate your license +- Sign up to activate your 7-day trial period if you haven't used it yet +- Refresh the license status from the three-dots menu (⋮) +- Open the AdGuard account to manage your license there +- Reset your license — for example, if you've reached device limit for this license and want to apply another one -![Lizenzbildschirm \*mobile_border](https://cdn.adtidy.org/blog/new/3wyh5hlicense.png) +![License screen \*mobile_border](https://cdn.adtidy.org/blog/new/3wyh5hlicense.png) ## Support -Nutzen Sie diesen Abschnitt, wenn Sie Fragen oder Anregungen zu AdGuard für Android haben. Wir empfehlen, die _[FAQ](https://adguard.com/support/adguard_for_android.html)_ oder diese Wissensdatenbank zu konsultieren, bevor Sie den Support kontaktieren. +Use this section if you have any questions or suggestions regarding AdGuard for Android. We recommend consulting _[FAQ](https://adguard.com/support/adguard_for_android.html)_ or this knowledge base before contacting support. ![Support \*mobile_border](https://cdn.adtidy.org/blog/new/cz55usupport.png) -Wenn Sie eine übersehene Werbung bemerken, melden Sie sie bitte über _Fehlerhaftes Sperren melden_. +If you notice a missed ad, please report it via _Report incorrect blocking_. -Bei unerwartetem Verhalten der App wählen Sie _Fehler melden_. Wenn möglich, beschreiben Sie Ihr Problem detailliert und fügen Sie App-Protokolle hinzu. [So beschreiben Sie ein Problem](/guides/report-bugs/#how-to-describe-a-problem) +For unexpected app behavior, select _Report a bug_. If possible, describe your problem in detail and add app logs. [How to describe an issue](/guides/report-bugs/#how-to-describe-a-problem) -Für Ihre Vorschläge verwenden Sie bitte _Funktion vorschlagen_. +For your suggestions, use _Request a feature_. :::note -GitHub ist eine alternative Möglichkeit, Fehler zu melden und neue Funktionen vorzuschlagen. [Anleitungen und Repository-Links](/guides/report-bugs/#adguard-for-android) +GitHub is an alternative way to report bugs and suggest new features. [Instructions and repository links](/guides/report-bugs/#adguard-for-android) ::: diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 30d775580ea..91d57c0fcdb 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: So installieren Sie AdGuard für Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index b458811bd9e..966e979d4fa 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: So deaktivieren Sie die Auto Blocker-Funktion auf Samsung-Geräten -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index 248fbf09383..2c46505078b 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: Einrichten des AdGuard-Hintergrundbetriebs -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 2e7a86c1beb..58c6e688546 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ Sie können darauf zugreifen, indem Sie zu *Statistiken* → *Batterieverbrauch* Darin finden Sie ein Diagramm, das den Verbrauch der AdGuard-Batterieressourcen in den letzten 24 Stunden anzeigt, mit der Option, durch Antippen des Diagramms detailliertere Daten von Stunde zu Stunde zu erhalten. Darüber hinaus gibt es auch eine numerische Aufschlüsselung der relevanten Daten und eine kurze technische Erklärung. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### Wie viel Batteriekapazität verbraucht AdGuard wirklich? Lassen Sie uns zunächst ein paar theoretische Überlegungen anstellen und mit den erforderlichen Daten verknüpfen. diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 4171ef1e361..5b811e2fcfd 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Bekannte Kompatibilitätsprobleme mit Android-Anwendungen -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index 14c7d641425..2d603161f0e 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Probleme durch erweiterte, eingeschränkte Einstellungen -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ Dieser Artikel behandelt AdGuard für Android, einem multifunktionalen Werbebloc ::: -In dem Bemühen, die Privatsphäre der Nutzer zu verbessern, hat Google die Beschränkungseinstellungen in Android 15 erweitert. Für die Aktivierung weiterer Einstellungen, wie z. B. _Zugang zur Nutzung von Apps_, ist nun eine zusätzliche Berechtigung erforderlich. Da für die Funktionen _[Firewall](/adguard-for-android/features/protection/firewall)_ und _[Samsung Pay erkennen](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ die Einstellung _Zugriff auf App-Nutzung_ aktiviert sein muss, damit sie ordnungsgemäß funktionieren, kann es zu Problemen bei der Verwendung kommen. Um diese Probleme zu beheben, führen Sie bitte die folgenden Schritte aus: +In dem Bemühen, die Privatsphäre der Nutzer zu verbessern, hat Google die Beschränkungseinstellungen in Android 15 erweitert. Für die Aktivierung weiterer Einstellungen, wie z. B. _Zugang zur Nutzung von Apps_, ist nun eine zusätzliche Berechtigung erforderlich. Da für die Funktionen _[Firewall](/adguard-for-android/features/protection/firewall)_ und _[Samsung Pay erkennen](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ die Einstellung _Zugriff auf App-Nutzung_ aktiviert sein muss, damit sie ordnungsgemäß funktionieren, kann es zu Problemen bei der Verwendung kommen. To resolve these issues, please follow the steps below. :::note @@ -17,20 +17,44 @@ AdGuard verfolgt eine strikte Politik das nicht protokolliert wird, was bedeutet ::: -1. Öffnen Sie auf Ihrem Android-Gerät die App **Einstellungen**. -2. Tippen Sie auf **Apps**. -3. Tippen Sie auf **AdGuard** +## Basic instructions + +1. On your Android device, open the **Settings app**. +2. Tap **Apps**. +3. Tap **AdGuard** ![AdGuard in Apps \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted1.png) -Wenn Sie sie dort nicht finden können, tippen Sie zunächst auf **Alle Apps anzeigen** oder **App-Info**. +If you can't find it, first tap **See all apps** or **App info**. + +1. Tap **More** (⁝) → _Allow restricted settings_. + +![Allow restricted settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted2.png) + +Follow the on-screen instructions. + +All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. + +![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) -1. Tippen Sie auf **Mehr** (⁝) → _Eingeschränkte Einstellungen zulassen_. +1. Select _Usage data access_ -![Eingeschränkte Einstellungen zulassen \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted2.png) +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) -Folgen Sie den Anweisungen auf dem Bildschirm. +1. Find and enable _AdGuard_ -Fertig! Jetzt funktionieren die Funktionen _Firewall_ und _Samsung Pay erkennen_ korrekt. +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) -![Eingeschränkte Einstellungen für AdGuard erlaubt \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) +All done! diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index 4083475b0a9..b53fa730673 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Manuelle Installation des Sicherheitszertifikats im Firefox-Browser -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index b7810352aae..dfdb0f98523 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Verschieben von CA-Zertifikaten in den Systemspeicher auf gerooteten Geräten -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 15f7e1472b4..24c1d23bdaf 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Zertifikatsinstallation auf Geräten mit Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 0f4c472d39b..fb05f1cd203 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Probleme, die durch mehrere Benutzerprofile verursacht werden -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 73ee9e51f7d..583022d195e 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: Einrichten eines ausgehenden Proxys -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index 2e5d854b908..f60226457bb 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: So verwenden Sie Samsung Pay mit AdGuard in Südkorea -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 5a93c4b78fc..a44c0010fcc 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Zertifikatsinstallation in einem Sicherheitsordner -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index c3a382b949c..35e039634da 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: So blockieren Sie Werbung in der YouTube-App -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index b592ea897d6..a56d7eb0edc 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,88 +5,150 @@ sidebar_position: 2 ## AdGuard für Linux installieren -Um AdGuard zu installieren, geben Sie ein: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta-Version +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly-Version +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` -Geben Sie bei Bedarf Ihr Admin-Passwort ein. +If required, enter your admin password. -Drücken Sie `y`, um einen Link in `/usr/local/bin` auf die ausführbare Datei zu erstellen und warten Sie, bis die Installation abgeschlossen ist. +Press `y` to create a link in `/usr/local/bin` to the executable and wait until the installation is complete. :::note -Sie können die Signatur überprüfen, um zu beweisen, dass es sich um eine offizielle Version von AdGuard handelt, indem Sie das Tool `gpg` verwenden. [Erfahren Sie mehr auf GitHub](https://github.com/AdguardTeam/AdGuardCLI?tab=readme-ov-file#verify-releases) +You can verify the signature to prove it’s an official version of AdGuard by using the `gpg` tool. [Read more on GitHub](https://github.com/AdguardTeam/AdGuardCLI?tab=readme-ov-file#verify-releases) ::: -## Lizenz aktivieren +## Initial setup -AdGuard für Linux erfordert eine [AdGuard-Lizenz] (https://adguard.com/license.html). Wenn Sie noch keine Lizenz haben, können Sie sich anmelden oder ein Konto erstellen, um eine kostenlose 14-tägige Testversion zu erhalten. Wenn Sie bereits eine Lizenz besitzen, melden Sie sich an, um sie zu aktivieren. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -Um sich anzumelden oder ein Konto zu erstellen, geben Sie ein: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -Um Ihre Lizenz zurückzusetzen, geben Sie ein: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -Um die Lizenzinformationen anzuzeigen, geben Sie ein: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Ersteinrichtung +4. After activation, you can continue to work with the program: -Um AdGuard nutzen zu können, führen Sie die Ersteinrichtung durch. Dazu gehören die Installation des AdGuard CA-Zertifikats, die Aktivierung der erforderlichen Filter und die Auswahl des Proxy-Modus. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -Um den Konfigurationsassistenten zu starten, geben Sie ein: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering -## AdGuard für Linux deinstallieren + ```sh + adguard-cli start + ``` -Um AdGuard zu deinstallieren, geben Sie ein: + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). + +## Uninstall AdGuard for Linux + +To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` -Beta-Version +Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` -Nightly-Version +Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` -Geben Sie bei Bedarf Ihr Admin-Passwort ein. +If required, enter your admin password. diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 236bee612c9..2861711ebe7 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Einstellungen und Schutzverwaltung sidebar_position: 3 --- +## Available commands + Um eine Liste aller verfügbaren AdGuard-Befehle zu erhalten, geben Sie ein: -``` +```sh adguard-cli --help-all ``` ## Schutz aktivieren und deaktivieren +### Enable protection + Um den Schutz zu aktivieren, geben Sie ein: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + Um den Schutz zu deaktivieren, geben Sie ein: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + Um den Schutzstatus anzuzeigen, geben Sie ein: -``` +```sh adguard-cli status ``` -## Auf Aktualisierungen prüfen +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Auf Aktualisierungen prüfen Um auf Aktualisierungen zu prüfen, geben Sie ein: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + Um AdGuard für Linux zu aktualisieren, geben Sie ein: -``` +```sh adguard-cli update ``` +### Update script output + Um die Ausgabe des Aktualisierungsskripts anzuzeigen, geben Sie ein: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Verwenden Sie den Befehl `config`, um AdGuard für Linux zu konfigurieren. Unterbefehle: - `show`: Die aktuelle Konfiguration in `proxy.yaml` anzeigen + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Eine Option in `proxy.yaml` konfigurieren - `listen_ports.http_proxy`: HTTP-Lauschport - `proxy_mode`: Proxy-Modus (`manual` oder `auto`) + - `get`: Den aktuellen Status der oben genannten Optionen abrufen ## Filter verwalten @@ -64,8 +90,32 @@ Verwenden Sie den Befehl `config`, um AdGuard für Linux zu konfigurieren. Unter Verwenden Sie den Befehl `filters`, um AdGuard für Linux zu konfigurieren. Unterbefehle: - `list`: Liste der installierten Filter + - `--all`: Alle Filter anzeigen + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Einen Filter installieren. Geben Sie die URL des Filters ein, den Sie installieren möchten + - `enable`: Einen Filter aktivieren. Geben Sie den Namen oder die ID des Filters ein + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - 'disable': Einen Filter deaktivieren. Geben Sie den Namen oder die ID des Filters ein + - 'update': Filter aktualisieren + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index f963b05b62c..f33172f5141 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ Diese Seite beschreibt die Funktionen und Details der zentralen Verwaltung der R ## 1. MSI herunterladen {#msi-download} -Laden Sie [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi)herunter +Laden Sie [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) herunter -Laden Sie [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi)herunter +Laden Sie [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) herunter ## 2. Konfigurieren Sie die Einstellungen für Ihr Netzwerk {#settings-configuring} diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md index cd43cb7e393..6c4fd853fd0 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md @@ -33,7 +33,7 @@ AdGuard Extra ist im Wesentlichen ein Miniprogramm, das die Funktionsweise von S **AdGuard Pop-up-Blocker** -Diese Erweiterung verhindert das Öffnen von Pop-up-Fenstern, wenn Sie Webseiten aufrufen. Some popups are considered useful — they may contain settings for site administering or additional reference information demonstrated upon clicking a link. Aus diesem Grund können Sie den Blocker bei Bedarf ausschalten. Diese Erweiterung funktioniert auch nicht auf Websites, die in der AdGuard-Ausnahmeliste aufgeführt sind. Sie ist standardmäßig ausgeschaltet, kann aber in den Einstellungen aktiviert werden. +Diese Erweiterung verhindert das Öffnen von Pop-up-Fenstern, wenn Sie Webseiten aufrufen. Einige Pop-ups werden als nützlich erachtet — sie können Einstellungen für die Verwaltung der Website oder zusätzliche Referenzinformationen enthalten, die beim Anklicken eines Links angezeigt werden. Aus diesem Grund können Sie den Blocker bei Bedarf ausschalten. Diese Erweiterung funktioniert auch nicht auf Websites, die in der AdGuard-Ausnahmeliste aufgeführt sind. Sie ist standardmäßig ausgeschaltet, kann aber in den Einstellungen aktiviert werden. **Web of Trust** diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md index f83d9ddd4d3..2d14c27475a 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md @@ -23,7 +23,7 @@ Ganz unten auf dem Bildschirm finden Sie _Erweiterte Einstellungen_. Wenn Sie ei ### Werbeblocker -Dies ist das Hauptmodul von AdGuard für Windows, das Werbung von den von Ihnen besuchten Websites und von den auf Ihrem Gerät installierten Apps entfernt. To filter out advertising and privacy-threatening content such as banners, popups, or trackers AdGuard uses different filters — groups of rules with a similar purpose written with a [special syntax](/general/ad-filtering/create-own-filters). Um zu verstehen, was Filter sind und wie sie funktionieren, lesen Sie [diesen Artikel](/general/ad-filtering/how-ad-blocking-works). +Dies ist das Hauptmodul von AdGuard für Windows, das Werbung von den von Ihnen besuchten Websites und von den auf Ihrem Gerät installierten Apps entfernt. Um Werbung und datenschutzgefährdende Inhalte wie Banner, Pop-ups oder Tracker auszufiltern, verwendet AdGuard verschiedene Filter: Gruppen von Regeln mit einem ähnlichen Zweck, die mit einer [speziellen Syntax](/general/ad-filtering/create-own-filters) geschrieben werden. Um zu verstehen, was Filter sind und wie sie funktionieren, lesen Sie [diesen Artikel](/general/ad-filtering/how-ad-blocking-works). ![Werbeblocker \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/settings_ad_blocker.png) @@ -54,7 +54,7 @@ Um alles über das Modul Tracking-Schutz und seine Optionen zu erfahren, [lesen Internetsicherheit bietet starken Schutz vor bösartigen und Phishing-Websites. AdGuard für Windows ist natürlich kein Antivirenprogramm. Die App kann weder das Herunterladen eines Virus stoppen, wenn es bereits begonnen hat, noch bereits vorhandene Viren löschen. Sie werden jedoch gewarnt, wenn Sie eine Website aufrufen oder eine Datei von einer Website herunterladen, deren Domain in unserer Datenbank „Nicht vertrauenswürdige Websites“ aufgeführt ist. Weitere Informationen über die Funktionsweise dieses Moduls finden Sie im [entsprechenden Artikel](/general/browsing-security). -In this module, you can: +In diesem Modul können Sie: - Benachrichtigungen aktivieren, um Anfragen an bösartige und Phishing-Seiten zu sperren, - akustische Benachrichtigungen aktivieren, @@ -83,13 +83,13 @@ Ab Version 7.20 können Sie Filter auch hinzufügen, indem Sie sie einfach aus e ### Kindersicherung -There are several websites to which access should be restricted from a PC used by children. Diese Aufgabe wird von der Kindersicherung wahrgenommen. +Es gibt eine Reihe von Websites, auf die der Zugriff von einem von Kindern benutzten PC aus beschränkt werden sollte. Diese Aufgabe wird von der Kindersicherung wahrgenommen. ![Kindersicherung \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/parental-control.png) Das Modul prüft den Inhalt der im Browser geöffneten Webseiten und filtert diejenigen mit für Kinder unerwünschten Inhalten: Bilder und Texte für Erwachsene, Schimpfwörter, Gewalt, Drogenpropaganda usw. Die Einstellungen der Kindersicherung sind passwortgeschützt, so dass das Kind die Einschränkungen nicht umgehen kann. Dieses Modul blockiert nicht nur die Weiterleitung auf unerwünschte Seiten, sondern kann auch die für Kinder ungeeigneten Links aus den Suchergebnissen entfernen. -Im Modul _Kindersicherung_ können Sie die _Sichere Suche_ aktivieren und die _Sperrliste_ und die _Positivliste_ verwalten, um die Funktionsweise dieser Option anzupassen. You can also check the _Block executable files download_ box to prevent your child from downloading and installing software on the computer. Im Modul _Kindersicherung_ gibt es zwei weitere Optionen: Sie können einen bestimmten Windows-Benutzer auswählen, der durch die _Kindersicherung_ geschützt werden soll, und ein Passwort festlegen, um die Einstellungen vor Änderungen zu schützen. +Im Modul _Kindersicherung_ können Sie die _Sichere Suche_ aktivieren und die _Sperrliste_ und die _Positivliste_ verwalten, um die Funktionsweise dieser Option anzupassen. Sie können auch das Kontrollkästchen _Herunterladen von ausführbaren Dateien sperren_ aktivieren, um zu verhindern, dass Ihr Kind Software auf den Computer herunterlädt und installiert. Im Modul _Kindersicherung_ gibt es zwei weitere Optionen: Sie können einen bestimmten Windows-Benutzer auswählen, der durch die _Kindersicherung_ geschützt werden soll, und ein Passwort festlegen, um die Einstellungen vor Änderungen zu schützen. ![Kindersicherung \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/parental-control.png) diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/installation.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/installation.md index cb7764d3af6..97651c2c389 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/installation.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/installation.md @@ -55,7 +55,7 @@ Um AdGuard auf einem PC oder Tablet unter Microsoft Windows zu verwenden, müsse Wenn Sie AdGuard deinstallieren oder neu installieren müssen, gehen Sie wie folgt vor: -- Für Microsoft Windows 10 und 11: Öffnen Sie *Startmenü* durch Klicken auf *Start*, und wählen Sie *Einstellungen*. Klicken Sie in dem sich öffnenden Fenster auf das Symbol *Apps*. Wählen Sie *Apps und Features* aus der Liste auf der linken Seite im Fenster *Apps*. Wählen Sie *AdGuard* aus der Liste Ihrer installierten Apps und klicken Sie auf *Deinstallieren*. Klicken Sie in dem sich öffnenden Dialogfeld zur Bestätigung auf *Deinstallieren*. +- Für Microsoft Windows 10 und 11: Öffnen Sie *Startmenü* durch Klicken auf *Start* und wählen Sie *Einstellungen*. Klicken Sie in dem sich öffnenden Fenster auf das Symbol *Apps*. Wählen Sie *Apps und Features* aus der Liste auf der linken Seite im Fenster *Apps*. Wählen Sie *AdGuard* aus der Liste Ihrer installierten Apps und klicken Sie auf *Deinstallieren*. Klicken Sie in dem sich öffnenden Dialogfeld zur Bestätigung auf *Deinstallieren*. ![Deinstallation unter Windows 10 und 11 *border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/installation/win10-uninstall.png) @@ -69,7 +69,7 @@ Wenn Sie AdGuard deinstallieren oder neu installieren müssen, gehen Sie wie fol ![Deinstallation unter Windows 7 *border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/installation/win7-uninstall.png) -### Erweiterte Methode {#advanced} +### Fortgeschrittene Methode {#advanced} Falls die reguläre Deinstallation aus irgendeinem Grund nicht funktioniert, können Sie versuchen, eine erweiterte Methode zu verwenden. Zuerst müssen Sie [das von unseren Entwicklern erstellte Deinstallationstool](https://static.adtidy.org/windows/uninstaller/uninstal_utility.zip) herunterladen. Entpacken Sie das Archiv in einen beliebigen Ordner auf Ihrem PC, führen Sie die Datei **Adguard.UninstallUtility.exe** aus und erlauben Sie der App, Änderungen an Ihrem Gerät vorzunehmen. Befolgen Sie anschließend die nachstehenden Anweisungen: diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md index b51feaf6161..806d1a04174 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md @@ -38,10 +38,10 @@ Man könnte sagen, dass dies eine besondere Unterkategorie des Fehlers 1603 ist. - Starten und registrieren Sie den Microsoft Installer-Dienst erneut. Es erfordert einige Schritte. - Drücken Sie *Win + R* und geben Sie **services.msc** ein. - - Find in the list and double-click *Windows Installer*. + - Suchen Sie in der Liste *Windows Installer* und doppelklicken Sie darauf. - Klicken Sie die Schaltfläche *Starten* unter *Dienststatus* und klicken Sie anschließend auf *OK*. Sollte der Dienststatus **Wird ausgeführt** sein, sollten Sie zuerst auf *Beenden* und anschließend auf *Starten* klicken. - - Press *Win + R*, type ***msiexec /unregister***, and hit *Enter*. - - Press *Win + R* again, type ***msiexec /regserver***, and hit *Enter* + - Drücken Sie *⊞ Win + R*, geben Sie ***msiexec /unregister*** ein und drücken Sie *Eingabetaste*. + - Drücken Sie erneut *Win + R*, geben Sie ***msiexec /regserver*** ein und drücken Sie *Eingabetaste* - Starten Sie den PC neu und beginnen Sie die Installation von vorne. Manchmal reicht dies aus, um das Problem zu beheben. @@ -68,10 +68,10 @@ Der Fehler klingt erschreckender als er tatsächlich ist. In Wirklichkeit handel - Starten und registrieren Sie den Microsoft Installer-Dienst erneut. Es erfordert einige Schritte. - Drücken Sie *Win + R* und geben Sie ***services.msc*** ein. - - Find in the list and double-click *Windows Installer*. + - Suchen Sie in der Liste *Windows Installer* und doppelklicken Sie darauf. - Klicken Sie die Schaltfläche *Starten* unter *Dienststatus* und klicken Sie anschließend auf *OK*. Sollte der Dienststatus **Wird ausgeführt** sein, sollten Sie zuerst auf *Beenden* und anschließend auf *Starten* klicken. - - Press *Win + R*, type ***msiexec /unregister***, and hit *Enter*. - - Press *Win + R* again, type ***msiexec /regserver***, and hit *Enter* + - Drücken Sie *⊞ Win + R*, geben Sie ***msiexec /unregister*** ein und drücken Sie *Eingabetaste*. + - Drücken Sie erneut *Win + R*, geben Sie ***msiexec /regserver*** ein und drücken Sie *Eingabetaste* - Verschaffen Sie sich für die Installation volle Berechtigungen auf dem Laufwerk. Es ist möglich, dass der Fehler 1603 auftritt, weil Sie nicht die vollen Berechtigungen für den Dateispeicherort besitzen. Es ist leider auch nicht so einfach wie einige der anderen Lösungen: diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md index 234b8fe360a..164147a4252 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md @@ -73,7 +73,7 @@ Andernfalls filtert AdGuard den gesamten Datenverkehr sofort und ohne Umleitung. ### Hauptfenster bei Systemstart öffnen -Aktivieren Sie diese Option, damit sich das Hauptfenster von AdGuard nach dem Laden des Systems öffnet. This setting, which doesn't affect whether the actual filtering service is launched or not, is located in *Settings → General Settings*. +Aktivieren Sie diese Option, damit sich das Hauptfenster von AdGuard nach dem Laden des Systems öffnet. Beachten Sie, dass es keinen Einfluss darauf hat, ob der eigentliche Filterdienst gestartet wurde oder nicht. Diese Einstellung befindet sich in *Einstellungen → Allgemeine Einstellungen*. ### Filterung beim Systemstart aktivieren diff --git a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/mozilla-error.md b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/mozilla-error.md index c3fe3cc9177..3752ad66904 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/mozilla-error.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/mozilla-error.md @@ -1,5 +1,5 @@ --- -title: How to fix the `MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE` error +title: So beheben Sie den Fehler `MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE` sidebar_position: 11 --- @@ -9,9 +9,9 @@ Dieser Artikel behandelt AdGuard für Windows, einem multifunktionalen Werbebloc ::: -Some users of AdGuard for Windows with enabled [HTTPS filtering](/general/https-filtering/what-is-https-filtering) are unable to access certain websites like google.com and youtube.com. Instead of opening a website, browsers with Strict Certificate Pinning would display a `MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE` error. +Bei aktivierter [HTTPS-Filterung](/general/https-filtering/what-is-https-filtering) in AdGuard für Windows kann es vorkommen, dass der Zugriff auf bestimmte Websites wie google.com und youtube.com nicht möglich ist. Anstatt eine Website zu öffnen, zeigen Browser mit strikter Zertifikatsanbindung den Fehler `MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE` an. -Here is a list of impacted browsers: +Hier finden Sie eine Liste der betroffenen Browser: - Arkenfox - Brace @@ -24,8 +24,8 @@ Here is a list of impacted browsers: - Phoenix - Tor Browser -If your default browser is one of these, do the following to solve the problem: +Wenn Ihr Standardbrowser einer dieser Browser ist, gehen Sie wie folgt vor, um das Problem zu lösen: -1. Type `about:config` in the address bar of your browser -2. In the menu that appears, enter `security.cert_pinning.enforcement_level` in the search field. -3. Change the `security.cert_pinning.enforcement_level` parameter from 2 to 1. +1. Geben Sie `about:config` in die Adresszeile Ihres Browsers ein +2. Geben Sie in dem daraufhin angezeigten Menü `security.cert_pinning.enforcement_level` in das Suchfeld ein. +3. Ändern Sie den Parameter `security.cert_pinning.enforcement_level` von 2 auf 1. diff --git a/i18n/de/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/de/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index 6e19197d15d..c2e943fb367 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ Standardmäßig funktionieren solche Regeln nicht für Dokumentanfragen. This me - `https://example.org/banner/img` -### Modifikatoren für Grundregeln {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filterregeln unterstützen zahlreiche Modifikatoren, mit denen Sie das Verhalten der Regel feinabstimmen können. Hier ist ein Beispiel für eine Regel mit einigen einfachen Modifikatoren. @@ -232,7 +232,7 @@ Der Safari Converter unterstützt eine wesentliche Teilmenge von [Grundregeln](# - `$replace` - `$urltransform` -#### Kosmetische Regeln +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML-Filterregeln +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -360,7 +360,7 @@ Regeln mit Platzhaltern für TLD werden vom AdGuard Inhaltsblocker nicht unterst - `@@||example.com$document` — allgemeine Ausnahmeregel. It completely disables filtering for `example.com` and all subdomains. Es gibt eine Reihe von Modifikatoren, die in Ausnahmeregeln verwendet werden können. Weitere Einzelheiten finden Sie unter dem Link [unten](#exception-modifiers). -### Modifikatoren für Grundregeln +### Basic rule modifiers - [Basismodifikatoren](#basic-rules-basic-modifiers) - [Inhaltstyp-Modifikatoren](#content-type-modifiers) @@ -396,8 +396,8 @@ Die folgenden Modifikatoren sind die einfachsten und am häufigsten verwendeten. | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,8 +405,7 @@ Die folgenden Modifikatoren sind die einfachsten und am häufigsten verwendeten. - ✅ — vollständig unterstützt - ✅ * — unterstützt, aber die Zuverlässigkeit kann variieren oder es können Einschränkungen auftreten; weitere Einzelheiten finden Sie in der Beschreibung des Modifikators -- ⏳ — Funktion, deren Implementierung geplant ist, die aber noch in keinem Produkt verfügbar ist -- ❌ — nicht unterstützt +- ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Kompatibilität -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In diesem Fall stimmt der Modi :::caution Einschränkungen 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In der AdGuard Browsererweiterung ist der `$header`-Modifikator nur kompatibel mit [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier) und [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Kompatibilität -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Regeln mit gemischt negierten und nicht negierten Werten werden als ungültig be :::info Kompatibilität -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard versucht, den Browser-Tab mit jeder Adresse zu schließen, die einer Spe 1. Der Modifikator `$popup` funktioniert am besten in der AdGuard Browsererweiterung für Chromium-basierte Browser und Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard für iOS und AdGuard für Safari blockieren `$popup`-Regeln die Seite einfach sofort. -1. In AdGuard für Windows, AdGuard für Mac und AdGuard für Android erkennt der Modifikator `$popup` in manchen Fällen möglicherweise kein Pop-up und es wird nicht blockiert. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Die blockierende Seite selbst kann einige Prüfungen durchführen und das Fenster schließen, wenn es sich wirklich um ein Pop-up-Fenster handelt. Andernfalls sollte die Seite geladen werden. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Die blockierende Seite selbst kann einige Prüfungen durchführen und das Fenster schließen, wenn es sich wirklich um ein Pop-up-Fenster handelt. Andernfalls sollte die Seite geladen werden. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Kompatibilität -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ Sie können einen kürzeren Namen (Alias) anstelle des vollständigen Modifikato :::info Kompatibilität -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ Sie können einen kürzeren Namen (Alias) verwenden, anstatt den vollständigen :::info Kompatibilität -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -843,7 +843,7 @@ Es gibt einen großen Unterschied in der Art und Weise, wie AdGuard den Inhaltst - ✅ — vollständig unterstützt - ✅ * — unterstützt, aber die Zuverlässigkeit kann variieren oder es können Einschränkungen auftreten; weitere Einzelheiten finden Sie in der Beschreibung des Modifikators -- ❌ — nicht unterstützt +- ❌ — not supported - 🚫 — entfernt und nicht mehr unterstützt ::: @@ -1043,7 +1043,7 @@ Wir empfehlen auch, sich mit [dem Adblock Plus Filter Tabellenblatt](https://adb - ✅ — vollständig unterstützt - ✅ * — unterstützt, aber die Zuverlässigkeit kann variieren oder es können Einschränkungen auftreten; weitere Einzelheiten finden Sie in der Beschreibung des Modifikators -- ❌ — nicht unterstützt +- ❌ — not supported ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Kompatibilität - Nur AdGuard für Windows, Mac, Android ist technisch in der Lage, Regeln mit dem Modifikator `$extension` zu verwenden. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Kompatibilität - Der Tracking-Schutz (ehemals Privatsphäre) ist in AdGuard für Windows, AdGuard für Mac, AdGuard für Android und AdGuard Browsererweiterung für Firefox und Chromium-basierte Browser verfügbar, mit Ausnahme von AdGuard für Chrome MV3. Alle anderen Produkte ignorieren die Regeln mit dem Modifikator `$stealth`. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,37 +1326,36 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifikator \ Produkte | [CoreLibs-Apps][cl-apps] | [AdGuard für Chromium][ext-chr] | [AdGuard für Chrome MV3][ext-mv3] | [AdGuard für Firefox][ext-ff] | [AdGuard für iOS][ios-app] | [AdGuard für Safari][ext-saf] | [AdGuard-Inhaltsblocker][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:--------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "veraltet") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "veraltet") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifikator \ Produkte | [CoreLibs-Apps][cl-apps] | [AdGuard für Chromium][ext-chr] | [AdGuard für Chrome MV3][ext-mv3] | [AdGuard für Firefox][ext-ff] | [AdGuard für iOS][ios-app] | [AdGuard für Safari][ext-saf] | [AdGuard-Inhaltsblocker][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:--------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "veraltet") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "veraltet") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — vollständig unterstützt - ✅ * — unterstützt, aber die Zuverlässigkeit kann variieren oder es können Einschränkungen auftreten; weitere Einzelheiten finden Sie in der Beschreibung des Modifikators -- ⏳ — Funktion, deren Implementierung geplant ist, die aber noch in keinem Produkt verfügbar ist -- ❌ — nicht unterstützt -- 👎 — veraltet; wird noch unterstützt, aber in Zukunft entfernt +- ❌ — not supported +- 👎 — deprecated; still supported but will be removed in the future ::: @@ -1670,7 +1669,7 @@ preroll.ts :::info Kompatibilität -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1912,7 +1911,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Kompatibilität -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2150,7 +2149,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Kompatibilität -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2248,8 +2247,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Kompatibilität -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2338,7 +2337,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Kompatibilität -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2386,6 +2385,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Beschränkungen + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. Zum Beispiel: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + wird umgewandelt in + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Einschränkungen This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2643,7 +2710,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Kompatibilität -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2689,13 +2756,13 @@ In the `$replace` value, two characters must be escaped: comma `,` and dollar si ||example.org^$replace=/()[\s\S]*<\/VAST>/\$1<\/VAST>/i ``` -Es gibt drei Teile in dieser Regel: +There are three parts in this rule: - `regexp` — `()(.|\s)*<\/VAST>`; -- `replacement` — `\$1<\/VAST>`, wo `$` maskiert ist; +- `replacement` — `\$1<\/VAST>` where `$` is escaped; - `modifiers` — `i` for insensitive search. -Hier können Sie sehen, wie diese Regel funktioniert: http://regexr.com/3cesk +You can see how this rule works here: http://regexr.com/3cesk **Multiple `$replace` rules** @@ -2703,7 +2770,7 @@ Hier können Sie sehen, wie diese Regel funktioniert: http://regexr.com/3cesk 2. `||example.org^$replace=/Z/Y/` 3. `@@||example.org/page/*$replace=/Z/Y/` -- Regel 1 und 2 werden auf alle Anfragen angewendet, die an `example.org` gesendet werden. +- Both rule 1 and 2 will be applied to all requests sent to `example.org`. - Rule 2 is disabled for requests matching `||example.org/page/`, **but rule 1 still works!** **Disabling `$replace` rules** @@ -2757,7 +2824,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Kompatibilität -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2769,7 +2836,7 @@ As stated above, normally `$urltransform` rules are only allowed to change the p ||example.org^$urltransform=/(pref\/).*\/(suf)/\$1\$2/i ``` -Es gibt drei Teile in dieser Regel: +There are three parts in this rule: - `regexp` — `(pref\/).*\/(suf)`; - `replacement` — `\$1\$2` where `$` is escaped; @@ -2781,8 +2848,8 @@ Es gibt drei Teile in dieser Regel: 2. `||example.org^$urltransform=/Z/Y/` 3. `@@||example.org/page/*$urltransform=/Z/Y/` -- Regel 1 und 2 werden auf alle Anfragen angewendet, die an `example.org` gesendet werden. -- Regel 2 ist deaktiviert für Anfragen, die mit `||example.org/page/` übereinstimmen, **aber Regel 1 funktioniert weiterhin.** +- Both rule 1 and 2 will be applied to all requests sent to `example.org`. +- Rule 2 is disabled for requests matching `||example.org/page/`, **but rule 1 still works!** **Re-matching rules after transforming the URL** @@ -2804,6 +2871,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Einschränkungen Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2812,7 +2901,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Kompatibilität -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2835,7 +2924,7 @@ Rules with `noop` modifier are not supported by AdGuard Content Blocker. #### **`$empty` (deprecated)** {#empty-modifier} -:::caution Hinweis zur Abkündigung +:::caution Deprecation notice This modifier is deprecated in favor of the [`$redirect` modifier](#redirect-modifier). Rules with `$empty` are still supported and being converted into `$redirect=nooptext` now but the support shall be removed in the future. @@ -2855,7 +2944,7 @@ Rules with `$empty` modifier are not supported by AdGuard Content Blocker, AdGua #### **`$mp4` (veraltet)** {#mp4-modifier} -:::caution Hinweis zur Abkündigung +:::caution Deprecation notice This modifier is deprecated in favor of the [`$redirect` modifier](#redirect-modifier). Rules with `$mp4` are still supported and being converted into `$redirect=noopmp4-1s,media` now but the support shall be removed in the future. @@ -2877,7 +2966,7 @@ Rules with `$mp4` modifier are not supported by AdGuard Content Blocker, AdGuard Each rule has its own priority, which is necessary when several rules match the request and the filtering engine needs to select one of them. Priority is measured by a positive integer. -:::note Kollisionen +:::note Collisions When two rules with the same priority match the same request, the filter engine implementation determines which one is chosen. @@ -2891,22 +2980,22 @@ The concept of rule priorities becomes increasingly important in light of Manife #### Berechnung der Prioritäten -Um die Priorität zu berechnen, haben wir die Modifikatoren in verschiedene Gruppen kategorisiert. Diese Gruppen werden entsprechend ihrer Priorität, von niedrig nach hoch, eingestuft. A modifier that significantly narrows the scope of a rule adds more weight to its total priority. Conversely, if a rule applies to a broader range of requests, its priority decreases. +To calculate priority, we've categorized modifiers into different groups. These groups are ranked based on their priority, from lowest to highest. A modifier that significantly narrows the scope of a rule adds more weight to its total priority. Conversely, if a rule applies to a broader range of requests, its priority decreases. It's worth noting that there are cases where a single-parameter modifier has a higher priority than multi-parameter ones. For instance, in the case of `$domain=example.com|example.org`, a rule that includes two domains has a slightly broader effective area than a rule with one specified domain, therefore its priority is lower. -Die Basispriorität jeder Regel beträgt 1. Wenn die berechnete Priorität eine Fließkommazahl ist, wird sie **aufgerundet** auf die kleinste ganze Zahl, die größer oder gleich der berechneten Priorität ist. +The base priority of any rule is 1. If the calculated priority is a floating-point number, it will be **rounded up** to the smallest integer greater than or equal to the calculated priority. :::info Kompatibilität - The concept of priority has been introduced in [TSUrlFilter][] v2.1.0 and [CoreLibs][] v1.13. Before that AdGuard didn't have any special priority computation algorithm and collisions handling could be different depending on AdGuard product and version. -- AdGuard für iOS, Safari und der AdGuard Inhaltsblocker verlassen sich auf die Implementierung der Browser und können den hier angegebenen Regeln nicht folgen. +- AdGuard for iOS, Safari, and AdGuard Content Blocker rely on the browsers implementation and they cannot follow the rules specified here. ::: :::note -Modifikator-Aliase (`1p`, `3p`, usw.) sind nicht in diesen Kategorien enthalten, werden jedoch innerhalb der Engine zur Berechnung der Regelpriorität verwendet. +Modifier aliases (`1p`, `3p`, etc.) are not included in these categories, however, they are utilized within the engine to compute the rule priority. ::: @@ -3037,11 +3126,11 @@ The [`$replace`](#replace-modifier) modifier takes precedence over all blocking 1. `||example.com^` - Gewicht der Regel ohne Modifikatoren: `1`. + Weight of the rule without modifiers: `1`. 1. `||example.com^$match-case` - Regelgewicht: Basisgewicht + Gewicht des Modifikators aus [Kategorie 1](#priority-category-1): `1 + 1 = 2`. + Rule weight: base weight + weight of the modifier from [category 1](#priority-category-1): `1 + 1 = 2`. 1. `||example.org^$removeparam=p` @@ -3087,11 +3176,11 @@ However, basic rules may not be enough to block ads. Sometimes you need to hide :::note - ✅ — vollständig unterstützt -- ❌ — nicht unterstützt +- ❌ — not supported ::: -## Kosmetische Regeln {#cosmetic-rules} +## Cosmetic rules {#cosmetic-rules} :::info @@ -3244,7 +3333,7 @@ CSS 3.0 is not always enough to block ads. To solve this problem AdGuard extends The idea of extended capabilities is an opportunity to match DOM elements with selectors based on their own representation (style, text content, etc.) or relations with other elements. There is also an opportunity to apply styles with non-standard CSS properties. -**Anwendungsbereich** +**Application area** Extended selectors can be used in any cosmetic rule, whether they are [element hiding rules](#cosmetic-elemhide-rules) or [CSS rules](#cosmetic-css-rules). @@ -3387,7 +3476,7 @@ Native implementation does not allow any usage of `:scope` inside the `:has()` a ``` -:::danger Veraltete Syntax +:::danger Old syntax [Backward compatible syntax for `:has()`](https://github.com/AdguardTeam/ExtendedCss#old-syntax-has) is supported but **not recommended**. @@ -3418,7 +3507,7 @@ Synonyms `:-abp-contains()` and `:has-text()` are supported for better compatibi **Beispiele** -Für solche DOM: +For such DOM: ```html @@ -3446,7 +3535,7 @@ Only the `div` with `id=match` is selected because the next element does not con ::: -:::danger Veraltete Syntax +:::danger Old syntax [Backward compatible syntax for `:contains()`](https://github.com/AdguardTeam/ExtendedCss#old-syntax-contains) is supported but **not recommended**. @@ -3475,7 +3564,7 @@ For **regexp** patterns `\` should be **escaped**, e.g. `:matches-css(background **Beispiele** -Für solche DOM: +For such DOM: ```html @@ -3513,7 +3602,7 @@ Obsolete pseudo-classes `:matches-css-before()` and `:matches-css-after()` are n ::: -:::danger Veraltete Syntax +:::danger Old syntax [Backward compatible syntax for `:matches-css()`](https://github.com/AdguardTeam/ExtendedCss#old-syntax-matches-css) is supported but **not recommended**. @@ -3635,7 +3724,7 @@ div:matches-property(memoizedProps.key="null") div:matches-property(memoizedProps._owner.src=/ad/) ``` -:::tip Für Filterbetreuer +:::tip For filter maintainers To check properties of a specific element, do the following: @@ -3715,7 +3804,7 @@ The `:nth-ancestor()` pseudo-class is not supported inside the argument of the [ **Beispiele** -Für solche DOM: +For such DOM: ```html @@ -3755,7 +3844,7 @@ The `:upward()` pseudo-class is not supported inside the argument of the [`:not( **Beispiele** -Für solche DOM: +For such DOM: ```html @@ -3918,7 +4007,7 @@ The way **element hiding** and **CSS rules** are applied is platform-specific. **Extended CSS selectors** use JavaScript to work and basically add an inline style themselves, therefore they can override any style. -## HTML-Filterregeln {#html-filtering-rules} +## HTML filtering rules {#html-filtering-rules} In most cases, the basis and cosmetic rules are enough to filter ads. But sometimes it is necessary to change the HTML-code of the page itself before it is loaded. This is when you need filtering rules for HTML content. They allow to indicate the HTML elements to be cut out before the browser loads the page. @@ -3969,9 +4058,9 @@ In addition to usual attributes, which value is every element checked for, there #### `tag-content` -:::caution Hinweis zur Abkündigung +:::caution Deprecation notice -Dieses spezielle Attribut könnte zukünftig nicht mehr unterstützt werden. Prefer using the `:contains()` pseudo-class where it is available. +This special attribute may become unsupported in the future. Prefer using the `:contains()` pseudo-class where it is available. ::: @@ -4001,9 +4090,9 @@ The `tag-content` special attribute must not appear in a selector to the left of #### `wildcard` -:::caution Hinweis zur Abkündigung +:::caution Deprecation notice -Dieses besondere Attribut könnte zukünftig nicht mehr unterstützt werden. Prefer using the `:contains()` pseudo-class where it is available. +This special attribute may become unsupported in the future. Prefer using the `:contains()` pseudo-class where it is available. ::: @@ -4023,9 +4112,9 @@ The `wildcard` special attribute must not appear in a selector to the left of a #### `max-length` -:::caution Hinweis zur Abkündigung +:::caution Deprecation notice -Dieses spezielle Attribut könnte zukünftig nicht mehr unterstützt werden. Prefer using the `:contains()` pseudo-class with a regular expression where it is available. +This special attribute may become unsupported in the future. Prefer using the `:contains()` pseudo-class with a regular expression where it is available. ::: @@ -4051,9 +4140,9 @@ The `max-length` special attribute must not appear in a selector to the left of #### `min-length` -:::caution Hinweis zur Abkündigung +:::caution Deprecation notice -Dieses spezielle Attribut könnte zukünftig nicht mehr unterstützt werden. Prefer using the `:contains()` pseudo-class with a regular expression where it is available. +This special attribute may become unsupported in the future. Prefer using the `:contains()` pseudo-class with a regular expression where it is available. ::: @@ -4089,7 +4178,7 @@ oder :contains(/reg(ular )?ex(pression)?/) ``` -:::note Kompatibilität +:::note Compatibility `:-abp-contains()` and `:has-text()` are synonyms for `:contains()`. @@ -4198,7 +4287,7 @@ AdGuard supports a lot of different scriptlets. In order to achieve cross-blocke ::: -**Syntax der Filterregeln** +**Blocking rules syntax** ```text [domains]#%#//scriptlet(name[, arguments]) @@ -4281,7 +4370,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4340,7 +4429,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` - ✅ — vollständig unterstützt - ✅ * — unterstützt, aber die Zuverlässigkeit kann variieren oder es können Einschränkungen auftreten; weitere Einzelheiten finden Sie in der Beschreibung des Modifikators -- ❌ — nicht unterstützt +- ❌ — not supported ::: @@ -4357,7 +4446,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Kompatibilität -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4455,7 +4544,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Kompatibilität -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4517,7 +4606,7 @@ Filter URL: `https://example.org/path/filter.txt` Filter maintainers can use conditions to supply different rules depending on the ad blocker type. A conditional directive beginning with an `!#if` directive must explicitly be terminated with an `!#endif` directive. Conditions support all basic logical operators. -Es gibt zwei mögliche Szenarien: +There are two possible scenarios: 1. When an ad blocker encounters an `!#if` directive and no `!#else` directive, it will compile the code between `!#if` and `!#endif` directives only if the specified condition is true. @@ -4555,6 +4644,7 @@ mit: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4565,7 +4655,7 @@ mit: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4730,7 +4820,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4768,6 +4860,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4883,7 +4986,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4899,8 +5002,8 @@ The following scriptlets also may be used for debug purposes: - ✅ * — unterstützt, aber die Zuverlässigkeit kann variieren oder es können Einschränkungen auftreten; weitere Einzelheiten finden Sie in der Beschreibung des Modifikators - 🧩 — may already be implemented in nightly or beta versions but is not yet supported in release versions - ⏳ — Funktion, deren Implementierung geplant ist, die aber noch in keinem Produkt verfügbar ist -- ❌ — nicht unterstützt -- 👎 — veraltet; wird noch unterstützt, aber in Zukunft entfernt +- ❌ — not supported +- 👎 — deprecated; still supported but will be removed in the future - 🚫 — entfernt und nicht mehr unterstützt ::: @@ -4915,7 +5018,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard für Windows, Mac und Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browsererweiterung für Chrome und andere Chromium-basierte Browser" [ext-mv3]: #what-product "AdGuard Browsererweiterung für Chrome MV3" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" diff --git a/i18n/de/docusaurus-plugin-content-docs/current/general/extensions.md b/i18n/de/docusaurus-plugin-content-docs/current/general/extensions.md index cbeb564ded5..5cbd501e0b7 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/general/extensions.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/general/extensions.md @@ -39,7 +39,7 @@ Diese Version des Assistenten ist veraltet und es ergibt keinen Sinn, sie auf ne ::: -#### AMP deaktivieren +#### Disable AMP Ein Skript, das nur in AdGuard für Android vorinstalliert ist. Es deaktiviert AMP (Accelerated Mobile Pages) auf der Google-Suchergebnisseite. Erfahren Sie mehr auf [GitHub](https://github.com/AdguardTeam/DisableAMP) über dieses Benutzerskript und wie man es installiert. diff --git a/i18n/de/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/de/docusaurus-plugin-content-docs/current/general/license/legacy.md index f37a0abf9a1..572756c654e 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: 'Altlizenzen: FAQ' sidebar_position: 6 --- -Wir haben diesen Artikel geschrieben, um Verwirrung zu vermeiden und ausführlich zu erklären, wie Sie eine veraltete (legacy) AdGuard-Lizenz erneuern/erweitern können. +We have written this article to avoid confusion and explain in detail how you can renew/upgrade a legacy AdGuard license. -## Über die veralteten Lizenzen +## About legacy licenses Ursprünglich waren Lizenzen der folgenden Typen verfügbar, um AdGuard-Produkte zu aktivieren: @@ -27,57 +27,55 @@ Für alle Typen (Standard, Mobil, Premium) gab es Optionen für eine Jahres- und Im Oktober 2019 hat AdGuard auf das neue Lizenzierungssystem umgestellt: Seitdem können Lizenzen weiterhin für 1 Jahr oder auf Lebenszeit erworben werden, aber die Lizenztypen sind nun **Einzellizenz** (für bis zu 3 Geräte) oder **Familienlizenz** (für bis zu 9 Geräte). -Eine weitere Änderung: **Lizenzschlüssel des neuen Typs können jetzt auf jedem Gerät und in jeder Kombination verwendet werden. Eine Personal-Lizenz kann zum Beispiel auf Android, Mac und iOS verwendet werden, genauso wie auf zwei Windows-Computern und einem Apple-Tablet.** +Another change is that the **new types of license keys can now be used on any device, in any combination**. For example, a Personal license can be used on Android, Mac and iOS, as well as on two Windows computers and an Apple tablet. -## Was ist mit den veralteten Lizenzen passiert? +## What happened to the legacy licenses? -Standard-Lizenzen wurden automatisch universell gemacht, was bedeutet, dass sie auf beliebigen Geräten aktiviert werden können. +**Standard licenses** were automatically made **universal**, which means that they can be activated on any device. -Mobile Lizenzen blieben unverändert und plattformbeschränkt (sie können weiterhin nur auf Telefonen oder Tablets verwendet werden). +**Mobile licenses** remained unchanged and platform-limited (they can still only be used on phones or tablets). -Premium-Lizenzen blieben ebenfalls unverändert und plattformbeschränkt. Und obwohl **Premium-Lizenzen jetzt in Ihrem persönlichen Konto nach der Gesamtzahl der Geräte** angezeigt werden, können sie immer noch nur gleichermaßen auf Desktop- und Mobilgeräten aktiviert werden. +**Premium licenses** also remained unchanged and platform-limited. Und obwohl **Premium-Lizenzen jetzt in Ihrem persönlichen Konto nach der Gesamtzahl der Geräte** angezeigt werden, können sie immer noch nur gleichermaßen auf Desktop- und Mobilgeräten aktiviert werden. So sieht zum Beispiel die Taste 1+1 aus: -![1+1 Schlüssel](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 Schlüssel](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *Aber trotz der Gesamtzahl der Geräte (2) kann es auf 1 Desktop und 1 Mobilgerät aktiviert werden.* > Alle veralteten Lizenzen haben ein „Legacy“-Abzeichen im AdGuard-Konto. Und sie werden automatisch in einen neuen Typ umgewandelt, wenn Sie sie entweder erneuern oder erweitern. Aber es gibt einige Nuancen. Sehen wir uns an, welche Lizenzen in einen neuen Typ umgewandelt werden können und wie das geht. -## Ich habe einen veralteten (Legacy) Schlüssel. Welche Erneuern/Erweitern-Optionen stehen mir zur Verfügung? +## How to renew or upgrade a legacy key -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +You can extend/renew or upgrade a legacy license in your [AdGuard account](https://adguardaccount.com) or on the [Extend or upgrade page](https://adguard.com/renew.html). -![Erweitern](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Gehen Sie zur Registerkarte „Meine Lizenzen“ und prüfen Sie, welche Aktionen Ihnen für jeden bestimmten Schlüssel zur Verfügung stehen. Im Folgenden erläutern wir dies anhand konkreter Beispiele. +To extend/renew or upgrade a legacy license in your AdGuard account, go to the *Licenses* tab, find the license you need, and select one of the available options. -### Lizenzen für 1/2/3 Geräte +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Jährliche** Lizenzen für 1, 2, 3 Geräte können entweder in Einzel- oder Familien-Lizenz umgewandelt werden: +Or go to the [Extend or upgrade page](https://adguard.com/renew.html), enter your license, and click *Apply*. On the new page, select one of the available options. -![Erweitern oder erneuern](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Wählen Sie aus, wie viele Geräte Sie schützen möchten. +### Lizenzen für 1/2/3 Geräte -Anstelle einer Erneuerung können Sie auf Lebenslange Lizenz umsteigen: +Mobile Yearly licenses for 3 devices can be converted to Personal licenses or upgraded to Family ones: -![Lebenslang](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Upgrade Yearly licenses for 1, 2, 3 devices](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Lebenslange** Lizenzen können aufgrund technischer Einschränkungen nur in Familienlizenz (9 Geräte) umgewandelt werden: +> If you have a **Standard license for 3 devices**, it already works as a **Personal** license. If you renew your **Mobile license** for 3 devices, you will be able to use it on a **different set of device**s, not just phones. -![Auf Lebenslange erweitern](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +You can also upgrade your license to Lifetime: -### Lizenzen für 4+ Geräte (bis zu 9) +![Upgrade to Lifetime](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Jährliche** Schlüssel dieser Konfiguration können nur in eine Familienlizenz umgewandelt werden: +**Lifetime** licenses can only be upgraded to Family (9 devices) due to technical limitations. -![Jahreslizenz für 4 Geräte](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Lizenzen für mehr als 4 Geräte (bis zu 9) -**Lebenslange** Lizenzen für 4 oder mehr Geräte können aufgrund technischer Einschränkungen nicht aktualisiert werden: +**Yearly** licenses for 4 or more devices can be upgraded to Family and Lifetime licenses. -![Lebenslange Lizenz für 4 Geräte](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +However, if you already have a **Lifetime** license, it cannot be upgraded due to technical limitations. -### Lizenzen für 9+ Geräte +### Lizenzen für mehr als 9 Geräte -Premium-Schlüssel (5+5 und mehr) und benutzerdefinierte Schlüssel für 10+ Geräte, die Sie individuell mit Hilfe unserer Manager erworben haben. +Premium keys (5+5 and more) and custom keys for 10+ devices that you purchased individually with the help of our managers. -Da es sich hierbei um Einzelfälle handelt, wenden Sie sich bitte an partners@adguard.com, wenn Sie Ihre Lizenz auf Lebenslange erweitern möchten. Abhängig von der konkreten Konfiguration Ihrer Lizenz machen wir Ihnen ein spezielles Angebot. +These are quite unique cases, so if you want to upgrade your license to Lifetime, please contact us at partners@adguard.com. We will make you a special offer depending on the specific configuration of your license. diff --git a/i18n/de/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/de/docusaurus-plugin-content-docs/current/general/license/what-is.md index a8f6acb7235..11efa9b6db8 100644 --- a/i18n/de/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/de/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ Es gibt auch Lizenzen, die man von anderen Quellen erwerben oder kostenlos erhal - **Vertriebshändlerlizenzen** und **Geschenklizenzen** können sowohl zeitlich begrenzt als auch nicht zeitlich begrenzt sein. Lizenzen mit einem Auslaufdatum können nur manuell verlängert werden - Einzellizenz — schützt bis zu 3 Geräte - Familienlizenz — schützt bis zu 9 Geräte -- **Die Lizenz für AdGuard Pro für iOS** wird über den App Store erworben und verwaltet und kann nur auf iOS- und iPadOS-Geräten mit der gleichen Apple-ID verwendet werden +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/es/docusaurus-plugin-content-docs/current.json b/i18n/es/docusaurus-plugin-content-docs/current.json index 5454a399369..696a50caa85 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current.json +++ b/i18n/es/docusaurus-plugin-content-docs/current.json @@ -100,7 +100,7 @@ "description": "The label for category Firewall in sidebar tutorialSidebar" }, "sidebar.tutorialSidebar.category.AdGuard for Linux": { - "message": "AdGuard for Linux", + "message": "AdGuard para Linux", "description": "The label for category AdGuard for Linux in sidebar tutorialSidebar" } } diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md index 9ef807517c0..7c1f0628954 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md @@ -13,7 +13,7 @@ Este artículo trata sobre AdGuard para Android, un bloqueador de anuncios multi :::caution -Changing the low-level settings can cause problems with AdGuard’s performance, interrupt your Internet connection, or compromise your security and privacy. Use the low-level features only if you are an experienced user and know what you are doing, or if our support team has asked you to do so. +Changing the low-level settings can cause problems with AdGuard’s performance, interrupt your Internet connection, or compromise your security and privacy. Utiliza las características de bajo nivel solo si eres un usuario experimentado y sabes lo que estás haciendo, o si nuestro equipo de soporte te lo ha pedido. ::: @@ -21,13 +21,13 @@ To access _Low-level settings_, open the AdGuard app and tap the gear icon in th ## Configuración de bajo nivel -For AdGuard v4.x for Android we’ve completely redesigned the low-level settings. We have reworked the list of settings and organized them into thematic groups with improved descriptions. We also added input validation and other safety valves. +Para AdGuard v4.x para Android hemos rediseñado completamente las configuraciones de bajo nivel. We have reworked the list of settings and organized them into thematic groups with improved descriptions. We also added input validation and other safety valves. ### Protección DNS #### Upstreams fallback -Here you can specify the fallback DNS resolver(s) to use when the configured server is unavailable. Available options: +Aquí puedes especificar los solucionadores DNS fallback que se utilizarán si el servidor configurado no está disponible. Opciones disponibles: - _Automatic DNS_: Select this option if you want to use the system DNS or AdGuard DNS. - _None_: Select this option if you do not want to have any fallback. @@ -39,18 +39,18 @@ Here you can list domains that will be redirected to fallback upstreams, if avai #### Detectar dominios de búsqueda -If this setting is enabled, AdGuard will detect DNS search domains and automatically redirect them to fallback upstreams, if available. +Si esta configuración está habilitada, AdGuard detectará los dominios de búsqueda DNS y los redirigirá automáticamente a fallback upstreams, si están disponibles. #### Bootstrap de subida -Bootstrap DNS for encrypted DNS upstreams, such as DoH, DoT, and DoQ servers. Available options: +Bootstrap DNS para DNS upstream cifrado, como servidores DoH, DoT y DoQ. Opciones disponibles: - _Automatic DNS_: Select this option if you want to use the system DNS or AdGuard DNS. This option is selected by default. - _Custom DNS_: Select this option and enter plain DNS server IPv4 or IPv6 addresses, one per line. These addresses will be used as bootstrap upstreams. #### Modo de bloqueo para reglas de estilo adblock -Here you can specify the response type for domains blocked by DNS rules based on adblock rule syntax (for example, `||example.org^`). Available options: +Here you can specify the response type for domains blocked by DNS rules based on adblock rule syntax (for example, `||example.org^`). Opciones disponibles: - _REFUSED_: Respond with REFUSED - _NXDOMAIN_: Respond with NXDOMAIN @@ -76,29 +76,29 @@ Here you can set the time to live (TTL) of the record for blocked domains. The d #### Tamaño de caché de DNS -Aquí puedes especificar el número máximo de respuestas almacenadas en caché. The default value is 1000. +Aquí puedes especificar el número máximo de respuestas almacenadas en caché. El valor predeterminado es 1000. #### Bloqueo ECH -If this setting is enabled, AdGuard will block TLS Encrypted Hello (ECH) in DNS responses. +Si esta configuración está habilitada, AdGuard bloqueará TLS Encrypted Hello (ECH) en las respuestas DNS. -#### Try HTTP/3 for DNS-over-HTTPS upstreams +#### Probar HTTP/3 para upstreams de DNS-over-HTTPS -If this setting is enabled, AdGuard will use HTTP/3 to speed up DNS query resolution for DNS-over-HTTPS upstreams. Otherwise, AdGuard will revert to its default behavior and use HTTP/2 to send all DNS requests for DNS-over-HTTPS. +If this setting is enabled, AdGuard will use HTTP/3 to speed up DNS query resolution for DNS-over-HTTPS upstreams. De lo contrario, AdGuard volverá a su comportamiento predeterminado y utilizará HTTP/2 para enviar todas las peticiones DNS para DNS-over-HTTPS. -#### SERVFAIL failure response +#### Respuesta a fallos de SERVFAIL -If this setting is enabled, AdGuard will send a SERVFAIL response to the client if all upstreams, including the fallback ones, fail to reply. If this setting is disabled, no response will be sent to the client in such a case. +Si esta configuración está habilitada, AdGuard enviará una respuesta SERVFAIL al cliente si todas las fuentes, incluidas las de segunda opción, no responden. If this setting is disabled, no response will be sent to the client in such a case. #### Use fallback for all domains -If this setting is enabled, AdGuard will use fallback upstreams for all domains, including non-fallback ones. Otherwise, fallback upstreams will only be used for fallback domains and search domains if the corresponding option is enabled. +If this setting is enabled, AdGuard will use fallback upstreams for all domains, including non-fallback ones. De lo contrario, los upstreams de fallback solo se utilizarán para dominios de segunda opción y dominios de búsqueda si la opción correspondiente está habilitada. -#### Validate DNS upstreams +#### Validar upstreams DNS -If this setting is enabled, AdGuard will test DNS upstreams before adding or updating custom DNS servers. +Si esta configuración está habilitada, AdGuard probará las fuentes DNS upstream antes de agregar o actualizar servidores DNS personalizados. -#### Filter secure DNS +#### Filtrar DNS seguro If this setting is enabled, AdGuard will filter encrypted DNS requests in addition to plain DNS requests. Encrypted DNS traffic mostly comes from Chrome and other browsers that have a secure DNS setting. @@ -110,9 +110,9 @@ This setting has two modes: ### Filtrado -#### Capture HAR +#### Capturar HAR -If this setting is enabled, AdGuard will log all filtered HTTP requests in HAR 1.2 format to the “har” subdirectory in the app cache directory. These files can be analyzed with the Fiddler tool. +Si esta configuración está habilitada, AdGuard registrará todas las peticiones HTTP filtradas en formato HAR 1.2 en el subdirectorio “har” del directorio de caché de la app. Estos archivos se pueden analizar con la aplicación Fiddler. This setting may slow down your device. Use it for debugging purposes only. @@ -120,17 +120,17 @@ This setting may slow down your device. Use it for debugging purposes only. #### Encrypted Client Hello -If this setting is enabled, AdGuard will encrypt ClientHellos, if necessary. This feature requires HTTPS filtering to be enabled. This feature uses a local DNS proxy to look for the ECH configuration for the domain. If it is found, the ClientHello packet will be encrypted. Make sure to use an encrypted DNS server with this feature. +If this setting is enabled, AdGuard will encrypt ClientHellos, if necessary. This feature requires HTTPS filtering to be enabled. This feature uses a local DNS proxy to look for the ECH configuration for the domain. Si se encuentra, el paquete ClientHello se cifrará. Make sure to use an encrypted DNS server with this feature. **About ClientHellos and ECH**: Every encrypted Internet connection has an unencrypted part. This is the very first packet that contains the name of the server you are connecting to. Encrypted Client Hello technology is designed to solve this problem by encrypting this packet. -#### OCSP checking +#### Verificación de OCSP If this setting is enabled, AdGuard will automatically check the revocation status of SSL certificates before connecting to a website. This feature requires HTTPS filtering to be enabled. If the check is completed within the required timeout, AdGuard will allow the connection if the certificate is valid or immediately block the connection if the certificate is revoked. -If the verification takes too long, AdGuard will allow the connection while continuing to check the certificate status in the background. Si se revoca el certificado, se bloquearán las conexiones actuales y futuras al dominio. +Si la verificación tarda demasiado tiempo, AdGuard permitirá la conexión mientras continúa verificando el estado del certificado en segundo plano. Si se revoca el certificado, se bloquearán las conexiones actuales y futuras al dominio. #### Filtrar HTTP/3 diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 7dcb51dec99..abf883bbab6 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -31,7 +31,7 @@ _Nivel de registro_ define qué datos sobre el funcionamiento de la aplicación ![Avanzado \*mobile_border](https://cdn.adtidy.org/blog/new/vshfnadvanced.png) -La sección _Configuración de bajo nivel_ es para usuarios expertos. [Read more about low-level settings](/adguard-for-android/features/low-level-settings/) +La sección _Configuración de bajo nivel_ es para usuarios expertos. [Más información sobre la configuración de bajo nivel](/adguard-for-android/features/low-level-settings/) Configuración de bajo nivel \*mobile_border](https://cdn.adtidy.org/blog/new/n9ztplow_level.png) @@ -39,7 +39,7 @@ Configuración de bajo nivel \*mobile_border](https://cdn.adtidy.org/blog/new/n9 Esta sección te permite administrar la configuración de filtrado HTTPS, los filtros y las secuencias de comandos de usuario, y configurar un servidor proxy. -![Filtrado \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filtros @@ -57,102 +57,110 @@ Si activas demasiados filtros, es posible que algunos sitios web funcionen incor [Más información sobre filtros](https://adguard.com/en/blog/what-are-filters.html) -### Userscripts +### Extensiones -Los scripts de usuario son miniprogramas escritos en JavaScript que amplían la funcionalidad de uno o más sitios web. Para instalar scripts de usuario, necesitas un administrador de userscripts especial. AdGuard tiene una funcionalidad de este tipo y te permite añadir usercripts por URL o desde un archivo. +Extensions allow you to add userscripts and userstyles. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) + +Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. + +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra -AdGuard Extra es un userscript personalizado que bloquea anuncios complejos y mecanismos que reinyectan anuncios en sitios web. +AdGuard Extra is a custom userscript that blocks complex ads and mechanisms that reinject ads to websites. -#### Deshabilitar AMP +#### Disable AMP -Deshabilitar AMP es un userscript que deshabilita [páginas móviles aceleradas](https://en.wikipedia.org/wiki/Accelerated_Mobile_Pages) en la página de resultados de búsqueda de Google. +Disable AMP is a userscript that disables [Accelerated mobile pages](https://en.wikipedia.org/wiki/Accelerated_Mobile_Pages) on the Google search results page. ### Red #### Filtrado HTTPS -Para bloquear anuncios y rastreadores en la mayoría de los sitios web y en la mayoría de las aplicaciones, AdGuard necesita filtrar su tráfico HTTPS. [Más información sobre el filtrado HTTPS](/general/https-filtering/what-is-https-filtering) +To block ads and trackers on most websites and in most apps, AdGuard needs to filter their HTTPS traffic. [Read more about HTTPS filtering](/general/https-filtering/what-is-https-filtering) -##### Certificados de seguridad +##### Security certificates -Para gestionar el tráfico cifrado, AdGuard instala su certificado CA en tu dispositivo. Es seguro: el tráfico se filtra localmente y AdGuard verifica la seguridad de la conexión. +To manage encrypted traffic, AdGuard installs its CA certificate on your device. It's safe: the traffic is filtered locally and AdGuard verifies the security of the connection. -En versiones anteriores de Android, el certificado se instala automáticamente. En Android 11 y versiones posteriores, debes instalarlo manualmente. [Instrucciones de instalación](/adguard-for-android/solving-problems/manual-certificate/) +On older versions of Android, the certificate is installed automatically. On Android 11 and later, you need to install it manually. [Installation instructions](/adguard-for-android/solving-problems/manual-certificate/) -El certificado CA en la tienda de usuarios es suficiente para filtrar el tráfico HTTPS en navegadores y algunas aplicaciones. Sin embargo, hay aplicaciones que sólo confían en los certificados del almacén del sistema. Para filtrar el tráfico HTTPS allí, debes instalar el certificado CA de AdGuard en el almacén del sistema. [Instrucciones](/adguard-for-android/solving-problems/https-certificate-for-rooted/) +The CA certificate in the user store is enough to filter HTTPS traffic in browsers and some apps. However, there are apps that only trust certificates from the system store. To filter HTTPS traffic there, you need to install AdGuard's CA certificate into the system store. [Instructions](/adguard-for-android/solving-problems/https-certificate-for-rooted/) -##### Aplicaciones filtradas por HTTPS +##### HTTPS-filtered apps -Esta sección contiene la lista de aplicaciones para las que AdGuard filtra el tráfico HTTPS. Ten en cuenta que la configuración se puede aplicar a todas las aplicaciones solo si tienes certificados de CA tanto en la tienda de usuarios como en la del sistema. +This section contains the list of apps for which AdGuard filters HTTPS traffic. Please note that the setting can be applied for all apps only if you have CA certificates both in the user store and in the system store. -##### Sitios web filtrados por HTTPS +##### HTTPS-filtered websites -Esta configuración te permite administrar sitios web para los cuales AdGuard debe filtrar el tráfico HTTPS. +This setting allows you to manage websites for which AdGuard should filter HTTPS traffic. -El filtrado HTTPS permite a AdGuard filtrar el contenido de las solicitudes y respuestas, pero nunca recopilamos ni almacenamos estos datos. Sin embargo, para aumentar la seguridad, [excluimos del filtrado HTTPS los sitios web que contienen información potencialmente confidencial](/general/https-filtering/what-is-https-filtering/#financial-websites-and-websites-with-sensitive-personal-data). +HTTPS filtering allows AdGuard to filter the content of requests and responses, but we never collect or store this data. However, to increase security, we [exclude websites that contain potentially sensitive information from HTTPS filtering](/general/https-filtering/what-is-https-filtering/#financial-websites-and-websites-with-sensitive-personal-data). -También podrás añadir a exclusiones los sitios web que consideres necesarios seleccionando una de las modalidades: +You can also add websites that you consider necessary to exclusions by selecting one of the modes: -- Excluir sitios web específicos del filtrado HTTPS -- Filtrar el tráfico HTTPS solo en los sitios web agregados a las exclusiones +- Exclude specific websites from HTTPS filtering +- Filter HTTPS traffic only on the websites added to exclusions -De forma predeterminada, tampoco filtramos sitios web con certificados de Validación Extendida (EV), como los sitios web financieros. Si es necesario, puedes habilitar la opción _Filtrar sitios web con certificados EV_. +By default, we also do not filter websites with Extended Validation (EV) certificates, such as financial websites. Si es necesario, puedes habilitar la opción _Filtrar sitios web con certificados EV_. #### Proxy -Puedes configurar AdGuard para enrutar todo el tráfico de tu dispositivo a través de tu servidor proxy. [Cómo configurar un proxy saliente](/adguard-for-android/solving-problems/outbound-proxy) +You can set up AdGuard to route all your device's traffic through your proxy server. [How to set up an outbound proxy](/adguard-for-android/solving-problems/outbound-proxy) -En esta sección, también puedes configurar una VPN de terceros para que funcione con AdGuard, si tu proveedor de VPN lo permite. +In this section, you can also set up a third-party VPN to work with AdGuard, if your VPN provider allows it. -En _Aplicaciones que funcionan a través de proxy_, puedes seleccionar aplicaciones que enrutarán tu tráfico a través de tu proxy especificado. Si tienes habilitada la _Integración con AdGuard VPN_, esta configuración desempeña el papel de exclusiones de aplicaciones de AdGuard VPN: te permite especificar aplicaciones que se enrutarán a través del túnel de AdGuard VPN. +Under _Apps operating through proxy_, you can select apps that will route their traffic through your specified proxy. If you have _Integration with AdGuard VPN_ enabled, this setting plays the role of AdGuard VPN's app exclusions: it allows you to specify apps to be routed through the AdGuard VPN tunnel. -#### Modo de enrutamiento +#### Routing mode -Esta sección te permite seleccionar el método de filtrado de tráfico. +This section allows you to select the traffic filtering method. -- _VPN local_ filtra el tráfico a través de una VPN creada localmente. Este es el modo más confiable. Debido a las restricciones de Android, también es el único método de filtrado de tráfico en todo el sistema disponible en dispositivos no rooteados. +- _Local VPN_ filters traffic through a locally created VPN. This is the most reliable mode. Due to Android restrictions, it is also the only system-wide traffic filtering method available on non-rooted devices. :::note -El modo _VPN local_ no permite utilizar AdGuard simultáneamente con otras VPN. Para usar otra VPN con AdGuard, debes reconfigurarla para que funcione en modo proxy y configurar un proxy saliente en AdGuard. Para AdGuard VPN, esto se hace automáticamente con la ayuda del [_modo integrado_](/adguard-for-android/features/integration-with-vpn). +The _Local VPN_ mode doesn't allow AdGuard to be used simultaneously with other VPNs. To use another VPN with AdGuard, you need to reconfigure it to work in proxy mode and set up an outbound proxy in AdGuard. For AdGuard VPN, this is done automatically with the help of the [_Integrated mode_](/adguard-for-android/features/integration-with-vpn). ::: -- _Proxy automático_ es un método de enrutamiento de tráfico alternativo que no requiere el uso de una VPN. Una ventaja importante es que se puede ejecutar en paralelo con una VPN. Este modo requiere acceso root. +- _Automatic proxy_ is an alternative traffic routing method that does not require the use of a VPN. One significant advantage is that it can be run in parallel with a VPN. This mode requires root access. -- _Proxy manual_ implica configurar un servidor proxy en un puerto específico, que luego se puede configurar en la configuración de Wi-Fi. Este modo requiere acceso de root para Android 10 y superior. +- _Manual proxy_ involves setting up a proxy server on a specific port, which can then be configured in Wi-Fi settings. This mode requires root access for Android 10 and above. ## Licencia -En esta sección podrás encontrar información sobre tu licencia y gestionarla: +In this section, you can find information about your license and manage it: -- Compra una licencia de AdGuard para activar [las funciones de la versión completa](/adguard-for-android/features/free-vs-full) -- Inicia sesión en tu cuenta AdGuard o ingresa la clave de licencia para activar tu licencia -- Regístrate para activar tu período de prueba de 7 días si aún no lo has usado -- Actualiza el estado de la licencia desde el menú de tres puntos (⋮) -- Abre la cuenta AdGuard para administrar tu licencia allí -- Restablece tu licencia. Por ejemplo, si has alcanzado el límite de dispositivos para esta licencia y deseas aplicar otra +- Buy an AdGuard license to activate [the full version's features](/adguard-for-android/features/free-vs-full) +- Log in to your AdGuard account or enter the license key to activate your license +- Sign up to activate your 7-day trial period if you haven't used it yet +- Refresh the license status from the three-dots menu (⋮) +- Open the AdGuard account to manage your license there +- Reset your license — for example, if you've reached device limit for this license and want to apply another one -![Pantalla de licencia \*mobile_border](https://cdn.adtidy.org/blog/new/3wyh5hlicense.png) +![License screen \*mobile_border](https://cdn.adtidy.org/blog/new/3wyh5hlicense.png) ## Asistencia técnica -Utiliza esta sección si tienes alguna pregunta o sugerencia sobre AdGuard para Android. Recomendamos consultar el _[FAQ](https://adguard.com/support/adguard_for_android.html)_ o esta base de conocimientos antes de contactar al soporte. +Use this section if you have any questions or suggestions regarding AdGuard for Android. We recommend consulting _[FAQ](https://adguard.com/support/adguard_for_android.html)_ or this knowledge base before contacting support. -![Soporte \*mobile_border](https://cdn.adtidy.org/blog/new/cz55usupport.png) +![Support \*mobile_border](https://cdn.adtidy.org/blog/new/cz55usupport.png) -Si notas un anuncio perdido, infórmalo a través de _Informar bloqueo incorrecto_. +If you notice a missed ad, please report it via _Report incorrect blocking_. -Para un comportamiento inesperado de la aplicación, selecciona _Informar un error_. Si es posible, describe tu problema en detalle y agrega registros de aplicaciones. [Cómo describir un problema](/guides/report-bugs/#how-to-describe-a-problem) +For unexpected app behavior, select _Report a bug_. If possible, describe your problem in detail and add app logs. [How to describe an issue](/guides/report-bugs/#how-to-describe-a-problem) -Para tus sugerencias, utiliza _Solicitar una función_. +For your suggestions, use _Request a feature_. :::note -O GitHub es una forma alternativa de informar errores y sugerir nuevas funciones. [Instrucciones y enlaces al repositorio](/guides/report-bugs/#adguard-for-android) +GitHub is an alternative way to report bugs and suggest new features. [Instructions and repository links](/guides/report-bugs/#adguard-for-android) ::: diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 997b08647fa..81eac80cb42 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: Cómo instalar AdGuard para Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 293e883cba2..1279ee6c29c 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: Cómo deshabilitar la función de bloqueo automático de Samsung -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index e69a10ea0f9..86e39c48d61 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: Cómo evitar que el sistema desactive AdGuard -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 1c4803f70e8..fa626356e6e 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ Puedes acceder navegando a *Estadísticas* → *Uso de batería*. En su interior, encontrarás un gráfico que muestra el consumo de recursos de la batería de AdGuard en las últimas 24 horas, con una opción para obtener datos más detallados hora a hora tocando el gráfico. Además de eso, también hay información numérica de los datos relevantes y una breve explicación técnica. +Hay varios otros parámetros debajo del gráfico: *CPU en primer plano*, *CPU en segundo plano*, *Uso de datos móviles*, y *Uso de datos de Wi-Fi*. + +*CPU en primer plano* y *CPU en segundo plano* muestran cuánto tiempo de CPU utiliza AdGuard cuando la aplicación está activa o en segundo plano. + +Y con el uso de *datos móviles* y *datos de Wi-Fi*, puedes ver cuánto tráfico consumió AdGuard cuando tu teléfono estaba usando Internet móvil o conectado a Wi-Fi. + ### ¿Cuánta batería consume realmente AdGuard? Primero, expongamos un poco de teoría y vínculos con los datos necesarios. diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index ac976a12c57..df18387f776 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Problemas de compatibilidad conocidos con aplicaciones de Android -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index 910a29cf8fe..cd7a319782d 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problemas causados por la ampliación de configuraciones restringidas -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ Este artículo trata sobre AdGuard para Android, un bloqueador de anuncios multi ::: -En un esfuerzo por mejorar la privacidad del usuario, Google ha ampliado la configuración de restricciones en Android 15. Más configuraciones, como _Acceso al uso de la aplicación_, ahora requieren un permiso adicional para ser habilitadas. Dado que las funciones _[Firewall](/adguard-for-android/features/protection/firewall)_ y _[Detectar Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ requieren que la configuración _Acceso al uso de aplicaciones_ esté habilitada para que funcionen correctamente, es posible que hayas experimentado problemas al usarlas. Para resolver estos problemas, sigue los pasos a continuación: +En un esfuerzo por mejorar la privacidad del usuario, Google ha ampliado la configuración de restricciones en Android 15. Más configuraciones, como _Acceso al uso de la aplicación_, ahora requieren un permiso adicional para ser habilitadas. Dado que las funciones _[Firewall](/adguard-for-android/features/protection/firewall)_ y _[Detectar Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ requieren que la configuración _Acceso al uso de aplicaciones_ esté habilitada para que funcionen correctamente, es posible que hayas experimentado problemas al usarlas. To resolve these issues, please follow the steps below. :::note @@ -17,20 +17,44 @@ AdGuard tiene una estricta política de no registro, lo que significa que no rec ::: -1. En tu dispositivo Android, abre la aplicación **Configuración**. -2. Toca **Aplicaciones**. -3. Toca **AdGuard** +## Basic instructions -![AdGuard en Aplicaciones \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted1.png) +1. On your Android device, open the **Settings app**. +2. Tap **Apps**. +3. Tap **AdGuard** -Si no lo encuentras, primero toca **Ver todas las aplicaciones** o **Información de la aplicación**. +![AdGuard in Apps \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted1.png) -1. Toca **Más** (⁝) → _Permitir configuraciones restringidas_. +If you can't find it, first tap **See all apps** or **App info**. -![Permitir configuraciones restringidas \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted2.png) +1. Tap **More** (⁝) → _Allow restricted settings_. -Sigue las instrucciones en pantalla. +![Allow restricted settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted2.png) -¡Todo listo! Ahora las funciones _Firewall_ y _Detectar Samsung Pay_ funcionarán correctamente. +Follow the on-screen instructions. -![Configuraciones restringidas permitidas para AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) +All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. + +![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index 068b49df56b..39c654f5adb 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Instalación manual del certificado de seguridad en el navegador Firefox -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index 2373825cbaf..6d75a79e3ad 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Trasladar el certificado de CA al almacenamiento del sistema en dispositivos rooteados -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/logcat.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/logcat.md index 4d8ba4effa7..f54c2dd6811 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/logcat.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/logcat.md @@ -63,7 +63,7 @@ En dispositivos con Android 7 y anteriores, no es posible enviar un informe de b Sigue estas instrucciones: -### Part #1: prepare the device +### Parte #1: prepara el dispositivo 1. Pon el dispositivo al modo de desarrollador. Para ello: ve a **Ajustes** → **Acerca de** → toca el **Número de compilación** 7 veces. @@ -73,9 +73,9 @@ Sigue estas instrucciones: 1. Aumenta el tamaño del **Logger buffer** a 4 MB por log buffer. -4 MB should be enough for storing the logs we need until you're able to do the second part (getting the log from the device); +4 MB deberían ser suficientes para almacenar los registros que necesitamos hasta que puedas hacer la segunda parte (obtener el registro del dispositivo); -### Part #2: reproduce the problem +### Parte #2: reproduce el problema It is important to reproduce the problem after you're done with the first part. @@ -83,7 +83,7 @@ It is important to reproduce the problem after you're done with the first part. 1. Recuerda/anota la fecha y hora de reproducción e inclúyela en el correo electrónico que enviarás posteriormente a nuestro soporte. -### Part #3: get the log +### Parte nº 3: obtén el registro 1. Conecta tu dispositivo a una PC con un cable USB. @@ -103,7 +103,7 @@ It is important to reproduce the problem after you're done with the first part. Email the created `txt` file as well as the time the problem was reproduced (from part #2) to our support team at . -### Alternative way for ROOT users +### Forma alternativa para usuarios ROOT 1. Descarga y ejecuta [Logcat](https://play.google.com/store/apps/details?id=com.pluscubed.matlog). diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 29ebec3a1fd..8891c2f9891 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Instalación de certificados en dispositivos con Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 01712882af8..4a81f11041a 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problemas causados por múltiples perfiles de usuario -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 3c45b199740..d0095c1f1ed 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: Cómo configurar un proxy saliente -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index 04c46a4536f..5ad3c59cf36 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: Cómo utilizar Samsung Pay con AdGuard en Corea del Sur -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 3ef35fd0f3e..985cb3f84c2 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Instalación del certificado en una carpeta segura -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index 0f245e4021b..b6765f7636d 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: Cómo bloquear anuncios en la aplicación de YouTube -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index f3019650343..01366798c3f 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,88 +5,150 @@ sidebar_position: 2 ## Instalando AdGuard para Linux -Para instalar AdGuard, ingresa: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` -Si es necesario, introduce tu contraseña de administrador. +If required, enter your admin password. -Presiona `y` para crear un enlace en `/usr/local/bin` al ejecutable y espera hasta que la instalación esté completa. +Press `y` to create a link in `/usr/local/bin` to the executable and wait until the installation is complete. :::note -Puedes verificar la firma para probar que es una versión oficial de AdGuard utilizando la herramienta `gpg`. [Más información en GitHub](https://github.com/AdguardTeam/AdGuardCLI?tab=readme-ov-file#verify-releases) +You can verify the signature to prove it’s an official version of AdGuard by using the `gpg` tool. [Read more on GitHub](https://github.com/AdguardTeam/AdGuardCLI?tab=readme-ov-file#verify-releases) ::: -## Activando una licencia +## Initial setup -AdGuard para Linux requiere una [licencia de AdGuard](https://adguard.com/license.html). Si aún no tienes una licencia, puedes iniciar sesión o crear una cuenta para obtener una prueba gratis de 14 días. Si ya tienes una licencia, inicia sesión para activarla. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -Para iniciar sesión o crear una cuenta, ingresa: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -Para restablecer tu licencia, introduce: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -Para ver la información de la licencia, ingresa: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Configuración inicial +4. After activation, you can continue to work with the program: -Para poner AdGuard en funcionamiento, completa la configuración inicial. Esto incluye la instalación del Certificado CA de AdGuard, la activación de los filtros necesarios y la selección del modo proxy. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -Para ejecutar el asistente de configuración, ingresa: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. -## Desinstalar AdGuard para Linux +7. After that, you can start the AdGuard protection by entering -Para desinstalar AdGuard, ingresa: + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). + +## Uninstall AdGuard for Linux + +To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` -Si es necesario, introduce tu contraseña de administrador. +If required, enter your admin password. diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index a678ff7ff05..71b28156d57 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Configuración y gestión de protección sidebar_position: 3 --- +## Available commands + Para obtener una lista de todos los comandos disponibles de AdGuard, ingresa: -``` +```sh adguard-cli --help-all ``` ## Habilitando y deshabilitando la protección +### Enable protection + Para habilitar la protección, ingresa: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + Para deshabilitar la protección, ingresa: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + Para ver el estado de la protección, ingresa: -``` +```sh adguard-cli status ``` -## Buscar actualizaciones +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Buscar actualizaciones Para buscar actualizaciones, ingresa: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + Para actualizar AdGuard para Linux, ingresa: -``` +```sh adguard-cli update ``` +### Update script output + Para ver la salida del script de actualización, ingresa: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Usa el comando `config` para configurar AdGuard para Linux. Subcomandos: - `show`: Muestra la configuración actual en `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configurar una opción en `proxy.yaml` - `listen_ports.http_proxy`: puerto HTTP de escucha - `proxy_mode`: Modo proxy (`manual` u `auto`) + - `get`: Obtener el estado actual de las opciones anteriores ## Administrar filtros @@ -64,8 +90,32 @@ Usa el comando `config` para configurar AdGuard para Linux. Subcomandos: Usa el comando `filters` para configurar AdGuard para Linux. Subcomandos: - `list`: Listar filtros instalados + - `--all`: Ver todos los filtrados + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Instalar un filtro. Ingrese la URL del filtrado que deseas instalar + - `enable`: Habilitar un filtro. Introduce el nombre o ID del filtro + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Deshabilitar un filtro. Introduce el nombre o ID del filtro + - `update`: Actualiza los filtros + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index e81ba3292e1..5ec22319cbd 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ Esta página describe las características y detalles sobre la gestión central ## 1. Descarga la MSI {#msi-download} -Descarga [AdGuard MSI x86](https://cdn.adtidy.org/distr/windows/AdGuard_x86.msi) +Descargar [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Descarga [AdGuard MSI x64](https://cdn.adtidy.org/distr/windows/AdGuard_x64.msi) +Descarga [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configura la configuración para tu red {#settings-configuring} diff --git a/i18n/es/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/es/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index 0e3c12d8e92..754ad7aa2d7 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,11 +65,11 @@ Por defecto, tales reglas no funcionan para las peticiones de documentos. Esto s - `https://example.org/banner/img` -### Modificadores de regla básicos {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} El soporte de reglas de filtrado admite numerosos modificadores que permiten ajustar el comportamiento de la regla. Aquí hay un ejemplo de una regla con algunos modificadores simples. -![Modificadores de regla básicos](https://cdn.adtidy.org/content/kb/ad_blocker/general/2_basic_rule_options.svg) +![Basic rule modifiers](https://cdn.adtidy.org/content/kb/ad_blocker/general/2_basic_rule_options.svg) **Esta regla bloquea:** @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -360,7 +360,7 @@ Rules with wildcard for TLD are not supported by AdGuard Content Blocker. - `@@||example.com$document` — general exception rule. It completely disables filtering for `example.com` and all subdomains. There is a number of modifiers which can be used in exception rules. For more details, please follow the link [below](#exception-modifiers). -### Modificadores de regla básicos +### Basic rule modifiers - [Basic modifiers](#basic-rules-basic-modifiers) - [Content-type modifiers](#content-type-modifiers) @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [✅](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,8 +405,7 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — totalmente compatible - ✅ * — compatible, pero la confiabilidad puede variar o pueden ocurrir limitaciones; verifica la descripción del modificador para más detalles -- ⏳ — funcionalidad que se planea implementar pero que aún no está disponible en ningún producto -- ❌ — no compatible +- ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restricciones 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -843,7 +843,7 @@ There is a big difference in how AdGuard determines the content type on differen - ✅ — totalmente compatible - ✅ * — compatible, pero la confiabilidad puede variar o pueden ocurrir limitaciones; verifica la descripción del modificador para más detalles -- ❌ — no compatible +- ❌ — not supported - 🚫 — removed and no longer supported ::: @@ -1043,7 +1043,7 @@ We recommend to get acquainted with [the Adblock Plus filter cheatsheet](https:/ - ✅ — totalmente compatible - ✅ * — compatible, pero la confiabilidad puede variar o pueden ocurrir limitaciones; verifica la descripción del modificador para más detalles -- ❌ — no compatible +- ❌ — not supported ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,36 +1326,35 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard para Chromium][ext-chr] | [AdGuard para Chrome MV3][ext-mv3] | [AdGuard para Firefox][ext-ff] | [AdGuard para iOS][ios-app] | [AdGuard para Safari][ext-saf] | [Bloqueador de contenido AdGuard][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:--------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:---------------------------:|:------------------------------:|:-----------------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard para Chromium][ext-chr] | [AdGuard para Chrome MV3][ext-mv3] | [AdGuard para Firefox][ext-ff] | [AdGuard para iOS][ios-app] | [AdGuard para Safari][ext-saf] | [Bloqueador de contenido AdGuard][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:---------------------------:|:------------------------------:|:-----------------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — totalmente compatible - ✅ * — compatible, pero la confiabilidad puede variar o pueden ocurrir limitaciones; verifica la descripción del modificador para más detalles -- ⏳ — funcionalidad que se planea implementar pero que aún no está disponible en ningún producto -- ❌ — no compatible +- ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future ::: @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + se convierte a + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restricciones This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restricciones Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -3090,7 +3179,7 @@ However, basic rules may not be enough to block ads. Sometimes you need to hide :::note - ✅ — totalmente compatible -- ❌ — no compatible +- ❌ — not supported ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4343,7 +4432,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` - ✅ — totalmente compatible - ✅ * — compatible, pero la confiabilidad puede variar o pueden ocurrir limitaciones; verifica la descripción del modificador para más detalles -- ❌ — no compatible +- ❌ — not supported ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4902,7 +5005,7 @@ The following scriptlets also may be used for debug purposes: - ✅ * — compatible, pero la confiabilidad puede variar o pueden ocurrir limitaciones; verifica la descripción del modificador para más detalles - 🧩 — may already be implemented in nightly or beta versions but is not yet supported in release versions - ⏳ — funcionalidad que se planea implementar pero que aún no está disponible en ningún producto -- ❌ — no compatible +- ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future - 🚫 — removed and no longer supported @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "Extensión de navegador AdGuard para Chrome MV3" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" diff --git a/i18n/es/docusaurus-plugin-content-docs/current/general/extensions.md b/i18n/es/docusaurus-plugin-content-docs/current/general/extensions.md index 1056735298b..8bdb66bc1d2 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/general/extensions.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/general/extensions.md @@ -39,7 +39,7 @@ Esta versión del Asistente de AdGuard es antigua y no tiene sentido usarla en s ::: -#### Deshabilitar AMP +#### Disable AMP Un script que sólo está preinstalado en AdGuard para Android. Desactiva AMP (Accelerated Mobile Pages) en la página de resultados de búsqueda de Google. Obtén más información sobre este scripts de usuario y cómo instalarlo en [GitHub](https://github.com/AdguardTeam/DisableAMP). diff --git a/i18n/es/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/es/docusaurus-plugin-content-docs/current/general/license/legacy.md index 0c792d4443c..a8afca8c689 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: FAQ sobre licencias heredadas sidebar_position: 6 --- -Escribimos este artículo para evitar confusiones y explicar en detalle cómo puedes renovar/actualizar una licencia de AdGuard obsoleta (heredada). +Escribimos este artículo para evitar confusiones y explicar en detalle cómo puedes renovar/actualizar una licencia de AdGuard heredada. -## Acerca de las licencias obsoletas +## Acerca de las licencias antiguas Inicialmente, las licencias de los siguientes tipos estaban disponibles para los productos de AdGuard: @@ -27,57 +27,55 @@ Para todos los tipos (Standad, Mobile, Premium) había opciones para una licenci En octubre de 2019, AdGuard cambió al nuevo sistema de licencias: a partir de ese momento, las licencias aún se pueden comprar por 1 año o de por vida, pero sus tipos pasan a ser **Personal** (para hasta 3 dispositivos) o **Familiar** (para hasta 9 dispositivos). -Un cambio más: ahora se pueden usar **claves de licencia del nuevo tipo en cualquier dispositivo, en cualquier combinación. Por ejemplo, una licencia Personal se puede utilizar en Android, Mac e iOS, al igual que en dos computadoras con Windows y una tableta Apple.** +Otro cambio es que los **nuevos tipos de claves de licencia ahora se pueden usar en cualquier dispositivo, en cualquier combinación**. Por ejemplo, una licencia Personal se puede utilizar en Android, Windows y iOS, así como en dos computadoras con Windows y una tableta Apple. -## ¿Qué pasó con las licencias obsoletas? +## ¿Qué pasó con las licencias antiguas? -Las estándares se convirtieron automáticamente en universales, lo que significa que se pueden activar en cualquier dispositivo. +Las **licencias estándar** se convirtieron automáticamente en **universales**, lo que significa que se pueden activar en cualquier dispositivo. -Las licencias móviles se mantuvieron sin cambios y limitadas por plataforma (todavía solo se pueden usar en teléfonos o tabletas). +**Licencias móviles** se mantuvieron sin cambios y limitadas por plataforma (todavía solo se pueden usar en teléfonos o tabletas). -Las licencias premium también se mantuvieron sin cambios y limitadas por plataforma. Y aunque ahora se muestran **licencias Premium en tu cuenta personal por el número total de dispositivos**, todavía se pueden activar en el conjunto de dispositivos de escritorio + móvil. +**Licencias premium** también se mantuvieron sin cambios y limitadas por plataforma. Y aunque ahora se muestran **licencias Premium en tu cuenta personal por el número total de dispositivos**, todavía se pueden activar en el conjunto de dispositivos de escritorio + móvil. Por ejemplo, así es como se ve la llave 1+1: -![Llave 1+1](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![Llave 1+1](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *Pero a pesar de la cantidad total de dispositivos (2), se puede activar en 1 computadora de escritorio y 1 dispositivo móvil.* > Todas las licencias obsoletas tienen un distintivo "legacy" en la cuenta de AdGuard. Y se convierten automáticamente a un nuevo tipo cuando las renuevas o actualizas. Pero hay algunos matices. Veamos qué licencias se pueden convertir a un nuevo tipo y cómo hacerlo. -## Tengo una clave obsoleta (heredada). ¿Qué opciones de renovación/actualización están disponibles para mí? +## Cómo renovar o actualizar una clave antigua -Puedes verificarlo en la [página de renovación](https://adguard.com/renew.html) o en tu [cuenta de AdGuard](https://adguardaccount.com/main.html): +Puedes extender/renovar o actualizar una licencia heredada en tu [cuenta de AdGuard](https://adguardaccount.com) o en la [página para extender o actualizar](https://adguard.com/renew.html). -![Actualizar](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Ve a la pestaña "Mis licencias" y verifica qué acciones están disponibles para cada clave específica. A continuación lo explicaremos con ejemplos concretos. +Para extender/renovar o actualizar una licencia antigua en tu cuenta de AdGuard, ve a la pestaña *Licencias*, encuentra la licencia que necesitas y selecciona una de las opciones disponibles. -### Licencias para 1/2/3 dispositivos +![Renueva o actualiza una licencia en tu cuenta AdGuard](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**** licencias anuales para 1, 2, 3 dispositivos se pueden convertir a Personal o Familiar: +O ve a la página [Extender o hacer un upgrade](https://adguard.com/renew.html), ingresa tu licencia y haz clic en *Aplicar*. En la nueva página, selecciona una de las opciones disponibles. -![Actualizar o renovar](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Elige en función de cuántos dispositivos necesitas proteger. +### Licencias para 1/2/3 dispositivos -En lugar de renovar, puedes cambiar a Vitalicio: +Las licencias anuales móviles para 3 dispositivos se pueden convertir en licencias personales o actualizarse a Familiar: -![Vitalicia](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Actualizar licencias anuales para 1, 2, 3 dispositivos](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Las licencias vitalicias** solo se pueden convertir a Familiar (9 dispositivos) debido a limitaciones técnicas: +> Si tienes una **licencia estándar para 3 dispositivos**, ya funciona como una **Personal**. Si renuevas tu **Licencia móvil** para 3 dispositivos, podrás **utilizarla en un conjunto diferente de dispositivos**, no solo en teléfonos. -![Actualización a Vitalicia](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +También puedes actualizar tu licencia a Vitalicia: -### Licencias para 4+ dispositivos (hasta 9) +![Actualizar a vitalicia](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Las claves anuales** de esta configuración sólo pueden convertirse en una licencia familiar: +**Las licencias vitalicias** solo se pueden actualizar a Familiar (9 dispositivos) debido a limitaciones técnicas. -![Licencia anual para 4 dispositivos](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licencias para 4+ dispositivos (hasta 9) -**Las licencias vitalicias** para 4 o más dispositivos no se pueden actualizar debido a limitaciones técnicas: +Las licencias **anuales** para 4 o más dispositivos se pueden actualizar a licencias Familiar y Vitalicia. -![Licencia vitalicia para 4 dispositivos](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +Sin embargo, si ya tienes una licencia **vitalicia**, no se puede actualizar debido a limitaciones técnicas. ### Licencias para más de 9 dispositivos -Claves premium (5+5 y más) y claves personalizadas para más de 10 dispositivos que compraste individualmente con la ayuda de nuestros gerentes. +Claves premium (5+5 y más) y claves personalizadas para más de 10 dispositivos que compraste individualmente con la ayuda de nuestros gestores. -Estos son casos bastante únicos, por lo que si deseas actualizar tu licencia a Vitalicia, contáctanos en partners@adguard.com. Te haremos una oferta especial dependiendo de la configuración específica de tu licencia. +Estos son casos bastante únicos, por lo que si deseas actualizar tu licencia a Vitalicia, contáctanos vía partners@adguard.com. Te haremos una oferta especial dependiendo de la configuración específica de tu licencia. diff --git a/i18n/es/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/es/docusaurus-plugin-content-docs/current/general/license/what-is.md index fc1bbfc2b58..444f1044b08 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ También hay licencias que el usuario puede adquirir de otras fuentes u obtener - **Las licencias de distribuidor** y **las licencias regaladas** pueden ser tanto de tiempo limitado como de tiempo no limitado. Las licencias con fecha de vencimiento solo se pueden renovar manualmente - Personal: hasta 3 dispositivos - Familiar: hasta 9 dispositivos -- **La licencia AdGuard Pro para iOS** se compra y administra a través de App Store y solo se puede usar en dispositivos iOS y iPadOS con el mismo ID de Apple +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/es/docusaurus-plugin-content-docs/current/general/stealth-mode.md b/i18n/es/docusaurus-plugin-content-docs/current/general/stealth-mode.md index 61bc4a2499f..3a94738a55e 100644 --- a/i18n/es/docusaurus-plugin-content-docs/current/general/stealth-mode.md +++ b/i18n/es/docusaurus-plugin-content-docs/current/general/stealth-mode.md @@ -3,7 +3,7 @@ title: Modo sigiloso (protección contra rastreo) sidebar_position: 4 --- -Muchos sitios web recopilan información sobre sus visitantes, como su dirección IP, navegador y sistema operativo instalados, resolución de pantalla e incluso la página desde la que se redirige al visitante. Algunas páginas web utilizan cookies para marcar tu navegador y guardar tus configuraciones y preferencias personales, o para "reconocerte" en tu próxima visita. *Tracking protection* safeguards your personal information from such data- and statistics-gathering systems. +Muchos sitios web recopilan información sobre sus visitantes, como su dirección IP, navegador y sistema operativo instalados, resolución de pantalla e incluso la página desde la que se redirige al visitante. Algunas páginas web utilizan cookies para marcar tu navegador y guardar tus configuraciones y preferencias personales, o para "reconocerte" en tu próxima visita. *Protección de seguimiento* protege tu información personal de sistemas de recopilación de datos y estadísticas. Puedes ajustar de manera flexible el trabajo del Modo sigiloso: por ejemplo, puedes prohibir que el sitio web reciba la solicitud de búsqueda que utilizaste para encontrarlo en Internet, eliminar automáticamente tanto las cookies de terceros como las propias del sitio web, desactivar el uso compartido de geolocalización del navegador que puede usarse para rastrear tu ubicación, y ocultar tu verdadera Dirección IP o incluso reemplazarla por una arbitraria. @@ -95,7 +95,7 @@ También puedes establecer un valor arbitrario para Referer ingresándolo en el Ten en cuenta que para poder filtrar el tráfico, las aplicaciones AdGuard "interceptan" las solicitudes del navegador al servidor. Las solicitudes a servidores de publicidad, seguimiento y phishing pueden modificarse antes de enviarlas al servidor o bloquearse por completo. Lo mismo ocurre con la opción *Ocultar Referer de terceros*: AdGuard intercepta solicitudes HTTP(S), en particular para eliminar o cambiar el encabezado Referer si esta opción está habilitada. Sin embargo, esto ocurre sólo después de que estas solicitudes “abandonan” el navegador. Esto significa que, si monitoreas el Referer dentro del navegador (por ejemplo, con la ayuda de las herramientas de desarrollo de Chrome), verás el Referer original porque la solicitud aún no ha llegado a AdGuard. Puedes utilizar software como [Fiddler](https://www.telerik.com/fiddler) para asegurarte de que Referer se modifique correctamente. -Due to the nature of all web browser extensions, AdGuard Browser Extension instead works 'inside' the web browser. Modificará el Referer en ese mismo momento, por lo que Developer Tools mostrará el Referer deseado para tus peticiones. +Debido a la naturaleza de todas las extensiones del navegador web, la Extensión de navegador de AdGuard funciona "dentro" del navegador web. Modificará el Referer en ese mismo momento, por lo que Developer Tools mostrará el Referer deseado para tus peticiones. ### Ocultar User-Agent {#useragent} diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 92bfd87a1dd..fa490098e78 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ The _Low-level settings_ section is for expert users. [Read more about low-level This section allows you to manage HTTPS filtering settings, filters, and userscripts, and set up a proxy server. -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filters @@ -57,11 +57,19 @@ If you activate too many filters, some websites may work incorrectly. [Read more about filters](https://adguard.com/en/blog/what-are-filters.html) -### Userscripts +### Extensions + +Extensions allow you to add userscripts and userstyles. + +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 5e75a51f1e8..b5525cd735c 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 24b41b032ca..8f7344f7ade 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index da99768471a..0341d942127 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: How to protect AdGuard from being disabled by the system -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 7367e63cef9..784a7c9587c 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ You can access it by navigating to *Statistics* → *Battery usage*. Inside you will find a chart that shows the AdGuard battery resource consumption within the last 24 hours, with an option to get more detailed hour-to-hour data by tapping on the chart. Besides that, there’s also a numeric breakdown of the relevant data and a short technical explanation. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### How much battery resource does AdGuard really consume? First, let us lay down a bit of theory and links with necessary data. diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 6f1876d0079..0563d2a0336 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index d98274a0489..c77491236e7 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index deebee15677..c716cc3ed93 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Manual installation of the security certificate into the Firefox browser -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index c5b7755321a..05d28c3b6ea 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 54b325ec582..52016424603 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 79723d1f221..b9f70d23922 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problems caused by multiple user profiles -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 6b9fddc4500..f95d206303e 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: How to set up outbound proxy -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index b9e9396152a..4ae364e8290 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 96b31c31295..25de8d83319 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index adfd7139869..5d8aa06bad9 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: How to block ads in the YouTube app -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 43c9e9aee82..67126401ab4 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,23 +5,25 @@ sidebar_position: 2 ## Install AdGuard for Linux -To install AdGuard, enter: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` @@ -35,37 +37,97 @@ You can verify the signature to prove it’s an official version of AdGuard by u ::: -## Activate license +## Initial setup -AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don't have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -To log in or create an account, enter: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -To reset your license, enter: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -To view the license info, enter: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Initial setup +4. After activation, you can continue to work with the program: -To get AdGuard up and running, complete the initial setup. This includes installing the AdGuard CA certificate, enabling the necessary filters, and selecting the proxy mode. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -To run the configuration wizard, enter: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). ## Uninstall AdGuard for Linux @@ -73,19 +135,19 @@ To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 4ede8a490a1..2487dcaac3b 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Settings and protection management sidebar_position: 3 --- +## Available commands + To get a list of all available AdGuard commands, enter: -``` +```sh adguard-cli --help-all ``` ## Enable and disable protection +### Enable protection + To enable protection, enter: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + To disable protection, enter: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + To view the protection status, enter: -``` +```sh adguard-cli status ``` -## Check for updates +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Check for updates To check for updates, enter: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + To update AdGuard for Linux, enter: -``` +```sh adguard-cli update ``` +### Update script output + To view the update script output, enter: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Use the `config` command to configure AdGuard for Linux. Subcommands: - `show`: Show the current configuration in `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configure an option in `proxy.yaml` - - `listen_ports.http_proxy`: HTTP listening port - - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `listen_ports.http_proxy`: HTTP listening port + - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `get`: Get the current status of the above options ## Manage filters @@ -64,8 +90,32 @@ Use the `config` command to configure AdGuard for Linux. Subcommands: Use the `filters` command to configure AdGuard for Linux. Subcommands: - `list`: List installed filters - - `--all`: View all filters + + - `--all`: View all filters + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Install a filter. Enter the URL of the filter you want to install + - `enable`: Enable a filter. Enter the name or ID of the filter + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Disable a filter. Enter the name or ID of the filter + - `update`: Update filters + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index 412685edf25..86c048ff7a0 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ This page describes the features and details of AdGuard’s central management o ## 1. Download the MSI {#msi-download} -Download the [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi) +Download the [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Download the [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi) +Download the [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configure the settings for your network {#settings-configuring} diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/fa/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index cf76ff7fe89..24b6011caf1 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + is converted to + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-ff]: #what-product "AdGuard Browser Extension for Firefox" diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/fa/docusaurus-plugin-content-docs/current/general/license/legacy.md index 6b1c2a74395..1e68e937061 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: Legacy licenses FAQ sidebar_position: 6 --- -We have written this article to avoid confusion and explain in detail how you can renew/upgrade an outdated (legacy) AdGuard license. +We have written this article to avoid confusion and explain in detail how you can renew/upgrade a legacy AdGuard license. -## About the outdated licenses +## About legacy licenses Initially licenses of the following types were available to activate AdGuard products: @@ -27,54 +27,52 @@ For all types (Standard, Mobile, Premium) there were options for a Yearly and Li In October 2019 AdGuard switched to the new licensing system: from then on, licenses can still be purchased for 1 year or Lifetime, but their types have become **Personal** (for up to 3 devices) or **Family** (for up to 9 devices). -One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal license can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet.** +Another change is that the **new types of license keys can now be used on any device, in any combination**. For example, a Personal license can be used on Android, Mac and iOS, as well as on two Windows computers and an Apple tablet. -## What happened to the outdated licenses? +## What happened to the legacy licenses? -Standard were automatically made universal, which means that they can be activated on any devices. +**Standard licenses** were automatically made **universal**, which means that they can be activated on any device. -Mobile licenses remained unchanged and platform-limited (they can still only be used on phones or tablets). +**Mobile licenses** remained unchanged and platform-limited (they can still only be used on phones or tablets). -Premium licenses also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. +**Premium licenses** also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. For example, this is how the 1+1 key looks like: -![1+1 key](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 key](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *But despite the total number of devices (2) it can be activated on 1 desktop and 1 mobile device.* > All the outdated licenses have a "legacy" badge in the AdGuard account. And they are automatically converted to a new type when you either renew or upgrade them. But there are some nuances. Let's see which licenses can be converted to a new type and how to do it. -## I have an outdated (legacy) key. What renewal/upgrade options are available for me? +## How to renew or upgrade a legacy key -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +You can extend/renew or upgrade a legacy license in your [AdGuard account](https://adguardaccount.com) or on the [Extend or upgrade page](https://adguard.com/renew.html). -![Upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Go to "My licenses" tab and check what actions are available to you for each specific key. Below we will explain with specific examples. +To extend/renew or upgrade a legacy license in your AdGuard account, go to the *Licenses* tab, find the license you need, and select one of the available options. -### Licenses for 1/2/3 devices +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Yearly** licenses for 1, 2, 3 devices can be converted to either Personal or Family: +Or go to the [Extend or upgrade page](https://adguard.com/renew.html), enter your license, and click *Apply*. On the new page, select one of the available options. -![Upgrade or renew](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Choose based on how many devices you need to protect. +### Licenses for 1/2/3 devices -Instead of renewal you can switch to Lifetime: +Mobile Yearly licenses for 3 devices can be converted to Personal licenses or upgraded to Family ones: -![Lifetime](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Upgrade Yearly licenses for 1, 2, 3 devices](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Lifetime** licenses can only be converted to Family (9 devices) due to technical limitations: +> If you have a **Standard license for 3 devices**, it already works as a **Personal** license. If you renew your **Mobile license** for 3 devices, you will be able to use it on a **different set of device**s, not just phones. -![Lifetime upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +You can also upgrade your license to Lifetime: -### Licenses for 4+ devices (up to 9) +![Upgrade to Lifetime](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Yearly** keys of this configuration can only be converted into a Family license: +**Lifetime** licenses can only be upgraded to Family (9 devices) due to technical limitations. -![Yearly license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licenses for 4+ devices (up to 9) -**Lifetime** licenses for 4 or more devices cannot be upgraded due to technical limitation: +**Yearly** licenses for 4 or more devices can be upgraded to Family and Lifetime licenses. -![Lifetime license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +However, if you already have a **Lifetime** license, it cannot be upgraded due to technical limitations. ### Licenses for 9+ devices diff --git a/i18n/fa/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/fa/docusaurus-plugin-content-docs/current/general/license/what-is.md index a3b22328a24..fd9fa685ce2 100644 --- a/i18n/fa/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/fa/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ There are also licenses that the user can purchase from other sources or get for - **Distributor licenses** and **gifted licenses** can be both time-limited and non-time limited. Licenses with an expiration date can only be renewed manually - Personal — up to 3 devices - Family — up to 9 devices -- **The AdGuard Pro for iOS license** is purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/compatibility.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/compatibility.md index bc8b5bec5d2..e9d2fb03171 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/compatibility.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/compatibility.md @@ -17,7 +17,7 @@ If you have the desktop version of AdGuard installed on your PC, it is better to ## AdGuard Browser Assistant -![AdGuard Browser Assistant \*mobile\_border](https://cdn.adtidy.org/content/kb/ad_blocker/browser_extension/ad_blocker_browser_extension_assistant.png) +![AdGuard Browser Assistant \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/browser_extension/ad_blocker_browser_extension_assistant.png) AdGuard Browser Assistant is a browser extension that works and feels just like AdGuard Browser Extension, but it's much lighter and doesn't interfere with the desktop apps. You can [read more about Browser Assistant for Windows](/adguard-for-windows/browser-assistant) or [Mac](/adguard-for-mac/features/browser-assistant), or [download it from our website](https://adguard.com/adguard-assistant/overview.html). diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/features/main-menu.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/features/main-menu.md index 4849d210fc4..eebf61e34d7 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/features/main-menu.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/features/main-menu.md @@ -11,7 +11,7 @@ This article is about the AdGuard Browser Extension, which safeguards only your The extension's main page can be accessed by clicking the extension's icon on the toolbar of your browser. -![Main menu \*mobile\_border](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/ad_blocker_browser_extension_main.png) +![Main menu \*mobile_border](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/ad_blocker_browser_extension_main.png) On the main page, you can hide any element on any page manually (a corresponding rule will be added to the _User rules_), open the _Filtering log_ to view the complete information about your browser's traffic and block requests on the go, or look at a website’s security report. Besides, you can submit a complaint about any website (for example, if there are missed ads on the page, our filter engineers will review the report and fix the problem) and see the statistics on applied blocking rules. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/mv3-version.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/mv3-version.md index 1c49edaf3a6..d10f3e8722a 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/mv3-version.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/mv3-version.md @@ -21,19 +21,19 @@ The old beta extension will be renamed to [**AdGuard Ad Blocker MV2**](https://c - **Filtering log** - ![Filtering log \*border](https://cdn.adtidy.org/content/blog/mv3/new/log.png) + ![Filtering log \*border](https://cdn.adtidy.org/content/blog/mv3/new/log.png) - Due to DNR restrictions, we can’t show exactly which rule worked, but we will provide an “assumed rule that was triggered” based on our engine. For precise information, you’ll need to install the “unpacked” form of the extension in your browser yourself. You’ll find detailed instructions on how to do this in a [separate article](/adguard-browser-extension/solving-problems/debug-rules/). + Due to DNR restrictions, we can’t show exactly which rule worked, but we will provide an “assumed rule that was triggered” based on our engine. For precise information, you’ll need to install the “unpacked” form of the extension in your browser yourself. You’ll find detailed instructions on how to do this in a [separate article](/adguard-browser-extension/solving-problems/debug-rules/). - _Tracking protection_ (formerly known as _Stealth mode_) - ![Tracking protection \*border](https://cdn.adtidy.org/content/blog/mv3/new/tracking_screen.png) + ![Tracking protection \*border](https://cdn.adtidy.org/content/blog/mv3/new/tracking_screen.png) - There are no _Cookies_ section, along with _Self-destruction of first-party cookies_ and _Self-destruction of third-party cookies_ since we cannot set the TTL of cookies using declarative rules. + There are no _Cookies_ section, along with _Self-destruction of first-party cookies_ and _Self-destruction of third-party cookies_ since we cannot set the TTL of cookies using declarative rules. - _Phishing & malware protection_ is no longer available in the general settings. To protect yourself from malicious websites and scams, enable the appropriate _Security_ filters in the _Filters_ tab. - ![Security \*border](https://cdn.adtidy.org/content/blog/mv3/new/security.png) + ![Security \*border](https://cdn.adtidy.org/content/blog/mv3/new/security.png) ## Limitations diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/solving-problems/debug-rules.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/solving-problems/debug-rules.md index 23251b3d6cb..b42117945b2 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/solving-problems/debug-rules.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/solving-problems/debug-rules.md @@ -19,61 +19,61 @@ These instructions are also meant for problematic cases where you want to modify 1. Clone the repository: - ```bash - git clone git@github.com:AdguardTeam/AdguardBrowserExtension.git - ``` + ```bash + git clone git@github.com:AdguardTeam/AdguardBrowserExtension.git + ``` 2. Navigate to the directory: - ```bash - cd AdguardBrowserExtension - ``` + ```bash + cd AdguardBrowserExtension + ``` 3. Switch to the `v5.0` branch: - ```bash - git checkout v5.0 - ``` + ```bash + git checkout v5.0 + ``` 4. Install dependencies: - ```bash - yarn install - ``` + ```bash + yarn install + ``` ## How to build extension 1. Switch to the `v5.0` branch: - ```bash - git checkout v5.0 - ``` + ```bash + git checkout v5.0 + ``` 2. Run the following command in the terminal: - ```bash - yarn dev chrome-mv3 - ``` + ```bash + yarn dev chrome-mv3 + ``` 3. The built extension will be located in the directory: - ```bash - ./build/dev/chrome-mv3 - ``` + ```bash + ./build/dev/chrome-mv3 + ``` ## How to install unpacked in the browser 1. Turn on developer mode: - ![Developer mode](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/developer_mode.png) + ![Developer mode](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/developer_mode.png) 2. Click _Load unpacked_: - ![Load unpacked](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/load_unpacked.png) + ![Load unpacked](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/load_unpacked.png) 3. Select the extension directory and click `Select`: - ![Select](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/select.png) + ![Select](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/select.png) That’s it! @@ -83,16 +83,16 @@ That’s it! 2. Convert the rules from txt to declarative form: - ```bash - yarn convert-declarative - ``` + ```bash + yarn convert-declarative + ``` 3. Build the extension again: - ```bash - yarn dev chrome-mv3 - ``` + ```bash + yarn dev chrome-mv3 + ``` 4. Reload the extension in the browser: - ![Reload extension](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/reload_extension.png) + ![Reload extension](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/reload_extension.png) diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/solving-problems/logs.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/solving-problems/logs.md index e3920acb8c0..fe6cd49616e 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/solving-problems/logs.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-browser-extension/solving-problems/logs.md @@ -13,19 +13,19 @@ sidebar_position: 1 3. Enable _Developer mode_. - ![Developer mode \*border](https://cdn.adguardvpn.com/content/kb/ad_blocker/browser_extension/developer_mode1.png) + ![Developer mode \*border](https://cdn.adguardvpn.com/content/kb/ad_blocker/browser_extension/developer_mode1.png) 4. Click `background.html`. - ![Background \*border](https://cdn.adguardvpn.com/content/kb/ad_blocker/browser_extension/background1.png) + ![Background \*border](https://cdn.adguardvpn.com/content/kb/ad_blocker/browser_extension/background1.png) 5. Open the tab _Console_. - ![The Console tab \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/console.png) + ![The Console tab \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/console.png) 6. Open the context menu and select _Save as…_. - ![Save as \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/save.png) + ![Save as \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/save.png) ### Firefox @@ -35,19 +35,19 @@ sidebar_position: 1 3. Click _Debug Add-ons_. - ![Debug Add-ons \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/add-ons.png) + ![Debug Add-ons \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/add-ons.png) 4. Click _Inspect_. - ![Inspect \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/inspect.png) + ![Inspect \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/inspect.png) 5. Go to the tab _Console_. - ![Console \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/ff_console.png) + ![Console \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/ff_console.png) 6. Click _Save all Messages to File_. - ![Save \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/save-to-file.png) + ![Save \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/save-to-file.png) ## Sending logs diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/ad-blocking.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/ad-blocking.md index 8f2a21d7101..de6ec21ff68 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/ad-blocking.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/ad-blocking.md @@ -21,4 +21,4 @@ Basic protection effectively blocks ads on most websites. For more customized ad - Create user rules — AdGuard will apply them on specified websites. [Learn how to create your own user rules](/general/ad-filtering/create-own-filters) -![Ad blocking \*mobile\_border](https://cdn.adtidy.org/blog/new/o44x5ad_blocking.png) +![Ad blocking \*mobile_border](https://cdn.adtidy.org/blog/new/o44x5ad_blocking.png) diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/browsing-security.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/browsing-security.md index ccd17b2d456..5345f7a3fbc 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/browsing-security.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/browsing-security.md @@ -13,11 +13,11 @@ The Browsing security module can be accessed by tapping the _Protection_ tab (se Browsing security protects you from visiting phishing and malicious websites. It also warns you about potential malware. -![Browsing security \*mobile\_border](https://cdn.adtidy.org/blog/new/1y6a8browsing_security.png) +![Browsing security \*mobile_border](https://cdn.adtidy.org/blog/new/1y6a8browsing_security.png) If you're about to visit a dangerous website, Browsing security will show you the following warning: -![Browsing security warning \*mobile\_border](https://cdn.adtidy.org/blog/new/o8s3Screenshot_2023-06-29-15-49-01-514-edit_com.android.chrome.jpg) +![Browsing security warning \*mobile_border](https://cdn.adtidy.org/blog/new/o8s3Screenshot_2023-06-29-15-49-01-514-edit_com.android.chrome.jpg) :::warning diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/dns-protection.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/dns-protection.md index 3ecae5f658d..90c66effc5a 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/dns-protection.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/dns-protection.md @@ -25,7 +25,7 @@ _DNS protection_ allows you to filter DNS requests with the help of a selected D - You can also block and unblock domains by creating user rules. You might need to consult our article about [DNS filtering rule syntax](https://adguard-dns.io/kb/general/dns-filtering-syntax/) -![DNS protection \*mobile\_border](https://cdn.adtidy.org/blog/new/u8qtxdns_protection.png) +![DNS protection \*mobile_border](https://cdn.adtidy.org/blog/new/u8qtxdns_protection.png) #### DNS server diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/firewall/firewall.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/firewall/firewall.md index 2417406eb35..a06ab0869e6 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/firewall/firewall.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/firewall/firewall.md @@ -13,13 +13,13 @@ The Firewall module can be accessed by tapping the _Protection_ tab (second-left This feature helps manage Internet access for specific apps installed on your device and for the device in general. -![Firewall \*mobile\_border](https://cdn.adtidy.org/blog/new/gdn94firewall.png) +![Firewall \*mobile_border](https://cdn.adtidy.org/blog/new/gdn94firewall.png) ### Global firewall rules This section allows you to control Internet access for the entire device. -![Global firewall rules \*mobile\_border](https://cdn.adtidy.org/blog/new/4zx2nhglobal_rules.png) +![Global firewall rules \*mobile_border](https://cdn.adtidy.org/blog/new/4zx2nhglobal_rules.png) These rules apply to all apps on your device unless you've set custom rules for them. @@ -29,15 +29,15 @@ In this section, you can control Internet access for specific apps — restrict 1. Open _Custom firewall rules_. Under _Apps with custom rules_, tap _Add app_. - ![Custom firewall rules \*mobile\_border](https://cdn.adtidy.org/blog/new/qkxpecustom_rules.png) + ![Custom firewall rules \*mobile_border](https://cdn.adtidy.org/blog/new/qkxpecustom_rules.png) 2. Select the app for which you want to set individual rules. - ![Adding an app to Custom firewall rules \*mobile\_border](https://cdn.adtidy.org/blog/new/2db47fadding_app.png) + ![Adding an app to Custom firewall rules \*mobile_border](https://cdn.adtidy.org/blog/new/2db47fadding_app.png) 3. In _Available custom rules_, select the ones you want to configure and tap the “+” icon. The rules will now appear in _Applied custom rules_. - ![Added rule \*mobile\_border](https://cdn.adtidy.org/blog/new/6fzjladded_rule.png) + ![Added rule \*mobile_border](https://cdn.adtidy.org/blog/new/6fzjladded_rule.png) 4. If you need to block a specific type of connection, toggle the switch to the left. If you want to allow it, leave the switch enabled. **Custom rules override global ones**: any changes you make in _Global firewall rules_ will not affect this app. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/firewall/quick-actions.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/firewall/quick-actions.md index 5f13eb2a6ed..25dd48b0c4a 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/firewall/quick-actions.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/firewall/quick-actions.md @@ -13,6 +13,6 @@ Quick actions can be found inside the _Firewall_ module, which can be accessed b _Quick actions_ are based on the requests from _Recent activity_ (which can be found in [_Statistics_](/adguard-for-android/features/statistics)). This section shows which apps have recently connected to the Internet. -![Quick actions \*mobile\_border](https://cdn.adtidy.org/blog/new/yigrfquick_actions.png) +![Quick actions \*mobile_border](https://cdn.adtidy.org/blog/new/yigrfquick_actions.png) If you see an app that shouldn't be using the Internet at all or an app that you haven't used recently, you can block its access on the fly. This will not be possible unless the _Firewall_ module is turned on. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/tracking-protection.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/tracking-protection.md index a867a6d217b..cba74f78efd 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/tracking-protection.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/tracking-protection.md @@ -13,7 +13,7 @@ The Tracking protection module can be accessed by tapping the _Protection_ tab ( _Tracking protection_ (formerly known as _Stealth Mode_) prevents websites from collecting information about you, such as your IP addresses, information about your browser and operating system, screen resolution, and the page you came or were redirected from. It can also block cookies that websites use to mark your browser, save your personal settings and user preferences, or recognize you on your next visit. -![Tracking protection \*mobile\_border](https://cdn.adtidy.org/blog/new/y5fuztracking_protection.png) +![Tracking protection \*mobile_border](https://cdn.adtidy.org/blog/new/y5fuztracking_protection.png) _Tracking protection_ has three pre-configured levels of privacy protection (_Standard_, _High_, and _Extreme_) and one user-defined level (_Custom_). @@ -21,60 +21,60 @@ Here are the active features of the pre-configured levels: 1. **Standard** - a. _Block trackers_. This feature uses _AdGuard Tracking Protection filter_ to protect you from online counters and web analytics tools + a. _Block trackers_. This feature uses _AdGuard Tracking Protection filter_ to protect you from online counters and web analytics tools - b. _Ask websites not to track you_. This feature sends the [Global Privacy Control](https://globalprivacycontrol.org/) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) signals to the websites you visit, asking web apps to disable tracking of your activity + b. _Ask websites not to track you_. This feature sends the [Global Privacy Control](https://globalprivacycontrol.org/) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) signals to the websites you visit, asking web apps to disable tracking of your activity - c. _Remove X-Client-Data header_. This feature prevents Google Chrome from sending information about its version and modifications to Google domains (including DoubleClick and Google Analytics) + c. _Remove X-Client-Data header_. This feature prevents Google Chrome from sending information about its version and modifications to Google domains (including DoubleClick and Google Analytics) 2. **High** - a. _Block trackers_. This feature uses _AdGuard Tracking Protection filter_ to protect you from online counters and web analytics tools + a. _Block trackers_. This feature uses _AdGuard Tracking Protection filter_ to protect you from online counters and web analytics tools - b. _Remove tracking parameters from URLs_. This feature uses _AdGuard URL Tracking filter_ to remove tracking parameters, such as `utm_*` and `fb_ref`, from page URLs + b. _Remove tracking parameters from URLs_. This feature uses _AdGuard URL Tracking filter_ to remove tracking parameters, such as `utm_*` and `fb_ref`, from page URLs - c. _Hide your search queries_. This feature hides queries for websites visited from a search engine + c. _Hide your search queries_. This feature hides queries for websites visited from a search engine - d. _Ask websites not to track you_. This feature sends the [Global Privacy Control](https://globalprivacycontrol.org/) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) signals to the websites you visit, asking web apps to disable tracking of your activity + d. _Ask websites not to track you_. This feature sends the [Global Privacy Control](https://globalprivacycontrol.org/) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) signals to the websites you visit, asking web apps to disable tracking of your activity - e. _Self-destruction of third-party cookies_. This feature limits the lifetime of third-party cookies to 180 minutes + e. _Self-destruction of third-party cookies_. This feature limits the lifetime of third-party cookies to 180 minutes - :::caution + :::caution - This feature deletes all third-party cookies after their forced expiration. This includes your logins through social networks or other third-party services. You may need to re-log in to some websites periodically or experience other cookie-related issues. To block only tracking cookies, use the _Standard_ protection level. + This feature deletes all third-party cookies after their forced expiration. This includes your logins through social networks or other third-party services. You may need to re-log in to some websites periodically or experience other cookie-related issues. To block only tracking cookies, use the _Standard_ protection level. - ::: + ::: - f. _Remove X-Client-Data header_. This feature prevents Google Chrome from sending its version and modifications information to Google domains (including DoubleClick and Google Analytics) + f. _Remove X-Client-Data header_. This feature prevents Google Chrome from sending its version and modifications information to Google domains (including DoubleClick and Google Analytics) 3. **Extreme** (formerly known as _Ultimate_) - a. _Block trackers_. This feature uses _AdGuard Tracking Protection filter_ to protect you from online counters and web analytics tools + a. _Block trackers_. This feature uses _AdGuard Tracking Protection filter_ to protect you from online counters and web analytics tools - b. _Remove tracking parameters from URLs_. This feature uses _AdGuard URL Tracking filter_ to remove tracking parameters, such as `utm_*` and `fb_ref`, from page URLs + b. _Remove tracking parameters from URLs_. This feature uses _AdGuard URL Tracking filter_ to remove tracking parameters, such as `utm_*` and `fb_ref`, from page URLs - c. _Hide your search queries_. This feature hides queries for websites visited from a search engine + c. _Hide your search queries_. This feature hides queries for websites visited from a search engine - d. _Ask websites not to track you_. This feature sends the [Global Privacy Control](https://globalprivacycontrol.org/) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) signals to the websites you visit, asking web apps to disable tracking of your activity + d. _Ask websites not to track you_. This feature sends the [Global Privacy Control](https://globalprivacycontrol.org/) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) signals to the websites you visit, asking web apps to disable tracking of your activity - e. _Self-destruction of third-party cookies_. This feature limits the lifetime of third-party cookies to 180 minutes + e. _Self-destruction of third-party cookies_. This feature limits the lifetime of third-party cookies to 180 minutes - :::caution + :::caution - This feature deletes all third-party cookies after their forced expiration. This includes your logins through social networks or other third-party services. You may need to re-log in to some websites periodically or experience other cookie-related issues. To block only tracking cookies, use the _Standard_ protection level. + This feature deletes all third-party cookies after their forced expiration. This includes your logins through social networks or other third-party services. You may need to re-log in to some websites periodically or experience other cookie-related issues. To block only tracking cookies, use the _Standard_ protection level. - ::: + ::: - f. _Block WebRTC_. This feature blocks WebRTC, a known vulnerability that can leak your real IP address even if you use a proxy or VPN + f. _Block WebRTC_. This feature blocks WebRTC, a known vulnerability that can leak your real IP address even if you use a proxy or VPN - g. _Block Push API_. This feature prevents your browsers from receiving push messages from servers + g. _Block Push API_. This feature prevents your browsers from receiving push messages from servers - h. _Block Location API_. This feature prevents browsers from accessing your GPS data and determining your location + h. _Block Location API_. This feature prevents browsers from accessing your GPS data and determining your location - i. _Hide Referer from third parties_. This feature prevents third parties from knowing which websites you visit. It hides the HTTP header that contains the URL of the initial page and replaces it with a default or custom one that you can set + i. _Hide Referer from third parties_. This feature prevents third parties from knowing which websites you visit. It hides the HTTP header that contains the URL of the initial page and replaces it with a default or custom one that you can set - j. _Hide your User-Agent_. This feature removes identifying information from the User-Agent header, which typically includes the name and version of the browser, the operating system, and language settings + j. _Hide your User-Agent_. This feature removes identifying information from the User-Agent header, which typically includes the name and version of the browser, the operating system, and language settings - k. _Remove X-Client-Data header_. This feature prevents Google Chrome from sending its version and modifications information to Google domains (including DoubleClick and Google Analytics) + k. _Remove X-Client-Data header_. This feature prevents Google Chrome from sending its version and modifications information to Google domains (including DoubleClick and Google Analytics) You can tweak individual settings in _Tracking protection_ and come up with a custom configuration. Every setting has a description that will help you understand its role. [Read more about what the various _Tracking protection_ settings do](/general/stealth-mode) and utilize them cautiously, as some may interfere with the functionality of websites and browser extensions. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 92bfd87a1dd..fa490098e78 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ The _Low-level settings_ section is for expert users. [Read more about low-level This section allows you to manage HTTPS filtering settings, filters, and userscripts, and set up a proxy server. -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filters @@ -57,11 +57,19 @@ If you activate too many filters, some websites may work incorrectly. [Read more about filters](https://adguard.com/en/blog/what-are-filters.html) -### Userscripts +### Extensions + +Extensions allow you to add userscripts and userstyles. + +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/statistics.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/statistics.md index 654a48442f2..bbe4f9a5b11 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/statistics.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/features/statistics.md @@ -11,7 +11,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro The _Statistics_ module can be accessed by tapping the _Statistics_ tab (fourth icon from the left at the bottom of the screen). This feature gives you a complete picture of what is happening with the traffic on your device: how many requests are being sent and to which companies, how much data is being uploaded and downloaded, what requests are being blocked, and more. You can choose to display the statistics for the selected time period: 24 hours, 7 days, 30 days, or all time. -![Statistics \*mobile\_border](https://cdn.adtidy.org/blog/new/czy5rStatistics.jpeg?mw=1360) +![Statistics \*mobile_border](https://cdn.adtidy.org/blog/new/czy5rStatistics.jpeg?mw=1360) The stats are categorized into different sections. @@ -33,7 +33,7 @@ This section displays stats for all apps installed on your device. You can sort Tap _View all apps_ to expand the list of your apps, sorted by the number of ads, trackers, or requests. -![List of apps \*mobile\_border](https://cdn.adtidy.org/blog/new/toq0mkScreenshot_20230627-235219_AdGuard.jpg) +![List of apps \*mobile_border](https://cdn.adtidy.org/blog/new/toq0mkScreenshot_20230627-235219_AdGuard.jpg) If you tap an app, you can see its full stats: the requests it sends and the domains and companies it reaches out to. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 5e75a51f1e8..b5525cd735c 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 24b41b032ca..8f7344f7ade 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index da99768471a..0341d942127 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: How to protect AdGuard from being disabled by the system -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 7367e63cef9..784a7c9587c 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ You can access it by navigating to *Statistics* → *Battery usage*. Inside you will find a chart that shows the AdGuard battery resource consumption within the last 24 hours, with an option to get more detailed hour-to-hour data by tapping on the chart. Besides that, there’s also a numeric breakdown of the relevant data and a short technical explanation. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### How much battery resource does AdGuard really consume? First, let us lay down a bit of theory and links with necessary data. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 6f1876d0079..0563d2a0336 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index d98274a0489..c77491236e7 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index deebee15677..c716cc3ed93 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Manual installation of the security certificate into the Firefox browser -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index c5b7755321a..05d28c3b6ea 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 54b325ec582..52016424603 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 79723d1f221..b9f70d23922 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problems caused by multiple user profiles -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 6b9fddc4500..f95d206303e 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: How to set up outbound proxy -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index b9e9396152a..4ae364e8290 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 96b31c31295..25de8d83319 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index adfd7139869..5d8aa06bad9 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: How to block ads in the YouTube app -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/activity.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/activity.md index 572d17baf4d..99df82c5a49 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/activity.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/activity.md @@ -11,7 +11,7 @@ This article is about AdGuard for iOS, a multifunctional ad blocker that protect _Activity_ screen is the 'information hub' of AdGuard's DNS protection suite. You can quickswitch to it by tapping the third icon in the bottom bar. N.b. this screen is only seen when DNS protection is enabled. -![Activity screen \*mobile\_border](https://cdn.adtidy.org/content/github/ad_blocker/ios/activity.png) +![Activity screen \*mobile_border](https://cdn.adtidy.org/content/github/ad_blocker/ios/activity.png) This is where AdGuard displays statistics about the device's DNS requests, such as total number, number of blocked requests and data saved by blocking them. AdGuard can display the statistics for a day, a week, a month or in total. @@ -25,7 +25,7 @@ AdGuard does not send this information anywhere. It is 100% local and does not l Tap any request to view more details. There will also be buttons to add the request to Blocklist/Allowlist in one tap. -![Request details \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/request_info_en.jpeg) +![Request details \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/request_info_en.jpeg) Above the activity feed, there are _Most active_ and _Most blocked_ companies. Tap each to see data based on the last 1500 requests. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/advanced-protection.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/advanced-protection.md index 3fce549ccdc..ed1b15ff982 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/advanced-protection.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/advanced-protection.md @@ -11,7 +11,7 @@ This article is about AdGuard for iOS, a multifunctional ad blocker that protect In iOS 15, Apple added support for Safari Web Extensions and we added a new _Advanced protection_ module to AdGuard for iOS. It allows AdGuard to apply advanced filtering rules, such as [CSS rules](/general/ad-filtering/create-own-filters#cosmetic-css-rules), [Extended CSS selectors](/general/ad-filtering/create-own-filters#extended-css-selectors), and [scriptlets](/general/ad-filtering/create-own-filters#scriptlets) to deal with even the complex ads, such as YouTube ads. -![Advanced protection screen \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/protection_screen_15_en.jpeg) +![Advanced protection screen \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/protection_screen_15_en.jpeg) ### How to enable @@ -23,4 +23,4 @@ The _Advanced protection_ only works on iOS 15 and later versions. If you are us ::: -![Protection screen on iOS 14 and earlier \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/protection_screen_14_en.jpeg) +![Protection screen on iOS 14 and earlier \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/protection_screen_14_en.jpeg) diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/assistant.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/assistant.md index 535bc6e43d9..0d52cf9cc42 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/assistant.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/assistant.md @@ -11,7 +11,7 @@ This article is about AdGuard for iOS, a multifunctional ad blocker that protect ### Assistant {#assistant} -![Safari Assistant \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/assistant_en.jpeg) +![Safari Assistant \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/assistant_en.jpeg) Assistant is a tool that helps you manage filtering in Safari right from the browser without switching back to the app. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/dns-protection.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/dns-protection.md index 5774624e7fa..4489fb78f01 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/dns-protection.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/dns-protection.md @@ -19,7 +19,7 @@ To be able to manage DNS settings, AdGuard apps require establishing a local VPN ### DNS implementation {#dns-implementation} -![DNS implementation screen \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/implementation_en.jpeg) +![DNS implementation screen \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/implementation_en.jpeg) This section has two options: AdGuard and Native implementation. Basically, these are two methods of setting up DNS. @@ -29,7 +29,7 @@ In Native implementation, the DNS is handled by the system and not the app. This The next section you'll see on the DNS Protection screen is DNS server. It shows the currently selected DNS server and encryption type. To change either, tap the button to enter the DNS server screen. -![DNS servers \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/dns_server_en.jpeg) +![DNS servers \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/dns_server_en.jpeg) Servers differ by their speed, employed protocol, trustworthiness, logging policy, etc. By default, AdGuard will suggest several DNS servers from among the most popular ones (including AdGuard DNS). Tap any to change the encryption type (if such option is provided by the server's owner) or to view the server's homepage. We added labels such as `No logging policy`, `Ad blocking`, `Security` to help you make a choice. @@ -51,7 +51,7 @@ To check if everything is set up correctly, visit our [diagnostics page](https:/ ### Network settings {#network-settings} -![Network settings screen \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/network_settings_en.jpeg) +![Network settings screen \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/network_settings_en.jpeg) Users can also handle their DNS security on the Network settings screen. _Filter mobile data_ and _Filter Wi-Fi_ enable or disable DNS protection for the respective network types. Further down, at _Wi-Fi exceptions_, you can exclude particular Wi-Fi networks from DNS protection (for example, you might want to exclude your home network if you use [AdGuard Home](https://adguard.com/adguard-home/overview.html)). @@ -63,7 +63,7 @@ How to access: _Protection_ (the shield icon in the bottom menu bar) → _DNS protection_ → _DNS filtering_ -![DNS filtering screen \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/dns_filtering_en.jpeg) +![DNS filtering screen \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/dns_filtering_en.jpeg) #### DNS filters {#dns-filters} diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/low-level-settings.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/low-level-settings.md index 5de687dd0cc..a599e400576 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/low-level-settings.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/low-level-settings.md @@ -9,7 +9,7 @@ This article is about AdGuard for iOS, a multifunctional ad blocker that protect ::: -![Low-level settings \*mobile\_border](https://cdn.adtidy.org/public/Adguard/Blog/ios_lowlevel.PNG) +![Low-level settings \*mobile_border](https://cdn.adtidy.org/public/Adguard/Blog/ios_lowlevel.PNG) To open the _Low-level settings_, go to _Settings_ → _General_ → (Enable _Advanced mode_ if it's off) → _Advanced settings_ → _Low-level settings_. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/other-features.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/other-features.md index 79e14d80c0d..7f21aa99943 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/other-features.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/other-features.md @@ -13,9 +13,9 @@ While Safari content blocking and DNS protection are indisputably two major modu ### **Dark theme** -![Light theme \*mobile\_border](https://cdn.adtidy.org/blog/new/26vo4homelight.jpeg) +![Light theme \*mobile_border](https://cdn.adtidy.org/blog/new/26vo4homelight.jpeg) -![Dark theme \*mobile\_border](https://cdn.adtidy.org/blog/new/bgko8homedark.jpeg) +![Dark theme \*mobile_border](https://cdn.adtidy.org/blog/new/bgko8homedark.jpeg) Residing right at the top of **Settings** → **General** screen, this setting allows you to switch between dark and light themes. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/safari-protection.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/safari-protection.md index 390548c4188..5a8d4bb20e0 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/safari-protection.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-ios/features/safari-protection.md @@ -15,7 +15,7 @@ Content blockers serve as 'containers' for filtering rules that do the actual jo All content blockers, their statuses, which thematic filters they currently include, and a total number of used filtering rules can be found on the respective screen in _Advanced settings_ (tap the gear icon at the bottom right → _General_ → _Advanced settings_ → _Content blockers_). -![Content blockers \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/content_blockers_en.jpeg) +![Content blockers \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/content_blockers_en.jpeg) :::tip @@ -29,7 +29,7 @@ Content blockers' work is based on filters, also sometimes referred to as filter All filters are grouped into thematic categories. To see the full list of these categories (not to be confused with content blockers), open the _Protection_ section by tapping the shield icon, then go to _Safari protection_ → _Filters_. -![Filter groups \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/filters_group_en.jpeg) +![Filter groups \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/filters_group_en.jpeg) There are eight of them, each category unites several filters that serve and share a common purpose, i.e. blocking ads, social media widgets, cookie notices, protecting the user from online scams. To decide which filters suit your needs, read their descriptions and navigate by the labels (`ads`, `privacy`, `recommended`, etc.). @@ -47,7 +47,7 @@ Here you can add new rules — either by entering them manually, or by using [th Learn [how to create your own ad filters](/general/ad-filtering/create-own-filters). But please note that many of them won't work in Safari on iOS. -![User rules screen \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/user_rules_en.jpeg) +![User rules screen \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/user_rules_en.jpeg) ### Allowlist {#allowlist} diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-linux/feedback.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-linux/feedback.md index ed211629a91..96884fa74de 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-linux/feedback.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-linux/feedback.md @@ -20,18 +20,18 @@ If you want to support the implementation of a new feature or bugfix, you can vo 1. Enable debug logging: - `adguard-cli config set log_level debug` + `adguard-cli config set log_level debug` 2. Reproduce the problem and try to remember the exact time it occurred. 3. Wait a while, then export the logs: - `adguard-cli export-logs` + `adguard-cli export-logs` - The archived log file will be downloaded to the application folder by default, and the path to the logs will be written to the console. + The archived log file will be downloaded to the application folder by default, and the path to the logs will be written to the console. 4. Send the log file to . Specify the time of the error and attach a link to your GitHub issue or its number (it appears as #number next to the title). Alternatively, you can upload the log file to Google Drive and share it with . Attach the file link to your GitHub issue. 5. Switch the logging mode back to `info`: - `adguard-cli config set log_level info` + `adguard-cli config set log_level info` diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 43c9e9aee82..67126401ab4 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,23 +5,25 @@ sidebar_position: 2 ## Install AdGuard for Linux -To install AdGuard, enter: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` @@ -35,37 +37,97 @@ You can verify the signature to prove it’s an official version of AdGuard by u ::: -## Activate license +## Initial setup -AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don't have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -To log in or create an account, enter: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -To reset your license, enter: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -To view the license info, enter: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Initial setup +4. After activation, you can continue to work with the program: -To get AdGuard up and running, complete the initial setup. This includes installing the AdGuard CA certificate, enabling the necessary filters, and selecting the proxy mode. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -To run the configuration wizard, enter: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). ## Uninstall AdGuard for Linux @@ -73,19 +135,19 @@ To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 4ede8a490a1..2487dcaac3b 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Settings and protection management sidebar_position: 3 --- +## Available commands + To get a list of all available AdGuard commands, enter: -``` +```sh adguard-cli --help-all ``` ## Enable and disable protection +### Enable protection + To enable protection, enter: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + To disable protection, enter: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + To view the protection status, enter: -``` +```sh adguard-cli status ``` -## Check for updates +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Check for updates To check for updates, enter: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + To update AdGuard for Linux, enter: -``` +```sh adguard-cli update ``` +### Update script output + To view the update script output, enter: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Use the `config` command to configure AdGuard for Linux. Subcommands: - `show`: Show the current configuration in `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configure an option in `proxy.yaml` - - `listen_ports.http_proxy`: HTTP listening port - - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `listen_ports.http_proxy`: HTTP listening port + - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `get`: Get the current status of the above options ## Manage filters @@ -64,8 +90,32 @@ Use the `config` command to configure AdGuard for Linux. Subcommands: Use the `filters` command to configure AdGuard for Linux. Subcommands: - `list`: List installed filters - - `--all`: View all filters + + - `--all`: View all filters + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Install a filter. Enter the URL of the filter you want to install + - `enable`: Enable a filter. Enter the name or ID of the filter + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Disable a filter. Enter the name or ID of the filter + - `update`: Update filters + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/ads-not-blocked.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/ads-not-blocked.md index 7f5779c0a05..0613994d881 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/ads-not-blocked.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/ads-not-blocked.md @@ -17,7 +17,7 @@ In some cases, filtering may not work and ads may still be displayed even though 2. Click _Safari_ in the left upper corner menu. 3. Click _Settings…_ → _Extensions_. 4. Clear the checkboxes for AdGuard’s extensions: _Custom_, _General_, _Other_, _Privacy_, _Security_, _Social_, _AdGuard for Safari_, and _AdGuard Assistant_. - ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) + ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) 5. Restart Safari. 6. Return to _Settings..._ → _Extensions_ and re-enable the content-blocking extensions. 7. Open AdGuard for Safari app. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/filters-after-disable.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/filters-after-disable.md index 08a7f136eba..30bf4489c28 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/filters-after-disable.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/filters-after-disable.md @@ -17,7 +17,7 @@ If filtering doesn’t stop when AdGuard for Safari is disabled, it may be becau 2. Click _Safari_ in the left upper corner menu. 3. Click _Settings…_ → _Extensions_. 4. Clear the checkboxes for AdGuard’s extensions: _Custom_, _General_, _Other_, _Privacy_, _Security_, _Social_, _AdGuard for Safari_, and _AdGuard Assistant_. - ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) + ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) 5. Restart Safari. 6. Return to _Settings..._ → _Extensions_ and re-enable the content-blocking extensions. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/logs.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/logs.md index 1874b6ee6c9..2e336f0d2f8 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/logs.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/logs.md @@ -27,4 +27,4 @@ AdGuard is committed to protecting your privacy. We strictly follow our [Privacy 1. Open the [AdGuard for Safari GitHub repo](https://github.com/AdguardTeam/AdGuardForSafari/issues) and click _New issue_. 2. Send the log file to devteam@adguard.com. Include the time of the bug and attach a link to your issue or its number (it appears as #number next to the title). - Alternatively, you can upload the log file to Google Drive and send it to devteam@adguard.com. Add the file link to your GitHub issue. + Alternatively, you can upload the log file to Google Drive and send it to devteam@adguard.com. Add the file link to your GitHub issue. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/private-sonoma.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/private-sonoma.md index 2bacecdef7c..3d771e6c161 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/private-sonoma.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/private-sonoma.md @@ -15,7 +15,7 @@ This article is about AdGuard for Safari, which safeguards only your Safari brow 2. Click _Safari_ in the left upper corner menu. 3. Click _Settings…_ → _Extensions_. 4. Check _Allow in Private Browsing_ for all AdGuard extensions. - ![Checked private browsing](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-sonoma-private.png) + ![Checked private browsing](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-sonoma-private.png) If this doesn’t help and ads are still not being blocked, please contact our support at support@adguard.com. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/rule-limit.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/rule-limit.md index d47cacd87da..fd956cb94f7 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/rule-limit.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/rule-limit.md @@ -31,6 +31,6 @@ However, **an extension can contain up to 150,000 rules**. If you exceed this li 1. Open AdGuard for Safari app. 2. Scroll down and click _Content blockers_. 3. Below each content blocker, you can see the enabled filters and the number of active rules. - ![Content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-cb.png) + ![Content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-cb.png) If more than 150,000 rules are enabled in a content blocker, you may need to disable some filters or user rules from it. Go to _Filters_, select the problematic category, and disable the filters or user rules you don’t need. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index 412685edf25..86c048ff7a0 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ This page describes the features and details of AdGuard’s central management o ## 1. Download the MSI {#msi-download} -Download the [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi) +Download the [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Download the [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi) +Download the [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configure the settings for your network {#settings-configuring} diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-windows/features/home-screen.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-windows/features/home-screen.md index 68db37af985..b1adcc3ff6a 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-windows/features/home-screen.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-windows/features/home-screen.md @@ -11,6 +11,6 @@ This article covers AdGuard for Windows, a multifunctional ad blocker that prote AdGuard for Windows is an easy-to-use tool that blocks annoying banners, popups, video ads, and trackers. But that's not all: it helps you save traffic, load web pages faster, and protect your computer from undesirable and potentially malicious websites. AdGuard also protects you from phishing websites and keeps your kids away from inappropriate content. -![Main screen \*mobile\_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/home-screen.png) +![Main screen \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/home-screen.png) Once you start AdGuard for Windows, you will see the main screen of the app. Its most noticeable detail is the _enable/disable protection_ button. Also, on this screen you can monitor blocked ads, trackers and threats statistics, find out the current version of the app or update it. Furthermore, there are four tabs in the upper right corner: _Settings_, _Support_, _License_, and _About_. Each of these is worth talking about separately. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-windows/features/network.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-windows/features/network.md index 217edb38423..fabafeb762b 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-windows/features/network.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-windows/features/network.md @@ -11,7 +11,7 @@ This article covers AdGuard for Windows, a multifunctional ad blocker that prote The _Network_ module is dedicated to network filtering, and here you will find additional network-related options. Two of them are enabled by default: _Enable traffic filtering_ and _Filter HTTPS_. These are important extra precautions to better filter your web space. Most websites are now using HTTPS, and the same applies to advertising. From many websites, like youtube.com, facebook.com, and x.com, it is impossible to remove ads without HTTPS filtering. So keep the _Filter HTTPS_ feature enabled unless you have a strong reason not to. -![Network Settings \*mobile\_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/network-settings.png) +![Network Settings \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/network-settings.png) In this module you can select the checkbox _Use AdGuard as an HTTP proxy_ to use AdGuard as a regular HTTP proxy which will filter all traffic passing through it. You can also enable the _Filter websites with EV certificates_ feature. Extended Validation (EV) SSL Certificates offer a stronger safety guarantee; owners of such websites have to pass a thorough and globally standardized identity verification process defined by EV guidelines. Which is the reason why some users trust websites with such certificates and prefer not to filter them. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-windows/features/others.md b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-windows/features/others.md index 9d46f2dfe43..5481bbf38cc 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-windows/features/others.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/adguard-for-windows/features/others.md @@ -13,13 +13,13 @@ There are other useful AdGuard options that shouldn't go unnoticed in this artic ### Support -![Support \*mobile\_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/support.png) +![Support \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/support.png) By clicking the Support tab you will open a dialog box through which you can report a bug, submit a feature request, or simply share your opinion of the product. ### License -![License \*mobile\_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/license.png) +![License \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/license.png) This tab contains information about your license. Here you can: @@ -28,13 +28,13 @@ This tab contains information about your license. Here you can: ### About -![About \*mobile\_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/about.png) +![About \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/about.png) In addition to information about the current version of the program, this tab provides some useful links to Licese agreement, Privacy policy, Acknowledgements, Discussions, and Version history pages. ### Check for updates -![Check for updates \*mobile\_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/check-updates.png) +![Check for updates \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/check-updates.png) To check for filters and userscripts updates, click the rotating arrows icon in the upper right corner of the app's main screen. diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/fi/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index cf76ff7fe89..24b6011caf1 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + is converted to + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-ff]: #what-product "AdGuard Browser Extension for Firefox" diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/general/extensions.md b/i18n/fi/docusaurus-plugin-content-docs/current/general/extensions.md index 71af31364c3..243bf9620fa 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/general/extensions.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/general/extensions.md @@ -363,30 +363,30 @@ We don’t support userstyles that contain `@var` or `@advanced` in the metadata 3. To create a userstyle, first write the title with metadata, for example - ```CSS - /* ==UserStyle== - @name New userstyle - @version 1.0 - ==/UserStyle== */ - ``` + ```CSS + /* ==UserStyle== + @name New userstyle + @version 1.0 + ==/UserStyle== */ + ``` 4. Write the CSS part after the meta data. AdGuard supports website domain names matching (`@-moz-document domain(…), …`). For example: - ```CSS - body { - background: gray; - } - ``` - - Or: - - ```CSS - @-moz-document domain('example.org'), - domain('example.net'), - domain('example.com') body { - background: gray; - } - ``` + ```CSS + body { + background: gray; + } + ``` + + Or: + + ```CSS + @-moz-document domain('example.org'), + domain('example.net'), + domain('example.com') body { + background: gray; + } + ``` 5. Once you’re finished, press _Save and Close_. Your new userstyle has been successfully added to AdGuard diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/fi/docusaurus-plugin-content-docs/current/general/license/legacy.md index 6b1c2a74395..1e68e937061 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: Legacy licenses FAQ sidebar_position: 6 --- -We have written this article to avoid confusion and explain in detail how you can renew/upgrade an outdated (legacy) AdGuard license. +We have written this article to avoid confusion and explain in detail how you can renew/upgrade a legacy AdGuard license. -## About the outdated licenses +## About legacy licenses Initially licenses of the following types were available to activate AdGuard products: @@ -27,54 +27,52 @@ For all types (Standard, Mobile, Premium) there were options for a Yearly and Li In October 2019 AdGuard switched to the new licensing system: from then on, licenses can still be purchased for 1 year or Lifetime, but their types have become **Personal** (for up to 3 devices) or **Family** (for up to 9 devices). -One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal license can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet.** +Another change is that the **new types of license keys can now be used on any device, in any combination**. For example, a Personal license can be used on Android, Mac and iOS, as well as on two Windows computers and an Apple tablet. -## What happened to the outdated licenses? +## What happened to the legacy licenses? -Standard were automatically made universal, which means that they can be activated on any devices. +**Standard licenses** were automatically made **universal**, which means that they can be activated on any device. -Mobile licenses remained unchanged and platform-limited (they can still only be used on phones or tablets). +**Mobile licenses** remained unchanged and platform-limited (they can still only be used on phones or tablets). -Premium licenses also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. +**Premium licenses** also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. For example, this is how the 1+1 key looks like: -![1+1 key](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 key](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *But despite the total number of devices (2) it can be activated on 1 desktop and 1 mobile device.* > All the outdated licenses have a "legacy" badge in the AdGuard account. And they are automatically converted to a new type when you either renew or upgrade them. But there are some nuances. Let's see which licenses can be converted to a new type and how to do it. -## I have an outdated (legacy) key. What renewal/upgrade options are available for me? +## How to renew or upgrade a legacy key -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +You can extend/renew or upgrade a legacy license in your [AdGuard account](https://adguardaccount.com) or on the [Extend or upgrade page](https://adguard.com/renew.html). -![Upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Go to "My licenses" tab and check what actions are available to you for each specific key. Below we will explain with specific examples. +To extend/renew or upgrade a legacy license in your AdGuard account, go to the *Licenses* tab, find the license you need, and select one of the available options. -### Licenses for 1/2/3 devices +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Yearly** licenses for 1, 2, 3 devices can be converted to either Personal or Family: +Or go to the [Extend or upgrade page](https://adguard.com/renew.html), enter your license, and click *Apply*. On the new page, select one of the available options. -![Upgrade or renew](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Choose based on how many devices you need to protect. +### Licenses for 1/2/3 devices -Instead of renewal you can switch to Lifetime: +Mobile Yearly licenses for 3 devices can be converted to Personal licenses or upgraded to Family ones: -![Lifetime](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Upgrade Yearly licenses for 1, 2, 3 devices](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Lifetime** licenses can only be converted to Family (9 devices) due to technical limitations: +> If you have a **Standard license for 3 devices**, it already works as a **Personal** license. If you renew your **Mobile license** for 3 devices, you will be able to use it on a **different set of device**s, not just phones. -![Lifetime upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +You can also upgrade your license to Lifetime: -### Licenses for 4+ devices (up to 9) +![Upgrade to Lifetime](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Yearly** keys of this configuration can only be converted into a Family license: +**Lifetime** licenses can only be upgraded to Family (9 devices) due to technical limitations. -![Yearly license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licenses for 4+ devices (up to 9) -**Lifetime** licenses for 4 or more devices cannot be upgraded due to technical limitation: +**Yearly** licenses for 4 or more devices can be upgraded to Family and Lifetime licenses. -![Lifetime license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +However, if you already have a **Lifetime** license, it cannot be upgraded due to technical limitations. ### Licenses for 9+ devices diff --git a/i18n/fi/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/fi/docusaurus-plugin-content-docs/current/general/license/what-is.md index a3b22328a24..fd9fa685ce2 100644 --- a/i18n/fi/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/fi/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ There are also licenses that the user can purchase from other sources or get for - **Distributor licenses** and **gifted licenses** can be both time-limited and non-time limited. Licenses with an expiration date can only be renewed manually - Personal — up to 3 devices - Family — up to 9 devices -- **The AdGuard Pro for iOS license** is purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/adguard-for-android.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/adguard-for-android.md index 418f4507ede..f797da48723 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/adguard-for-android.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/adguard-for-android.md @@ -5,7 +5,7 @@ sidebar_position: 1 :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) +Cet article concerne AdGuard pour Android, un bloqueur de publicité multifonctionnel qui protège votre appareil au niveau système. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) ::: diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/features/features.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/features/features.md index 3805ea0be8c..3a05cd7349d 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/features/features.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/features/features.md @@ -33,7 +33,7 @@ Paramètres généraux, avancés et de bas niveau qui vous permettent de sélect [Paramètres](/adguard-for-android/features/settings.md) -## Low-level settings guide +## Guide sur les paramètres de bas niveau Descriptions of the low-level settings available in AdGuard v4.3 for Android and later. diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md index 2c086eac052..8e4050182ac 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md @@ -1,60 +1,60 @@ --- -title: Low-level settings guide +title: Guide sur les paramètres de bas niveau sidebar_position: 5 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) +Cet article concerne AdGuard pour Android, un bloqueur de publicité multifonctionnel qui protège votre appareil au niveau système. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) ::: -## How to reach Low-level settings +## Comment accéder aux paramètres de bas niveau :::caution -Changing the low-level settings can cause problems with AdGuard’s performance, interrupt your Internet connection, or compromise your security and privacy. Use the low-level features only if you are an experienced user and know what you are doing, or if our support team has asked you to do so. +La modification des paramètres de bas niveau peut entraîner des problèmes de performance d'AdGuard, interrompre votre connexion Internet ou compromettre votre sécurité et votre confidentialité. N'utilisez les fonctions de bas niveau que si vous êtes un utilisateur expérimenté et si vous savez ce que vous faites, soit si notre équipe d'assistance vous a demandé de le faire. ::: -To access _Low-level settings_, open the AdGuard app and tap the gear icon in the lower-right corner of the screen. Then select _General → Advanced → Low-level settings_. +Pour accéder aux _Paramètres de bas niveau_, ouvrez l'application AdGuard et appuyez sur l'icône d'engrenage dans le coin inférieur droit de l'écran. Then select _General → Advanced → Low-level settings_. -## Low-level settings +## Paramètres de bas niveau -For AdGuard v4.x for Android we’ve completely redesigned the low-level settings. We have reworked the list of settings and organized them into thematic groups with improved descriptions. We also added input validation and other safety valves. +Pour AdGuard v4.x pour Android, nous avons complètement repensé les paramètres de bas niveau. Nous avons retravaillé la liste des paramètres et les avons organisés en groupes thématiques avec des descriptions améliorées. Nous avons également ajouté une validation de l'input et d'autres dispositifs de sécurité. -### DNS protection +### Protection DNS -#### Fallback upstreams +#### Repli en amont -Here you can specify the fallback DNS resolver(s) to use when the configured server is unavailable. Available options: +Ici, vous pouvez spécifier le ou les résolveurs DNS de traitement de secours à utiliser lorsque le serveur configuré n'est pas disponible. Options disponibles : -- _Automatic DNS_: Select this option if you want to use the system DNS or AdGuard DNS. +- _DNS automatique_: Sélectionnez cette option si vous souhaitez utiliser le DNS système ou le DNS AdGuard. - _None_: Select this option if you do not want to have any fallback. -- _Custom DNS_: Select this option and enter plain DNS server IPv4 or IPv6 addresses, one per line. These addresses will be used as upstreams. +- _Custom DNS_: Select this option and enter plain DNS server IPv4 or IPv6 addresses, one per line. Ces adresses seront utilisées en amont. -#### Fallback domains +#### Domaines de secours -Here you can list domains that will be redirected to fallback upstreams, if available. You can enter multiple domains, one per line. You can use limited wildcards. +Ici, vous pouvez lister les domaines qui seront redirigés vers les serveurs de secours en amont, s'ils sont disponibles. Vous pouvez saisir plusieurs domaines, un par ligne. Vous pouvez utiliser des caractères génériques limités. -#### Detect search domains +#### Détecter les domaines de recherche -If this setting is enabled, AdGuard will detect DNS search domains and automatically redirect them to fallback upstreams, if available. +Si ce paramètre est activé, AdGuard détectera les domaines de recherche DNS et les redirigera automatiquement vers les traitements de secours en amont, si disponibles. -#### Bootstrap upstreams +#### Bootstrap en amont -Bootstrap DNS for encrypted DNS upstreams, such as DoH, DoT, and DoQ servers. Available options: +Bootstrap DNS pour les DNS chiffrés en amont, tels que les serveurs DoH, DoT et DoQ. Options disponibles : -- _Automatic DNS_: Select this option if you want to use the system DNS or AdGuard DNS. This option is selected by default. -- _Custom DNS_: Select this option and enter plain DNS server IPv4 or IPv6 addresses, one per line. These addresses will be used as bootstrap upstreams. +- _DNS automatique_: Sélectionnez cette option si vous souhaitez utiliser le DNS système ou le DNS AdGuard. Cette option est sélectionnée par défaut. +- _Custom DNS_: Select this option and enter plain DNS server IPv4 or IPv6 addresses, one per line. Ces adresses seront utilisées comme adresses d'amorçage en amont. #### Mode de blocage pour les règles de type adblock -Here you can specify the response type for domains blocked by DNS rules based on adblock rule syntax (for example, `||example.org^`). Available options: +Here you can specify the response type for domains blocked by DNS rules based on adblock rule syntax (for example, `||example.org^`). Options disponibles : - _REFUSED_: Respond with REFUSED - _NXDOMAIN_: Respond with NXDOMAIN -- _Custom IP address_: Select this option to respond with a custom IP address. You will have to enter an IPv4 address for blocked A requests and an IPv6 address for blocked AAAA requests. +- _Custom IP address_: Select this option to respond with a custom IP address. Vous devrez entrer une adresse IPv4 pour les requêtes A bloquées et une adresse IPv6 pour les requêtes AAAA bloquées. #### Mode de blocage pour les règles d’hôtes @@ -63,26 +63,26 @@ Here you can specify the response type for domains blocked by DNS rules based on - _REFUSED_: Respond with REFUSED - _NXDOMAIN_: Respond with NXDOMAIN -- _Custom IP address_: Select this option to respond with a custom IP address. You will have to enter an IPv4 address for blocked A requests and an IPv6 address for blocked AAAA requests. +- _Custom IP address_: Select this option to respond with a custom IP address. Vous devrez entrer une adresse IPv4 pour les requêtes A bloquées et une adresse IPv6 pour les requêtes AAAA bloquées. -#### DNS request timeout +#### Délai d'attente pour les requêtes DNS -Here you can specify the timeout, in milliseconds, that AdGuard will wait for each DNS request before redirecting it to a fallback DNS resolver. If you don’t fill in this field or enter an invalid value, the value of 5000 ms will be used. -If you have multiple upstreams, the fallback DNS will only be used after the timeouts of each upstream have expired. +Ici, vous pouvez spécifier le délai dépassé, en millisecondes, qu'AdGuard attendra pour chaque requête DNS avant de la rediriger vers un résolveur DNS de traitement de secours. Si vous ne remplissez pas ce champ ou si vous saisissez une valeur invalide, la valeur de 5000 ms sera utilisée. +Si vous avez plusieurs amonts, le DNS de secours ne sera utilisé qu'après l'expiration des délais d'expiration de chaque flux en amont. #### Réponse TTL bloquée -Here you can set the time to live (TTL) of the record for blocked domains. The default value is 3600 seconds. +Ici, vous pouvez définir la durée de vie (TTL) de l'enregistrement pour les domaines bloqués. La valeur par défaut est de 3600 secondes. -#### DNS cache size +#### Taille du cache DNS -Here you can specify the maximum number of cached responses. The default value is 1000. +Ici, vous pouvez spécifier le nombre maximum de réponses mises en cache. La valeur par défaut est de 1000. -#### ECH blocking +#### Blocage ECH -If this setting is enabled, AdGuard will block TLS Encrypted Hello (ECH) in DNS responses. +Si ce paramètre est activé, AdGuard bloquera TLS Encrypted Hello (ECH) dans les réponses DNS. -#### Try HTTP/3 for DNS-over-HTTPS upstreams +#### Essayer HTTP/3 pour les amonts DNS-over-HTTPS If this setting is enabled, AdGuard will use HTTP/3 to speed up DNS query resolution for DNS-over-HTTPS upstreams. Otherwise, AdGuard will revert to its default behavior and use HTTP/2 to send all DNS requests for DNS-over-HTTPS. @@ -241,6 +241,6 @@ If this setting is enabled, AdGuard will display the **Developer tools** icon in **Developer tools** is a specialized section available in AdGuard for Android v4.3 and later, designed for quick navigation and switching between features. It allows you to quickly enable or disable custom filters, access logs, enable various logs, and more. -#### Detect Samsung Pay +#### Détection de Samsung Pay -If this setting is enabled, AdGuard protection will be paused when you open the Samsung Pay app. Korean users require this feature as they experience [issues with Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea) when AdGuard is enabled. +Si ce paramètre est activé, la protection AdGuard sera mise en pause lorsque vous ouvrirez l'application Samsung Pay. Les utilisateurs coréens nécessitent cette fonctionnalité car ils rencontrent [des problèmes avec Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea) lorsque AdGuard est activé. diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 3f35239f8ab..401bc4b92e9 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -31,7 +31,7 @@ Le _Niveau de journalisation_ définit les données sur le fonctionnement de l'a ![Paramètres avancés \*mobile_border](https://cdn.adtidy.org/blog/new/vshfnadvanced.png) -La section _Paramètres de bas niveau_ est destinée aux utilisateurs experts. [Read more about low-level settings](/adguard-for-android/features/low-level-settings/) +La section _Paramètres de bas niveau_ est destinée aux utilisateurs experts. [En savoir plus sur les paramètres de bas niveau](/adguard-for-android/features/low-level-settings/) ![Paramètres de bas niveau \*mobile_border](https://cdn.adtidy.org/blog/new/n9ztplow_level.png) @@ -59,9 +59,17 @@ Si vous activez trop de filtres, certains sites web peuvent ne pas fonctionner c ### Scripts utilisateur +Extensions allow you to add userscripts and userstyles. + +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) + Les scripts utilisateur sont des mini-programmes écrits en JavaScript qui étendent la fonctionnalité d'un ou plusieurs sites web. Pour installer un script utilisateur, vous avez besoin d'un gestionnaire de scripts utilisateur. AdGuard possède cette fonctionnalité et vous permet d'ajouter des scripts utilisateur via une URL ou à partir d'un fichier. -![Scripts utilisateur \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra @@ -100,7 +108,7 @@ Vous pouvez également ajouter des sites que vous considérez nécessaires aux e - Exclure certains sites du filtrage HTTPS - Filtrer le trafic HTTPS uniquement sur les sites ajoutés aux exclusions -Par défaut, nous ne filtrons pas non plus les sites avec des certificats Extended Validation (EV), comme les sites financiers. Si nécessaire, vous pouvez activer l'option _Filtrer les sites web avec des certificats EV_. +Par défaut, nous ne filtrons également pas les sites Web dotés de certificats de validation étendue (EV), tels que les sites financiers. Si nécessaire, vous pouvez activer l'option _Filtrer les sites web avec des certificats EV_. #### Proxy diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/installation.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/installation.md index 9ff27985b11..dca3b5a8afa 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/installation.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/installation.md @@ -19,56 +19,56 @@ Cet article concerne AdGuard pour Android, un bloqueur de publicités multifonct ## Installation -Most Android-based apps are distributed via Google Play; however, AdGuard is not presented there, because Google prohibits distribution of network-level ad blockers via Google Play, i.e. apps that block commercials in other apps. You will find more information about Google restrictive policy [in our blog](https://adguard.com/blog/adguard-google-play-removal.html). +La plupart des applications basées sur Android sont distribuées via Google Play ; toutefois, AdGuard n'y est pas présenté, car Google interdit la distribution de bloqueurs d'annonces au niveau du réseau via Google Play, donc des applications qui bloquent les annonces dans d'autres applications. Vous trouverez plus d'informations sur la politique restrictive de Google [dans notre blog](https://adguard.com/blog/adguard-google-play-removal.html). -That’s why you can only install AdGuard for Android manually. To use the app on your mobile device, you will need to do the following. +C'est pourquoi vous ne pouvez installer AdGuard pour Android que manuellement. Pour utiliser l'app sur votre appareil mobile, vous devrez faire ce qui suit. -1. **Download the app on your device**. Here are a few ways you can do this: +1. **Téléchargez l'application sur votre appareil**. Voici quelques façons de procéder : - - head over to [our website](https://adguard.com/adguard-android/overview.html) and tap the *Download* button - - start the browser and type in the following URL: [https://adguard.com/apk](https://adguard.com/apk) - - or scan this QR code: + - rendez-vous sur [notre site Web](https://adguard.com/adguard-android/overview.html) et appuyez sur le bouton *Télécharger* + - démarrez le navigateur et saisissez l'URL suivante : [https://adguard.com/apk](https://adguard.com/apk) + - ou scannez ce code QR : - ![QR code *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst-qr-en-1.png) + ![Code QR *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst-qr-en-1.png) -1. **Allow installing apps from unknown sources**. Once the file download is complete, tap *Open* in the notification. +1. **Autorisez l'installation d'applications à partir de sources inconnues**. Une fois le téléchargement du fichier terminé, appuyez sur *Ouvrir* dans la notification. - ![Installing apps from unknown sources *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_1.png) + ![Installation d'applications à partir de sources inconnues *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_1.png) - A popup will appear. Tap *Settings*, navigate to *Install unknown apps*, and grant permission for the browser you've used to download the file. + Un popup va apparaître. Appuyez sur *Paramètres*, naviguez vers *Installer des applications inconnues* et accordez l'autorisation pour le navigateur que vous avez utilisé pour télécharger le fichier. - ![Installing apps from unknown sources *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_3.png) + ![Installation d'applications à partir de sources inconnues *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_3.png) -1. **Install the app**. Once the browser has obtained the necessary permissions, the system will ask you if you want to install the AdGuard app. Tap *Install*. +1. **Installez l'application**. Une fois que le navigateur a obtenu les autorisations nécessaires, le système vous demandera si vous souhaitez installer l'application AdGuard. Cliquez sur *Installer*. - ![Installing apps from unknown sources *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_4.png) + ![Installation d'applications à partir de sources inconnues *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_4.png) - You will then be asked to read AdGuard's *License agreement* and *Privacy policy*. You can also participate in product development. To do this, check the boxes for *Send crash reports automatically* and *Send technical and interaction data*. Then tap *Continue*. + Vous serez ensuite invité à lire le *Contrat de licence* et la *Politique de confidentialité*d'AdGuard. Vous pouvez également participer au développement du produit. Pour cela, cochez les cases pour *Envoyer des rapports de plantage automatiques* et *Envoyer des données techniques et d'interaction*. Cliquez ensuite sur *Continuer*. - ![Privacy policy *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/fl_3.png) + ![Politique de confidentialité *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/fl_3.png) -1. **Create a local VPN**. In order to filter all traffic directly on your device and not route it through a remote server, AdGuard needs to establish a VPN connection. +1. **Créez un VPN local**. Pour filtrer tout le trafic directement sur votre appareil et de ne pas l'acheminer via un serveur distant, AdGuard doit établir une connexion VPN. - ![Create a local VPN *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/fl_2.png) + ![Créer un VPN local *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/fl_2.png) -1. **Enable HTTPS filtering**. It is not a mandatory option, however, we advice to turn it on for the best ad-blocking quality. +1. **Activez le filtrage HTTPS**. Ce n'est pas une option obligatoire, cependant, nous vous conseillons de l'activer pour une meilleure qualité de blocage des publicités. - If your device is running Android 7–9, you'll be prompted to install a root certificate and configure HTTPS filtering after the local VPN setup. + Si votre appareil fonctionne sous Android 7–9, vous serez invité à installer un certificat racine et à configurer le filtrage HTTPS après la configuration du VPN local. - ![Enable HTTPS filtering on Android 7-9 *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/cert_1.jpg) + ![Activer le filtrage HTTPS sur Android 7–9 *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/cert_1.jpg) - After you tap *Install now*, a prompt will appear asking you to authenticate the certificate installation with a password or fingerprint. + Après avoir tapé *Installer maintenant*, une invite apparaîtra vous demandant d'authentifier l'installation du certificat avec un mot de passe ou une empreinte digitale. - ![Enable HTTPS filtering on Android 7-9. Step 2 *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/cert_2.jpg) + ![Activer le filtrage HTTPS sur Android 7–9. Étape 2 *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/cert_2.jpg) - If you have Android 10+ on your device, then after creating a local VPN, you will see the main app screen with a snack bar at the bottom with a suggestion to enable HTTPS filtering: tap *Enable* and follow the instructions on the next screen or check [the article about certificate installation](solving-problems/manual-certificate.md) for more information. + Si vous avez Android 10+ sur votre appareil, après avoir créé un VPN local, vous verrez l'écran principal de l'application avec une barre de notification en bas vous suggérant d'activer le filtrage HTTPS : appuyez sur *Activer* et suivez les instructions à l'écran suivant ou consultez [l'article sur l'installation du certificat](solving-problems/manual-certificate.md) pour plus d'informations. - ![Enable HTTPS filtering *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/fl_5.png) + ![Activer le filtrage HTTPS *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/fl_5.png) -## Uninstalling/Reinstalling AdGuard +## Désinstallation/Réinstallation d'AdGuard -If you need to uninstall AdGuard on your mobile device, open *Settings* and choose *Apps* (Android 7) or *Apps & notifications* (Android 8+). Find AdGuard in the list of installed apps and press *Uninstall*. +Si vous devez désinstaller AdGuard sur votre appareil mobile, ouvrez *Paramètres* et choisissez *Applications* (Android 7) ou *Applications & notifications* (Android 8+). Trouvez AdGuard dans la liste des applications installées et appuyez sur *Désinstaller*. -![Reinstall AdGuard *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_4.png) +![Réinstaller AdGuard *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_4.png) Pour réinstaller AdGuard, il suffit de télécharger le fichier apk à nouveau et de suivre les étapes décrites dans la section Installation. Aucune désinstallation préalable n'est nécessaire. diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 2a9677947b9..1d68358fa54 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,60 +1,60 @@ --- -title: How to install AdGuard for Android TV -sidebar_position: 16 +title: Comment installer AdGuard pour Android TV +sidebar_position: 15 --- :::info -This article is about AdGuard for Android TV, an ad blocker that protects your TV at the system level. To see how it works, [download the AdGuard TV app](https://agrd.io/tvapk) +Cet article concerne AdGuard pour Android TV, un bloqueur de publicité qui protège votre TV au niveau système. Pour voir comment cela fonctionne, [téléchargez l'application AdGuard TV](https://agrd.io/tvapk) ::: -In most cases, stock browsers cannot install a file on your TV, but you can download a browser from the Google Play Store that has this functionality. In our guide, we will go through an example of installation using the TV Bro browser, but there are other options and you can choose the one that better suits your needs. As an alternative, you can use the [Downloader](https://play.google.com/store/apps/details?id=com.esaba.downloader) app. +Dans la plupart des cas, les navigateurs par défaut ne permettent pas d'installer un fichier sur votre TV, mais vous pouvez télécharger un navigateur depuis le Google Play Store qui a cette fonctionnalité. Dans notre guide, nous allons passer par un exemple d'installation en utilisant le navigateur TV Bro, mais il existe d'autres options, et vous pouvez choisir celle qui correspond le mieux à vos besoins. En alternative, vous pouvez utiliser l'application [Downloader](https://play.google.com/store/apps/details?id=com.esaba.downloader). -## Installing AdGuard for Android TV via browser +## Installation de AdGuard pour Android TV via un navigateur -1. Install the [TV Bro browser](https://play.google.com/store/apps/details?id=com.phlox.tvwebbrowser) on your Android TV. +1. Installez le [navigateur TV Bro](https://play.google.com/store/apps/details?id=com.phlox.tvwebbrowser) sur votre Android TV. -2. Download and install AdGuard for Android TV: +2. Téléchargez et installez AdGuard pour Android TV : -- Open the installed TV Bro browser on your Android TV. -- In the address bar of the browser, type `https://agrd.io/tvapk` and press _Enter_ or follow the link. -- The browser will start downloading the AdGuard for Android TV installation file automatically. -- Once the download is complete, select _Downloads_ in the browser control bar, then select the downloaded file. -- In a warning message, allow installing files from the browser. -- Return to your browser, open _Downloads_, and click the downloaded file. -- In the system window that appears, click _Install_, then _Done_ or _Open_. +- Ouvrez le navigateur TV Bro installé sur votre Android TV. +- Dans la barre d'adresse du navigateur, tapez `https://agrd.io/tvapk` et appuyez sur _Entrée_ ou suivez le lien. +- Le navigateur commencera à télécharger automatiquement le fichier d'installation d'AdGuard pour Android TV. +- Une fois le téléchargement terminé, sélectionnez _Téléchargements_ dans la barre de contrôle du navigateur, puis sélectionnez le fichier téléchargé. +- Dans un message d'avertissement, autorisez l'installation de fichiers depuis le navigateur. +- Retournez dans votre navigateur, ouvrez _Téléchargements_, et cliquez sur le fichier téléchargé. +- Dans la fenêtre système qui apparaît, cliquez sur _Installer_, puis _Terminé_ ou _Ouvrir_. -Done, AdGuard for Android TV is installed. +C'est fait, AdGuard pour Android TV est installé. -1. Launch AdGuard for Android TV: +1. Lancez AdGuard pour Android TV : -- After the installation is complete, find the AdGuard app in the list of installed apps on your Android TV. -- Click the AdGuard icon to launch the app. -- Follow the on-screen instructions to complete the setup. +- Après l'installation, trouvez l'application AdGuard dans la liste des applications installées sur votre Android TV. +- Cliquez sur l'icône AdGuard pour lancer l'application. +- Suivez les instructions à l'écran pour terminer la configuration. -## Installing AdGuard for Android TV via ADB +## Installation d'AdGuard pour Android TV via ADB -1. Make sure that Android Debug Bridge (ADB) is installed on your computer. If not, you can follow the instructions on XDA Developers: [ADB Installation Guide](https://www.xda-developers.com/install-adb-windows-macos-linux). +1. Assurez-vous que Android Debug Bridge (ADB) est installé sur votre ordinateur. Si ce n'est pas le cas, vous pouvez suivre les instructions sur XDA Developers : [Guide d'installation ADB](https://www.xda-developers.com/install-adb-windows-macos-linux). -2. Download [AdGuard for Android TV](https://agrd.io/tvapk). +2. Téléchargez [AdGuard pour Android TV](https://agrd.io/tvapk). -3. In your TV settings, go to _System_ → _About_ and press the build number seven times to unlock developer options. Enable _USB debugging_. +3. Dans les paramètres de votre TV, allez dans _Système_ → _À propos_ et appuyez sept fois sur le numéro de build pour déverrouiller les options pour les développeurs. Activez le _Débogage USB_. 4. Notez l'adresse IP de votre Android TV : - - On your Android TV, navigate to Settings. - - Select _System_ → _About_. - - Find _Network_ and select _Wi-Fi_ or _Ethernet_, depending on your connection type. - - Go to the network section and find _IP address_. Notez cette adresse IP. + - Sur votre Android TV, allez dans les Paramètres. + - Sélectionnez _Système_ → _À propos_. + - Trouvez _Réseau_ et sélectionnez _Wi-Fi_ ou _Ethernet_, en fonction de votre type de connexion. + - Allez dans la section réseau et trouvez _Adresse IP_. Notez cette adresse IP. -5. Connect to Android TV via ADB: +5. Connectez-vous à l'Android TV via ADB : - - Open the terminal or command prompt on your computer. - - Enter the command `adb connect` and paste the IP address of your TV. - - The connection will be established. + - Ouvrez le terminal ou l'invite de commande sur votre ordinateur. + - Saisissez la commande `adb connect` et collez l'adresse IP de votre TV. + - La connexion sera établie. -6. Install AdGuard for Android TV via ADB: +6. Installez AdGuard pour Android TV via ADB : - - In the terminal, enter the command `adb install Downloads/adguard_tv.apk`. If necessary, replace `Downloads/adguard_tv.apk` with your path. - - Wait for a message in the terminal indicating the successful installation of the app. + - Dans le terminal, saisissez la commande `adb install Downloads/adguard_tv.apk`. Si nécessaire, remplacez `Downloads/adguard_tv.apk` par votre chemin d'accès. + - Attendez un message dans le terminal indiquant l'installation réussie de l'application. diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index e170ce519b0..18b01677438 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,11 +1,11 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) +Cet article concerne AdGuard pour Android, un bloqueur de publicité multifonctionnel qui protège votre appareil au niveau système. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) ::: diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index 438d018cb82..e4bb1194859 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: Comment empêcher le système de désactiver AdGuard -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 7367e63cef9..b33ad2875cc 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -1,60 +1,66 @@ --- -title: Battery and traffic consumption issues +title: Problèmes de consommation de batterie et de trafic sidebar_position: 1 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. To see how it works, [download the AdGuard app](https://agrd.io/download-kb-adblock) +Cet article concerne AdGuard pour Android, un bloqueur de publicité multifonctionnel qui protège votre appareil au niveau système. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) ::: -Due to built-in statistics processes, high data and/or battery consumption was often attributed to AdGuard by Android 6 and earlier. This was because AdGuard counted all the traffic it filtered from various apps. As a result, AdGuard's share of total data and battery usage was overstated, while other apps were understated. +À cause des processus statistiques intégrés, une forte consommation de données et/ou de batterie était souvent attribuée à AdGuard par Android 6 et les versions antérieures. Cela s'explique par le fait qu'AdGuard comptait tout le trafic qu'il filtrait à partir de diverses applications. En conséquence, la part d'AdGuard dans l'utilisation totale des données et de la batterie était exagérée, tandis que d'autres applications étaient sous-estimées. -With Android 7, however, this scenario has improved. Now the data reflected in Android's built-in data usage statistics is very close to reality, although there are minor discrepancies in the battery usage data. +Avec Android 7, cependant, ce scénario s'est amélioré. Maintenant, les données reflétées dans les statistiques intégrées d'utilisation des données d'Android sont très proches de la réalité, bien qu'il y ait de légères divergences dans les données d'utilisation de la batterie. -However, AdGuard users can always get a true picture of the situation on the *Battery usage* screen. +Pourtant, les utilisateurs d'AdGuard peuvent toujours obtenir une image précise de la situation sur l'écran *Utilisation de la batterie*. -### Own battery usage stats screen +### Écran des statistiques d'utilisation de batterie -You can access it by navigating to *Statistics* → *Battery usage*. +Vous pouvez y accéder en naviguant vers *Statistiques* → *Utilisation de la batterie*. -![Battery stats *mobile_border](https://cdn.adtidy.org/content/articles/battery/1.png) +![Statistiques de batterie *mobile_border](https://cdn.adtidy.org/content/articles/battery/1.png) -Inside you will find a chart that shows the AdGuard battery resource consumption within the last 24 hours, with an option to get more detailed hour-to-hour data by tapping on the chart. Besides that, there’s also a numeric breakdown of the relevant data and a short technical explanation. +À l'intérieur, vous trouverez un tableau qui affiche la consommation de ressources de la batterie par AdGuard au cours des dernières 24 heures, avec une option pour obtenir des données plus détaillées heure par heure en appuyant sur le tableau. En plus de cela, il y a également une répartition numérique des données pertinentes et une courte explication technique. -### How much battery resource does AdGuard really consume? +Vous trouverez plusieurs autres paramètres ci-dessous le graphique : *CPU au premier plan*, *CPU en arrière-plan*, *données mobiles*, et *données Wi-Fi*. -First, let us lay down a bit of theory and links with necessary data. +*CPU premier plan* et *CPU arrière-plan* affichent combien de temps l'unité centrale est utilisée par AdGuard lorsque l'application est active ou s'exécute en arrière-plan. -1. Android derives traffic consumption judging on so-called Power Profile, which is given by every manufacturer: +Grâce à l'*Utilisation des données mobiles* et à l'*Utilisation des données Wi-Fi*, vous pouvez voir combien de trafic AdGuard a consommé lorsque votre téléphone utilisait l'Internet mobile ou était connecté au Wi-Fi. -1. Main part of Power Profile is a set of values in mAh which define battery consumption for every component of the device: +### Combien de ressources de batterie AdGuard consomme-t-il vraiment ? - For example, from the table above: +Tout d'abord, proposons un peu de théorie et de liens avec les données nécessaires. - *wifi.active=* 31mA additional consumption in mAh caused by WiFi data exchange. +1. Android calcule la consommation de trafic en fonction du Profil de Puissance fourni par chaque fabricant : - *radio.active=* 100-300mA additional consumption in mAh caused by data exchange over Mobile network. +1. La partie principale du Profil de Puissance est un ensemble de valeurs en mAh qui définissent la consommation de la batterie pour chaque composant de l'appareil : - *cpu.active=* 100-200mA additional consumption in mAh caused by CPU load. + Par exemple, à partir du tableau ci-dessus : -1. AdGuard by itself almost doesn't consume any traffic, so for the sake of evaluating power consumption let's get rid of 'Mobile/Wi-Fi packets' and stick to 'CPU'. + *wifi.active=* 31mA de consommation supplémentaire en mAh causée par l'échange de données par WiFi. - Formula to calculate the consumption: + *radio.active=* 100-300mA de consommation supplémentaire en mAh causée par l'échange de données sur le réseau mobile. - > “CPU TIME (ms)” X “cpu.active” / (60 *60* 1000) = “POWER USE mAh” + *cpu.active=* 100-200mA de consommation supplémentaire en mAh causée par la charge du processeur. - Let's put real numbers into this formula. +1. AdGuard lui-même ne consomme presque aucun trafic, donc afin d'évaluer la consommation d'énergie, éliminons les "Paquets mobile/Wi-Fi" et concentrons-nous sur "CPU". - Let's take *CPU total* from the second screenshot and convert into milliseconds: 506000 + Formule pour calculer la consommation : - A coefficient *cpu.active* for 2GHz will be roughly equal to 225mAh + > "TEMPS CPU (ms)" X "cpu.active" / (60 *60* 1000) = "CONSOMMATION D'ÉNERGIE mAh" - Final result: + Mettons des nombres réels dans cette formule. + + Prenons *le total CPU* de la deuxième capture d'écran et convertissons-le en millisecondes : 506 000 + + Un coefficient *cpu.active* pour 2GHz sera à peu près égal à 225mAh + + Résultat final : > 506000 *225 / (60* 60 * 1000) = 31,625mAh ### Conclusion -Real consumption is **several times less** than it is shown in Android statistics. Instead of 220mAh it should be somewhere around 31-40mAh. On the other hand, browser's consumption should be not 66mAh, but ~200mAh. +La consommation réelle est **plusieurs fois inférieure** à ce qui est affiché dans les statistiques Android. Au lieu de 220 mAh, la valeur devrait être autour de 31 à 40 mAh. D'autre part, la consommation du navigateur ne devrait pas être de 66mAh, mais plutôt de 200mAh environ. diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 80e99e2974c..0218f8e2461 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,11 +1,11 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. To see how it works, [download the AdGuard app](https://agrd.io/download-kb-adblock) +Cet article concerne AdGuard pour Android, un bloqueur de publicité multifonctionnel qui protège votre appareil au niveau système. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) ::: @@ -30,7 +30,7 @@ The Private DNS feature was introduced in Android Pie. Before version Q, Private - To solve the problem with Private DNS, use the `$network` rule -Some device manufacturers keep Private DNS settings hidden and set 'Automatic' mode as a default one. Thus, disabling Private DNS is impossible but we can make the system think that the upstream is not valid by blocking it with a `$network` rule. For instance, if the system uses Google DNS by default, we can add rules `|8.8.4.4^$network` and `|8.8.8.8^$network` to block Google DNS. +Certains fabricants d'appareils gardent les paramètres DNS privés masqués et définissent le mode 'Automatique' comme mode par défaut. Thus, disabling Private DNS is impossible but we can make the system think that the upstream is not valid by blocking it with a `$network` rule. For instance, if the system uses Google DNS by default, we can add rules `|8.8.4.4^$network` and `|8.8.8.8^$network` to block Google DNS. ## Unsupported browsers diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index a51e2b180be..72c87a4a7d7 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,15 +1,15 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) +Cet article concerne AdGuard pour Android, un bloqueur de publicité multifonctionnel qui protège votre appareil au niveau système. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Étant donné que les fonctionnalités _[Pare-feu](/adguard-for-android/features/protection/firewall)_ et _[Détecter Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ nécessitent que le paramètre _Accès à l'utilisation des applications_ soit activé pour qu'elles fonctionnent correctement, vous avez peut-être rencontré des problèmes lors de leur utilisation. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Étant donné que les fonctionnalités _[Pare-feu](/adguard-for-android/features/protection/firewall)_ et _[Détecter Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ nécessitent que le paramètre _Accès à l'utilisation des applications_ soit activé pour qu'elles fonctionnent correctement, vous avez peut-être rencontré des problèmes lors de leur utilisation. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -31,6 +33,28 @@ If you can't find it, first tap **See all apps** or **App info**. Follow the on-screen instructions. -All done! Maintenant, les fonctionnalités _Pare-feu_ et _Détecter Samsung Pay_ fonctionneront correctement. +All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index ecea4473a6f..0a556c948bc 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Installation manuelle du certificat de sécurité dans le navigateur Firefox -sidebar_position: 11 +sidebar_position: 10 --- :::info @@ -49,33 +49,33 @@ Cette méthode ne fonctionnera que sur les appareils **rootés** . - Ouvrez l'application **Paramètres** sur votre téléphone ; - Accédez à la section **Système** (dernier élément du menu des paramètres). Dans cette section, trouvez le sous-élément **À propos du téléphone** ; - - Tap the **Build number** line 7 times. After that, you will receive a notification that **You are now a developer** (If necessary, enter an unlock code for the device); - - Open **System Settings** → **Developer Options** → Scroll down and enable **USB debugging** → Confirm debugging is enabled in the window **Allow USB debugging** after reading the warning carefully. + - Cliquez 7 fois sur la ligne **Numéro de version**. Ensuite, vous recevrez une notification indiquant **Vous êtes maintenant un développeur** (Si nécessaire, saisissez un code de déverrouillage pour l'appareil) ; + - Ouvrez **Paramètres système** → **Options du développeur** → Faites défiler vers le bas et activez **Débogage USB** → Confirmez que le débogage est activé dans la fenêtre **Autoriser le débogage USB** après avoir lu attentivement l'avertissement. -1. Install the [Firefox](https://www.mozilla.org/en-US/firefox/releases/) browser (release version); +1. Installez le navigateur [Firefox](https://www.mozilla.org/en-US/firefox/releases/) (version finale) ; -1. Open the **AdGuard settings** (gear icon in the bottom right corner) → **Filtering** → **Network** → **HTTPS filtering** → **Security certificate** → **Instructions for Firefox** → **Install for old versions**; +1. Ouvrez les **paramètres d'AdGuard** (icône d'engrenage dans le coin inférieur droit) → **Filtrage** → **Réseau** → **Filtrage HTTPS** → **Certificat de sécurité** → **Instructions pour Firefox** → **Installer pour les anciennes versions**; -1. Open the folder `data/data/org.mozilla.firefox/files/mozilla` using `adb shell su` and `cd data/data/...`, then browse to the folder named `xxxxxxx.default` and memorize its name; +1. Ouvrez le dossier `data/data/org.mozilla.firefox/files/mozilla` en utilisant `adb shell su` et `cd data/data/...`, puis naviguez jusqu'au dossier nommé `xxxxxxx.default` et mémorisez son nom ; -1. In the specified folder we are interested in two files: +1. Dans le dossier spécifié, nous nous intéressons à deux fichiers : - `cert9.db` - `key4.db` -1. We need to move these files to a folder of the browser where the security certificate issue occurred: +1. Nous devons déplacer ces fichiers dans un dossier du navigateur où le problème du certificat de sécurité s'est produit : - `data/data/org.mozilla./files/mozilla/yyyyyy.default`. -1. The full command will look like this: +1. La commande complète se présente comme suit : - `adb shell su` - `cp -R data/data/org.mozilla.firefox/files/mozilla/xxxxxxxxxx.default/cert9.db data/data/org.mozilla./files/mozilla/yyyyyyyyyy.default` - `cp -R data/data/org.mozilla.firefox/files/mozilla/xxxxxxxxxx.default/key4.db data/data/org.mozilla./files/mozilla/yyyyyyyyyy.default` - In case you received the system notification **permission denied**, you should first move the specified files to the permission-free directory. And after that you should move them to the necessary folder in your Firefox browser. + Si vous avez reçu la notification du système indiquant que **l'autorisation est refusée**, vous devez d'abord déplacer les fichiers spécifiés vers le répertoire sans autorisation. Ensuite, vous devez les déplacer dans le dossier nécessaire dans votre navigateur Firefox. - The full command should look something like this: + La commande complète doit ressembler à ceci : - `adb shell su` - `cp -R data/data/org.mozilla.firefox/files/mozilla/xxxxxxxx.default/cert9.db sdcard/Download` diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/har.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/har.md index de1fbe7b144..b836708a65a 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/har.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/har.md @@ -1,47 +1,47 @@ --- -title: How to generate HAR files +title: Comment générer des fichiers HAR sidebar_position: 5 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. To see how it works, [download the AdGuard app](https://agrd.io/download-kb-adblock) +Cet article concerne AdGuard pour Android, un bloqueur de publicité multifonctionnel qui protège votre appareil au niveau système. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) ::: :::note -HAR files are processed in accordance with [the AdGuard Privacy Policy](https://adguard.com/en/privacy.html). +Les fichiers HAR sont traités conformément à la [Politique de confidentialité d'AdGuard](https://adguard.com/en/privacy.html). ::: -## What are HAR files? +## Qu'est-ce qu'un fichier HAR ? -The HAR (HTTP ARchive) format is a JSON-formatted archive file for logging of a web browser's interaction with a site. The specifications of HAR format define archival data for HTTP transactions that a browser uses to export detailed information about the web pages it loads. More detailed description of HAR file format and its specification you can find at [softwareishard.com](http://www.softwareishard.com/blog/har-12-spec/) website. +Le format HAR (HTTP ARchive) est un fichier d'archive au format JSON pour la journalisation de l'interaction d'un navigateur web avec un site. Les spécifications du format HAR définissent les données d'archives pour les transactions HTTP qu'un navigateur utilise pour exporter des informations détaillées sur les pages Web qu'il charge. Vous pouvez trouver une description plus détaillée du format de fichier HAR et de sa spécification sur le site Web [softwareishard.com](http://www.softwareishard.com/blog/har-12-spec/). -## How to generate HAR files +## Comment générer des fichiers HAR -Sometimes we need to analyze it to block specific ads that are difficult to reproduce for some reason. To get HAR files, follow these steps: +Parfois, nous devons l'analyser pour bloquer des publicités spécifiques qui sont difficiles à reproduire pour une raison quelconque. Pour obtenir des fichiers HAR, procédez comme suit : -1. Open AdGuard and go to **Settings** (⚙ icon in the lower right corner). -2. Tap **General** →**Advanced** → **Low-level settings**. -3. Scroll down and activate **Capture HAR** in the Filtering section. -4. Open the app and perform the necessary actions to reproduce the problem. -5. Turn **Capture HAR** off. -6. Go back to **Advanced**. -7. Tap **Export logs and system info** → **Allow** (if necessary) → **Save**. +1. Ouvrez AdGuard et accédez à **Paramètres** (icône ⚙ dans le coin inférieur droit). +2. Appuyez sur **Général** →**Avancé** → **Paramètres de bas niveau**. +3. Faites défiler vers le bas et activez **Capture HAR** dans la section Filtrage. +4. Ouvrez l'app et effectuez les actions nécessaires pour reproduire le problème. +5. Désactivez **Capture HAR** . +6. Retournez à **Avancé**. +7. Tapez **Exporter les journaux et informations système** → **Autoriser** (si nécessaire) → **Enregistrer**. -**Send the generated file with the logs to the AdGuard support service.** +**Envoyez le fichier généré avec les journaux au service d'assistance AdGuard.** :::note -Our support team will process your ticket much faster if you specify the HelpDesk ticket number or the GitHub issue number in your message. +Notre équipe d'assistance traitera votre ticket beaucoup plus rapidement si vous spécifiez le numéro de ticket HelpDesk ou le numéro de problème GitHub dans votre message au support. ::: -## How to analyze HAR files +## Comment analyser des fichiers HAR -Here are some sources that we can recommend to analyze HAR files: +Voici quelques sources que nous pouvons recommander pour analyser les fichiers HAR : -- [HTTP Archive Viewer master](https://gitgrimbo.github.io/harviewer/master/) is a HAR analyzer tool, visualizes HTTP Archive (HAR) log files created by HTTP tracking tools. -- [Fiddler](https://www.telerik.com/fiddler) is a web debugging proxy, lets you capture, inspect, monitor all HTTP(S) traffic between your computer and the Internet, mock requests, and diagnose network issues. +- [HTTP Archive Viewer master](https://gitgrimbo.github.io/harviewer/master/) est un outil d'analyse HAR, qui visualise les fichiers journaux du HTTP Archive (HAR) créés par les outils de suivi HTTP. +- [Fiddler](https://www.telerik.com/fiddler) est un proxy de débogage web, vous permettant de capturer, d'inspecter, de surveiller tout le trafic HTTP(S) entre votre ordinateur et Internet, de simuler des requêtes et de diagnostiquer des problèmes de réseau. diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index c5b7755321a..f019241d428 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,11 +1,11 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. To see how it works, [download the AdGuard app](https://agrd.io/download-kb-adblock) +Cet article concerne AdGuard pour Android, un bloqueur de publicité multifonctionnel qui protège votre appareil au niveau système. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) ::: @@ -29,7 +29,7 @@ Here's how to do that. 1. Install the [latest release of the **adguardcert** Magisk module](https://github.com/AdguardTeam/adguardcert/releases/latest/). -1. Open *Magisk → Modules → Install from storage* and select the downloaded **adguardcert** file. The AdGuard Personal CA certificate will be copied to the system store. +1. Ouvrez *Magisk → Modules → Installer depuis le stockage* et sélectionnez le fichier **adguardcert** téléchargé. The AdGuard Personal CA certificate will be copied to the system store. ![Open Magisk modules *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/https-certificate-for-rooted/magisk-module-4.png) diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/log.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/log.md index 682a9feddac..c4c812c1e42 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/log.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/log.md @@ -1,38 +1,38 @@ --- -title: How to collect debug logs +title: Comment collecter les journaux de débogage sidebar_position: 2 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. To see how it works, [download the AdGuard app](https://agrd.io/download-kb-adblock) +Cet article concerne AdGuard pour Android, un bloqueur de publicité multifonctionnel qui protège votre appareil au niveau système. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) ::: :::note -Data and/or files provided in logs are processed in accordance with [the AdGuard Privacy Policy](https://adguard.com/en/privacy.html). +Les données et/ou les fichiers fournis dans les journaux sont traités conformément à [la Politique de confidentialité d'AdGuard](https://adguard.com/en/privacy.html). ::: -In this article, we'll guide you through the process of collecting debug logs, an essential troubleshooting step for solving complex issues that may potentially arise. Debug logs provide detailed insight into the inner workings of AdGuard for Android. If the AdGuard support team asks you to provide debug logs, simply follow these instructions. +Dans cet article, nous vous guiderons le long du processus de collecte des journaux de débogage, une étape de dépannage essentielle pour résoudre les problèmes complexes qui peuvent survenir. Les journaux de débogage fournissent un aperçu détaillé du fonctionnement interne d'AdGuard pour Android. Si l'équipe d'assistance AdGuard vous demande de fournir des journaux de débogage, suivez simplement ces instructions. :::note -AdGuard s'engage à protéger votre vie privée. We strictly follow our [Privacy Policy](https://adguard.com/privacy/android.html) and do not collect any private information about users. Avant d'envoyer vos journaux à l'équipe d'assistance, veuillez consulter le fichier car il peut contenir des informations supplémentaires que vous ne souhaitez pas partager. S'il contient de telles informations personnelles, nous vous recommandons de les supprimer au préalable. +AdGuard s'engage à protéger votre vie privée. Nous suivons strictement notre [Politique de confidentialité](https://adguard.com/privacy/android.html) et ne collectons aucune information privée sur les utilisateurs. Avant d'envoyer vos journaux à l'équipe d'assistance, veuillez consulter le fichier car il peut contenir des informations supplémentaires que vous ne souhaitez pas partager. S'il contient de telles informations personnelles, nous vous recommandons de les supprimer au préalable. ::: -### Recording debug log +### Enregistrement du journal de débogage -To collect **debug** log and send it to us, you need to perform following steps: +Pour collecter le journal de **débogage** et nous l'envoyer, vous devez suivre les étapes suivantes : -1. Go to *Settings* → *General* → *Advanced*. -1. Tap *Logging level* and set it to *Debug*. -1. Reproduce the problem and try to remember the exact time it occurred. -1. Wait a while, then return to *Settings* and choose the *Support* tab. Tap *Report a bug* and complete the required fields. Don't forget to check the *Send app logs and system info* checkbox. Finally tap *Send*. +1. Allez dans *Paramètres* → *Général* → *Avancé*. +1. Appuyez sur *Niveau de journalisation* et définissez-le sur *Débogage*. +1. Reproduisez le problème et essayez de vous souvenir du moment exact où il s’est produit. +1. Attendez un moment, puis revenez aux *Paramètres* et choisissez l'onglet *Assistance*. Appuyez sur *Signaler un bug* et remplissez les champs obligatoires. N'oubliez pas de cocher la case *Envoyer les journaux de l'application et les informations système*. Et finalement, tapez sur *Envoyer*. -If you're interested in following the resolution of your issue and engaging in a dialogue with the developers, we recommend that you take the following steps after completing the first three: +Si vous souhaitez suivre la résolution de votre problème et engager un dialogue avec les développeurs, nous vous recommandons de suivre les étapes suivantes après avoir terminé les trois premières : -1. Wait a while, then return to the *Advanced* screen and export logs via *Export logs and system info*. Then report a bug on GitHub by following these [instructions](/guides/report-bugs.md). -1. After creating an issue on GitHub, send the log file to . Include the time of the bug and attach a link to your issue or its number (it appears as #number next to the title). Alternatively, you can upload the log file to Google Drive and send it to . Add the file link to your GitHub issue +1. Attendez un moment, puis revenez à l'écran *Avancé* et exportez les journaux via *Exporter les journaux et les informations système*. Signalez ensuite un bug sur GitHub en suivant ces [instructions](/guides/report-bugs.md). +1. Après avoir créé un problème sur GitHub, envoyez le fichier journal à . Indiquez la date du bug et joignez un lien vers votre problème ou son numéro (il apparaît sous la forme #numéro à côté du titre). Vous pouvez également télécharger le fichier journal sur Google Drive et l'envoyer à . Ajoutez le lien du fichier à votre problème GitHub diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/logcat.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/logcat.md index 619244987ff..eeccba3b316 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/logcat.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/logcat.md @@ -1,122 +1,122 @@ --- -title: How to get system logs +title: Comment obtenir les journaux système sidebar_position: 4 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. To see how it works, [download the AdGuard app](https://agrd.io/download-kb-adblock) +Cet article concerne AdGuard pour Android, un bloqueur de publicité multifonctionnel qui protège votre appareil au niveau système. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) ::: ::note -Data and/or files provided in logs are processed in accordance with [the AdGuard Privacy Policy](https://adguard.com/en/privacy.html). +Les données et/ou les fichiers fournis dans les journaux sont traités conformément à [la Politique de confidentialité d'AdGuard](https://adguard.com/en/privacy.html). ::: -Sometimes a regular log may not be sufficient to identify the origin of the problem. In such cases a system log is needed. Below are instructions on how to collect and get it: via Developer options and Logcat. +Parfois, un journal régulier peut ne pas être suffisant pour identifier l'origine du problème. Dans de tels cas, un journal système est nécessaire. Vous trouverez ci-dessous des instructions sur la façon de le collecter et de l'obtenir : via les options du développeur et Logcat. :::note -AdGuard s'engage à protéger votre vie privée. We strictly follow our [Privacy Policy](https://adguard.com/privacy/android.html) and do not collect any private information about users. Avant d'envoyer vos journaux à l'équipe d'assistance, veuillez consulter le fichier car il peut contenir des informations supplémentaires que vous ne souhaitez pas partager. S'il contient de telles informations personnelles, nous vous recommandons de les supprimer au préalable. +AdGuard s'engage à protéger votre vie privée. Nous suivons strictement notre [Politique de confidentialité](https://adguard.com/privacy/android.html) et ne collectons aucune information privée sur les utilisateurs. Avant d'envoyer vos journaux à l'équipe d'assistance, veuillez consulter le fichier car il peut contenir des informations supplémentaires que vous ne souhaitez pas partager. S'il contient de telles informations personnelles, nous vous recommandons de les supprimer au préalable. ::: -## Capture a bug report from a device +## Saisir un rapport de bogue à partir d'un appareil -To get a bug report directly from your device, do the following: +Pour obtenir un rapport de bogue directement depuis votre appareil, procédez comme suit : -1. Be sure you have [Developer options](https://developer.android.com/studio/run/device.html#developer-device-options) enabled. +1. Assurez-vous que les [options de développement](https://developer.android.com/studio/run/device.html#developer-device-options) sont activées. -1. In **Developer options**, tap **Take bug report**. +1. Dans **Options du développeur**, appuyez sur **Saisir un rapport de bogue**. - ![Bug report *mobile](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/Android3.1/bugreporten.png) + ![Rapport de bogue *mobile](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/Android3.1/bugreporten.png) -1. Select the type of bug report you want and tap **Report**. +1. Sélectionnez le type de bogue que vous souhaitez signaler et appuyez sur **Signaler**. :::note - After a moment, you will see a notification that the bug report is ready (see Figure 2). + Après un moment, vous verrez une notification que le rapport de bogue est prêt (voir la Figure 2). ::: - ![Bug report *mobile](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/Android3.1/bugreporteen.png) + ![Rapport de bogue *mobile](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/Android3.1/bugreporteen.png) -1. To share the bug report, tap the notification. +1. Pour partager le rapport de bogue, appuyez sur la notification. - ![Bug report *mobile_border](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/Android3.1/bugreport3en.png) + ![Rapport de bogue *mobile_border](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/Android3.1/bugreport3en.png) -1. Send this log to our support team. +1. Envoyez ce journal à notre équipe d'assistance. :::note - Our support team will process your ticket much faster if you specify the HelpDesk ticket number or the GitHub issue number in your message to support. + Notre équipe d'assistance traitera votre ticket beaucoup plus rapidement si vous spécifiez le numéro de ticket HelpDesk ou le numéro de problème GitHub dans votre message au support. ::: -## Capture a bug report via Logcat +## Saisir un rapport de bogue via Logcat -On devices with Android 7 and below, it is not possible to send a bug report automatically. Then you can capture it manually via Logcat — a standard Android command-line tool that dumps a log of system messages. +Sur les appareils équipés d'Android 7 et versions antérieures, il n'est pas possible d'envoyer un rapport de bogue automatiquement. Vous pouvez alors le saisir manuellement via Logcat — un outil en ligne de commande Android standard qui affiche un journal des messages système. -Follow this instruction: +Suivez cette instruction : -### Part #1: prepare the device +### Partie #1 : préparez l'appareil -1. Switch device to the developer mode. To do this: go to **Settings** → **About** → tap **Build Number** 7 times. +1. Basculez l'appareil en mode développeur. Pour faire ça : accédez aux **Paramètres** → **À propos** → appuyez sur **Numéro de build** 7 fois. -1. Go to **Developer Options**. +1. Allez dans les **Options pour développeurs**. -1. Enable **USB debugging**. +1. Activez le **Débogage USB**. -1. Increase **Logger buffer** sizes to 4 MB per log buffer. +1. Augmentez la taille du **Tampon de journal** à 4 Mo par tampon de journal. -4 MB should be enough for storing the logs we need until you're able to do the second part (getting the log from the device); +4 Mo devrait suffire pour stocker les journaux dont nous avons besoin jusqu'à ce que vous puissiez effectuer la deuxième partie (saisir le journal de l'appareil) ; -### Part #2: reproduce the problem +### Partie #2 : reproduisez le problème -It is important to reproduce the problem after you're done with the first part. +Il est important de reproduire le problème après avoir terminé la première partie. 1. Reproduisez le problème. -1. Remember/write down the date and time of reproduction and include it in the email to our support later. +1. N'oubliez pas/notez la date et l'heure de reproduction et incluez-les dans l'e-mail envoyé à notre support ultérieurement. -### Part #3: get the log +### Partie #3 : saisissez le journal -1. Connect your device to a PC with a USB cable. +1. Connectez votre appareil à un PC avec un câble USB. -1. Download [Android SDK Platform Tools](https://developer.android.com/studio/releases/platform-tools#downloads). Choose the appropriate download link for your OS from the Downloads section. Once you tap the link, a ZIP file will be downloaded. You can extract the ADB (Android Debug Bridge) files from the ZIP file and store them wherever you want. +1. Téléchargez [les outils de plateforme Android SDK](https://developer.android.com/studio/releases/platform-tools#downloads). Choisissez le lien de téléchargement approprié pour votre OS dans la section Téléchargements. Une fois que vous appuyez sur le lien, un fichier ZIP sera téléchargé. Vous pouvez extraire les fichiers ADB (Android Debug Bridge) du fichier ZIP et les stocker où vous le souhaitez. -1. Test whether ADB is working properly: connect your Android device to your computer using a USB cable, open the Command Prompt, PowerShell or Terminal and run the following command: +1. Testez si ADB fonctionne correctement : connectez votre appareil Android à votre ordinateur à l'aide d'un câble USB, ouvrez l'invite de commandes, PowerShell ou Terminal et exécutez la commande suivante : `adb devices` - An example of a successful result: + Un exemple de résultat réussi : - ![Step 3](https://cdn.adtidy.org/content/kb/ad_blocker/android/logcat/logcat_step-3.png) + ![Étape 3](https://cdn.adtidy.org/content/kb/ad_blocker/android/logcat/logcat_step-3.png) -1. Then run the following command (insert the relevant path): +1. Ensuite, exécutez la commande suivante (insérez le chemin pertinent) : `adb logcat -v threadtime -d > C:\Program Files\platform-tools\logs.txt` - Email the created `txt` file as well as the time the problem was reproduced (from part #2) to our support team at . + Envoyez par e-mail le fichier `txt` créé avec l'heure quand le problème a été reproduit (à partir de la partie #2) à notre équipe d'assistance à l'adresse . -### Alternative way for ROOT users +### Méthode alternative pour les utilisateurs ROOT -1. Download and run [Logcat](https://play.google.com/store/apps/details?id=com.pluscubed.matlog). +1. Téléchargez et exécutez [Logcat](https://play.google.com/store/apps/details?id=com.pluscubed.matlog). -1. Choose **Record** in the menu. Choose a name for a log file or just press **OK**. Now you can press **Home** button, CatLog will continue recording the log in background. +1. Choisissez **Enregistrement** dans le menu. Choisissez un nom pour un fichier journal ou appuyez simplement sur **OK**. Vous pouvez maintenant appuyer sur le bouton **Accueil**, CatLog continuera à journaliser en arrière-plan. -1. Reproduce the issue. +1. Reproduisez le problème. -1. Open CatLog and press **Stop record** in the menu. +1. Ouvrez CatLog et appuyez sur **Arrêter l'enregistrement** dans le menu. -1. Send this log to our support team. +1. Envoyez ce journal à notre équipe d'assistance. :::note -Our support team will process your ticket much faster if you specify the HelpDesk ticket number or the GitHub issue number in your message to support. +Notre équipe d'assistance traitera votre ticket beaucoup plus rapidement si vous spécifiez le numéro de ticket HelpDesk ou le numéro de problème GitHub dans votre message au support. ::: diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index f4b3b4c7dae..a381c68547a 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,26 +1,26 @@ --- -title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +title: Installation du certificat sur des appareils avec Android 11+ +sidebar_position: 11 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. To see how it works, [download the AdGuard app](https://agrd.io/download-kb-adblock) +Cet article concerne AdGuard pour Android, un bloqueur de publicité multifonctionnel qui protège votre appareil au niveau système. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) ::: -To be able to [filter HTTPS traffic](/general/https-filtering/what-is-https-filtering.md) (which is extremely important as most ads use HTTPS), AdGuard needs to install its certificate into your device's user storage. On older versions of the Android OS this was done automatically, but on Android 11 and later users have to install it manually. +Pour pouvoir [filtrer le trafic HTTPS](/general/https-filtering/what-is-https-filtering.md) (ce qui est extrêmement important car la plupart des publicités utilisent HTTPS), AdGuard doit installer son certificat dans le stockage utilisateur de votre appareil. Sur les anciennes versions d'Android, cela se faisait automatiquement, mais sur Android 11 et les versions ultérieures, les utilisateurs doivent l'installer manuellement. -![Certificate *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/manual-certificate/g.gif) +![Certificat *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/manual-certificate/g.gif) -Follow these steps to install the AdGuard certificate: +Suivez ces étapes pour installer le certificat AdGuard: -1. When you see the *HTTPS filtering is off* notification, tap *Enable*. +1. Lorsque vous voyez la notification *Filtrage HTTPS désactivé*, appuyez sur *Activer*. -1. Then you'll be presented with three screens that explain: - - Why filter HTTPS traffic - - The safety of this filtering process - - The necessity of the AdGuard certificate +1. Ensuite, vous verrez trois écrans qui expliquent : + - Pourquoi filtrer le trafic HTTPS + - La sécurité de ce processus de filtrage + - La nécessité du certificat AdGuard Consecutively tap *Next* → *Next* → *Save certificate*. @@ -40,7 +40,7 @@ Veuillez noter que les étapes fournies sont basées sur le smartphone Google Pi If you experience issues during the manual certificate installation (for example, you installed the certificate, but the application keeps ignoring it), you can follow one of the solutions below. -1. Restart AdGuard. -2. Try to install the correct certificate (AdGuard Personal CA) one more time. +1. Redémarrez AdGuard. +2. Essayez d'installer le certificat correct (AdGuard Personal CA) une fois de plus. -If you still encounter a problem and can't install the certificate, please contact our support team at . +Si vous rencontrez toujours un problème et ne pouvez pas installer le certificat, veuillez contacter notre Équipe d'assistance à l'adresse . diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 41c8a709bc3..31a60ade740 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,11 +1,11 @@ --- title: Problèmes causés par des profils d'utilisateurs multiples -sidebar_position: 10 +sidebar_position: 9 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. To see how it works, [download the AdGuard app](https://agrd.io/download-kb-adblock) +Cet article concerne AdGuard pour Android, un bloqueur de publicité multifonctionnel qui protège votre appareil au niveau système. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) ::: @@ -21,78 +21,78 @@ Pour résoudre ce problème, vous devez désinstaller l'application pour tous le ![Uninstall *mobile border](https://cdn.adtidy.org/blog/new/tu49hmultiple_users.png) -## Problems caused by using a Restricted Mode profile +## Problèmes causés par l'utilisation d'un profil sous le Mode restreint -The owners of phones, tablets, or TVs running the Android 7+ operating system might face the problem caused by using **a profile with Restricted Mode**. If you have such a profile, **AdGuard**, like other applications that use VPN, gets restrictions on selective filtering of VPN traffic. As a result, AdGuard cannot launch protection in a **local VPN mode**. Also, one of the reasons for this situation may be using **Dual App/Dual Messenger profile** on your device. Below are described the recommendations that you can apply when this problem occurs. +Les propriétaires de téléphones, tablettes ou TV sous le système d'exploitation Android 7+ peuvent être confrontés au problème causé par l'utilisation d'**un profil en Mode restreint**. Si vous avez un tel profil, **AdGuard**, comme les autres applications qui utilisent le VPN, obtient des restrictions sur la gestion sélective du trafic VPN. Par conséquent, AdGuard ne peut pas lancer de protection en **mode VPN local**. En outre, l'utilisation du profil **Dual App/Dual Messenger** sur votre appareil peut causer cette situation. Vous trouverez ci-dessous les recommandations que vous pouvez appliquer lorsque ce problème se produit. ### Solutions -You have three ways to solve the issue: +Il existe trois façons de résoudre le problème : -### Option 1: Grant permissions to AdGuard using ADB +### Option 1 : Accorder des autorisations à AdGuard en utilisant ADB :::note -This approach is available starting from **AdGuard v3.5 nightly 6**. If you're using an older version, you can get the latest update [here](https://adguard.com/adguard-android/overview.html). +Cette approche est disponible à partir de **AdGuard v3.5 nightly 6**. Si vous utilisez une version plus ancienne, vous pouvez obtenir la dernière mise à jour [ici](https://adguard.com/adguard-android/overview.html). ::: 1. Activez le **mode développeur** et activez ensuite **le débogage USB** : - - Open the **Settings** app phone; + - Ouvrez l'application **Paramètres** sur votre téléphone ; - Accédez à la section **Système** (dernier élément du menu des paramètres). Dans cette section, trouvez le sous-élément **À propos du téléphone** ; - - Tap the **Build number** line 7 times. After that, you will receive a notification that **You are now a developer** (If necessary, enter an unlock code for the device); - - Open **System Settings** → **Developer Options** → Scroll down and enable **USB debugging** → Confirm debugging is enabled in the window **Allow USB debugging** after reading the warning carefully. + - Cliquez 7 fois sur la ligne **Numéro de version**. Ensuite, vous recevrez une notification indiquant **Vous êtes maintenant un développeur** (Si nécessaire, saisissez un code de déverrouillage pour l'appareil) ; + - Ouvrez **Paramètres système** → **Options du développeur** → Faites défiler vers le bas et activez **Débogage USB** → Confirmez que le débogage est activé dans la fenêtre **Autoriser le débogage USB** après avoir lu attentivement l'avertissement. :::note - If you have any difficulties or additional questions, full instructions can be found [here](https://developer.android.com/studio/debug/dev-options). + Si vous rencontrez des difficultés ou avez des questions supplémentaires, vous trouverez des instructions complètes [ici](https://developer.android.com/studio/debug/dev-options). ::: 1. [Installer et configurer](https://www.xda-developers.com/install-adb-windows-macos-linux/) ADB ; Sur la plateforme Windows, les propriétaires de **Samsung** peuvent avoir besoin d'installer [cet utilitaire](https://developer.samsung.com/mobile/android-usb-driver.html). -1. Connect your device using a **USB cable** to the computer or laptop on which you installed **ADB**; +1. Connectez votre appareil à l'aide d'un **câble USB** à l'ordinateur ou au portable sur lequel vous avez installé **ADB**; -1. Open **the command line** on your PC: +1. Ouvrez **la ligne de commande** sur votre PC : - - **Cmd.exe** if you are using **Windows**; - - **Terminal** if you are using **macOS**; + - **Cmd.exe** si vous utilisez **Windows** ; + - **Terminal** si vous utilisez **macOS**; -1. Enter the command `adb shell pm grant com.adguard.android android.permission.INTERACT_ACROSS_USERS` and press **Enter**. +1. Saisissez la commande `adb shell pm grant com.adguard.android android.permission.INTERACT_ACROSS_USERS` et appuyez sur **Enter**. -### Option 2: Remove *restricted user account* +### Option 2 : Retirer le *compte utilisateur restreint* -About how to manage user accounts from an Android device you can [find here](https://support.google.com/a/answer/6223444?hl=en). +Pour savoir comment gérer les comptes utilisateurs à partir d'un appareil Android, vous pouvez [rechercher l'info ici](https://support.google.com/a/answer/6223444?hl=en). :::note -In some cases restricted user accounts are created implicitly and cannot be removed. For instance, when you use Dual Messenger or Dual App features on **Samsung** or **LG** devices. You can read below how to fix the issue in these cases. +Dans certains cas, les comptes d'utilisateurs restreints sont créés implicitement et ne peuvent pas être supprimés. For instance, when you use Dual Messenger or Dual App features on **Samsung** or **LG** devices. Vous pouvez lire ci-dessous comment résoudre le problème dans ces cas. ::: -### Option 3: Use AdGuard in *Local HTTP proxy mode* (requires root) +### Option 3 : Utiliser AdGuard en *Mode proxy HTTP local* (nécessite l'accès root) -To enable this mode, open **AdGuard Settings** → **Network** → **Filtering method** → **Local HTTP proxy** +Pour activer ce mode, ouvrez **Paramètres AdGuard** → **Réseau** → **Méthode de filtrage** → **Proxy HTTP local** ### Appareils LG et Samsung -Les propriétaires de téléphones **LG** ou **Samsung** peuvent rencontrer un problème similaire. It can be caused by using **Dual App/Dual Messenger** function (which automatically creates a restricted profile). To solve this issue, you need to disable this feature. +Les propriétaires de téléphones **LG** ou **Samsung** peuvent rencontrer un problème similaire. Cela peut être dû à l'utilisation de la fonction **Dual App/Dual Messenger** (qui crée automatiquement un profil restreint). Pour résoudre ce problème, vous devez désactiver cette fonctionnalité. ### Samsung -- Open **Settings**; -- Press **Advanced**; +- Ouvrez les **Paramètres**; +- Appuyez **Paramètres avancés** ; - Scroll down and press **Dual Messenger**; - Disable the **Dual Messenger** for all apps; -- Lock the device for 5 minutes; -- Unlock the screen and try again to create the VPN profile. +- Verrouillez l'appareil pendant 5 minutes ; +- Déverrouillez l'écran et réessayez de créer le profil VPN. ### LG -- Open **Settings**; -- Choose **General** tab; +- Ouvrez les **Paramètres**; +- Choisissez l'onglet **Général** ; - Scroll down and press **Dual App**; - Remove all apps from the list; -- Reboot your device. +- Redémarrez votre appareil. diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 6b9fddc4500..bbc91d335a6 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,91 +1,91 @@ --- -title: How to set up outbound proxy -sidebar_position: 8 +title: Comment configurer le proxy sortant +sidebar_position: 7 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. To see how it works, [download the AdGuard app](https://agrd.io/download-kb-adblock) +Cet article concerne AdGuard pour Android, un bloqueur de publicité multifonctionnel qui protège votre appareil au niveau système. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) ::: -Below is a list of the most well-known applications that can be configured to work as proxies in AdGuard. +Vous trouverez ci-dessous une liste des applications les plus connues qui peuvent être configurées pour fonctionner comme proxys dans AdGuard. :::note -If your app is not listed below, please check on its proxy configurations in the settings or contact its support team. +Si votre app n'est pas répertoriée ci-dessous, veuillez vérifier ses configurations de proxy dans les paramètres ou contacter son équipe d'assistance. ::: -AdGuard allows you to route your device's traffic through a proxy server. To access proxy settings, open **Settings** and then proceed to **Filtering** → **Network** → **Proxy**. +AdGuard permet d'acheminer le trafic de votre appareil via un proxy. Pour accéder aux paramètres du proxy, ouvrez **Paramètres** et procédez ensuite à **Filtrage** → **Réseau** → **Proxy**. -## Proxy configuration examples +## Exemples de configuration du proxy -In this article we give examples of how to set up some of the most popular proxies to work with AdGuard. +Dans cet article, nous donnons des exemples de la façon de configurer certains des proxies les plus populaires pour fonctionner avec AdGuard. -### How to use AdGuard with Tor +### Comment utiliser AdGuard avec Tor -1. Open AdGuard and go to **Settings** → **Filtering** → **Network** → **Proxy**. Download “Orbot: Proxy with Tor” directly from [Google Play](https://play.google.com/store/apps/details?id=org.torproject.android&noprocess) or by tapping **Integrate with Tor** and then **Install**. +1. Ouvrez AdGuard et accédez à **Paramètres** → **Filtrage** → **Réseau** → **Proxy**. Téléchargez "Orbot: Proxy with Tor" directement depuis [Google Play](https://play.google.com/store/apps/details?id=org.torproject.android&noprocess) ou en appuyant sur **Intégrer avec Tor** puis sur **Installer**. -1. Open Orbot and press the **Start** button on the application's main screen. +1. Ouvrez Orbot et appuyez sur le bouton **Démarrer** sur l'écran principal de l'application. -1. Go back to the **Proxy** screen of AdGuard. +1. Revenez à l’écran **Proxy** d’AdGuard. -1. Tap the **Integrate with Tor** button. +1. Appuyez sur le bouton **Intégrer avec Tor**. -1. All the required fields will be pre-filled: +1. Tous les champs requis seront préremplis : - | Field | Value | - | ---------- | -------------------- | - | Proxy type | *SOCKS4* or *SOCKS5* | - | Proxy host | *127.0.0.1* | - | Proxy port | *9050* | + | Champ | Valeur | + | ------------- | -------------------- | + | Type de proxy | *SOCKS5* ou *SOCKS5* | + | Host du proxy | *127.0.0.1* | + | Port du proxy | *9050* | - Or you can tap **Proxy server** → **Add proxy server**, enter these values manually, and set Orbot as the default proxy. + Soit vous pouvez appuyer sur **Serveur proxy** → **Ajouter un serveur proxy**, saisir ces valeurs manuellement et définir Orbot comme proxy par défaut. -1. Enable the main Proxy switch and AdGuard protection to route your device's traffic through the proxy. +1. Activez le commutateur Proxy principal et la protection AdGuard pour acheminer le trafic de votre appareil via le proxy. - Now AdGuard will route all traffic through Orbot. If you disable Orbot, Internet connection will be unavailable until you disable the outbound proxy settings in AdGuard. + Maintenant, AdGuard fera passer tout le trafic par Orbot. Si vous désactivez Orbot, la connexion Internet ne sera pas disponible jusqu'à ce que vous désactiviez les paramètres de proxy sortants dans AdGuard. -### How to use AdGuard with PIA (Private Internet Access) +### Comment utiliser AdGuard avec PIA (Private Internet Access) -*Here we presume that you are already a PIA VPN client and have it installed on your device.* +*Ici, nous présumons que vous êtes déjà un client VPN PIA et que vous l'avez installé sur votre appareil.* -1. Open AdGuard and go to **Settings** → **Filtering** → **Network** → **Proxy** → **Proxy server**. +1. Ouvrez AdGuard et accédez à **Paramètres** → **Filtrage** → **Réseau** → **Proxy** → **Serveur proxy**. -1. Tap the **Add proxy server** button and enter the following data: +1. Appuyez sur le bouton **Ajouter un serveur proxy** et saisissez les données suivantes : - | Field | Value | - | ---------- | ------------------------------------ | - | Proxy type | *SOCKS5* | - | Proxy host | *proxy-nl.privateinternetaccess.com* | - | Proxy port | *1080* | + | Champ | Valeur | + | ------------- | ------------------------------------ | + | Type de proxy | *SOCKS5* | + | Host du proxy | *proxy-nl.privateinternetaccess.com* | + | Port du proxy | *1080* | -1. You also need to fill out the **Username/Password** fields. To do so, log in to the [Client Control Panel](https://www.privateinternetaccess.com/pages/client-sign-in) on the PIA website. Tap the **Generate Password** button under the **Generate PPTP/L2TP/SOCKS Password** section. A username starting with “x” and a random password will be shown. Use them to fill out the **Proxy username** and **Proxy password** fields in AdGuard. +1. Vous devez également remplir les champs **Nom d'utilisateur/Mot de passe**. Pour ce faire, connectez-vous au [Panneau de configuration client](https://www.privateinternetaccess.com/pages/client-sign-in) sur le site Web de PIA. Appuyez sur le bouton **Générer un mot de passe** sous la section **Générer un mot de passe PPTP/L2TP/SOCKS**. Un nom d'utilisateur commençant par "x" et un mot de passe aléatoire seront affichés. Utilisez-les pour remplir les champs **Nom d'utilisateur proxy** et **Mot de passe proxy** dans AdGuard. -1. Tap **Save and select**. +1. Tapez **Enregistrer et sélectionner**. -1. Enable the main Proxy switch and AdGuard protection to route your device's traffic through the proxy. +1. Activez le commutateur Proxy principal et la protection AdGuard pour acheminer le trafic de votre appareil via le proxy. ### How to use AdGuard with TorGuard *Here we presume that you are already a TorGuard client and have it installed on your device.* -1. Open AdGuard and go to **Settings** → **Filtering** → **Network** → **Proxy** → **Proxy server**. +1. Ouvrez AdGuard et accédez à **Paramètres** → **Filtrage** → **Réseau** → **Proxy** → **Serveur proxy**. -1. Tap the **Add proxy server** button and enter the following data: +1. Appuyez sur le bouton **Ajouter un serveur proxy** et saisissez les données suivantes : - | Field | Value | - | ---------- | ------------------------------------------- | - | Proxy type | *SOCKS5* | - | Proxy host | *proxy.torguard.org* or *proxy.torguard.io* | - | Proxy port | *1080* or *1085* or *1090* | + | Champ | Valeur | + | ------------- | ------------------------------------------- | + | Type de proxy | *SOCKS5* | + | Host du proxy | *proxy.torguard.org* or *proxy.torguard.io* | + | Port du proxy | *1080* or *1085* or *1090* | 1. For **Username** and **Password** fields, enter your proxy username and proxy password you have chosen at TorGuard signup. 1. Tap **Save and select**. -1. Enable the main Proxy switch and AdGuard protection to route your device's traffic through the proxy. +1. Activez le commutateur Proxy principal et la protection AdGuard pour acheminer le trafic de votre appareil via le proxy. ### How to use AdGuard with NordVPN @@ -101,17 +101,17 @@ In this article we give examples of how to set up some of the most popular proxi 1. Enter the following data: - | Field | Value | - | ---------- | ----------------------------------------------------------------------------------------------------------------------------- | - | Proxy type | *SOCKS5* | - | Proxy host | Any server from [this list](https://support.nordvpn.com/hc/en-us/articles/20195967385745-NordVPN-proxy-setup-for-qBittorrent) | - | Proxy port | *1080* | + | Champ | Valeur | + | ------------- | ----------------------------------------------------------------------------------------------------------------------------- | + | Type de proxy | *SOCKS5* | + | Host du proxy | Any server from [this list](https://support.nordvpn.com/hc/en-us/articles/20195967385745-NordVPN-proxy-setup-for-qBittorrent) | + | Port du proxy | *1080* | 1. Enter your NordVPN credentials in the **Username** and **Password** fields. 1. Tap **Save and select**. -1. Enable the main Proxy switch and AdGuard protection to route your device's traffic through the proxy. +1. Activez le commutateur Proxy principal et la protection AdGuard pour acheminer le trafic de votre appareil via le proxy. ### How to use AdGuard with Shadowsocks @@ -123,19 +123,19 @@ You should remove Shadowsocks app from filtering before setting up the process ( ::: -1. Open AdGuard and go to **Settings** → **Filtering** → **Network** → **Proxy** → **Proxy server**. +1. Ouvrez AdGuard et accédez à **Paramètres** → **Filtrage** → **Réseau** → **Proxy** → **Serveur proxy**. 1. Tap the **Add proxy server** and fill in the fields: - | Field | Value | - | ---------- | ----------- | - | Proxy type | *SOCKS5* | - | Proxy host | *127.0.0.1* | - | Proxy port | *1080* | + | Champ | Valeur | + | ------------- | ----------- | + | Type de proxy | *SOCKS5* | + | Host du proxy | *127.0.0.1* | + | Port du proxy | *1080* | 1. Tap **Save and select**. -1. Enable the main Proxy switch and AdGuard protection to route your device's traffic through the proxy. +1. Activez le commutateur Proxy principal et la protection AdGuard pour acheminer le trafic de votre appareil via le proxy. ### How to use AdGuard with Clash @@ -143,17 +143,17 @@ You should remove Shadowsocks app from filtering before setting up the process ( 1. Open Clash and go to **Settings** → **Network** → **Route System Traffic** and toggle the switch on. This will set Clash to proxy mode. -1. Open AdGuard and go to **App management**. Choose **Clash For Android** and disable **Route traffic through AdGuard**. This will eliminate traffic looping. +1. Ouvrez AdGuard et accédez à **Gestion des applications**. Choose **Clash For Android** and disable **Route traffic through AdGuard**. This will eliminate traffic looping. 1. Then go to **Settings** → **Filtering** → **Network** → **Proxy** → **Proxy server**. 1. Tap **Add proxy server** and fill in the fields: - | Field | Value | - | ---------- | ----------- | - | Proxy type | *SOCKS5* | - | Proxy host | *127.0.0.1* | - | Proxy port | *7891* | + | Champ | Valeur | + | ------------- | ----------- | + | Type de proxy | *SOCKS5* | + | Host du proxy | *127.0.0.1* | + | Port du proxy | *7891* | ## Limitations diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index c01f4eddf00..58d79ccb639 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,33 +1,33 @@ --- title: Comment utiliser Samsung Pay avec AdGuard en Corée du Sud -sidebar_position: 17 +sidebar_position: 16 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. To see how it works, [download the AdGuard app](https://agrd.io/download-kb-adblock) +Cet article concerne AdGuard pour Android, un bloqueur de publicité multifonctionnel qui protège votre appareil au niveau système. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) ::: -Un certain nombre d'utilisateurs ont rencontré un problème où Samsung Pay ne fonctionne pas lorsque AdGuard est en cours d'exécution. This issue occurs almost exclusively on devices registered in South Korea. +Un certain nombre d'utilisateurs ont rencontré un problème où Samsung Pay ne fonctionne pas lorsque AdGuard est en cours d'exécution. Ce problème se produit presque exclusivement sur les appareils enregistrés en Corée du Sud. -What is causing this issue? Parfois, Samsung Pay ne fonctionne pas sur les appareils avec des services VPN en cours d'exécution, et AdGuard est l'une de ces applications. Par défaut, AdGuard utilise un VPN local pour filtrer le trafic, ce qui peut poser des problèmes lors de l'utilisation de Samsung Pay. +Quelle est la cause de ce problème ? Parfois, Samsung Pay ne fonctionne pas sur les appareils avec des services VPN en cours d'exécution, et AdGuard est l'une de ces applications. Par défaut, AdGuard utilise un VPN local pour filtrer le trafic, ce qui peut poser des problèmes lors de l'utilisation de Samsung Pay. En conséquence, les utilisateurs devaient désactiver AdGuard lorsqu'ils effectuaient des paiements avec Samsung Pay. Cela peut être évité avec la fonction *Détecter Samsung Pay*. Lorsque cette option est activée, l'application AdGuard est mise en pause chaque fois que l'utilisateur ouvre l'application Samsung Pay et reprend lorsque l'application est fermée. :::note -This feature will work only if the Local VPN filtering mode is chosen in AdGuard settings. Si un autre mode est utilisé, Samsung Pay fonctionnera sans interruption. +Cette fonctionnalité ne fonctionnera que si le mode de filtrage VPN local est choisi dans les paramètres d'AdGuard. Si un autre mode est utilisé, Samsung Pay fonctionnera sans interruption. ::: Pour activer *Détecter Samsung Pay*, suivez ces étapes : -1. Go to *Settings* → *General* → *Advanced*→ *Low-level settings*. +1. Allez dans *Paramètres* → *Général* → *Avancé* → *Paramètres de bas niveau*. 1. Faites défiler jusqu'à *Détecter Samsung Pay* et déplacez le curseur vers la droite. -1. Tap *Allow permissions* and give AdGuard access to information about the use of other apps. +1. Appuyez sur *Accorder les autorisations* et donnez à AdGuard l'accès aux informations sur l'utilisation d'autres applications. Nous en avons besoin pour collecter des statistiques sur le fonctionnement de Samsung Pay afin que la fonction *Détecter Samsung Pay* puisse être utilisée. diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index de9f7f95971..1447dfa0c46 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,11 +1,11 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. To see how it works, [download the AdGuard app](https://agrd.io/download-kb-adblock) +Cet article concerne AdGuard pour Android, un bloqueur de publicité multifonctionnel qui protège votre appareil au niveau système. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) ::: diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/solving-problems.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/solving-problems.md index fa0e4e225b4..43840b021e7 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/solving-problems.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/solving-problems.md @@ -5,7 +5,7 @@ sidebar_position: 1 :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) +Cet article concerne AdGuard pour Android, un bloqueur de publicité multifonctionnel qui protège votre appareil au niveau système. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) ::: diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/tasker.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/tasker.md index bc573d0192d..41989e3a708 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/tasker.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/tasker.md @@ -5,7 +5,7 @@ sidebar_position: 3 :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. To see how it works, [download the AdGuard app](https://agrd.io/download-kb-adblock) +Cet article concerne AdGuard pour Android, un bloqueur de publicité multifonctionnel qui protège votre appareil au niveau système. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) ::: @@ -47,7 +47,7 @@ Here are actions that, when included in the intent, will be understood by AdGuar ::note -When the *Use FakeDNS* setting is enabled, *DNS Protection* will be automatically disabled. DNS requests won't be filtered locally. +Lorsque le paramètre *Utiliser FakeDNS* est activé, la *Protection DNS* sera automatiquement désactivée. DNS requests won't be filtered locally. ::: @@ -140,10 +140,10 @@ Before v4.0 the class was called `com.adguard.android.receivers.AutomationReceiv ::: -### Execution without notification +### Exécution sans notification -To perform a task without showing a toast, add an additional EXTRA `quiet: true` +Pour effectuer une tâche sans afficher de toast, ajoutez un EXTRA supplémentaire `quiet: true` -### Example +### Exemple -![Automation *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/tasker/automation2.png) +![Automatisation *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/tasker/automation2.png) diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index adfd7139869..9f08e12db8b 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,32 +1,32 @@ --- -title: How to block ads in the YouTube app -sidebar_position: 7 +title: Comment bloquer les publicités dans l'application YouTube +sidebar_position: 6 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. To see how it works, [download the AdGuard app](https://agrd.io/download-kb-adblock) +Cet article concerne AdGuard pour Android, un bloqueur de publicité multifonctionnel qui protège votre appareil au niveau système. Pour voir comment ça fonctionne, [téléchargez l'application AdGuard](https://agrd.io/download-kb-adblock) ::: -One of the most popular questions users ask us is: 'Is it possible to block ads in YouTube on Android?'. Due to the technical restrictions of the Android OS, there is no way to *completely* remove ads from the YouTube app. But we've found an alternative that brings you to it as close as possible, while getting around the Android-imposed restrictions. +L'une des questions les plus courantes que les utilisateurs nous posent est : "Est-il possible de bloquer les publicités dans YouTube sur Android ?". En raison des restrictions techniques d'Android, il n'est pas possible de *supprimer complètement* les publicités de l'application YouTube. Cependant, nous avons trouvé une alternative qui vous en rapproche autant que possible, tout en contournant les limitations imposées par Android. -## Watch YouTube in the AdGuard app +## Regardez YouTube dans l'application AdGuard ![Instruction *mobile](https://cdn.adtidy.org/public/Adguard/Blog/Android/3-6/share.gif) -1. Open the YouTube app and start the video you want to watch. +1. Ouvrez l'application YouTube et lancez la vidéo que vous souhaitez regarder. -1. Tap the *Share* button. +1. Appuyez sur le bouton *Partager*. - ![Share to YouTube step 1 *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/youtube/android-youtube-share-step1.png) + ![Partager sur YouTube étape 1 *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/youtube/android-youtube-share-step1.png) -1. Select *AdGuard* from the list of apps. +1. Sélectionnez *AdGuard* dans la liste des applications. - ![Share to YouTube step 2 *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/youtube/android-youtube-share-step2.png) + ![Partager sur YouTube étape 2 *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/youtube/android-youtube-share-step2.png) -That's it! A new window with the video will open where you'll be able to watch it without being interrupted by ads. +Et voilà ! Une nouvelle fenêtre avec la vidéo s'ouvrira, où vous pourrez la regarder sans être interrompu par des publicités. -## Watch YouTube in a browser +## Regarder YouTube dans un navigateur -Alternatively, you can also watch YouTube in a browser and there will be no ads if you have AdGuard installed and enabled. +Alternativement, vous pouvez également regarder YouTube dans un navigateur. Il n'y aura pas de publicités si vous avez installé et activé AdGuard. diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 22f9ced3165..e28d9cfabd3 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,88 +5,150 @@ sidebar_position: 2 ## Installation d'AdGuard pour Linux -Pour installer AdGuard, saisissez : +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Version +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Bêta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` -Si nécessaire, saisissez votre mot de passe administrateur. +If required, enter your admin password. -Appuyez sur `y` pour créer un lien dans `/usr/local/bin` vers l'exécutable et attendez que l'installation soit terminée. +Press `y` to create a link in `/usr/local/bin` to the executable and wait until the installation is complete. :::note -Vous pouvez vérifier la signature pour prouver qu'il s'agit d'une version officielle d'AdGuard en utilisant l'outil `gpg`. [En savoir plus sur GitHub](https://github.com/AdguardTeam/AdGuardCLI?tab=readme-ov-file#verify-releases) +You can verify the signature to prove it’s an official version of AdGuard by using the `gpg` tool. [Read more on GitHub](https://github.com/AdguardTeam/AdGuardCLI?tab=readme-ov-file#verify-releases) ::: -## Activation de la licence +## Initial setup -AdGuard pour Linux nécessite une [licence AdGuard](https://adguard.com/license.html). Si vous n'avez pas encore de licence, vous pouvez vous connecter ou créer un compte pour obtenir un essai gratuit de 14 jours. Si vous avez déjà une licence, connectez-vous pour l'activer. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -Pour vous connecter ou créer un compte, saisissez : +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -Pour réinitialiser votre licence, saisissez : +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -Pour afficher les informations sur la licence, saisissez : +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Configuration initiale +4. After activation, you can continue to work with the program: -Pour qu'AdGuard soit opérationnel, terminez la configuration initiale. Cela inclut l'installation du certificat CA AdGuard, l'activation des filtres nécessaires et la sélection du mode proxy. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -Pour exécuter l'assistant de configuration, saisissez : +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` -## Désinstallation d'AdGuard pour Linux + or view the license info by entering -Pour désinstaller AdGuard, saisissez : + ```sh + adguard-cli license + ``` -Version +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: -``` + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). + +## Uninstall AdGuard for Linux + +To uninstall AdGuard, enter: + +Release + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` -Bêta +Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` -Si nécessaire, saisissez votre mot de passe administrateur. +If required, enter your admin password. diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 7e34a1efda6..123f57223e7 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Gestion des paramètres et de la protection sidebar_position: 3 --- +## Available commands + Pour obtenir une liste de toutes les commandes AdGuard disponibles, sasissez : -``` +```sh adguard-cli --help-all ``` ## Activation et désactivation de la protection +### Enable protection + Pour activer la protection, il faut saisir : -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + Pour désactiver la protection, saisissez : -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + Pour afficher l'état de la protection, il faut saisir : -``` +```sh adguard-cli status ``` -## Vérification des mises à jour +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Vérification des mises à jour Pour vérifier les mises à jour, saisissez : -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + Pour mettre à jour AdGuard pour Linux, saisissez : -``` +```sh adguard-cli update ``` +### Update script output + Pour voir la sortie du script de mise à jour, il faut saisir : -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Utilisez la commande `config` pour configurer AdGuard pour Linux. Sous-commandes : - `afficher`: Afficher la configuration actuelle dans `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `définir`: Configurer une option dans `proxy.yaml` - `listen_ports.http_proxy`: Port d'écoute HTTP - `proxy_mode`: Mode proxy (`manuel` ou `auto`) + - `get` : Obtenir l'état actuel des options ci-dessus ## Gestion des filtres @@ -64,8 +90,32 @@ Utilisez la commande `config` pour configurer AdGuard pour Linux. Sous-commandes Utilisez la commande `filters` pour configurer AdGuard pour Linux. Sous-commandes : - `list` : Liste des filtres installés + - `--all`: Afficher tous les filtres + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install` : Installer un filtre. Saisissez l'URL du filtre que vous souhaitez installer + - `activer`: Activer un filtre. Saisissez le nom ou l'ID du filtre + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `désactiver`: Désactiver un filtre. Saisissez le nom ou l'ID du filtre + - `update` : Mise à jour des filtres + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-mac/adguard-for-mac.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-mac/adguard-for-mac.md index f5bbf1d4f25..fedb5ce5637 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-mac/adguard-for-mac.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-mac/adguard-for-mac.md @@ -11,13 +11,13 @@ Cet article parle de AdGuard pour Mac, un bloqueur d'annonces multifonctionnel q ## Fonctionnalités -Main features and settings available in AdGuard for Mac +Fonctionnalités principales et paramètres disponibles dans AdGuard pour Mac [Fonctionnalités](/adguard-for-mac/features/features.md) ## Installation -Installation, removal, and system requirements for AdGuard for Mac +L'installation, la désinstallation et la configuration système requise d'AdGuard pour Mac [Installation](/adguard-for-mac/installation.md) diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-mac/features/features.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-mac/features/features.md index 8d7b4cad8fd..dd73975ac8b 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-mac/features/features.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-mac/features/features.md @@ -11,19 +11,19 @@ Cet article parle de AdGuard pour Mac, un bloqueur d'annonces multifonctionnel q ## Fenêtre principale -Main screen with statistics on blocked ads and trackers and access to main settings +Écran principal avec des statistiques sur les annonces bloquées et les traqueurs et accès aux paramètres principaux [Fenêtre principale](/adguard-for-mac/features/main.md) ## Général -Basic settings to block search ads and website self-promotional ads, enable language-specific filters, and manage _Allowlist_ +Paramètres de base pour bloquer les publicités de recherche et les publicités auto-promotionnelles sur le site Web, activer les filtres spécifiques à la langue et gérer la _liste d'autorisation_ [Général](/adguard-for-mac/features/general.md) ## Filtres -Filters and user rules to fine-tune ad blocking +Les filtres et les règles utilisateur pour personnaliser le blocage d'annonces [Filtres](/adguard-for-mac/features/filters.md) @@ -37,28 +37,28 @@ Les serveurs DNS et les filtres DNS qui vous permettent de bloquer les publicit Paramètres permettant de bloquer les cookies, les balises UTM et les outils d'analyse en ligne qui collectent des informations sur l'utilisateur -[Stealth Mode](/adguard-for-mac/features/stealth.md) +[Mode furtif](/adguard-for-mac/features/stealth.md) ## Sécurité -A setting that blocks access to malicious and phishing websites and protects you from online threats +Un paramètre qui bloque l'accès aux sites Web malveillants et hameçonneurs et vous protège des menaces en ligne [Sécurité](/adguard-for-mac/features/security.md) ## Assistant de navigateur -An extension that complements the desktop program and allows you to manage filtering from your browser +Une extension qui complète le programme de bureau et vous permet de gérer le filtrage depuis votre navigateur [Assistant AdGuard](/adguard-for-mac/features/browser-assistant.md) ## Extensions -A feature that allows you to extend the functionality of websites by adding userscripts and userstyles +Une fonctionnalité qui vous permet d'étendre la fonctionnalité des sites Web en ajoutant des scripts utilisateur et des styles utilisateur [Extensions](/adguard-for-mac/features/extensions.md) ## Réseau -Additional network-related options and proxy settings +Options supplémentaires liées au réseau et paramètres du proxy [Réseau](/adguard-for-mac/features/network.md) diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/adguard-for-windows.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/adguard-for-windows.md index df78a5d70bb..e87c26cf2d6 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/adguard-for-windows.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/adguard-for-windows.md @@ -11,19 +11,19 @@ Cet article parle de AdGuard pour Windows, un bloqueur de contenus multifonction ## Fonctionnalités -Main features and settings available in AdGuard for Windows +Voici les principales fonctionnalités et paramètres disponibles dans AdGuard pour Windows [Fonctionnalités](/adguard-for-windows/features/features.md) ## Installation -Installation, removal, and system requirements for AdGuard for Windows +Vous trouverez ici la configuration requise ainsi que des instructions sur l'installation et la désinstallation d'AdGuard pour Windows [Installation](/adguard-for-windows/installation.md) ## Assistant de navigateur -An extension that complements the desktop program and allows you to manage filtering from your browser +Une extension qui complète le programme de bureau et vous permet de gérer le filtrage depuis votre navigateur [Assistant AdGuard](/adguard-for-windows/browser-assistant.md) @@ -35,6 +35,6 @@ Problèmes connus et solutions possibles ## Documentation pour les administrateurs -Configuration guide for system administrators +Guide de configuration pour les administrateurs système [Documentation pour les administrateurs](/adguard-for-windows/admins-documentation.md) diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index b9445190960..bbc0ee847ae 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ Cette page décrit les caractéristiques et les détails de la gestion centrale ## 1. Téléchargez le MSI {#msi-download} -Téléchargez le [MSI AdGuard x86](https://cdn.adtidy.org/distr/windows/AdGuard_x86.msi) +Téléchargez le [MSI AdGuard x86](https://agrd.io/adguard_setup86_msi) -Téléchargez le [AdGuard MSI x64](https://cdn.adtidy.org/distr/windows/AdGuard_x64.msi) +Téléchargez le [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configurez les paramètres de votre réseau {#settings-configuring} diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md index aaae1ea95cd..72bc2a51eb9 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md @@ -33,7 +33,7 @@ AdGuard Extra est essentiellement un miniprogramme qui modifie le fonctionnement **Bloqueur AdGuard de fenêtres pop-up** -Cette extension empêche l'ouverture de fenêtres pop-up lorsque vous consultez des pages web. Some popups are considered useful — they may contain settings for site administering or additional reference information demonstrated upon clicking a link. C'est pourquoi vous pouvez désactiver le Bloqueur si nécessaire. Cette extension ne fonctionne pas non plus sur les sites web ajoutés à la liste d'exceptions d'AdGuard. Elle est désactivée par défaut, mais vous pouvez l'activer dans les paramètres de l'application. +Cette extension empêche l'ouverture de fenêtres pop-up lorsque vous consultez des pages web. Certaines fenêtres pop-up sont considérées comme utiles — elles peuvent contenir des paramètres pour l'administration du site ou des informations de référence supplémentaires affichées lorsque l'on clique sur un lien. C'est pourquoi vous pouvez désactiver le Bloqueur si nécessaire. Cette extension ne fonctionne pas non plus sur les sites web ajoutés à la liste d'exceptions d'AdGuard. Elle est désactivée par défaut, mais vous pouvez l'activer dans les paramètres de l'application. **Web of Trust** diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/features/features.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/features/features.md index 070b6a92110..4648ea8c922 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/features/features.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/features/features.md @@ -11,30 +11,30 @@ Cet article parle de AdGuard pour Windows, un bloqueur de contenus multifonction ## Écran d'accueil -On the main screen you’ll find _Settings_, _Support_, _License_, and _About_, as well as statistics on blocked ads and trackers +Sur l'écran principal, vous trouverez _Paramètres_, _Assistance_, _Licence_ et _À propos_, ainsi que des statistiques sur les publicités et les traqueurs bloqués [Écran d'accueil](/adguard-for-windows/features/home-screen/) ## Paramètres -Theme and language settings, ad blocking customization, DNS protection, parental controls, extension management, and advanced options for expert users +Paramètres de thème et de langue, personnalisation du blocage des publicités, Protection DNS, contrôles parentaux, gestion des extensions et options avancées pour les utilisateurs experts [Paramètres](/adguard-for-windows/features/settings/) ## Extensions -A feature that allows you to extend the functionality of websites by adding userscripts and userstyles +Une fonctionnalité qui vous permet d'étendre la fonctionnalité des sites Web en ajoutant des scripts utilisateur et des styles utilisateur [Extensions](/adguard-for-windows/features/extensions/) ## Réseau -Additional network-related options and proxy settings +Options supplémentaires liées au réseau et paramètres du proxy [Réseau](/adguard-for-windows/features/network/) ## Autres fonctions -Support, license management, tray menu options, program version and updates +Assistance, gestion des licences, options de menu de la barre d'état, version du programme et mises à jour [Autres fonctionnalités](/adguard-for-windows/features/others/) diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md index 7e089a29a02..cb1e63bfdcc 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md @@ -23,7 +23,7 @@ Tout en bas de l'écran, vous trouverez les _Paramètres avancés_. Changer cert ### Bloqueur d'annonces -C'est le module principal d'AdGuard pour Windows qui supprime les publicités des sites web que vous visitez et des applications installées sur votre appareil. To filter out advertising and privacy-threatening content such as banners, popups, or trackers AdGuard uses different filters — groups of rules with a similar purpose written with a [special syntax](/general/ad-filtering/create-own-filters). Pour comprendre ce que sont les filtres et comment ils fonctionnent, lisez [cet article](/general/ad-filtering/how-ad-blocking-works). +C'est le module principal d'AdGuard pour Windows qui supprime les publicités des sites web que vous visitez et des applications installées sur votre appareil. Pour filtrer la publicité et les contenus menaçant la vie privée tels que les bannières, les pop-ups ou les traqueurs, AdGuard utilise des filtres différents — des groupes de règles ayant un objectif similaire écrites avec une [syntaxe spéciale](/general/ad-filtering/create-own- filtres). Pour comprendre ce que sont les filtres et comment ils fonctionnent, lisez [cet article](/general/ad-filtering/how-ad-blocking-works). ![Bloqueur de publicités \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/settings_ad_blocker.png) @@ -54,7 +54,7 @@ Pour tout apprendre sur le Mode furtif et ses nombreuses options, [lisez cet art La Navigation sécurisée offre une protection efficace contre les sites web malveillants et les sites d'hameçonnage. Non, AdGuard pour Windows n'est pas un antivirus. Il n'arrêtera pas le téléchargement d'un virus lorsqu'il est déjà lancé, ni ne supprimera ceux déjà existants. Mais il vous avertira si vous êtes sur le point de vous rendre sur un site web dont le domaine a été ajouté à notre base de données de "sites non fiables", ou de télécharger un fichier à partir d'un tel site web. Vous trouverez plus d'informations sur le fonctionnement de ce module dans l'[article dédié](/general/browsing-security). -In this module, you can: +Dans ce module, vous pouvez : - activer les notifications pour bloquer les requêtes vers des sites malveillants et ceux d'hameçonnage, - activer les notifications sonores, @@ -70,31 +70,31 @@ Il existe trois raisons importantes pour lesquelles vous souhaiterez peut-être ![Protection DNS \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/dns-settings.png) -In the DNS protection module of AdGuard for Windows, you can choose DNS servers from known DNS providers, including AdGuard DNS, which blocks ads and trackers, AdGuard DNS Family Protection, which also blocks adult content, or AdGuard DNS Non-filtering, which provides a secure and reliable connection but doesn’t filter anything. You can even add custom DNS servers and rules using [DNS rule syntax](https://adguard-dns.io/kb/general/dns-filtering-syntax/). If necessary, you can add [DNS filters of your choice](https://filterlists.com). +Dans le module de protection DNS d'AdGuard pour Windows, vous pouvez choisir des serveurs DNS provenant de fournisseurs DNS connus, y compris AdGuard DNS, qui bloque les publicités et les traqueurs, AdGuard DNS Protection Familiale, qui bloque également le contenu pour adultes, ou AdGuard DNS Sans filtrage, qui fournit une connexion sécurisée et fiable mais ne filtre rien. Vous pouvez même ajouter des serveurs DNS personnalisés. Si nécessaire, vous pouvez ajouter [des filtres DNS de votre choix](https://filterlists.com). -Starting with v7.20, you can also add filters by simply selecting them from a list of pre-built, trusted filters. They are grouped into four categories for your convenience: +À partir de la version 7.20, vous pouvez également ajouter des filtres en les sélectionnant simplement dans une liste de filtres prédéfinis et fiables. Ils sont regroupés en quatre catégories pour votre commodité : -- **General**: block ads and trackers -- **Regional**: block ads and trackers on language-specific websites -- **Security**: block phishing and unreliable websites -- **Other**: cover special use cases that don’t fit into the above categories +- **Général** : pour bloquer les publicités et les traqueurs +- **Régional** : pour bloquer les publicités et les traqueurs sur les sites Web spécifiques à la langue +- **Sécurité** : pour bloquer le phishing et les sites Web peu fiables +- **Autres** : couvre les cas d'utilisation spéciaux qui ne correspondent pas aux catégories ci-dessus -![DNS filters \*border](https://cdn.adtidy.org/content/release_notes/ad_blocker/windows/v7.20/dns_filters/en.png) +![Filtres DNS\*border](https://cdn.adtidy.org/content/release_notes/ad_blocker/windows/v7.20/dns_filters/en.png) -### Parental Control +### Contrôle parental -There are several websites to which access should be restricted from a PC used by children. This task is accomplished by Parental Control. +Il existe plusieurs sites web dont l'accès doit être restreint à partir d'un PC utilisé par des enfants. Cette tâche est accomplie par le Contrôle Parental. -![Parental Control \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/parental-control.png) +![Contrôle parental \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/parental-control.png) -The module checks the contents of web pages opened in the browser and filters those with content undesirable for children: images and texts for adults, crude language, violence, drug propaganda, etc. Parental Control settings are password-protected so that the child is not able to go round the restrictions. This module not only blocks directions to undesirable sites but can also delete the links that are inappropriate for children from the search results. +Le module vérifie le contenu des pages web ouvertes dans le navigateur et filtre celles dont le contenu est indésirable pour les enfants : images et textes pour adultes, langage grossier, violence, propagande de drogue, etc. Les paramètres du Contrôle Parental sont protégés par mot de passe pour que l'enfant ne puisse pas contourner les restrictions. Ce module bloque non seulement les directions vers des sites indésirables, mais peut également supprimer des résultats de recherche les liens inappropriés pour les enfants. -In the _Parental Control_ module you can enable the _Safe search_ and manage the _blocklist_ and the _allowlist_ to customize how this option works. You can also check the _Block executable files download_ box to prevent your child from downloading and installing software on the computer. There are two more options in the _Parental Control_ module: you can select a specific Windows user to be protected by _Parental Control_ and set a password to protect AdGuard settings from change. +Dans le module _Contrôle Parental_, vous pouvez activer la _Recherche sécurisée_ et gérer la _liste de blocage_ et la _liste d'autorisation_ pour personnaliser le fonctionnement de cette option. Vous pouvez également cocher la case _Bloquer le téléchargement des fichiers exécutables_ pour empêcher votre enfant de télécharger et d'installer des logiciels sur l'ordinateur. Il existe deux autres options dans le module _Contrôle parental_ : vous pouvez sélectionner un utilisateur Windows spécifique à protéger par le _Contrôle parental_ et définir un mot de passe pour protéger les paramètres AdGuard contre toute modification. -![Parental Control \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/parental-control.png) +![Contrôle parental \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/parental-control.png) ### Assistant de navigateur -![Browser Assistant \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/browser-assistant/browser-assistant.png) +! [Assistant de navigateur \*mobile_border] (https://cdn.adtidy.org/content/kb/ad_blocker/windows/browser-assistant/browser-assistant.png) -From this tab you can easily proceed to install AdGuard Browser Assistant, which primary function is to manage filtering directly from the browser. We explained more about how to work with it and what to do if there is no Browser Assistant for your browser in the [separate article](/adguard-for-windows/browser-assistant.md). +À partir de cet onglet, vous pouvez facilement procéder à l'installation de l'Assistant de navigateur d'AdGuard, dont la fonction principale est de gérer le filtrage directement depuis le navigateur. Nous avons expliqué plus en détail comment l'utiliser et que faire s'il n'y a pas d'assistant de navigateur pour votre navigateur dans l'[article séparé](/adguard-for-windows/browser-assistant.md). diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md index 0de525131f8..617b21a0115 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md @@ -35,13 +35,13 @@ Ce sont deux erreurs différentes avec des solutions très similaires. Comme les Vous pourriez dire que c'est une sous-catégorie particulière de l'erreur 1603. Les solutions possibles sont similaires : -- Start and re-register Microsoft Installer service. It requires some work. +- Démarrez et réenregistrez le service Microsoft Installer. Ceci nécessite du travail. - - Press *Win + R* and enter **services.msc**. - - Find in the list and double-click *Windows Installer*. - - Hit *Start* button under *Service status* and hit *OK*. If the service status is **running**, you should click *Stop* first and then hit *Start*. - - Press *Win + R*, type ***msiexec /unregister***, and hit *Enter*. - - Press *Win + R* again, type ***msiexec /regserver***, and hit *Enter* + - Appuyez sur *Win + R* et saisissez **services.msc**. + - Trouvez dans la liste et double-cliquez sur *Windows Installer*. + - Appuyez sur le bouton *Démarrer* sous *État du service* et appuyez sur *OK*. Si l'état du service est **en cours d'exécution**, vous devez d'abord cliquer sur *Arrêter* puis appuyer sur *Démarrer*. + - Appuyez sur *Win + R*, tapez ***msiexec /unregister*** et appuyez sur *Entrée*. + - Appuyez à nouveau sur *Win + R*, tapez ***msiexec /regserver***, et appuyez sur *Entrée* - Redémarrez le PC et recommencez l'installation depuis le début. Parfois, cela suffit à résoudre le problème. @@ -65,25 +65,25 @@ L'erreur semble plus effrayante qu'elle ne l'est en réalité. En réalité, il - Désinstallez AdGuard à l'aide de notre [outil de désinstallation](../../installation#advanced) spécial, puis répétez l'installation. -- Start and re-register Microsoft Installer service. It requires some work. - - - Press *Win + R* and enter ***services.msc***. - - Find in the list and double-click *Windows Installer*. - - Hit *Start* button under *Service status* and hit *OK*. If the service status is **running**, you should click *Stop* first and then hit *Start*. - - Press *Win + R*, type ***msiexec /unregister***, and hit *Enter*. - - Press *Win + R* again, type ***msiexec /regserver***, and hit *Enter* - -- Acquire full permissions on the drive for installation. It is possible that the error 1603 occurs because you don’t have full permissions on the file location. It's also not as easy as some of the other solutions: - - - Open *File Explorer*, right-click the drive containing the installation location and select *Properties*. - - Go to *Security* tab and click *Edit*. - - Single-click *SYSTEM* and ensure that the *Allow* box of every item in *Permissions for SYSTEM* is checked (if it is checkable). Do the same check for *Administrators*. - - Click *OK* to go back to *Properties* dialog. Then click *Advanced*. - - Click *Change Permissions*. - - On *Permissions* tab, double-click *Administrators*. - - Select *This folder, subfolders and files* for *Applies to* field and check all the available *Basic permissions*. After that, hit *OK*. - - Do the same operation above (from item 7) for *SYSTEM*. - - Click *OK* all the way out. Try installing AdGuard again. +- Démarrez et réenregistrez le service Microsoft Installer. Ceci nécessite du travail. + + - Appuyez sur *Win + R* et saisissez ***services.msc***. + - Trouvez dans la liste et double-cliquez sur *Windows Installer*. + - Appuyez sur le bouton *Démarrer* sous *État du service* et appuyez sur *OK*. Si l'état du service est **en cours d'exécution**, vous devez d'abord cliquer sur *Arrêter* puis appuyer sur *Démarrer*. + - Appuyez sur *Win + R*, tapez ***msiexec /unregister*** et appuyez sur *Entrée*. + - Appuyez à nouveau sur *Win + R*, tapez ***msiexec /regserver***, et appuyez sur *Entrée* + +- Obtenez les autorisations complètes sur le lecteur pour l’installation. Il est possible que l'erreur 1603 se produise parce que vous n'avez pas toutes les autorisations sur l'emplacement du fichier. Ce n’est pas non plus aussi simple que certaines des autres solutions : + + - Ouvrez *File Explorer*, faites un clic droit sur le lecteur contenant l'emplacement d'installation et sélectionnez *Propriétés*. + - Allez à l'onglet *Sécurité* et cliquez sur *Modifier*. + - Faites un clic simple sur *SYSTEM* et assurez-vous que la case *Autoriser* de chaque élément des *Autorisations pour SYSTEM* est cochée (si elle est cochable). Faites la même vérification pour les *Administrateurs*. + - Cliquez sur *OK* pour revenir à la boîte de dialogue des *Propriétés*. Ensuite, cliquez sur *Avancés*. + - Cliquez sur *Modifier les autorisations*. + - Sur l'onglet *Autorisations*, double-cliquez sur *Administrateurs*. + - Sélectionnez *Ce dossier, sous-dossiers et fichiers* pour le champ *S'applique à* et cochez toutes les *autorisations de base* disponibles. Après cela, cliquez sur *OK*. + - Faites la même opération ci-dessus (depuis le point 7) pour *SYSTEM*. + - Cliquez sur *OK* jusqu'au bout. Essayez à nouveau d’installer AdGuard. ### Erreur 1618 : Une autre installation est déjà en cours {#error-1618} diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md index 85da6ce03ac..f57dcbdbc10 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md @@ -73,7 +73,7 @@ Sinon, AdGuard effectuera le filtrage de tout le trafic en temps réel, sans red ### Afficher la fenêtre principale au démarrage du système -Activez cette option pour ouvrir la fenêtre principale d'AdGuard après le chargement du système. This setting, which doesn't affect whether the actual filtering service is launched or not, is located in *Settings → General Settings*. +Activez cette option pour ouvrir la fenêtre principale d'AdGuard après le chargement du système. Ce paramètre, qui n'affecte pas le lancement ou non du service de filtrage réel, se trouve dans *Paramètres → Paramètres généraux*. ### Activer le filtrage au démarrage du système diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/general/account/2fa.md b/i18n/fr/docusaurus-plugin-content-docs/current/general/account/2fa.md index e057b7c627e..103d8099449 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/general/account/2fa.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/general/account/2fa.md @@ -11,7 +11,7 @@ Nous vous recommandons de mettre en place une authentification à deux facteurs ## Comment la mettre en place -1. Log into your [AdGuard account](https://auth.adguardaccount.com/login.html) and go to the *Settings* tab: +1. Connectez-vous à votre [ compte AdGuard](https://auth.adguardaccount.com/login.html) et accédez à l'onglet *Paramètres* : ![Paramètres du compte AdGuard *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_1.png) diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/general/account/features.md b/i18n/fr/docusaurus-plugin-content-docs/current/general/account/features.md index 2c45c3249ce..5e4f23ef49f 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/general/account/features.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/general/account/features.md @@ -24,9 +24,9 @@ Dans la section *Licences* , vous pouvez gérer vos licences et les appareils qu - liées et non liées, - prolongées -- upgraded. +- surclassées. -Les appareils liés à vos licences du Bloqueur AdGuard peuvent être déliés ou renommés. To unbind unused devices, click the number of bound devices next to *Devices*, then select `>` → *Remove*. +Les appareils liés à vos licences du Bloqueur AdGuard peuvent être déliés ou renommés. Pour dissocier les appareils inutilisés, cliquez sur le nombre d'appareils liés à côté de *Appareils*, puis sélectionnez `>` → *Supprimer*. ## Afficher les achats diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/general/account/register.md b/i18n/fr/docusaurus-plugin-content-docs/current/general/account/register.md index 22e4d306c21..46e52ee60b7 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/general/account/register.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/general/account/register.md @@ -5,7 +5,7 @@ sidebar_position: 1 ## Qu'est-ce qu'un compte AdGuard -[AdGuard account](https://adguardaccount.com/) is a user account that stores information about your AdGuard licenses and subscriptions, active devices, your purchase history, preferred language, and other preferences. De nombreux produits AdGuard offrent la possibilité de les activer en saisissant les informations d'identification de votre compte AdGuard, à condition qu'il contienne une licence valide. +[Le compte AdGuard](https://adguardaccount.com/) est un compte utilisateur qui stocke des informations sur vos licences et abonnements AdGuard, vos appareils actifs, votre historique d'achats, votre langue préférée et d'autres préférences. De nombreux produits AdGuard offrent la possibilité de les activer en saisissant les informations d'identification de votre compte AdGuard, à condition qu'il contienne une licence valide. ## Comment créer un compte @@ -29,4 +29,4 @@ Après avoir enregistré votre compte, vous pouvez utiliser l'option *Code à us ## Comment créer un compte via un réseau social -To create an account via a social network, simply follow the [link](https://auth.adguardaccount.com/login.html) and log in to your account. Une fois inscrit, vérifiez votre boîte de réception : vous recevrez un e-mail de confirmation. Définissez un mot de passe et c'est tout ! Vous pouvez désormais utiliser toutes les [fonctionnalités du compte AdGuard](https://adguard.com/kb/general/account/features/). +Pour créer un compte via un réseau social, suivez simplement [le lien](https://auth.adguardaccount.com/login.html) et connectez-vous à votre compte. Une fois inscrit, vérifiez votre boîte de réception : vous recevrez un e-mail de confirmation. Définissez un mot de passe et c'est tout ! Vous pouvez désormais utiliser toutes les [fonctionnalités du compte AdGuard](https://adguard.com/kb/general/account/features/). diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/fr/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index cb63b704774..e4bb544a08c 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard pour iOS][ios-app] | [AdGuard pour Safari][ext-saf] | [Bloqueur de contenu AdGuard][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:---------------------------:|:------------------------------:|:-------------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard pour iOS][ios-app] | [AdGuard pour Safari][ext-saf] | [Bloqueur de contenu AdGuard][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:---------------------------:|:------------------------------:|:-------------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + est convertie en + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "Extension AdGuard pour Chrome MV3" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/general/browsing-security.md b/i18n/fr/docusaurus-plugin-content-docs/current/general/browsing-security.md index eee06568dc9..0458dac138a 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/general/browsing-security.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/general/browsing-security.md @@ -19,58 +19,58 @@ Chaque fois que vous visitez un site web, votre client local échange des inform AdGuard offre la meilleure protection possible en inspectant à la fois les pages et tous les objets qui y sont chargés. AdGuard vérifie les URL et les noms de domaine à l'aide de préfixes de hachage, et non des URL complètes, de sorte que nos serveurs ne conservent aucune information sur les sites Web que vous visitez et que vos informations personnelles sont totalement sécurisées. Nos serveurs répondent à la requête de l'application avec une liste de toutes les adresses possibles correspondant au préfixe de hachage. Lorsqu'une menace potentielle est détectée grâce à des correspondances de hachage, l'accès à ce site web est immédiatement bloqué. -![AdGuard warning](https://cdn.adtidy.org/content/kb/ad_blocker/general/dangerous_website_blocked.png) +![Avertissement d'AdGuard](https://cdn.adtidy.org/content/kb/ad_blocker/general/dangerous_website_blocked.png) -### In browser extensions {#extension} +### Dans les extensions de navigateur {#extension} Nos extensions de navigateur ne peuvent vérifier que les noms de domaine, pas les URL complètes. Ils ne sont pas non plus en mesure de vérifier les sous-requêtes. Cela signifie que s'il y a des éléments potentiellement malveillants sur la page, ils seront chargés même si la page elle-même provient d'un domaine sûr. L’extension ne pourra pas s’en protéger. Il est également important de noter que la vérification effectuée est asynchrone, c'est-à-dire qu'elle se produit en même temps que le chargement de la page, il est donc possible que des logiciels malveillants soient également chargés. ## Paramétrage de la protection contre l'hameçonnage et les maliciels dans les produits AdGuard -- **For Windows**: Activate the *Browsing Security* module in the *Settings* menu +- **Pour Windows**: Activez le module *Navigation sécurisée* dans le menu *Paramètres* - ![Browsing Security in Windows](https://cdn.adtidy.org/content/kb/ad_blocker/general/windows.png) + ![Navigation sécurisée dans Windows](https://cdn.adtidy.org/content/kb/ad_blocker/general/windows.png) -- **For Mac**: Enable the *Security* module in *Preferences* +- **Pour Mac**: Activez le module *Sécurité* dans *Préférences* - ![Security in Mac](https://cdn.adtidy.org/content/kb/ad_blocker/general/bs_mac.png) + ![Sécurité sur Mac](https://cdn.adtidy.org/content/kb/ad_blocker/general/bs_mac.png) -- **For Android**: Turn on *Browsing Security* in the *Protection* tab +- **Pour Android**: Activez *Navigation sécurisée* dans l'onglet *Protection* - ![Browsing security in Android *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/general/bs_android.png) + ![Navigation sécurisée sous Android *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/general/bs_android.png) -- **For iOS**: Although there’s no separate module, you can go to *Safari protection* → *Filters* → *Security* and enable the available filters. Additionally, enable *DNS protection* and select one of the AdGuard DNS servers +- **Pour iOS**: Bien qu'il n'y ait pas de module séparé, vous pouvez aller dans *Protection Safari* → *Filtres* → *Sécurité* et activer les filtres disponibles. En outre, activez la *Protection DNS* et sélectionnez l'un des serveurs DNS AdGuard - ![Security in iOS *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/general/bs_ios.jpg) + ![Sécurité sous iOS *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/general/bs_ios.jpg) -- **For Browser extensions**: Enable *Phishing and malware protection* in the *Settings* tab. For enhanced protection, go to *Filters* → *Security* and activate filters +- **Pour les extensions de navigateur** : Activez la *Protection contre l'hameçonnage et les maliciels* dans l'onglet *Paramètres*. Pour une protection renforcée, accédez à *Filtres* → *Sécurité* et activez les filtres ![Protection contre les maliciels et l'hameçonnage](https://cdn.adtidy.org/content/kb/ad_blocker/general/extension_protection.png) -- **For Private AdGuard DNS:** Enable malware protection in *Server settings* under *Security* +- **Pour le DNS AdGuard privé :** Activez la protection contre les logiciels malveillants dans *Paramètres du serveur* sous *Sécurité* - ![Security in DNS](https://cdn.adtidy.org/content/kb/ad_blocker/general/bs_dns.png) + ![Sécurité dans DNS](https://cdn.adtidy.org/content/kb/ad_blocker/general/bs_dns.png) ## Ce que nous bloquons -We maintain two primary filters: one that protects against phishing and fraudulent websites that attempt to steal user credentials, and another that blocks access to websites known to distribute malware, which could lead to data loss, information leaks, or damage to your device. These filters also protect you from websites with various scams and fraudulent schemes. For more detailed information, refer to this [Wikipedia article](https://en.wikipedia.org/wiki/Phishing). +Nous maintenons deux filtres principaux : un qui protège contre l'hameçonnage et les sites web frauduleux qui tentent de voler les informations d'identification des utilisateurs, et un autre qui bloque l'accès aux sites web connus pour distribuer des maliciels, ce qui pourrait entraîner une perte de données, des fuites d'informations ou des dommages à votre appareil. Ces filtres vous protègent également des sites web des escrocs proposant des stratagèmes frauduleux. Pour des informations plus détaillées, consultez l'[article de Wikipédia](https://en.wikipedia.org/wiki/Phishing). ## Entretien de nos filtres -AdGuard maintains an extensive database of phishing and malware websites, and it’s updated regularly and automatically as new threats are discovered. We collect information from a variety of reliable, high-quality sources, both public and from other companies, and aggregate it into a common database of dangerous sites. +AdGuard gère une vaste base de données de sites web d'hameçonnage et de logiciels malveillants, et elle est mise à jour régulièrement et automatiquement à mesure que de nouvelles menaces sont découvertes. Nous recueillons des informations à partir des sources fiables et de qualité, à la fois publiques et provenant d'autres entreprises, et les regroupons dans une base de données commune sur les sites dangereux. -We automatically analyze complaints about suspicious sites and spend a great deal of time keeping the database up-to-date, cleaning up false positives, and implementing mechanisms to prevent them in the future. +Nous analysons automatiquement les plaintes concernant les sites web suspects et passons beaucoup de temps à maintenir la base de données à jour, à nettoyer les faux positifs et à mettre en place des mécanismes pour les éviter à l'avenir. ### Vous souhaitez nous aider ? -Any help is welcome! If you encounter a phishing or malware website, please report it to . +Nous apprécions toute votre aide ! Si vous rencontrez un site d'hameçonnage ou de maliciels, veuillez le signaler à . ### Réponses faussement positives -Occasionally, some non-malicious websites are added to AdGuard’s filters. We do our best to reduce the percentage of false positives, but they still occur. If you encounter this behavior from AdGuard, please report the false positive to our technical support at . +Il arrive que des sites web non malveillants soient ajoutés aux filtres d'AdGuard. Nous faisons de notre mieux pour réduire le pourcentage de faux positifs, mais il y en a toujours. Si vous rencontrez ce comportement de la part d'AdGuard, veuillez signaler le faux positif à notre assistance technique à . ## Si vous avez des doutes sur un site web -If you suspect that a certain website might be dangerous, check it first by using our [security check tool](https://reports.adguard.com/welcome.html). +Si vous pensez qu'un site web donné peut être dangereux, vérifiez-le d'abord à l'aide de notre [outil de vérification de la sécurité](https://reports.adguard.com/welcome.html). -![Security check](https://cdn.adtidy.org/content/kb/ad_blocker/general/site_warning.png) +![Contrôle de sécurité](https://cdn.adtidy.org/content/kb/ad_blocker/general/site_warning.png) diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/general/extensions.md b/i18n/fr/docusaurus-plugin-content-docs/current/general/extensions.md index 5bf0b576a52..c1201854949 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/general/extensions.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/general/extensions.md @@ -148,7 +148,7 @@ Toutes les anciennes fonctions Greasemonkey répertoriées sont obsolètes mais - [`GM_log`](https://www.tampermonkey.net/documentation.php#api:GM_log) - [`GM.addElement`, `GM_addElement`](https://www.tampermonkey.net/documentation.php#api:GM_addElement) -You can find more information about Greasemonkey API in [its manual](https://wiki.greasespot.net/Greasemonkey_Manual:API). +Vous pouvez trouver plus d'informations sur l'API Greasemonkey dans [son manuel](https://wiki.greasespot.net/Greasemonkey_Manual:API). #### Exemple @@ -190,34 +190,34 @@ You can find more information about Greasemonkey API in [its manual](https://wik )}(); ``` -#### Trusted Types API +#### API Trusted Types -AdGuard provides an instance of the `PolicyApi` class that allows you to manage Trusted Types in your userscripts. +AdGuard fournit une instance de la classe `PolicyApi` qui vous permet de gérer les Trusted Types dans vos scripts utilisateur. -You can access the instance of this class by using the `ADG_policyApi` variable in your userscript. +Vous pouvez accéder à l'instance de cette classe en utilisant la variable `ADG_policyApi` dans votre script utilisateur. -##### Properties +##### Propriétés -- `name: string` — a name of the policy (Default is `"AGPolicy"`). -- `isSupported: boolean` — a flag indicating whether or not the Trusted Types API is supported by the current browser. +- `name: string` — un nom de politique (Par défaut, c'est `"AGPolicy"`). +- `isSupported: boolean` — un indicateur indiquant si oui ou non l'API Trusted Types est prise en charge par le navigateur actuel. -##### Polyfilled methods +##### Méthodes polyfillées -- [`ADG_policyApi.createHTML`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicy/createHTML). If not supported, returns `input: string`. -- [`ADG_policyApi.createScript`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicy/createScript). If not supported, returns `input: string`. -- [`ADG_policyApi.createScriptURL`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicy/createScriptURL). If not supported, returns `input: string`. -- [`ADG_policyApi.getAttributeType`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/getAttributeType). If not supported, returns `null`. -- [`ADG_policyApi.getPropertyType`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/getPropertyType). If not supported, returns `null`. -- [`ADG_policyApi.isHTML`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/isHTML). If not supported, returns `false`. -- [`ADG_policyApi.isScript`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/isScript). If not supported, returns `false`. -- [`ADG_policyApi.isScriptURL`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/isScriptURL). If not supported, returns `false`. +- [`ADG_policyApi.createHTML`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicy/createHTML). Si non pris en charge, renvoie `input: string`. +- [`ADG_policyApi.createScript`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicy/createScript). Si non pris en charge, renvoie `input: string`. +- [`ADG_policyApi.createScriptURL`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicy/createScriptURL). Si non pris en charge, renvoie `input: string`. +- [`ADG_policyApi.getAttributeType`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/getAttributeType). Si non pris en charge, renvoie `null`. +- [`ADG_policyApi.getPropertyType`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/getPropertyType). Si non pris en charge, renvoie `null`. +- [`ADG_policyApi.isHTML`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/isHTML). Si non pris en charge, renvoie `false`. +- [`ADG_policyApi.isScript`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/isScript). Si non pris en charge, renvoie `false`. +- [`ADG_policyApi.isScriptURL`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/isScriptURL). Si non pris en charge, renvoie `false`. -##### Additional Types +##### Types supplémentaires ```typescript /** - * Enum representation of the return values of the `getAttributeType` and - * `getPropertyType` methods of the native Trusted Types API. + * Représentation Enum des valeurs de retour des méthodes `getAttributeType` et + * `getPropertyType` de l'API native Trusted Types. * * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/getAttributeType} * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/getPropertyType} @@ -228,12 +228,12 @@ enum TrustedType { ScriptURL = 'TrustedScriptURL', } -// You can access it like that inside of userscript +// Vous pouvez y accéder comme ça dans un script utilisateur ADG_TrustedType.HTML // "TrustedHTML" /** - * Isomorphic trusted value type. If a browser supports the Trusted Types API, it will be one of the enum Trusted Types - * (`TrustedHTML`, `TrustedScript` or `TrustedScriptURL`); otherwise, it will be regular `string`. + * Type de valeur de confiance isomorphe. Si un navigateur prend en charge l'API Trusted Types, il sera l'un des Trusted Types enum + * (`TrustedHTML`, `TrustedScript` ou `TrustedScriptURL`); sinon, ce sera une chaîne `string` normale. * * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/TrustedHTML} * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/TrustedScript} @@ -242,20 +242,20 @@ ADG_TrustedType.HTML // "TrustedHTML" type TrustedValue = string | TrustedHTML | TrustedScript | TrustedScriptURL; ``` -##### Additional methods +##### Méthodes supplémentaires ```typescript /** - * Creates a Trusted Type depending on `type`: + * Crée un Trusted Type en fonction du `type` : * - `TrustedHTML` * - `TrustedScript` * - `TrustedScriptURL` - * - or returns `value` if none of them is applicable. + * - ou retourne `value` si aucun d'eux n'est applicable. * * @param type Trusted Type. - * @param value Value from which a Trusted Type is created. - * @param createArgs Additional arguments to be passed to the function represented by `TrustedTypePolicy`. - * @returns Created value. + * @param value Valeur à partir de laquelle un type de confiance est créé. + * @param createArgs Arguments supplémentaires à passer à la fonction représentée par `TrustedTypePolicy`. + * @returns Valeur créée. */ function create( type: TrustedType, @@ -264,23 +264,23 @@ function create( ): TrustedValue -// Example: Creates TrustedHTML +// Exemple : Crée TrustedHTML const trustedHTML = ADG_policyApi.create(ADG_TrustedType.HTML, '
'); /** - * Converts `value` of `attribute` into one of the Trusted Types: + * Convertit `value` de `attribute` en un des Trusted Type : * - `TrustedHTML` * - `TrustedScript` * - `TrustedScriptURL` - * - or returns `value` if none of them is applicable. + * - ou retourne `value` si aucun d'eux n'est applicable. * - * @param tagName Name of an HTML tag. - * @param attribute Attribute. - * @param value Value of an attribute to be converted. - * @param elementNS Element namespace. If empty, defaults to the HTML namespace. - * @param attrNS Attribute namespace. If empty, defaults to null. - * @param createArgs Additional arguments to be passed to the function represented by `TrustedTypePolicy`. - * @returns Converted value. + * @param tagName Nom d'une balise HTML. + * @param attribute Attribut. + * @param value Valeur d'un attribut à convertir. + * @param elementNS Espace de noms de l'élément. S'il est vide, il retourne à l'espace de noms HTML par défaut. + * @param attrNS Espace de noms de l'attribut. S'il est vide, il retourne à null. + * @param createArgs Arguments supplémentaires à passer à la fonction représentée par `TrustedTypePolicy`. + * @returns Valeur convertie. */ function convertAttributeToTrusted( tagName: string, @@ -291,23 +291,23 @@ function convertAttributeToTrusted( ...createArgs: unknown[] ): TrustedValue -// Example: Converts to TrustedScriptURL +// Exemple : Convertit en TrustedScriptURL const trustedScriptURL = ADG_policyApi.convertAttributeToTrusted("script", "src", 'SOME_URL'); scriptElement.setAttribute("src", trustedScriptURL); /** - * Converts `value` of `property` into one of the Trusted Types: + * Convertit `value` de `property` en un des Trusted Type : * - `TrustedHTML` * - `TrustedScript` * - `TrustedScriptURL` - * - or returns `value` if none of them is applicable. + * - ou retourne `value` si aucun d'eux n'est applicable. * - * @param tagName Name of an HTML tag. - * @param property Property. - * @param value Value of a property to be converted. - * @param elementNS Element namespace. If empty, defaults to the HTML namespace. - * @param createArgs Additional arguments to be passed to the function represented by `TrustedTypePolicy`. - * @returns Converted value. + * @param tagName Nom d'une balise HTML. + * @param property Propriété. + * @param value Valeur d'une propriété à convertir. + * @param elementNS Espace de noms de l'élément. S'il est vide, il retourne à l'espace de noms HTML par défaut. + * @param createArgs Arguments supplémentaires à passer à la fonction représentée par `TrustedTypePolicy`. + * @returns Valeur convertie. */ function convertPropertyToTrusted( tagName: string, @@ -317,7 +317,7 @@ function convertPropertyToTrusted( ...createArgs: unknown[] ): TrustedValue -// Example: Converts to TrustedHTML +// Exemple : Convertit en TrustedHTML divElement.innerHTML = ADG_policyApi.convertPropertyToTrusted("div", "innerHTML", "
"); ``` diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/general/https-filtering/what-is-https-filtering.md b/i18n/fr/docusaurus-plugin-content-docs/current/general/https-filtering/what-is-https-filtering.md index 854eff6304f..dfa22b70878 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/general/https-filtering/what-is-https-filtering.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/general/https-filtering/what-is-https-filtering.md @@ -27,11 +27,11 @@ Si c'était facile, HTTPS ne serait pas aussi sécurisé. Lorsqu'un navigateur t Pour une meilleure compréhension, nous avons représenté ce processus : -![How HTTPS filtering works](https://cdn.adtidy.org/public/Adguard/Blog/https/what_is_https_filtering.png) +![Comment fonctionne le filtrage HTTPS](https://cdn.adtidy.org/public/Adguard/Blog/https/what_is_https_filtering.png) ### Mon trafic reste-t-il crypté et sécurisé ? -Bien sûr ! Votre connexion avec un serveur distant reste cryptée et sécurisée. AdGuard, just like a browser, checks the server’s certificate before determining if the connection should be filtered or not. +Bien sûr ! Votre connexion avec un serveur distant reste cryptée et sécurisée. AdGuard, tout comme votre navigateur, vérifie le certificat du serveur avant de décider de le filtrer ou pas. Pourtant, le filtrage HTTPS présente ses inconvénients. Le plus important est qu'il cache au navigateur le certificat réel du site web. À la place, le navigateur voit le certificat émis par AdGuard. @@ -51,7 +51,7 @@ Un certificat EV offre un niveau de sécurité plus élevé et fournit davantage ### Problèmes liés au filtrage HTTPS -A [2017 study](https://cdn.adtidy.org/public/Adguard/Blog/https/interception-ndss17.pdf) found that 5 to 10% of HTTPS connections were established by HTTPS filtering applications. Cela est généralement effectué par des types différents de logiciels antivirus. La mauvaise nouvelle est que 24 des 26 antivirus testés ont réduit, de diverses manières, le niveau de sécurité des connexions, tandis que les deux tiers ont créé des connexions sujettes au piratage. +Une [étude datée de 2017](https://cdn.adtidy.org/public/Adguard/Blog/https/interception-ndss17.pdf) montre que 5 à 10 % des connexions HTTPS sont établies par des applications de filtrage HTTPS. Cela est généralement effectué par des types différents de logiciels antivirus. La mauvaise nouvelle est que 24 des 26 antivirus testés ont réduit, de diverses manières, le niveau de sécurité des connexions, tandis que les deux tiers ont créé des connexions sujettes au piratage. Les chercheurs sont arrivés à une conclusion simple : la communauté de sécurité Internet devrait prêter une attention particulière aux applications qui filtrent les connexions sécurisées. Les développeurs de ces logiciels doivent accorder une attention particulière à la qualité de la mise en œuvre du filtrage. @@ -71,7 +71,7 @@ Enfin, si votre appareil est rooté, vous pouvez déplacer le certificat AdGuard ### Comment vérifier manuellement la qualité HTTPS ? -Il existe plusieurs sites web dédiés où vous pouvez vérifier la qualité de votre connexion HTTPS. Ces sites web vérifient si votre navigateur (ou, dans notre cas, votre navigateur plus AdGuard) est susceptible d'être affecté par des vulnérabilités courantes. If you plan to use any program that filters HTTPS, not necessarily AdGuard (e.g., an antivirus), we advise that you check the connection quality using these websites. +Il existe plusieurs sites web dédiés où vous pouvez vérifier la qualité de votre connexion HTTPS. Ces sites web vérifient si votre navigateur (ou, dans notre cas, votre navigateur plus AdGuard) est susceptible d'être affecté par des vulnérabilités courantes. Si vous envisagez d'utiliser un programme qui filtre le HTTPS, pas nécessairement AdGuard (par exemple, un antivirus), nous vous conseillons de vérifier la qualité de la connexion sur ces sites web. - [https://www.ssllabs.com/ssltest/viewMyClient.html](https://www.ssllabs.com/ssltest/viewMyClient.html) - [https://www.howsmyssl.com/](https://www.howsmyssl.com/) diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/general/license/cancel-refund.md b/i18n/fr/docusaurus-plugin-content-docs/current/general/license/cancel-refund.md index 3c334d3a076..06f33194645 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/general/license/cancel-refund.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/general/license/cancel-refund.md @@ -7,7 +7,7 @@ sidebar_position: 5 L'abonnement peut être annulé dans votre compte AdGuard. Pour annuler votre abonnement : - 1. Go to your [AdGuard account](https://adguardaccount.com/). + 1. Accédez à votre [compte AdGuard](https://adguardaccount.com/). 1. Sélectionnez *Licences*. 1. Cliquez sur *Annuler l'abonnement* sous l'abonnement dont vous n'avez plus besoin. ![Annuler](https://cdn.adtidy.org/content/kb/ad_blocker/general/newaccount-cancel-sub.png) diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/fr/docusaurus-plugin-content-docs/current/general/license/legacy.md index 601ff914f0f..f0938855abb 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -27,57 +27,55 @@ Pour tous les types de licences (Standard, Mobile, Premium), il y avait des opti En octobre 2019, AdGuard est passé au nouveau système de licences : à partir de ce moment, les licences peuvent toujours être achetées pour 1 an ou À vie, mais leurs types sont devenus **Personnel** (jusqu'à 3 appareils) ou **Famille** (jusqu'à 9 dispositifs). -Un autre changement : les **clefs de licence du nouveau type peuvent désormais être utilisées sur n'importe quel appareil, dans n'importe quelle combinaison. Par exemple, une licence Personnelle peut être utilisée sur Android, Mac et iOS, comme sur deux ordinateurs Windows et une tablette Apple, etc.** +Un autre changement : les **clefs de licence du nouveau type peuvent désormais être utilisées sur n'importe quel appareil, dans n'importe quelle combinaison**. Par exemple, une licence Personnelle peut être utilisée sur Android, Mac et iOS, comme sur deux ordinateurs Windows et une tablette Apple, etc. ## Qu'arrive-t-il aux licences obsolètes ? -Les normes ont été automatiquement rendues universelles, ce qui signifie qu'elles peuvent être activées sur n'importe quel appareil. +Les **licences Standard** ont été automatiquement rendues **universelles**, ce qui signifie qu'elles peuvent être activées sur n'importe quel appareil. -Les licences mobiles sont restées inchangées et limitées à une plate-forme (elles ne peuvent toujours être utilisées que sur des téléphones ou des tablettes). +Les **licences Mobiles** sont restées inchangées et limitées à une plate-forme (elles ne peuvent toujours être utilisées que sur des téléphones ou des tablettes). -Les licences Premium sont également restées sans changements et limitées à la plate-forme. Et bien que les licences **Premium soient désormais affichées dans votre compte personnel en fonction du nombre total d'appareils**, elles peuvent toujours être activées sur un ensemble d'appareils bureau + mobile. +Les **licences Premium** sont également restées sans changements et limitées à la plate-forme. Et bien que les licences **Premium soient désormais affichées dans votre compte personnel en fonction du nombre total d'appareils**, elles peuvent toujours être activées sur un ensemble d'appareils bureau + mobile. Par exemple, voici à quoi ressemble la clef 1+1 : -![Clef 1+1](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![Clef 1+1](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *Mais malgré le nombre total d'appareils (2), il peut être activé sur 1 ordinateur de bureau et 1 appareil mobile.* > Toutes les licences obsolètes ont un badge "legacy" dans le compte AdGuard. Et ils sont automatiquement convertis en un nouveau type lorsque vous les renouvelez ou les surclassez. Mais il y a quelques nuances. Voyons quelles licences peuvent être converties en un nouveau type et comment procéder. -## J'ai une clé obsolète (ancienne). Quelles options de renouvellement/surclassements sont disponibles pour moi ? +## Comment renouveler ou mettre à niveau une ancienne clef -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +Vous pouvez prolonger/renouveler ou surclasser une licence obsolète dans votre [compte AdGuard](https://adguardaccount.com) ou sur la page [Prolonger ou surclasser](https://adguard.com/renew.html). -![Surclasser](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Allez dans l'onglet "Mes licences" et vérifiez quelles actions vous sont disponibles pour chaque clef spécifique. Nous l'expliquons ci-dessous à l'aide d'exemples concrets. +Pour prolonger/renouveler ou surclasser une ancienne licence dans votre compte AdGuard, accédez à l'onglet *Licences* , recherchez la licence dont vous avez besoin et sélectionnez l'une des options disponibles. -### Licences pour 1/2/3 appareils +![Renouveler ou surclasser une licence dans votre compte AdGuard](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Les licences annuelles** pour 1, 2 ou 3 appareils peuvent être converties en licences Personnelles ou Familiales : +Soit allez sur la page [Prolonger ou surclasser](https://adguard.com/renew.html), saisissez votre licence et cliquez sur *Appliquer*. Sur la nouvelle page, sélectionnez l'une des options disponibles. -![Surclasser ou renouveler](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Choisissez en fonction du nombre d'appareils à protéger. +### Licences pour 1/2/3 appareils -Au lieu d'un simple renouvellement, vous pouvez opter pour le plan À vie : +Les licences annuelles mobiles pour 3 appareils peuvent être converties en licences Personnelles ou mises à niveau vers des licences Familiales : -![À vie](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Mettre à niveau les licences annuelles pour 1, 2, 3 appareils](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Les licences À vie** ne peuvent être converties qu'en plan Famille (9 appareils) à cause de limitations techniques : +> Si vous avez une **licence Standard pour 3 appareils**, elle fonctionne déjà comme une **licence Personnelle**. Si vous renouvelez votre **licence Mobile** pour 3 appareils, vous pourrez l’utiliser sur un **ensemble différent d’appareils**, et pas seulement des téléphones. -![Mise à niveau À vie](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +Vous pouvez également passer à une licence À vie : -### Licences pour 4+ appareils (jusqu'à 9) +![Surclasser vers À vie](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -Les clefs **Annuelles** de cette configuration ne peuvent être converties qu'en licence Familiale : +Les clefs **À vie** ne peuvent être surclassées qu'en licences Familiales (9 dispositifs) à cause de limitations techniques. -![Licence annuelle pour 4 appareils](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licences pour 4+ appareils (jusqu'à 9) -Les licences **À vie** pour 4 appareils ou plus ne peuvent être converties à cause de limitations techniques : +Les licences **annuelles** pour 4 appareils ou plus peuvent être converties en licences Famille et À vie. -![Licence À vie pour 4 appareils](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +Cependant, si vous avez déjà une licence **À vie**, elle ne peut pas être surclassée à cause de limitations techniques. ### Licences pour 9+ appareils -Les clefs Premium (5+5 et plus) et clefs personnalisées pour plus de 10 appareils que vous avez achetés individuellement avec l'aide de nos gestionnaires. +Les clefs Premium (5+5 et plus) et les clefs personnalisées pour plus de 10 appareils que vous avez achetés individuellement avec l'aide de nos gestionnaires. Ce sont des cas assez uniques, donc si vous souhaitez surclasser votre licence pour une À vie, veuillez nous contacter à partners@adguard.com. Nous vous ferons une offre spéciale en fonction de la configuration spécifique de votre licence. diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/general/license/transfer.md b/i18n/fr/docusaurus-plugin-content-docs/current/general/license/transfer.md index 1a377d152e7..89bf6f20e26 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/general/license/transfer.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/general/license/transfer.md @@ -12,7 +12,7 @@ La clef de licence peut être activée sur un [nombre limité d'appareils](../wh - Cliquez sur *Réinitialiser la licence* ou *Déconnexion* dans une application AdGuard - Supprimez l'appareil de votre compte AdGuard : - 1. Click *AdGuard Ad Blocker* in your [AdGuard account](https://adguardaccount.com/). + 1. Cliquez sur le *Bloqueur AdGuard* dans votre [compte AdGuard](https://adguardaccount.com/). ![Onglet du compte du Bloqueur *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/general/newaccount-unbind-device-0.png) diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/fr/docusaurus-plugin-content-docs/current/general/license/what-is.md index 9ff8e120224..635d66a238c 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -1,9 +1,9 @@ --- -title: What is an AdGuard license? +title: Qu'est-ce qu'une licence AdGuard ? sidebar_position: 1 --- -Une licence est une autorisation d'utiliser le produit AdGuard, fournie conformément au [Contrat de licence utilisateur final](https://adguard.com/eula.html). If bound to an email address, AdGuard licenses can be found in the user's [AdGuard account](https://adguardaccount.com/). +Une licence est une autorisation d'utiliser le produit AdGuard, fournie conformément au [Contrat de licence utilisateur final](https://adguard.com/eula.html). Si elles sont liées à une adresse e-mail, les licences AdGuard peuvent être trouvées dans le [compte AdGuard](https://adguardaccount.com/) de l'utilisateur. ## Quels types de licences AdGuard existent-ils @@ -12,7 +12,7 @@ Sur la [page d'achat](https://adguard.com/license.html), vous pouvez voir les ty - **Les abonnements d'un an** — ces licences sont renouvelées automatiquement chaque année ou peuvent être prolongées manuellement - Personnelles — jusqu’à 3 appareils - Familiales — jusqu'à 9 appareils -- **Lifetime** — these licenses are perpetual +- **À vie** — ces licences ne sont pas limitées dans le temps - Personnelles — jusqu’à 3 appareils - Familiales — jusqu'à 9 appareils @@ -25,7 +25,7 @@ Il existe également des licences que l'utilisateur peut acheter auprès d'autre - **Les licences de distributeur** et **les licences offertes** peuvent être à la fois limitées dans le temps et non limitées dans le temps. Les licences avec une date d'expiration ne peuvent être renouvelées que manuellement - Personnelles — jusqu’à 3 appareils - Familiales — jusqu'à 9 appareils -- **La licence AdGuard Pro pour iOS** est achetée et gérée via l'App Store et ne peut être utilisée que sur les appareils iOS et iPadOS avec le même identifiant Apple +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip @@ -35,7 +35,7 @@ Pour étendre la limite d'appareils, vous pouvez [surclasser](../payment-options ## Comment utiliser la licence AdGuard -Pour utiliser votre licence sur un appareil, connectez-vous à votre application AdGuard en utilisant l'adresse e-mail associée à la licence. If the license hasn't been bound to your email address yet, you can do it in your [AdGuard account](https://adguardaccount.com/). Pour faire ça, ouvrez l'onglet *Licences* et cliquez sur *Lier la licence*. +Pour utiliser votre licence sur un appareil, connectez-vous à votre application AdGuard en utilisant l'adresse e-mail associée à la licence. Si la licence n'a pas encore été liée à votre adresse e-mail, vous pouvez le faire dans votre [compte AdGuard](https://adguardaccount.com/). Pour faire ça, ouvrez l'onglet *Licences* et cliquez sur *Lier la licence*. Vous pouvez également saisir votre [clef de licence ](#license-key) dans votre application AdGuard. diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/general/stealth-mode.md b/i18n/fr/docusaurus-plugin-content-docs/current/general/stealth-mode.md index 9c350c16d68..a4884df989f 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/general/stealth-mode.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/general/stealth-mode.md @@ -3,7 +3,7 @@ title: Mode furtif (Protection contre le suivi) sidebar_position: 4 --- -De nombreux sites web recueillent des informations sur leurs visiteurs, telles que leur adresse IP, le navigateur et le système d'exploitation installés, la résolution de l'écran et même la page à partir de laquelle le visiteur a été redirigé. Certaines pages web utilisent des cookies pour marquer votre navigateur et enregistrer vos paramètres personnels et vos préférences, ou pour vous "reconnaître" lors de votre prochaine visite. *Tracking protection* safeguards your personal information from such data- and statistics-gathering systems. +De nombreux sites web recueillent des informations sur leurs visiteurs, telles que leur adresse IP, le navigateur et le système d'exploitation installés, la résolution de l'écran et même la page à partir de laquelle le visiteur a été redirigé. Certaines pages web utilisent des cookies pour marquer votre navigateur et enregistrer vos paramètres personnels et vos préférences, ou pour vous "reconnaître" lors de votre prochaine visite. *La Protection contre le suivi* protège vos informations personnelles contre ces systèmes de collecte de données et de statistiques. Vous pouvez adapter le fonctionnement du mode furtif de manière flexible : par exemple, vous pouvez interdire au site web de recevoir la requête de recherche que vous avez utilisée pour le trouver sur Internet, supprimer automatiquement les cookies de tiers et ceux du site web, désactiver le partage de la géolocalisation du navigateur qui peut être utilisé pour suivre vos déplacements, et masquer votre véritable adresse IP ou même la remplacer par une adresse arbitraire. @@ -95,7 +95,7 @@ Vous pouvez également définir une valeur arbitraire pour le référent en la s Notez que pour pouvoir filtrer le trafic, les applications AdGuard "interceptent" les requêtes navigateur-serveur. Les requêtes adressées aux serveurs de publicité, de suivi et d'hameçonnage peuvent être modifiées avant d'être envoyées au serveur ou bloquées complètement. Idem pour l'option *Masquer le référent aux tiers* : AdGuard intercepte les requêtes HTTP(S), notamment pour supprimer ou modifier l'en-tête référent si cette option est activée. Toutefois, cela ne se produit qu'une fois que ces requêtes "quittent" le navigateur. Cela signifie que si vous surveillez le référent dans le navigateur (par exemple, avec l'aide des outils de développement de Chrome), vous verrez le référent d'origine car la requête n'a pas encore atteint AdGuard. Vous pouvez utiliser des logiciels tels que [Fiddler](https://www.telerik.com/fiddler) pour vous assurer que le référent est modifié correctement. -Due to the nature of all web browser extensions, AdGuard Browser Extension instead works 'inside' the web browser. Elle modifiera le référent à ce moment précis, de sorte que les outils de développeur afficheront le référent souhaité pour vos demandes. +À cause de la nature de toutes les extensions de navigateur, l'Extension de navigateur AdGuard fonctionne "à l'intérieur" du navigateur. Elle modifiera le référent à ce moment précis, de sorte que les outils de développeur afficheront le référent souhaité pour vos demandes. ### Masquer l'Agent utilisateur {#useragent} diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/guides/collect-har-file.md b/i18n/fr/docusaurus-plugin-content-docs/current/guides/collect-har-file.md index 360f49e88cb..fdc4407e927 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/guides/collect-har-file.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/guides/collect-har-file.md @@ -105,7 +105,7 @@ Pour créer un fichier HAR dans Internet Explorer 11, procédez comme suit : - Le bouton de lecture sera gris lors de l'enregistrement et le bouton d'arrêt sera rouge. Mettez en mode **Lecture** . -1. Clear any session info appearing in the lower grid using the **Clear session** button on the **Network** tab. Passez la souris sur les icônes pour voir les noms. +1. Effacez toutes les informations de session apparaissant dans la grille inférieure à l'aide du bouton **Effacer la session** de l'onglet **Réseau**. Passez la souris sur les icônes pour voir les noms. - **Le bouton Effacer la session** est une icône à trois lignes avec un x dessus. @@ -113,7 +113,7 @@ Pour créer un fichier HAR dans Internet Explorer 11, procédez comme suit : 1. Reproduisez les étapes qui créent le problème. -1. Save session as a .har file by clicking the **Save to disk** button (Export as HAR) on the **Network** tab. +1. Enregistrez la session en tant que fichier .har en cliquant sur le bouton **Enregistrer sur le disque** (Exporter en tant que HAR) dans l'onglet **Réseau**. 1. Envoyez-le au service d'assistance AdGuard (support@adguard.com) avec une explication détaillée du problème. Les captures d’écran prises en charge peuvent également être utiles. diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md b/i18n/fr/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md index f0032eee2e9..dda27550275 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md @@ -19,9 +19,9 @@ Selon le système d'exploitation de l'appareil dont vous souhaitez filtrer le tr ### Windows {#windows} -1. Note the IP address of your computer with AdGuard installed. +1. Notez l'adresse IP de votre ordinateur de bureau où AdGuard est installé. -1. Assurez-vous que la protection AdGuard est activée. Sur un ordinateur Windows, cochez la case **Utiliser AdGuard comme proxy HTTP** dans l'onglet **Réseau** de ses paramètres. On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. Assurez-vous que la protection AdGuard est activée. Sur un ordinateur Windows, cochez la case **Utiliser AdGuard comme proxy HTTP** dans l'onglet **Réseau** de ses paramètres. Pour Mac, allez dans **Réglages** → **Préférences** → **Réseau** et activez le **Proxy HTTP**. 1. Sur le même ordinateur avec AdGuard, suivez ce lien : [http://local.adguard.org/cert](http://local.adguard.org/cert). @@ -55,15 +55,15 @@ Selon le système d'exploitation de l'appareil dont vous souhaitez filtrer le tr 1. Cliquez sur **Configurer** dans l'onglet *Utiliser un serveur proxy* . -1. Activez la bascule. For **Proxy IP address**, type the IP address of your computer that you noted in step 1. Pour le **Port**, saisissez le port choisi dans les paramètres réseau de l'application AdGuard de bureau. +1. Activez la bascule. Pour l'**Adresse IP du proxy**, saisissez l'adresse IP de votre ordinateur de bureau, que vous avez notée à l'étape 1. Pour le **Port**, saisissez le port choisi dans les paramètres réseau de l'application AdGuard de bureau. 1. Cliquez sur **Enregistrer**. ### Mac {#mac} -1. Note the IP address of your computer with installed AdGuard. +1. Notez l'adresse IP de votre ordinateur de bureau où AdGuard est installé. -1. Assurez-vous que la protection AdGuard est activée. Sur un ordinateur Windows, cochez la case **Utiliser AdGuard comme proxy HTTP** dans l'onglet **Réseau** de ses paramètres. On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. Assurez-vous que la protection AdGuard est activée. Sur un ordinateur Windows, cochez la case **Utiliser AdGuard comme proxy HTTP** dans l'onglet **Réseau** de ses paramètres. Pour Mac, allez dans **Réglages** → **Préférences** → **Réseau** et activez le **Proxy HTTP**. 1. Suivez ce lien à l'aide d'un navigateur web : [http://local.adguard.org/cert](http://local.adguard.org/cert). @@ -93,9 +93,9 @@ Selon le système d'exploitation de l'appareil dont vous souhaitez filtrer le tr ### Android {#android} -1. Note the IP address of your computer with installed AdGuard. +1. Notez l'adresse IP de votre ordinateur de bureau où AdGuard est installé. -1. Assurez-vous que la protection AdGuard est activée. Sur un ordinateur Windows, cochez la case **Utiliser AdGuard comme proxy HTTP** dans l'onglet **Réseau** de ses paramètres. On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. Assurez-vous que la protection AdGuard est activée. Sur un ordinateur Windows, cochez la case **Utiliser AdGuard comme proxy HTTP** dans l'onglet **Réseau** de ses paramètres. Pour Mac, allez dans **Réglages** → **Préférences** → **Réseau** et activez le **Proxy HTTP**. 1. Depuis l'ordinateur avec AdGuard, suivez ce lien à l'aide d'un navigateur web : [http://local.adguard.org/cert](http://local.adguard.org/cert). @@ -109,13 +109,13 @@ Selon le système d'exploitation de l'appareil dont vous souhaitez filtrer le tr 1. Ouvrez les paramètres avancés du réseau Wi-Fi actif. -1. Remplacez le **Type de proxy** par **Manuel**. For **Proxy hostname**, enter the noted IP address of your computer you noted in step 1. Pour le **Port proxy**, saisissez le port choisi dans les paramètres réseau de l'application de bureau AdGuard. +1. Remplacez le **Type de proxy** par **Manuel**. Pour le **Nom d'hôte du proxy**, saisissez l'adresse IP de votre ordinateur de bureau, que vous avez notée à l'étape 1. Pour le **Port proxy**, saisissez le port choisi dans les paramètres réseau de l'application de bureau AdGuard. ### iOS {#ios} -1. Note the IP address of your computer with installed AdGuard. +1. Notez l'adresse IP de votre ordinateur de bureau où AdGuard est installé. -1. Assurez-vous que la protection AdGuard est activée. Sur un ordinateur Windows, cochez la case **Utiliser AdGuard comme proxy HTTP** dans l'onglet **Réseau** de ses paramètres. On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. Assurez-vous que la protection AdGuard est activée. Sur un ordinateur Windows, cochez la case **Utiliser AdGuard comme proxy HTTP** dans l'onglet **Réseau** de ses paramètres. Pour Mac, allez dans **Réglages** → **Préférences** → **Réseau** et activez le **Proxy HTTP**. 1. Depuis l'ordinateur avec AdGuard, suivez ce lien à l'aide d'un navigateur web : [http://local.adguard.org/cert](http://local.adguard.org/cert). diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/beta-testing.md b/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/beta-testing.md index 6c0afc89b42..8c32ee43592 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/beta-testing.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/beta-testing.md @@ -1,46 +1,46 @@ --- -title: AdGuard beta/nightly testing +title: Testing bêta/nightly de AdGuard sidebar_position: 1 --- -Il existe une application AdGuard pour pratiquement toutes les plates-formes principales, et nous publions régulièrement des mises à jour pour chacune d'entre elles. This would not be possible without beta and nightly testing and, more importantly, without our testers. Want to become one of them? Here’s how you can do it. +Il existe une application AdGuard pour pratiquement toutes les plates-formes principales, et nous publions régulièrement des mises à jour pour chacune d'entre elles. Cela ne serait pas possible sans les tests bêta et nightly et, surtout, sans les bêta-testeurs. Vous souhaitez devenir l'un d'entre eux ? Voici comment faire. -### Beta or nightly: what is the difference? +### Bêta ou nightly : quelle est la différence ? -Both beta and nightly testing are important to make AdGuard constantly better. However, they are different, and you can choose the one that suits you more. +Les tests bêta et nightly sont importants pour améliorer AdGuard constamment. Cependant, elles sont différentes, et vous pouvez choisir celle qui vous convient le mieux. -The development process follows a progression from nightly to beta and then from beta to the final, stable version — release. It means that you are more likely to find bugs in nightly builds, but you get access to new features faster, almost on a daily basis. Betas are more stable, but you will get updates less often. +Le processus de développement suit une progression de nightly à bêta, puis de bêta à la version définitive et stable — version release. Cela signifie que vous êtes plus susceptible de trouver des bogues dans les versions nightly, mais vous accédez plus rapidement aux nouvelles fonctionnalités, presque quotidiennement. Les bêtas sont plus stables, mais vous recevrez des mises à jour moins souvent. -## How to become a beta or nightly tester {#intro} +## Comment devenir testeur de bêta ou nightly {#intro} -Our requirements are easy: use AdGuard, upgrade to the beta/nightly version when it becomes available, and report any bugs you notice. You will need a [GitHub](https://github.com/) account to become our tester, so you may want to get that out of the way first. +Nos exigences sont simples : utilisez AdGuard, passez à la version bêta/nightly lorsqu'elle sera disponible et signalez les bogues que vous constatez. Vous aurez besoin d'un compte [GitHub](https://github.com/) pour devenir notre testeur, vous voudrez peut-être commencer par ça. -You will also need the device on which you will install the app and [the link to the the beta testing page](https://adguard.com/beta.html). There you will find more information on how to join our program and test AdGuard for Windows, Mac, Android, and iOS. +Vous aurez également besoin de l'appareil sur lequel vous allez installer l'application et [le lien vers la page de test bêta](https://adguard.com/beta.html). Vous y trouverez plus d'informations sur la manière de rejoindre notre programme et de tester AdGuard pour Windows, iOS et Android. -If you want to skip the description part and get straight to the action, you can apply [here](https://surveys.adguard.com/beta_testing_program/form.html). Your application will be reviewed within 1–3 working days, and you'll get a reply via email. +Si vous souhaitez sauter la partie description et passer directement à l'action, vous pouvez vous inscrire [ici](https://surveys.adguard.com/beta_testing_program/form.html). Votre candidature sera examinée dans un délai de 1 à 3 jours ouvrables et vous recevrez une réponse par e-mail. :::note -To get the AdGuard for iOS beta or nightly build, first you have to install [TestFlight](https://apps.apple.com/app/testflight/id899247664) on your iOS device. +Pour obtenir la version bêta ou la version nightly d'AdGuard pour iOS, vous devez d'abord installer [TestFlight](https://apps.apple.com/app/testflight/id899247664) sur votre appareil iOS. ::: ## Comment signaler un problème {#report-a-bug} -If you spotted a bug or just want to share your suggestion, let us know: go to [GitHub](https://github.com/AdguardTeam/), find a suitable repository, create a new issue there, and describe the bug/feature request in detail. +Si vous avez repéré un bug ou souhaitez simplement partager votre suggestion, dites nous : allez sur [GitHub](https://github.com/AdguardTeam/), trouvez un référentiel approprié, créez-y un nouveau problème et décrivez la demande de bug/fonctionnalité dans détail. -The above method is the most preferred, but you can use others if necessary: +La méthode ci-dessus est plus privilégiée, mais vous pouvez en utiliser d'autres si nécessaire : - Retrouvez-nous sur des plateformes de médias sociaux diverses, comme [Facebook](https://www.facebook.com/AdguardFr/), [Reddit](https://www.reddit.com/r/Adguard/), etc. Toutefois, ce n'est pas le moyen le plus pratique de discuter de questions techniques. - Envoyez un e-mail à notre équipe d'assistance depuis l'onglet Assistance dans l'application ou écrivez directement à [support@adguard.com](mailto:support@adguard.com). -## How to activate a beta/nightly key in the iOS app {#ios} +## Comment activer la clef bêta/nightly dans l'application iOS {#ios} -If you have already received a beta or nightly key and it is listed in your `adguard.com` account, go to the app and open the license section (Get Premium). Once there, enter the credentials from your AdGuard account. After that, the premium features will become available automatically. +Si vous avez déjà reçu une clef bêta ou nightly et elle est répertoriée dans votre compte `adguard.com`, accédez à l'application et ouvrez la section licence (Obtenir Premium). Une fois là-bas, saisissez les informations d'identification de votre compte AdGuard. Après cela, les fonctionnalités premium seront disponibles automatiquement. -### What else? +### Quoi d'autre ? -There is not much more to add. You don't have to go out of your way to find bugs. You can continue using AdGuard as usual. However, if you encounter a bug, please report it. Of course, we appreciate any additional effort. +Il n'y a plus grand-chose à ajouter. Vous n’avez pas besoin de faire trop d'efforts pour trouver des bugs. Vous pouvez continuer à utiliser AdGuard comme d'habitude. Cependant, si vous trouvez un bug, merci de le signaler. Bien entendu, nous apprécions tout effort supplémentaire. -Occasionally, you will receive our newsletters, keeping you informed of the latest changes in the beta/nightly (in case you missed them) and other important news. You can unsubscribe from it at any time. +Occasionnellement, vous recevrez nos bulletins d'information, qui vous tiendront au courant des dernières modifications apportées à la version bêta/nightly (au cas où vous les auriez manquées) et d'autres nouvelles importantes. Vous pouvez vous en désinscrire à tout moment. diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/filters.md b/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/filters.md index e1c92200dca..28b6ff96a84 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/filters.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/filters.md @@ -13,7 +13,7 @@ Les sites web modifient constamment la manière dont ils intègrent les publicit Toutefois, l'utilisation de filtres de blocage nécessite des compétences spécifiques. Si vous les avez et si vous savez comment créer des règles, rendez-vous directement sur notre référentiel[répositoire des Filtres AdGuard](https://github.com/AdguardTeam/AdguardFilters) sur GitHub. Vous y trouverez de nombreux problèmes actifs, chacun faisant référence à un problème de site web - une annonce manquée, un faux positif, etc. Choisissez-en une et suggérez vos propres règles dans les commentaires. Les ingénieurs des filtres AdGuard examineront vos suggestions et, s'ils les jugent appropriées, vos règles seront ajoutées aux filtres AdGuard. -If you are not yet familiar with our filtering rule syntax, or maybe need a refresher, you'll find the basics about the syntax [in our Knowledge Base](/general/ad-filtering/create-own-filters). +Si vous n'êtes pas encore familiarisé avec la syntaxe de nos règles de filtrage, ou si vous avez besoin d'un rappel, vous trouverez les bases de la syntaxe [dans notre Base de connaissances](/general/ad-filtering/create-own-filters). ### Récompenses {#rewards} diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/become-translator.md b/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/become-translator.md index 09c4222016e..9923d63cfc6 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/become-translator.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/become-translator.md @@ -3,7 +3,7 @@ title: Devenir traducteur/réviseur sidebar_position: 2 --- -If you want to help translate AdGuard products, websites, and Knowledge Bases, go to [Crowdin](https://crowdin.com/) and sign up/log in there. +Si vous souhaitez aider à traduire les produits, les sites web et les Bases de connaissances AdGuard, accédez à [Crowdin](https://crowdin.com/) et inscrivez-vous/connectez-vous. ![crowdin *border](https://cdn.adtidy.org/public/Adguard/kb/en/ag-translations/main-screen.png) diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/plural-forms.md b/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/plural-forms.md index 8863c12e040..1a505454617 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/plural-forms.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/plural-forms.md @@ -38,7 +38,7 @@ Faisant face à une traduction qui nécessite l'utilisation de pluriels, vous ne Voici quelques sources d'informations que vous pouvez utiliser. -[Guide de localisation](http://docs.translatehouse.org/projects/localization-guide/en/latest/l10n/pluralforms.html) contient une large liste de langues. Le nombre de formes plurielles pour les langues différentes est indiqué de cette façon : `nplurals=2`, `nplurals=4` et ainsi de suite. The numeral after the equals sign `=` indicates the number of plural forms of the respective language. +[Guide de localisation](http://docs.translatehouse.org/projects/localization-guide/en/latest/l10n/pluralforms.html) contient une large liste de langues. Le nombre de formes plurielles pour les langues différentes est indiqué de cette façon : `nplurals=2`, `nplurals=4` et ainsi de suite. Le chiffre après le signe Égal `=` indique le nombre de formes plurielles de la langue respective. En outre, vous pouvez obtenir des informations sur les formes plurielles dans le répertoire [Unicode Common Locale Data Repository](http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#rules) (CLDR). Les règles plurielles CLDR indiquent une forme de mot supplémentaire pour les nombres décimaux (1.5 ; 2.3 ; 100.1…), mais nous ne les utilisons pas dans les traductions AdGuard. @@ -137,7 +137,7 @@ Ainsi, la traduction de l'anglais vers le serbe devrait être : Bien qu'il soit évident que les deux derniers modèles ne présentent aucune différence, il est très important de respecter la règle : **Le nombre de modèles doit refléter le nombre de formes plurielles de la langue concernée !**(typiquement pour ce type de chaînes avec des pluriels). -## Short summary {#summary} +## Résumé bref {#summary} Lors de la traduction de projets AdGuard, portez une attention particulière aux phrases qui nécessitent l'utilisation de formes plurielles. diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/program.md b/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/program.md index 2431225f540..75b8e76b89a 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/program.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/program.md @@ -3,10 +3,10 @@ title: Programme de traduction AdGuard sidebar_position: 1 --- -You can ask us any questions about translating AdGuard by sending an email to [translate@adguard.com](mailto:translate@adguard.com) or by joining our [Telegram chat](https://t.me/joinchat/UVYTLcHbr8JmOGIy). +Vous pouvez nous poser toutes vos questions sur la traduction d'AdGuard en envoyant un email à [translate@adguard.com](mailto:translate@adguard.com) ou en rejoignant notre [chat Telegram](https://t.me/joinchat/UVYTLcHbr8JmOGIy). -When it comes to translations, we at AdGuard always heavily rely on volunteers. +En matière de traductions, chez AdGuard, nous comptons toujours fortement sur les bénévoles. -We now use the [Crowdin platform](https://crowdin.com/) to manage translations of our products. So this is the place for anyone who wants to contribute to AdGuard by translating any of our products. +Nous utilisons actuellement la plateforme [Crowdin](https://crowdin.com/) pour gérer les traductions de nos produits. C'est donc l'endroit idéal pour quiconque souhaite contribuer à AdGuard en traduisant l'un de nos produits. -If you want to be among the volunteers who help us translate AdGuard, please read the information on [how to become our translator](../become-translator) and [how we collaborate with them](../rewards). +Si vous voulez faire partie des bénévoles qui nous aident à traduire AdGuard, veuillez lire les informations sur [comment devenir notre traducteur](../become-translator) et [comment nous collaborons avec eux](../rewards). diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/rewards.md b/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/rewards.md index 7689ce1a596..9270bfec9ba 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/rewards.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/rewards.md @@ -5,56 +5,56 @@ sidebar_position: 6 Comme tout effort honnête et bien fait doit être récompensé, les traducteurs actifs sur Crowdin peuvent demander une clef de licence AdGuard gratuite et un abonnement VPN. -## How our reward system works +## Comment fonctionne notre système de récompenses -### For AdGuard licenses +### Pour les licences AdGuard -- For your first one-year Ad Blocker license, you need to translate **1,000 words**. -- For your second license, you’ll need an **additional 1,500 words** (a total of 2,500 words). -- All subsequent licenses require an **additional 2,500** words per license. +- Pour votre première licence d'un an pour le Bloqueur d'annonces, vous devez traduire **1 000 mots**. +- Pour votre deuxième licence, vous devrez traduire **1 500 mots supplémentaires** (soit un total de 2 500 mots). +- Toutes les licences suivantes nécessitent **2 500 mots supplémentaires** par licence. -### For AdGuard VPN licenses +### Pour les licences AdGuard VPN -- The first one-year VPN subscription requires translating **3,000 words**. -- All subsequent subscriptions or renewals require an **additional 3,000 words** per subscription. +- Le premier abonnement d'un an au VPN nécessite de traduire **3 000 mots**. +- Tous les abonnements ou renouvellements suivants nécessitent **3 000 mots supplémentaires** par abonnement. :::note Limitations -As a reward for contributing, we offer licenses and subscriptions valid for a maximum of 5 years. In the case of Ad Blocker, we offer licenses that cover up to 5 devices. We do not offer lifetime licenses. +En tant que récompense pour votre contribution, nous offrons des licences et abonnements valables pour une durée maximale de 5 ans. Dans le cas du Bloqueur d'annonces, nous proposons des licences couvrant jusqu'à 5 appareils. Nous n'offrons pas de licences à vie. ::: -## How to request your license +## Comment demander votre licence -Just send an email to our translators team at [translate@adguard.com](mailto:translate@adguard.com) with the following information: +Envoyez simplement un email à notre équipe de traducteurs à [translate@adguard.com](mailto:translate@adguard.com) avec les informations suivantes : -- Your Crowdin username -- The projects you contributed to (Websites, Applications, Knowledge Base, etc.) -- The email address to which you want to link your license -- Your translation statistics (a screenshot or total word count) and the type of license you want +- Votre nom d'utilisateur Crowdin +- Les projets auxquels vous avez contribué (Sites web, Applications, Base de connaissances, etc.) +- L'adresse email à laquelle vous souhaitez lier votre licence +- Vos statistiques de traduction (capture d'écran ou nombre total de mots) et le type de licence souhaité -**Email template:** +**Modèle d'email :** -> Hi AdGuard team! +> Bonjour l'équipe AdGuard ! > -> I’ve translated more than 5,000 words in AdGuard for Android in (*your language*) — you can find my stats attached. As a reward, I’d like to request an AdGuard VPN license and an Ad Blocker license My email is (*your email address*). My Crowdin username is (*your username*). +> J'ai traduit plus de 5 000 mots dans AdGuard pour Android en (*votre langue*) — vous trouverez mes statistiques en pièce jointe. En récompense, j'aimerais demander une licence AdGuard VPN et une licence du Bloqueur d'annonces Mon adresse e-mail est*(votre adresse e-mail*). Mon nom d'utilisateur Crowdin est (*votre nom d'utilisateur*). -## How to check your translation progress +## Comment vérifier votre progression de traduction -Open a project you have been working on, click the *Reports* tab, select *My Contribution*, scroll down, select a date range, and generate a report. It will look something like this. +Ouvrez un projet sur lequel vous avez travaillé, cliquez sur l'onglet *Rapports*, sélectionnez *Ma contribution*, descendez, sélectionnez une plage de dates et générez un rapport. Il se présentera comme suit. -![Statistics *border](https://cdn.adtidy.org/content/kb/ad_blocker/miscellaneous/adguard_translations/statistics.png) +![Statistiques *border](https://cdn.adtidy.org/content/kb/ad_blocker/miscellaneous/adguard_translations/statistics.png) -You can add up the number of words translated across different projects to qualify for a license. +Vous pouvez additionner le nombre de mots traduits sur des projets différents pour atteindre le seuil nécessaire pour une licence. ## Comment devenir relecteur -Our most active translators may be considered for proofreader status in the future. To become a proofreader, you’ll need to deliver consistently high quality translations over a period of several months. +Nos traducteurs les plus actifs pourraient être considérés pour devenir relecteurs dans le futur. Pour devenir relecteur, vous devrez fournir des traductions de haute qualité de manière constante sur une période de plusieurs mois. -Please note that proofreaders do not receive extra licenses or benefits beyond helping more people access AdGuard products in their language. If you’re interested in becoming one of our proofreaders, please contact us at [translate@adguard.com](mailto:translate@adguard.com). +Veuillez noter que les relecteurs ne reçoivent pas de licences ou d'avantages supplémentaires au-delà d'aider les utilisateurs à accéder aux produits AdGuard dans leur langue. Si vous êtes intéressé par le rôle de relecteur, veuillez nous contacter à [translate@adguard.com](mailto:translate@adguard.com). -## Gifts for active contributors +## Cadeaux pour les contributeurs actifs -To the best contributors, every year we send gifts with the AdGuard merch and give a shout out on our [blog](https://adguard.com/en/blog/best-contributors-2023.html). +Chaque année nous envoyons des cadeaux avec des articles de la marque AdGuard à nos meilleurs contributeurs, et nous leur adressons un remerciement sur notre [blog](https://adguard.com/en/blog/best-contributors-2023.html). -![AdGuard merch *border](https://cdn.adguard.com/public/Adguard/Blog/presents.png) +![Articles de marque AdGuard *border](https://cdn.adguard.com/public/Adguard/Blog/presents.png) diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/translation-priority.md b/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/translation-priority.md index 2ab5c9e6813..3f84f4e222c 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/translation-priority.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/translation-priority.md @@ -3,13 +3,13 @@ title: Comment hiérarchiser les traductions des fichiers Crowdin sidebar_position: 5 --- -There are five major AdGuard projects on Crowdin — [AdGuard Applications](https://crowdin.com/project/adguard-applications), [AdGuard Websites](https://crowdin.com/project/adguard-websites), [AdGuard Ad Blocker Knowledge Base](https://crowdin.com/project/adguard-knowledge-base), [AdGuard VPN Knowledge Base](https://crowdin.com/project/adguard-vpn-knowledge-base), and [AdGuard DNS Knowledge Base](https://crowdin.com/project/adguard-knowledge-bases). +Il existe cinq projets majeurs d'AdGuard sur Crowdin — [Applications AdGuard](https://crowdin.com/project/adguard-applications), [Sites Web AdGuard](https://crowdin.com/project/adguard-websites), [Base de connaissances du Bloqueur AdGuard](https://crowdin.com/project/adguard-knowledge-base), [Base de connaissances d'AdGuard VPN](https://crowdin.com/project/adguard-vpn-knowledge-base), et [Base de connaissances d'AdGuard DNS](https://crowdin.com/project/adguard-knowledge-bases). Nous n'avons pas de directives claires sur les fichiers ou les produits avec lesquels commencer travailler sur le projet *AdGuard Applications*. Choisissez simplement n'importe quel produit que vous préférez. Il y a juste deux ou trois choses que nous voulons mentionner : -- The app is only available to users in those languages for which all translations have been completed on Crowdin; +- L'application n'est disponible que pour les utilisateurs dans les langues pour lesquelles toutes les traductions ont été complétées sur Crowdin ; - Nous vous recommandons de traduire les descriptions des magasins d'applications en deuxième lieu, car sans la traduction des produits eux-mêmes, les descriptions ne seront pas nécessaires. La situation est différente dans le projet *AdGuard Websites*. Des langues peuvent être ajoutées au site même si un ensemble complet de traductions n'est pas disponible. Toutefois, cela dépend des fichiers qui ont déjà été traduits. C'est pourquoi nous vous recommandons de commencer par les fichiers les plus importants — ils sont répertoriés ci-dessous : diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/updating-knowledge-base.md b/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/updating-knowledge-base.md index 037397dcd22..2856bd59cd4 100644 --- a/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/updating-knowledge-base.md +++ b/i18n/fr/docusaurus-plugin-content-docs/current/miscellaneous/contribute/updating-knowledge-base.md @@ -1,28 +1,28 @@ --- -title: Updating the Knowledge Base +title: Mise à jour de la Base de connaissances sidebar_position: 2 --- -The goal of AdGuard Ad Blocker Knowledge Base is to provide everyone with the most up-to-date information on all kinds of AdGuard-related topics. Mais les choses évoluent constamment et il arrive qu'un article ne reflète plus l'état actuel des choses. +L'objectif de la Base de connaissances du Bloqueur d'annonces AdGuard est de fournir à chacun les informations les plus récentes sur toutes sortes de sujets liés à AdGuard. Mais les choses évoluent constamment et il arrive qu'un article ne reflète plus l'état actuel des choses. C'est pourquoi nous avons placé l'ensemble du contenu de notre base de données sur [GitHub](https://github.com/AdguardTeam/KnowledgeBase). Désormais, tout le monde peut y contribuer en suggérant des modifications et des traductions pour les articles existants, ainsi que de nouveaux articles. ## Comment suggérer un changement ou écrire un nouvel article {#suggest-change} -You can suggest changes to current articles and add new ones to our Knowledge Base using the functionality of GitHub mentioned above. Si vous n'êtes pas familier avec les principes de travail avec la plate-forme, commencez par lire la [documentation GitHub](https://docs.github.com/en). +Vous pouvez suggérer des modifications aux articles actuels de notre Base de connaissances et y ajouter de nouveaux en utilisant la fonctionnalité de GitHub mentionnée ci-dessus. Si vous n'êtes pas familier avec les principes de travail avec la plate-forme, commencez par lire la [documentation GitHub](https://docs.github.com/en). -Une fois que vous êtes prêt à commencer, procédez dans [le référentiel KnowledgeBase](https://github.com/AdguardTeam/KnowledgeBase). All texts in our Knowledge Base are written in `Markdown` markup language. Gardez cela à l'esprit lorsque vous modifiez ou rédigez des articles. Suivez [ce lien](https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax) pour apprendre plus sur la syntaxe Markdown. +Une fois que vous êtes prêt à commencer, procédez dans [le référentiel KnowledgeBase](https://github.com/AdguardTeam/KnowledgeBase). Tous les textes de notre base de connaissances sont rédigés en langage de balisage `Markdown`. Gardez cela à l'esprit lorsque vous modifiez ou rédigez des articles. Suivez [ce lien](https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax) pour apprendre plus sur la syntaxe Markdown. -The Knowledge Base website is built using Docusaurus 2 — a modern static website generator. Lorsque vous suggérez des modifications ou des ajouts d'infos, tenez compte du fait que tous les documents doivent respecter les principes de la plateforme. Vous pouvez en prendre connaissance dans les [Guides sur Docusaurus](https://docusaurus.io/docs/category/guides). +Le site web de la Base de connaissances est construit à l'aide de Docusaurus 2 — un générateur moderne de sites web statiques. Lorsque vous suggérez des modifications ou des ajouts d'infos, tenez compte du fait que tous les documents doivent respecter les principes de la plateforme. Vous pouvez en prendre connaissance dans les [Guides sur Docusaurus](https://docusaurus.io/docs/category/guides). -You can deploy this Knowledge Base locally on your computer to preview the changes you suggest. Detailed instructions on how to do this can be found [in the README file](https://github.com/AdguardTeam/KnowledgeBase#readme) on this Knowledge Base's GitHub page. +Vous pouvez déployer cette Base de connaissances localement sur votre ordinateur pour prévisualiser les modifications que vous suggérez. Vous trouverez des instructions détaillées sur la façon de procéder à l'adresse [dans le fichier README.md](https://github.com/AdguardTeam/KnowledgeBase#readme) sur la page GitHub de cette Base de connaissances. ## La traduction des articles {#translate-adguard} -Translation of the existing articles of the Knowledge Base is carried out on [the Crowdin platform](https://crowdin.com/profile/adguard). All the details about translations and working with Crowdin can be found [in the dedicated article](../translate/guidelines) of the AdGuard Ad Blocker Knowledge Base. +La traduction des articles existants de la Base de connaissances est réalisée sur [la plateforme Crowdin](https://crowdin.com/profile/adguard). Tous les détails sur les traductions et le travail avec Crowdin peuvent être trouvés [dans l'article dédié](../translate/guidelines) de la Base de connaissances du Bloqueur AdGuard. -When working on AdGuard Knowledge Base articles, you may meet strings containing plural forms that you should translate with extra attention. [Dans un article séparé](../translate/plural-forms), nous avons décrit en détail les difficultés qui peuvent survenir lors de la traduction de chaînes avec des formes plurielles, et avons donné des instructions détaillées sur la façon de les utiliser sur la plate-forme Crowdin. +Lorsque vous travaillez sur des articles de la Base de connaissances de AdGuard, vous pouvez rencontrer des chaînes contenant des formes plurielles que vous devrez traduire avec une attention particulière. [Dans un article séparé](../translate/plural-forms), nous avons décrit en détail les difficultés qui peuvent survenir lors de la traduction de chaînes avec des formes plurielles, et avons donné des instructions détaillées sur la façon de les utiliser sur la plate-forme Crowdin. ## Le travail sur les questions ouvertes -Sometimes there exist [open tasks](https://github.com/AdguardTeam/KnowledgeBase/issues) related to updating the Knowledge Base. You can help us speed up their completion [the same way](#suggest-change) you would suggest any other changes to the Knowledge Base. Choisissez un sujet qui vous intéresse et commencez à travailler dessus. Si vous avez des questions, vous pouvez les poser directement dans les commentaires de cette tâche. +Parfois, il y aura des [tâches ouvertes](https://github.com/AdguardTeam/KnowledgeBase/issues) liées à la mise à jour de la Base de connaissances. Vous pouvez nous aider à accélérer leur réalisation [de la même manière](#suggest-change) que vous suggéreriez toute autre modification à cette Base de connaissances. Choisissez un sujet qui vous intéresse et commencez à travailler dessus. Si vous avez des questions, vous pouvez les poser directement dans les commentaires de cette tâche. diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 92bfd87a1dd..fa490098e78 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ The _Low-level settings_ section is for expert users. [Read more about low-level This section allows you to manage HTTPS filtering settings, filters, and userscripts, and set up a proxy server. -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filters @@ -57,11 +57,19 @@ If you activate too many filters, some websites may work incorrectly. [Read more about filters](https://adguard.com/en/blog/what-are-filters.html) -### Userscripts +### Extensions + +Extensions allow you to add userscripts and userstyles. + +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 5e75a51f1e8..b5525cd735c 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 24b41b032ca..8f7344f7ade 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index da99768471a..0341d942127 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: How to protect AdGuard from being disabled by the system -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 7367e63cef9..784a7c9587c 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ You can access it by navigating to *Statistics* → *Battery usage*. Inside you will find a chart that shows the AdGuard battery resource consumption within the last 24 hours, with an option to get more detailed hour-to-hour data by tapping on the chart. Besides that, there’s also a numeric breakdown of the relevant data and a short technical explanation. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### How much battery resource does AdGuard really consume? First, let us lay down a bit of theory and links with necessary data. diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 6f1876d0079..0563d2a0336 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index d98274a0489..c77491236e7 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index deebee15677..c716cc3ed93 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Manual installation of the security certificate into the Firefox browser -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index c5b7755321a..05d28c3b6ea 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 54b325ec582..52016424603 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 79723d1f221..b9f70d23922 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problems caused by multiple user profiles -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 6b9fddc4500..f95d206303e 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: How to set up outbound proxy -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index b9e9396152a..4ae364e8290 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 96b31c31295..25de8d83319 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index adfd7139869..5d8aa06bad9 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: How to block ads in the YouTube app -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 43c9e9aee82..67126401ab4 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,23 +5,25 @@ sidebar_position: 2 ## Install AdGuard for Linux -To install AdGuard, enter: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` @@ -35,37 +37,97 @@ You can verify the signature to prove it’s an official version of AdGuard by u ::: -## Activate license +## Initial setup -AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don't have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -To log in or create an account, enter: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -To reset your license, enter: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -To view the license info, enter: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Initial setup +4. After activation, you can continue to work with the program: -To get AdGuard up and running, complete the initial setup. This includes installing the AdGuard CA certificate, enabling the necessary filters, and selecting the proxy mode. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -To run the configuration wizard, enter: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). ## Uninstall AdGuard for Linux @@ -73,19 +135,19 @@ To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 4ede8a490a1..2487dcaac3b 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Settings and protection management sidebar_position: 3 --- +## Available commands + To get a list of all available AdGuard commands, enter: -``` +```sh adguard-cli --help-all ``` ## Enable and disable protection +### Enable protection + To enable protection, enter: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + To disable protection, enter: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + To view the protection status, enter: -``` +```sh adguard-cli status ``` -## Check for updates +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Check for updates To check for updates, enter: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + To update AdGuard for Linux, enter: -``` +```sh adguard-cli update ``` +### Update script output + To view the update script output, enter: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Use the `config` command to configure AdGuard for Linux. Subcommands: - `show`: Show the current configuration in `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configure an option in `proxy.yaml` - - `listen_ports.http_proxy`: HTTP listening port - - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `listen_ports.http_proxy`: HTTP listening port + - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `get`: Get the current status of the above options ## Manage filters @@ -64,8 +90,32 @@ Use the `config` command to configure AdGuard for Linux. Subcommands: Use the `filters` command to configure AdGuard for Linux. Subcommands: - `list`: List installed filters - - `--all`: View all filters + + - `--all`: View all filters + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Install a filter. Enter the URL of the filter you want to install + - `enable`: Enable a filter. Enter the name or ID of the filter + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Disable a filter. Enter the name or ID of the filter + - `update`: Update filters + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index 412685edf25..86c048ff7a0 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ This page describes the features and details of AdGuard’s central management o ## 1. Download the MSI {#msi-download} -Download the [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi) +Download the [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Download the [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi) +Download the [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configure the settings for your network {#settings-configuring} diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/hr/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index cf76ff7fe89..24b6011caf1 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + is converted to + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-ff]: #what-product "AdGuard Browser Extension for Firefox" diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/hr/docusaurus-plugin-content-docs/current/general/license/legacy.md index 6b1c2a74395..1e68e937061 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: Legacy licenses FAQ sidebar_position: 6 --- -We have written this article to avoid confusion and explain in detail how you can renew/upgrade an outdated (legacy) AdGuard license. +We have written this article to avoid confusion and explain in detail how you can renew/upgrade a legacy AdGuard license. -## About the outdated licenses +## About legacy licenses Initially licenses of the following types were available to activate AdGuard products: @@ -27,54 +27,52 @@ For all types (Standard, Mobile, Premium) there were options for a Yearly and Li In October 2019 AdGuard switched to the new licensing system: from then on, licenses can still be purchased for 1 year or Lifetime, but their types have become **Personal** (for up to 3 devices) or **Family** (for up to 9 devices). -One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal license can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet.** +Another change is that the **new types of license keys can now be used on any device, in any combination**. For example, a Personal license can be used on Android, Mac and iOS, as well as on two Windows computers and an Apple tablet. -## What happened to the outdated licenses? +## What happened to the legacy licenses? -Standard were automatically made universal, which means that they can be activated on any devices. +**Standard licenses** were automatically made **universal**, which means that they can be activated on any device. -Mobile licenses remained unchanged and platform-limited (they can still only be used on phones or tablets). +**Mobile licenses** remained unchanged and platform-limited (they can still only be used on phones or tablets). -Premium licenses also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. +**Premium licenses** also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. For example, this is how the 1+1 key looks like: -![1+1 key](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 key](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *But despite the total number of devices (2) it can be activated on 1 desktop and 1 mobile device.* > All the outdated licenses have a "legacy" badge in the AdGuard account. And they are automatically converted to a new type when you either renew or upgrade them. But there are some nuances. Let's see which licenses can be converted to a new type and how to do it. -## I have an outdated (legacy) key. What renewal/upgrade options are available for me? +## How to renew or upgrade a legacy key -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +You can extend/renew or upgrade a legacy license in your [AdGuard account](https://adguardaccount.com) or on the [Extend or upgrade page](https://adguard.com/renew.html). -![Upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Go to "My licenses" tab and check what actions are available to you for each specific key. Below we will explain with specific examples. +To extend/renew or upgrade a legacy license in your AdGuard account, go to the *Licenses* tab, find the license you need, and select one of the available options. -### Licenses for 1/2/3 devices +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Yearly** licenses for 1, 2, 3 devices can be converted to either Personal or Family: +Or go to the [Extend or upgrade page](https://adguard.com/renew.html), enter your license, and click *Apply*. On the new page, select one of the available options. -![Upgrade or renew](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Choose based on how many devices you need to protect. +### Licenses for 1/2/3 devices -Instead of renewal you can switch to Lifetime: +Mobile Yearly licenses for 3 devices can be converted to Personal licenses or upgraded to Family ones: -![Lifetime](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Upgrade Yearly licenses for 1, 2, 3 devices](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Lifetime** licenses can only be converted to Family (9 devices) due to technical limitations: +> If you have a **Standard license for 3 devices**, it already works as a **Personal** license. If you renew your **Mobile license** for 3 devices, you will be able to use it on a **different set of device**s, not just phones. -![Lifetime upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +You can also upgrade your license to Lifetime: -### Licenses for 4+ devices (up to 9) +![Upgrade to Lifetime](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Yearly** keys of this configuration can only be converted into a Family license: +**Lifetime** licenses can only be upgraded to Family (9 devices) due to technical limitations. -![Yearly license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licenses for 4+ devices (up to 9) -**Lifetime** licenses for 4 or more devices cannot be upgraded due to technical limitation: +**Yearly** licenses for 4 or more devices can be upgraded to Family and Lifetime licenses. -![Lifetime license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +However, if you already have a **Lifetime** license, it cannot be upgraded due to technical limitations. ### Licenses for 9+ devices diff --git a/i18n/hr/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/hr/docusaurus-plugin-content-docs/current/general/license/what-is.md index a3b22328a24..fd9fa685ce2 100644 --- a/i18n/hr/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/hr/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ There are also licenses that the user can purchase from other sources or get for - **Distributor licenses** and **gifted licenses** can be both time-limited and non-time limited. Licenses with an expiration date can only be renewed manually - Personal — up to 3 devices - Family — up to 9 devices -- **The AdGuard Pro for iOS license** is purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 92bfd87a1dd..fa490098e78 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ The _Low-level settings_ section is for expert users. [Read more about low-level This section allows you to manage HTTPS filtering settings, filters, and userscripts, and set up a proxy server. -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filters @@ -57,11 +57,19 @@ If you activate too many filters, some websites may work incorrectly. [Read more about filters](https://adguard.com/en/blog/what-are-filters.html) -### Userscripts +### Extensions + +Extensions allow you to add userscripts and userstyles. + +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 5e75a51f1e8..b5525cd735c 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 24b41b032ca..8f7344f7ade 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index c721f59df6c..5f7a35911d9 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: How to protect AdGuard from being disabled by the system -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 7367e63cef9..784a7c9587c 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ You can access it by navigating to *Statistics* → *Battery usage*. Inside you will find a chart that shows the AdGuard battery resource consumption within the last 24 hours, with an option to get more detailed hour-to-hour data by tapping on the chart. Besides that, there’s also a numeric breakdown of the relevant data and a short technical explanation. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### How much battery resource does AdGuard really consume? First, let us lay down a bit of theory and links with necessary data. diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 6f1876d0079..0563d2a0336 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index d98274a0489..c77491236e7 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index deebee15677..c716cc3ed93 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Manual installation of the security certificate into the Firefox browser -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index c5b7755321a..05d28c3b6ea 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 54b325ec582..52016424603 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 6488a7f48ea..55b613a2728 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problems caused by multiple user profiles -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 6b9fddc4500..f95d206303e 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: How to set up outbound proxy -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index b9e9396152a..4ae364e8290 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 96b31c31295..25de8d83319 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index adfd7139869..5d8aa06bad9 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: How to block ads in the YouTube app -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 43c9e9aee82..67126401ab4 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,23 +5,25 @@ sidebar_position: 2 ## Install AdGuard for Linux -To install AdGuard, enter: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` @@ -35,37 +37,97 @@ You can verify the signature to prove it’s an official version of AdGuard by u ::: -## Activate license +## Initial setup -AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don't have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -To log in or create an account, enter: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -To reset your license, enter: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -To view the license info, enter: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Initial setup +4. After activation, you can continue to work with the program: -To get AdGuard up and running, complete the initial setup. This includes installing the AdGuard CA certificate, enabling the necessary filters, and selecting the proxy mode. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -To run the configuration wizard, enter: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). ## Uninstall AdGuard for Linux @@ -73,19 +135,19 @@ To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 85de0186c4f..2487dcaac3b 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Settings and protection management sidebar_position: 3 --- +## Available commands + To get a list of all available AdGuard commands, enter: -``` +```sh adguard-cli --help-all ``` ## Enable and disable protection +### Enable protection + To enable protection, enter: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + To disable protection, enter: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + To view the protection status, enter: -``` +```sh adguard-cli status ``` -## Check for updates +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Check for updates To check for updates, enter: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + To update AdGuard for Linux, enter: -``` +```sh adguard-cli update ``` +### Update script output + To view the update script output, enter: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Use the `config` command to configure AdGuard for Linux. Subcommands: - `show`: Show the current configuration in `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configure an option in `proxy.yaml` - `listen_ports.http_proxy`: HTTP listening port - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `get`: Get the current status of the above options ## Manage filters @@ -64,8 +90,32 @@ Use the `config` command to configure AdGuard for Linux. Subcommands: Use the `filters` command to configure AdGuard for Linux. Subcommands: - `list`: List installed filters + - `--all`: View all filters + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Install a filter. Enter the URL of the filter you want to install + - `enable`: Enable a filter. Enter the name or ID of the filter + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Disable a filter. Enter the name or ID of the filter + - `update`: Update filters + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index 412685edf25..86c048ff7a0 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ This page describes the features and details of AdGuard’s central management o ## 1. Download the MSI {#msi-download} -Download the [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi) +Download the [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Download the [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi) +Download the [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configure the settings for your network {#settings-configuring} diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/hu/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index 16aacaccd70..108949d3f11 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + is converted to + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-ff]: #what-product "AdGuard Browser Extension for Firefox" diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/hu/docusaurus-plugin-content-docs/current/general/license/legacy.md index 6b1c2a74395..1e68e937061 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: Legacy licenses FAQ sidebar_position: 6 --- -We have written this article to avoid confusion and explain in detail how you can renew/upgrade an outdated (legacy) AdGuard license. +We have written this article to avoid confusion and explain in detail how you can renew/upgrade a legacy AdGuard license. -## About the outdated licenses +## About legacy licenses Initially licenses of the following types were available to activate AdGuard products: @@ -27,54 +27,52 @@ For all types (Standard, Mobile, Premium) there were options for a Yearly and Li In October 2019 AdGuard switched to the new licensing system: from then on, licenses can still be purchased for 1 year or Lifetime, but their types have become **Personal** (for up to 3 devices) or **Family** (for up to 9 devices). -One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal license can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet.** +Another change is that the **new types of license keys can now be used on any device, in any combination**. For example, a Personal license can be used on Android, Mac and iOS, as well as on two Windows computers and an Apple tablet. -## What happened to the outdated licenses? +## What happened to the legacy licenses? -Standard were automatically made universal, which means that they can be activated on any devices. +**Standard licenses** were automatically made **universal**, which means that they can be activated on any device. -Mobile licenses remained unchanged and platform-limited (they can still only be used on phones or tablets). +**Mobile licenses** remained unchanged and platform-limited (they can still only be used on phones or tablets). -Premium licenses also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. +**Premium licenses** also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. For example, this is how the 1+1 key looks like: -![1+1 key](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 key](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *But despite the total number of devices (2) it can be activated on 1 desktop and 1 mobile device.* > All the outdated licenses have a "legacy" badge in the AdGuard account. And they are automatically converted to a new type when you either renew or upgrade them. But there are some nuances. Let's see which licenses can be converted to a new type and how to do it. -## I have an outdated (legacy) key. What renewal/upgrade options are available for me? +## How to renew or upgrade a legacy key -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +You can extend/renew or upgrade a legacy license in your [AdGuard account](https://adguardaccount.com) or on the [Extend or upgrade page](https://adguard.com/renew.html). -![Upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Go to "My licenses" tab and check what actions are available to you for each specific key. Below we will explain with specific examples. +To extend/renew or upgrade a legacy license in your AdGuard account, go to the *Licenses* tab, find the license you need, and select one of the available options. -### Licenses for 1/2/3 devices +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Yearly** licenses for 1, 2, 3 devices can be converted to either Personal or Family: +Or go to the [Extend or upgrade page](https://adguard.com/renew.html), enter your license, and click *Apply*. On the new page, select one of the available options. -![Upgrade or renew](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Choose based on how many devices you need to protect. +### Licenses for 1/2/3 devices -Instead of renewal you can switch to Lifetime: +Mobile Yearly licenses for 3 devices can be converted to Personal licenses or upgraded to Family ones: -![Lifetime](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Upgrade Yearly licenses for 1, 2, 3 devices](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Lifetime** licenses can only be converted to Family (9 devices) due to technical limitations: +> If you have a **Standard license for 3 devices**, it already works as a **Personal** license. If you renew your **Mobile license** for 3 devices, you will be able to use it on a **different set of device**s, not just phones. -![Lifetime upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +You can also upgrade your license to Lifetime: -### Licenses for 4+ devices (up to 9) +![Upgrade to Lifetime](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Yearly** keys of this configuration can only be converted into a Family license: +**Lifetime** licenses can only be upgraded to Family (9 devices) due to technical limitations. -![Yearly license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licenses for 4+ devices (up to 9) -**Lifetime** licenses for 4 or more devices cannot be upgraded due to technical limitation: +**Yearly** licenses for 4 or more devices can be upgraded to Family and Lifetime licenses. -![Lifetime license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +However, if you already have a **Lifetime** license, it cannot be upgraded due to technical limitations. ### Licenses for 9+ devices diff --git a/i18n/hu/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/hu/docusaurus-plugin-content-docs/current/general/license/what-is.md index a3b22328a24..fd9fa685ce2 100644 --- a/i18n/hu/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/hu/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ There are also licenses that the user can purchase from other sources or get for - **Distributor licenses** and **gifted licenses** can be both time-limited and non-time limited. Licenses with an expiration date can only be renewed manually - Personal — up to 3 devices - Family — up to 9 devices -- **The AdGuard Pro for iOS license** is purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/adguard-for-android.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/adguard-for-android.md index 198770e4721..ca56bd99f7e 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/adguard-for-android.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/adguard-for-android.md @@ -5,7 +5,7 @@ sidebar_position: 1 :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) +Questo articolo riguarda AdGuard per Android, un blocca-inserzioni multifunzionale che protegge il tuo dispositivo a livello di sistema. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) ::: diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md index 41205923215..3c3ab6cb56c 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md @@ -5,7 +5,7 @@ sidebar_position: 5 :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) +Questo articolo riguarda AdGuard per Android, un blocca-inserzioni multifunzionale che protegge il tuo dispositivo a livello di sistema. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) ::: @@ -241,6 +241,6 @@ If this setting is enabled, AdGuard will display the **Developer tools** icon in **Developer tools** is a specialized section available in AdGuard for Android v4.3 and later, designed for quick navigation and switching between features. It allows you to quickly enable or disable custom filters, access logs, enable various logs, and more. -#### Detect Samsung Pay +#### Rileva Samsung Pay -If this setting is enabled, AdGuard protection will be paused when you open the Samsung Pay app. Korean users require this feature as they experience [issues with Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea) when AdGuard is enabled. +Se quest'impostazione è abilitata, la protezione di AdGuard sarà interrotta quando apri l'app Samsung Pay. Gli utenti coreani richiedono questa funzione poiché riscontrano [problemi con Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea) quando AdGuard è abilitato. diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 09cbbcacf24..2adb761a178 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ La sezione delle _Impostazioni di basso livello_ è indirizzata agli utenti espe Questa sezione ti consente di gestire le impostazioni di filtraggio HTTPS, i filtri e gli userscript, e a configurare il server di un proxy. -![Filtraggio \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filtri @@ -57,102 +57,110 @@ Se attivi troppi filtri, alcuni siti web potrebbero non funzionare correttamente [Leggi di più sui filtri](https://adguard.com/en/blog/what-are-filters.html) -### Script utente +### Estensioni -Gli script utente sono mini-programmi scritti in JavaScript che estendono la funzionalità di uno o più siti web. Per installare uno userscript, hai bisogno di un gestore speciale di script utente. AdGuard dispone di questa funzionalità e ti consente di aggiungere gli script utente tramite URL o da file. +Extensions allow you to add userscripts and userstyles. -![Script utente \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) + +Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. + +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra -AdGuard Extra è uno script utente personalizzato che blocca le inserzioni complesse e i meccanismi che le reinseriscono nei siti web. +AdGuard Extra is a custom userscript that blocks complex ads and mechanisms that reinject ads to websites. #### Disable AMP -Disabilita AMP è uno script utente che disabilita le [pagine mobili accelerate](https://en.wikipedia.org/wiki/Accelerated_Mobile_Pages) nella pagina dei risultati di ricerca di Google. +Disable AMP is a userscript that disables [Accelerated mobile pages](https://en.wikipedia.org/wiki/Accelerated_Mobile_Pages) on the Google search results page. -### Rete dedicata +### Rete #### Filtraggio HTTPS -Per bloccare le inserzioni e i tracciatori in gran parte dei siti web e delle app, AdGuard ha bisogno di filtrarne il traffico HTTPS. [Leggi di più sul filtraggio HTTPS](/general/https-filtering/what-is-https-filtering) +To block ads and trackers on most websites and in most apps, AdGuard needs to filter their HTTPS traffic. [Read more about HTTPS filtering](/general/https-filtering/what-is-https-filtering) -##### Certificati di sicurezza +##### Security certificates -Per gestire il traffico crittografato, AdGuard installa il proprio certificato CA sul tuo dispositivo. È sicuro: il traffico viene filtrato localmente e AdGuard verifica la sicurezza della connessione. +To manage encrypted traffic, AdGuard installs its CA certificate on your device. It's safe: the traffic is filtered locally and AdGuard verifies the security of the connection. -Sulle versioni precedenti di Android, il certificato viene installato automaticamente. Su Android 11 e successive, devi installarlo manualmente. [Istruzioni per l'installazione](/adguard-for-android/solving-problems/manual-certificate/) +On older versions of Android, the certificate is installed automatically. On Android 11 and later, you need to install it manually. [Installation instructions](/adguard-for-android/solving-problems/manual-certificate/) -Il certificato CA nell'archivio dell'utente è sufficiente per filtrare il traffico HTTPS nei browser e su alcune app. Tuttavia, esistono delle app che si fidano soltanto dei certificati dall'archivio di sistema. Per filtrare il traffico HTTPS su questi, devi installare il certificato CA di AdGuard nell'archivio di sistema. [Istruzioni](/adguard-for-android/solving-problems/https-certificate-for-rooted/) +The CA certificate in the user store is enough to filter HTTPS traffic in browsers and some apps. However, there are apps that only trust certificates from the system store. To filter HTTPS traffic there, you need to install AdGuard's CA certificate into the system store. [Instructions](/adguard-for-android/solving-problems/https-certificate-for-rooted/) -##### App con filtraggio HTTPS +##### HTTPS-filtered apps -Questa sezione contiene l'elenco delle app per cui AdGuard filtra il traffico HTTPS. Ti preghiamo di notare che l'impostazione è applicabile a tutte le app soltanto se disponi dei certificati CA sia nell'archivio utente che nell'archivio di sistema. +This section contains the list of apps for which AdGuard filters HTTPS traffic. Ti preghiamo di notare che l'impostazione è applicabile a tutte le app soltanto se disponi dei certificati CA sia nell'archivio utente che nell'archivio di sistema. -##### Siti web con filtraggio HTTPS +##### HTTPS-filtered websites -Quest'impostazione ti consente di gestire i siti web per cui AdGuard dovrebbe filtrare il traffico HTTPS. +This setting allows you to manage websites for which AdGuard should filter HTTPS traffic. -Il Filtraggio HTTPS consente ad AdGuard di filtrare i contenuti di richieste e risposte, senza mai raccogliere o archiviare tali dati. Tuttavia, per aumentare la sicurezza, noi [escludiamo i siti web che contengono informazioni potenzialmente sensibili dal filtraggio HTTPS](/general/https-filtering/what-is-https-filtering/#financial-websites-and-websites-with-sensitive-personal-data). +HTTPS filtering allows AdGuard to filter the content of requests and responses, but we never collect or store this data. However, to increase security, we [exclude websites that contain potentially sensitive information from HTTPS filtering](/general/https-filtering/what-is-https-filtering/#financial-websites-and-websites-with-sensitive-personal-data). -Inoltre, puoi aggiungere i siti web che consideri necessari alle esclusioni, selezionando una delle modalità: +You can also add websites that you consider necessary to exclusions by selecting one of the modes: -- Escludi siti web specifici dal Filtraggio HTTPS -- Filtra il traffico HTTPS soltanto sui siti web aggiunti alle esclusioni +- Exclude specific websites from HTTPS filtering +- Filter HTTPS traffic only on the websites added to exclusions -Per impostazioni predefiniti, inoltre, non filtriamo i siti web che dispongono di certificati di Convalida Estesa (EV), come i siti web finanziari. Se necessario, puoi abilitare l'opzione _Filtra siti web con certificati EV_. +By default, we also do not filter websites with Extended Validation (EV) certificates, such as financial websites. Se necessario, puoi abilitare l'opzione _Filtra siti web con certificati EV_. #### Proxy -Puoi configurare AdGuard per instradare tutto il traffico del tuo dispositivo attraverso il tuo proxy. [Come impostare un proxy in uscita](/adguard-for-android/solving-problems/outbound-proxy) +You can set up AdGuard to route all your device's traffic through your proxy server. [How to set up an outbound proxy](/adguard-for-android/solving-problems/outbound-proxy) -In questa sezione, inoltre, puoi configurare una VPN di terze parti affinché funzioni con AdGuard, se il fornitore della tua VPN lo consente. +In this section, you can also set up a third-party VPN to work with AdGuard, if your VPN provider allows it. -In _App operanti tramite proxy_, puoi selezionare le app che instraderanno il proprio traffico attraverso il tuo proxy specificato. Se hai abilitato _Integrazione con AdGuard VPN_, quest'impostazione svolge il ruolo delle esclusioni delle app di AdGuard VPN: ti consente di specificare le app da instradare attraverso il Tunnel VPN di AdGuard. +Under _Apps operating through proxy_, you can select apps that will route their traffic through your specified proxy. If you have _Integration with AdGuard VPN_ enabled, this setting plays the role of AdGuard VPN's app exclusions: it allows you to specify apps to be routed through the AdGuard VPN tunnel. -#### Modalità d'instradamento +#### Routing mode -Questa sezione ti consente di selezionare il metodo di filtraggio del traffico. +This section allows you to select the traffic filtering method. -- _VPN Locale_ filtra il traffico attraverso una VPN creata localmente. Questa è la modalità più affidabile. A causa delle limitazioni di Android, inoltre, è il solo metodo di filtraggio del traffico disponibile a livello di sistema, sui dispositivi senza permessi di root. +- _Local VPN_ filters traffic through a locally created VPN. This is the most reliable mode. Due to Android restrictions, it is also the only system-wide traffic filtering method available on non-rooted devices. :::note -La modalità _VPN Locale_ non consente che AdGuard sia usata assieme ad altre VPN. Per usare un'altra VPN con AdGuard, devi riconfigurarla affinché funzioni in modalità proxy, e configurare un proxy in uscita su AdGuard. Per AdGuard VPN, questo viene fatto automaticamente con l'aiuto della [_Modalità Integrata_](/adguard-for-android/features/integration-with-vpn). +The _Local VPN_ mode doesn't allow AdGuard to be used simultaneously with other VPNs. To use another VPN with AdGuard, you need to reconfigure it to work in proxy mode and set up an outbound proxy in AdGuard. For AdGuard VPN, this is done automatically with the help of the [_Integrated mode_](/adguard-for-android/features/integration-with-vpn). ::: -- Il _proxy automatico_ è un metodo di instradamento del traffico alternativo che non richiede l'uso di una VPN. Un vantaggio significativo è che può essere eseguito insieme a una VPN. Questa modalità richiede l'accesso di root. +- _Automatic proxy_ is an alternative traffic routing method that does not require the use of a VPN. One significant advantage is that it can be run in parallel with a VPN. This mode requires root access. -- Il _proxy manuale_ prevede la configurazione di un server proxy su una porta specifica, poi configurabile nelle impostazioni del Wi-Fi. Questa modalità richiede l'accesso di root per Android 10 e superiori. +- _Manual proxy_ involves setting up a proxy server on a specific port, which can then be configured in Wi-Fi settings. This mode requires root access for Android 10 and above. ## Licenza -In questa sezione, puoi trovare le informazioni sulla tua licenza, e gestirla: +In this section, you can find information about your license and manage it: -- Compra una licenza AdGuard per attivare le [funzionalità della versione completa](/adguard-for-android/features/free-vs-full) -- Accedi al tuo profilo di AdGuard o inserisci la chiave di licenza per attivare la tua licenza -- Iscriviti per attivare il tuo periodo di prova di 7 giorni, se non lo hai ancora usato -- Aggiorna lo stato della licenza dal menu' dei tre punti (⋮) -- Apri il profilo di AdGuard per gestirvi la tua licenza -- Ripristina la tua licenza: ad esempio, se hai raggiunto il limite di dispositivi per questa licenza, e desideri applicarla a un altro +- Buy an AdGuard license to activate [the full version's features](/adguard-for-android/features/free-vs-full) +- Log in to your AdGuard account or enter the license key to activate your license +- Sign up to activate your 7-day trial period if you haven't used it yet +- Refresh the license status from the three-dots menu (⋮) +- Open the AdGuard account to manage your license there +- Reset your license — for example, if you've reached device limit for this license and want to apply another one -![Schermata della licenza \*mobile_border](https://cdn.adtidy.org/blog/new/3wyh5hlicense.png) +![License screen \*mobile_border](https://cdn.adtidy.org/blog/new/3wyh5hlicense.png) -## Assistenza +## Supporto -Usa questa sezione se hai qualsiasi domanda o suggerimento riguardanti AdGuard per Android. Consigliamo di consultare _[FAQ](https://adguard.com/support/adguard_for_android.html)_ o queste nozioni di base prima di contattare l'assistenza. +Use this section if you have any questions or suggestions regarding AdGuard for Android. We recommend consulting _[FAQ](https://adguard.com/support/adguard_for_android.html)_ or this knowledge base before contacting support. -![Assistenza \*mobile_border](https://cdn.adtidy.org/blog/new/cz55usupport.png) +![Support \*mobile_border](https://cdn.adtidy.org/blog/new/cz55usupport.png) -Se noti un'inserzione non bloccata, segnalala tramite _Segnala bloccaggio scorretto_. +If you notice a missed ad, please report it via _Report incorrect blocking_. -Per i comportamenti inaspettati dell'app, seleziona _Segnala un bug_. Se possibile, descrivi il tuo problema nei dettagli e aggiungi i registri dell'app. [Come descrivere un problema](/guides/report-bugs/#how-to-describe-a-problem) +For unexpected app behavior, select _Report a bug_. If possible, describe your problem in detail and add app logs. [How to describe an issue](/guides/report-bugs/#how-to-describe-a-problem) -Per i tuoi suggerimenti, usa _Richiedi una funzione_. +For your suggestions, use _Request a feature_. :::note -GitHub è un metodo alternativo per segnalare i bug e suggerire nuove funzionalità. [Istruzioni e collegamenti del dispensario](/guides/report-bugs/#adguard-for-android) +GitHub is an alternative way to report bugs and suggest new features. [Instructions and repository links](/guides/report-bugs/#adguard-for-android) ::: diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/installation.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/installation.md index 153452e9bdd..f16e24f264c 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/installation.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/installation.md @@ -5,70 +5,70 @@ sidebar_position: 2 :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) +Questo articolo riguarda AdGuard per Android, un blocca-inserzioni multifunzionale che protegge il tuo dispositivo a livello di sistema. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) ::: ## Requisiti di sistema -**OS version:** Android 9.0 or higher +**Versione OS:** Android 9.0 o superiore **RAM:** almeno 2 GB -**Free disk space:** 500 MB +**Spazio libero su disco:** 500 MB ## Installazione -Most Android-based apps are distributed via Google Play; however, AdGuard is not presented there, because Google prohibits distribution of network-level ad blockers via Google Play, i.e. apps that block commercials in other apps. You will find more information about Google restrictive policy [in our blog](https://adguard.com/blog/adguard-google-play-removal.html). +Gran parte delle app basate su Android sono distribuite tramite Google Play; tuttavia, AdGuard non è presente, poiché Google proibisce la distribuzione di blocchi di annunci a livello di rete tramite Google Play, ovvero, le app che bloccano gli annunci su altre app. Troverai ulteriori informazioni sulla politica restrittiva di Google [nel nostro blog](https://adguard.com/blog/adguard-google-play-removal.html). -That’s why you can only install AdGuard for Android manually. To use the app on your mobile device, you will need to do the following. +Ecco perché puoi soltanto installare AdGuard per Android manualmente. Per utilizzare l'app sul tuo dispositivo mobile, dovrai fare quanto segue. -1. **Download the app on your device**. Here are a few ways you can do this: +1. **Scarica l'app sul tuo dispositivo**. Ecco alcuni modi per farlo: - - head over to [our website](https://adguard.com/adguard-android/overview.html) and tap the *Download* button - - start the browser and type in the following URL: [https://adguard.com/apk](https://adguard.com/apk) - - or scan this QR code: + - vai [sul nostro sito web](https://adguard.com/adguard-android/overview.html) e tocca il pulsante *Scarica* + - avvia il browser e digita il seguente URL: [https://adguard.com/apk](https://adguard.com/apk) + - o scansiona questo codice QR: - ![QR code *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst-qr-en-1.png) + ![Codice QR *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst-qr-en-1.png) -1. **Allow installing apps from unknown sources**. Once the file download is complete, tap *Open* in the notification. +1. **Consenti l'installazione di app da fonti sconosciute**. Una volta completato il download del file, tocca su *Apri* nella notifica. - ![Installing apps from unknown sources *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_1.png) + ![Installare app da fonti sconosciute *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_1.png) - A popup will appear. Tap *Settings*, navigate to *Install unknown apps*, and grant permission for the browser you've used to download the file. + Apparirà un popup. Tocca su *Impostazioni* naviga a *Installa app sconosciute* e concedi l'autorizzazione per il browser che hai utilizzato per scaricare il file. - ![Installing apps from unknown sources *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_3.png) + ![Installare app da fonti sconosciute *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_3.png) -1. **Install the app**. Once the browser has obtained the necessary permissions, the system will ask you if you want to install the AdGuard app. Tap *Install*. +1. **Installa l'app**. Una volta che il browser avrà ottenuto le autorizzazioni necessarie, il sistema ti chiederà se desideri installare l'app di AdGuard. Tocca su *Installa*. - ![Installing apps from unknown sources *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_4.png) + ![Installare app da fonti sconosciute *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_4.png) - You will then be asked to read AdGuard's *License agreement* and *Privacy policy*. You can also participate in product development. To do this, check the boxes for *Send crash reports automatically* and *Send technical and interaction data*. Then tap *Continue*. + Quindi, ti sarà chiesto di leggere l'*Accordo di licenza* e la *Politica sulla riservatezza* di AdGuard. Puoi anche partecipare allo sviluppo del prodotto. Per farlo, spunta le caselle per *Invia automaticamente segnalazioni sugli arresti anomali* e *Invia dati tecnici e d'interazione*. Quindi, tocca su *Continua*. - ![Privacy policy *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/fl_3.png) + ![Politica di riservatezza *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/fl_3.png) -1. **Create a local VPN**. In order to filter all traffic directly on your device and not route it through a remote server, AdGuard needs to establish a VPN connection. +1. **Crea una VPN locale**. Per poter filtrare tutto il traffico direttamente sul tuo dispositivo e non indirizzarlo attraverso un server remoto, AdGuard deve stabilire una connessione VPN. - ![Create a local VPN *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/fl_2.png) + ![Creare una VPN locale *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/fl_2.png) -1. **Enable HTTPS filtering**. It is not a mandatory option, however, we advice to turn it on for the best ad-blocking quality. +1. **Abilita il filtraggio HTTPS**. Non è un'opzione obbligatoria, tuttavia, consigliamo di attivarla per una migliore qualità del blocco degli annunci. - If your device is running Android 7–9, you'll be prompted to install a root certificate and configure HTTPS filtering after the local VPN setup. + Se il tuo dispositivo ha Android da 7 a 9, ti sarà richiesto di installare un certificato di root e di configurare il filtraggio HTTPS, in seguito alla configurazione della VPN locale. - ![Enable HTTPS filtering on Android 7-9 *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/cert_1.jpg) + ![Abilitare il Filtraggio HTTPS su Android da 7 a 9 *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/cert_1.jpg) - After you tap *Install now*, a prompt will appear asking you to authenticate the certificate installation with a password or fingerprint. + Dopo aver toccato su *Installa ora*, apparirà una richiesta di autenticare l'installazione del certificato con una password, o con l'impronta digitale. - ![Enable HTTPS filtering on Android 7-9. Step 2 *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/cert_2.jpg) + ![Abilitare il Filtraggio HTTPS su Android da 7 a 9. Fase 2 *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/cert_2.jpg) - If you have Android 10+ on your device, then after creating a local VPN, you will see the main app screen with a snack bar at the bottom with a suggestion to enable HTTPS filtering: tap *Enable* and follow the instructions on the next screen or check [the article about certificate installation](solving-problems/manual-certificate.md) for more information. + Se hai Android 10 o superiori sul tuo dispositivo, dopo aver creato una VPN locale, vedrai la schermata principale dell'app con una barretta in basso, e il suggerimento di abilitarre il Filtraggio HTTPS. Tocca su *Abilita* e segui le istruzioni sulla schermata successiva, o consulta [l'articolo sull'installazione del certificato](solving-problems/manual-certificate.md), per ulteriori informazioni. - ![Enable HTTPS filtering *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/fl_5.png) + ![Abilitare il Filtraggio HTTPS *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/fl_5.png) -## Uninstalling/Reinstalling AdGuard +## Disinstallare/Reinstallare AdGuard -If you need to uninstall AdGuard on your mobile device, open *Settings* and choose *Apps* (Android 7) or *Apps & notifications* (Android 8+). Find AdGuard in the list of installed apps and press *Uninstall*. +Se devi disinstallare AdGuard sul tuo dispositivo mobile, apri le *Impostazioni* e scegli *App* (Android 7) o *App e notifiche* (Android 8 e superiori). Trova AdGuard nell'elenco delle app installate e premi su *Disinstalla*. -![Reinstall AdGuard *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_4.png) +![Reinstallare AdGuard *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_4.png) -To reinstall AdGuard, just download the apk file again and follow the steps outlined in the Installation section. Uninstallation is not required beforehand. +Per reinstallare AdGuard, basterà riscaricare il file APK e seguire i passaggi descritti nella sezione Installazione. La disinstallazione non è preventivamente richiesta. diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 5e75a51f1e8..b77c22b4295 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info @@ -46,7 +46,7 @@ Done, AdGuard for Android TV is installed. - On your Android TV, navigate to Settings. - Select _System_ → _About_. - Find _Network_ and select _Wi-Fi_ or _Ethernet_, depending on your connection type. - - Go to the network section and find _IP address_. Note down this IP address. + - Go to the network section and find _IP address_. Annota questo indirizzo IP. 5. Connect to Android TV via ADB: diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index a2da681d7e6..6a5aed1dcc7 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,11 +1,11 @@ --- -title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +title: Come disabilitare la funzione auto-bloccaggio di Samsung +sidebar_position: 18 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) +Questo articolo riguarda AdGuard per Android, un blocca-inserzioni multifunzionale che protegge il tuo dispositivo a livello di sistema. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) ::: diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index 9ec84d28340..652e6947bef 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: Come proteggere AdGuard dalla disabilitazione da parte del sistema -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 460502b6c7e..654e9078990 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ Tuttavia, gli utenti di AdGuard possono sempre ottenere un quadro reale della si All'interno troverai un grafico che mostra il consumo di risorse della batteria di AdGuard nelle ultime 24 ore, con un'opzione per ottenere dati orari più dettagliati toccando il grafico. Inoltre, è anche presente una ripartizione numerica dei dati rilevanti e una breve spiegazione tecnica. +Ci sono diversi altri parametri sotto il grafico: *CPU in primo piano*, *CPU in background*, *Uso dati mobile*, e *Uso dati Wi-Fi*. + +*CPU in primo piano* e *CPU in background* mostrano quanto tempo della CPU è usato da AdGuard quando l'app è attiva o in esecuzione dietro le quinte. + +E con *l'uso dei dati mobile* e *l'uso dei dati Wi-Fi*, puoi vedere quanto traffico AdGuard ha consumato quando il tuo telefono usava la rete globale mobile o era connesso a Wi-Fi. + ### Quanta batteria consuma davvero AdGuard? Prima di tutto, stabiliamo un po' di teoria e collegamenti con i dati necessari. @@ -57,4 +63,4 @@ Prima di tutto, stabiliamo un po' di teoria e collegamenti con i dati necessari. ### Conclusione -Il consumo reale è **di diverse volte inferiore** di quanto mostrato nelle statistiche di Android. Instead of 220mAh it should be somewhere around 31-40mAh. On the other hand, browser's consumption should be not 66mAh, but ~200mAh. +Il consumo reale è **di diverse volte inferiore** di quanto mostrato nelle statistiche di Android. Invece di 220mAh dovrebbe aggirarsi tra i 31 e i 40 mAh. D'altra parte, il consumo dei browser non dovrebbe essere di 66mAh, ma di circa 200mAh. diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 40f8456d7a7..d035e1ac897 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,11 +1,11 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) +Questo articolo riguarda AdGuard per Android, un blocca-inserzioni multifunzionale che protegge il tuo dispositivo a livello di sistema. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) ::: @@ -18,7 +18,7 @@ If you are using AdGuard in the *Local VPN* filtering mode, you cannot run other - Switch to the *Automatic proxy* mode. When you do that, AdGuard will no longer use local VPN and will reconfigure iptables instead - Switch to the *Manual proxy* mode. To do this, go to *Settings* → *Filtering* → *Network* → *Routing mode* -:::note Compatibility +:::note Compatibilità The *Automatic proxy* mode is only accessible on rooted devices. For *Manual proxy*, rooting is required on devices running on Android 10 or later. @@ -40,7 +40,7 @@ To be able to filter HTTPS traffic, AdGuard requires the user to add a certifica - To solve this problem, move the [certificate to the system certificate store](../solving-problems/https-certificate-for-rooted.md/) -:::note Compatibility +:::note Compatibilità Requires root access. diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index 128a1116a72..596c9abc60f 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,15 +1,15 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) +Questo articolo riguarda AdGuard per Android, un blocca-inserzioni multifunzionale che protegge il tuo dispositivo a livello di sistema. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index 6dace487db5..d60bfd1eeb7 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Installazione manuale del certificato di sicurezza nel browser di Firefox -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/har.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/har.md index 170397660c6..3f93f66136b 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/har.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/har.md @@ -5,7 +5,7 @@ sidebar_position: 5 :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) +Questo articolo riguarda AdGuard per Android, un blocca-inserzioni multifunzionale che protegge il tuo dispositivo a livello di sistema. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) ::: diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index 629a6efbd6c..e7a3e6528f1 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,11 +1,11 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) +Questo articolo riguarda AdGuard per Android, un blocca-inserzioni multifunzionale che protegge il tuo dispositivo a livello di sistema. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) ::: diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/log.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/log.md index 02fa6520793..585533df630 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/log.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/log.md @@ -5,7 +5,7 @@ sidebar_position: 2 :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) +Questo articolo riguarda AdGuard per Android, un blocca-inserzioni multifunzionale che protegge il tuo dispositivo a livello di sistema. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) ::: diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 3afc1650676..2db1165d0be 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,11 +1,11 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) +Questo articolo riguarda AdGuard per Android, un blocca-inserzioni multifunzionale che protegge il tuo dispositivo a livello di sistema. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) ::: @@ -36,7 +36,7 @@ Follow these steps to install the AdGuard certificate: You're all set! Once the certificate is installed successfully, you've enabled HTTPS filtering. -Please note that the steps provided are based on the Google Pixel 7 smartphone. If you're using a different Android device, the exact menu names or options might vary. For easier navigation consider searching for a certificate by entering “certificate” or “credentials” in the settings search bar. +Ti preghiamo di notare che i passaggi forniti si basano sullo smartphone Google Pixel 7. If you're using a different Android device, the exact menu names or options might vary. For easier navigation consider searching for a certificate by entering “certificate” or “credentials” in the settings search bar. If you experience issues during the manual certificate installation (for example, you installed the certificate, but the application keeps ignoring it), you can follow one of the solutions below. diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 178f7313094..c25207cc9bc 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,11 +1,11 @@ --- title: Problemi causati da profili utente multipli -sidebar_position: 10 +sidebar_position: 9 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) +Questo articolo riguarda AdGuard per Android, un blocca-inserzioni multifunzionale che protegge il tuo dispositivo a livello di sistema. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) ::: @@ -21,37 +21,37 @@ Per risolvere questo problema, devi disinstallare l'applicazione per tutti gli u ![Uninstall *mobile border](https://cdn.adtidy.org/blog/new/tu49hmultiple_users.png) -## Problems caused by using a Restricted Mode profile +## Problemi causati dall'uso di un profilo in Modalità Limitata -The owners of phones, tablets, or TVs running the Android 7+ operating system might face the problem caused by using **a profile with Restricted Mode**. If you have such a profile, **AdGuard**, like other applications that use VPN, gets restrictions on selective filtering of VPN traffic. As a result, AdGuard cannot launch protection in a **local VPN mode**. Also, one of the reasons for this situation may be using **Dual App/Dual Messenger profile** on your device. Below are described the recommendations that you can apply when this problem occurs. +I possessori di telefoni, tablet o TV con sistema operativo Android 7 e successive, potrebbero riscontrare il problema causato dall'uso del **profilo con Modalità Limitata**. Se hai un profilo da tal tipo, **AdGuard**, come altre applicazioni che utilizzano la VPN, riceve limitazioni sul filtraggio selettivo del traffico VPN. Di conseguenza, AdGuard non può avviare la protezione in una **modalità VPN locale**. Inoltre, uno dei motivi di tale situazione potrebbe essere l'uso del **profilo Dual App/Dual Messenger** sul tuo dispositivo. Di seguito, sono descritti i consigli applicabili quando si verifica questo problema. -### Solutions +### Soluzioni -You have three ways to solve the issue: +Hai tre modi per risolvere questo problema: -### Option 1: Grant permissions to AdGuard using ADB +### Opzione 1: Concedere le autorizzazioni ad AdGuard utilizzando ADB :::note -This approach is available starting from **AdGuard v3.5 nightly 6**. If you're using an older version, you can get the latest update [here](https://adguard.com/adguard-android/overview.html). +Questo approccio è disponibile a partire da **AdGuard v3.5 nightly 6**. Se stai utilizzando una versione precedente, puoi ottenere [qui](https://adguard.com/adguard-android/overview.html) l'ultimo aggiornamento. ::: 1. Attiva la **modalità sviluppatore** e abilita il **Debug USB**: - - Open the **Settings** app phone; + - Apri l'app **Impostazioni** del dispositivo; - Vai alla sezione **Sistema** (ultima voce nel menu delle impostazioni). In questa sezione, trova **Informazioni sul telefono**; - Tocca la riga **Numero di build** per 7 volte. Dopodiché, riceverai la notifica "**Sei ora uno sviluppatore**" (Se necessario, inserisci un codice di sblocco per il dispositivo); - Apri le **Impostazioni di sistema** → **Opzioni per sviluppatori** → Scorri in basso e abilita **Debug USB** → Conferma che il debug sia abilitato nella finestra **Consenti debug USB**, dopo aver letto attentamente l'avviso. :::note - If you have any difficulties or additional questions, full instructions can be found [here](https://developer.android.com/studio/debug/dev-options). + In caso di qualsiasi difficoltà o domanda aggiuntiva, puoi trovare [qui](https://developer.android.com/studio/debug/dev-options) le istruzioni complete. ::: -1. [Install and configure](https://www.xda-developers.com/install-adb-windows-macos-linux/) ADB; On the Windows platform, **Samsung** owners may need to install [this utility](https://developer.samsung.com/mobile/android-usb-driver.html). +1. [Installa e configura](https://www.xda-developers.com/install-adb-windows-macos-linux/) ADB; Sulla piattaforma Windows, i proprietari di **Samsung** potrebbero dover installare [questa utility](https://developer.samsung.com/mobile/android-usb-driver.html). 1. Connect your device using a **USB cable** to the computer or laptop on which you installed **ADB**; @@ -62,23 +62,23 @@ This approach is available starting from **AdGuard v3.5 nightly 6**. If you're u 1. Enter the command `adb shell pm grant com.adguard.android android.permission.INTERACT_ACROSS_USERS` and press **Enter**. -### Option 2: Remove *restricted user account* +### Opzione 2: Rimuovere il *profilo da utente limitato* -About how to manage user accounts from an Android device you can [find here](https://support.google.com/a/answer/6223444?hl=en). +Puoi [trovare qui](https://support.google.com/a/answer/6223444?hl=en) le informazioni su come gestire i profili utente da un dispositivo Android. :::note -In some cases restricted user accounts are created implicitly and cannot be removed. For instance, when you use Dual Messenger or Dual App features on **Samsung** or **LG** devices. You can read below how to fix the issue in these cases. +In alcuni casi gli account utente con restrizioni vengono creati implicitamente e non possono essere rimossi. Ad esempio, quando usi le funzioni Dual Messenger o Dual App nei dispositivi **Samsung** o **LG**. Puoi leggere di seguito come risolvere il problema in questi casi. ::: -### Option 3: Use AdGuard in *Local HTTP proxy mode* (requires root) +### Opzione 3: Utilizzare AdGuard in *Modalità proxy HTTP Locale* (richiede root) -To enable this mode, open **AdGuard Settings** → **Network** → **Filtering method** → **Local HTTP proxy** +Per attivare questa modalità, apri le **Impostazioni AdGuard** → **Rete** → **Metodo di filtraggio** → **Proxy HTTP locale** -### LG and Samsung devices +### Dispositivi LG e Samsung -Owners of **LG** or **Samsung** phones may also encounter a similar issue. It can be caused by using **Dual App/Dual Messenger** function (which automatically creates a restricted profile). To solve this issue, you need to disable this feature. +I possessori di telefoni **LG** o **Samsung** potrebbero inoltre riscontrare un simile problema. Può essere causato dall'utilizzo della funzione **Dual App/Dual Messenger** (che crea automaticamente un profilo limitato). Per risolvere questo problema, devi disabilitare questa funzionalità. ### Samsung diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 9106e8bd9e6..c3e529a2b13 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,11 +1,11 @@ --- title: How to set up outbound proxy -sidebar_position: 8 +sidebar_position: 7 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) +Questo articolo riguarda AdGuard per Android, un blocca-inserzioni multifunzionale che protegge il tuo dispositivo a livello di sistema. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) ::: diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index 31ade34da2d..08c0725971b 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,38 +1,38 @@ --- -title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +title: Come utilizzare Samsung Pay con AdGuard in Corea del Sud +sidebar_position: 16 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) +Questo articolo riguarda AdGuard per Android, un blocca-inserzioni multifunzionale che protegge il tuo dispositivo a livello di sistema. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) ::: -A number of users have encountered an issue where Samsung Pay does not work while AdGuard is running. This issue occurs almost exclusively on devices registered in South Korea. +Un certo numero di utenti ha riscontrato un problema in cui Samsung Pay non funziona mentre AdGuard è in esecuzione. This issue occurs almost exclusively on devices registered in South Korea. -What is causing this issue? Sometimes Samsung Pay does not work on devices with VPN services running, and AdGuard is one of these apps. By default, AdGuard uses a local VPN to filter traffic, which can cause problems when using Samsung Pay. +What is causing this issue? A volte Samsung Pay non funziona su dispositivi con servizi VPN in esecuzione e AdGuard è una di queste app. Di default, AdGuard utilizza una VPN locale per filtrare il traffico, il che può causare dei problemi utilizzando Samsung Pay. -As a consequence, users had to disable AdGuard when making payments with Samsung Pay. This can be avoided with the *Detect Samsung Pay* feature. When this option is enabled, the AdGuard app is paused whenever the user opens the Samsung Pay app and resumes when the app is closed. +Di conseguenza, gli utenti devono disabilitare AdGuard, quando effettuano dei pagamenti con Samsung Pay. Ciò si può evitare con la funzionalità *Rileva Samsung Pay*. Quando quest'opzione è abilitata, l'app di AdGuard viene messa in pausa quando l'utente apre l'app di Samsung Pay, e riprende quando l'app viene chiusa. :::note -This feature will work only if the Local VPN filtering mode is chosen in AdGuard settings. If another mode is being used, Samsung Pay will function without any interruptions. +This feature will work only if the Local VPN filtering mode is chosen in AdGuard settings. Se un'altra modalità è in uso, Samsung Pay funzionerà senza alcuna interruzione. ::: -To enable *Detect Samsung Pay*, follow these steps: +Per abilitare *Rileva Samsung Pay*, segui questi passaggi: 1. Go to *Settings* → *General* → *Advanced*→ *Low-level settings*. -1. Scroll to *Detect Samsung Pay* and move the slider to the right. +1. Scorri fino a *Rileva Samsung Pay* e sposta il cursore verso destra. 1. Tap *Allow permissions* and give AdGuard access to information about the use of other apps. -We need it to collect statistics about the operation of Samsung Pay in order for the *Detect Samsung Pay* feature to work. +Le necessitiamo per raccogliere statistiche sull'operazione di Samsung Pay, e affinché la funzionalità *Rileva Samsung Pay* funzioni. -After enabling this feature, when you switch from Samsung Pay to AdGuard, the following message will appear as shown in the screenshot. +Dopo aver abilitato questa funzionalità, quando passi da Samsung Pay ad AdGuard, il seguente messaggio apparirà come mostrato nello screenshot. ![samsungpay *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/samsungpay-with-adguard-in-south-korea/samsung_pay.png) -Alternatively, you can disable filtering for Samsung Pay in *App management*. Simply go to the *App management* screen (third tab from the bottom), find Samsung Pay in the list, and turn off the switch at *Route traffic through AdGuard*. +Altrimenti, puoi disabilitare il filtraggio per Samsung Pay in *Gestione app*. Basta andare alla schermata *Gestione app* (terza scheda dal basso), trovare Samsung Pay nell'elenco, e disabilitare *Instrada traffico attraverso AdGuard*. diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index a8c84df3259..0b090813f02 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,15 +1,15 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) +Questo articolo riguarda AdGuard per Android, un blocca-inserzioni multifunzionale che protegge il tuo dispositivo a livello di sistema. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) ::: -If you install AdGuard to [the *Secure folder* on your Android](https://www.samsung.com/uk/support/mobile-devices/what-is-the-secure-folder-and-how-do-i-use-it/) (this applies mainly to Samsung devices), you may face some difficulties when installing the HTTPS certificate. The thing is, the *Secure folder* has its own space where the certificates are stored. However, if you do everything according to the regular certificate installation instructions ([described here](/adguard-for-android/features/settings#https-filtering)), the certificate will be installed into the main memory and will play no role for your ad blocker in the *Secure folder*. To solve this problem and install the certificate for your AdGuard for Android into the *Secure folder's* storage, please follow these instructions instead: +Se installi AdGuard in [la *Cartella sicura* sul tuo Android](https://www.samsung.com/uk/support/mobile-devices/what-is-the-secure-folder-and-how-do-i-use-it/) (ciò si applica principalmente ai dispositivi Samsung), potresti incontrare delle difficoltà nell'installazione del certificato HTTPS. The thing is, the *Secure folder* has its own space where the certificates are stored. However, if you do everything according to the regular certificate installation instructions ([described here](/adguard-for-android/features/settings#https-filtering)), the certificate will be installed into the main memory and will play no role for your ad blocker in the *Secure folder*. To solve this problem and install the certificate for your AdGuard for Android into the *Secure folder's* storage, please follow these instructions instead: 1. After installing the app and connecting the local VPN, tap **ENABLE** next to the *HTTPS filtering is off* message. 1. Tap **Next** → **Next** → **Save it now** → **Save certificate**. diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/solving-problems.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/solving-problems.md index 2a7f0565c34..67c20e6fcec 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/solving-problems.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/solving-problems.md @@ -5,7 +5,7 @@ sidebar_position: 1 :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) +Questo articolo riguarda AdGuard per Android, un blocca-inserzioni multifunzionale che protegge il tuo dispositivo a livello di sistema. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) ::: @@ -26,5 +26,5 @@ Ecco alcuni problemi che puoi riscontrare e le loro soluzioni, guide e istruzion - [Moving the CA certificate to the system store on rooted devices](/adguard-for-android/solving-problems/https-certificate-for-rooted.md) - [Known compatibility issues with Android apps](/adguard-for-android/solving-problems/compatibility-issues.md) - [How to install AdGuard for Android TV](/adguard-for-android/solving-problems/adguard-for-android-tv.md) -- [How to use Samsung Pay with AdGuard in South Korea](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md) +- [Come usare Samsung Pay con AdGuard in Corea del Sud](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md) - [Problems caused by extending restricted settings](/adguard-for-android/solving-problems/extending-restricted-settings.md) diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/tasker.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/tasker.md index c770453a4bf..dbee3fabef1 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/tasker.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/tasker.md @@ -5,7 +5,7 @@ sidebar_position: 3 :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) +Questo articolo riguarda AdGuard per Android, un blocca-inserzioni multifunzionale che protegge il tuo dispositivo a livello di sistema. Per vedere come funziona, [scarica l'app di AdGuard](https://agrd.io/download-kb-adblock) ::: @@ -118,7 +118,7 @@ Or you can configure remove parameters manually: `[trust]` applies for **HTTPS_CONNECT** server type only and include option **Trust any certificates**. It is necessary to set **true or false** value. -:::note Example +:::note Esempio `setting by name`: server:MyServer diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index 6b7e874d36b..3a23c8ebf27 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: Come bloccare gli annunci nell'app di YouTube -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 045f10e477c..810a6a3d3f3 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,88 +5,150 @@ sidebar_position: 2 ## Installa AdGuard per Linux -Per installare AdGuard, inserisci: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Versione +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` -Se necessario, inserisci la password di amministratore. +If required, enter your admin password. -Premi `y` per creare un collegamento in `/usr/local/bin` all'eseguibile e attendi il completamento dell'installazione. +Press `y` to create a link in `/usr/local/bin` to the executable and wait until the installation is complete. :::note -Puoi verificare la firma per dimostrare che si tratta di una versione ufficiale di AdGuard usando lo strumento `gpg`. [Leggi di più su GitHub](https://github.com/AdguardTeam/AdGuardCLI?tab=readme-ov-file#verify-releases) +You can verify the signature to prove it’s an official version of AdGuard by using the `gpg` tool. [Read more on GitHub](https://github.com/AdguardTeam/AdGuardCLI?tab=readme-ov-file#verify-releases) ::: -## Attiva la licenza +## Initial setup -AdGuard per Linux richiede una [licenza AdGuard](https://adguard.com/license.html). Se non hai ancora una licenza, puoi accedere o creare un account per ottenere un periodo di prova gratuito di 14 giorni. Se hai già una licenza, accedi per attivarla. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -Per accedere o creare un account, digitare: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -Per reimpostare la tua licenza, digita: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -Per vedere le informazioni sulla licenza, digita: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Configurazione iniziale +4. After activation, you can continue to work with the program: -Per far funzionare AdGuard, è necessario completare la configurazione iniziale. Ciò include l'installazione del Certificato CA di AdGuard, l'abilitazione dei filtri necessari e la selezione della modalità proxy. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -Per avviare la configurazione guidata, inserisci: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` -## Disinstalla AdGuard per Linux + or view the license info by entering -Per disinstallare AdGuard, inserisci: + ```sh + adguard-cli license + ``` -Versione +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: -``` + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). + +## Uninstall AdGuard for Linux + +To uninstall AdGuard, enter: + +Release + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` -Se necessario, inserisci la password di amministratore. +If required, enter your admin password. diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 1485b2a03e8..d29f30a33e1 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Gestione impostazioni e protezione sidebar_position: 3 --- +## Available commands + Per ottenere una lista di tutti i comandi AdGuard disponibili, inserisci: -``` +```sh adguard-cli --help-all ``` ## Abilita e disabilita protezione +### Enable protection + Per abilitare la protezione, inserisci: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + Per disabilitare la protezione, inserire: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + Per vedere lo stato della protezione, inserisci: -``` +```sh adguard-cli status ``` -## Controlla gli aggiornamenti +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Controlla gli aggiornamenti Per controllare gli aggiornamenti, inserisci: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + Per aggiornare AdGuard per Linux, inserisci: -``` +```sh adguard-cli update ``` +### Update script output + Per vedere il risultato del codice di aggiornamento, inserisci: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Usa il comando `config` per configurare AdGuard per Linux. Sotto-comandi: - `show`: Mostra la configurazione corrente in `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configura un'opzione in `proxy.yaml` - `listen_ports.http_proxy`: porta HTTP di ascolto - `proxy_mode`: Modalità proxy (`manuale` o `automatico`) + - `get`: Ottieni lo stato attuale delle opzioni soprastanti ## Gestisci i filtri @@ -64,8 +90,32 @@ Usa il comando `config` per configurare AdGuard per Linux. Sotto-comandi: Usa il comando `filters` per configurare AdGuard per Linux. Sotto-comandi: - `list`: Elenca i filtri installati + - `--all`: Vedi tutti i filtri + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: installa un filtro. Inserisci l'URL del filtro che desideri installare + - `enable`: Abilita un filtro. Inserisci il nome o l'ID del filtro + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: disabilita un filtro. Inserisci il nome o l'ID del filtro + - `update`: aggiorna i filtri + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-mac/adguard-for-mac.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-mac/adguard-for-mac.md index 27acc04c0fa..3252d363757 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-mac/adguard-for-mac.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-mac/adguard-for-mac.md @@ -11,13 +11,13 @@ Questo articolo riguarda AdGuard per Mac, un blocco annunci multifunzionale che ## Funzionalità -Main features and settings available in AdGuard for Mac +Funzioni principali e impostazioni disponibili in AdGuard per Mac [Funzionalità](/adguard-for-mac/features/features.md) ## Installazione -Installation, removal, and system requirements for AdGuard for Mac +Installazione, rimozione e requisiti di sistema per AdGuard per Mac [Installazione](/adguard-for-mac/installation.md) diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-mac/features/features.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-mac/features/features.md index ce54de1cc5d..d341a0005ca 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-mac/features/features.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-mac/features/features.md @@ -11,25 +11,25 @@ Questo articolo riguarda AdGuard per Mac, un blocco annunci multifunzionale che ## Schermo principale -Main screen with statistics on blocked ads and trackers and access to main settings +Schermata principale con statistiche sugli annunci e tracciatori bloccati e accesso alle impostazioni principali [Finestra principale](/adguard-for-mac/features/main.md) ## Generali -Basic settings to block search ads and website self-promotional ads, enable language-specific filters, and manage _Allowlist_ +Impostazioni di base per bloccare gli annunci di ricerca e gli annunci auto-promozionali del sito web, abilitare i filtri specifici per lingua e gestire la _Lista consentita_ [Generale](/adguard-for-mac/features/general.md) ## Filtri -Filters and user rules to fine-tune ad blocking +Filtri e regole utente per ottimizzare il blocco delle inserzioni [Filtri](/adguard-for-mac/features/filters.md) ## DNS -Impostazioni per un server DNS sicuro e filtri DNS per bloccare le inserzioni, i tracciatori e i siti web pericolosi +Server DNS e filtri DNS che consentono di bloccare inserzioni, tracciatori e siti web pericolosi [DNS](/adguard-for-mac/features/dns.md) @@ -37,28 +37,28 @@ Impostazioni per un server DNS sicuro e filtri DNS per bloccare le inserzioni, i Impostazioni per bloccare cookie, tag UTM e le analisi in rete che raccolgono informazioni sugli utenti -[Stealth Mode](/adguard-for-mac/features/stealth.md) +[Modalità Invisibilità](/adguard-for-mac/features/stealth.md) ## Sicurezza -A setting that blocks access to malicious and phishing websites and protects you from online threats +Un'impostazione che blocca l'accesso a siti web dannosi e di phishing e ti protegge dalle minacce in rete [Sicurezza](/adguard-for-mac/features/security.md) ## Browser Assistant -An extension that complements the desktop program and allows you to manage filtering from your browser +Un'estensione che completa il programma per desktop e consente di gestire il filtraggio dal browser [Browser Assistant](/adguard-for-mac/features/browser-assistant.md) ## Estensioni -A feature that allows you to extend the functionality of websites by adding userscripts and userstyles +Una funzione che consente di estendere le funzionalità dei siti web aggiungendo codici e stili personali [Estensioni](/adguard-for-mac/features/extensions.md) ## Rete -Additional network-related options and proxy settings +Opzioni aggiuntive relative alla rete e impostazioni del proxy [Rete](/adguard-for-mac/features/network.md) diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/adguard-for-windows.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/adguard-for-windows.md index 763c390261d..067eab08a91 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/adguard-for-windows.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/adguard-for-windows.md @@ -11,19 +11,19 @@ Questo articolo riguarda AdGuard per Windows, un blocca-inserzioni multifunziona ## Funzioni -Main features and settings available in AdGuard for Windows +Funzioni principali e impostazioni disponibili in AdGuard per Windows [Funzioni](/adguard-for-windows/features/features.md) ## Installazione -Installation, removal, and system requirements for AdGuard for Windows +Installazione, rimozione e requisiti di sistema per AdGuard per Windows [Installazione](/adguard-for-windows/installation.md) ## Browser Assistant -An extension that complements the desktop program and allows you to manage filtering from your browser +Un'estensione che completa il programma per desktop e consente di gestire il filtraggio dal browser [Browser Assistant](/adguard-for-windows/browser-assistant.md) @@ -35,6 +35,6 @@ Problemi noti e possibili soluzioni ## Documentazione per amministratori -Configuration guide for system administrators +Guida alla configurazione per gli amministratori di sistema [Documentazione per amministratori](/adguard-for-windows/admins-documentation.md) diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index b9144b1e93e..7fdb008822c 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ Questa pagina descrive le funzionalità e i dettagli della gestione centrale di ## 1. Scarica MSI {#msi-download} -Scarica il [AdGuard MSI x86](https://cdn.adtidy.org/distr/windows/AdGuard_x86.msi) +Scarica il [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Scarica il [AdGuard MSI x64](https://cdn.adtidy.org/distr/windows/AdGuard_x64.msi) +Scarica il [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configura le impostazioni per la tua rete {#settings-configuring} diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md index e3b497581db..0c55534a6f6 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md @@ -33,7 +33,7 @@ AdGuard Extra è, essenzialmente, un microprogramma che modifica il funzionament **AdGuard Popup Blocker** -Quest'estensione impedisce l'apertura delle finestre popup quando visualizzi le pagine web. Some popups are considered useful — they may contain settings for site administering or additional reference information demonstrated upon clicking a link. Per questo, puoi disattivare il Blocco, se necessario. Quest'estensione non funziona neanche sui siti web aggiunti all'elenco di eccezioni di AdGuard. È disattivata di default, ma puoi attivarla nelle impostazioni dell'applicazione. +Quest'estensione impedisce l'apertura delle finestre popup quando visualizzi le pagine web. Alcuni pop-up sono considerati utili: possono contenere impostazioni per l'amministrazione del sito o informazioni di riferimento aggiuntive mostrate facendo clic su un collegamento. Per questo, puoi disattivare il Blocco, se necessario. Quest'estensione non funziona neanche sui siti web aggiunti all'elenco di eccezioni di AdGuard. È disattivata di default, ma puoi attivarla nelle impostazioni dell'applicazione. **Web of Trust** diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/features/features.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/features/features.md index 46d568a509f..cda795af9dc 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/features/features.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/features/features.md @@ -11,30 +11,30 @@ Questo articolo riguarda AdGuard per Windows, un blocca-inserzioni multifunziona ## Schermata iniziale -On the main screen you’ll find _Settings_, _Support_, _License_, and _About_, as well as statistics on blocked ads and trackers +Nella schermata principale troverai _Impostazioni_, _Assistenza_, _Licenza_ e _Informazioni_, così come le statistiche sulle inserzioni bloccate e sui tracciatori [Schermata principale](/adguard-for-windows/features/home-screen/) ## Impostazioni -Theme and language settings, ad blocking customization, DNS protection, parental controls, extension management, and advanced options for expert users +Impostazioni di tema e lingua, personalizzazione del blocco delle inserzioni, Protezione DNS, controlli parentali, gestione delle estensioni e opzioni avanzate per utenti esperti [Impostazioni](/adguard-for-windows/features/settings/) ## Estensioni -A feature that allows you to extend the functionality of websites by adding userscripts and userstyles +Una funzione che consente di estendere le funzionalità dei siti web aggiungendo codici e stili personali [Estensioni](/adguard-for-windows/features/extensions/) ## Rete -Additional network-related options and proxy settings +Opzioni aggiuntive relative alla rete e impostazioni del proxy [Rete](/adguard-for-windows/features/network/) ## Altre funzioni -Support, license management, tray menu options, program version and updates +Assistenza, gestione della licenza, opzioni del menu', versione del programma e aggiornamenti [Altre funzioni](/adguard-for-windows/features/others/) diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md index f7da323b873..0ad13c188b1 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md @@ -23,7 +23,7 @@ In fondo alla schermata, troverai le _Impostazioni Avanzate_. Modificarne alcune ### Blocco degli Annunci -Questo è il modulo principale di AdGuard per Windows che rimuove gli annunci dai siti web che visiti e dalle app installate sul tuo dispositivo. To filter out advertising and privacy-threatening content such as banners, popups, or trackers AdGuard uses different filters — groups of rules with a similar purpose written with a [special syntax](/general/ad-filtering/create-own-filters). Per comprendere cosa sono i filtri e come funzionano, leggi [questo articolo](/general/ad-filtering/how-ad-blocking-works). +Questo è il modulo principale di AdGuard per Windows che rimuove gli annunci dai siti web che visiti e dalle app installate sul tuo dispositivo. Per filtrare i contenuti inserzionistici e che minacciano la privacy, quali banner, popup, o tracciatori, AdGuard utilizza filtri differenti: gruppi di regole con uno scopo simile, scritte con una [sintassi speciale](/general/ad-filtering/create-own-filters). Per comprendere cosa sono i filtri e come funzionano, leggi [questo articolo](/general/ad-filtering/how-ad-blocking-works). ![Blocco inserzioni \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/settings_ad_blocker.png) @@ -54,7 +54,7 @@ Per imparare tutto sulla Modalità Stealth e sulle sue tante opzioni, [leggi que La Sicurezza di navigazione offre una forte protezione dai siti web dannosi e di phishing. No, AdGuard per Windows non è un antivirus. Non interromperà il download di un virus quando è già avviato, né eliminerà quelli già esistenti. Ma ti avviserà se stai per procedere a un sito web il cui dominio è stato aggiunto al nostro database dei "siti non attendibili" o se stai per scaricare un file da tale sito web. Puoi trovare ulteriori informazioni sul funzionamento di questo modulo nell'[articolo dedicato](/general/browsing-security). -In this module, you can: +In questo modulo, puoi: - abilitare le notifiche per bloccare le richieste a siti dannosi e di phishing, - attivare le notifiche sonore, @@ -70,31 +70,31 @@ Esistono tre motivi significativi per cui potresti voler esplorare le impostazio ![Protezione DNS \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/dns-settings.png) -In the DNS protection module of AdGuard for Windows, you can choose DNS servers from known DNS providers, including AdGuard DNS, which blocks ads and trackers, AdGuard DNS Family Protection, which also blocks adult content, or AdGuard DNS Non-filtering, which provides a secure and reliable connection but doesn’t filter anything. You can even add custom DNS servers and rules using [DNS rule syntax](https://adguard-dns.io/kb/general/dns-filtering-syntax/). If necessary, you can add [DNS filters of your choice](https://filterlists.com). +Nel modulo di Protezione DNS di AdGuard per Windows, puoi selezionare i server DNS dai fornitori noti, incluso AdGuard DNS che blocca inserzioni e tracciatori, AdGuard DNS Protezione Famiglie, che blocca anche i contenuti per adulti, o AdGuard DNS Senza filtraggio, che fornisce una connessione sicura e affidabile, ma non filtra tutto. Puoi anche aggiungere server DNS e regole personali utilizzando la [sintassi delle regole DNS](https://adguard-dns.io/kb/general/dns-filtering-syntax/). E, se necessario, puoi aggiungere dei [filtri DNS di tua scelta](https://filterlists.com). -Starting with v7.20, you can also add filters by simply selecting them from a list of pre-built, trusted filters. They are grouped into four categories for your convenience: +A partire dalla v7.20, puoi anche aggiungere filtri semplicemente selezionandoli da una lista di filtri predefiniti e affidabili. Sono raggruppati in quattro categorie per la tua comodità: -- **General**: block ads and trackers -- **Regional**: block ads and trackers on language-specific websites -- **Security**: block phishing and unreliable websites -- **Other**: cover special use cases that don’t fit into the above categories +- **Generale**: blocca inserzioni e tracciatori +- **Regionale**: blocca inserzioni e tracciatori nei siti web specifici per lingua +- **Sicurezza**: blocca siti web di phishing e non affidabili +- **Altro**: copre casi d'uso speciali che non rientrano nelle categorie sopra indicate -![DNS filters \*border](https://cdn.adtidy.org/content/release_notes/ad_blocker/windows/v7.20/dns_filters/en.png) +![Filtri DNS \*border](https://cdn.adtidy.org/content/release_notes/ad_blocker/windows/v7.20/dns_filters/en.png) -### Parental Control +### Controllo Parentale -There are several websites to which access should be restricted from a PC used by children. This task is accomplished by Parental Control. +Esistono numerosi siti web a cui dovrebbe essere limitato l'accesso da un PC utilizzato da bambini. Questo compito è svolto dal Controllo Parentale. -![Parental Control \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/parental-control.png) +![Controllo Parentale \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/parental-control.png) -The module checks the contents of web pages opened in the browser and filters those with content undesirable for children: images and texts for adults, crude language, violence, drug propaganda, etc. Parental Control settings are password-protected so that the child is not able to go round the restrictions. This module not only blocks directions to undesirable sites but can also delete the links that are inappropriate for children from the search results. +Il modulo controlla i contenuti delle pagine web aperte nel browser e filtra quelle con contenuti indesiderabili per i bambini: immagini e testi per adulti, linguaggio volgare, violenza, sostanze stupefacenti, etc. Le impostazioni del Controllo Parentale sono protette da password, così che i bambini non possano aggirare le limitazioni. Questo modulo non blocca soltanto le indicazioni ai siti indesiderati, ma può anche eliminare i collegamenti inappropriati per i bambini, dai risultati di ricerca. -In the _Parental Control_ module you can enable the _Safe search_ and manage the _blocklist_ and the _allowlist_ to customize how this option works. You can also check the _Block executable files download_ box to prevent your child from downloading and installing software on the computer. There are two more options in the _Parental Control_ module: you can select a specific Windows user to be protected by _Parental Control_ and set a password to protect AdGuard settings from change. +Nel modulo _Controllo Parentale_, puoi abilitare la _Ricerca sicura_ e gestire l'_elenco di blocco_ e l'_elenco consentiti_ per personalizzare il funzionamento d quest'opzione. Inoltre, puoi anche spuntare la casella _Blocca download file eseguibili_ per impedire ai tuoi figli di scaricare e installare software sul computer. Esistono ancora altre due opzioni nel modulo _Controllo Parentale_: puoi selezionare un utente di Windows specifico da proteggere con il _Controllo Parentale_ e impostare una password per proteggere le impostazioni di AdGuard dalla modifica. -![Parental Control \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/parental-control.png) +![Controllo Parentale \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/parental-control.png) ### Browser Assistant ![Browser Assistant \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/browser-assistant/browser-assistant.png) -From this tab you can easily proceed to install AdGuard Browser Assistant, which primary function is to manage filtering directly from the browser. We explained more about how to work with it and what to do if there is no Browser Assistant for your browser in the [separate article](/adguard-for-windows/browser-assistant.md). +Da questa scheda, puoi facilmente procedere all'installazione di AdGuard Browser Assistant, la cui funzionalità principale è gestire il filtraggio direttamente dal browser. Abbiamo spiegato di più sul funzionamento e sul da farsi se non è presente alcun Browser Assistant per il tuo browser, in un [articolo separato](/adguard-for-windows/browser-assistant.md). diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md index e67d6306a37..07977d44ac3 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md @@ -35,13 +35,13 @@ Esistono due errori differenti con soluzioni molto simili. Come suggerito dai lo Si potrebbe dire che questa è una sottocategoria particolare dell'errore 1603. Le possibili soluzioni sono simili: -- Start and re-register Microsoft Installer service. It requires some work. +- Avvia e registra nuovamente il servizio di Microsoft Installer. Richiede un po' di lavoro. - - Press *Win + R* and enter **services.msc**. - - Find in the list and double-click *Windows Installer*. - - Hit *Start* button under *Service status* and hit *OK*. If the service status is **running**, you should click *Stop* first and then hit *Start*. - - Press *Win + R*, type ***msiexec /unregister***, and hit *Enter*. - - Press *Win + R* again, type ***msiexec /regserver***, and hit *Enter* + - Premi *Win + R* e inserisci **services.msc**. + - Trova nell'elenco e clicca due volte *Windows Installer*. + - Premi il pulsante *Avvia* sotto *Stato del servizio* e premi *OK*. Se lo stato del servizio è **in esecuzione**, devi prima cliccare *Arresta*, quindi su *Avvia*. + - Premi *Win + R*, digita e cerca ***msiexec /unregister*** e premi *Invio*. + - Premi ancora *Win + R*, digita e cerca ***msiexec /regserver*** e premi *Invio* - Riavvia il PC e ricomincia l'installazione. Talvolta, ciò è sufficiente per risolvere il problema. @@ -65,25 +65,25 @@ L'errore sembra più spaventoso di quanto non sia in realtà. Infatti, questo è - Disinstalla AdGuard utilizzando il nostro [strumento di disinstallazione](../../installation#advanced) speciale, poi ripeti l'installazione. -- Start and re-register Microsoft Installer service. It requires some work. - - - Press *Win + R* and enter ***services.msc***. - - Find in the list and double-click *Windows Installer*. - - Hit *Start* button under *Service status* and hit *OK*. If the service status is **running**, you should click *Stop* first and then hit *Start*. - - Press *Win + R*, type ***msiexec /unregister***, and hit *Enter*. - - Press *Win + R* again, type ***msiexec /regserver***, and hit *Enter* - -- Acquire full permissions on the drive for installation. It is possible that the error 1603 occurs because you don’t have full permissions on the file location. It's also not as easy as some of the other solutions: - - - Open *File Explorer*, right-click the drive containing the installation location and select *Properties*. - - Go to *Security* tab and click *Edit*. - - Single-click *SYSTEM* and ensure that the *Allow* box of every item in *Permissions for SYSTEM* is checked (if it is checkable). Do the same check for *Administrators*. - - Click *OK* to go back to *Properties* dialog. Then click *Advanced*. - - Click *Change Permissions*. - - On *Permissions* tab, double-click *Administrators*. - - Select *This folder, subfolders and files* for *Applies to* field and check all the available *Basic permissions*. After that, hit *OK*. - - Do the same operation above (from item 7) for *SYSTEM*. - - Click *OK* all the way out. Try installing AdGuard again. +- Avvia e registra nuovamente il servizio di Microsoft Installer. Richiede un po' di lavoro. + + - Premi *Win + R* e inserisci ***services.msc***. + - Trova nell'elenco e clicca due volte *Windows Installer*. + - Premi il pulsante *Avvia* sotto *Stato del servizio* e premi *OK*. Se lo stato del servizio è **in esecuzione**, devi prima cliccare *Arresta*, quindi su *Avvia*. + - Premi *Win + R*, digita e cerca ***msiexec /unregister*** e premi *Invio*. + - Premi ancora *Win + R*, digita e cerca ***msiexec /regserver*** e premi *Invio* + +- Acquisisci le autorizzazioni complete sull'unità per l'installazione. È possibile che l'errore 1603 si verifichi perché non disponi delle complete autorizzazioni per la posizione del file. Inoltre, questa non è facile come altre soluzioni: + + - Apri *Esplora file*, clicca con il pulsante destro del mouse l'unità contenente il percorso di installazione e seleziona *Proprietà*. + - Vai alla scheda *Sicurezza* e clicca *Modifica*. + - Clicca *SYSTEM* e assicurati che la casella *Consenti* di ogni voce in *Autorizzazioni per SYSTEM* sia spuntata (se possibile spuntarla). Fai lo stesso controllo per *Amministratori*. + - Clicca *OK* per tornare alla finestra *Proprietà*. Quindi clicca *Avanzate*. + - Clicca *Modifica autorizzazioni*. + - Nella scheda *Autorizzazioni*, clicca due volte su *Amministratori*. + - Seleziona *Questa cartella, sottocartelle e file* per il campo *Si applica a*, e spunta tutte le *Autorizzazioni di base* disponibili. Dopodiché, clicca *OK*. + - Esegui la stessa operazione sopra (dalla voce 7) per *SYSTEM*. + - Clicca *OK* fino alla fine. Prova a reinstallare AdGuard. ### Errore 1618: Un'altra installazione è già in corso {#error-1618} diff --git a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md index 6a93f3ecaba..a94a9fbf2b2 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md @@ -73,7 +73,7 @@ Altrimenti, AdGuard filtrerà tutto il traffico al volo, senza reindirizzamento. ### Apri la finestra principale all'avvio del sistema -Abilita quest'opzione per far aprire la finestra principale di AdGuard all'avvio del sistema. This setting, which doesn't affect whether the actual filtering service is launched or not, is located in *Settings → General Settings*. +Abilita quest'opzione per far aprire la finestra principale di AdGuard all'avvio del sistema. Questa impostazione, che non influisce sull'avvio o meno del servizio di filtraggio effettivo, si trova in *Impostazioni → Impostazioni generali*. ### Abilita il filtraggio all'avvio del sistema diff --git a/i18n/it/docusaurus-plugin-content-docs/current/general/account/2fa.md b/i18n/it/docusaurus-plugin-content-docs/current/general/account/2fa.md index d14ed97553c..fdf57305b2c 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/general/account/2fa.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/general/account/2fa.md @@ -11,7 +11,7 @@ Consigliamo di configurare l'autenticazione a due fattori per il tuo profilo di ## Come configurarla -1. Log into your [AdGuard account](https://auth.adguardaccount.com/login.html) and go to the *Settings* tab: +1. Accedi all'account [AdGuard](https://auth.adguardaccount.com/login.html) e vai nella scheda *Impostazioni*: ![Impostazioni dell'account AdGuard *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_1.png) diff --git a/i18n/it/docusaurus-plugin-content-docs/current/general/account/features.md b/i18n/it/docusaurus-plugin-content-docs/current/general/account/features.md index 6a6d41a58e2..40ace4dc0ca 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/general/account/features.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/general/account/features.md @@ -24,9 +24,9 @@ Le [licenze di AdGuard](../../license/what-is) possono essere: - collegate e scollegate, - estese, -- upgraded. +- aggiornate. -I dispositivi collegati alle tue licenze di AdGuard Ad Blocker sono collegabili o scollegabili. To unbind unused devices, click the number of bound devices next to *Devices*, then select `>` → *Remove*. +I dispositivi collegati alle tue licenze di AdGuard Ad Blocker sono collegabili o scollegabili. Per dissociare i dispositivi non utilizzati, fai clic sul numero di dispositivi legati accanto a *Dispositivi*, quindi seleziona `>` → *Elimina*. ## Visualizza gli acquisti diff --git a/i18n/it/docusaurus-plugin-content-docs/current/general/account/register.md b/i18n/it/docusaurus-plugin-content-docs/current/general/account/register.md index ab17c6bea6a..97c0e2773d3 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/general/account/register.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/general/account/register.md @@ -5,7 +5,7 @@ sidebar_position: 1 ## Cos'è un profilo di AdGuard -[AdGuard account](https://adguardaccount.com/) is a user account that stores information about your AdGuard licenses and subscriptions, active devices, your purchase history, preferred language, and other preferences. Molti prodotti di AdGuard offrono un'opzione per attivarli inserendo le credenziali per il tuo profilo di AdGuard, ammesso che contenga una licenza valida. +Il [profilo di AdGuard](https://adguardaccount.com/) è un profilo utente che memorizza le informazioni sui tuoi abbonamenti e licenze di AdGuard, dispositivi attivi, lo storico dei tuoi acquisti, la lingua preferita e altre preferenze. Molti prodotti di AdGuard offrono un'opzione per attivarli inserendo le credenziali per il tuo profilo di AdGuard, ammesso che contenga una licenza valida. ## Come creare un profilo @@ -29,4 +29,4 @@ Dopo aver registrato il tuo account, puoi usare l'opzione *Codice una tantum* pe ## Come creare un account tramite un social network -To create an account via a social network, simply follow the [link](https://auth.adguardaccount.com/login.html) and log in to your account. Una volta registrato, controlla la tua casella di posta: riceverai un'e-mail di conferma. Imposta una password e tutto è fatto! Ora puoi utilizzare tutte le [funzionalità dell'account AdGuard](https://adguard.com/kb/general/account/features/). +Per creare un account tramite un social network, segui semplicemente [il collegamento](https://auth.adguardaccount.com/login.html) e accedi al tuo account. Una volta registrato, controlla la tua casella di posta: riceverai un'e-mail di conferma. Imposta una password e tutto è fatto! Ora puoi utilizzare tutte le [funzionalità dell'account AdGuard](https://adguard.com/kb/general/account/features/). diff --git a/i18n/it/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/it/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index 0927ae771e1..91c9483619b 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard per iOS][ios-app] | [AdGuard per Safari][ext-saf] | [Blocco contenuti AdGuard][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:----------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard per iOS][ios-app] | [AdGuard per Safari][ext-saf] | [Blocco contenuti AdGuard][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:----------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2327,7 +2326,7 @@ Rules with `$redirect-rule` modifier are not supported by [AdGuard Content Block #### **`$referrerpolicy`** {#referrerpolicy-modifier} -These rules allow overriding of a page's [referrer policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy). Responses to matching requests will have all of their `Referrer-Policy` headers replaced with a single header with the value equal to the matching rule's modifier value. If the response carries an HTML document with a `. +Ogni aiuto è ben accetto! Se incontri un sito web di phishing o malware, segnalalo a . -### False-positive responses +### Risposte false positive -Occasionally, some non-malicious websites are added to AdGuard’s filters. We do our best to reduce the percentage of false positives, but they still occur. If you encounter this behavior from AdGuard, please report the false positive to our technical support at . +Occasionalmente, alcuni siti web non dannosi sono aggiunti ai filtri di AdGuard. Facciamo del nostro meglio per ridurre la percentuale di falsi positivi, ma si verificano comunque. Se riscontri questo comportamento da AdGuard, segnala il falso positivo al nostro servizio di assistenza all'indirizzo . ## Se hai dubbi su un sito web -If you suspect that a certain website might be dangerous, check it first by using our [security check tool](https://reports.adguard.com/welcome.html). +Se sospetti che un certo sito web possa essere pericoloso, controllalo prima usando il nostro [strumento di controllo della sicurezza](https://reports.adguard.com/welcome.html). -![Security check](https://cdn.adtidy.org/content/kb/ad_blocker/general/site_warning.png) +![Controllo della sicurezza](https://cdn.adtidy.org/content/kb/ad_blocker/general/site_warning.png) diff --git a/i18n/it/docusaurus-plugin-content-docs/current/general/extensions.md b/i18n/it/docusaurus-plugin-content-docs/current/general/extensions.md index a3d572b6d2a..99ad142c3a4 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/general/extensions.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/general/extensions.md @@ -148,16 +148,16 @@ Tutte le funzionalità di Greasemonkey elencate sono deprecate, ma ancora suppor - [`GM_log`](https://www.tampermonkey.net/documentation.php#api:GM_log) - [`GM.addElement`, `GM_addElement`](https://www.tampermonkey.net/documentation.php#api:GM_addElement) -You can find more information about Greasemonkey API in [its manual](https://wiki.greasespot.net/Greasemonkey_Manual:API). +Puoi trovare ulteriori informazioni sull'API di Greasemonkey nel [suo manuale](https://wiki.greasespot.net/Greasemonkey_Manual:API). #### Esempio ```javascript // ==UserScript== -// @name Name as shown to the user when locale is english or unknown -// @name:ru Name as shown to the user when locale is russian -// @description Description as shown to the user when locale is english or unknown -// @description:ru Description as shown to the user when locale is russian +// @name Nome mostrato all'utente se la lingua è inglese o sconosciuta +// @name:ru Nome mostrato all'utente se la lingua è russa +// @description Descrizione mostrata all'utente se la lingua è inglese o sconosciuta +// @description:ru Descrizione mostrata all'utente se la lingua è russa // @icon https://myhomepage.com/myuserscript.png // @version 1.0.0.0 // @downloadURL https://dl.myhomepage.org/myuserscript.user.js @@ -186,38 +186,38 @@ You can find more information about Greasemonkey API in [its manual](https://wik // @run-at document-start // ==/UserScript== !function(){( - console.log("I am loaded!"); + console.log("Sono caricato."); )}(); ``` -#### Trusted Types API +#### API Trusted Types -AdGuard provides an instance of the `PolicyApi` class that allows you to manage Trusted Types in your userscripts. +AdGuard fornisce un'istanza della classe `PolicyApi` che consente di gestire i fiduciari nei tuoi script utente. -You can access the instance of this class by using the `ADG_policyApi` variable in your userscript. +Puoi accedere all'istanza di questa classe usando la variabile `ADG_policyApi` nel tuo script utente. -##### Properties +##### Proprietà -- `name: string` — a name of the policy (Default is `"AGPolicy"`). -- `isSupported: boolean` — a flag indicating whether or not the Trusted Types API is supported by the current browser. +- `name: string` — un nome per la politica (Predefinito è `"AGPolicy"`). +- `isSupported: boolean` — un flag che indica se l'API Trusted Types è supportata dal browser attuale. -##### Polyfilled methods +##### Metodi polifunzionali -- [`ADG_policyApi.createHTML`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicy/createHTML). If not supported, returns `input: string`. -- [`ADG_policyApi.createScript`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicy/createScript). If not supported, returns `input: string`. -- [`ADG_policyApi.createScriptURL`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicy/createScriptURL). If not supported, returns `input: string`. -- [`ADG_policyApi.getAttributeType`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/getAttributeType). If not supported, returns `null`. -- [`ADG_policyApi.getPropertyType`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/getPropertyType). If not supported, returns `null`. -- [`ADG_policyApi.isHTML`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/isHTML). If not supported, returns `false`. -- [`ADG_policyApi.isScript`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/isScript). If not supported, returns `false`. -- [`ADG_policyApi.isScriptURL`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/isScriptURL). If not supported, returns `false`. +- [`ADG_policyApi.createHTML`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicy/createHTML). Se non supportato, restituisce `input: string`. +- [`ADG_policyApi.createScript`](https://developer.mozilla.org/it/docs/Web/API/TrustedTypePolicy/createScript). Se non supportato, restituisce `input: string`. +- [`ADG_policyApi.createScriptURL`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicy/createScriptURL). Se non supportato, restituisce `input: string`. +- [`ADG_policyApi.getAttributeType`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/getAttributeType). Se non supportato, restituisce `null`. +- [`ADG_policyApi.getPropertyType`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/getPropertyType). Se non supportato, restituisce `null`. +- [`ADG_policyApi.isHTML`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/isHTML). Se non supportato, restituisce `false`. +- [`ADG_policyApi.isScript`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/isScript). Se non supportato, restituisce `false`. +- [`ADG_policyApi.isScriptURL`](https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/isScriptURL). Se non supportato, restituisce `false`. -##### Additional Types +##### Tipi aggiuntivi ```typescript /** - * Enum representation of the return values of the `getAttributeType` and - * `getPropertyType` methods of the native Trusted Types API. + * Rappresentazione Enum dei valori di ritorno dei metodi `getAttributeType` e + * `getPropertyType` dell'API Trusted Types nativa. * * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/getAttributeType} * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/getPropertyType} @@ -228,12 +228,12 @@ enum TrustedType { ScriptURL = 'TrustedScriptURL', } -// You can access it like that inside of userscript +// Puoi accedervi in questo modo all'interno del codice dell'utente ADG_TrustedType.HTML // "TrustedHTML" /** - * Isomorphic trusted value type. If a browser supports the Trusted Types API, it will be one of the enum Trusted Types - * (`TrustedHTML`, `TrustedScript` or `TrustedScriptURL`); otherwise, it will be regular `string`. + * Tipo di valore attendibile isomorfo. Se un browser supporta l'API Trusted Types, sarà uno dei tipi enum Trusted + * (`TrustedHTML`, `TrustedScript` o `TrustedScriptURL`); altrimenti, sarà una stringa regolare. * * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/TrustedHTML} * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/TrustedScript} @@ -242,20 +242,20 @@ ADG_TrustedType.HTML // "TrustedHTML" type TrustedValue = string | TrustedHTML | TrustedScript | TrustedScriptURL; ``` -##### Additional methods +##### Metodi aggiuntivi ```typescript /** - * Creates a Trusted Type depending on `type`: + * Crea un Trusted Type a seconda di `tipo`: * - `TrustedHTML` * - `TrustedScript` * - `TrustedScriptURL` - * - or returns `value` if none of them is applicable. + * - oppure restituisce `valore` se nessuno di essi è applicabile. * - * @param type Trusted Type. - * @param value Value from which a Trusted Type is created. - * @param createArgs Additional arguments to be passed to the function represented by `TrustedTypePolicy`. - * @returns Created value. + * @param tipo Trusted Type. + * @param valore Valore da cui viene creato un Trusted Type. + * @param creaArgs Argomenti aggiuntivi da passare alla funzione rappresentata da `TrustedTypePolicy`. + * @returns Valore creato. */ function create( type: TrustedType, @@ -264,23 +264,23 @@ function create( ): TrustedValue -// Example: Creates TrustedHTML +// Esempio: Crea TrustedHTML const trustedHTML = ADG_policyApi.create(ADG_TrustedType.HTML, '
'); /** - * Converts `value` of `attribute` into one of the Trusted Types: + * Converte `valore` di `attributo` in uno dei Tipi Affidabili: * - `TrustedHTML` * - `TrustedScript` * - `TrustedScriptURL` - * - or returns `value` if none of them is applicable. + * - oppure restituisce `valore` se nessuno di essi è applicabile. * - * @param tagName Name of an HTML tag. - * @param attribute Attribute. - * @param value Value of an attribute to be converted. - * @param elementNS Element namespace. If empty, defaults to the HTML namespace. - * @param attrNS Attribute namespace. If empty, defaults to null. - * @param createArgs Additional arguments to be passed to the function represented by `TrustedTypePolicy`. - * @returns Converted value. + * @param tagName Nome di un tag HTML. + * @param property Attributo. + * @param value Valore di un attributo da convertire. + * @param elementNS Spazio dei nomi dell'elemento. Se vuoto, usa come predefinito lo spazio dei nomi HTML. + * @param attrNS Spazio dei nomi dell'attributo. Se vuoto, predefinito a null. + * @param createArgs Argomenti aggiuntivi da passare alla funzione rappresentata da `TrustedTypePolicy`. + * @returns Valore convertito. */ function convertAttributeToTrusted( tagName: string, @@ -291,23 +291,23 @@ function convertAttributeToTrusted( ...createArgs: unknown[] ): TrustedValue -// Example: Converts to TrustedScriptURL +// Esempio: Converte in TrustedScriptURL const trustedScriptURL = ADG_policyApi.convertAttributeToTrusted("script", "src", 'SOME_URL'); scriptElement.setAttribute("src", trustedScriptURL); /** - * Converts `value` of `property` into one of the Trusted Types: + * Converte `valore` di `proprietà` in uno dei Tipi Affidabili: * - `TrustedHTML` * - `TrustedScript` * - `TrustedScriptURL` - * - or returns `value` if none of them is applicable. + * - oppure restituisce `valore` se nessuno di essi è applicabile. * - * @param tagName Name of an HTML tag. - * @param property Property. - * @param value Value of a property to be converted. - * @param elementNS Element namespace. If empty, defaults to the HTML namespace. - * @param createArgs Additional arguments to be passed to the function represented by `TrustedTypePolicy`. - * @returns Converted value. + * @param tagName Nome di un tag HTML. + * @param property Proprietà. + * @param value Valore di una proprietà da convertire. + * @param elementNS Spazio dei nomi dell'elemento. Se vuoto, usa come predefinito lo spazio dei nomi HTML. + * @param createArgs Argomenti aggiuntivi da passare alla funzione rappresentata da `TrustedTypePolicy`. + * @returns Valore convertito. */ function convertPropertyToTrusted( tagName: string, @@ -317,7 +317,7 @@ function convertPropertyToTrusted( ...createArgs: unknown[] ): TrustedValue -// Example: Converts to TrustedHTML +// Esempio: Converte in TrustedHTML divElement.innerHTML = ADG_policyApi.convertPropertyToTrusted("div", "innerHTML", "
"); ``` diff --git a/i18n/it/docusaurus-plugin-content-docs/current/general/https-filtering/what-is-https-filtering.md b/i18n/it/docusaurus-plugin-content-docs/current/general/https-filtering/what-is-https-filtering.md index 07732084760..8d9f2194ac1 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/general/https-filtering/what-is-https-filtering.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/general/https-filtering/what-is-https-filtering.md @@ -27,11 +27,11 @@ Se fosse facile, HTTPS non sarebbe così sicuro. Quando un browser tenta di conn Per una migliore comprensione, abbiamo raffigurato questo processo: -![How HTTPS filtering works](https://cdn.adtidy.org/public/Adguard/Blog/https/what_is_https_filtering.png) +![Come funziona il filtraggio HTTPS](https://cdn.adtidy.org/public/Adguard/Blog/https/what_is_https_filtering.png) ### Il mio traffico rimane crittografato e sicuro? -Ovviamente! La tua connessione con un server remoto resta crittografata e sicura. AdGuard, just like a browser, checks the server’s certificate before determining if the connection should be filtered or not. +Ovviamente! La tua connessione con un server remoto resta crittografata e sicura. AdGuard, proprio come il tuo browser, controlla il certificato del server prima di decidere se filtrarlo o no. Tuttavia, il filtraggio HTTPS presenta degli svantaggi. Il più importante è che nasconde il certificato effettivo del sito web dal browser. Invece, il browser visualizza il certificato emesso da AdGuard. @@ -51,7 +51,7 @@ Un certificato EV offre un livello maggiore di sicurezza e fornisce maggiori gar ### Problemi correlati al filtraggio HTTPS -A [2017 study](https://cdn.adtidy.org/public/Adguard/Blog/https/interception-ndss17.pdf) found that 5 to 10% of HTTPS connections were established by HTTPS filtering applications. Solitamente, ciò viene eseguito da vari tipi di software antivirus. La cattiva notizia è che 24 dei 26 antivirus testati riduceva, in vari modi, il livello di sicurezza della connessione, mentre i due terzi delle connessioni create erano soggette ad hacking. +Uno [studio del 2017](https://cdn.adtidy.org/public/Adguard/Blog/https/interception-ndss17.pdf), dimostra che dal 5 al 10% delle connessioni HTTPS, sono stabilite da applicazioni di filtraggio HTTPS. Solitamente, ciò viene eseguito da vari tipi di software antivirus. La cattiva notizia è che 24 dei 26 antivirus testati riduceva, in vari modi, il livello di sicurezza della connessione, mentre i due terzi delle connessioni create erano soggette ad hacking. I ricercatori sono giunti a una semplice conclusione: la community della sicurezza di Internet dovrebbe prestare maggiore attenzione alle applicazioni che filtrano le connessioni sicure. E gli sviluppatori di tali software, devono prestare molta attenzione alla qualità delle implementazioni di filtraggio. @@ -71,7 +71,7 @@ Infine, se il tuo dispositivo ha i permessi di root, puoi spostare il certificat ### Come verificare manualmente la qualità HTTPS? -Esistono svariati siti web dedicati su cui puoi verificare la qualità della tua connessione HTTPS. Questi siti web verificano se il tuo browser (o, nel nostro caso, il tuo browser con AdGuard), è suscettibile alle vulnerabilità comuni. If you plan to use any program that filters HTTPS, not necessarily AdGuard (e.g., an antivirus), we advise that you check the connection quality using these websites. +Esistono svariati siti web dedicati su cui puoi verificare la qualità della tua connessione HTTPS. Questi siti web verificano se il tuo browser (o, nel nostro caso, il tuo browser con AdGuard), è suscettibile alle vulnerabilità comuni. Se pianifichi di utilizzare qualsiasi programma che filtri HTTPS, non necessariamente AdGuard (es., un antivirus), ti consigliamo di verificare la qualità della connessione su tali siti web. - [https://www.ssllabs.com/ssltest/viewMyClient.html](https://www.ssllabs.com/ssltest/viewMyClient.html) - [https://www.howsmyssl.com/](https://www.howsmyssl.com/) diff --git a/i18n/it/docusaurus-plugin-content-docs/current/general/license/cancel-refund.md b/i18n/it/docusaurus-plugin-content-docs/current/general/license/cancel-refund.md index 9dcf28cbd22..2db31cd5e14 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/general/license/cancel-refund.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/general/license/cancel-refund.md @@ -7,7 +7,7 @@ sidebar_position: 5 L'abbonamento può essere annullato sul tuo profilo di AdGuard. Per annullare il tuo abbonamento: - 1. Go to your [AdGuard account](https://adguardaccount.com/). + 1. Vai nel tuo [account AdGuard](https://adguardaccount.com/). 1. Selezioni *Licenze*. 1. Fai clic su *Annulla abbonamento* sotto l'abbonamento che non ti serve più. ![Annulla](https://cdn.adtidy.org/content/kb/ad_blocker/general/newaccount-cancel-sub.png) diff --git a/i18n/it/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/it/docusaurus-plugin-content-docs/current/general/license/legacy.md index 5348c68b2f3..2f61d0651c6 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,7 +3,7 @@ title: Domande frequenti sulle licenze ereditarie sidebar_position: 6 --- -Abbiamo redatto questo articolo per evitare confusione e spiegare nel dettaglio come puoi rinnovare/aggiornare una licenza obsoleta (ereditaria) di AdGuard. +Abbiamo redatto questo articolo per evitare confusione e spiegare nel dettaglio come puoi rinnovare/aggiornare una licenza obsoleta di AdGuard. ## Sulle licenze obsolete @@ -27,57 +27,55 @@ Per tutti i tipi (Standard, Mobile, Premium), esistevano opzioni per una licenza A ottobre 2019, AdGuard è passato al nuovo sistema di licenze: da allora, le licenze sono ancora acquistabili per 1 anno o A Vita, ma le tipologie sono diventate: **Personale ** (fino a 3 dispositivi) o **Famiglia** (fino a 9 dispositivi). -Ancora una modifica: **le chiavi di licenza del nuovo tipo sono ora utilizzabili su qualsiasi dispositivo, in qualsiasi combinazione. Ad esempio, una licenza Personale è utilizzabile su Android, Mac e iOS, proprio come su due computer Windows e un tablet Apple.** +Un'altra modifica è che i **nuovi tipi di chiavi di licenza possono ora essere utilizzati su qualsiasi dispositivo, in qualsiasi combinazione**. Ad esempio, una licenza Personale è utilizzabile su Android, Mac e iOS, proprio come su due computer Windows e un tablet Apple. ## Cosa è successo alle licenze obsolete? -Le licenze standard sono state automaticamente rese universali, a significare che sono attivabili su qualsiasi dispositivo. +Le **licenze Standard** sono state automaticamente rese **universali**, sono ora attivabili su qualsiasi dispositivo. -Le licenze mobili sono rimaste invariate e limitate alla piattaforma (sono ancora utilizzabili soltanto su telefoni o tablet). +Le **licenze Mobili** sono rimaste invariate e limitate alla piattaforma (sono ancora utilizzabili soltanto su telefoni o tablet). -Anche le licenze Premium sono rimaste invariate e limitate alla piattaforma. E, sebbene **le licenze Premium siano ora mostrate nel tuo profilo personale dal numero totale di dispositivi**, sono ancora attivabili su serie di dispositivi desktop + mobile. +Anche le **licenze Premium** sono rimaste invariate e limitate alla piattaforma. E, sebbene **le licenze Premium siano ora mostrate nel tuo profilo personale dal numero totale di dispositivi**, sono ancora attivabili su serie di dispositivi desktop + mobile. Ad esempio, ecco l'aspetto della chiave 1+1: -![Chiave 1+1](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![Chiave 1+1](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *Ma, nonostante il numero totale di dispositivi (2), è attivabile su 1 desktop e 1 dispositivo mobile.* > Tutte le licenze obsolete presentano un distintivo "ereditaria" nel profilo AdGuard. E sono automaticamente convertite a un nuovo tipo, al loro rinnovo o aggiornamento. Ma esistono delle sfumature. Vediamo quali licenze sono convertibili in un nuovo tipo e come farlo. -## Ho una chiave (ereditaria) obsoleta. Che opzioni di rinnovo/aggiornamento sono disponibili per me? +## Come rinnovare o aggiornare una chiave non attuale -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +Puoi estendere/rinnovare o aggiornare una licenza non attuale nel tuo [profilo AdGuard](https://adguardaccount.com) o nella [pagina di estensione o aggiornamento](https://adguard.com/renew.html). -![Upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Vai alla scheda "Le mie licenze" e controlla quali azioni sono per te disponibili, per ogni specifica chiave. Di seguito, le spiegheremo con esempi specifici. +Per estendere/rinnovare o aggiornare una licenza non attuale nel tuo profilo AdGuard, vai alla scheda *Licenze*, trova la licenza di cui hai bisogno e seleziona una delle opzioni disponibili. -### Licenze per 1/2/3 dispositivi +![Rinnova o aggiorna una licenza nel tuo profilo AdGuard](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -Le licenze **Annuali** per 1, 2, 3 dispositivi, sono convertibili in Personale o Famiglia: +Oppure vai alla [pagina di estensione o aggiornamento](https://adguard.com/renew.html), inserisci la tua licenza e clicca *Applica*. Nella nuova pagina, seleziona una delle opzioni disponibili. -![Aggiorna o rinnova](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Scegli a seconda di quanti dispositivi necessiti di proteggere. +### Licenze per 1/2/3 dispositivi -Invece di rinnovarla, puoi passare a una licenza A Vita: +Le licenze mobili Annuali per 3 dispositivi possono essere convertite in licenze Personali o aggiornate a quelle Familiari: -![A Vita](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Aggiorna le licenze Annuali per 1, 2, 3 dispositivi](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -Le licenze **A Vita** sono convertibili soltanto in Famiglia (9 dispositivi) a causa di limitazioni tecniche: +> Se hai una **licenza Standard per 3 dispositivi**, funziona già come una licenza **Personale**. Se rinnovi la tua **licenza Mobile** per 3 dispositivi, potrai utilizzarla su una **serie diversa di dispositivi**, non solo su telefoni. -![Aggiornamento A Vita](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +Puoi anche aggiornare la tua licenza a una licenza A vita: -### Licenze per oltre 4 dispositivi (fino a 9) +![Aggiornamento A Vita](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -Le chiavi **Annuali** di questa configurazione sono convertibili soltanto in una licenza Famiglia: +Le licenze **A Vita** possono essere aggiornate soltanto in Famiglia (9 dispositivi) a causa di limitazioni tecniche. -![Licenza Annuale per 4 dispositivi](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licenze per oltre 4 dispositivi (fino a 9) -Le licenze **A Vita** per 4 o più dispositivi non possono essere aggiornate a causa di limitazioni tecniche: +Le licenze **Annuali** per 4 o più dispositivi possono essere aggiornate a licenze Famiglia e A Vita. -![Licenza A Vita per 4 dispositivi](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +Tuttavia, se hai già una licenza **A Vita**, non può essere aggiornata a causa di limitazioni tecniche. ### Licenze per oltre 9 dispositivi -Le chiavi Premium (5+5 e superiori) e le chiavi personalizzate per oltre 10 dispositivi, acquistate individualmente con l'aiuto dei nostri manager. +Le chiavi Premium (5+5 e superiori) e le chiavi personalizzate per oltre di 10 dispositivi, acquistate individualmente con l'aiuto dei nostri manager. -Queste rappresentano dei casi abbastanza unici, quindi, se desideri aggiornare la tua licenza a una A Vita, sei pregato di contattarci a partner@adguard.com. Ti faremo un'offerta speciale a seconda della configurazione specifica della tua licenza. +Si tratta di casi piuttosto unici, quindi se desideri aggiornare la tua licenza a quella AVita, contattaci all'indirizzo partners@adguard.com. Ti faremo un'offerta speciale a seconda della configurazione specifica della tua licenza. diff --git a/i18n/it/docusaurus-plugin-content-docs/current/general/license/transfer.md b/i18n/it/docusaurus-plugin-content-docs/current/general/license/transfer.md index 6fd4ceee329..1fbfdff7425 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/general/license/transfer.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/general/license/transfer.md @@ -12,7 +12,7 @@ La chiave di licenza è attivabile su un [numero limitato di dispositivi](../wha - Fai clic su *Reimpostare licenza* o *Esci* in un'app AdGuard - Rimuovi il dispositivo dal tuo account AdGuard: - 1. Click *AdGuard Ad Blocker* in your [AdGuard account](https://adguardaccount.com/). + 1. Fai clic sul *Blocco AdGuard* nel tuo [account AdGuard](https://adguardaccount.com/). ![Scheda dell'account di Blocco annunci *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/general/newaccount-unbind-device-0.png) diff --git a/i18n/it/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/it/docusaurus-plugin-content-docs/current/general/license/what-is.md index 3176042dcc0..06c7f7abb6e 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -1,9 +1,9 @@ --- -title: What is an AdGuard license? +title: Cos'è una licenza di AdGuard? sidebar_position: 1 --- -Una licenza è un'autorizzazione all'uso del prodotto AdGuard, fornita in conformità all' [Accordo di licenza dell'utente finale](https://adguard.com/eula.html). If bound to an email address, AdGuard licenses can be found in the user's [AdGuard account](https://adguardaccount.com/). +Una licenza è un'autorizzazione all'uso del prodotto AdGuard, fornita in conformità all' [Accordo di licenza dell'utente finale](https://adguard.com/eula.html). Se legate a un indirizzo email, le licenze AdGuard possono essere trovate nell'[account AdGuard](https://adguardaccount.com/) dell'utente. ## Quali tipi di licenze AdGuard esistono @@ -12,7 +12,7 @@ Nella pagina [di acquisto](https://adguard.com/license.html)è possibile visuali - **Abbonamenti di 1 anno**: queste licenze si rinnovano automaticamente ogni anno o possono essere estese manualmente - Personale — fino a 3 dispositivi - Famiglia — fino a 9 dispositivi -- **Lifetime** — these licenses are perpetual +- **A vita** — queste licenze sono perpetue - Personale — fino a 3 dispositivi - Famiglia — fino a 9 dispositivi @@ -25,7 +25,7 @@ Esistono anche licenze che l'utente può acquistare da altre fonti o ottenere gr - **Le licenze distributore** e **le licenze regalate** possono essere sia limitate nel tempo che non limitate nel tempo. Le licenze con data di scadenza possono essere rinnovate solo manualmente - Personale — fino a 3 dispositivi - Famiglia — fino a 9 dispositivi -- **La licenza di AdGuard Pro per iOS** viene acquistata e gestita tramite l'App Store e può essere utilizzata solo su dispositivi iOS e iPadOS con lo stesso ID Apple +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip @@ -35,7 +35,7 @@ Per estendere il limite di dispositivi, puoi [aggiornare](../payment-options/#up ## Come utilizzare la licenza AdGuard -Per utilizzare la tua licenza su un dispositivo, accedi alla tua app AdGuard utilizzando l'indirizzo email associato alla licenza. If the license hasn't been bound to your email address yet, you can do it in your [AdGuard account](https://adguardaccount.com/). A tal fine, aprire la scheda *Licenze* e fare clic su *Legare la licenza*. +Per utilizzare la tua licenza su un dispositivo, accedi alla tua app AdGuard utilizzando l'indirizzo email associato alla licenza. Se la licenza non è stata ancora associata al tuo indirizzo email, puoi farlo nel tuo [account AdGuard](https://adguardaccount.com/). A tal fine, aprire la scheda *Licenze* e fare clic su *Legare la licenza*. In alternativa, puoi inserire la tua [chiave di licenza](#license-key) nella tua app AdGuard. diff --git a/i18n/it/docusaurus-plugin-content-docs/current/general/stealth-mode.md b/i18n/it/docusaurus-plugin-content-docs/current/general/stealth-mode.md index 4696b531262..82327015815 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/general/stealth-mode.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/general/stealth-mode.md @@ -3,7 +3,7 @@ title: Modalità Invisibilità (Protezione dal tracciamento) sidebar_position: 4 --- -Molti siti web raccolgono informazioni sui propri visitatori, quali il loro indirizzo IP, browser e sistema operativo installati, risoluzione dello schermo e persino la pagina da cui un visitatore è stato reindirizzato. Alcune pagine web utilizzano i cookie per contrassegnare il tuo browser e salvare le tue impostazioni personali e preferenze o per "riconoscerti" alla tua visita successiva. *Tracking protection* safeguards your personal information from such data- and statistics-gathering systems. +Molti siti web raccolgono informazioni sui propri visitatori, quali il loro indirizzo IP, browser e sistema operativo installati, risoluzione dello schermo e persino la pagina da cui un visitatore è stato reindirizzato. Alcune pagine web utilizzano i cookie per contrassegnare il tuo browser e salvare le tue impostazioni personali e preferenze o per "riconoscerti" alla tua visita successiva. La *Protezione dal tracciamento* protegge le tue informazioni personali da tali sistemi di raccolta dati e statistiche. Puoi regolare in modo flessibile il funzionamento della Modalità Invisibilità: ad esempio, puoi impedire al sito web di ricevere la richiesta di ricerca che hai utilizzato per trovarlo su Internet, eliminare automaticamente i cookie di terze parti, disattivare la condivisione della posizione del browser, utilizzabile per tracciare la tua posizione e nascondere il tuo vero indirizzo IP o persino sostituirlo con uno arbitrario. @@ -95,7 +95,7 @@ Inoltre, puoi impostare un valore arbitrario per il Referente, inserendolo nel c Tieni presente che per poter filtrare il traffico, le applicazioni AdGuard "intercettano" le richieste dal browser al server. Le richieste effettuate agli server di annunci, tracciamento e di phishing possono essere modificate prima dell'invio al server o bloccate completamente. Lo stesso valore per l'opzione *Nascondi Referente dalle terze parti*: AdGuard intercetta le richieste HTTP(S), in particolare per rimuovere o modificare l'intestazione del Referente, se quest'opzione è abilitata. Tuttavia, ciò accade solo dopo che queste richieste "lasciano" il browser. Ciò significa che se monitori il Referente nel browser (ad esempio, con l'aiuto degli Strumenti per Sviluppatori di Chrome), vedrai il Referente originale, poiché la richiesta non ha ancora raggiunto AdGuard. Puoi utilizzare software come [Fiddler](https://www.telerik.com/fiddler) per assicurarti che il Referente sia alterato correttamente. -Due to the nature of all web browser extensions, AdGuard Browser Extension instead works 'inside' the web browser. Altererà il Referente in quel momento, quindi, gli Strumenti per Sviluppatori mostreranno il Referente desiderato per le tue richieste. +A causa della natura stessa di tutte le estensioni del browser, l'Estensione Browser AdGuard funziona "all'interno" del browser. Altererà il Referente in quel momento, quindi, gli Strumenti per Sviluppatori mostreranno il Referente desiderato per le tue richieste. ### Nascondi User Agent {#useragent} diff --git a/i18n/it/docusaurus-plugin-content-docs/current/guides/collect-har-file.md b/i18n/it/docusaurus-plugin-content-docs/current/guides/collect-har-file.md index a3e4cfabdcf..f5c35cc998d 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/guides/collect-har-file.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/guides/collect-har-file.md @@ -105,7 +105,7 @@ Per creare un file HAR in Internet Explorer 11, segui questi passaggi: - Il pulsante "Riproduci" sarà grigio durante la registrazione e il pulsante "Pausa" sarà rosso. Attiva la modalità **Riproduci**. -1. Clear any session info appearing in the lower grid using the **Clear session** button on the **Network** tab. Passa sulle icone per vederne i nomi. +1. Cancella tutte le informazioni sulla sessione, visualizzate nella griglia inferiore, utilizzando il pulsante **Cancella sessione**, sulla scheda **Rete**. Passa sulle icone per vederne i nomi. - Il pulsante **Cancella sessione** è un'icona a tre linee, con una x sopra di esse. @@ -113,7 +113,7 @@ Per creare un file HAR in Internet Explorer 11, segui questi passaggi: 1. Riproduci i passaggi per causare il problema. -1. Save session as a .har file by clicking the **Save to disk** button (Export as HAR) on the **Network** tab. +1. Salva la sessione come un file .har cliccando il pulsante **Salva su disco** (Esporta come HAR), sulla scheda **Rete**. 1. Invialo al supporto di AdGuard (support@adguard.com) con una spiegazione dettagliata del problema. Anche degli screenshot di supporto potrebbero essere utili. diff --git a/i18n/it/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md b/i18n/it/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md index e5aca27c276..3215206b1bc 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md @@ -19,9 +19,9 @@ A seconda del sistema operativo del dispositivo di cui desideri filtrare il traf ### Windows {#windows} -1. Note the IP address of your computer with AdGuard installed. +1. Annota l'indirizzo IP del tuo computer desktop con AdGuard installato. -1. Assicurati che la protezione di AdGuard sia abilitata. Su un computer Windows, spunta la casella **Utilizza AdGuard come un proxy HTTP** nella scheda **Rete** delle sue impostazioni. On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. Assicurati che la protezione di AdGuard sia abilitata. Su un computer Windows, spunta la casella **Utilizza AdGuard come un proxy HTTP** nella scheda **Rete** delle sue impostazioni. Per Mac, vai in **Impostazioni** → **Preferenze** → **Rete**, e abilita il **proxy HTTP**. 1. Sullo stesso computer con AdGuard, segui questo link: [http://local.adguard.org/cert](http://local.adguard.org/cert). @@ -55,15 +55,15 @@ A seconda del sistema operativo del dispositivo di cui desideri filtrare il traf 1. Clicca su **Configura** nella scheda *Utilizza un server proxy*. -1. Attiva l'interruttore. For **Proxy IP address**, type the IP address of your computer that you noted in step 1. Per la **Porta**, inserisci la porta scelta nelle impostazioni di rete dell'app desktop di AdGuard. +1. Attiva l'interruttore. Per l'**indirizzo IP del proxy**, digita l'indirizzo IP del tuo computer desktop, annotato al passaggio 1. Per la **Porta**, inserisci la porta scelta nelle impostazioni di rete dell'app desktop di AdGuard. 1. Clicca su **Salva**. ### Mac {#mac} -1. Note the IP address of your computer with installed AdGuard. +1. Annota l'indirizzo IP del tuo computer su cui è installato AdGuard. -1. Assicurati che la protezione di AdGuard sia abilitata. Su un computer Windows, spunta la casella **Utilizza AdGuard come un proxy HTTP** nella scheda **Rete** delle sue impostazioni. On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. Assicurati che la protezione di AdGuard sia abilitata. Su un computer Windows, spunta la casella **Utilizza AdGuard come un proxy HTTP** nella scheda **Rete** delle sue impostazioni. Per Mac, vai in **Impostazioni** → **Preferenze** → **Rete**, e abilita il **proxy HTTP**. 1. Segui questo link utilizzando un browser web: [http://local.adguard.org/cert](http://local.adguard.org/cert). @@ -93,9 +93,9 @@ A seconda del sistema operativo del dispositivo di cui desideri filtrare il traf ### Android {#android} -1. Note the IP address of your computer with installed AdGuard. +1. Annota l'indirizzo IP del tuo computer su cui è installato AdGuard. -1. Assicurati che la protezione di AdGuard sia abilitata. Su un computer Windows, spunta la casella **Utilizza AdGuard come un proxy HTTP** nella scheda **Rete** delle sue impostazioni. On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. Assicurati che la protezione di AdGuard sia abilitata. Su un computer Windows, spunta la casella **Utilizza AdGuard come un proxy HTTP** nella scheda **Rete** delle sue impostazioni. Per Mac, vai in **Impostazioni** → **Preferenze** → **Rete**, e abilita il **proxy HTTP**. 1. Dal computer con AdGuard, apri questo link utilizzando un browser web: [http://local.adguard.org/cert](http://local.adguard.org/cert). @@ -109,13 +109,13 @@ A seconda del sistema operativo del dispositivo di cui desideri filtrare il traf 1. Apri le impostazioni avanzate della rete Wi-Fi attiva. -1. Cambia il **Tipo di proxy** a **Manuale**. For **Proxy hostname**, enter the noted IP address of your computer you noted in step 1. Per la **Porta del proxy**, inserisci quella selezionata nelle impostazioni di rete dell'app di AdGuard. +1. Cambia il **Tipo di proxy** a **Manuale**. Per il **Nome del host del proxy**, inserisci l'indirizzo IP del tuo computer desktop, annotato al passaggio 1. Per la **Porta del proxy**, inserisci quella selezionata nelle impostazioni di rete dell'app di AdGuard. ### iOS {#ios} -1. Note the IP address of your computer with installed AdGuard. +1. Annota l'indirizzo IP del tuo computer su cui è installato AdGuard. -1. Assicurati che la protezione di AdGuard sia abilitata. Su un computer Windows, spunta la casella **Utilizza AdGuard come un proxy HTTP** nella scheda **Rete** delle sue impostazioni. On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. Assicurati che la protezione di AdGuard sia abilitata. Su un computer Windows, spunta la casella **Utilizza AdGuard come un proxy HTTP** nella scheda **Rete** delle sue impostazioni. Per Mac, vai in **Impostazioni** → **Preferenze** → **Rete**, e abilita il **proxy HTTP**. 1. Dal computer con AdGuard, apri questo link utilizzando un browser web: [http://local.adguard.org/cert](http://local.adguard.org/cert). diff --git a/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/beta-testing.md b/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/beta-testing.md index 852e82fdb57..c0f5d7bcf83 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/beta-testing.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/beta-testing.md @@ -1,46 +1,46 @@ --- -title: AdGuard beta/nightly testing +title: Test beta/nightly AdGuard sidebar_position: 1 --- -Esiste un'app di AdGuard praticamente per ogni piattaforma principale disponibile e rilasciamo regolarmente degli aggiornamenti per ognuna di esse. This would not be possible without beta and nightly testing and, more importantly, without our testers. Want to become one of them? Here’s how you can do it. +Esiste un'app di AdGuard praticamente per ogni piattaforma principale disponibile e rilasciamo regolarmente degli aggiornamenti per ognuna di esse. Questo sarebbe impossibile senza il beta testing o quello di nightly e, soprattutto, senza i tester. Vuoi diventarlo? Ecco come puoi farlo. -### Beta or nightly: what is the difference? +### Beta o nightly: qual è la differenza? -Both beta and nightly testing are important to make AdGuard constantly better. However, they are different, and you can choose the one that suits you more. +Sia i test beta che quelli nightly sono importanti per migliorare costantemente AdGuard. Tuttavia, sono diversi e puoi scegliere quello che ti si addice di più. -The development process follows a progression from nightly to beta and then from beta to the final, stable version — release. It means that you are more likely to find bugs in nightly builds, but you get access to new features faster, almost on a daily basis. Betas are more stable, but you will get updates less often. +Il processo di sviluppo segue una progressione da nightly a beta e poi da beta alla versione finale e stabile — rilascio. Significa che è più probabile che tu trovi bug nelle versioni nightly, ma hai accesso a nuove funzioni più rapidamente, quasi su base giornaliera. Le beta sono più stabili, ma riceverai aggiornamenti meno frequentemente. -## How to become a beta or nightly tester {#intro} +## Come diventare un beta/nightly tester {#intro} -Our requirements are easy: use AdGuard, upgrade to the beta/nightly version when it becomes available, and report any bugs you notice. You will need a [GitHub](https://github.com/) account to become our tester, so you may want to get that out of the way first. +I nostri requisiti sono semplici: usare AdGuard, passare alla versione beta/nightly quando è disponibile e segnalare qualsiasi bug noti. Tuttavia, ti servirà un profilo di [GitHub](https://github.com/) per diventare un nostro tester, quindi, potresti iniziare creandone uno. -You will also need the device on which you will install the app and [the link to the the beta testing page](https://adguard.com/beta.html). There you will find more information on how to join our program and test AdGuard for Windows, Mac, Android, and iOS. +Avrai anche bisogno del dispositivo su cui installerai l'app e [il collegamento alla pagina di beta testing](https://adguard.com/beta.html). Lì troverai ulteriori informazioni su come unirti alla nostra app e testare AdGuard per Windows, Android e iOS. -If you want to skip the description part and get straight to the action, you can apply [here](https://surveys.adguard.com/beta_testing_program/form.html). Your application will be reviewed within 1–3 working days, and you'll get a reply via email. +Se desideri saltare la parte descrittiva e passare direttamente all'azione, puoi candidarti [qui](https://surveys.adguard.com/beta_testing_program/form.html). La tua candidatura sarà revisionata entro 1–3 giorni lavorativi e riceverai una risposta via email. :::note -To get the AdGuard for iOS beta or nightly build, first you have to install [TestFlight](https://apps.apple.com/app/testflight/id899247664) on your iOS device. +Per ottenere la versione beta o la nightly di AdGuard per iOS, prima devi installare [TestFlight](https://apps.apple.com/app/testflight/id899247664) sul tuo dispositivo iOS. ::: ## Come segnalare un bug {#report-a-bug} -If you spotted a bug or just want to share your suggestion, let us know: go to [GitHub](https://github.com/AdguardTeam/), find a suitable repository, create a new issue there, and describe the bug/feature request in detail. +Se hai individuato un bug o desideri semplicemente condividere un tuo suggerimento, faccelo sapere: vai su [GitHub](https://github.com/AdguardTeam/), trova una repository idonea, crea un nuovo ticket, e descrivi il bug o la richiesta di funzionalità nel dettaglio. -The above method is the most preferred, but you can use others if necessary: +Il suddetto metodo è il preferito, ma puoi utilizzarne altri se necessario: - Trovaci sulle varie piattaforme social, come [Facebook](https://www.facebook.com/AdguardEn/), [Reddit](https://www.reddit.com/r/Adguard/), etc. Tuttavia, questo non è il metodo più comodo per discutere le questioni tecniche. - Invia un'email al nostro team di supporto dalla scheda Supporto nell'app o scrivi direttamente a [support@adguard.com](mailto:support@adguard.com). -## How to activate a beta/nightly key in the iOS app {#ios} +## Come attivare la chiave beta/nightly nell'applicazione iOS {#ios} -If you have already received a beta or nightly key and it is listed in your `adguard.com` account, go to the app and open the license section (Get Premium). Once there, enter the credentials from your AdGuard account. After that, the premium features will become available automatically. +Se hai già ricevuto una chiave beta o nightly ed è elencata nel tuo profilo su `adguard.com`, vai all'app e apri la sezione della licenza (Ottieni Premium). Una volta lì, inserisci le credenziali dal tuo profilo di AdGuard. Dopodiché, le funzionalità Premium diverranno automaticamente disponibili. -### What else? +### Che altro? -There is not much more to add. You don't have to go out of your way to find bugs. You can continue using AdGuard as usual. However, if you encounter a bug, please report it. Of course, we appreciate any additional effort. +Non c'è molto altro da aggiungere. Non devi fare di tutto per trovare i bug. Puoi continuare a utilizzare AdGuard come al solito. Tuttavia, se riscontri un bug, sei pregato di segnalarlo. Ovviamente, apprezziamo qualsiasi ulteriore sforzo. -Occasionally, you will receive our newsletters, keeping you informed of the latest changes in the beta/nightly (in case you missed them) and other important news. You can unsubscribe from it at any time. +Occasionalmente, riceverai le nostre newsletter, che ti terranno informato sugli ultimi cambiamenti nella beta (nel caso te li sia persi) e su altre notizie importanti. Puoi disiscriverti in qualsiasi momento. diff --git a/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/filters.md b/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/filters.md index 500a30fcadd..9406603e983 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/filters.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/filters.md @@ -13,7 +13,7 @@ I siti web modificano costantemente come incorporano gli annunci e, noi, aggiung Tuttavia, lavorare con i filtri di blocco richiede delle competenze specifiche. Se le hai e sai come creare le regole, dirigiti direttamente alla nostra [repository dei Filtri di AdGuard](https://github.com/AdguardTeam/AdguardFilters) su Github. Lì, troverai molti ticket aperti, ognuno riferito a un problema con qualche sito web: un annuncio non bloccato, un falso positivo, etc. Scegline uno qualsiasi e suggerisci le tue regole nei commenti. Gli ingegneri di filtraggio di AdGuard revisioneranno i tuoi suggerimenti e, se li troveranno appropriati, le tue regole saranno aggiunte ai filtri di AdGuard. -If you are not yet familiar with our filtering rule syntax, or maybe need a refresher, you'll find the basics about the syntax [in our Knowledge Base](/general/ad-filtering/create-own-filters). +Se non sei ancora familiare con la sintassi delle nostre regole di filtraggio, o non ti ricordi come funziona, troverai i fondamenti sulla sintassi [nelle nostre Base di conoscenza](/general/ad-filtering/create-own-filters). ### Ricompense {#rewards} diff --git a/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/become-translator.md b/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/become-translator.md index f50fd2e2af8..e2d08c1d2c0 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/become-translator.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/become-translator.md @@ -3,7 +3,7 @@ title: Diventare un traduttore/revisore sidebar_position: 2 --- -If you want to help translate AdGuard products, websites, and Knowledge Bases, go to [Crowdin](https://crowdin.com/) and sign up/log in there. +Se desideri aiutare a tradurre i prodotti, siti web e Basi di conoscenza di AdGuard, vai su [Crowdin](https://crowdin.com/) e registrati/accedi. ![crowdin *border](https://cdn.adtidy.org/public/Adguard/kb/en/ag-translations/main-screen.png) diff --git a/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/plural-forms.md b/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/plural-forms.md index b8daa9a11a6..c37e1ff544e 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/plural-forms.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/plural-forms.md @@ -38,7 +38,7 @@ Quando ti trovi di fronte una traduzione che richiede l'uso dei plurali, potrest Ecco alcune fonti di informazioni che puoi utilizzare. -La [Guida di Localizzazione](http://docs.translatehouse.org/projects/localization-guide/en/latest/l10n/pluralforms.html) contiene un ampio elenco di lingue. La quantità di forme plurali per le diverse lingue è mostrato come segue: `nplurals=2`, `nplurals=4` e così via. The numeral after the equals sign `=` indicates the number of plural forms of the respective language. +La [Guida di Localizzazione](http://docs.translatehouse.org/projects/localization-guide/en/latest/l10n/pluralforms.html) contiene un ampio elenco di lingue. La quantità di forme plurali per le diverse lingue è mostrato come segue: `nplurals=2`, `nplurals=4` e così via. Il numero dopo il segno Uguale `=` indica il numero di forme plurali della lingua rispettiva. Inoltre, puoi ottenere le informazioni sulle forme plurali nella [Repository Locale di Dati Comuni Unicode](http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#rules) (CLDR). Le Regole Plurali CLDR indicano una forma aggiuntiva della parola per i numeri decimali (1,5; 2,3; 100,1…), ma non le utilizziamo nelle traduzioni di AdGuard. @@ -137,7 +137,7 @@ Pertanto, la traduzione dall'inglese al serbo dovrebbe essere: Sebbene sia ovvio che gli ultimi due modelli non presentino differenze, è molto importante seguire la regola: **Il numero di modelli dovrebbe riflettere il numero di forme plurali della rispettiva lingua!** (tipicamente, per questo tipo di stringhe contenenti plurali). -## Short summary {#summary} +## Riepilogo breve {#summary} Traducendo i progetti di AdGuard, presta particolare attenzione alle frasi che richiedono l'utilizzo di forme plurali. diff --git a/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/program.md b/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/program.md index 908a411cefb..3930fac5015 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/program.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/program.md @@ -3,10 +3,10 @@ title: Programma di traduzione di AdGuard sidebar_position: 1 --- -You can ask us any questions about translating AdGuard by sending an email to [translate@adguard.com](mailto:translate@adguard.com) or by joining our [Telegram chat](https://t.me/joinchat/UVYTLcHbr8JmOGIy). +Puoi farci qualsiasi domanda sulla traduzione di AdGuard, inviando un'e-mail a [translate@adguard.com](mailto:translate@adguard.com) o unendoti alla nostra [chat di Telegram](https://t.me/joinchat/UVYTLcHbr8JmOGIy). -When it comes to translations, we at AdGuard always heavily rely on volunteers. +Quando si tratta di traduzioni, noi di AdGuard facciamo sempre molto affidamento sui volontari. -We now use the [Crowdin platform](https://crowdin.com/) to manage translations of our products. So this is the place for anyone who wants to contribute to AdGuard by translating any of our products. +Ora usiamo la [piattaforma Crowdin](https://crowdin.com/) per gestire le traduzioni dei nostri prodotti. Quindi, questo è il posto giusto per chiunque voglia contribuire ad AdGuard traducendo uno qualsiasi dei nostri prodotti. -If you want to be among the volunteers who help us translate AdGuard, please read the information on [how to become our translator](../become-translator) and [how we collaborate with them](../rewards). +Se desideri essere tra i volontari che ci aiutano a tradurre AdGuard, sei pregato di leggere le informazioni su [come diventare un nostro traduttore](../become-translator) e [come collaboriamo con loro](../rewards). diff --git a/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/rewards.md b/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/rewards.md index d73b78efdbd..22158a2c910 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/rewards.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/rewards.md @@ -5,56 +5,56 @@ sidebar_position: 6 Poiché qualsiasi sforzo onesto e ben fatto dovrebbe esser ricompensato, i traduttori attivi su Crowdin possono richiedere una chiave di licenza gratuita di AdGuard e un abbonamento alla VPN. -## How our reward system works +## Come funziona il nostro sistema di ricompense -### For AdGuard licenses +### Per licenze AdGuard -- For your first one-year Ad Blocker license, you need to translate **1,000 words**. -- For your second license, you’ll need an **additional 1,500 words** (a total of 2,500 words). -- All subsequent licenses require an **additional 2,500** words per license. +- Per la tua prima licenza di un anno del Blocco-inserzioni devi tradurre **1.000 parole**. +- Per la tua seconda licenza, avrai bisogno di **1.500 parole aggiuntive** (un totale di 2.500 parole). +- Tutte le licenze successive richiedono la traduzione di ulteriori **2.500** parole per licenza. -### For AdGuard VPN licenses +### Per licenze AdGuard VPN -- The first one-year VPN subscription requires translating **3,000 words**. -- All subsequent subscriptions or renewals require an **additional 3,000 words** per subscription. +- La prima sottoscrizione VPN di un anno richiede la traduzione di **3.000 parole**. +- Tutti gli abbonamenti o rinnovi successivi richiedono la **traduzione di 3.000 parole ulteriori** per abbonamento. -:::note Limitations +:::note Limitazioni -As a reward for contributing, we offer licenses and subscriptions valid for a maximum of 5 years. In the case of Ad Blocker, we offer licenses that cover up to 5 devices. We do not offer lifetime licenses. +Come premio per il contributo, offriamo licenze e abbonamenti validi per un massimo di 5 anni. Nel caso di Ad Blocker, offriamo licenze che coprono fino a 5 dispositivi. Non offriamo licenze a vita. ::: -## How to request your license +## Come richiedere la tua licenza -Just send an email to our translators team at [translate@adguard.com](mailto:translate@adguard.com) with the following information: +Invia un'e-mail al nostro gruppo di traduttori all'indirizzo [translate@adguard.com](mailto:translate@adguard.com) con le seguenti informazioni: -- Your Crowdin username -- The projects you contributed to (Websites, Applications, Knowledge Base, etc.) -- The email address to which you want to link your license -- Your translation statistics (a screenshot or total word count) and the type of license you want +- Il tuo nome utente Crowdin +- I progetti a cui hai contribuito (Siti web, Applicazioni, Base di conoscenze, ecc.) +- L'indirizzo e-mail a cui vuoi collegare la tua licenza +- Le tue statistiche di traduzione (una schermata o conteggio totale delle parole) e il tipo di licenza che desideri -**Email template:** +**Modello di e-mail:** -> Hi AdGuard team! +> Ciao team AdGuard! > -> I’ve translated more than 5,000 words in AdGuard for Android in (*your language*) — you can find my stats attached. As a reward, I’d like to request an AdGuard VPN license and an Ad Blocker license My email is (*your email address*). My Crowdin username is (*your username*). +> Ho tradotto più di 5.000 parole in AdGuard per Android in (*inserisci la tua lingua*) — puoi trovare le mie statistiche allegate. Come ricompensa, vorrei richiedere una licenza di AdGuard VPN e una licenza del Blocca-inserzioni Il mio indirizzo e-mail è (*inserisci il tuo indirizzo e-mail*). Il mio nome utente Crowdin è (*inserisci il tuo nome utente*). -## How to check your translation progress +## Come controllare i progressi della tua traduzione -Open a project you have been working on, click the *Reports* tab, select *My Contribution*, scroll down, select a date range, and generate a report. It will look something like this. +Apri un progetto su cui hai lavorato, clicca la scheda *Rapporti*, seleziona *Il mio contributo*, scorri verso il basso, seleziona un intervallo di date e genera un rapporto. Produrrà qualcosa del genere. -![Statistics *border](https://cdn.adtidy.org/content/kb/ad_blocker/miscellaneous/adguard_translations/statistics.png) +![Statistiche *border](https://cdn.adtidy.org/content/kb/ad_blocker/miscellaneous/adguard_translations/statistics.png) -You can add up the number of words translated across different projects to qualify for a license. +Puoi sommare il numero di parole tradotte in diversi progetti per qualificarti per una licenza. ## Come diventare un revisore -Our most active translators may be considered for proofreader status in the future. To become a proofreader, you’ll need to deliver consistently high quality translations over a period of several months. +In futuro, i nostri traduttori più attivi potrebbero essere presi in considerazione per la qualifica di correttori di bozze. Per diventare un correttore di bozze, dovrai fornire traduzioni di alta qualità in modo costante per un lasso di diversi mesi. -Please note that proofreaders do not receive extra licenses or benefits beyond helping more people access AdGuard products in their language. If you’re interested in becoming one of our proofreaders, please contact us at [translate@adguard.com](mailto:translate@adguard.com). +Si prega di notare che i correttori di bozze non ricevono licenze o vantaggi aggiuntivi oltre ad aiutare più persone ad accedere ai prodotti AdGuard nella loro lingua. Se sei interessato a diventare uno dei nostri correttori di bozze, ti preghiamo di contattarci a [translate@adguard.com](mailto:translate@adguard.com). -## Gifts for active contributors +## Regali per i collaboratori attivi -To the best contributors, every year we send gifts with the AdGuard merch and give a shout out on our [blog](https://adguard.com/en/blog/best-contributors-2023.html). +Ai migliori contributori, ogni anno inviamo regali con il merchandising di AdGuard e diamo visibilità nel nostro [blog](https://adguard.com/en/blog/best-contributors-2023.html). -![AdGuard merch *border](https://cdn.adguard.com/public/Adguard/Blog/presents.png) +![Merchandising AdGuard *border](https://cdn.adguard.com/public/Adguard/Blog/presents.png) diff --git a/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/translation-priority.md b/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/translation-priority.md index 07a3e37a713..d271c7e20e9 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/translation-priority.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/translation-priority.md @@ -3,13 +3,13 @@ title: Come dare priorità alle traduzioni dei file di Crowdin sidebar_position: 5 --- -There are five major AdGuard projects on Crowdin — [AdGuard Applications](https://crowdin.com/project/adguard-applications), [AdGuard Websites](https://crowdin.com/project/adguard-websites), [AdGuard Ad Blocker Knowledge Base](https://crowdin.com/project/adguard-knowledge-base), [AdGuard VPN Knowledge Base](https://crowdin.com/project/adguard-vpn-knowledge-base), and [AdGuard DNS Knowledge Base](https://crowdin.com/project/adguard-knowledge-bases). +Ci sono cinque progetti principali di AdGuard su Crowdin — [AdGuard Applications](https://crowdin.com/project/adguard-applications), [AdGuard Websites](https://crowdin.com/project/adguard-websites), [Nozioni di base del blocca-inserzioni di AdGuard](https://crowdin.com/project/adguard-knowledge-base), [Nozioni di base di AdGuard VPN](https://crowdin.com/project/adguard-vpn-knowledge-base), e [Nozioni di base di AdGuard DNS](https://crowdin.com/project/adguard-knowledge-bases). Non abbiamo delle linee guida chiare su con quali file o prodotti del progetto *AdGuard Applications* iniziare. Basta scegliere qualsiasi prodotto tu preferisca. Ci sono soltanto un paio di cose che vogliamo menzionare: -- The app is only available to users in those languages for which all translations have been completed on Crowdin; +- L'app è disponibile solo per gli utenti in quelle lingue per cui tutte le traduzioni sono state completate su Crowdin; - Consigliamo di tradurre le descrizioni per i negozi di app in un secondo momento, poiché, senza la traduzione dei prodotti stessi, le descrizioni non saranno necessarie. La situazione è differente nel progetto *AdGuard Websites*. Le lingue possono essere aggiunte al sito anche se non è disponibile una serie completa di traduzioni. Tuttavia, ciò dipende da quali file sono già stati tradotti. Ecco perché ti consigliamo di iniziare con i file più importanti, elencati di seguito: diff --git a/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/updating-knowledge-base.md b/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/updating-knowledge-base.md index 0405f7e5284..fdaf771d872 100644 --- a/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/updating-knowledge-base.md +++ b/i18n/it/docusaurus-plugin-content-docs/current/miscellaneous/contribute/updating-knowledge-base.md @@ -1,28 +1,28 @@ --- -title: Updating the Knowledge Base +title: Aggiornamento della Base di Conoscenza sidebar_position: 2 --- -The goal of AdGuard Ad Blocker Knowledge Base is to provide everyone with the most up-to-date information on all kinds of AdGuard-related topics. Ma le cose cambiano continuamente e, talvolta, un articolo non riflette più lo stato corrente delle cose. +L'obiettivo della Base di conoscenza del Blocco AdGuard è quello di fornire a tutti le informazioni più aggiornate su ogni tipo di argomento correlato ad AdGuard. Ma le cose cambiano continuamente e, talvolta, un articolo non riflette più lo stato corrente delle cose. Per questo abbiamo inserito tutti i contenuti della nostra KB su [GitHub](https://github.com/AdguardTeam/KnowledgeBase) e, ora, letteralmente chiunque può contribuire a essa suggerendo modifiche e traduzioni agli articoli esistenti, nonché proporne di totalmente nuovi. ## Come suggerire una modifica o scrivere un nuovo articolo {#suggest-change} -You can suggest changes to current articles and add new ones to our Knowledge Base using the functionality of GitHub mentioned above. Se non sei familiare con i principi di lavoro con la piattaforma, inizia leggendo la [documentazione di GitHub](https://docs.github.com/en). +Puoi suggerire modifiche agli articoli esistenti e aggiungerne di nuovi alla nostra Base di conoscenza, utilizzando la funzionalità di GitHub menzionata sopra. Se non sei familiare con i principi di lavoro con la piattaforma, inizia leggendo la [documentazione di GitHub](https://docs.github.com/en). -Una volta pronto a iniziare, lavora nella [repository "KnowledgeBase"](https://github.com/AdguardTeam/KnowledgeBase). All texts in our Knowledge Base are written in `Markdown` markup language. Tienilo a mente quando modifichi o scrivi articoli. Segui [questo link](https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax) per scoprire di più sulla sintassi di Markdown. +Una volta pronto a iniziare, lavora nella [repository "KnowledgeBase"](https://github.com/AdguardTeam/KnowledgeBase). Tutti i testi nella nostra Base di Conoscenza sono scritti nel linguaggio di markup `Markdown`. Tienilo a mente quando modifichi o scrivi articoli. Segui [questo link](https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax) per scoprire di più sulla sintassi di Markdown. -The Knowledge Base website is built using Docusaurus 2 — a modern static website generator. Suggerendo modifiche o aggiunte, considera che tutti i documenti devono conformarsi ai principi della piattaforma. Puoi saperne di più nelle [Guide di Docusaurus](https://docusaurus.io/docs/category/guides). +Il sito web della Base di Conoscenza è creato utilizzando Docusaurus 2: un generatore di siti web statici moderni. Suggerendo modifiche o aggiunte, considera che tutti i documenti devono conformarsi ai principi della piattaforma. Puoi saperne di più nelle [Guide di Docusaurus](https://docusaurus.io/docs/category/guides). -You can deploy this Knowledge Base locally on your computer to preview the changes you suggest. Detailed instructions on how to do this can be found [in the README file](https://github.com/AdguardTeam/KnowledgeBase#readme) on this Knowledge Base's GitHub page. +Puoi distribuire questa Base di conoscenza localmente sul tuo computer per visualizzare in anteprima le modifiche che suggerisci. Istruzioni dettagliate su come farlo si possono trovare [nel file README](https://github.com/AdguardTeam/KnowledgeBase#readme) su questa pagina di GitHub della Base di conoscenza. ## Traduzione degli articoli {#translate-adguard} -Translation of the existing articles of the Knowledge Base is carried out on [the Crowdin platform](https://crowdin.com/profile/adguard). All the details about translations and working with Crowdin can be found [in the dedicated article](../translate/guidelines) of the AdGuard Ad Blocker Knowledge Base. +La traduzione degli articoli esistenti della Base di Conoscenza è effettuata sulla [piattaforma di Crowdin](https://crowdin.com/profile/adguard). Tutti i dettagli sulle traduzioni e sull'utilizzo di Crowdin si possono trovare [nell'articolo dedicato](../translate/guidelines) della Base di Conoscenza del Blocco-inserzioni AdGuard Ad Blocker. -When working on AdGuard Knowledge Base articles, you may meet strings containing plural forms that you should translate with extra attention. [In un articolo separato](../translate/plural-forms), abbiamo descritto nel dettaglio le difficoltà che possono sorgere traducendo stringhe contenenti le forme plurali e abbiamo fornito istruzioni approfondite su come lavorarci sulla piattaforma di Crowdin. +Lavorando con gli articoli della Base di conoscenza di AdGuard, potresti incontrare delle stringhe contenenti forme plurali, che dovresti tradurre con particolare attenzione. [In un articolo separato](../translate/plural-forms), abbiamo descritto nel dettaglio le difficoltà che possono sorgere traducendo stringhe contenenti le forme plurali e abbiamo fornito istruzioni approfondite su come lavorarci sulla piattaforma di Crowdin. ## Lavorare a problemi aperti -Sometimes there exist [open tasks](https://github.com/AdguardTeam/KnowledgeBase/issues) related to updating the Knowledge Base. You can help us speed up their completion [the same way](#suggest-change) you would suggest any other changes to the Knowledge Base. Scegli qualsiasi problema tu trovi interessante e inizia a lavorarci. Se hai domande, puoi farle direttamente nei commenti di quel problema. +Talvolta esistono degli [incarichi aperti](https://github.com/AdguardTeam/KnowledgeBase/issues) correlati all'aggiornamento della Base di Conoscenza. Puoi aiutarci a velocizzarne il completamento, [allo stesso modo](#suggest-change) in cui suggeriresti qualsiasi altra modifica alla Base di conoscenza. Scegli qualsiasi problema tu trovi interessante e inizia a lavorarci. Se hai domande, puoi farle direttamente nei commenti di quel problema. diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md index f81d3382c3c..8da57cd31e6 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md @@ -1,56 +1,56 @@ --- -title: Low-level settings guide +title: ローレベル設定の使い方ガイド sidebar_position: 5 --- :::info -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. 実際どのように機能するのかを確認するには、[AdGuard アプリ](https://agrd.io/download-kb-adblock)をダウンロードしてください。 +この記事は、システムレベルでデバイスを保護してくれる多機能広告ブロッカー、「AdGuard for Android」についてです。 実際どのように機能するのかを確認するには、[AdGuard アプリ](https://agrd.io/download-kb-adblock)をダウンロードしてください。 ::: -## How to reach Low-level settings +## ローレベル設定にアクセスする方法 :::caution -Changing the low-level settings can cause problems with AdGuard’s performance, interrupt your Internet connection, or compromise your security and privacy. Use the low-level features only if you are an experienced user and know what you are doing, or if our support team has asked you to do so. +ローレベル設定を変更するとAdGuardのパフォーマンス悪化やインターネット接続の切断、もしくはあなたのセキュリティやプライバシーを侵害してしまう可能性があります。 ローレベル設定の機能は、あなたが経験豊富なユーザーであり自分が何をしているかを知っている場合、またはサポートチームから依頼された場合にのみ使用してください。 ::: -To access _Low-level settings_, open the AdGuard app and tap the gear icon in the lower-right corner of the screen. Then select _General → Advanced → Low-level settings_. +「_ローレベル設定_」にアクセスするには、AdGuardアプリを開き、画面の右下隅にある⚙️アイコン(設定)をタップします。 次に、「一般設定」→「詳細設定」→「ローレベル設定」を選択します。 ## ローレベル設定 -For AdGuard v4.x for Android we’ve completely redesigned the low-level settings. We have reworked the list of settings and organized them into thematic groups with improved descriptions. We also added input validation and other safety valves. +AdGuard for Android v4.x では、ローレベルの設定を完全に再設計しました。 設定のリストを再構成し、それぞれのテーマグループにまとめて説明を改善しました。 入力検証やその他の安全弁も追加しました。 ### DNS通信を保護 -#### Fallback upstreams +#### フォールバックアップストリーム -Here you can specify the fallback DNS resolver(s) to use when the configured server is unavailable. Available options: +ここでは、設定しているサーバーが利用できなかった場合に使用されるフォールバックDNSレゾルバーを指定できます。 使用可能なオプションは以下の通りです: -- _Automatic DNS_: Select this option if you want to use the system DNS or AdGuard DNS. -- _None_: Select this option if you do not want to have any fallback. -- _Custom DNS_: Select this option and enter plain DNS server IPv4 or IPv6 addresses, one per line. These addresses will be used as upstreams. +- _自動DNS_:システムDNSまたはAdGuard DNSを使用する場合は、このオプションを選択します。 +- _なし_:フォールバックがいらない場合は、このオプションを選択します。 +- _カスタムDNS_:このオプションを選択しますと、プレーンDNSサーバーのIPv4またはIPv6アドレスを1行に1つずつ入力できます。 これらのアドレスはアップストリームとして使用されます。 -#### Fallback domains +#### フォールバックドメイン -Here you can list domains that will be redirected to fallback upstreams, if available. You can enter multiple domains, one per line. You can use limited wildcards. +ここでは、フォールバックアップストリーム(利用可能なものがある場合)にリダイレクトされるドメインをリストアップできます。 複数のドメインを1行に1つずつ入力できます。 (限定的なワイルドカードも使用できます。) -#### Detect search domains +#### 検索ドメインを検出する -If this setting is enabled, AdGuard will detect DNS search domains and automatically redirect them to fallback upstreams, if available. +この設定が有効になっている場合、AdGuardはDNS検索ドメインを検出し、利用可能であれば自動的にフォールバックアップストリームにリダイレクトします。 -#### Bootstrap upstreams +#### Bootstrapアップストリーム -Bootstrap DNS for encrypted DNS upstreams, such as DoH, DoT, and DoQ servers. Available options: +DoH、DoT、DoQ サーバーなどの暗号化された DNS アップストリーム用のBootstrap DNSです。 使用可能なオプションは以下の通りです: -- _Automatic DNS_: Select this option if you want to use the system DNS or AdGuard DNS. This option is selected by default. -- _Custom DNS_: Select this option and enter plain DNS server IPv4 or IPv6 addresses, one per line. These addresses will be used as bootstrap upstreams. +- _自動DNS_:システムDNSまたはAdGuard DNSを使用する場合は、このオプションを選択します。 このオプションはデフォルトで選択されています。 +- _カスタムDNS_:このオプションを選択しますと、プレーンDNSサーバーのIPv4またはIPv6アドレスを1行に1つずつ入力できます。 これらのアドレスはbootstrapアップストリームとして使用されます。 #### adblock-styleルール用ブロックモード -Here you can specify the response type for domains blocked by DNS rules based on adblock rule syntax (for example, `||example.org^`). Available options: +ここでは、広告ブロックルールの語法(例えば、`||example.org^`)に基づいて、DNSルールによってブロックされたドメインのレスポンスタイプを指定できます。 使用可能なオプションは以下の通りです: - _REFUSED_: Respond with REFUSED - _NXDOMAIN_: Respond with NXDOMAIN diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 5a49fead44c..9d38498292a 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ sidebar_position: 4 このセクションでは、HTTPSフィルタリング設定、フィルタ、ユーザースクリプトを管理し、プロキシサーバーを設定することができます。 -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### フィルタ @@ -57,102 +57,110 @@ AdGuard は、フィルタのルールを適用することで、広告、トラ [フィルタについてもっと読む](https://adguard.com/en/blog/what-are-filters.html) -### ユーザースクリプト +### 拡張機能 -Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. ユーザースクリプトをインストールするには、専用のユーザースクリプト・マネージャが必要です。 AdGuard にはこのようなマネージャー機能があるので、そのままURLまたはファイルからユーザースクリプトを追加することができます。 +Extensions allow you to add userscripts and userstyles. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) + +Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. + +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra -AdGuard Extra は、複雑な広告やウェブサイトに広告を再投入するメカニズムをブロックしてくれるカスタム・ユーザースクリプトです。 +AdGuard Extra is a custom userscript that blocks complex ads and mechanisms that reinject ads to websites. -#### AMPを無効化 +#### Disable AMP -「AMPを無効化」は、Google 検索結果ページで [Accelerated mobile pages(AMP)](https://ja.wikipedia.org/wiki/Accelerated_Mobile_Pages) を無効にするユーザー スクリプトです。 +Disable AMP is a userscript that disables [Accelerated mobile pages](https://en.wikipedia.org/wiki/Accelerated_Mobile_Pages) on the Google search results page. ### ネットワーク #### HTTPSフィルタリング -多くのウェブサイトやアプリで広告やトラッカー(追跡)をブロックするには、AdGuard は HTTPS トラフィックをフィルタリングできることが必要です。 [HTTPSフィルタリングについてもっと読む](/general/https-filtering/what-is-https-filtering) +To block ads and trackers on most websites and in most apps, AdGuard needs to filter their HTTPS traffic. [Read more about HTTPS filtering](/general/https-filtering/what-is-https-filtering) -##### セキュリティ証明書 +##### Security certificates -暗号化されたトラフィックを処理するためには、AdGuard はデバイスに CA 証明書をインストールします。 トラフィックはローカルでフィルタリングされ、AdGuard が接続のセキュリティ性を検証しますので、安全です。 +To manage encrypted traffic, AdGuard installs its CA certificate on your device. It's safe: the traffic is filtered locally and AdGuard verifies the security of the connection. -旧バージョンのアンドロイドでは、証明書は自動的にインストールされます。 Android 11 以降では、手動で証明書をインストールする必要があります。 [インストール手順はこちら](/adguard-for-android/solving-problems/manual-certificate/) +On older versions of Android, the certificate is installed automatically. On Android 11 and later, you need to install it manually. [Installation instructions](/adguard-for-android/solving-problems/manual-certificate/) -ユーザーストア内の CA 証明書は、ブラウザや一部のアプリで HTTPS トラフィックをフィルタリングするのに十分です。 しかし、システムストアの証明書しか信用しないアプリもあります。 そういったアプリで HTTPS トラフィックをフィルタリングするには、AdGuard の CA 証明書をシステムストアにインストールする必要があります。 [その手順はこちら](/adguard-for-android/solving-problems/https-certificate-for-rooted/) +The CA certificate in the user store is enough to filter HTTPS traffic in browsers and some apps. However, there are apps that only trust certificates from the system store. To filter HTTPS traffic there, you need to install AdGuard's CA certificate into the system store. [Instructions](/adguard-for-android/solving-problems/https-certificate-for-rooted/) -##### HTTPSフィルタリングされるアプリ +##### HTTPS-filtered apps -このセクションには、AdGuard が HTTPS トラフィックをフィルタリングするアプリのリストが含まれています。 ※この設定をデバイス上のすべてのアプリに適用するのは、ユーザーストアとシステムストアの両方にCA証明書がある場合のみ可能です。 +This section contains the list of apps for which AdGuard filters HTTPS traffic. Please note that the setting can be applied for all apps only if you have CA certificates both in the user store and in the system store. -##### HTTPSフィルタリング対象ウェブサイト +##### HTTPS-filtered websites -この設定では、AdGuard が HTTPS トラフィックをフィルタリングする Web サイトを管理できます。 +This setting allows you to manage websites for which AdGuard should filter HTTPS traffic. -HTTPS フィルタリングにより、AdGuard はリクエストと応答のコンテンツをフィルタリングできますが、AdGuard はこのデータを収集または保存したりすることは一切ありません。 ただし、セキュリティを強化するために、[潜在的に機密情報を含むウェブサイトを HTTPS フィルタリングから除外](/general/https-filtering/what-is-https-filtering/#financial-websites-and-websites-with-sensitive-personal-data)します。 +HTTPS filtering allows AdGuard to filter the content of requests and responses, but we never collect or store this data. However, to increase security, we [exclude websites that contain potentially sensitive information from HTTPS filtering](/general/https-filtering/what-is-https-filtering/#financial-websites-and-websites-with-sensitive-personal-data). -次のいずれかのモードを選択して、除外する必要があると思われる Web サイトを追加することもできます: +You can also add websites that you consider necessary to exclusions by selecting one of the modes: -- 特定のウェブサイトをHTTPSフィルタリングの対象から除外する -- 除外リストに追加されたウェブサイトのみのHTTPSトラフィックをフィルタリングする +- Exclude specific websites from HTTPS filtering +- Filter HTTPS traffic only on the websites added to exclusions -デフォルトでは、金融ウェブサイトなど、Extended Validation (EV) 証明書を持つウェブサイトもAdGuardはフィルタリングしません。 必要であれば、「EV証明書を持つウェブサイトをフィルタリング」オプションを有効にすることができます。 +By default, we also do not filter websites with Extended Validation (EV) certificates, such as financial websites. 必要であれば、「_EV証明書を持つウェブサイトをフィルタリング_」オプションを有効にすることができます。 -#### プロキシ +#### Proxy -AdGuardを、デバイスのすべてのトラフィックをプロキシサーバー経由でルーティングするように設定できます。 [アウトバウンドプロキシの設定方法](/adguard-for-android/solving-problems/outbound-proxy) +You can set up AdGuard to route all your device's traffic through your proxy server. [How to set up an outbound proxy](/adguard-for-android/solving-problems/outbound-proxy) -「プロキシ」セクションでは、AdGuard と連携するサードパーティの VPN を設定することもできます(お使いのVPNプロバイダーがそれを許可している場合)。 +In this section, you can also set up a third-party VPN to work with AdGuard, if your VPN provider allows it. -「プロキシ経由で動作するアプリ」の下で、指定したプロキシ経由でトラフィックをルーティングするアプリを選択できます。 _AdGuard VPN との併用モード_が有効になっている場合、この設定は AdGuard VPN のアプリ除外の役割を果たすようになります。これにより、AdGuard VPN トンネル経由でルーティングされるアプリを指定できます。 +Under _Apps operating through proxy_, you can select apps that will route their traffic through your specified proxy. If you have _Integration with AdGuard VPN_ enabled, this setting plays the role of AdGuard VPN's app exclusions: it allows you to specify apps to be routed through the AdGuard VPN tunnel. -#### ルーティングモード +#### Routing mode -このセクションでは、トラフィックのフィルタリング方法を選択できます。 +This section allows you to select the traffic filtering method. -- 「ローカルVPN」は、ローカルに作成された VPN を介してトラフィックをフィルタリングします。 これは最も安定性の高いモードです。 Android の制限により、このモードはルート化されていないデバイスで使用できる唯一のシステム全体のトラフィックフィルタリング方法でもあります。 +- _Local VPN_ filters traffic through a locally created VPN. This is the most reliable mode. Due to Android restrictions, it is also the only system-wide traffic filtering method available on non-rooted devices. :::note -※_ローカルVPN_ モードでは、AdGuard を他の VPN と同時に使用することはできません。 AdGuard と別の VPN を併用するには、「プロキシ」モードで動作するように再構成し、AdGuard でアウトバウンドプロキシを設定する必要があります。 AdGuard VPN の場合、これは[_併用モード_](/adguard-for-android/features/integration-with-vpn)のおかげで自動的に行われます。 +The _Local VPN_ mode doesn't allow AdGuard to be used simultaneously with other VPNs. To use another VPN with AdGuard, you need to reconfigure it to work in proxy mode and set up an outbound proxy in AdGuard. For AdGuard VPN, this is done automatically with the help of the [_Integrated mode_](/adguard-for-android/features/integration-with-vpn). ::: -- 「自動プロキシ」は、VPN の使用を必要としない代替トラフィックルーティング方法です。 大きな利点の 1 つは、VPN と並行して実行できることです。 ※このモードにはroot権限が必要です. +- _Automatic proxy_ is an alternative traffic routing method that does not require the use of a VPN. One significant advantage is that it can be run in parallel with a VPN. This mode requires root access. -- 「手動プロキシ」は、特定のポートにプロキシサーバーを設定し、それを Wi-Fi 設定で構成できる、というモードです。 ※このモードには、Android 10 以降のroot権限が必要です。 +- _Manual proxy_ involves setting up a proxy server on a specific port, which can then be configured in Wi-Fi settings. This mode requires root access for Android 10 and above. ## ライセンス -このセクションでは、お使いのライセンスに関する情報を確認し、以下のように管理することができます: +In this section, you can find information about your license and manage it: -- [フルバージョンの機能](/adguard-for-android/features/free-vs-full)を有効にするためのAdGuardライセンス購入 -- AdGuard アカウントにログインするか、ライセンスキーを入力してライセンスを有効化 -- 7日間の無料試用期間をまだ利用していない場合は、登録して試用期間を有効にする +- Buy an AdGuard license to activate [the full version's features](/adguard-for-android/features/free-vs-full) +- Log in to your AdGuard account or enter the license key to activate your license +- Sign up to activate your 7-day trial period if you haven't used it yet - Refresh the license status from the three-dots menu (⋮) -- AdGuard アカウントを開いてライセンスを管理する -- ライセンスをリセットする(たとえば、ライセンスの最大デバイス数上限に達し、別のライセンスを適用したい場合などです。) +- Open the AdGuard account to manage your license there +- Reset your license — for example, if you've reached device limit for this license and want to apply another one ![License screen \*mobile_border](https://cdn.adtidy.org/blog/new/3wyh5hlicense.png) ## サポート -AdGuard for Android に関するご質問やご意見には、このセクションをご利用ください。 サポートにお問い合わせいただく前に、_[よくあるご質問(FAQ)](https://adguard.com/support/adguard_for_android.html)_ またはこのナレッジベースを参照することをお勧めします。 +Use this section if you have any questions or suggestions regarding AdGuard for Android. We recommend consulting _[FAQ](https://adguard.com/support/adguard_for_android.html)_ or this knowledge base before contacting support. ![Support \*mobile_border](https://cdn.adtidy.org/blog/new/cz55usupport.png) -すり抜け広告を見つけた場合は、「不適切なブロックを報告する」からご報告ください。 +If you notice a missed ad, please report it via _Report incorrect blocking_. -アプリの変な動作については、「バグ・不具合を報告する」を選択してください。 可能でしたら、問題を詳しく説明し、アプリのログを添付してください。 [問題を説明する方法はこちら](/guides/report-bugs/#how-to-describe-a-problem) +For unexpected app behavior, select _Report a bug_. If possible, describe your problem in detail and add app logs. [How to describe an issue](/guides/report-bugs/#how-to-describe-a-problem) -ご提案については、「機能を依頼・提案する」をご利用ください。 +For your suggestions, use _Request a feature_. :::note -GitHub も、バグを報告したり、新しい機能を提案したりするためのいい手段です。GitHub上のご報告等は直接エンジニアが頻繁に確認します。 [報告手順とリポジトリへのリンクはこちら](/guides/report-bugs/#adguard-for-android) +GitHub is an alternative way to report bugs and suggest new features. [Instructions and repository links](/guides/report-bugs/#adguard-for-android) ::: diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 5e75a51f1e8..b5525cd735c 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index d1314f96f25..dedf5a38d63 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index dd2a4434d2f..40936e6f8a8 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: How to protect AdGuard from being disabled by the system -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 183b504b07e..d8db60d5583 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ AdGuard for Android アプリ →「*統計*」(画面下左から3番目の この画面では、過去24時間以内のAdGuardによるバッテリー消費量を示すグラフが表示されています。また、グラフをタップすることで、より詳細な1時間ごとのデータも確認できます。 そのほか、関連データの数値的な内訳と短い技術的な説明もあります。 +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### AdGuard の本当のバッテリー消費量はどのくらいですか? まず、少し理論を整理し、必要なデータへのリンク挙げたいと思います。を diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 6f1876d0079..0563d2a0336 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index 852a029cd4c..23c87775371 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index ac33a8251c8..abe7cde0207 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Firefoxブラウザへのセキュリティ証明書の手動インストール -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index c5b7755321a..05d28c3b6ea 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 3f4bbfa4f19..c48c7bde328 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Android 11以上での証明書インストール方法 -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 4fb6b0f07da..f71b0577990 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problems caused by multiple user profiles -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 6b9fddc4500..f95d206303e 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: How to set up outbound proxy -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index b9e9396152a..4ae364e8290 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index ccafc42f723..32460046dd1 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/solving-problems.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/solving-problems.md index 9ac47918b29..f24c15c3766 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/solving-problems.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/solving-problems.md @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -Here are some problems you may encounter and workarounds, guides, and instructions you may need. +あなたが遭遇する可能性のある問題と、それらへの回避策、ガイド、および手順を紹介しております: - [Battery and traffic consumption issues](/adguard-for-android/solving-problems/battery.md) - [How to collect debug logs](/adguard-for-android/solving-problems/log.md) diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index adfd7139869..5d8aa06bad9 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: How to block ads in the YouTube app -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 591c033e68c..35b0985bfd6 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,88 +5,150 @@ sidebar_position: 2 ## AdGuard for Linux をインストールする方法 -AdGuard for Linux をインストールするには、以下のコマンドを入力してください: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -【安定版】 +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -【ベータ版】 +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -【Nightly版】 +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` -必要に応じて、管理者パスワードを入力します。 +If required, enter your admin password. -`y` を押すことで `/usr/local/bin` に実行可能ファイルへのリンクを作成し、インストールが完了するまで待ちます。 +Press `y` to create a link in `/usr/local/bin` to the executable and wait until the installation is complete. :::note -AdGuard の公式バージョンであることを証明するには、`gpg` ツールを使用して署名を検証することができます。 [GitHubで詳細を読む](https://github.com/AdguardTeam/AdGuardCLI?tab=readme-ov-file#verify-releases) +You can verify the signature to prove it’s an official version of AdGuard by using the `gpg` tool. [Read more on GitHub](https://github.com/AdguardTeam/AdGuardCLI?tab=readme-ov-file#verify-releases) ::: -## ライセンスを有効化する +## Initial setup -AdGuard for Linuxをご利用いただくには[AdGuardライセンス](https://adguard.com/license.html)が必要です。 まだライセンスをお持ちでない方は、ログインするかアカウントを作成して14日間の無料トライアルをご利用いただけます。 すでにライセンスをお持ちの場合は、ログインすることで有効化してください。 +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -ログインまたはアカウントを登録するには、以下を入力します: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -ライセンスをリセットするには、以下を入力します: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -ライセンス情報を表示するには、以下を入力します: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## 初期設定 +4. After activation, you can continue to work with the program: -AdGuardを稼働させるには、初期設定を完了してください。 これには、AdGuard CA 証明書のインストール、必要なフィルターの有効化、プロキシモードの選択が含まれます。 + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -設定ウィザードを実行するには、以下を入力します: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` -## AdGuard for Linux をアンインストールする方法 + or view the license info by entering -AdGuard をアンインストールするには、以下のコマンドを入力します: + ```sh + adguard-cli license + ``` -【安定版】 +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: -``` + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). + +## Uninstall AdGuard for Linux + +To uninstall AdGuard, enter: + +Release + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` -【ベータ版】 +Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` -【Nightly版】 +Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` -必要に応じて、管理者パスワードを入力します。 +If required, enter your admin password. diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 5691b0fdd53..2099b6acc26 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: 設定と保護機能の管理 sidebar_position: 3 --- +## Available commands + すべての AdGuard コマンドをリストの形で確認するには、以下を入力してください: -``` +```sh adguard-cli --help-all ``` ## AdGuard による保護機能をオン・オフにする +### Enable protection + 保護を有効にするには、以下を入力します: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + 保護機能をオフにするには、以下を入力します: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + 保護ステータスを表示するには、以下を入力します: -``` +```sh adguard-cli status ``` -## フィルタ更新を確認する +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### フィルタ更新を確認する 更新があるかどうかをチェックするには、以下を入力します: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + AdGuard for Linux をアップデートするには、以下を入力します: -``` +```sh adguard-cli update ``` +### Update script output + 更新スクリプトの出力を表示するには、以下を入力します: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v AdGuard for Linuxを設定するには、`config` コマンドを使用します。 サブコマンドは以下のとおりです: - `show`: `proxy.yaml` の現在の構成を表示する + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: `proxy.yaml` でオプションを設定する - `listen_ports.http_proxy`: HTTP listening port - `proxy_mode`: プロキシモード(`manual`または`auto`) + - `get`: 上記オプションの現在の状態を取得する ## フィルターを管理する @@ -64,8 +90,32 @@ AdGuard for Linuxを設定するには、`config` コマンドを使用します AdGuard for Linuxを設定するには、`filters` コマンドを使用します。 サブコマンドは以下のとおりです: - `list`: インストールされているフィルタ一覧を表示する + - `--all`: すべてのフィルタを表示 + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: フィルタをインストールする (インストールしたいフィルタのURLを入力してください。) + - `enable`: フィルタを有効にする (フィルタの名前またはIDを入力してください。) + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: フィルタを無効にする (フィルタの名前またはIDを入力してください。) + - `update`: フィルタを更新する + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/adguard-for-mac.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/adguard-for-mac.md index a356fb6225f..36d131941e4 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/adguard-for-mac.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/adguard-for-mac.md @@ -9,20 +9,20 @@ sidebar_position: 1 ::: -## Features +## 機能 -Main features and settings available in AdGuard for Mac +AdGuard for Mac の主な機能と設定についての説明です: -[Features](/adguard-for-mac/features/features.md) +[機能](/adguard-for-mac/features/features.md) ## インストール/アンインストール -Installation, removal, and system requirements for AdGuard for Mac +動作環境と、AdGuard for Mac のインストールおよびアンインストール方法の手順について説明しております: -[Installation](/adguard-for-mac/installation.md) +[インストール方法](/adguard-for-mac/installation.md) ### 問題解決 既知の問題と考えられる解決策を説明する記事がまとめられています: -[Solving problems](/adguard-for-mac/solving-problems/solving-problems.md) +[問題解決](/adguard-for-mac/solving-problems/solving-problems.md) diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/features/features.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/features/features.md index 5dc2280331c..a9f1681e5eb 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/features/features.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/features/features.md @@ -1,5 +1,5 @@ --- -title: Features +title: 機能 sidebar_position: 1 --- @@ -11,25 +11,25 @@ sidebar_position: 1 ## メインウィンドウ -Main screen with statistics on blocked ads and trackers and access to main settings +ブロックされた広告とトラッカーの統計と主要設定へのアクセスを備えたメイン画面についてです: -[Main window](/adguard-for-mac/features/main.md) +[メインウィンドウ](/adguard-for-mac/features/main.md) ## 一般 -Basic settings to block search ads and website self-promotional ads, enable language-specific filters, and manage _Allowlist_ +言語特化フィルタ、ホワイトリスト、検索広告とウェブサイトの自己宣伝広告のブロックなどという基本設定です: -[General](/adguard-for-mac/features/general.md) +[一般設定](/adguard-for-mac/features/general.md) ## フィルタ -Filters and user rules to fine-tune ad blocking +フィルターとユーザールールで広告ブロックの微調整が可能です: -[Filters](/adguard-for-mac/features/filters.md) +[フィルタ](/adguard-for-mac/features/filters.md) ## DNS -DNS servers and DNS filters that let you block ads, trackers, and dangerous websites +DNSサーバーやDNSフィルタを設定することで、広告、トラッカー、および悪意のあるコンテンツをブロックする方法についての説明です: [DNS](/adguard-for-mac/features/dns.md) @@ -37,28 +37,28 @@ DNS servers and DNS filters that let you block ads, trackers, and dangerous webs ユーザー情報を収集するCookie、UTMタグ、オンライン分析をブロックする機能です。 -[Stealth Mode](/adguard-for-mac/features/stealth.md) +[ステルスモード](/adguard-for-mac/features/stealth.md) ## セキュリティ -A setting that blocks access to malicious and phishing websites and protects you from online threats +悪意のあるウェブサイトやフィッシングサイトへのアクセスをブロックし、オンラインの脅威から保護してくれる設定です: -[Security](/adguard-for-mac/features/security.md) +[セキュリティ](/adguard-for-mac/features/security.md) ## ブラウザアシスタント -An extension that complements the desktop program and allows you to manage filtering from your browser +直接ブラウザからのフィルタリング管理を可能にすることで、AdGuardデスクトップアプリを補完してくれる拡張機能です。 -[Browser Assistant](/adguard-for-mac/features/browser-assistant.md) +[ブラウザアシスタント](/adguard-for-mac/features/browser-assistant.md) ## 拡張機能 -A feature that allows you to extend the functionality of websites by adding userscripts and userstyles +ユーザースクリプトやユーザースタイルを追加することで、ウェブサイトの機能を拡張できる機能です: -[Extensions](/adguard-for-mac/features/extensions.md) +[拡張機能](/adguard-for-mac/features/extensions.md) ## ネットワーク -Additional network-related options and proxy settings +追加のネットワーク関連オプションとプロキシ設定についての説明です: -[Network](/adguard-for-mac/features/network.md) +[ネットワーク](/adguard-for-mac/features/network.md) diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/solving-problems/advanced-settings.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/solving-problems/advanced-settings.md index 3ea591e6666..8c884a05a2f 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/solving-problems/advanced-settings.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/solving-problems/advanced-settings.md @@ -161,9 +161,9 @@ Chrome Certificate Transparency Policy(証明書透過性ポリシー)に基 #### `dns.proxy.private.relay.sequoia.workaround.enabled` -Blocks macOS Private Relay domains if the user has a firewall enabled, which in turn disables the *Private Relay* feature. +ユーザーがファイアウォールを有効にしている場合、macOSプライベートリレードメインをブロックし、「*プライベートリレー*」機能を無効にします。 -Enabling this setting is useful in the following scenario: when macOS Private Relay is active, filtering cannot function properly and must be disabled. In macOS versions up to 14, AdGuard could automatically disable Private Relay when Protection was enabled. However, starting with macOS 15, this is no longer possible if a firewall is active. By turning on this setting, you can disable Private Relay even when the firewall is enabled, overcoming the previous limitation. +この設定を有効にすると、次のような時に便利です:macOSプライベートリレーがアクティブだとフィルタリングは正しく機能しないため、無効にする必要があります。 macOSバージョン14まででは、保護機能が有効の際に、AdGuardはプライベートリレーを自動的に無効にすることができていました。 しかし、macOS 15 以降では、ファイアウォールがアクティブな場合、これを行うことはできません。 この設定をオンにすると、ファイアウォールが有効な場合でもプライベートリレーを無効にすることができ、以前の制限を克服することができます。 ### ステルスモード設定 diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/solving-problems/high-sierra-compatibility.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/solving-problems/high-sierra-compatibility.md index 49dc087074e..095ebd05e8a 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/solving-problems/high-sierra-compatibility.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/solving-problems/high-sierra-compatibility.md @@ -9,12 +9,12 @@ sidebar_position: 3 ::: -During the installation of AdGuard on macOS High Sierra (or later), you may receive the message "System Extension Blocked". This is a new security mechanism introduced in High Sierra that requires you to explicitly allow the installation of a third-party system extension. +macOS High Sierra (またはそれ以降のバージョン) に AdGuard をインストールしているときに、「システム拡張がブロックされました」というメッセージが表示される場合があります。 これは High Sierra で登場した新しいセキュリティメカニズムであり、活用するにはサードパーティシステム拡張のインストールを明示的に許可する必要があります。 -To complete the installation of AdGuard you have to manually allow loading the extension by clicking the "Allow" button in *System Preferences* → *Security & Privacy* → *General*. +AdGuard のインストールを完了するには、拡張機能の読み込みを手動で許可する必要があります。( *システム環境設定* → *セキュリティ & プライバシー* → *一般* で「許可する」を押します) -On macOS Sequoia, you can do it in *System Preferences* → *Security & Privacy* → *General* → *Login Items & Extensions*. Once there, click the "i" icon next to *Network Extensions* and toggle the AdGuard option. +macOS Sequoiaの場合、*システム環境設定*→*セキュリティ & プライバシー*→*一般*→*ログインアイテム & 拡張機能* で行うことができます。 そこで、「*ネットワーク拡張機能*」の隣にある「i」アイコンをクリックし、AdGuardオプションのスイッチを切り替えます。 ![設定で拡張機能のインストールを許可する](https://cdn.adtidy.org/public/Adguard/kb/PicturesEN/highsierra.png) -After that you will be able to proceed with the installation as usual. +その後、通常通りのインストールを進めることができます。 diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/solving-problems/solving-problems.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/solving-problems/solving-problems.md index d9137143629..58a3b5493cb 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/solving-problems/solving-problems.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-mac/solving-problems/solving-problems.md @@ -9,16 +9,16 @@ sidebar_position: 1 ::: -Here are some problems you may encounter and workarounds, guides, and instructions you may need. +あなたが遭遇する可能性のある問題と、それらへの回避策、ガイド、および手順を紹介しております: -- [Manual certificate installation](/adguard-for-mac/solving-problems/manual-certificate-installation.md) -- [Protection cannot be enabled](/adguard-for-mac/solving-problems/protection-cannot-be-enabled.md) -- [How to install AdGuard on macOS High Sierra and above](/adguard-for-mac/solving-problems/high-sierra-compatibility.md) -- [Compatibility issues with different macOS versions](/adguard-for-mac/solving-problems/big-sur-issues.md) -- [Installation problems solving](/adguard-for-mac/solving-problems/installation-issues.md) -- [Launch issues](/adguard-for-mac/solving-problems/launch-issues.md) -- [iCloud Private Relay and AdGuard](/adguard-for-mac/solving-problems/icloud-private-relay.md) -- [Protect Mail Activity and AdGuard](/adguard-for-mac/solving-problems/protect-mail-activity.md) -- [Advanced Settings guide](/adguard-for-mac/solving-problems/advanced-settings.md) -- [Setting up filtering in Tor Browser](/adguard-for-mac/solving-problems/tor-filtering.md) -- [Incompatibility with Screen Time](/adguard-for-mac/solving-problems/screen-time-issues.md) +- [証明書の手動インストール](/adguard-for-mac/solving-problems/manual-certificate-installation.md) +- [保護機能を有効にすることができない](/adguard-for-mac/solving-problems/protection-cannot-be-enabled.md) +- [macOS High Sierra 以降に AdGuard をインストールする方法](/adguard-for-mac/solving-problems/high-sierra-compatibility.md) +- [異なるmacOSバージョンとの互換性問題](/adguard-for-mac/solving-problems/big-sur-issues.md) +- [インストール関連の問題解決](/adguard-for-mac/solving-problems/installation-issues.md) +- [アプリ起動時の問題](/adguard-for-mac/solving-problems/launch-issues.md) +- [iCloud プライベートリレーと AdGuard](/adguard-for-mac/solving-problems/icloud-private-relay.md) +- [「"メール"でのアクティビティを保護」と AdGuard](/adguard-for-mac/solving-problems/protect-mail-activity.md) +- [詳細設定ガイド](/adguard-for-mac/solving-problems/advanced-settings.md) +- [Torブラウザでフィルタリングを設定する方法](/adguard-for-mac/solving-problems/tor-filtering.md) +- [スクリーンタイムとの互換性問題](/adguard-for-mac/solving-problems/screen-time-issues.md) diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/adguard-for-windows.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/adguard-for-windows.md index 3f8acc2e8d7..b3911f4ddd0 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/adguard-for-windows.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/adguard-for-windows.md @@ -9,32 +9,32 @@ sidebar_position: 1 ::: -## Features +## 機能 -Main features and settings available in AdGuard for Windows +AdGuard for Windows の主な機能と設定についての説明です: -[Features](/adguard-for-windows/features/features.md) +[機能](/adguard-for-windows/features/features.md) ## インストール/アンインストール -Installation, removal, and system requirements for AdGuard for Windows +動作環境と、AdGuard for Windows のインストールおよびアンインストール方法の手順について説明しております: -[Installation](/adguard-for-windows/installation.md) +[インストール方法](/adguard-for-windows/installation.md) ## ブラウザアシスタント -An extension that complements the desktop program and allows you to manage filtering from your browser +直接ブラウザからのフィルタリング管理を可能にすることで、AdGuardデスクトップアプリを補完してくれる拡張機能です。 -[Browser Assistant](/adguard-for-windows/browser-assistant.md) +[ブラウザアシスタント](/adguard-for-windows/browser-assistant.md) ## 問題解決 既知の問題と考えられる解決策を説明する記事がまとめられています: -[Solving problems](/adguard-for-windows/solving-problems/solving-problems.md) +[問題解決](/adguard-for-windows/solving-problems/solving-problems.md) ## 管理者向けドキュメンテーション -Configuration guide for system administrators +システム管理者向けの設定ガイドです: -[Documentation for admins](/adguard-for-windows/admins-documentation.md) +[管理者向けドキュメント](/adguard-for-windows/admins-documentation.md) diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index 2aa90a4331d..e872557753c 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ sidebar_position: 5 ## 1. MSIをダウンロードする {#msi-download} -Download the [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi) +[AdGuard MSI x86 をダウンロード](https://agrd.io/adguard_setup86_msi) -Download the [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi) +[AdGuard MSI x64 をダウンロード](https://agrd.io/adguard_setup64_msi) ## 2. お使いのネットワーク用の設定を構成する {#settings-configuring} diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md index c4698316453..c3fb6466c7d 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md @@ -9,7 +9,7 @@ sidebar_position: 3 ::: -AdGuard can significantly extend website functionality by working as a [userscript manager](/general/extensions.md). AdGuard users can add their own scripts as well as manage existing ones. +AdGuard は[ユーザースクリプトマネージャ](/general/extensions.md)として動くことで、ウェブサイトの機能を大幅に拡張することができます。 AdGuard のユーザーは、独自のスクリプトを追加したり、既存のスクリプトを管理したりできます。 ![拡張機能画面 \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/userscripts.png) @@ -33,7 +33,7 @@ AdGuard Extra は、基本的にミニプログラムで、サイトがブロッ **AdGuard ポップアップブロッカー** -この拡張機能は、ウェブページ閲覧時にポップアップウィンドウが開かないようにしてくれます。 Some popups are considered useful — they may contain settings for site administering or additional reference information demonstrated upon clicking a link. そのため、必要に応じてAdGuard ポップアップブロッカーをオフにすることができます。 また、この拡張機能は、AdGuard の除外リストに追加されたウェブサイトでも機能しません。 デフォルトではオフになっていますが、アプリの設定でオンにすることができます。 +この拡張機能は、ウェブページ閲覧時にポップアップウィンドウが開かないようにしてくれます。 ポップアップの中には、サイト管理のための設定や、リンクをクリックしたときに表示される追加参考情報が含まれているような、役に立つとされるポップアップもたまにあります。 そのため、必要に応じてAdGuard ポップアップブロッカーをオフにすることができます。 また、この拡張機能は、AdGuard の除外リストに追加されたウェブサイトでも機能しません。 デフォルトではオフになっていますが、アプリの設定でオンにすることができます。 **Web of Trust** diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/features/features.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/features/features.md index d619b61ae7a..e0c37bbe59f 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/features/features.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/features/features.md @@ -1,5 +1,5 @@ --- -title: Features +title: 機能 sidebar_position: 1 --- @@ -11,30 +11,30 @@ sidebar_position: 1 ## ホーム画面 -On the main screen you’ll find _Settings_, _Support_, _License_, and _About_, as well as statistics on blocked ads and trackers +メイン画面には、_設定_、_サポート_、_ライセンス_、_バージョン情報_、およびブロックされた広告とトラッカーの数(統計)が表示されます。 -[Home screen](/adguard-for-windows/features/home-screen/) +[ホーム画面](/adguard-for-windows/features/home-screen/) ## 設定 -Theme and language settings, ad blocking customization, DNS protection, parental controls, extension management, and advanced options for expert users +テーマと言語設定、広告ブロックのカスタマイズ、DNS通信を保護、ペアレンタルコントロール、拡張機能の管理、上級ユーザー向けの詳細設定などがあります: -[Settings](/adguard-for-windows/features/settings/) +[設定](/adguard-for-windows/features/settings/) ## 拡張機能 -A feature that allows you to extend the functionality of websites by adding userscripts and userstyles +ユーザースクリプトやユーザースタイルを追加することで、ウェブサイトの機能を拡張できる機能です: -[Extensions](/adguard-for-windows/features/extensions/) +[拡張機能](/adguard-for-windows/features/extensions/) ## ネットワーク -Additional network-related options and proxy settings +追加のネットワーク関連オプションとプロキシ設定についての説明です: -[Network](/adguard-for-windows/features/network/) +[ネットワーク](/adguard-for-windows/features/network/) ## その他の機能 -Support, license management, tray menu options, program version and updates +サポート、ライセンス管理、トレイメニューオプション、プログラムバージョンとアップデートなど: -[Other features](/adguard-for-windows/features/others/) +[その他の機能](/adguard-for-windows/features/others/) diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/features/network.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/features/network.md index b5743f05e11..328f947f2d5 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/features/network.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/features/network.md @@ -9,25 +9,25 @@ sidebar_position: 4 ::: -The _Network_ module is dedicated to network filtering, and here you will find additional network-related options. Two of them are enabled by default: _Enable traffic filtering_ and _Filter HTTPS_. These are important extra precautions to better filter your web space. Most websites are now using HTTPS, and the same applies to advertising. From many websites, like youtube.com, facebook.com, and x.com, it is impossible to remove ads without HTTPS filtering. So keep the _Filter HTTPS_ feature enabled unless you have a strong reason not to. +この「ネットワーク」モジュールはネットワークフィルタリング専用のもので、ネットワーク関連の追加オプションがあります。 このうち、「トラフィックフィルタリングを有効にする」と「HTTPS をフィルタリングする」は、デフォルトで有効になっています。 これらは、あなたのウェブスペースをより良くフィルタリングするための重要な追加予防措置です。 現在、ほとんどのウェブサイトがHTTPSを使用しており、広告も同様です。 youtube.com、facebook.com、x.comなど多くのウェブサイトでは、HTTPSフィルタリングなしでは広告を削除することができません。 そのため、特別な理由がない限り、「HTTPSをフィルタリングする」機能は有効にしておいてください。 ![Network Settings \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/network-settings.png) -In this module you can select the checkbox _Use AdGuard as an HTTP proxy_ to use AdGuard as a regular HTTP proxy which will filter all traffic passing through it. You can also enable the _Filter websites with EV certificates_ feature. Extended Validation (EV) SSL Certificates offer a stronger safety guarantee; owners of such websites have to pass a thorough and globally standardized identity verification process defined by EV guidelines. Which is the reason why some users trust websites with such certificates and prefer not to filter them. +このモジュールでは、「HTTPプロキシとしてAdGuardを使用する」チェックボックスをオンにすると、AdGuardを通常のHTTPプロキシとして使用し、通過するすべてのトラフィックをフィルタリングできます。 「EV証明書を持つウェブサイトをフィルタリング」オプションを有効にすることもできます。 EV (Extended Validation) SSL証明書は、ウェブサイトの所有者がEVガイドラインで定義されている国際標準化された徹底的な身元確認プロセスに合格したことを保証します。 これは、このような証明書を持つウェブサイトを信頼してフィルタリングをしないようなユーザーがいる理由でもあります。 -At last, there is a section with proxy settings. There you can specify which proxy server AdGuard should use to update filters, get new versions, and so on. +最後に、プロキシ設定のセクションがあります。 そこで、AdGuard がフィルタの更新や新バージョンの取得などに使用するプロキシサーバーを指定できます。 ### AdGuard VPN -The last section is dedicated to AdGuard VPN — an ideal tool that provides security and anonymity each time you browse the Internet. You can download it by clicking the _Download_ button or go to the AdGuard VPN website by clicking the _Homepage_ button. +最後のセクションは AdGuard VPN に関するものです。AdGuard VPN は、インターネットを閲覧するたびにセキュリティと匿名性を提供する理想的なツールです。 「ダウンロード」ボタンをクリックしてダウンロードするか、「ホームページ」ボタンをクリックして AdGuard VPN のウェブサイトにアクセスしてください。 -How does AdGuard VPN work? Without going into technical details, we can say that VPN creates a secure encrypted tunnel between the user's computer or mobile device and a remote VPN server. In this way, data privacy is preserved, as well as the anonymity of the user, because a third-party observer sees the IP address of the VPN server and not the actual user's IP. +そもそも、AdGuard VPN の仕組みは何なのか? 技術的な詳細は省きますが、VPNは、ユーザーのコンピュータまたはモバイル端末とリモートVPNサーバーの間に安全な暗号化トンネルを作成すると言えます。 これにより、データと個人情報のプライバシーが保たれるだけでなく、オンライン上の第三者にはユーザーの実際のIPではなく、VPNサーバーのIPアドレスが見えるので、ユーザーの位置情報も隠されます。 -**What AdGuard VPN does:** +**AdGuard VPN の機能:** -- hides your real whereabouts and helps you stay anonymous -- changes your IP address to protect your data from tracking -- encrypts your traffic to make it unreadable to third parties -- lets you configure where to use VPN and where not to (exclusions feature) +- あなたの本当の居場所を隠し、匿名性を保てるようにします。 +- IPアドレスを変更することで、トラッキングからデータ・個人情報を保護します。 +- トラフィック(通信)を暗号化し、詐欺師やハッカーが通信内容にアクセスできないようにします。 +- VPNを使用するとしない場所を設定できます(「VPN対象外リスト「機能) -To get more information about AdGuard VPN, dive into the [AdGuard VPN Knowledge Base](https://adguard-vpn.com/kb/). +AdGuard VPN についての詳しい情報は、[AdGuard VPN ナレッジベース](https://adguard-vpn.com/kb/)をご覧ください。 diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md index df6622ee068..aa3cc7ed309 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md @@ -23,7 +23,7 @@ sidebar_position: 2 ### 広告ブロッカー -これは AdGuard for Windows のメインモジュールで、アクセスしたウェブサイトやデバイスにインストールされたアプリから広告を削除します。 To filter out advertising and privacy-threatening content such as banners, popups, or trackers AdGuard uses different filters — groups of rules with a similar purpose written with a [special syntax](/general/ad-filtering/create-own-filters). フィルタとは何か、どのように機能するのかについては、[こちらの記事](/general/ad-filtering/how-ad-blocking-works)をお読みください。 +これは AdGuard for Windows のメインモジュールで、アクセスしたウェブサイトやデバイスにインストールされたアプリから広告を削除します。 AdGuard は、バナー、ポップアップ、トラッカーなどのような、広告やプライバシーを脅かすコンテンツをフィルタリングするために、さまざまなフィルタ([特別な構文](/general/ad-filtering/create-own-filters)で記述され、同様の目的を持つルールグループ)を使用します。 フィルタとは何か、どのように機能するのかについては、[こちらの記事](/general/ad-filtering/how-ad-blocking-works)をお読みください。 ![広告ブロッカー \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/settings_ad_blocker.png) @@ -54,7 +54,7 @@ sidebar_position: 2 ブラウジング・セキュリティは、悪意のあるウェブサイトやフィッシングサイトからしっかり保護してくれます。 (※AdGuard for Windows はアンチウイルスソフトではありません。 すでに始まっているウイルスのダウンロードを止めることや、すでに存在するウイルスを削除することはできません。) しかし、ドメインが「信頼できないサイト」データベースに追加されたウェブサイトにアクセスしようとしたり、そのようなウェブサイトからファイルをダウンロードしようとしたりすると、警告が表示されます。 このモジュールがどのように機能するかについての詳細は、[こちらの専用記事](/general/browsing-security)をご覧ください。 -In this module, you can: +このモジュールでできること: - 悪質なウェブサイトやフィッシング詐欺サイトへのリクエストがブロックされた際の通知の受け取りを有効にする - サウンド通知を有効にする @@ -70,26 +70,26 @@ In this module, you can: ![DNS通信を保護 \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/dns-settings.png) -In the DNS protection module of AdGuard for Windows, you can choose DNS servers from known DNS providers, including AdGuard DNS, which blocks ads and trackers, AdGuard DNS Family Protection, which also blocks adult content, or AdGuard DNS Non-filtering, which provides a secure and reliable connection but doesn’t filter anything. You can even add custom DNS servers and rules using [DNS rule syntax](https://adguard-dns.io/kb/general/dns-filtering-syntax/). If necessary, you can add [DNS filters of your choice](https://filterlists.com). +AdGuard for Windows の「DNS通信を保護」モジュールでは、広告とトラッカーをブロックする「AdGuard DNS」、アダルトコンテンツをブロックする「AdGuard DNS ファミリー保護」、または安全で信頼性の高い接続を提供するが何もフィルタリングしない「AdGuard DNS フィルタリングなし」など、既知のDNSプロバイダからDNSサーバを選択できます。 また、[DNSルール構文](https://adguard-dns.io/kb/general/dns-filtering-syntax/)を使ってカスタムDNSサーバーやカスタムDNSルールを追加することもできます。 また、必要に応じて[お好みのDNSフィルタ](https://filterlists.com)を追加することもできます。 -Starting with v7.20, you can also add filters by simply selecting them from a list of pre-built, trusted filters. They are grouped into four categories for your convenience: +v7.20 以降では、信頼できる組み込みフィルタリストからフィルタを選択するだけで、フィルタを追加することもできます。 より使いやすくなるよう、フィルタは4つのカテゴリにグループ化されています: -- **General**: block ads and trackers -- **Regional**: block ads and trackers on language-specific websites -- **Security**: block phishing and unreliable websites -- **Other**: cover special use cases that don’t fit into the above categories +- **一般**:広告とトラッカー(個人情報追跡)をブロックします。 +- **地域別**:言語固有のウェブサイトで広告とトラッカーをブロックします。 +- **セキュリティ**:フィッシングサイトや信頼できないウェブサイトをブロックします。 +- **その他**:上記のカテゴリに当てはまらない特別なユースケースをカバーします。 ![DNS filters \*border](https://cdn.adtidy.org/content/release_notes/ad_blocker/windows/v7.20/dns_filters/en.png) -### Parental Control +### ペアレンタルコントロール -There are several websites to which access should be restricted from a PC used by children. This task is accomplished by Parental Control. +子供が使用するパソコンで、アクセスを制限する必要があるウェブサイトは何個もあるでしょう。 この機能をペアレンタルコントロールが果たします。 ![Parental Control \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/parental-control.png) -The module checks the contents of web pages opened in the browser and filters those with content undesirable for children: images and texts for adults, crude language, violence, drug propaganda, etc. Parental Control settings are password-protected so that the child is not able to go round the restrictions. This module not only blocks directions to undesirable sites but can also delete the links that are inappropriate for children from the search results. +このモジュールは、ブラウザで開かれたウェブページの内容をチェックし、子供にとって好ましくない内容(大人向けの画像やテキスト、下品な言葉、暴力、薬物の宣伝など)のものをフィルタリングします。 ペアレンタルコントロールの設定はパスワードで保護されているため、子供が自分で制限をオフにすることはできません。 このモジュールは、不適切なサイトへの誘導をブロックするだけでなく、子供に不適切なリンクを検索結果から削除することもできます。 -In the _Parental Control_ module you can enable the _Safe search_ and manage the _blocklist_ and the _allowlist_ to customize how this option works. You can also check the _Block executable files download_ box to prevent your child from downloading and installing software on the computer. There are two more options in the _Parental Control_ module: you can select a specific Windows user to be protected by _Parental Control_ and set a password to protect AdGuard settings from change. +ペアレンタルコントロールモジュールでは、「_セーフサーチ_」を有効にし、「_ブラックリスト_」と「_ホワイトリスト_」を管理して、この機能の動作をカスタマイズすることができます。 「実行形式ファイルのダウンロードをブロック」を有効にしますと、お子様のコンピュータへのソフトウェアのダウンロードとインストールを防ぎます。 「_ペアレンタルコントロール_」モジュールにはさらに 2 つのオプションがあります。_ペアレンタルコントロール_で保護対象の特定の Windows ユーザーを指定するオプションと、AdGuard 設定が変更されないようにパスワードを設定するオプションです。 ![Parental Control \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/parental-control.png) @@ -97,4 +97,4 @@ In the _Parental Control_ module you can enable the _Safe search_ and manage the ![Browser Assistant \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/browser-assistant/browser-assistant.png) -From this tab you can easily proceed to install AdGuard Browser Assistant, which primary function is to manage filtering directly from the browser. We explained more about how to work with it and what to do if there is no Browser Assistant for your browser in the [separate article](/adguard-for-windows/browser-assistant.md). +このタブから、AdGuard ブラウザアシスタントのインストールに簡単に進むことができます。AdGuard ブラウザアシスタントは、ブラウザから直接フィルタリングを管理することを主な機能としています。 [こちらの別の記事](/adguard-for-windows/browser-assistant.md)で、その使い方や、ブラウザにブラウザアシスタントがない場合の対処方法について詳しく説明しました。 diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/installation.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/installation.md index 31395049c9b..bc5eb24a222 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/installation.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/installation.md @@ -23,31 +23,31 @@ sidebar_position: 2 Microsoft Windowsを搭載したPCやタブレットでAdGuardを使用するには、インストールパッケージをダウンロードして、インストールプログラムを起動する必要があります。 以下の操作を行ってください: -1. Go to the [AdGuard website](http://adguard.com) in the address bar and click *Download* [on the homepage](https://adguard.com/download.html?auto=1). +1. [AdGuard ホームページ](http://adguard.com)にアクセスし、[*ダウンロード*](https://adguard.com/download.html?auto=1)をクリックします。 - ![Download AdGuard](https://cdn.adtidy.org/content/kb/ad_blocker/windows/installation/download-from-website.png) + ![AdGuardをダウンロード](https://cdn.adtidy.org/content/kb/ad_blocker/windows/installation/download-from-website.png) -2. When the download is finished, press the *Open* button shown in the Downloads bar or click the file name *adguardInstaller.exe*. +2. ダウンロードが完了しましたら、ダウンロードバーにある「*開く*」ボタンを押すか、「*adguardInstaller.exe*」というファイルを押してください。 - ![Press "Run"](https://cdn.adtidy.org/content/kb/ad_blocker/windows/installation/click-download.png) + ![「実行」を押す](https://cdn.adtidy.org/content/kb/ad_blocker/windows/installation/click-download.png) -3. You’ll see the User Account Control dialogue box requesting to allow the app to make changes to your PC. Click *Yes*. +3. ユーザーアカウント制御のダイアログボックスが表示され、アプリがPCに変更を加えることを許可するよう求められた場合は、 「*はい*」をクリックしてください。 - ![Allow changes *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/windows/installation/allow-changes.png) + ![変更を許可 *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/windows/installation/allow-changes.png) -4. Next, choose the folder on your PC for the app to be installed to. +4. 次に、PC上でAdGuardのインストール先を選びます。 - ![Choose folder *border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/installation/install-wizard.png) + ![フォルダを選択 *border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/installation/install-wizard.png) - If you do not agree with the default installation path, press *Browse*, select the folder for AdGuard installation in the *Browse For Folder* window, and confirm your choice by clicking *OK*. You can also install AdGuard to a new folder by clicking *Make New Folder* and entering its name. To create a desktop shortcut for AdGuard, check the *Create a desktop shortcut* box. Press *Install* to proceed with installation. + デフォルトのインストール先を変更したい場合は、「*参照*」を押して、「*フォルダを参照*」ウィンドウでAdGuardをインストールするフォルダを選択し、「*OK*」をクリックして選択を確定してください。 また、「*新規フォルダを作成*」をクリックしてフォルダ名を入力することで、AdGuardを新しいフォルダにインストールすることもできます。 AdGuardのデスクトップショートカットを作成するには、「*デスクトップにショートカットを作成*」にチェックを入れます。 「*インストール*」を押して、インストールを続行します。 - ![Start installation *border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/installation/start-install.png) + ![インストール開始 *border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/installation/start-install.png) -5. Wait for the installation to complete and click *Finish*. +5. インストールが完了しましたら、「*終了*」を押します。 - ![Complete installation *border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/installation/finish-install.png) + ![インストール完了 *border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/installation/finish-install.png) - Congratulations! You have successfully installed AdGuard on your computer. On the screen you will see the main window where you can change the app’s settings. + お試し版開始 お使いのコンピュータへのAdGuardインストールは完了です。 画面には、アプリの設定を変更できるメインウィンドウが表示されます。 ## AdGuard for Windows をアンインストールする方法 {#uninstall} @@ -71,7 +71,7 @@ AdGuardをアンインストールまたは再インストールする必要が ### アドバンスド方法 {#advanced} -何らかの理由で通常のアンインストールがうまくいかない場合は、アドバンスド方法を試してみてください。 First of all, you need to [download the uninstaller tool](https://static.adtidy.org/windows/uninstaller/uninstal_utility.zip) created by our developers. アーカイブをお使いのPCの任意のフォルダに解凍し、「**Adguard_Uninstall_Utility.exe**」ファイルを実行して、パソコンに変化を与えることを許可してください。 その後、以下の手順に行なってください: +何らかの理由で通常のアンインストールがうまくいかない場合は、アドバンスド方法を試してみてください。 まず、AdGuardのエンジニアが作成した[アンインストーラーツールをダウンロード](https://static.adtidy.org/windows/uninstaller/uninstal_utility.zip)する必要があります。 アーカイブをお使いのPCの任意のフォルダに解凍し、「**Adguard_Uninstall_Utility.exe**」ファイルを実行して、パソコンに変化を与えることを許可してください。 その後、以下の手順に行なってください: - *AdGuard Ad Blocker*と *Standard*uninstall type を選択し、*Uninstall* をクリックします。 @@ -105,20 +105,20 @@ AdGuardをアンインストールまたは再インストールする必要が AdGuardのアンインストール完了です! -#### Running the uninstaller in console mode +#### コンソールモードでアンインストーラを実行する -Besides running the advanced uninstaller in its user-interactive mode, you can also use command-line arguments to uninstall AdGuard for Windows. To do this, follow the instructions below: +高度なアンインストーラをユーザー対話モードで実行する以外に、コマンドライン引数を使用して AdGuard for Windows をアンインストールすることもできます。 それを行うには、以下の手順を行なってください: -1. Open Command Prompt by typing *cmd* from the Start menu. -2. Use `/console` to run the uninstaller in console mode, without the interactive UI. All the command-line parameters below will be ignored if the `/console` mode is not activated. -3. Use `/adblocker` to uninstall AdGuard for Windows. It should look like this: +1. スタート メニューから「*cmd*」と入力してコマンドプロンプトを開きます。 +2. `/console` を使用して対話型UIなしでコンソールモードでアンインストーラーを実行します。 ※`/console` モードが有効化されていない場合、以下のすべてのコマンドラインパラメーターは無視されます。 +3. `/adblocker` を使用して AdGuard for Windows をアンインストールします。 この場合、以下のようになるはずです: `Adguard.UninstallUtility.exe /console /adblocker` -4. You can also use `/advanced` to force the uninstaller to run in *Advanced mode* and `/settings` to force the uninstaller to remove user settings along with the application. +4. `/advanced` を使用しますとアンインストーラーを*高度なモード*で強制的に実行させ、`/settings` を使用しますとユーザーの設定をアプリと共に削除することもできます。 :::note -The use of the parameters `/console` and `/adblocker` is necessary for a successful uninstall. The parameters `/advanced` and `/settings` are optional. +アンインストールを成功させるには、パラメータ `/console` と `/adblocker` を使用する必要があります。 パラメータ `/advanced` と `/settings` は任意オプションです。 ::: diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md index 0331024d6ee..5e90d20bb00 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md @@ -35,13 +35,13 @@ sidebar_position: 6 これはエラー1603のサブカテゴリー的なものであると言えます。 考えられる解決策も似ています: -- Start and re-register Microsoft Installer service. It requires some work. +- Microsoftインストーラサービスを開始して再登録してください。 これを行うには、多少のステップを踏む必要があります: - - Press *Win + R* and enter **services.msc**. - - Find in the list and double-click *Windows Installer*. - - Hit *Start* button under *Service status* and hit *OK*. If the service status is **running**, you should click *Stop* first and then hit *Start*. - - Press *Win + R*, type ***msiexec /unregister***, and hit *Enter*. - - Press *Win + R* again, type ***msiexec /regserver***, and hit *Enter* + - *Win + R* を押して、 **services.msc**と入力します。 + - リストから *Windows インストーラー* を探し、ダブルクリックします。 + - *サービスステータス* の下の *開始* ボタンを押し、 *OK*を押します。 サービスステータスが**実行中**の場合、まず「*停止*」をクリックし、次に「*開始*」をクリックします。 + - *Win + R* を押し、 ***msiexec /unregister*** と入力し、 *Enter*キーを押します。 + - *Win + R* をもう一度押し、 ***msiexec /regserver*** と入力し、 *Enter*キーを押します。 - PC を再起動し、インストールを最初からやり直してください。 場合によっては、それだけで問題が解決する場合もあります。 @@ -65,25 +65,25 @@ sidebar_position: 6 - [専用のアンインストールツール](../../installation#advanced)を使用して AdGuard をアンインストールし、その後にインストールを繰り返してください。 -- Start and re-register Microsoft Installer service. It requires some work. - - - Press *Win + R* and enter ***services.msc***. - - Find in the list and double-click *Windows Installer*. - - Hit *Start* button under *Service status* and hit *OK*. If the service status is **running**, you should click *Stop* first and then hit *Start*. - - Press *Win + R*, type ***msiexec /unregister***, and hit *Enter*. - - Press *Win + R* again, type ***msiexec /regserver***, and hit *Enter* - -- Acquire full permissions on the drive for installation. It is possible that the error 1603 occurs because you don’t have full permissions on the file location. It's also not as easy as some of the other solutions: - - - Open *File Explorer*, right-click the drive containing the installation location and select *Properties*. - - Go to *Security* tab and click *Edit*. - - Single-click *SYSTEM* and ensure that the *Allow* box of every item in *Permissions for SYSTEM* is checked (if it is checkable). Do the same check for *Administrators*. - - Click *OK* to go back to *Properties* dialog. Then click *Advanced*. - - Click *Change Permissions*. - - On *Permissions* tab, double-click *Administrators*. - - Select *This folder, subfolders and files* for *Applies to* field and check all the available *Basic permissions*. After that, hit *OK*. - - Do the same operation above (from item 7) for *SYSTEM*. - - Click *OK* all the way out. Try installing AdGuard again. +- Microsoftインストーラサービスを開始して再登録してください。 これを行うには、多少のステップを踏む必要があります: + + - *Win + R* を押して、 **services.msc** と入力します。 + - リストから *Windows インストーラー* を探し、ダブルクリックします。 + - *サービスステータス* の下の *開始* ボタンを押し、 *OK*を押します。 サービスステータスが**実行中**の場合、まず「*停止*」をクリックし、次に「*開始*」をクリックします。 + - *Win + R* を押し、 ***msiexec /unregister*** と入力し、 *Enter*キーを押します。 + - *Win + R* をもう一度押し、 ***msiexec /regserver*** と入力し、 *Enter*キーを押します。 + +- インストールのためにドライブのフル権限を取得してください。 1603エラーが発生する原因は、ファイルの保存先に対してフルアクセス権限がないことの可能性があります。 結構手間かかりますが、手順は以下のとおりです: + + - *ファイルエクスプローラー*を開き、インストール先を含むドライブを右クリックして 「*プロパティ*」を選択します。 + - *セキュリティ* タブに移動し、 *編集* をクリックします。 + - *SYSTEM*(システム)を 1 回クリックし、「*SYSTEMのアクセス許可*」にあるすべての項目の *許可* ボックスがオンになっていることを確認します (チェック可能な場合)。 「*管理者*」に対しても同じチェックを入れます。 + - *OK* をクリックして *プロパティ* に戻ります。 次に「*詳細設定*」をクリックします。 + - 「*権限の変更*」をクリックします。 + - *権限* タブで、「*管理者*」をダブルクリックします。 + - *適用先* フィールドに対して「*このフォルダー、サブフォルダー、およびファイル*」を選択し、*基本権限*のすべてにチェックを入れます。 その後、 *OK* を押します。 + - *SYSTEM*に対してもステップ7と同じことをします。 + - *OK* を最後までクリックし続けます。 AdGuard を再度インストールしてみてください。 ### エラー 1618: 他のインストールがすでに進行中です {#error-1618} diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md index f5596d159b5..699fb262ef1 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md @@ -73,7 +73,7 @@ AdGuard に購読 URL (例: `abp:subscribe` など) を自動的に傍受させ ### システム起動時にメインウィンドウを開く -このオプションを有効にすると、システムの起動後に AdGuard のメインウィンドウが開きます。 This setting, which doesn't affect whether the actual filtering service is launched or not, is located in *Settings → General Settings*. +このオプションを有効にすると、システムの起動後に AdGuard のメインウィンドウが開きます。 ※実際のフィルタリングサービスが起動するかどうかには影響しないことにご注意ください。その設定は*「設定」→「一般設定*」にあります。 ### システム起動時にフィルタリングを有効にする diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/mozilla-error.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/mozilla-error.md index e26aadc460f..f6366a4b239 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/mozilla-error.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/mozilla-error.md @@ -1,5 +1,5 @@ --- -title: How to fix the `MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE` error +title: "`MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE` エラーを修正する方法" sidebar_position: 11 --- @@ -9,9 +9,9 @@ sidebar_position: 11 ::: -Some users of AdGuard for Windows with enabled [HTTPS filtering](/general/https-filtering/what-is-https-filtering) are unable to access certain websites like google.com and youtube.com. Instead of opening a website, browsers with Strict Certificate Pinning would display a `MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE` error. +[HTTPSフィルタリング](/general/https-filtering/what-is-https-filtering)が有効な AdGuard for Windows の一部のユーザーは、google.comやyoutube.comなどの特定のウェブサイトにアクセスできないことがあります。 ウェブサイトを開く代わりに、厳格な証明書ピンニングを持つブラウザは `MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE` エラーを表示します。 -Here is a list of impacted browsers: +影響を受けたブラウザのリストはこちらです: - Arkenfox - Brace @@ -24,8 +24,8 @@ Here is a list of impacted browsers: - Phoenix - Tor Browser -If your default browser is one of these, do the following to solve the problem: +お使いのデフォルトブラウザがこれらのいずれかである場合は、以下の手順で問題を解決してください: -1. Type `about:config` in the address bar of your browser -2. In the menu that appears, enter `security.cert_pinning.enforcement_level` in the search field. -3. Change the `security.cert_pinning.enforcement_level` parameter from 2 to 1. +1. ブラウザのアドレスバーに「about:config」と入力します。 +2. 表示されるメニューの検索フィールドに「security.cert_pinning.enforcement_level」と入力します。 +3. `security.cert_pinning.enforcement_level` パラメータを 2 から 1 に変更します。 diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/solving-problems.md b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/solving-problems.md index da75a18436b..e55a37f5549 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/solving-problems.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/solving-problems.md @@ -9,16 +9,16 @@ sidebar_position: 1 ::: -Here are some problems you may encounter and workarounds, guides, and instructions you may need. +あなたが遭遇する可能性のある問題と、それらへの回避策、ガイド、および手順を紹介しております: -- [WFP driver compatibility](/adguard-for-windows/solving-problems/wfp-driver/) -- [Certificate-related issues](/adguard-for-windows/solving-problems/connection-not-trusted/) -- [How to collect AdGuard logs](/adguard-for-windows/solving-problems/adguard-logs/) -- [How to collect AdGuard installation logs](/adguard-for-windows/solving-problems/installation-logs/) -- [How to collect Windows system logs](/adguard-for-windows/solving-problems/system-logs/) -- [Common installer errors](/adguard-for-windows/solving-problems/common-installer-errors/) -- [Advanced (low-level) Settings guide](/adguard-for-windows/solving-problems/low-level-settings/) -- [How to create a dump file](/adguard-for-windows/solving-problems/dump-file/) -- [Possible DNS leaks](/adguard-for-windows/solving-problems/dns-leaks/) -- [Known issues of AdGuard for Windows](/adguard-for-windows/solving-problems/known-issues/) -- [How to fix the `MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE` error](/adguard-for-windows/solving-problems/mozilla-error/) +- [WFPドライバーの互換性](/adguard-for-windows/solving-problems/wfp-driver/) +- [証明書関連の問題](/adguard-for-windows/solving-problems/connection-not-trusted/) +- [AdGuard のログを収集する方法](/adguard-for-windows/solving-problems/adguard-logs/) +- [AdGuardのインストールログを収集する方法](/adguard-for-windows/solving-problems/installation-logs/) +- [Windows のシステムログを収集する方法](/adguard-for-windows/solving-problems/system-logs/) +- [よくあるインストーラーエラー](/adguard-for-windows/solving-problems/common-installer-errors/) +- [詳細設定(ローレベル設定)ガイド](/adguard-for-windows/solving-problems/low-level-settings/) +- [ダンプファイルの作成方法](/adguard-for-windows/solving-problems/dump-file/) +- [可能なDNSリーク](/adguard-for-windows/solving-problems/dns-leaks/) +- [AdGuard for Windows の既知の問題](/adguard-for-windows/solving-problems/known-issues/) +- [`MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE` エラーを修正する方法](/adguard-for-windows/solving-problems/mozilla-error/) diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/general/account/2fa.md b/i18n/ja/docusaurus-plugin-content-docs/current/general/account/2fa.md index 89fac490cba..9fe918c8cbc 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/general/account/2fa.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/general/account/2fa.md @@ -11,40 +11,40 @@ AdGuardアカウントに二要素認証を設定することをお勧めしま ## 設定方法 -1. Log into your [AdGuard account](https://auth.adguardaccount.com/login.html) and go to the *Settings* tab: +1. [AdGuardアカウント](https://auth.adguardaccount.com/login.html) にログインし、「*設定*」タブに移動します: - ![AdGuard Account settings *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_1.png) + ![AdGuard アカウント設定 *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_1.png) -1. Scroll down to *Two-factor authentication* and enable it: +1. 下にスクロールし、「*二要素認証*」を有効にします: - ![Two-factor authentication toggle *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_2.png) + ![2要素認証の有効/無効 *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_2.png) -1. A code will be sent to the email address associated with your AdGuard account. To enable 2FA, enter the code and click *Enable*. +1. AdGuard アカウントに関連付けられたメールアドレスにコードが送信されます。 2FAを有効にするには、コードを入力し、「*有効にする*」をクリックしてください。 - ![The verification code *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_3.png?) + ![認証コード *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_3.png?) -After you enable two-factor authentication, you have two options to choose from: +二要素認証(2FA)を有効にすると、2つのオプションから選択できるようになります: -- *One-time email code*: when you log in, we will ask you to enter the code we sent to your email +- *ワンタイムコード*: ログイン時に、メールアドレスに送信されたコードの入力を求められます。 -- *Code from authenticator app*: when you log in, we will ask for a code from your authenticator app +- *認証アプリからのコード*: ログイン時、認証アプリからのコードを求められます。 -![2FA options *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_4.png) +![2段階認証オプション *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_4.png) :::note -If you use the authenticator app, make sure to save the **setup key** somewhere. It will be necessary to recover your account in case your mobile phone gets lost or stolen. +認証アプリを使用する場合は、**セットアップキー**をどこかに保存しておいてください。 万が一端末を紛失したり盗まれたりした場合には、アカウントを復帰するために必要です。 -![The setup key in the authenticator app *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/setup_key.png) +![認証アプリのセットアップキー *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/setup_key.png) ::: -If everything is done right, you will see this when you log into your account the next time: +設定が正しく完了していれば、次回アカウントにログインしたときにはこのような画面が表示されます: -![The result *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_5.png) +![結果 *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_5.png) :::note -If you get an authentication error, check the clock on your phone. Adjust it if needed, as an unsynchronized clock may be the cause of the error. +※認証エラーが発生した場合は、スマホの時計を確認してください。 時計が同期していないことがエラーの原因である可能性があるため、必要に応じては調整してください。 ::: diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/general/account/features.md b/i18n/ja/docusaurus-plugin-content-docs/current/general/account/features.md index ddb3d9c8c87..cf034786ce1 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/general/account/features.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/general/account/features.md @@ -1,5 +1,5 @@ --- -title: What can be done in the AdGuard account +title: AdGuard アカウント内でできること sidebar_position: 2 --- @@ -7,14 +7,14 @@ sidebar_position: 2 ## AdGuard アカウント設定の管理 -In the *Settings* section of your AdGuard account, you can update or reset your password, change your email address, enable one-time code login or [two-factor authentication](../2fa), view the data stored about you by AdGuard, and select the language of your account and notifications. +AdGuard アカウントの「*設定*」セクションで、パスワードの更新またはリセット、メールアドレスの変更、ワンタイムコードログインの有効化、[二要素認証](../2fa)の有効化、AdGuard が保存するお客様のデータの表示、アカウントおよび通知の言語の選択を行うことができます。 また、このセクションでは、AdGuardからのメール配信設定を管理することもできます: -- Receive AdGuard newsletter -- Receive transactional emails -- Send read receipts to AdGuard -- Opt-out preferences +- AdGuard ニュースレターの受け取り +- トランザクションメール(購入完了通知、ライセンスの有効期限に関する通知など)の受け取り +- 開封の通知を AdGuard に送信する +- オプトアウト設定(配信停止の設定) ## ライセンスを管理 @@ -24,14 +24,14 @@ In the *Settings* section of your AdGuard account, you can update or reset your - デバイスに紐付けする・紐付けを解除する - 更新・延長 -- upgraded. +- アップグレード -AdGuard 広告ブロッカーライセンスにバインド(紐付け)されているデバイスは、バインド(紐付け)を解除したり、デバイス名を変更したりできます。 To unbind unused devices, click the number of bound devices next to *Devices*, then select `>` → *Remove*. +AdGuard 広告ブロッカーライセンスにバインド(紐付け)されているデバイスは、バインド(紐付け)を解除したり、デバイス名を変更したりできます。 使用されていないデバイスのバインド(紐付け)を解除するには、*デバイス*の横にある紐付けデバイス数をクリックし、次に「`>`」→ 「*削除する*」を選択します。 ## ご購入履歴 -The *Purchases* section displays all the licenses that you have ever purchased using the email account you registered your AdGuard account with. また、購入日、オーダー番号、支払い方法、購入金額に関する情報も掲載されています。 +「*ご購入履歴*」セクションには、AdGuard アカウントの登録時メールアドレスを使用して購入したすべてのライセンスが表示されます。 また、購入日、オーダー番号、支払い方法、購入金額に関する情報も掲載されています。 -## Activity +## アクティビティ -The *Activity* tab allows you to monitor login activity for your AdGuard account. It displays the email address used, location, and login date. You can also filter records by product: *All products*, *AdGuard Ad Blocker*, *AdGuard VPN*, *AdGuard DNS*. +「*アクティビティ*」タブでは、あなたの AdGuard アカウントのログインアクティビティを確認・監視することができます。 使用されているメールアドレス、所在地、ログイン日が表示されます。 製品別に記録を並べ替えすることもできます:*すべての製品*、*AdGuard 広告ブロッカー*、*AdGuard VPN*、*AdGuard DNS*。 diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/general/account/register.md b/i18n/ja/docusaurus-plugin-content-docs/current/general/account/register.md index ec19852569c..dbbaa26f1d9 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/general/account/register.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/general/account/register.md @@ -5,11 +5,11 @@ sidebar_position: 1 ## AdGuard アカウントとは? -[AdGuard account](https://adguardaccount.com/) is a user account that stores information about your AdGuard licenses and subscriptions, active devices, your purchase history, preferred language, and other preferences. 多くの AdGuard 製品には、AdGuard アカウントを使ってログインすることで製品をアクティベートするオプションがあります(アカウントに有効なライセンスがある場合)。 +[AdGuard アカウント](https://adguardaccount.com/) (マイ・アカウント)は、お客様の AdGuard ライセンスおよびサブスクリプション、使用しているデバイス、購入履歴、言語、その他の設定に関する情報があるユーザーアカウントです。 多くの AdGuard 製品には、AdGuard アカウントを使ってログインすることで製品をアクティベートするオプションがあります(アカウントに有効なライセンスがある場合)。 ## AdGuard アカウントを登録する方法 -To create an account, go to [AdGuard's official website](https://adguard.com/welcome.html) and click the *Log in* button on the top right corner of the screen. メールアドレスを入力し、パスワードを作成すると、アカウント登録されます。 +アカウントを登録するには、 [AdGuard の公式ウェブサイト](https://adguard.com/welcome.html) にアクセスし、画面右上の「*ログイン*」を押します。 メールアドレスを入力し、パスワードを作成すると、アカウント登録されます。 :::tip @@ -23,10 +23,10 @@ To create an account, go to [AdGuard's official website](https://adguard.com/wel :::tip -After you've registered your account, you can use the *One-time code* option to log in to the application. Enter your email address and choose to enter either your password or the the code sent to your email address. +アカウント登録後、*ワンタイムコードオプション*を使用してアプリにログインすることができます。 メールアドレスを入力して、パスワードを入力するか、メールアドレスに送信されたコードを入力するかを選択します。 ::: ## SNSアカウント経由でAdGuardアカウントを登録する方法 -To create an account via a social network, simply follow the [link](https://auth.adguardaccount.com/login.html) and log in to your account. Once you’ve signed up, check your inbox — there’ll be a confirmation email. Set a password and that’s it! Now you can use all the [features of the AdGuard account](https://adguard.com/kb/general/account/features/). +SNSアカウント経由でAdGuardアカウントを作成するには、 [こちらリンク](https://auth.adguardaccount.com/login.html)へ進み、お持ちのSNSアカウントでログインするだけです。 登録が完了しましたら、確認メールが届きますので、受信トレイをチェックしてください。 パスワードを設定して完了です。 これで、[AdGuard アカウントのすべての機能](https://adguard.com/kb/general/account/features/)をご利用いただけます。 diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/ja/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index 026521d2cad..475c46aa393 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuardコンテンツブロッカー][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuardコンテンツブロッカー][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + が以下のものに変化されます: + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "AdGuard ブラウザ拡張機能 MV3対応版" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/general/extensions.md b/i18n/ja/docusaurus-plugin-content-docs/current/general/extensions.md index 4ff37871c38..00107b8f96a 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/general/extensions.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/general/extensions.md @@ -39,7 +39,7 @@ This version of Assistant is legacy and there is no point in using it on new sys ::: -#### AMPを無効化 +#### Disable AMP Android版AdGuardにのみプリインストールされているスクリプト。 Google 検索結果ページで AMP (Accelerated Mobile Pages) を無効にします。 Learn more about this userscript and how to install it on [GitHub](https://github.com/AdguardTeam/DisableAMP). diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/general/license/cancel-refund.md b/i18n/ja/docusaurus-plugin-content-docs/current/general/license/cancel-refund.md index 41f5cd6f5c3..c86ea00a8a3 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/general/license/cancel-refund.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/general/license/cancel-refund.md @@ -7,7 +7,7 @@ sidebar_position: 5 サブスクリプションは、AdGuardアカウントでキャンセルすることができます。 その方法以下の通りです: - 1. Go to your [AdGuard account](https://adguardaccount.com/). + 1. お使いの[AdGuardアカウント](https://adguardaccount.com/)にアクセスします。 1. メニューで「*ライセンス*」を押します。 1. 解約したいサブスクリプションの下の「**サブスクリプションを解約する**」をクリックします。 ![キャンセル](https://cdn.adtidy.org/blog/new/fgjbxcancel-ja-1.png) diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/ja/docusaurus-plugin-content-docs/current/general/license/legacy.md index 87d02eb7cfb..7d0e54d15fb 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: 旧ライセンスに関するFAQ sidebar_position: 6 --- -この記事では、混乱を避けるために、旧(レガシー)AdGuardライセンスを更新/アップグレードする方法について詳しく説明しております。 +この記事では、混乱を避けるために、レガシーAdGuardライセンス(旧タイプのライセンス)を更新/アップグレードする方法について詳しく説明しております。 -## 旧ライセンスについて +## レガシーライセンス(旧タイプのライセンス)について 当初、AdGuard製品のアクティベーションのために、以下の種類のライセンスが用意されていました: @@ -27,57 +27,55 @@ sidebar_position: 6 2019年10月、AdGuardは新しいライセンス形態に切り替わりました。それ以降、ライセンスは引き続き1年版または永久版を購入できますが、台数によるタイプは**パーソナル** (デバイス3台版)または**ファミリー**(デバイス9台版)となっています。 -もう一つの変更点は、**新タイプのライセンスキーは、PC・モバイルに関係なく、どのデバイスでも、どのような組み合わせでも使用できるようになったことです。 例えば、パーソナルライセンスは、Windows/Android/Mac/iOS のうちのどの3台にも使用することができます(例:Windowsパソコン1台、スマホ1台、iPhone 1台)**。 +もう一つの変更点は、**新タイプのライセンスキーは、PC・モバイルに関係なく、どのデバイスでも、どのような組み合わせでも使用できるようになったこと**です。 例えば、パーソナルライセンスは、Windows/Android/Mac/iOS のうちのどの3台にも使用することができます(例:Windowsパソコン1台、スマホ1台、iPhone 1台)。 -## 旧ライセンスは現在どのような扱いか? +## レガシーライセンス(旧タイプのライセンス)はどうなったのか -スタンダードライセンスは自動的にユニバーサル化され、パソコンだけでなく、どのようなデバイスでも使用できるようになりました。 +**スタンダードライセンス**は自動的に**ユニバーサル化**され、つまりパソコンだけでなく、どのようなデバイスでも使用できるようになりました。 -モバイルライセンスは、従来通り、プラットフォームが限定されています(スマホまたはタブレット端末でのみ使用可能)。 +**モバイルライセンス**は、従来通り、プラットフォームが限定されています。(スマホまたはタブレット端末でのみ使用可能) -プレミアムライセンスも従来通り、プラットフォーム制限があります。 また、 **プレミアムライセンスは、AdGuardアカウントではデバイスの総数で表示されるようになりましたが、**今まで通り、デスクトップ◯台+モバイル◯台のセットで有効にするしかできませんのでご注意ください。 +**プレミアムライセンス**も従来通り、プラットフォーム制限があります。 また、 **プレミアムライセンスは、AdGuardアカウントではデバイスの総数で表示されるようになりましたが、**今まで通り、デスクトップ◯台+モバイル◯台のセットで有効にするしかできませんのでご注意ください。 例えば、1+1キーはこんな風に表示されます: -![1+1キー](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1キー](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *しかし、合計2台にもかかわらず、使用できる台数は、パソコン1台とモバイル端末1台となります。* > すべての旧式ライセンスには、AdGuardアカウントに「(旧)」というバッジがついています。 また、更新時やアップグレード時には、自動的に新しいタイプに変換されます。 しかし、いくつかのニュアンスがあります。 では、どのライセンスを新しいタイプに変換できるのかとその方法について見てみましょう。 -## 旧キーを持っています。 更新・アップグレードする方法は? +## レガシーキー(旧キー)を更新またはアップグレードする方法 -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +[更新・アップグレード用ページ](https://adguard.com/renew.html)または[AdGuardアカウント](https://adguardaccount.com)でレガシーライセンスを延長・更新・アップグレードできます。 -![アップグレード](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> 「ライセンス」タブで、キーごとにどのようなアクションが可能かを確認することができます。 以下、具体的な例を挙げて説明しております。 +AdGuard アカウントのレガシーライセンス(旧タイプのライセンス)を延長/更新またはアップグレードするには、「*ライセンス*」タブでライセンスを見つけて、表示されているオプションのいずれかを選択します。 -### 1〜3台用ライセンス +![AdGuardアカウントでライセンスの更新またはアップグレード](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -1台、2台、3台用の**1年**ライセンスは、パーソナルまたはファミリーのいずれかに変更可能です。 +または[ライセンスの延長・アップグレードページ](https://adguard.com/renew.html)にアクセスし、ライセンスキーを入力して、*適用する*をクリックしてください。 そのページで、表示されているオプションからお選びください。 -![アップグレードまたは更新](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> 保護したいデバイスの台数に応じてお選びください。 +### 1〜3台用ライセンス -更新の代わりに永久版に切り替えることもできます。 +デバイス3台用のモバイル1年ライセンスは、パーソナルライセンスへの変更、またはファミリーライセンスへのアップグレードが可能です: -![永久版](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![1、2、3 台用の1年ライセンスをアップグレード](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**永久版**ライセンスは、技術的な制約によりファミリー(9台版)にのみ変換可能です。 +> 「ライセンス」タブで、キーごとにどのようなアクションが可能かを確認することができます。**デバイス3台用のスタンダードライセンス**をお持ちの場合は、すでに**パーソナル**ライセンスとして機能します。 **3台用モバイルライセンス**を分更新すると、スマホだけでなく、**別のデバイスでも**使用できるようになります。 -![永久版へのアップグレード](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +お持ちのライセンスを永久版にアップグレードすることもできます: -### 4台以上用ライセンス +![永久版へのアップグレード](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_ja.png) -この場合、**1年版** キーは、ファミリーライセンスにのみ変換することができます。 +**永久版**ライセンスは、技術的な制約によりファミリー(9台版)にのみアップグレード可能です。 -![4 台用1年版ライセンス](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### 4台以上用ライセンス -4台以上用**永久版**ライセンスは、技術的な制約によりファミリー(9台版)にのみ変換可能です。 +4台以上のデバイス用の**1年**ライセンスは、ファミリーライセンスおよび永久ライセンスにアップグレードできます。 -![4 台用永久版ライセンス](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +4台以上用**永久版**ライセンスは、技術的な制約にアップグレードできません。 ### 9台以上用ライセンス 特別に入手されたプレミアムキー(5+5以上)および10台以上用カスタムキー。 -これらはかなり特殊なケースですので、ライセンスを永久版にアップグレードしたい場合は、partners@adguard.com までご連絡ください。 お客様の特殊ライセンスの構成に応じて、特別なご提案をさせていただきます。 +これらはかなり特殊なケースですので、ライセンスを永久版にアップグレードしたい場合は、partners@adguard.com までご連絡ください。 お客様のライセンスの構成に応じて、特別なオファーをさせていただきます。 diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/general/license/transfer.md b/i18n/ja/docusaurus-plugin-content-docs/current/general/license/transfer.md index f02baec1141..a598cef2298 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/general/license/transfer.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/general/license/transfer.md @@ -12,7 +12,7 @@ sidebar_position: 4 - 【方法①】AdGuard アプリで「*ライセンスをリセット*」または「*ログアウト*」をクリックします。 - 【方法②】お使いのAdGuardアカウントでデバイスを削除します: - 1. Click *AdGuard Ad Blocker* in your [AdGuard account](https://adguardaccount.com/). + 1. お使いの[AdGuardアカウント](https://adguardaccount.com/)→「*AdGuard 広告ブロッカー*」 タブを押します。 ![AdGuard広告ブロッカータブ *mobile](https://cdn.adtidy.org/blog/new/ynkyjltansfer-ja-1.png) diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/ja/docusaurus-plugin-content-docs/current/general/license/what-is.md index c6af7c93c91..f95acf12be9 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -1,9 +1,9 @@ --- -title: What is an AdGuard license? +title: AdGuard ライセンスとは? sidebar_position: 1 --- -ライセンスとは、[利用許諾契約(EULA)](https://adguard.com/eula.html)に基づいて提供されるAdGuard製品の使用許可です。 If bound to an email address, AdGuard licenses can be found in the user's [AdGuard account](https://adguardaccount.com/). +ライセンスとは、[利用許諾契約(EULA)](https://adguard.com/eula.html)に基づいて提供されるAdGuard製品の使用許可です。 AdGuardライセンスがメールアドレスにバインド(紐付け)されている場合、[AdGuard アカウント](https://adguardaccount.com/)でお持ちのライセンスを確認できます。 ## AdGuard ライセンスの種類 @@ -12,7 +12,7 @@ sidebar_position: 1 - **1年サブスクリプション** - これらのライセンスは毎年自動的に更新されますが、手動で延長することもできます。 - パーソナル(デバイス3台用) - ファミリー(デバイス9台用) -- **Lifetime** — these licenses are perpetual +- **永久** - これらのライセンスには無期限で、ずっとご利用いただけるものです。 - パーソナル(デバイス3台用) - ファミリー(デバイス9台用) @@ -25,7 +25,7 @@ sidebar_position: 1 - **販売代理店ライセンス** および**付与ライセンス**は、期間限定と非期間限定の両方があります。 有効期限のあるライセンスは、手動でのみ更新できます。 - パーソナル(デバイス3台用) - ファミリー(デバイス9台用) -- **iOS用「AdGuard Pro」アプリのライセンス** は、App Storeを通じて購入および管理され、同じApple IDを持つiOSおよびiPadOSデバイスでのみ使用できます。 +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip @@ -35,7 +35,7 @@ sidebar_position: 1 ## AdGuard ライセンスの使用方法 -ライセンスをデバイスで使用するには、ライセンスに関連付けられているメールアドレスを使用して AdGuard アプリにログインします。 If the license hasn't been bound to your email address yet, you can do it in your [AdGuard account](https://adguardaccount.com/). これを行うには、AdGuardアカウントで「*ライセンス*」画面を開き、「*ライセンスを紐付けする*」をクリックします。 +ライセンスをデバイスで使用するには、ライセンスに関連付けられているメールアドレスを使用して AdGuard アプリにログインします。 ライセンスがまだメールアドレスにバインド(紐付け)されていない場合は、[AdGuardアカウント](https://adguardaccount.com/)でバインドできます。 これを行うには、AdGuardアカウントで「*ライセンス*」画面を開き、「*ライセンスを紐付けする*」をクリックします。 または、AdGuard アプリに[ライセンスキー](#license-key)を直接入力するというライセンス使用方法もあります。 diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/guides/collect-har-file.md b/i18n/ja/docusaurus-plugin-content-docs/current/guides/collect-har-file.md index 526db1cb8e9..2ace5d4eb16 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/guides/collect-har-file.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/guides/collect-har-file.md @@ -105,7 +105,7 @@ Internet Explorer 11 でHARファイルを作成する手順は以下の通り - 録画中、再生ボタンは灰色、停止ボタンは赤色になります。 **再生**モードにしてください。 -1. Clear any session info appearing in the lower grid using the **Clear session** button on the **Network** tab. アイコンにカーソルを合わせるとボタン・操作の名前が表示されます。 +1. **ネットワーク**タブの**[セッションをクリア]**ボタンを使用して、下のグリッドに表示されているセッション情報をすべてクリアします。 アイコンにカーソルを合わせるとボタン・操作の名前が表示されます。 - **セッションをクリア**ボタンは、×印の三本線のアイコンです。 @@ -113,7 +113,7 @@ Internet Explorer 11 でHARファイルを作成する手順は以下の通り 1. 問題を再現してください。 -1. Save session as a .har file by clicking the **Save to disk** button (Export as HAR) on the **Network** tab. +1. **Network**タブの**Save to disk**ボタン(Export as HAR)をクリックして、セッションを.harファイルとして保存します。 1. 問題の詳細な説明を添えて、保存したHARファイルを AdGuard サポート (support@adguard.com) までお送りください。 可能でしたら、問題に関するスクリーンショットも添付いただけると大変助かります。 diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md b/i18n/ja/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md index faefbb7ec31..e6981bd665d 100644 --- a/i18n/ja/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md +++ b/i18n/ja/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md @@ -19,9 +19,9 @@ HTTPトラフィックはどのような場合でもフィルタリングされ ### Windows の場合 {#windows} -1. Note the IP address of your computer with AdGuard installed. +1. AdGuard がインストール済みパソコンのIPアドレスをメモしてください。 -1. AdGuard による保護がオンになっていることを確認してください。 Windowsパソコンでは、AdGuard アプリ内の設定⚙️の「**ネットワーク**」タブにある「**AdGuard をHTTPプロキシとして使用する**」チェックボックスにチェックを入れます。 On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. AdGuard による保護がオンになっていることを確認してください。 Windowsパソコンでは、AdGuard アプリ内の設定⚙️の「**ネットワーク**」タブにある「**AdGuard をHTTPプロキシとして使用する**」チェックボックスにチェックを入れます。 Mac の場合は、 **設定⚙️** → **設定** → **ネットワーク** に移動して、「**HTTP プロキシ**」を有効にします。 1. AdGuard がインストールされているパソコンで、こちらのリンクをたどってください: [ http://local.adguard.org/cert](http://local.adguard.org/cert) @@ -55,15 +55,15 @@ HTTPトラフィックはどのような場合でもフィルタリングされ 1. 「*プロキシサーバーの使用*」タブの「**設定**」をクリックします。 -1. トグルをオンにします。 For **Proxy IP address**, type the IP address of your computer that you noted in step 1. 「**ポート**」には、デスクトップ版AdGuardアプリのネットワーク設定で選択したポートを入力します。 +1. トグルをオンにします。 「**プロキシIPアドレス**」には、コンピュータのIPアドレス(ステップ1からのもの)を入力します。 「**ポート**」には、デスクトップ版AdGuardアプリのネットワーク設定で選択したポートを入力します。 1. 「**保存**」をクリックします。 ### Mac の場合 {#mac} -1. Note the IP address of your computer with installed AdGuard. +1. AdGuardがインストール済みのパソコンのIPアドレスをメモしてください。 -1. AdGuard による保護がオンになっていることを確認してください。 Windowsパソコンでは、AdGuard アプリ内の設定⚙️の「**ネットワーク**」タブにある「**AdGuard をHTTPプロキシとして使用する**」チェックボックスにチェックを入れます。 On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. AdGuard による保護がオンになっていることを確認してください。 Windowsパソコンでは、AdGuard アプリ内の設定⚙️の「**ネットワーク**」タブにある「**AdGuard をHTTPプロキシとして使用する**」チェックボックスにチェックを入れます。 Mac の場合は、 **設定⚙️** → **設定** → **ネットワーク** に移動して、「**HTTP プロキシ**」を有効にします。 1. ブラウザを使用してこちらのリンクをたどってください: [ http://local.adguard.org/cert](http://local.adguard.org/cert) @@ -93,9 +93,9 @@ HTTPトラフィックはどのような場合でもフィルタリングされ ### Android の場合 {#android} -1. Note the IP address of your computer with installed AdGuard. +1. AdGuardがインストール済みのパソコンのIPアドレスをメモしてください。 -1. AdGuard による保護がオンになっていることを確認してください。 Windowsパソコンでは、AdGuard アプリ内の設定⚙️の「**ネットワーク**」タブにある「**AdGuard をHTTPプロキシとして使用する**」チェックボックスにチェックを入れます。 On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. AdGuard による保護がオンになっていることを確認してください。 Windowsパソコンでは、AdGuard アプリ内の設定⚙️の「**ネットワーク**」タブにある「**AdGuard をHTTPプロキシとして使用する**」チェックボックスにチェックを入れます。 Mac の場合は、 **設定⚙️** → **設定** → **ネットワーク** に移動して、「**HTTP プロキシ**」を有効にします。 1. AdGuardがインストール済みのデバイスで、ブラウザを使用してこちらのリンクをたどってください: [ http://local.adguard.org/cert](http://local.adguard.org/cert) @@ -109,13 +109,13 @@ HTTPトラフィックはどのような場合でもフィルタリングされ 1. アクティブなWi-Fiネットワークの詳細設定を開きます。 -1. **プロキシタイプ** を **手動**に変更します。 For **Proxy hostname**, enter the noted IP address of your computer you noted in step 1. 「**プロキシポート**」には、デスクトップ版AdGuardアプリのネットワーク設定で選択したポートを入力します。 +1. **プロキシタイプ** を **手動**に変更します。 「**プロキシホスト名**」には、パソコンのIPアドレス(ステップ1からのもの)を入力します。 「**プロキシポート**」には、デスクトップ版AdGuardアプリのネットワーク設定で選択したポートを入力します。 ### iOS (iPhone/iPad)の場合 {#ios} -1. Note the IP address of your computer with installed AdGuard. +1. AdGuardがインストール済みのパソコンのIPアドレスをメモしてください。 -1. AdGuard による保護がオンになっていることを確認してください。 Windowsパソコンでは、AdGuard アプリ内の設定⚙️の「**ネットワーク**」タブにある「**AdGuard をHTTPプロキシとして使用する**」チェックボックスにチェックを入れます。 On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. AdGuard による保護がオンになっていることを確認してください。 Windowsパソコンでは、AdGuard アプリ内の設定⚙️の「**ネットワーク**」タブにある「**AdGuard をHTTPプロキシとして使用する**」チェックボックスにチェックを入れます。 Mac の場合は、 **設定⚙️** → **設定** → **ネットワーク** に移動して、「**HTTP プロキシ**」を有効にします。 1. AdGuardがインストール済みのデバイスで、ブラウザを使用してこちらのリンクをたどってください: [ http://local.adguard.org/cert](http://local.adguard.org/cert) diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/features/integration-with-vpn.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/features/integration-with-vpn.md index 102a9ef5a5d..1db14e7212b 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/features/integration-with-vpn.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/features/integration-with-vpn.md @@ -1,6 +1,6 @@ --- title: AdGuard VPN과 통합 -sidebar_position: 8 +sidebar_position: 9 --- :::info diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index fb20e324a38..b66592f0a11 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ sidebar_position: 4 이 섹션에서는 HTTPS 필터링 설정, 필터, 유저스크립트를 관리하고 프록시 서버를 설정할 수 있습니다. -![필터링 \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### 필터 @@ -57,102 +57,110 @@ AdGuard는 필터의 규칙을 적용하여 광고, 추적기 및 성가신 광 [필터에 대해 자세히 알아보기](https://adguard.com/en/blog/what-are-filters.html) -### 유저스크립트 +### 확장 프로그램 -유저스크립트는 하나 또는 그 이상의 웹사이트의 기능을 확장하기 위해 JavaScript로 쓰여진 미니 프로그램입니다. 유저스크립트를 설치하려면 특별한 유저스크립트 관리자가 필요합니다. AdGuard에는 이러한 기능이 있으며 URL 또는 파일에서 유저스크립트를 추가할 수 있습니다. +Extensions allow you to add userscripts and userstyles. -![유저스크립트 \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) + +Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. + +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra -AdGuard Extra는 복잡한 광고와 웹사이트에 광고를 다시 삽입하는 메커니즘을 차단하는 유저스크립트입니다. +AdGuard Extra is a custom userscript that blocks complex ads and mechanisms that reinject ads to websites. -#### AMP 비활성화 +#### Disable AMP -AMP 비활성화는 [가속화된 모바일 페이지](https://en.wikipedia.org/wiki/Accelerated_Mobile_Pages)를 비활성화하는 유저스크립트입니다. +Disable AMP is a userscript that disables [Accelerated mobile pages](https://en.wikipedia.org/wiki/Accelerated_Mobile_Pages) on the Google search results page. ### 네트워크 #### HTTPS 필터링 -대부분의 웹사이트와 앱에서 광고와 추적기를 차단하려면 AdGuard가 HTTPS 트래픽을 필터링해야 합니다. [HTTPS 필터링에 대해 자세히 알아보기](/general/https-filtering/what-is-https-filtering) +To block ads and trackers on most websites and in most apps, AdGuard needs to filter their HTTPS traffic. [Read more about HTTPS filtering](/general/https-filtering/what-is-https-filtering) -##### 보안 인증서 +##### Security certificates -암호화된 트래픽을 관리하기 위해 AdGuard는 기기에 CA 인증서를 설치합니다. 기기에 CA 인증서를 설치하는 것은 안전합니다. 트래픽은 로컬로 필터링되고 AdGuard는 연결의 보안을 확인합니다. +To manage encrypted traffic, AdGuard installs its CA certificate on your device. It's safe: the traffic is filtered locally and AdGuard verifies the security of the connection. -Android의 이전 버전에서는 인증서가 자동으로 설치됩니다. Android 11 이상에서는 수동으로 설치해야 합니다. [설치 지침](/adguard-for-android/solving-problems/manual-certificate/) +On older versions of Android, the certificate is installed automatically. On Android 11 and later, you need to install it manually. [Installation instructions](/adguard-for-android/solving-problems/manual-certificate/) -사용자 저장소에 있는 CA 인증서는 브라우저와 일부 앱에서 HTTPS 트래픽을 필터링하는 데 충분합니다. 그러나 시스템 저장소의 인증서만 신뢰하는 앱도 있습니다. HTTPS 트래픽을 필터링하려면 시스템 저장소에 AdGuard의 CA 인증서를 설치해야 합니다. [지침](/adguard-for-android/solving-problems/https-certificate-for-rooted/) +The CA certificate in the user store is enough to filter HTTPS traffic in browsers and some apps. However, there are apps that only trust certificates from the system store. To filter HTTPS traffic there, you need to install AdGuard's CA certificate into the system store. [Instructions](/adguard-for-android/solving-problems/https-certificate-for-rooted/) -##### HTTPS로 필터링된 앱 +##### HTTPS-filtered apps -이 섹션에서는 AdGuard가 HTTPS 트래픽을 필터링하는 앱 목록을 확인할 수 있습니다. 이 설정은 사용자 저장소와 시스템 저장소에 모두 CA 인증서가 있는 경우에만 모든 앱에 적용할 수 있습니다. +This section contains the list of apps for which AdGuard filters HTTPS traffic. Please note that the setting can be applied for all apps only if you have CA certificates both in the user store and in the system store. -##### HTTPS로 필터링된 웹사이트 +##### HTTPS-filtered websites -이 설정을 사용하면 AdGuard가 HTTPS 트래픽을 필터링해야 하는 웹사이트를 관리할 수 있습니다. +This setting allows you to manage websites for which AdGuard should filter HTTPS traffic. -HTTPS 필터링을 통해 AdGuard는 요청 및 응답의 콘텐츠를 필터링할 수 있지만, 이 데이터를 수집하거나 저장하지 않습니다. 그러나 보안을 강화하기 위해 [민감한 정보가 포함될 가능성이 있는 웹사이트는 HTTPS 필터링에서 제외합니다](/general/https-filtering/what-is-https-filtering/#financial-websites-and-websites-with-sensitive-personal-data). +HTTPS filtering allows AdGuard to filter the content of requests and responses, but we never collect or store this data. However, to increase security, we [exclude websites that contain potentially sensitive information from HTTPS filtering](/general/https-filtering/what-is-https-filtering/#financial-websites-and-websites-with-sensitive-personal-data). -다음 모드 중 하나를 선택하여 원하는 사이트를 예외 목록에 추가할 수도 있습니다. +You can also add websites that you consider necessary to exclusions by selecting one of the modes: -- 특정 웹사이트를 HTTPS 필터링에서 제외 -- 예외 목록에 추가된 웹사이트에서만 HTTPS 트래픽 필터링 +- Exclude specific websites from HTTPS filtering +- Filter HTTPS traffic only on the websites added to exclusions -또한 기본적으로 금융 웹사이트와 같이 EV(Extended Validation) 인증서를 사용하는 웹사이트는 필터링하지 않습니다. 필요한 경우 **EV 인증서가 있는 웹사이트를 필터링** 옵션을 활성화할 수 있습니다. +By default, we also do not filter websites with Extended Validation (EV) certificates, such as financial websites. 필요한 경우, **EV 인증서가 있는 웹사이트를 필터링** 옵션을 활성화할 수 있습니다. -#### 프록시 +#### Proxy -프록시 서버를 통해 모든 기기의 트래픽을 라우팅하도록 AdGuard를 설정할 수 있습니다. [아웃바운드 프록시 설정 방법](/adguard-for-android/solving-problems/outbound-proxy) +You can set up AdGuard to route all your device's traffic through your proxy server. [How to set up an outbound proxy](/adguard-for-android/solving-problems/outbound-proxy) -이 섹션에서는 VPN 제공업체가 허용하는 경우, 타사 VPN을 AdGuard와 함께 작동하도록 설정할 수 있습니다. +In this section, you can also set up a third-party VPN to work with AdGuard, if your VPN provider allows it. -**프록시를 통해 작동하는 앱** 아래에서 지정한 프록시를 통해 트래픽을 라우팅할 앱을 선택할 수 있습니다. **AdGuard VPN과의 통합**을 활성화한 경우, 이 설정을 사용하면 AdGuard VPN 터널을 통해 라우팅할 앱을 지정하여 AdGuard VPN의 앱 예외 목록 역할을 합니다. +Under _Apps operating through proxy_, you can select apps that will route their traffic through your specified proxy. If you have _Integration with AdGuard VPN_ enabled, this setting plays the role of AdGuard VPN's app exclusions: it allows you to specify apps to be routed through the AdGuard VPN tunnel. -#### 라우팅 모드 +#### Routing mode -이 섹션에서는 트래픽 필터링 방법을 선택할 수 있습니다. +This section allows you to select the traffic filtering method. -- **로컬 VPN**은 로컬에서 생성한 VPN을 통해 트래픽을 필터링합니다. 이것은 가장 안정적인 모드입니다. Android 제한으로 인해 루팅되지 않은 기기에서 사용할 수 있는 유일한 시스템 전체 트래픽 필터링 방법이기도 합니다. +- _Local VPN_ filters traffic through a locally created VPN. This is the most reliable mode. Due to Android restrictions, it is also the only system-wide traffic filtering method available on non-rooted devices. :::note -**로컬 VPN** 모드에서는 AdGuard를 다른 VPN과 동시에 사용할 수 없습니다. AdGuard와 함께 다른 VPN을 사용하려면 프록시 모드에서 작동하도록 재설정하고 AdGuard에서 아웃바운드 프록시를 설정해야 합니다. AdGuard VPN의 경우, \*\*[통합 모드](/adguard-for-android/features/integration-with-vpn)\*\*의 도움으로 이 작업이 자동으로 수행됩니다. +The _Local VPN_ mode doesn't allow AdGuard to be used simultaneously with other VPNs. To use another VPN with AdGuard, you need to reconfigure it to work in proxy mode and set up an outbound proxy in AdGuard. For AdGuard VPN, this is done automatically with the help of the [_Integrated mode_](/adguard-for-android/features/integration-with-vpn). ::: -- _자동 프록시_는 VPN을 사용할 필요가 없는 대체 트래픽 라우팅 방법입니다. 한 가지 중요한 장점은 VPN과 병렬로 실행할 수 있다는 것입니다. 이 모드에는 루트 액세스 권한이 필요합니다. +- _Automatic proxy_ is an alternative traffic routing method that does not require the use of a VPN. One significant advantage is that it can be run in parallel with a VPN. This mode requires root access. -- **수동 프록시**는 특정 포트에 프록시 서버를 설정하는 것입니다(Wi-Fi 설정에서 구성할 수 있음). 이 모드를 사용하려면 Android 10 이상에서 루트 액세스 권한이 필요합니다. +- _Manual proxy_ involves setting up a proxy server on a specific port, which can then be configured in Wi-Fi settings. This mode requires root access for Android 10 and above. ## 라이선스 -이 섹션에서는 라이선스에 대한 정보를 찾고 라이선스를 관리할 수 있습니다. +In this section, you can find information about your license and manage it: -- AdGuard 라이선스를 구매하여 [정식 버전의 기능](/adguard-for-android/features/free-vs-full)을 활성화하세요. -- AdGuard 계정에 로그인하거나 라이선스 키를 입력하여 라이선스를 활성화하세요. -- 아직 7일 체험판을 사용하지 않았다면 가입하여 활성화하세요. -- 점 3개가 있는 메뉴(⋮)에서 라이선스 상태를 새로고침하세요. -- AdGuard 계정을 열어 라이선스를 관리하세요. -- 이 라이선스의 기기 제한에 도달하여 다른 라이선스를 적용하려면 라이선스를 초기화하세요. +- Buy an AdGuard license to activate [the full version's features](/adguard-for-android/features/free-vs-full) +- Log in to your AdGuard account or enter the license key to activate your license +- Sign up to activate your 7-day trial period if you haven't used it yet +- Refresh the license status from the three-dots menu (⋮) +- Open the AdGuard account to manage your license there +- Reset your license — for example, if you've reached device limit for this license and want to apply another one -![라이선스 화면 \*mobile_border](https://cdn.adtidy.org/blog/new/3wyh5hlicense.png) +![License screen \*mobile_border](https://cdn.adtidy.org/blog/new/3wyh5hlicense.png) ## 고객 지원 -이 섹션은 Android용 AdGuard에 대한 질문이나 제안 사항이 있는 경우, 도움이 될 것입니다. 지원팀에 문의하기 전에 **[FAQ](https://adguard.com/support/adguard_for_android.html)** 또는 지식창고를 참조하는 것이 좋습니다. +Use this section if you have any questions or suggestions regarding AdGuard for Android. We recommend consulting _[FAQ](https://adguard.com/support/adguard_for_android.html)_ or this knowledge base before contacting support. -![고객 지원 \*mobile_border](https://cdn.adtidy.org/blog/new/cz55usupport.png) +![Support \*mobile_border](https://cdn.adtidy.org/blog/new/cz55usupport.png) -누락된 광고를 발견하면 **잘못된 차단 신고**를 통해 신고해 주세요. +If you notice a missed ad, please report it via _Report incorrect blocking_. -예기치 않은 앱 동작이 발생하면 **버그 신고**를 선택합니다. 가능하면 문제를 자세히 설명하고 앱 로그를 추가하세요. [문제를 설명하는 방법](/guides/report-bugs/#how-to-describe-a-problem) +For unexpected app behavior, select _Report a bug_. If possible, describe your problem in detail and add app logs. [How to describe an issue](/guides/report-bugs/#how-to-describe-a-problem) -기능을 제안하려면 **기능 요청**을 사용하세요. +For your suggestions, use _Request a feature_. :::note -GitHub는 버그를 보고하고 새로운 기능을 제안하는 또 다른 방법입니다. [지침 및 리포지토리 링크](/guides/report-bugs/#adguard-for-android) +GitHub is an alternative way to report bugs and suggest new features. [Instructions and repository links](/guides/report-bugs/#adguard-for-android) ::: diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 5e75a51f1e8..b5525cd735c 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index c35ef5459bf..541d59a6e68 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 31f2344efa0..514c0c921cd 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -5,11 +5,11 @@ sidebar_position: 1 :::정보 -This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. To see how it works, [download the AdGuard app](https://agrd.io/download-kb-adblock) +이 문서는 시스템 수준에서 기기를 보호하는 다기능 광고 차단기인 Android용 AdGuard에 대해 다룹니다. 이용하고자 한다면 [AdGuard 앱을 다운로드](https://agrd.io/download-kb-adblock)해 보세요 ::: -Due to built-in statistics processes, high data and/or battery consumption was often attributed to AdGuard by Android 6 and earlier. This was because AdGuard counted all the traffic it filtered from various apps. As a result, AdGuard's share of total data and battery usage was overstated, while other apps were understated. +내장된 통계 프로세스로 인해 Android 6 및 이전 버전의 AdGuard에서는 높은 데이터 및/또는 배터리 소모가 종종 발생했습니다. This was because AdGuard counted all the traffic it filtered from various apps. As a result, AdGuard's share of total data and battery usage was overstated, while other apps were understated. With Android 7, however, this scenario has improved. Now the data reflected in Android's built-in data usage statistics is very close to reality, although there are minor discrepancies in the battery usage data. @@ -23,6 +23,12 @@ You can access it by navigating to *Statistics* → *Battery usage*. Inside you will find a chart that shows the AdGuard battery resource consumption within the last 24 hours, with an option to get more detailed hour-to-hour data by tapping on the chart. 또한 데이터의 숫자 분석과 간단한 기술 설명도 있습니다. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### AdGuard는 실제로 얼마나 많은 배터리를 소비합니까? First, let us lay down a bit of theory and links with necessary data. diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 3334deca8cb..a4d2724d9c9 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::정보 diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index 0f2b6578443..e6077bfec4e 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index c8d707a35a3..ccfb602441a 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Firefox 브라우저의 인증서 신뢰 문제 -sidebar_position: 11 +sidebar_position: 10 --- :::정보 diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index c95cc19334d..2587a3b0876 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::정보 diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index d1ed46d65ea..32779cd8750 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::정보 diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 99d357fbc31..ca865ff4913 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problems caused by multiple user profiles -sidebar_position: 10 +sidebar_position: 9 --- :::정보 diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index fdb6d25a527..aa9eaf64e51 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: How to set up outbound proxy -sidebar_position: 8 +sidebar_position: 7 --- :::정보 diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index dba364dbd74..7e9c2e6d0c0 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +sidebar_position: 16 --- :::정보 diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 506a187f54b..c7a16aa60e5 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::정보 diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index d88d79cacca..ff694b31cc6 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: How to block ads in the YouTube app -sidebar_position: 7 +sidebar_position: 6 --- :::정보 diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-ios/features/compatibility-with-adguard-vpn.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-ios/features/compatibility-with-adguard-vpn.md index d1750ce0714..d8ed7bdc9db 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-ios/features/compatibility-with-adguard-vpn.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-ios/features/compatibility-with-adguard-vpn.md @@ -1,6 +1,6 @@ --- title: AdGuard VPN과의 호환성 -sidebar_position: 8 +sidebar_position: 9 --- :::info diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 0257a6c99e5..c2bc68bf225 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,88 +5,150 @@ sidebar_position: 2 ## Linux용 AdGuard 설치 -AdGuard를 설치하려면 다음을 입력합니다. +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -정식 버전 +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -베타 버전 +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -나이틀리 버전 +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` -필요한 경우 관리자 비밀번호를 입력합니다. +If required, enter your admin password. -`y`를 눌러 `/usr/local/bin`에 실행 파일에 대한 링크를 생성하고 설치가 완료될 때까지 기다립니다. +Press `y` to create a link in `/usr/local/bin` to the executable and wait until the installation is complete. :::note -`gpg` 도구를 사용하여 서명을 확인하고 AdGuard의 공식 버전인지 확인할 수 있습니다. [GitHub에서 자세히 보기](https://github.com/AdguardTeam/AdGuardCLI?tab=readme-ov-file#verify-releases) +You can verify the signature to prove it’s an official version of AdGuard by using the `gpg` tool. [Read more on GitHub](https://github.com/AdguardTeam/AdGuardCLI?tab=readme-ov-file#verify-releases) ::: -## 라이선스 활성화 +## Initial setup -Linux용 AdGuard에는 [AdGuard 라이선스](https://adguard.com/license.html)가 필요합니다. 아직 라이선스가 없는 경우, 로그인하거나 계정을 만들어 14일 무료 체험판을 이용할 수 있습니다. 이미 라이선스가 있는 경우, 로그인하여 활성화하세요. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -로그인하거나 계정을 만들려면 다음을 입력합니다. +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -라이선스를 재설정하려면 다음을 입력합니다. +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -라이선스 정보를 보려면 다음을 입력합니다. +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## 초기 설정 +4. After activation, you can continue to work with the program: -AdGuard를 시작하고 실행하려면 초기 설정을 완료하세요. 여기에는 AdGuard CA 인증서 설치, 필요한 필터 활성화, 프록시 모드 선택이 포함됩니다. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -구성 마법사를 실행하려면 다음을 입력합니다. +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` -## Linux용 AdGuard 제거 + or view the license info by entering -AdGuard를 제거하려면 다음을 입력합니다. + ```sh + adguard-cli license + ``` -정식 버전 +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: -``` + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). + +## Uninstall AdGuard for Linux + +To uninstall AdGuard, enter: + +Release + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` -베타 버전 +Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` -나이틀리 버전 +Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` -필요한 경우 관리자 비밀번호를 입력합니다. +If required, enter your admin password. diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 20ea84ab8fe..c40c0af3241 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: 설정 및 보호 관리 sidebar_position: 3 --- +## Available commands + 사용 가능한 모든 AdGuard 명령 목록을 보려면 다음을 입력합니다. -``` +```sh adguard-cli --help-all ``` ## 보호 활성화 및 비활성화 +### Enable protection + 보호를 활성화하려면 다음을 입력합니다. -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + 보호를 비활성화하려면 다음을 입력하세요. -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + 보호 상태를 보려면 다음을 입력합니다. -``` +```sh adguard-cli status ``` -## 업데이트 확인 +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### 업데이트 확인 업데이트를 확인하려면 다음을 입력합니다. -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + Linux용 AdGuard를 업데이트하려면 다음을 입력합니다. -``` +```sh adguard-cli update ``` +### Update script output + 업데이트 스크립트 출력을 보려면 다음을 입력합니다. -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v `config` 명령을 사용하여 Linux용 AdGuard를 구성합니다. 하위 명령: - `show`: `proxy.yaml`의 현재 설정 표시 + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: `proxy.yaml`에서 옵션 설정 - `listen_ports.http_proxy`: HTTP 수신 포트 - `proxy_mode`: 프록시 모드(`manual` 또는 `auto`) + - `get`: 위 옵션의 현재 상태 확인 ## 필터 관리 @@ -64,8 +90,32 @@ adguard-cli update -v `filters` 명령을 사용하여 Linux용 AdGuard를 구성합니다. 하위 명령: - `list`: 설치된 필터 목록 + - `--all`: 모든 필터 보기 + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: 필터 설치 설치하려는 필터의 URL을 입력합니다. + - `enable`: 필터 활성화 필터의 이름이나 ID를 입력합니다. + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: 필터 비활성화 필터의 이름이나 ID를 입력합니다. + - `update`: 필터 업데이트 + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-mac/features/browser-assistant.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-mac/features/browser-assistant.md index 5769e6cd8fb..848b713da0f 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-mac/features/browser-assistant.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-mac/features/browser-assistant.md @@ -1,6 +1,6 @@ --- title: 브라우저 어시스턴트 -sidebar_position: 8 +sidebar_position: 9 --- :::info diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index e799f8a1c9d..2462d7279f7 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ sidebar_position: 5 ## 1. MSI 다운로드 {#msi-download} -[AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi)을 다운로드합니다. +[AdGuard MSI x86](https://agrd.io/adguard_setup86_msi)을 다운로드합니다. -[AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi)을 다운로드합니다. +[AdGuard MSI x64](https://agrd.io/adguard_setup64_msi)을 다운로드합니다. ## 2. 네트워크 설정 구성 {#settings-configuring} diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/dump-file.md b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/dump-file.md index bb272ce7a4a..881f43551c0 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/dump-file.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/dump-file.md @@ -1,6 +1,6 @@ --- title: 덤프 파일을 만드는 방법 -sidebar_position: 8 +sidebar_position: 9 --- :::정보 diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/ko/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index 9335cc6d2fe..f420b460191 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [iOS용 AdGuard][ios-app] | [Safari용 AdGuard][ext-saf] | [AdGuard 콘텐츠 차단기][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:-----------------------:|:--------------------------:|:-------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [iOS용 AdGuard][ios-app] | [Safari용 AdGuard][ext-saf] | [AdGuard 콘텐츠 차단기][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:-----------------------:|:--------------------------:|:-------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + 이 아래와 같이 변환됩니다. + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "Chrome MV3용 AdGuard 브라우저 확장 프로그램" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/general/browsing-security.md b/i18n/ko/docusaurus-plugin-content-docs/current/general/browsing-security.md index 255318a6a0f..3ada7e16867 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/general/browsing-security.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/general/browsing-security.md @@ -11,7 +11,7 @@ sidebar_position: 3 ::: -## How does AdGuard check websites? +## AdGuard는 웹사이트를 어떻게 검사하나요? 사용자가 웹사이트를 방문할 때마다 로컬 클라이언트는 해시 및 해시 접두사 형태로 AdGuard 백엔드 서버와 정보를 교환합니다. 이 교환을 기반으로 로컬 클라이언트는 잠재적으로 위험한 웹사이트 데이터베이스에 해당 웹사이트가 등재되어 있는지 여부를 결정합니다. 하지만 앱과 확장 프로그램은 조금 다르게 검사됩니다. @@ -19,58 +19,58 @@ sidebar_position: 3 AdGuard는 페이지와 페이지에 로드된 모든 개체를 검사하여 최상의 보호 기능을 제공합니다. AdGuard는 전체 URL이 아닌 해시 접두사를 사용하여 URL과 도메인 이름을 확인하므로, 당사 서버는 사용자가 방문한 웹사이트에 대한 정보를 보유하지 않으며 사용자의 개인 정보는 완전히 안전합니다. AdGuard 서버는 해시 접두사와 일치하는 모든 가능한 주소 목록으로 앱의 쿼리에 응답합니다. 해시 일치를 기반으로 잠재적 위협이 감지되면 해당 웹사이트에 대한 액세스가 즉시 차단됩니다. -![AdGuard warning](https://cdn.adtidy.org/content/kb/ad_blocker/general/dangerous_website_blocked.png) +![AdGuard 경고](https://cdn.adtidy.org/content/kb/ad_blocker/general/dangerous_website_blocked.png) -### In browser extensions {#extension} +### 확장 프로그램 {#extension} 브라우저 확장 프로그램은 전체 URL이 아닌 도메인 이름만 확인할 수 있습니다. 또한 하위 쿼리를 확인할 수 없습니다. 즉, 페이지에 잠재적으로 악성일 수 있는 요소가 있는 경우 페이지 자체가 안전한 도메인의 것이라도 해당 요소가 로드됩니다. 확장 프로그램으로는 보호할 수 없습니다. 또한 수행되는 검사는 비동기식으로, 즉 페이지가 로드되는 동시에 수행되므로 멀웨어도 로드될 수 있다는 점에 유의해야 합니다. ## AdGuard 제품에서 피싱 및 멀웨어 보호 설정하기 -- **For Windows**: Activate the *Browsing Security* module in the *Settings* menu +- **Windows의 경우**: *설정* 메뉴에서 *브라우징 보안* 모듈을 활성화합니다. - ![Browsing Security in Windows](https://cdn.adtidy.org/content/kb/ad_blocker/general/windows.png) + ![Windows의 브라우징 보안](https://cdn.adtidy.org/content/kb/ad_blocker/general/windows.png) -- **For Mac**: Enable the *Security* module in *Preferences* +- **Mac의 경우**: *설정에서* *보안* 모듈을 활성화합니다. - ![Security in Mac](https://cdn.adtidy.org/content/kb/ad_blocker/general/bs_mac.png) + ![Mac의 보안](https://cdn.adtidy.org/content/kb/ad_blocker/general/bs_mac.png) -- **For Android**: Turn on *Browsing Security* in the *Protection* tab +- **Android의 경우**: *보호* 탭에서 *브라우징 보안*을 켭니다. - ![Browsing security in Android *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/general/bs_android.png) + ![Android의 브라우징 보안 *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/general/bs_android.png) -- **For iOS**: Although there’s no separate module, you can go to *Safari protection* → *Filters* → *Security* and enable the available filters. Additionally, enable *DNS protection* and select one of the AdGuard DNS servers +- **iOS의 경우**: 별도의 모듈은 없지만 *Safari 보호* → *필터* → *보안*을 클릭하고 사용 가능한 필터를 활성화합니다. 또한 *DNS 보호*를 활성화하고 AdGuard DNS 서버 중 하나를 선택합니다. - ![Security in iOS *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/general/bs_ios.jpg) + ![iOS의 보안 *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/general/bs_ios.jpg) -- **For Browser extensions**: Enable *Phishing and malware protection* in the *Settings* tab. For enhanced protection, go to *Filters* → *Security* and activate filters +- **브라우저 확장 프로그램의 경우**: *설정* 탭에서 *피싱 및 멀웨어 보호*를 활성화합니다. 보호 기능을 강화하려면 *필터* → *보안*으로 이동하여 사용 가능한 필터를 활성화합니다. ![피싱 및 멀웨어 보호](https://cdn.adtidy.org/content/kb/ad_blocker/general/extension_protection.png) -- **For Private AdGuard DNS:** Enable malware protection in *Server settings* under *Security* +- **사설 AdGuard DNS의 경우:** *보안* 아래의 *서버 설정*에서 멀웨어 보호를 활성화합니다. - ![Security in DNS](https://cdn.adtidy.org/content/kb/ad_blocker/general/bs_dns.png) + ![DNS의 보안](https://cdn.adtidy.org/content/kb/ad_blocker/general/bs_dns.png) ## 차단 대상 -We maintain two primary filters: one that protects against phishing and fraudulent websites that attempt to steal user credentials, and another that blocks access to websites known to distribute malware, which could lead to data loss, information leaks, or damage to your device. These filters also protect you from websites with various scams and fraudulent schemes. For more detailed information, refer to this [Wikipedia article](https://en.wikipedia.org/wiki/Phishing). +사용자 인증 정보를 도용하려는 피싱 및 사기성 웹사이트로부터 보호하는 필터와 데이터 손실, 정보 유출 또는 기기 손상으로 이어질 수 있는 멀웨어를 배포하는 것으로 알려진 웹사이트에 대한 액세스를 차단하는 두 가지 기본 필터를 유지 관리합니다. 또한 이러한 필터는 다양한 사기 사이트로부터 사용자를 보호합니다. 자세한 내용은 이 [위키백과 문서](https://en.wikipedia.org/wiki/Phishing)를 참조하세요. ## 필터 유지 관리 -AdGuard maintains an extensive database of phishing and malware websites, and it’s updated regularly and automatically as new threats are discovered. We collect information from a variety of reliable, high-quality sources, both public and from other companies, and aggregate it into a common database of dangerous sites. +AdGuard는 피싱 및 악성 웹사이트의 데이터베이스를 관리하고 있으며, 새로운 위협이 발견되면 정기적으로 자동으로 업데이트됩니다. 저희는 공공 기관과 다른 회사들로부터 신뢰할 수 있고 수준 높은 출처에서 정보를 수집하여 위험한 사이트의 공통 데이터베이스로 통합합니다. -We automatically analyze complaints about suspicious sites and spend a great deal of time keeping the database up-to-date, cleaning up false positives, and implementing mechanisms to prevent them in the future. +의심스러운 사이트에 대한 불만을 자동으로 분석하고 데이터베이스를 최신 상태로 유지하며 오탐을 정리하고 향후 이를 방지하기 위한 메커니즘을 구현하는 데 많은 시간을 할애합니다. ### 피싱 또는 멀웨어 웹사이트 신고 -Any help is welcome! If you encounter a phishing or malware website, please report it to . +피싱 또는 멀웨어 웹사이트를 발견하면 으로 신고해 주세요. -### 오탐 +### 오탐 응답 -Occasionally, some non-malicious websites are added to AdGuard’s filters. We do our best to reduce the percentage of false positives, but they still occur. If you encounter this behavior from AdGuard, please report the false positive to our technical support at . +간혹 일부 악의적이지 않은 웹사이트가 AdGuard의 필터에 추가될 수 있습니다. 저희는 악의적이지 않은 웹사이트가 AdGuard 필터에 추가되지 않도록 최선을 다하고 있지만, 여전히 발생할 수 있습니다. AdGuard 필터에서 악의적이지 않은 웹사이트를 발견한 경우, 지원팀()으로 알려주세요. ## 웹사이트가 의심스러운 경우 -If you suspect that a certain website might be dangerous, check it first by using our [security check tool](https://reports.adguard.com/welcome.html). +특정 웹사이트가 위험하다고 생각되면 먼저 [보안 확인 도구](https://reports.adguard.com/welcome.html)를 사용해 보세요. -![Security check](https://cdn.adtidy.org/content/kb/ad_blocker/general/site_warning.png) +![보안 검사](https://cdn.adtidy.org/content/kb/ad_blocker/general/site_warning.png) diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/general/extensions.md b/i18n/ko/docusaurus-plugin-content-docs/current/general/extensions.md index 6fa6edcaeaa..919bf419a0a 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/general/extensions.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/general/extensions.md @@ -39,7 +39,7 @@ AdGuard는 유저스크립트 관리자 역할을 수행하여 웹사이트 기 ::: -#### AMP 비활성화 +#### Disable AMP Android용 AdGuard에만 사전 설치된 스크립트입니다. Google 검색 결과 페이지에서 AMP(가속화된 모바일 페이지)를 비활성화합니다. 이 사용자 스크립트에 대한 자세한 내용과 설치 방법은 [GitHub](https://github.com/AdguardTeam/DisableAMP)에서 확인할 수 있습니다. diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/general/https-filtering/what-is-https-filtering.md b/i18n/ko/docusaurus-plugin-content-docs/current/general/https-filtering/what-is-https-filtering.md index 97667794209..53ed680a282 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/general/https-filtering/what-is-https-filtering.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/general/https-filtering/what-is-https-filtering.md @@ -27,11 +27,11 @@ HTTPS 필터링 작업 방식이 쉬웠다면 HTTPS는 그렇게 안전하지 아래 그림은 이 과정을 보여줍니다. -![How HTTPS filtering works](https://cdn.adtidy.org/public/Adguard/Blog/https/what_is_https_filtering.png) +![HTTPS 필터링 작동 방식](https://cdn.adtidy.org/public/Adguard/Blog/https/what_is_https_filtering.png) ### 내 트래픽이 암호화되고 안전하나요? -물론입니다. 원격 서버와의 연결은 암호화되고 안전하게 유지됩니다. AdGuard, just like a browser, checks the server’s certificate before determining if the connection should be filtered or not. +물론입니다. 원격 서버와의 연결은 암호화되고 안전하게 유지됩니다. AdGuard는 브라우저와 마찬가지로 연결을 필터링할지 여부를 결정하기 전에 서버의 인증서를 확인합니다. 그러나 HTTPS 필터링에는 단점이 있습니다. HTTPS 필터링 시 브라우저는 실제 인증서 대신 AdGuard에서 발급한 인증서를 봅니다. @@ -51,7 +51,7 @@ EV 인증서는 더 높은 수준의 보안을 의미하며 일반 인증서보 ### HTTPS 필터링과 관련된 문제 -A [2017 study](https://cdn.adtidy.org/public/Adguard/Blog/https/interception-ndss17.pdf) found that 5 to 10% of HTTPS connections were established by HTTPS filtering applications. 이 HTTPS 필터링 애플리케이션 중 대부분 바이러스 백신 소프트웨어입니다. 나쁜 소식은 테스트된 26개의 바이러스 중 24개가 연결 보안 수준을 떨어뜨렸고 3분의 2가 해킹 연결에 취약하다는 것입니다. +[2017년 연구](https://cdn.adtidy.org/public/Adguard/Blog/https/interception-ndss17.pdf)에 따르면 HTTPS 연결의 5~10%가 HTTPS 필터링을 사용하는 애플리케이션에 의해 이루어집니다. 이 HTTPS 필터링 애플리케이션 중 대부분 바이러스 백신 소프트웨어입니다. 나쁜 소식은 테스트된 26개의 바이러스 중 24개가 연결 보안 수준을 떨어뜨렸고 3분의 2가 해킹 연결에 취약하다는 것입니다. 연구원들의 결론은 인터넷 보안 커뮤니티가 보안 연결을 필터링하는 애플리케이션에 세심한주의를 기울여야 한다는 것입니다. 그리고 그러한 프로그램의 개발자는 필터링 구현의 품질에 가장 진지하게주의를 진지하게 임해야 합니다. @@ -71,7 +71,7 @@ AdGuard는 연구원의 결과에 전적으로 동의합니다. 또한 현재 ### HTTPS 품질을 수동으로 확인하는 방법은 무엇인가요? -특정 웹 사이트에서 HTTPS 연결 품질을 확인할 수 있습니다. 이러한 웹 사이트는 브라우저(또는 AdGuard를 사용 경우, 브라우저 + AdGuard)가 일반적인 취약점에 노출되는지 확인합니다. If you plan to use any program that filters HTTPS, not necessarily AdGuard (e.g., an antivirus), we advise that you check the connection quality using these websites. +특정 웹 사이트에서 HTTPS 연결 품질을 확인할 수 있습니다. 이러한 웹 사이트는 브라우저(또는 AdGuard를 사용 경우, 브라우저 + AdGuard)가 일반적인 취약점에 노출되는지 확인합니다. HTTPS를 필터링하는 프로그램을 사용하려는 경우, AdGuard (예: 바이러스 백신)이 아닐지라도, 다음 웹사이트를 사용하여 연결 품질을 확인하는 것이 좋습니다. - [https://www.ssllabs.com/ssltest/viewMyClient.html](https://www.ssllabs.com/ssltest/viewMyClient.html) - [https://www.howsmyssl.com/](https://www.howsmyssl.com/) diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/ko/docusaurus-plugin-content-docs/current/general/license/legacy.md index 0f5ae74b9e0..d7b900608fd 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -27,57 +27,55 @@ AdGuard 이전 라이선스 키를 업그레이드·갱신하는 방법을 살 그러나 2019년 10월부터 새로운 라이선스 시스템이 도입되었습니다. 이제는 3개의 기기에서 사용할 수 있는 **개인용 라이선스**와 9개의 기기에서 사용할 수 있는 **가족용 라이선스**가 존재합니다. 예전처럼 개인용/가족용 라이선스는 연간와 평생 라이선스로 구분되었습니다. -제일 중요한 변경 사항은 **새로운 라이선스를 모든 기기에서 사용할 수 있는 것입니다. 예를 들어, 개인용 라이선스는 Android, Mac 및 iOS 또는 두 대의 Windows 컴퓨터와 한 대의 Apple 태블릿에서 사용할 수 있습니다.** +제일 중요한 변경 사항은 **새로운 라이선스를 모든 기기에서 사용할 수 있는 것입니다.** 예를 들어, 개인용 라이선스는 Android, Mac 및 iOS 또는 두 대의 Windows 컴퓨터와 한 대의 Apple 태블릿에서 사용할 수 있습니다. ## 이전 라이선스 키는 어떻게 되었나요? -이전 프리미엄 또는 모바일 라이선스를 가지고 있다면 과거와 동일하게 사용할 수 있습니다. +**일반 라이선스**는 자동으로 범용 라이선스로 전환되어 **어떤 기기에서든 사용**할 수 있습니다. -그러나 새로운 라이선스 시스템이 적용된 이후 모든 기기에서 일반 라이선스를 사용할 수 있습니다. +**모바일 라이선스**는 변경되지 않았으며, 휴대폰이나 태블릿에서만 사용할 수 있습니다. -예를 들면, 이제는 3개의 기기용 일반 라이선스를 2대의 컴퓨터와 1대의 휴대폰에서 이용할 수 있습니다. 또한 **프리미엄 라이선스는 이제 총 기기 수에 따라 개인 계정에 표시**됩니다. +**프리미엄 라이선스**도 변경되지 않고 플랫폼 제한이 유지됩니다. 또한 **프리미엄 라이선스는 이제 총 기기 수에 따라 개인 계정에 표시**됩니다. 1+1 키는 다음과 같이 표시됩니다. -![1+1 키](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 키](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *개인 계정에서 이전 라이선스는 '이전 버전’으로 표시됩니다.* > 이전 라이선스가 있는 경우 계정에 '이전 라이선스'라는 문구가 표시됩니다. 그러나 이러한 라이선스는 갱신 또는 업그레이드 시 자동으로 새로운 유형으로 변환됩니다. 어떤 라이선스를 새로운 유형으로 변환할 수 있는지, 어떻게 변환하는지 살펴보겠습니다. -## 이전 키 업그레이드· 갱신 방법 +## 레거시 키를 갱신하거나 업그레이드하는 방법 -[갱신 페이지](https://adguard.com/renew.html) 또는 [AdGuard 계정](https://adguardaccount.com/main.html)에서 확인할 수 있습니다. +기존 라이선스를 연장/갱신하거나 업그레이드하려면 [AdGuard 계정](https://adguardaccount.com) 또는 [갱신 또는 업그레이드 페이지](https://adguard.com/renew.html)에서 라이선스를 연장/갱신하거나 업그레이드할 수 있습니다. -![업그레이드](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> '내 라이선스'에서 특정 키에 대한 업그레이드·갱신 가능성을 확인할 수 있습니다. 구체적인 예를 살펴 보겠습니다. +AdGuard 계정에서 기존 라이선스를 갱신/연장하거나 업그레이드하려면, *라이선스* 탭으로 이동하여 필요한 라이선스를 찾아서 사용 가능한 옵션 중 하나를 선택하세요. -### 1/2/3개의 기기용 일반/모바일 라이선스 또는 1+1 프리미엄 +![AdGuard 계정에서 라이선스 갱신 또는 업그레이드하기](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -1/2/3개의 기기용 **연간 라이선스**는 갱신 시 개인용 또는 가족용 라이선스로 전환할 수 있습니다. +또는 [갱신 또는 업그레이드 페이지](https://adguard.com/renew.html)로 이동하여 라이선스를 입력하고 *적용*을 클릭하세요. 새 페이지에서 사용 가능한 옵션 중 하나를 선택합니다. -![업그레이드 또는 갱신](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> 보호해야 하는 기기 수에 따라 라이선스를 선택하십시오. +### 1/2/3개의 기기용 라이선스 -또한 갱신하는 대신 영구 라이선스를 이용하십시오. +또한 갱신하는 대신 영구 라이선스를 이용하세요. -![평생](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![평생](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**평생 라이선스**는 갱신할 수 없으므로 새로운 유형의 라이선스로 전환 시 가족용 라이선스로 업그레이드하는 옵션만 가능합니다. +> **3개 기기용 표준 라이선스**를 가지고 있다면, 이미 **개인용 라이선스**로 전환된 것입니다. **모바일 라이선스**를 3개의 기기용으로 갱신하면, 휴대폰뿐만 아니라 **다른 기기**에서도 사용할 수 있습니다. -![평생 업그레이드](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +이 라이선스를 평생 라이선스로 업그레이드할 수도 있습니다.: -### 4개 기기 이상의 라이선스 (최대 9개 기기 이용) +![평생 라이선스로 업그레이드](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) + +기술적 한계로 인해 **평생 라이선스**는 가족용 라이선스(9개 기기)로만 업그레이드할 수 있습니다. -**연간 라이선스**는 가족용 라이선스로 전환할 수 있습니다. +### 4개 기기 이상의 라이선스 (최대 9개 기기 이용) -![4개의 기기에서 사용할 수 있는 연간 라이선스](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +4개 이상의 기기용 **연간** 라이선스는 평생 및 가족용 라이선스로 업그레이드할 수 있습니다. **평생 라이선스**가 기술적 제한으로 인해 새로운 유형 라이선스로 변경이 불가능합니다. -![4개의 기기에서 사용할 수 있는 평생 라이선스](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) - ### 9개 기기 이상의 라이선스 -9개 기기 이상의 라이선스로는 5+5 프리미엄 라이선스와 관리자를 통해 구매한 10대 이상 기기용 라이선스가 있습니다. +프리미엄 키(5+5 이상)와 10개 이상의 기기에 사용할 수 있는 사용자 지정 키를 관리자의 도움을 받아 개별적으로 구매할 수 있습니다. -이는 매우 독특한 경우이므로 연간 라이선스를 평생 라이선스로 업그레이드하려면 partners@adguard.com으로 문의하십시오. 라이선스의 구성에 따라 개별적인 특별 제안을 제공하겠습니다. +이는 매우 독특한 경우이므로 라이선스를 평생 라이선스로 업그레이드하려면 partners@adguard.com으로 문의하세요. 라이선스의 구성에 따라 개별적인 특별 제안을 제공하겠습니다. diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/ko/docusaurus-plugin-content-docs/current/general/license/what-is.md index f63a4be5ad8..f8b8e6cee30 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ sidebar_position: 1 - **판매업체 라이선스** 및 **선물받은 라이선스**는 기간 제한이 있을 수도 없을 수도 있습니다. 만료일이 있는 라이선스는 수동으로만 갱신할 수 있습니다. - 개인용 — 최대 3개의 기기 - 가족용 — 최대 9개의 기기 -- **iOS용 AdGuard Pro 라이선스**는 App Store를 통해 구매 및 관리되며 동일한 Apple ID를 사용하는 iOS 및 iPadOS 기기에서만 사용할 수 있습니다. +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/general/stealth-mode.md b/i18n/ko/docusaurus-plugin-content-docs/current/general/stealth-mode.md index 87a353ba87e..5a833942d2f 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/general/stealth-mode.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/general/stealth-mode.md @@ -1,9 +1,9 @@ --- -title: Stealth Mode (Tracking protection) +title: 스텔스 모드(추적 보호) sidebar_position: 4 --- -많은 웹사이트는 방문자의 IP 주소, 설치된 브라우저 및 운영 체제, 화면 해상도, 심지어 방문자가 리디렉션된 페이지 등 방문자에 대한 정보를 수집합니다. 일부 웹 페이지에서는 쿠키를 사용하여 브라우저를 표시하고 개인 설정 및 환경설정을 저장하거나 다음 방문 시 사용자를 '인식'합니다. *Tracking protection* safeguards your personal information from such data- and statistics-gathering systems. +많은 웹사이트는 방문자의 IP 주소, 설치된 브라우저 및 운영 체제, 화면 해상도, 심지어 방문자가 리디렉션된 페이지 등 방문자에 대한 정보를 수집합니다. 일부 웹 페이지에서는 쿠키를 사용하여 브라우저를 표시하고 개인 설정 및 환경설정을 저장하거나 다음 방문 시 사용자를 '인식'합니다. *추적 보호* 기능은 이러한 데이터 및 통계 수집 시스템으로부터 개인 정보를 보호합니다. 스텔스 모드의 작업을 유연하게 조정할 수 있습니다. 예를 들어 인터넷에서 웹사이트를 찾는 데 사용한 검색 요청을 웹사이트가 수신하지 못하도록 하고, 타사 쿠키와 웹사이트 자체 쿠키를 모두 자동으로 삭제하고, 내 위치를 추적하는 데 사용할 수 있는 브라우저 지리적 위치 공유를 끄고, 실제 IP 주소를 숨기거나 임의의 주소로 대체할 수도 있습니다. @@ -17,21 +17,21 @@ sidebar_position: 4 ## 일반 {#general} -### Hide search queries {#searchqueries} +### 검색어 숨기기 {#searchqueries} Google, Yahoo 또는 기타 검색 엔진에서 웹사이트로 이동하는 경우 이 옵션은 해당 웹사이트를 찾는 데 사용한 검색어를 숨깁니다. -### Send signals to opt out of tracking {#donottrack} +### 추적 거부 신호 보내기 {#donottrack} 방문하는 웹사이트에 [Global Privacy Control](https://globalprivacycontrol.org/#gpc-spec) 및 [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) 요청을 보냅니다. -### Remove tracking parameters from URLs {#removetracking} +### URL에서 추적 매개변수 제거 {#removetracking} 이 옵션을 활성화하면 AdGuard는 페이지의 URL에서 `utm_*` 및 `fb_ref와` 같은 추적 매개변수를 제거합니다. ### 추적 방법 {#tracking-methods} -### Delete third-party cookies {#3p-cookie} +### 타사 쿠키 삭제 {#3p-cookie} 웹사이트는 쿠키를 사용하여 사용자가 선택한 언어, 위치, 장바구니의 품목 목록 등 사용자의 정보와 기본 설정을 저장합니다. 웹사이트에 다시 방문하면 브라우저는 해당 웹사이트에 속한 쿠키를 다시 전송하여 사용자의 데이터를 기억할 수 있습니다. @@ -45,7 +45,7 @@ Google, Yahoo 또는 기타 검색 엔진에서 웹사이트로 이동하는 경 ::: -### Delete first-party cookies (not recommended) {#1p-cookie} +### 자사 쿠키 삭제(권장하지 않음) {#1p-cookie} 모든 쿠키가 삭제되는 기간(분 단위)을 설정합니다. 완전히 차단하려면 타이머를 0으로 설정합니다. @@ -55,7 +55,7 @@ Google, Yahoo 또는 기타 검색 엔진에서 웹사이트로 이동하는 경 ::: -### Block ETag and If-None-Match headers {#3p-cache} +### ETag 및 If-None-Match 헤더 차단 {#3p-cache} 브라우저가 페이지 주소를 지정하면 서버는 해당 페이지에 ETag를 할당합니다. 이 ETag는 브라우저에서 페이지의 콘텐츠를 캐시하는 데 사용됩니다. 후속 요청 시 브라우저는 해당 서버로 ETag를 전송하여 서버가 방문자의 신원을 파악할 수 있도록 합니다. 사이트의 파일이 캐시되어 있는 한, 브라우저에서 이 사이트를 주소 지정할 때마다 ETag가 전송됩니다. 사이트에 다른 서버의 콘텐츠(예: 이미지 또는 iframe)가 포함된 경우 해당 서버는 사용자 모르게 사용자의 활동을 추적할 수 있습니다. @@ -79,7 +79,7 @@ WebRTC(웹 실시간 통신)는 브라우저와 앱 간에 데이터를 직접 ### Flash 차단 {#flash} -The Flash Player plugin has become increasingly vulnerable to such online threats as viruses and hackers; it may also significantly increase website load times. 이 설정을 켜면 AdGuard가 브라우저에서 Flash의 콘텐츠 표시를 허용하는 구성 요소(예: 플러그인 및 ActiveXObject 개체)를 감지하는 기능을 차단합니다. 이는 사실상 브라우저가 Flash를 지원할 수 없음을 의미합니다. +Flash Player 플러그인은 바이러스 및 해커와 같은 온라인 위협에 점점 더 취약해지고 있습니다. 또한 웹사이트 로딩 시간에 큰 영향을 미칠 수도 있습니다. 이 설정을 켜면 AdGuard가 브라우저에서 Flash의 콘텐츠 표시를 허용하는 구성 요소(예: 플러그인 및 ActiveXObject 개체)를 감지하는 기능을 차단합니다. 이는 사실상 브라우저가 Flash를 지원할 수 없음을 의미합니다. ### Java 차단 {#java} @@ -95,25 +95,25 @@ The Flash Player plugin has become increasingly vulnerable to such online threat 트래픽을 필터링하기 위해 AdGuard 애플리케이션은 브라우저-서버 간 요청을 '가로채기'합니다. 광고, 추적 및 피싱 서버에 대한 요청은 서버로 전송되기 전에 변경되거나 완전히 차단될 수 있습니다. *타사 리퍼러 숨기기* 옵션도 마찬가지입니다: 이 옵션이 활성화된 경우 AdGuard는 HTTP(S) 요청, 특히 리퍼러 헤더를 제거하거나 변경하기 위해 요청을 가로챕니다. 그러나 이러한 요청은 브라우저에서 '종료'된 후에만 발생합니다. 즉, 브라우저 내부에서 리퍼러를 모니터링하는 경우(예: Chrome의 개발자 도구 사용) 요청이 아직 AdGuard에 도달하지 않았기 때문에 원래 리퍼러가 표시됩니다. [Fiddler](https://www.telerik.com/fiddler)와 같은 소프트웨어를 사용하여 Referer가 올바르게 변경되었는지 확인할 수 있습니다. -Due to the nature of all web browser extensions, AdGuard Browser Extension instead works 'inside' the web browser. 그러면 바로 그 자리에서 Referer가 변경되므로 개발자 도구는 귀하의 요청에 대해 원하는 Referer를 표시합니다. +모든 웹 브라우저 확장 프로그램의 특성으로 인해 AdGuard 브라우저 확장 프로그램은 웹 브라우저 내부에서 작동합니다. 그러면 바로 그 자리에서 Referer가 변경되므로 개발자 도구는 귀하의 요청에 대해 원하는 Referer를 표시합니다. -### Hide User-Agent {#useragent} +### User Agent 숨기기 {#useragent} 웹사이트를 방문하면 브라우저가 해당 정보를 서버로 전송합니다. 'User-Agent:'로 시작하는 HTTP 요청의 일부인 텍스트 줄처럼 보입니다. 일반적으로 브라우저의 이름과 버전, 운영 체제 및 언어 설정이 포함됩니다. 우리는 광고주가 정보를 얻을 수 없도록 User Agent를 식별 정보에서 제외했습니다. Custom User Agent 필드에 User Agent 값을 입력하여 임의의 값을 설정할 수도 있습니다. 기본 User Agent를 사용하려면 필드를 비워 두세요. -### Mask IP address {#ip} +### IP 주소 숨기기 {#ip} 스텔스 모드에서는 IP 주소를 숨길 수 없습니다. 그러나 방문하는 웹사이트가 귀하를 프록시로 인식하도록 숨길 수 있습니다. 이 방법이 도움이 될 때도 있지만 웹사이트는 실제 IP 주소를 무시합니다. 다른 사람이 내 IP 주소로 인식하도록 하려면 해당 필드에 입력하기만 하면 임의의 IP 주소를 설정할 수 있습니다. 기본 IP 주소를 사용하려면 이 필드를 비워둡니다. -### Remove X-Client-Data header {#xclientdata} +### X-Client-Data 헤더 제거 {#xclientdata} 이는 Google Chrome이 Google 도메인(Double Click 및 Google Analytics 포함)에 대한 요청과 함께 버전 및 수정 정보를 보내는 것을 금지합니다. -### Protect against DPI {#dpi} +### DPI로부터 보호 {#dpi} 심층 패킷 검사는 패킷 내용별로 트래픽을 심층 분석 및 필터링하고 통계 데이터를 축적하는 시스템입니다. ISP는 이 기술을 사용하여 통과하는 트래픽을 제어하고 클라이언트의 콘텐츠 액세스를 제한할 수 있습니다. @@ -123,6 +123,6 @@ AdGuard는 클라이언트가 DPI 차단 기준에 해당하지 않도록 발신 :::caution -If this feature is enabled in AdGuard for Windows, it may interfere with ESET antivirus. Anti-DPI will prevent ESET from filtering traffic, leaving blacklisted and malicious websites unblocked. +Windows용 AdGuard에서 이 기능이 활성화되어 있는 경우, ESET 백신 프로그램과 충돌할 수 있습니다. DPI로부터 보호 기능은 ESET가 트래픽을 필터링하지 못하게 하여 블랙리스트에 올라간 웹사이트와 악성 웹사이트를 차단 해제 상태로 유지합니다. ::: diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/guides/collect-har-file.md b/i18n/ko/docusaurus-plugin-content-docs/current/guides/collect-har-file.md index 2ce708c6b8d..03c89e11ae0 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/guides/collect-har-file.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/guides/collect-har-file.md @@ -105,7 +105,7 @@ Internet Explorer 11에서 HAR 파일을 생성하려면 다음 단계를 따르 - 녹화 중 재생 버튼은 회색으로 표시되고 중지 버튼은 빨간색으로 표시됩니다. **재생** 모드를 켭니다. -1. Clear any session info appearing in the lower grid using the **Clear session** button on the **Network** tab. 아이콘 위로 마우스를 가져가면 이름을 볼 수 있습니다. +1. **네트워크** 탭의 **세션 지우기** 버튼을 사용하여 아래쪽 그리드에 표시되는 세션 정보를 지웁니다. 아이콘 위로 마우스를 가져가면 이름을 볼 수 있습니다. - **세션 지우기** 버튼은 세 줄 아이콘에 X가 표시되어 있습니다. @@ -113,7 +113,7 @@ Internet Explorer 11에서 HAR 파일을 생성하려면 다음 단계를 따르 1. 문제를 일으키는 단계를 재현합니다. -1. Save session as a .har file by clicking the **Save to disk** button (Export as HAR) on the **Network** tab. +1. **네트워크** 탭에서 **디스크에 저장** 버튼(HAR로 내보내기)을 클릭하여 세션을 .har 파일로 저장합니다. 1. AdGuard 지원 팀(support@adguard.com)에 파일을 보내고 문제를 자세히 설명하세요. 스크린샷을 첨부하는 것도 도움이 될 수 있습니다. diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md b/i18n/ko/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md index bc50d613783..f1b61343d15 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md @@ -19,9 +19,9 @@ HTTP 트래픽은 어떤 경우에도 필터링되지만, AdGard가 HTTPS 트래 ### Windows {#windows} -1. Note the IP address of your computer with AdGuard installed. +1. AdGuard가 설치된 컴퓨터의 IP 주소를 기록해 두세요. -1. AdGuard 보호 기능이 활성화되어 있는지 확인하세요. Windows 컴퓨터의 경우, 설정의 **네트워크** 탭에서 **AdGuard를 HTTP 프록시로 사용** 확인란을 선택합니다. On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. AdGuard 보호 기능이 활성화되어 있는지 확인하세요. Windows 컴퓨터의 경우, 설정의 **네트워크** 탭에서 **AdGuard를 HTTP 프록시로 사용** 확인란을 선택합니다. Mac의 경우, **설정** → **환경설정** → **네트워크**로 이동하여 **HTTP 프록시**를 활성화합니다. 1. AdGuard가 설치된 동일한 컴퓨터에서 다음 링크를 따르세요: [http://local.adguard.org/cert](http://local.adguard.org/cert) @@ -55,15 +55,15 @@ HTTP 트래픽은 어떤 경우에도 필터링되지만, AdGard가 HTTPS 트래 1. *프록시 서버 사용* 탭에서 **설정**을 클릭합니다. -1. 토글을 켭니다. For **Proxy IP address**, type the IP address of your computer that you noted in step 1. **포트**, 데스크톱 AdGuard 앱의 네트워크 설정에서 선택한 포트를 입력합니다. +1. 토글을 켭니다. **프록시 IP 주소**에 1단계에서 기록한 컴퓨터의 IP 주소를 입력합니다. **포트**, 데스크톱 AdGuard 앱의 네트워크 설정에서 선택한 포트를 입력합니다. 1. **저장**을 클릭합니다. ### Mac {#mac} -1. Note the IP address of your computer with installed AdGuard. +1. AdGuard가 설치된 컴퓨터의 IP 주소를 기록해 두세요. -1. AdGuard 보호 기능이 활성화되어 있는지 확인하세요. Windows 컴퓨터의 경우, 설정의 **네트워크** 탭에서 **AdGuard를 HTTP 프록시로 사용** 확인란을 선택합니다. On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. AdGuard 보호 기능이 활성화되어 있는지 확인하세요. Windows 컴퓨터의 경우, 설정의 **네트워크** 탭에서 **AdGuard를 HTTP 프록시로 사용** 확인란을 선택합니다. Mac의 경우, **설정** → **환경설정** → **네트워크**로 이동하여 **HTTP 프록시**를 활성화합니다. 1. 웹 브라우저를 사용하여 이 링크를 클릭하세요: [http://local.adguard.org/cert](http://local.adguard.org/cert) @@ -93,9 +93,9 @@ HTTP 트래픽은 어떤 경우에도 필터링되지만, AdGard가 HTTPS 트래 ### Android {#android} -1. Note the IP address of your computer with installed AdGuard. +1. AdGuard가 설치된 컴퓨터의 IP 주소를 기록해 두세요. -1. AdGuard 보호 기능이 활성화되어 있는지 확인하세요. Windows 컴퓨터의 경우, 설정의 **네트워크** 탭에서 **AdGuard를 HTTP 프록시로 사용** 확인란을 선택합니다. On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. AdGuard 보호 기능이 활성화되어 있는지 확인하세요. Windows 컴퓨터의 경우, 설정의 **네트워크** 탭에서 **AdGuard를 HTTP 프록시로 사용** 확인란을 선택합니다. Mac의 경우, **설정** → **환경설정** → **네트워크**로 이동하여 **HTTP 프록시**를 활성화합니다. 1. AdGuard가 설치된 컴퓨터에서 웹 브라우저를 사용하여 다음 링크를 따르세요: [http://local.adguard.org/cert](http://local.adguard.org/cert). @@ -109,13 +109,13 @@ HTTP 트래픽은 어떤 경우에도 필터링되지만, AdGard가 HTTPS 트래 1. 활성 Wi-Fi 네트워크의 고급 설정을 엽니다. -1. **프록시 유형**을 **수동**으로 변경합니다. For **Proxy hostname**, enter the noted IP address of your computer you noted in step 1. **프록시 포트**, AdGuard 데스크톱 앱의 네트워크 설정에서 선택한 포트를 입력합니다. +1. **프록시 유형**을 **수동**으로 변경합니다. **프록시 호스트 이름**에 1단계에서 기록한 컴퓨터의 IP 주소를 입력합니다. **프록시 포트**, AdGuard 데스크톱 앱의 네트워크 설정에서 선택한 포트를 입력합니다. ### iOS {#ios} -1. Note the IP address of your computer with installed AdGuard. +1. AdGuard가 설치된 컴퓨터의 IP 주소를 기록해 두세요. -1. AdGuard 보호 기능이 활성화되어 있는지 확인하세요. Windows 컴퓨터의 경우, 설정의 **네트워크** 탭에서 **AdGuard를 HTTP 프록시로 사용** 확인란을 선택합니다. On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. AdGuard 보호 기능이 활성화되어 있는지 확인하세요. Windows 컴퓨터의 경우, 설정의 **네트워크** 탭에서 **AdGuard를 HTTP 프록시로 사용** 확인란을 선택합니다. Mac의 경우, **설정** → **환경설정** → **네트워크**로 이동하여 **HTTP 프록시**를 활성화합니다. 1. AdGuard가 설치된 컴퓨터에서 웹 브라우저를 사용하여 다음 링크를 따르세요: [http://local.adguard.org/cert](http://local.adguard.org/cert). diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/miscellaneous/contribute/beta-testing.md b/i18n/ko/docusaurus-plugin-content-docs/current/miscellaneous/contribute/beta-testing.md index d17a6ec47d1..48b0b54404d 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/miscellaneous/contribute/beta-testing.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/miscellaneous/contribute/beta-testing.md @@ -1,46 +1,46 @@ --- -title: AdGuard beta/nightly testing +title: AdGuard 베타/나이틀리 테스트 sidebar_position: 1 --- -거의 모든 주요 플랫폼을 위한 AdGuard 앱이 있으며, 모든 플랫폼에 대한 업데이트를 정기적으로 출시합니다. This would not be possible without beta and nightly testing and, more importantly, without our testers. Want to become one of them? Here’s how you can do it. +거의 모든 주요 플랫폼을 위한 AdGuard 앱이 있으며, 모든 플랫폼에 대한 업데이트를 정기적으로 출시합니다. 베타 버전과 나이틀리 테스트, 그리고 테스터가 없었다면 불가능했을 것입니다. 테스터가 되고 싶으신가요? 아래 방법을 확인하세요. -### Beta or nightly: what is the difference? +### 베타 버전과 나이틀리 버전: 차이점은 무엇인가요? -Both beta and nightly testing are important to make AdGuard constantly better. However, they are different, and you can choose the one that suits you more. +베타 테스트와 나이틀리 테스트 모두 AdGuard를 지속적으로 개선하는 데 중요합니다. 하지만 서로 다르므로 자신에게 더 적합한 것을 선택할 수 있습니다. -The development process follows a progression from nightly to beta and then from beta to the final, stable version — release. It means that you are more likely to find bugs in nightly builds, but you get access to new features faster, almost on a daily basis. Betas are more stable, but you will get updates less often. +개발 과정은 나이트리에서 베타로, 베타에서 정식 버전으로 진행됩니다. 즉, 나이틀리 빌드에서 버그를 발견할 가능성이 더 높지만, 거의 매일 새로운 기능에 더 빨리 액세스할 수 있습니다. 베타 버전은 더 안정적이지만, 업데이트를 덜 자주 받을 수 있습니다. -## How to become a beta or nightly tester {#intro} +## 베타 또는 나이틀리 테스터가 되는 방법 {#intro} -Our requirements are easy: use AdGuard, upgrade to the beta/nightly version when it becomes available, and report any bugs you notice. You will need a [GitHub](https://github.com/) account to become our tester, so you may want to get that out of the way first. +AdGuard를 사용하고, 베타/나이틀리 버전으로 업그레이드할 수 있게 되면 업그레이드하고, 발견한 버그를 신고해 주시면 감사하겠습니다. 베타 테스터가 되려면 [GitHub](https://github.com/) 계정이 필요하므로 먼저 계정을 만드는 것이 좋습니다. -You will also need the device on which you will install the app and [the link to the the beta testing page](https://adguard.com/beta.html). There you will find more information on how to join our program and test AdGuard for Windows, Mac, Android, and iOS. +또한 앱을 설치할 기기와 [베타 테스트 페이지 링크](https://adguard.com/beta.html)가 필요합니다. 여기에서 프로그램에 참여하고 Windows, Mac, Android, iOS용 AdGuard를 테스트하는 방법에 대한 자세한 정보를 확인할 수 있습니다. -If you want to skip the description part and get straight to the action, you can apply [here](https://surveys.adguard.com/beta_testing_program/form.html). Your application will be reviewed within 1–3 working days, and you'll get a reply via email. +설명 부분을 건너뛰고 바로 실행에 옮기고 싶다면 [여기](https://surveys.adguard.com/beta_testing_program/form.html)에서 신청할 수 있습니다. 신청서는 영업일 기준 1~3일 이내에 검토되며 이메일을 통해 회신해 드립니다. :::note -To get the AdGuard for iOS beta or nightly build, first you have to install [TestFlight](https://apps.apple.com/app/testflight/id899247664) on your iOS device. +iOS용 AdGuard 베타 또는 나이틀리 빌드를 받으려면 먼저 iOS 기기에 [TestFlight](https://apps.apple.com/app/testflight/id899247664)를 설치하세요. ::: ## 버그를 신고하는 방법 {#report-a-bug} -If you spotted a bug or just want to share your suggestion, let us know: go to [GitHub](https://github.com/AdguardTeam/), find a suitable repository, create a new issue there, and describe the bug/feature request in detail. +버그를 발견했거나 제안을 공유하고 싶으시면 [GitHub](https://github.com/AdguardTeam/)로 이동하여 적합한 리포지토리를 찾은 후 새 이슈를 생성하고 버그/기능 요청을 자세히 설명해 주세요. -The above method is the most preferred, but you can use others if necessary: +위의 방법이 가장 선호되지만, 필요한 경우 다른 방법을 사용할 수 있습니다. - [Facebook](https://www.facebook.com/AdguardEn/), [Reddit](https://www.reddit.com/r/Adguard/) 등 다양한 소셜 미디어 플랫폼에서 저희를 만나보세요. 하지만 이는 기술적인 문제를 논의하는 데 가장 편리한 방법은 아닙니다. - 앱의 지원 탭에서 저희의 지원 팀에게 이메일을 보내거나, [support@adguard.com](mailto:support@adguard.com)으로 직접 보내주세요. -## How to activate a beta/nightly key in the iOS app {#ios} +## iOS 앱에서 베타/나이틀리 키를 활성화하는 방법 {#ios} -If you have already received a beta or nightly key and it is listed in your `adguard.com` account, go to the app and open the license section (Get Premium). Once there, enter the credentials from your AdGuard account. After that, the premium features will become available automatically. +이미 베타 또는 나이틀리 키를 받았고 `adguard.com` 계정에 키가 등록되어 있는 경우 앱으로 이동하여 라이선스 섹션(프리미엄 받기)을 엽니다. AdGuard 계정의 자격 증명을 입력하세요. 그 후에는 프리미엄 기능을 자동으로 사용할 수 있게 됩니다. -### What else? +### 기타 -There is not much more to add. You don't have to go out of your way to find bugs. You can continue using AdGuard as usual. However, if you encounter a bug, please report it. Of course, we appreciate any additional effort. +더 이상 추가할 내용이 많지 않습니다. 버그를 열심히 찾을 필요가 없습니다. 평소와 같이 AdGuard를 계속 사용할 수 있습니다. 하지만 버그가 발견되면 신고해 주세요. 물론 추가적인 노력에 감사드립니다. -Occasionally, you will receive our newsletters, keeping you informed of the latest changes in the beta/nightly (in case you missed them) and other important news. You can unsubscribe from it at any time. +가끔씩 뉴스레터를 통해 베타의 최신 변경 사항(놓친 경우) 및 기타 중요한 소식을 알려드립니다. 언제든 구독을 취소할 수 있습니다. diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/plural-forms.md b/i18n/ko/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/plural-forms.md index 3a8d162d220..7b491e9059d 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/plural-forms.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/plural-forms.md @@ -38,7 +38,7 @@ sidebar_position: 4 다음은 사용할 수 있는 몇 가지 정보 출처입니다. -[현지화 가이드](http://docs.translatehouse.org/projects/localization-guide/en/latest/l10n/pluralforms.html)에는 다양한 언어 목록이 포함되어 있습니다. 다른 언어의 복수형 수는 `nplurals=2`, `nplurals=4` 등과 같은 방식으로 표시됩니다. The numeral after the equals sign `=` indicates the number of plural forms of the respective language. +[현지화 가이드](http://docs.translatehouse.org/projects/localization-guide/en/latest/l10n/pluralforms.html)에는 다양한 언어 목록이 포함되어 있습니다. 다른 언어의 복수형 수는 `nplurals=2`, `nplurals=4` 등과 같은 방식으로 표시됩니다. 등호 기호 `=` 뒤의 숫자는 해당 언어의 복수형 개수를 나타냅니다. 또한 [Unicode Common Locale Data Repository(CLDR)](http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#rules)에서 복수형에 대한 정보를 확인할 수 있습니다. CLDR 복수형 규칙은 10진수(1.5, 2.3, 100.1…)에 대한 추가 단어 형식을 나타내지만 AdGuard 번역에는 사용하지 않습니다. diff --git a/i18n/ko/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/rewards.md b/i18n/ko/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/rewards.md index 8297e62d55f..0461d2c2a2b 100644 --- a/i18n/ko/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/rewards.md +++ b/i18n/ko/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/rewards.md @@ -37,7 +37,7 @@ sidebar_position: 6 > 안녕하세요, > -> 저는 Android용 AdGuard에서 *한국어* 단어 5,000개 이상을 번역했습니다. 제 통계를 첨부해 두었습니다. As a reward, I’d like to request an AdGuard VPN license and an Ad Blocker license My email is (*your email address*). My Crowdin username is (*your username*). +> 저는 Android용 AdGuard에서 *한국어* 단어 5,000개 이상을 번역했습니다. 제 통계를 첨부해 두었습니다. 보답으로 AdGuard VPN 라이선스와 광고 차단기 라이선스를 요청하고 싶습니다. 제 이메일 주소는 (*귀하의 이메일 주소*)입니다. 제 Crowdin 사용자 이름은 (*귀하의 사용자 이름*)입니다. ## 자신의 번역 진행도를 확인하는 법 diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 92bfd87a1dd..fa490098e78 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ The _Low-level settings_ section is for expert users. [Read more about low-level This section allows you to manage HTTPS filtering settings, filters, and userscripts, and set up a proxy server. -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filters @@ -57,11 +57,19 @@ If you activate too many filters, some websites may work incorrectly. [Read more about filters](https://adguard.com/en/blog/what-are-filters.html) -### Userscripts +### Extensions + +Extensions allow you to add userscripts and userstyles. + +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 5e75a51f1e8..b5525cd735c 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 24b41b032ca..8f7344f7ade 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index da99768471a..0341d942127 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: How to protect AdGuard from being disabled by the system -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 7367e63cef9..784a7c9587c 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ You can access it by navigating to *Statistics* → *Battery usage*. Inside you will find a chart that shows the AdGuard battery resource consumption within the last 24 hours, with an option to get more detailed hour-to-hour data by tapping on the chart. Besides that, there’s also a numeric breakdown of the relevant data and a short technical explanation. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### How much battery resource does AdGuard really consume? First, let us lay down a bit of theory and links with necessary data. diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 6f1876d0079..0563d2a0336 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index d98274a0489..c77491236e7 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index deebee15677..c716cc3ed93 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Manual installation of the security certificate into the Firefox browser -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index c5b7755321a..05d28c3b6ea 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 54b325ec582..52016424603 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 79723d1f221..b9f70d23922 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problems caused by multiple user profiles -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 6b9fddc4500..f95d206303e 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: How to set up outbound proxy -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index b9e9396152a..4ae364e8290 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 96b31c31295..25de8d83319 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index adfd7139869..5d8aa06bad9 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: How to block ads in the YouTube app -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 43c9e9aee82..67126401ab4 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,23 +5,25 @@ sidebar_position: 2 ## Install AdGuard for Linux -To install AdGuard, enter: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` @@ -35,37 +37,97 @@ You can verify the signature to prove it’s an official version of AdGuard by u ::: -## Activate license +## Initial setup -AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don't have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -To log in or create an account, enter: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -To reset your license, enter: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -To view the license info, enter: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Initial setup +4. After activation, you can continue to work with the program: -To get AdGuard up and running, complete the initial setup. This includes installing the AdGuard CA certificate, enabling the necessary filters, and selecting the proxy mode. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -To run the configuration wizard, enter: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). ## Uninstall AdGuard for Linux @@ -73,19 +135,19 @@ To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 4ede8a490a1..2487dcaac3b 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Settings and protection management sidebar_position: 3 --- +## Available commands + To get a list of all available AdGuard commands, enter: -``` +```sh adguard-cli --help-all ``` ## Enable and disable protection +### Enable protection + To enable protection, enter: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + To disable protection, enter: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + To view the protection status, enter: -``` +```sh adguard-cli status ``` -## Check for updates +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Check for updates To check for updates, enter: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + To update AdGuard for Linux, enter: -``` +```sh adguard-cli update ``` +### Update script output + To view the update script output, enter: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Use the `config` command to configure AdGuard for Linux. Subcommands: - `show`: Show the current configuration in `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configure an option in `proxy.yaml` - - `listen_ports.http_proxy`: HTTP listening port - - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `listen_ports.http_proxy`: HTTP listening port + - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `get`: Get the current status of the above options ## Manage filters @@ -64,8 +90,32 @@ Use the `config` command to configure AdGuard for Linux. Subcommands: Use the `filters` command to configure AdGuard for Linux. Subcommands: - `list`: List installed filters - - `--all`: View all filters + + - `--all`: View all filters + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Install a filter. Enter the URL of the filter you want to install + - `enable`: Enable a filter. Enter the name or ID of the filter + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Disable a filter. Enter the name or ID of the filter + - `update`: Update filters + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index 412685edf25..86c048ff7a0 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ This page describes the features and details of AdGuard’s central management o ## 1. Download the MSI {#msi-download} -Download the [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi) +Download the [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Download the [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi) +Download the [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configure the settings for your network {#settings-configuring} diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/nl/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index cf76ff7fe89..24b6011caf1 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + is converted to + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-ff]: #what-product "AdGuard Browser Extension for Firefox" diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/nl/docusaurus-plugin-content-docs/current/general/license/legacy.md index 6b1c2a74395..1e68e937061 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: Legacy licenses FAQ sidebar_position: 6 --- -We have written this article to avoid confusion and explain in detail how you can renew/upgrade an outdated (legacy) AdGuard license. +We have written this article to avoid confusion and explain in detail how you can renew/upgrade a legacy AdGuard license. -## About the outdated licenses +## About legacy licenses Initially licenses of the following types were available to activate AdGuard products: @@ -27,54 +27,52 @@ For all types (Standard, Mobile, Premium) there were options for a Yearly and Li In October 2019 AdGuard switched to the new licensing system: from then on, licenses can still be purchased for 1 year or Lifetime, but their types have become **Personal** (for up to 3 devices) or **Family** (for up to 9 devices). -One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal license can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet.** +Another change is that the **new types of license keys can now be used on any device, in any combination**. For example, a Personal license can be used on Android, Mac and iOS, as well as on two Windows computers and an Apple tablet. -## What happened to the outdated licenses? +## What happened to the legacy licenses? -Standard were automatically made universal, which means that they can be activated on any devices. +**Standard licenses** were automatically made **universal**, which means that they can be activated on any device. -Mobile licenses remained unchanged and platform-limited (they can still only be used on phones or tablets). +**Mobile licenses** remained unchanged and platform-limited (they can still only be used on phones or tablets). -Premium licenses also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. +**Premium licenses** also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. For example, this is how the 1+1 key looks like: -![1+1 key](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 key](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *But despite the total number of devices (2) it can be activated on 1 desktop and 1 mobile device.* > All the outdated licenses have a "legacy" badge in the AdGuard account. And they are automatically converted to a new type when you either renew or upgrade them. But there are some nuances. Let's see which licenses can be converted to a new type and how to do it. -## I have an outdated (legacy) key. What renewal/upgrade options are available for me? +## How to renew or upgrade a legacy key -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +You can extend/renew or upgrade a legacy license in your [AdGuard account](https://adguardaccount.com) or on the [Extend or upgrade page](https://adguard.com/renew.html). -![Upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Go to "My licenses" tab and check what actions are available to you for each specific key. Below we will explain with specific examples. +To extend/renew or upgrade a legacy license in your AdGuard account, go to the *Licenses* tab, find the license you need, and select one of the available options. -### Licenses for 1/2/3 devices +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Yearly** licenses for 1, 2, 3 devices can be converted to either Personal or Family: +Or go to the [Extend or upgrade page](https://adguard.com/renew.html), enter your license, and click *Apply*. On the new page, select one of the available options. -![Upgrade or renew](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Choose based on how many devices you need to protect. +### Licenses for 1/2/3 devices -Instead of renewal you can switch to Lifetime: +Mobile Yearly licenses for 3 devices can be converted to Personal licenses or upgraded to Family ones: -![Lifetime](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Upgrade Yearly licenses for 1, 2, 3 devices](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Lifetime** licenses can only be converted to Family (9 devices) due to technical limitations: +> If you have a **Standard license for 3 devices**, it already works as a **Personal** license. If you renew your **Mobile license** for 3 devices, you will be able to use it on a **different set of device**s, not just phones. -![Lifetime upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +You can also upgrade your license to Lifetime: -### Licenses for 4+ devices (up to 9) +![Upgrade to Lifetime](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Yearly** keys of this configuration can only be converted into a Family license: +**Lifetime** licenses can only be upgraded to Family (9 devices) due to technical limitations. -![Yearly license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licenses for 4+ devices (up to 9) -**Lifetime** licenses for 4 or more devices cannot be upgraded due to technical limitation: +**Yearly** licenses for 4 or more devices can be upgraded to Family and Lifetime licenses. -![Lifetime license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +However, if you already have a **Lifetime** license, it cannot be upgraded due to technical limitations. ### Licenses for 9+ devices diff --git a/i18n/nl/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/nl/docusaurus-plugin-content-docs/current/general/license/what-is.md index a3b22328a24..fd9fa685ce2 100644 --- a/i18n/nl/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/nl/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ There are also licenses that the user can purchase from other sources or get for - **Distributor licenses** and **gifted licenses** can be both time-limited and non-time limited. Licenses with an expiration date can only be renewed manually - Personal — up to 3 devices - Family — up to 9 devices -- **The AdGuard Pro for iOS license** is purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 92bfd87a1dd..fa490098e78 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ The _Low-level settings_ section is for expert users. [Read more about low-level This section allows you to manage HTTPS filtering settings, filters, and userscripts, and set up a proxy server. -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filters @@ -57,11 +57,19 @@ If you activate too many filters, some websites may work incorrectly. [Read more about filters](https://adguard.com/en/blog/what-are-filters.html) -### Userscripts +### Extensions + +Extensions allow you to add userscripts and userstyles. + +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 5e75a51f1e8..b5525cd735c 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 24b41b032ca..8f7344f7ade 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index da99768471a..0341d942127 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: How to protect AdGuard from being disabled by the system -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 7367e63cef9..784a7c9587c 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ You can access it by navigating to *Statistics* → *Battery usage*. Inside you will find a chart that shows the AdGuard battery resource consumption within the last 24 hours, with an option to get more detailed hour-to-hour data by tapping on the chart. Besides that, there’s also a numeric breakdown of the relevant data and a short technical explanation. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### How much battery resource does AdGuard really consume? First, let us lay down a bit of theory and links with necessary data. diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 6f1876d0079..0563d2a0336 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index d98274a0489..c77491236e7 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index deebee15677..c716cc3ed93 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Manual installation of the security certificate into the Firefox browser -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index c5b7755321a..05d28c3b6ea 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 54b325ec582..52016424603 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 79723d1f221..b9f70d23922 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problems caused by multiple user profiles -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 6b9fddc4500..f95d206303e 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: How to set up outbound proxy -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index b9e9396152a..4ae364e8290 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 96b31c31295..25de8d83319 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index adfd7139869..5d8aa06bad9 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: How to block ads in the YouTube app -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 43c9e9aee82..67126401ab4 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,23 +5,25 @@ sidebar_position: 2 ## Install AdGuard for Linux -To install AdGuard, enter: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` @@ -35,37 +37,97 @@ You can verify the signature to prove it’s an official version of AdGuard by u ::: -## Activate license +## Initial setup -AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don't have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -To log in or create an account, enter: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -To reset your license, enter: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -To view the license info, enter: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Initial setup +4. After activation, you can continue to work with the program: -To get AdGuard up and running, complete the initial setup. This includes installing the AdGuard CA certificate, enabling the necessary filters, and selecting the proxy mode. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -To run the configuration wizard, enter: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). ## Uninstall AdGuard for Linux @@ -73,19 +135,19 @@ To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 4ede8a490a1..2487dcaac3b 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Settings and protection management sidebar_position: 3 --- +## Available commands + To get a list of all available AdGuard commands, enter: -``` +```sh adguard-cli --help-all ``` ## Enable and disable protection +### Enable protection + To enable protection, enter: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + To disable protection, enter: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + To view the protection status, enter: -``` +```sh adguard-cli status ``` -## Check for updates +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Check for updates To check for updates, enter: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + To update AdGuard for Linux, enter: -``` +```sh adguard-cli update ``` +### Update script output + To view the update script output, enter: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Use the `config` command to configure AdGuard for Linux. Subcommands: - `show`: Show the current configuration in `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configure an option in `proxy.yaml` - - `listen_ports.http_proxy`: HTTP listening port - - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `listen_ports.http_proxy`: HTTP listening port + - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `get`: Get the current status of the above options ## Manage filters @@ -64,8 +90,32 @@ Use the `config` command to configure AdGuard for Linux. Subcommands: Use the `filters` command to configure AdGuard for Linux. Subcommands: - `list`: List installed filters - - `--all`: View all filters + + - `--all`: View all filters + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Install a filter. Enter the URL of the filter you want to install + - `enable`: Enable a filter. Enter the name or ID of the filter + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Disable a filter. Enter the name or ID of the filter + - `update`: Update filters + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index 412685edf25..86c048ff7a0 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ This page describes the features and details of AdGuard’s central management o ## 1. Download the MSI {#msi-download} -Download the [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi) +Download the [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Download the [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi) +Download the [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configure the settings for your network {#settings-configuring} diff --git a/i18n/no/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/no/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index cf76ff7fe89..24b6011caf1 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + is converted to + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-ff]: #what-product "AdGuard Browser Extension for Firefox" diff --git a/i18n/no/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/no/docusaurus-plugin-content-docs/current/general/license/legacy.md index 6b1c2a74395..1e68e937061 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: Legacy licenses FAQ sidebar_position: 6 --- -We have written this article to avoid confusion and explain in detail how you can renew/upgrade an outdated (legacy) AdGuard license. +We have written this article to avoid confusion and explain in detail how you can renew/upgrade a legacy AdGuard license. -## About the outdated licenses +## About legacy licenses Initially licenses of the following types were available to activate AdGuard products: @@ -27,54 +27,52 @@ For all types (Standard, Mobile, Premium) there were options for a Yearly and Li In October 2019 AdGuard switched to the new licensing system: from then on, licenses can still be purchased for 1 year or Lifetime, but their types have become **Personal** (for up to 3 devices) or **Family** (for up to 9 devices). -One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal license can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet.** +Another change is that the **new types of license keys can now be used on any device, in any combination**. For example, a Personal license can be used on Android, Mac and iOS, as well as on two Windows computers and an Apple tablet. -## What happened to the outdated licenses? +## What happened to the legacy licenses? -Standard were automatically made universal, which means that they can be activated on any devices. +**Standard licenses** were automatically made **universal**, which means that they can be activated on any device. -Mobile licenses remained unchanged and platform-limited (they can still only be used on phones or tablets). +**Mobile licenses** remained unchanged and platform-limited (they can still only be used on phones or tablets). -Premium licenses also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. +**Premium licenses** also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. For example, this is how the 1+1 key looks like: -![1+1 key](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 key](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *But despite the total number of devices (2) it can be activated on 1 desktop and 1 mobile device.* > All the outdated licenses have a "legacy" badge in the AdGuard account. And they are automatically converted to a new type when you either renew or upgrade them. But there are some nuances. Let's see which licenses can be converted to a new type and how to do it. -## I have an outdated (legacy) key. What renewal/upgrade options are available for me? +## How to renew or upgrade a legacy key -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +You can extend/renew or upgrade a legacy license in your [AdGuard account](https://adguardaccount.com) or on the [Extend or upgrade page](https://adguard.com/renew.html). -![Upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Go to "My licenses" tab and check what actions are available to you for each specific key. Below we will explain with specific examples. +To extend/renew or upgrade a legacy license in your AdGuard account, go to the *Licenses* tab, find the license you need, and select one of the available options. -### Licenses for 1/2/3 devices +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Yearly** licenses for 1, 2, 3 devices can be converted to either Personal or Family: +Or go to the [Extend or upgrade page](https://adguard.com/renew.html), enter your license, and click *Apply*. On the new page, select one of the available options. -![Upgrade or renew](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Choose based on how many devices you need to protect. +### Licenses for 1/2/3 devices -Instead of renewal you can switch to Lifetime: +Mobile Yearly licenses for 3 devices can be converted to Personal licenses or upgraded to Family ones: -![Lifetime](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Upgrade Yearly licenses for 1, 2, 3 devices](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Lifetime** licenses can only be converted to Family (9 devices) due to technical limitations: +> If you have a **Standard license for 3 devices**, it already works as a **Personal** license. If you renew your **Mobile license** for 3 devices, you will be able to use it on a **different set of device**s, not just phones. -![Lifetime upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +You can also upgrade your license to Lifetime: -### Licenses for 4+ devices (up to 9) +![Upgrade to Lifetime](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Yearly** keys of this configuration can only be converted into a Family license: +**Lifetime** licenses can only be upgraded to Family (9 devices) due to technical limitations. -![Yearly license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licenses for 4+ devices (up to 9) -**Lifetime** licenses for 4 or more devices cannot be upgraded due to technical limitation: +**Yearly** licenses for 4 or more devices can be upgraded to Family and Lifetime licenses. -![Lifetime license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +However, if you already have a **Lifetime** license, it cannot be upgraded due to technical limitations. ### Licenses for 9+ devices diff --git a/i18n/no/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/no/docusaurus-plugin-content-docs/current/general/license/what-is.md index a3b22328a24..fd9fa685ce2 100644 --- a/i18n/no/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/no/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ There are also licenses that the user can purchase from other sources or get for - **Distributor licenses** and **gifted licenses** can be both time-limited and non-time limited. Licenses with an expiration date can only be renewed manually - Personal — up to 3 devices - Family — up to 9 devices -- **The AdGuard Pro for iOS license** is purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 92bfd87a1dd..fa490098e78 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ The _Low-level settings_ section is for expert users. [Read more about low-level This section allows you to manage HTTPS filtering settings, filters, and userscripts, and set up a proxy server. -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filters @@ -57,11 +57,19 @@ If you activate too many filters, some websites may work incorrectly. [Read more about filters](https://adguard.com/en/blog/what-are-filters.html) -### Userscripts +### Extensions + +Extensions allow you to add userscripts and userstyles. + +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 5e75a51f1e8..b5525cd735c 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 24b41b032ca..8f7344f7ade 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index da99768471a..0341d942127 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: How to protect AdGuard from being disabled by the system -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 7367e63cef9..784a7c9587c 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ You can access it by navigating to *Statistics* → *Battery usage*. Inside you will find a chart that shows the AdGuard battery resource consumption within the last 24 hours, with an option to get more detailed hour-to-hour data by tapping on the chart. Besides that, there’s also a numeric breakdown of the relevant data and a short technical explanation. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### How much battery resource does AdGuard really consume? First, let us lay down a bit of theory and links with necessary data. diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 6f1876d0079..0563d2a0336 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index d98274a0489..c77491236e7 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index deebee15677..c716cc3ed93 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Manual installation of the security certificate into the Firefox browser -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index c5b7755321a..05d28c3b6ea 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 54b325ec582..52016424603 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 79723d1f221..b9f70d23922 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problems caused by multiple user profiles -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 6b9fddc4500..f95d206303e 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: How to set up outbound proxy -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index b9e9396152a..4ae364e8290 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 96b31c31295..25de8d83319 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index adfd7139869..5d8aa06bad9 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: How to block ads in the YouTube app -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 43c9e9aee82..67126401ab4 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,23 +5,25 @@ sidebar_position: 2 ## Install AdGuard for Linux -To install AdGuard, enter: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` @@ -35,37 +37,97 @@ You can verify the signature to prove it’s an official version of AdGuard by u ::: -## Activate license +## Initial setup -AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don't have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -To log in or create an account, enter: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -To reset your license, enter: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -To view the license info, enter: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Initial setup +4. After activation, you can continue to work with the program: -To get AdGuard up and running, complete the initial setup. This includes installing the AdGuard CA certificate, enabling the necessary filters, and selecting the proxy mode. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -To run the configuration wizard, enter: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). ## Uninstall AdGuard for Linux @@ -73,19 +135,19 @@ To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 4ede8a490a1..2487dcaac3b 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Settings and protection management sidebar_position: 3 --- +## Available commands + To get a list of all available AdGuard commands, enter: -``` +```sh adguard-cli --help-all ``` ## Enable and disable protection +### Enable protection + To enable protection, enter: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + To disable protection, enter: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + To view the protection status, enter: -``` +```sh adguard-cli status ``` -## Check for updates +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Check for updates To check for updates, enter: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + To update AdGuard for Linux, enter: -``` +```sh adguard-cli update ``` +### Update script output + To view the update script output, enter: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Use the `config` command to configure AdGuard for Linux. Subcommands: - `show`: Show the current configuration in `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configure an option in `proxy.yaml` - - `listen_ports.http_proxy`: HTTP listening port - - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `listen_ports.http_proxy`: HTTP listening port + - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `get`: Get the current status of the above options ## Manage filters @@ -64,8 +90,32 @@ Use the `config` command to configure AdGuard for Linux. Subcommands: Use the `filters` command to configure AdGuard for Linux. Subcommands: - `list`: List installed filters - - `--all`: View all filters + + - `--all`: View all filters + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Install a filter. Enter the URL of the filter you want to install + - `enable`: Enable a filter. Enter the name or ID of the filter + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Disable a filter. Enter the name or ID of the filter + - `update`: Update filters + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index 412685edf25..86c048ff7a0 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ This page describes the features and details of AdGuard’s central management o ## 1. Download the MSI {#msi-download} -Download the [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi) +Download the [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Download the [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi) +Download the [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configure the settings for your network {#settings-configuring} diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/pl/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index cf76ff7fe89..24b6011caf1 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + is converted to + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-ff]: #what-product "AdGuard Browser Extension for Firefox" diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/pl/docusaurus-plugin-content-docs/current/general/license/legacy.md index 6b1c2a74395..1e68e937061 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: Legacy licenses FAQ sidebar_position: 6 --- -We have written this article to avoid confusion and explain in detail how you can renew/upgrade an outdated (legacy) AdGuard license. +We have written this article to avoid confusion and explain in detail how you can renew/upgrade a legacy AdGuard license. -## About the outdated licenses +## About legacy licenses Initially licenses of the following types were available to activate AdGuard products: @@ -27,54 +27,52 @@ For all types (Standard, Mobile, Premium) there were options for a Yearly and Li In October 2019 AdGuard switched to the new licensing system: from then on, licenses can still be purchased for 1 year or Lifetime, but their types have become **Personal** (for up to 3 devices) or **Family** (for up to 9 devices). -One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal license can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet.** +Another change is that the **new types of license keys can now be used on any device, in any combination**. For example, a Personal license can be used on Android, Mac and iOS, as well as on two Windows computers and an Apple tablet. -## What happened to the outdated licenses? +## What happened to the legacy licenses? -Standard were automatically made universal, which means that they can be activated on any devices. +**Standard licenses** were automatically made **universal**, which means that they can be activated on any device. -Mobile licenses remained unchanged and platform-limited (they can still only be used on phones or tablets). +**Mobile licenses** remained unchanged and platform-limited (they can still only be used on phones or tablets). -Premium licenses also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. +**Premium licenses** also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. For example, this is how the 1+1 key looks like: -![1+1 key](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 key](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *But despite the total number of devices (2) it can be activated on 1 desktop and 1 mobile device.* > All the outdated licenses have a "legacy" badge in the AdGuard account. And they are automatically converted to a new type when you either renew or upgrade them. But there are some nuances. Let's see which licenses can be converted to a new type and how to do it. -## I have an outdated (legacy) key. What renewal/upgrade options are available for me? +## How to renew or upgrade a legacy key -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +You can extend/renew or upgrade a legacy license in your [AdGuard account](https://adguardaccount.com) or on the [Extend or upgrade page](https://adguard.com/renew.html). -![Upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Go to "My licenses" tab and check what actions are available to you for each specific key. Below we will explain with specific examples. +To extend/renew or upgrade a legacy license in your AdGuard account, go to the *Licenses* tab, find the license you need, and select one of the available options. -### Licenses for 1/2/3 devices +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Yearly** licenses for 1, 2, 3 devices can be converted to either Personal or Family: +Or go to the [Extend or upgrade page](https://adguard.com/renew.html), enter your license, and click *Apply*. On the new page, select one of the available options. -![Upgrade or renew](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Choose based on how many devices you need to protect. +### Licenses for 1/2/3 devices -Instead of renewal you can switch to Lifetime: +Mobile Yearly licenses for 3 devices can be converted to Personal licenses or upgraded to Family ones: -![Lifetime](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Upgrade Yearly licenses for 1, 2, 3 devices](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Lifetime** licenses can only be converted to Family (9 devices) due to technical limitations: +> If you have a **Standard license for 3 devices**, it already works as a **Personal** license. If you renew your **Mobile license** for 3 devices, you will be able to use it on a **different set of device**s, not just phones. -![Lifetime upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +You can also upgrade your license to Lifetime: -### Licenses for 4+ devices (up to 9) +![Upgrade to Lifetime](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Yearly** keys of this configuration can only be converted into a Family license: +**Lifetime** licenses can only be upgraded to Family (9 devices) due to technical limitations. -![Yearly license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licenses for 4+ devices (up to 9) -**Lifetime** licenses for 4 or more devices cannot be upgraded due to technical limitation: +**Yearly** licenses for 4 or more devices can be upgraded to Family and Lifetime licenses. -![Lifetime license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +However, if you already have a **Lifetime** license, it cannot be upgraded due to technical limitations. ### Licenses for 9+ devices diff --git a/i18n/pl/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/pl/docusaurus-plugin-content-docs/current/general/license/what-is.md index a3b22328a24..fd9fa685ce2 100644 --- a/i18n/pl/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/pl/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ There are also licenses that the user can purchase from other sources or get for - **Distributor licenses** and **gifted licenses** can be both time-limited and non-time limited. Licenses with an expiration date can only be renewed manually - Personal — up to 3 devices - Family — up to 9 devices -- **The AdGuard Pro for iOS license** is purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/features/features.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/features/features.md index a238999753c..16432bf6037 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/features/features.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/features/features.md @@ -35,9 +35,9 @@ Configurações gerais, avançadas e de baixo nível que permitem selecionar o i ## Guia de configurações de baixo nível -Descriptions of the low-level settings available in AdGuard v4.3 for Android and later. +Descrições das configurações de baixo nível disponíveis no AdGuard v4.3 para Android e versões posteriores. -[Low-level settings guide](/adguard-for-android/features/low-level-settings.md) +[Guia de configurações de baixo nível](/adguard-for-android/features/low-level-settings.md) ## Assistente diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md index 8fcd96a1f2c..2acd542d661 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/features/low-level-settings.md @@ -17,7 +17,7 @@ Alterar as configurações de baixo nível pode causar problemas no desempenho d ::: -To access _Low-level settings_, open the AdGuard app and tap the gear icon in the lower-right corner of the screen. Then select _General → Advanced → Low-level settings_. +Para acessar _Configurações de baixo nível_, abra o aplicativo AdGuard e toque no ícone de engrenagem no canto inferior direito da tela. Em seguida, selecione _Modo geral → Avançado → Configurações de baixo nível_. ## Configurações de baixo nível @@ -29,9 +29,9 @@ Para o AdGuard v4.x para Android, redesenhamos completamente as configurações Aqui você pode especificar o(s) resolvedor(es) DNS de recuo a ser(em) usado(s) quando o servidor configurado não estiver disponível. Opções disponíveis: -- _Automatic DNS_: Select this option if you want to use the system DNS or AdGuard DNS. -- _None_: Select this option if you do not want to have any fallback. -- _Custom DNS_: Select this option and enter plain DNS server IPv4 or IPv6 addresses, one per line. Estes endereços serão utilizados como servidores DNS primários. +- _DNS automático_: Selecione esta opção se você quiser usar o DNS do sistema ou o AdGuard DNS. +- _Nenhum_: Selecione esta opção se você não quiser ter nenhum fallback. +- _DNS personalizado_: Selecione esta opção e insira os endereços de servidor DNS simples IPv4 ou IPv6, um por linha. Estes endereços serão utilizados como servidores DNS primários. #### Domínios de fallback @@ -45,25 +45,25 @@ Se essa configuração estiver ativada, o AdGuard detectará os domínios de pes Bootstrap DNS para servidores DNS primários criptografados, como DoH, DoT e DoQ. Opções disponíveis: -- _Automatic DNS_: Select this option if you want to use the system DNS or AdGuard DNS. Esta opção está selecionada por padrão. -- _Custom DNS_: Select this option and enter plain DNS server IPv4 or IPv6 addresses, one per line. Estes endereços serão utilizados como servidores DNS primários bootstrap. +- _DNS automático_: Selecione esta opção se você quiser usar o DNS do sistema ou o AdGuard DNS. Esta opção está selecionada por padrão. +- _DNS personalizado_: Selecione esta opção e insira os endereços de servidor DNS simples IPv4 ou IPv6, um por linha. Estes endereços serão utilizados como servidores DNS primários bootstrap. #### Modo de bloqueio para regras de estilo adblock -Here you can specify the response type for domains blocked by DNS rules based on adblock rule syntax (for example, `||example.org^`). Opções disponíveis: +Aqui você pode especificar o tipo de resposta para domínios Bloqueado por regras de DNS com base na sintaxe da regra de bloqueio de anúncios (por exemplo, `||example.org^`). Opções disponíveis: -- _REFUSED_: Respond with REFUSED -- _NXDOMAIN_: Respond with NXDOMAIN -- _Custom IP address_: Select this option to respond with a custom IP address. Você terá que inserir um endereço IPv4 para solicitações A bloqueadas e um endereço IPv6 para solicitações AAAA bloqueadas. +- _REFUSED_: responder com o código REFUSED +- _NXDOMAIN_: responder com NXDOMAIN +- _Endereço de IP personalizado_: Selecione esta opção para responder com um endereço de IP personalizado. Você terá que inserir um endereço IPv4 para solicitações A bloqueadas e um endereço IPv6 para solicitações AAAA bloqueadas. #### Modo de bloqueio para regras de hosts -Here you can specify the response type for domains blocked by DNS rules based on hosts rule syntax -(for example, ` 0.0.0.0 example.com`). +Aqui você pode especificar o tipo de resposta para domínios bloqueados por regras de DNS com base na sintaxe da regra de hosts +(por exemplo, ` 0.0.0.0 example.com`). -- _REFUSED_: Respond with REFUSED -- _NXDOMAIN_: Respond with NXDOMAIN -- _Custom IP address_: Select this option to respond with a custom IP address. Você terá que inserir um endereço IPv4 para solicitações A bloqueadas e um endereço IPv6 para solicitações AAAA bloqueadas. +- _REFUSED_: responder com o código REFUSED +- _NXDOMAIN_: responder com NXDOMAIN +- _Endereço de IP personalizado_: Selecione esta opção para responder com um endereço de IP personalizado. Você terá que inserir um endereço IPv4 para solicitações A bloqueadas e um endereço IPv6 para solicitações AAAA bloqueadas. #### Tempo limite de solicitação de DNS @@ -104,9 +104,9 @@ Se essa configuração estiver ativada, o AdGuard filtrará as solicitações de Esta configuração possui dois modos: -- **Filter on the fly**. Neste modo, o AdGuard filtra o tráfego DNS-over-HTTPS sem redirecioná-lo para o proxy DNS local. Ele usará o servidor DNS especificado nas configurações do navegador. +- **Filtrar em tempo real**. Neste modo, o AdGuard filtra o tráfego DNS-over-HTTPS sem redirecioná-lo para o proxy DNS local. Ele usará o servidor DNS especificado nas configurações do navegador. -- **Redirect to DNS proxy**. Nesse modo, o AdGuard redirecionará as solicitações de DNS-over-HTTPS para o proxy DNS local para filtragem. Ele usará o servidor DNS selecionado nas configurações de DNS do aplicativo AdGuard. +- **Redirecionar para o proxy DNS**. Nesse modo, o AdGuard redirecionará as solicitações de DNS-over-HTTPS para o proxy DNS local para filtragem. Ele usará o servidor DNS selecionado nas configurações de DNS do aplicativo AdGuard. ### Filtragem @@ -122,7 +122,7 @@ Essa configuração pode desacelerar seu dispositivo. Use-o apenas para fins de Se esta configuração estiver ativada, o AdGuard criptografará ClientHellos, se necessário. Este recurso requer a filtragem HTTPS para ser ativada. Este recurso utiliza um proxy DNS local para procurar a configuração ECH para o domínio. Se encontrado, o pacote ClientHello será criptografado. Certifique-se de usar um servidor DNS criptografado com este recurso. -**About ClientHellos and ECH**: Every encrypted Internet connection has an unencrypted part. Estamos falando do primeiro pacote, que contém o nome do servidor ao qual você está se conectando. A tecnologia Encrypted Client Hello é projetada para resolver este problema ao criptografar este pacote. +**Sobre ClientHellos e ECH**: Cada conexão de Internet criptografada tem uma parte não criptografada. Estamos falando do primeiro pacote, que contém o nome do servidor ao qual você está se conectando. A tecnologia Encrypted Client Hello é projetada para resolver este problema ao criptografar este pacote. #### Verificação OCSP @@ -136,23 +136,23 @@ Se a verificação demorar muito, o AdGuard permitirá a conexão enquanto conti Se esta configuração estiver ativada, o AdGuard filtrará as solicitações enviadas por HTTP/3, além de outros tipos de solicitação. Este recurso requer a filtragem HTTPS para ser ativada. -**About HTTP/3**: This is the latest version of the HTTP protocol, based on QUIC. +**Sobre o HTTP/3**: Esta é a versão mais recente do protocolo HTTP, baseado em QUIC. ### Proxy de saída #### Mostrar a configuração Filtrar solicitações de DNS -When this setting is enabled, the _Filter DNS requests_ switch is displayed in the _Add proxy server_ dialog. To access the dialog, open **Settings**, then go to **Filtering** → **Network** → **Proxy** → **Proxy server**, and click _+ Add proxy server_. Ativar aquele interruptor ativa a filtragem de Solicitações de DNS que passam pelo proxy de saída especificado. +Quando esta configuração estiver ativada, a opção _Filtragem de solicitações DNS_ será exibida no diálogo _Adicionar proxy_. Para acessar o diálogo, abra **Configurações**, em seguida vá para **Filtragem** → **Rede** → **Proxy** → **Servidor proxy**, e clique em _+ Adicionar servidor proxy_. Ativar aquele interruptor ativa a filtragem de Solicitações de DNS que passam pelo proxy de saída especificado. ### Proteção #### Intervalo de portas -Esta configuração permite que você especifique os intervalos de portas que devem ser filtrados. Insira intervalos de portas, um intervalo por linha. Use `..` to specify the range. For example, `80..5221`. +Esta configuração permite que você especifique os intervalos de portas que devem ser filtrados. Insira intervalos de portas, um intervalo por linha. Use `..` para especificar o alcance. Por exemplo, `80..5221`. #### Registrar eventos HTML removidos -If this setting is enabled, AdGuard will write information about blocked HTML elements to _Recent activity_. To access the logs, go to go to **Statistics** → **Recent activity**. +Se esta configuração estiver ativada, o AdGuard registrará informações sobre elementos HTML bloqueados em _Atividade recente_. Para acessar os registros, vá para **Estatísticas** → **Atividade recente**. #### Correção de Scriptlet @@ -160,15 +160,15 @@ Se esta configuração estiver ativada, o aplicativo exibirá informações de d #### Aplicativos excluídos -Esta configuração permite que você liste os pacotes e UIDs a excluir da proteção do AdGuard. Digite os nomes dos pacotes ou UIDs, um por linha. You can use `//` for comments. +Esta configuração permite que você liste os pacotes e UIDs a excluir da proteção do AdGuard. Digite os nomes dos pacotes ou UIDs, um por linha. Você pode usar `//` para comentários. #### Pacotes QUIC bypass -Aqui você pode especificar nomes de pacotes para os quais o AdGuard deve ignorar o tráfego QUIC. Digite os nomes dos pacotes, um por linha. You can use `//` for comments. +Aqui você pode especificar nomes de pacotes para os quais o AdGuard deve ignorar o tráfego QUIC. Digite os nomes dos pacotes, um por linha. Você pode usar `//` para comentários. #### Reconfigurar o proxy automático quando a rede mudar -Se esta configuração estiver ativada, a proteção do AdGuard será reiniciada para reconfigurar os parâmetros automáticos do proxy quando seu dispositivo se conectar a outra rede. This setting only applies when _Routing mode_ is set to _Automatic proxy_. +Se esta configuração estiver ativada, a proteção do AdGuard será reiniciada para reconfigurar os parâmetros automáticos do proxy quando seu dispositivo se conectar a outra rede. Esta configuração só se aplica quando o _Modo de roteamento_ está definido como _Proxy automático_. #### Filtragem IPv6 @@ -176,11 +176,11 @@ Se esta configuração estiver ativada, o AdGuard filtrará redes IPv6 se uma in #### Intervalos IPv4 excluídos da filtragem -Aqui você pode listar os intervalos de endereços IPv4 a excluir da filtragem. Insira um alcance de IP por linha. You can use `//` for comments. +Aqui você pode listar os intervalos de endereços IPv4 a excluir da filtragem. Insira um alcance de IP por linha. Você pode usar `//` para comentários. #### Intervalos IPv6 excluídos da filtragem -Aqui você pode listar os intervalos de endereços IPv6 a excluir da filtragem. Insira um alcance de IP por linha. You can use `//` for comments. +Aqui você pode listar os intervalos de endereços IPv6 a excluir da filtragem. Insira um alcance de IP por linha. Você pode usar `//` para comentários. #### TCP keepalive para soquetes de saída @@ -188,8 +188,8 @@ Se essa configuração estiver ativada, o AdGuard enviará uma sonda keepalive a Esta configuração permite que você especifique: -- **Idle time**, in seconds, before sending TCP keepalive probes to outgoing sockets. O valor padrão é 0. Se você estiver tendo problemas com NAT, defina isso como 20. -- **Time between keepalive probes** for an unresponsive peer. O valor padrão é 0 segundos. +- **Tempo ocioso**, em segundos, antes de enviar sondas TCP keepalive para soquetes de saída. O valor padrão é 0. Se você estiver tendo problemas com NAT, defina isso como 20. +- **Tempo entre sondagens de keepalive** para um par não responsivo. O valor padrão é 0 segundos. ### Configurações locais de VPN @@ -211,7 +211,7 @@ Se esta configuração estiver ativada, a VPN local do AdGuard será reativada a #### Captura de pacotes (PCAP) -Essa configuração ativa o registro de interfaces TUN. When enabled, AdGuard creates a file `timestamp.pcap`, such as 1682599851461.pcap, in the app cache directory. Este arquivo lista todos os pacotes de rede transmitidos pela VPN e pode ser analisado usando a ferramenta Wireshark. +Essa configuração ativa o registro de interfaces TUN. Quando ativado, o AdGuard cria um arquivo `timestamp.pcap`, como 1682599851461.pcap, no diretório de cache do aplicativo. Este arquivo lista todos os pacotes de rede transmitidos pela VPN e pode ser analisado usando a ferramenta Wireshark. #### Incluir a porta Wi-Fi nas rotas VPN @@ -219,28 +219,28 @@ Se esta configuração estiver ativada, os endereços IP do gateway serão adici #### Endereço IPv4 -Aqui você pode inserir o endereço IP que será usado para criar uma interface TUN. The default value is `172.18.11.218`. +Aqui você pode inserir o endereço IP que será usado para criar uma interface TUN. O valor padrão é `172.18.11.218`. #### Forçar o roteamento de LAN IPv4 -If this setting is enabled, AdGuard will filter all LAN connections, including local IPv4 network traffic, even if the _Route all LAN IPv4 connections_ option is enabled. +Se esta configuração estiver ativada, o AdGuard filtrará todas as conexões LAN, incluindo o tráfego de rede IPv4 local, mesmo que a opção _Rotear todas as conexões LAN IPv4_ esteja ativada. #### Rotear todas as conexões LAN IPv4 -Se esta configuração estiver ativada, o AdGuard excluirá as conexões LAN da filtragem de redes simples. Isso pode não funcionar para redes complexas. This setting only applies if _Forcibly route LAN IPv4_ is disabled. +Se esta configuração estiver ativada, o AdGuard excluirá as conexões LAN da filtragem de redes simples. Isso pode não funcionar para redes complexas. Esta configuração só se aplica se _Forçar roteamento LAN IPv4_ estiver desativado. #### Endereço IPv6 -Aqui você pode inserir o endereço de IP que será usado para criar uma interface TUN. The default value is `2001:db8:ad:0:ff::`. +Aqui você pode inserir o endereço de IP que será usado para criar uma interface TUN. O valor padrão é `2001:db8:ad:0:ff::`. ### Diversos #### Mostrar as ferramentas para desenvolvedores na tela principal -If this setting is enabled, AdGuard will display the **Developer tools** icon in the upper right corner of the app’s home screen. +Se esta configuração estiver ativada, o AdGuard exibirá o ícone de **Ferramentas de desenvolvedor** no canto superior direito da tela inicial do aplicativo. -**Developer tools** is a specialized section available in AdGuard for Android v4.3 and later, designed for quick navigation and switching between features. Ele permite que você ative ou desative rapidamente filtros personalizados, acesse registros, ative vários registros e muito mais. +**Ferramentas de desenvolvedor** é uma seção especializada disponível no AdGuard para Android v4.3 e posterior, projetada para navegação rápida e alternância entre funcionalidades. Ele permite que você ative ou desative rapidamente filtros personalizados, acesse registros, ative vários registros e muito mais. #### Detectar Samsung Pay -Se esta configuração estiver ativada, a proteção do AdGuard será pausada quando você abrir o aplicativo Samsung Pay. Korean users require this feature as they experience [issues with Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea) when AdGuard is enabled. +Se esta configuração estiver ativada, a proteção do AdGuard será pausada quando você abrir o aplicativo Samsung Pay. Os usuários coreanos precisam desse recurso, pois enfrentam [problemas com o Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea) quando o AdGuard está ativado. diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 9d3e5b2620d..bf7e6e58acf 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -31,7 +31,7 @@ _Nível de registro_ define quais dados sobre a operação do aplicativo devem s ![Avançado \*mobile_border](https://cdn.adtidy.org/blog/new/vshfnadvanced.png) -A seção _Configurações de baixo nível_ é para usuários experientes. [Read more about low-level settings](/adguard-for-android/features/low-level-settings/) +A seção _Configurações de baixo nível_ é para usuários experientes. [Leia mais sobre configurações de baixo nível](/adguard-for-android/features/low-level-settings/) ![Configurações de baixo nível \*mobile_border](https://cdn.adtidy.org/blog/new/n9ztplow_level.png) @@ -39,7 +39,7 @@ A seção _Configurações de baixo nível_ é para usuários experientes. [Read Esta seção permite gerenciar configurações de filtragem HTTPS, filtros e scripts de usuário e configurar um servidor proxy. -![Filtragem \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filtros @@ -57,102 +57,110 @@ Se você ativar muitos filtros, alguns sites poderão funcionar incorretamente. [Leia mais sobre filtros](https://adguard.com/en/blog/what-are-filters.html) -### Userscripts +### Extensões -Userscripts são miniprogramas escritos em JavaScript que estendem a funcionalidade de um ou mais sites. Para instalar userscripts, você precisa de um gerenciador de userscript especial. O AdGuard tem essa funcionalidade e permite que você adicione scripts de usuário por URL ou a partir de um arquivo. +Extensions allow you to add userscripts and userstyles. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) + +Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. + +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra -AdGuard Extra é um script de usuário personalizado que bloqueia anúncios complexos e mecanismos que reinjetam anúncios em sites. +AdGuard Extra is a custom userscript that blocks complex ads and mechanisms that reinject ads to websites. -#### Desativar AMP +#### Disable AMP -Desativar AMP é um script de usuário que desativa [Accelerated mobile pages](https://en.wikipedia.org/wiki/Accelerated_Mobile_Pages) na página de resultados de pesquisa do Google. +Disable AMP is a userscript that disables [Accelerated mobile pages](https://en.wikipedia.org/wiki/Accelerated_Mobile_Pages) on the Google search results page. ### Rede #### Filtragem HTTPS -Para bloquear anúncios e rastreadores na maioria dos sites e aplicativos, o AdGuard precisa filtrar o tráfego HTTPS. [Leia mais sobre filtragem HTTPS](/general/https-filtering/what-is-https-filtering) +To block ads and trackers on most websites and in most apps, AdGuard needs to filter their HTTPS traffic. [Read more about HTTPS filtering](/general/https-filtering/what-is-https-filtering) -##### Certificados de segurança +##### Security certificates -Para gerenciar o tráfego criptografado, o AdGuard instala seu certificado CA no seu dispositivo. É seguro: o tráfego é filtrado localmente e o AdGuard verifica a segurança da conexão. +To manage encrypted traffic, AdGuard installs its CA certificate on your device. It's safe: the traffic is filtered locally and AdGuard verifies the security of the connection. -Nas versões mais antigas do Android, o certificado é instalado automaticamente. No Android 11 e posterior, você precisa instalá-lo manualmente. [Instruções de instalação](/adguard-for-android/solving-problems/manual-certificate/) +On older versions of Android, the certificate is installed automatically. On Android 11 and later, you need to install it manually. [Installation instructions](/adguard-for-android/solving-problems/manual-certificate/) -O certificado CA no armazenamento do usuário é suficiente para filtrar o tráfego HTTPS em navegadores e alguns aplicativos. No entanto, existem aplicativos que confiam apenas nos certificados do armazenamento do sistema. Para filtrar o tráfego HTTPS lá, você precisa instalar o certificado CA do AdGuard no armazenamento do sistema. [Instruções](/adguard-for-android/solving-problems/https-certificate-for-rooted/) +The CA certificate in the user store is enough to filter HTTPS traffic in browsers and some apps. However, there are apps that only trust certificates from the system store. To filter HTTPS traffic there, you need to install AdGuard's CA certificate into the system store. [Instructions](/adguard-for-android/solving-problems/https-certificate-for-rooted/) -##### Aplicativos filtrados por HTTPS +##### HTTPS-filtered apps -Esta seção contém a lista de aplicativos para os quais o AdGuard filtra o tráfego HTTPS. Observe que a configuração só pode ser aplicada a todos os aplicativos se você tiver certificados CA no armazenamento do usuário e no armazenamento do sistema. +This section contains the list of apps for which AdGuard filters HTTPS traffic. Please note that the setting can be applied for all apps only if you have CA certificates both in the user store and in the system store. -##### Sites filtrados por HTTPS +##### HTTPS-filtered websites -Esta configuração permite gerenciar sites para os quais o AdGuard deve filtrar o tráfego HTTPS. +This setting allows you to manage websites for which AdGuard should filter HTTPS traffic. -A filtragem HTTPS permite que o AdGuard filtre o conteúdo de solicitações e respostas, mas nunca coletamos ou armazenamos esses dados. No entanto, para aumentar a segurança, [excluímos sites que contêm informações potencialmente confidenciais da filtragem HTTPS](/general/https-filtering/what-is-https-filtering/#financial-websites-and-websites-with-sensitive-personal-data). +HTTPS filtering allows AdGuard to filter the content of requests and responses, but we never collect or store this data. However, to increase security, we [exclude websites that contain potentially sensitive information from HTTPS filtering](/general/https-filtering/what-is-https-filtering/#financial-websites-and-websites-with-sensitive-personal-data). -Você também pode adicionar sites que considere necessários às exclusões, selecionando um dos modos: +You can also add websites that you consider necessary to exclusions by selecting one of the modes: -- Excluir sites específicos da filtragem HTTPS -- Filtre o tráfego HTTPS apenas nos sites adicionados às exclusões +- Exclude specific websites from HTTPS filtering +- Filter HTTPS traffic only on the websites added to exclusions -Por padrão, também não filtramos sites com certificados de Validação Estendida (EV), como sites financeiros. Se necessário, você pode ativar a opção _Filtrar sites com certificados EV_. +By default, we also do not filter websites with Extended Validation (EV) certificates, such as financial websites. Se necessário, você pode ativar a opção _Filtrar sites com certificados EV_. #### Proxy -Você pode configurar o AdGuard para rotear todo o tráfego do seu dispositivo através do seu servidor proxy. [Como configurar um proxy de saída](/adguard-for-android/solving-problems/outbound-proxy) +You can set up AdGuard to route all your device's traffic through your proxy server. [How to set up an outbound proxy](/adguard-for-android/solving-problems/outbound-proxy) -Nesta seção, você também pode configurar uma VPN de terceiros para aue funcione com o AdGuard, se o seu provedor de VPN permitir. +In this section, you can also set up a third-party VPN to work with AdGuard, if your VPN provider allows it. -Em _Aplicativos que operam por meio de proxy_, você pode selecionar aplicativos que encaminharão o tráfego por meio do proxy especificado. Se você tiver a _Integração com AdGuard VPN_ ativada, esta configuração desempenha o papel das exclusões de aplicativos do AdGuard VPN: permite que você especifique aplicativos a serem roteados através do túnel AdGuard VPN. +Under _Apps operating through proxy_, you can select apps that will route their traffic through your specified proxy. If you have _Integration with AdGuard VPN_ enabled, this setting plays the role of AdGuard VPN's app exclusions: it allows you to specify apps to be routed through the AdGuard VPN tunnel. -#### Modo de roteamento +#### Routing mode -Esta seção permite selecionar o método de filtragem de tráfego. +This section allows you to select the traffic filtering method. -- _VPN local_ filtra o tráfego por meio de uma VPN criada localmente. Este é o modo mais confiável. Devido às restrições do Android, é também o único método de filtragem de tráfego em todo o sistema disponível em dispositivos sem acesso root. +- _Local VPN_ filters traffic through a locally created VPN. This is the most reliable mode. Due to Android restrictions, it is also the only system-wide traffic filtering method available on non-rooted devices. :::note -O modo _VPN local_ não permite que o AdGuard seja usado simultaneamente com outras VPNs. Para usar outra VPN com AdGuard, você precisa reconfigurá-la para funcionar em modo proxy e configurar um proxy de saída no AdGuard. Para AdGuard VPN, isso é feito automaticamente com a ajuda do [_modo integrado_](/adguard-for-android/features/integration-with-vpn). +The _Local VPN_ mode doesn't allow AdGuard to be used simultaneously with other VPNs. To use another VPN with AdGuard, you need to reconfigure it to work in proxy mode and set up an outbound proxy in AdGuard. For AdGuard VPN, this is done automatically with the help of the [_Integrated mode_](/adguard-for-android/features/integration-with-vpn). ::: -- _Proxy automático_ é um método alternativo de roteamento de tráfego que não requer o uso de VPN. Uma vantagem significativa é que ele pode ser executado em paralelo com uma VPN. Este modo requer acesso root. +- _Automatic proxy_ is an alternative traffic routing method that does not require the use of a VPN. One significant advantage is that it can be run in parallel with a VPN. This mode requires root access. -- _Proxy manual_ envolve a configuração de um servidor proxy em uma porta específica, que pode então ser configurada nas configurações de Wi-Fi. Este modo requer acesso root para Android 10 e superior. +- _Manual proxy_ involves setting up a proxy server on a specific port, which can then be configured in Wi-Fi settings. This mode requires root access for Android 10 and above. ## Licença -Nesta seção você pode encontrar informações sobre sua licença e gerenciá-la: +In this section, you can find information about your license and manage it: -- Compre uma licença do AdGuard para ativar [os recursos da versão completa](/adguard-for-android/features/free-vs-full) -- Faça login em sua conta AdGuard ou insira a chave de licença para ativar sua licença -- Inscreva-se para ativar seu período de teste de 7 dias, caso ainda não o tenha usado -- Atualize o status da licença no menu de três pontos (⋮) -- Abra a conta AdGuard para gerenciar sua licença lá -- Redefina sua licença. Por exemplo, se você atingiu o limite de dispositivos para esta licença e deseja aplicar outra +- Buy an AdGuard license to activate [the full version's features](/adguard-for-android/features/free-vs-full) +- Log in to your AdGuard account or enter the license key to activate your license +- Sign up to activate your 7-day trial period if you haven't used it yet +- Refresh the license status from the three-dots menu (⋮) +- Open the AdGuard account to manage your license there +- Reset your license — for example, if you've reached device limit for this license and want to apply another one -![Tela de licença \*mobile_border](https://cdn.adtidy.org/blog/new/3wyh5hlicense.png) +![License screen \*mobile_border](https://cdn.adtidy.org/blog/new/3wyh5hlicense.png) ## Suporte -Use esta seção se tiver dúvidas ou sugestões sobre o AdGuard para Android. Recomendamos consultar o _[FAQ](https://adguard.com/support/adguard_for_android.html)_ ou esta base de conhecimento antes de entrar em contato com o suporte. +Use this section if you have any questions or suggestions regarding AdGuard for Android. We recommend consulting _[FAQ](https://adguard.com/support/adguard_for_android.html)_ or this knowledge base before contacting support. -![Suporte \*mobile_border](https://cdn.adtidy.org/blog/new/cz55usupport.png) +![Support \*mobile_border](https://cdn.adtidy.org/blog/new/cz55usupport.png) -Se você notar um anúncio perdido, denuncie-o por meio de _Relatar bloqueio incorreto_. +If you notice a missed ad, please report it via _Report incorrect blocking_. -Em caso de comportamento inesperado do aplicativo, selecione _Reportar um bug_. Se possível, descreva seu problema detalhadamente e adicione logs de aplicativos. [Como descrever um problema](/guides/report-bugs/#how-to-describe-a-problem) +For unexpected app behavior, select _Report a bug_. If possible, describe your problem in detail and add app logs. [How to describe an issue](/guides/report-bugs/#how-to-describe-a-problem) -Para dar sugestões, use _Solicitar um recurso_. +For your suggestions, use _Request a feature_. :::note -O GitHub é uma forma alternativa de relatar bugs e sugerir novos recursos. [Instruções e links de repositório](/guides/report-bugs/#adguard-for-android) +GitHub is an alternative way to report bugs and suggest new features. [Instructions and repository links](/guides/report-bugs/#adguard-for-android) ::: diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index d82ab5f3c39..2f0eabee8d1 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: Como instalar o AdGuard para Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 8337f9ead12..196d310e957 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: Como desativar o recurso Auto Blocker da Samsung -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index 6a2b5775478..6e28a70ed68 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: Como proteger o AdGuard de ser desativado pelo sistema -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 6ae2a2e426d..8f88cf68a1f 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ Acesse-a ao navegar até *Estatísticas* → *Uso da bateria*. Dentro dele, você encontrará um gráfico que mostra o consumo de recursos da bateria do AdGuard nas últimas 24 horas, com uma opção para obter dados mais detalhados de hora em hora tocando no gráfico. Além disso, há também uma análise numérica dos dados relevantes e uma breve explicação técnica. +Existem vários outros parâmetros abaixo do gráfico: *CPU em primeiro plano*, *CPU em segundo plano*, *Uso de dados móveis* e *Uso de dados Wi-Fi*. + +*CPU em primeiro plano* e *CPU em segundo plano* mostram quanto tempo de CPU é usado pelo AdGuard quando o app está ativo ou em execução em segundo plano. + +E com o *uso de dados móveis* e *uso de dados Wi-Fi*, você pode ver quanto tráfego o AdGuard consumiu quando seu celular estava usando Internet móvel ou conectado ao Wi-Fi. + ### Quanto da bateria o AdGuard realmente consome? Primeiro, vamos estabelecer um pouco de teoria e links com os dados necessários. diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index d7ad3b11535..70a8ccd003b 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Problemas de compatibilidade conhecidos com aplicativos Android -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index 7580eab3806..3e17cf129f6 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problemas causados pela extensão de configurações restritas -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ Este artigo aborda o AdGuard para Android, um bloqueador de anúncios multifunci ::: -Em um esforço para melhorar a privacidade do usuário, o Google expandiu as configurações de restrição no Android 15. Mais configurações, como _Acesso ao uso do aplicativo_, agora exigem uma permissão adicional para serem ativadas. Como os recursos _[Firewall](/adguard-for-android/features/protection/firewall)_ e _[Detectar Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ exigem que a configuração _Acesso ao uso do app_ esteja ativada para que funcionem corretamente, você pode ter tido problemas ao usá-los. Para resolver esses problemas, siga as etapas abaixo: +Em um esforço para melhorar a privacidade do usuário, o Google expandiu as configurações de restrição no Android 15. Mais configurações, como _Acesso ao uso do aplicativo_, agora exigem uma permissão adicional para serem ativadas. Como os recursos _[Firewall](/adguard-for-android/features/protection/firewall)_ e _[Detectar Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ exigem que a configuração _Acesso ao uso do app_ esteja ativada para que funcionem corretamente, você pode ter tido problemas ao usá-los. To resolve these issues, please follow the steps below. :::note @@ -17,20 +17,44 @@ O AdGuard tem uma política rigorosa de não registro, o que significa que não ::: -1. No seu dispositivo Android, abra o **aplicativo Configurações**. -2. Toque em **Aplicativos**. -3. Toque em **AdGuard** +## Basic instructions -![AdGuard em aplicativos \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted1.png) +1. On your Android device, open the **Settings app**. +2. Tap **Apps**. +3. Tap **AdGuard** -Se você não conseguir encontrá-lo, primeiro toque em **Ver todos os aplicativos** ou **Informações do aplicativo**. +![AdGuard in Apps \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted1.png) -1. Toque em **Mais** (⁝) → _Permitir configurações restritas_. +If you can't find it, first tap **See all apps** or **App info**. -![Permitir configurações restritas \*celular](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted2.png) +1. Tap **More** (⁝) → _Allow restricted settings_. -Siga as instruções na tela. +![Allow restricted settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted2.png) -Tudo pronto! Agora os recursos _Firewall_ e _Detectar Samsung Pay_ funcionarão corretamente. +Follow the on-screen instructions. -![Configurações restritas permitidas para AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) +All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. + +![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index 62cb343ebbd..996954c6ca0 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Instalação manual do certificado de segurança no navegador Firefox -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index 6ec695d93c6..f30be1c7061 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Mover o certificado CA para o armazenamento do sistema em dispositivos com root -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index ae71ae0e044..bf04fae1974 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Instalação do certificado em dispositivos com Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 5fb556bc57a..2c0a49fd772 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problemas causados por múltiplos perfis de usuário -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 8a980aa3748..764df3a131a 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: Como configurar o proxy de saída -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index 23205b20aac..8f0ef884d09 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: Como usar o Samsung Pay com o AdGuard na Coreia do Sul -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 4a2ef43037a..0d00eb5811b 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Instalação do certificado em uma pasta segura -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index 5bc418d4aed..aef112a33e6 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: Como bloquear anúncios no aplicativo YouTube -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index f4519c6518d..79816da25ee 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,88 +5,150 @@ sidebar_position: 2 ## Instalando o AdGuard para Linux -Para instalar o AdGuard, digite: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Versão estável +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` -Se necessário, digite sua senha de administrador. +If required, enter your admin password. -Pressione `y` para criar um link em `/usr/local/bin` para o executável e aguarde até que a instalação esteja concluída. +Press `y` to create a link in `/usr/local/bin` to the executable and wait until the installation is complete. :::note -Você pode verificar a assinatura para provar que é uma versão oficial do AdGuard usando a ferramenta `gpg`. [Leia mais no GitHub](https://github.com/AdguardTeam/AdGuardCLI?tab=readme-ov-file#verify-releases) +You can verify the signature to prove it’s an official version of AdGuard by using the `gpg` tool. [Read more on GitHub](https://github.com/AdguardTeam/AdGuardCLI?tab=readme-ov-file#verify-releases) ::: -## Ativar licença +## Initial setup -O AdGuard para Linux requer uma [licença do AdGuard](https://adguard.com/license.html). Se você ainda não tem uma licença, pode registrar-se ou criar uma conta para obter um teste gratuito de 14 dias. Se você já possui uma licença, faça login para ativá-la. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -Para fazer login ou criar uma conta, digite: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -Para redefinir sua licença, insira: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -Para visualizar as informações da licença, digite: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Configuração inicial +4. After activation, you can continue to work with the program: -Para colocar o AdGuard em funcionamento, conclua as configurações iniciais. Isso inclui a instalação do Certificado CA do AdGuard, a ativação dos filtros necessários e a seleção do modo proxy. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -Para executar o assistente de configuração, digite: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` -## Desinstalando o AdGuard para Linux + or view the license info by entering -Para desinstalar o AdGuard, digite: + ```sh + adguard-cli license + ``` -Versão estável +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: -``` + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). + +## Uninstall AdGuard for Linux + +To uninstall AdGuard, enter: + +Release + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` -Se necessário, digite sua senha de administrador. +If required, enter your admin password. diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index fe84199ce94..22d81933e60 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Gerenciamento das configurações e da proteção sidebar_position: 3 --- +## Available commands + Para obter uma lista de todos os comandos disponíveis no AdGuard, digite: -``` +```sh adguard-cli --help-all ``` ## Ativar e desativar a proteção +### Enable protection + Para ativar a proteção, insira: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + Para desativar a proteção, digite: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + Para visualizar o status da proteção, digite: -``` +```sh adguard-cli status ``` -## Verificar atualizações +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Verificar atualizações Para verificar se há atualizações, digite: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + Para atualizar o AdGuard para Linux, digite: -``` +```sh adguard-cli update ``` +### Update script output + Para visualizar o output do script de atualização, digite: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Use o comando `config` para configurar o AdGuard para Linux. Subcomandos: - `show`: Mostra a configuração atual em `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configura uma opção em `proxy.yaml` - `listen_ports.http_proxy`: Porta de escuta HTTP - `proxy_mode`: Modo de proxy (`manual` ou `auto`) + - `get`: Obtém o status atual das opções acima ## Gerenciamento de filtros @@ -64,8 +90,32 @@ Use o comando `config` para configurar o AdGuard para Linux. Subcomandos: Use o comando `filters` para configurar o AdGuard para Linux. Subcomandos: - `list`: Listar filtros instalados + - `--all`: Ver todos os filtros + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `instalar`: Instalar um filtro. Digite a URL da filtragem que você deseja instalar + - `enable`: Ativa um filtro. Digite o nome ou ID do filtro + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Desabilita um filtro. Digite o nome ou ID do filtro + - `update`: Atualiza os filtros + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index 77ecad3aac7..18b29b7c7e4 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ Esta página descreve os recursos e detalhes sobre a gestão central de polític ## 1. Baixe o MSI {#msi-download} -Baixe o [AdGuard MSI x86](https://cdn.adtidy.org/distr/windows/AdGuard_x86.msi) +Baixe o [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Baixe o [AdGuard MSI x64](https://cdn.adtidy.org/distr/windows/AdGuard_x64.msi) +Baixe o [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configure as configurações da sua rede {#settings-configuring} diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index 0b6cb38c9a1..7b6acd087aa 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ O conversor Safari suporta um subconjunto substancial de [regras básicas](#basi - `$replace` - `$urltransform` -#### Regras cosméticas +#### Cosmetic rules {#cosmetic-rules-safari-limitations} O Safari Converter suporta a maioria das [regras cosméticas](#cosmetic-rules), embora apenas as regras de ocultação de elementos com seletores CSS básicos sejam suportadas nativamente via bloqueio de conteúdo do Safari; tudo o mais precisa ser interpretado por uma extensão adicional. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### Regras de filtragem HTML +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [Regras de filtragem HTML](#html-filtering-rules) **não são compatíveis** e não o serão no futuro. Infelizmente, Safari não fornece as capacidades técnicas necessárias para implementá-las. @@ -396,8 +396,8 @@ Os seguintes modificadores são os mais simples e frequentemente usados. Basicam | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ Os seguintes modificadores são os mais simples e frequentemente usados. Basicam - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — recurso que está planejado para ser implementado, mas ainda não está disponível em nenhum produto - ❌ — not supported ::: @@ -579,7 +578,7 @@ O Safari não permite o uso simultâneo de domínios permitidos e não permitido :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modificador \ Produtos | [Aplicativos do CoreLibs][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard para iOS][ios-app] | [AdGuard para Safari][ext-saf] | [Bloqueador de conteúdo do AdGuard][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:---------------------------:|:------------------------------:|:-------------------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modificador \ Produtos | [Aplicativos do CoreLibs][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard para iOS][ios-app] | [AdGuard para Safari][ext-saf] | [Bloqueador de conteúdo do AdGuard][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:---------------------------:|:------------------------------:|:-------------------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — recurso que está planejado para ser implementado, mas ainda não está disponível em nenhum produto - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. Por exemplo: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + é convertido para + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2928,11 +3017,11 @@ Modifier aliases (`1p`, `3p`, etc.) are not included in these categories, howeve - [`$to`](#to-modifier), - restricted [content-types](#content-type-modifiers) with `~`. -Ao lidar com um domínio negado, aplicativo, método ou tipo de conteúdo, adicionamos **1 ponto** pela existência do modificador em si, independentemente da quantidade de domínios ou tipos de conteúdo negados. Isto ocorre porque o escopo da regra já é infinitamente amplo. De forma simples, ao proibir vários domínios, tipos de conteúdo, métodos ou aplicativos, o escopo da regra se torna apenas minimamente menor. +When dealing with a negated domain, app, method, or content-type, we add **1 point** for the existence of the modifier itself, regardless of the quantity of negated domains or content-types. This is because the rule's scope is already infinitely broad. Put simply, by prohibiting multiple domains, content-types, methods or apps, the scope of the rule becomes only minimally smaller. #### Modificadores de tipo de conteúdo definidos, métodos definidos, cabeçalhos definidos, $all, $popup, exceções específicas {#priority-category-2} -Todos os tipos de conteúdo válidos: +All valid content types: @@ -2949,15 +3038,15 @@ Todos os tipos de conteúdo válidos: - [`$websocket`](#websocket-modifier), - [`$xmlhttprequest`](#xmlhttprequest-modifier); -Isso também inclui regras que adicionam implicitamente todos os tipos de conteúdo: +This also includes rules that implicitly add all content types: - [`$all`](#all-modifier); -Ou regras que implicitamente adicionam o modificador `$document`: +Or rules that implicitly add the modifier `$document`: - [`$popup`](#popup-modifier); -Ou algumas exceções específicas que adicionam implicitamente `$document,subdocument`: +Or some specific exceptions that implicitly add `$document,subdocument`: @@ -2970,25 +3059,25 @@ Ou algumas exceções específicas que adicionam implicitamente `$document,subdo - [`$specifichide`](#specifichide-modifier), - [`$urlblock`](#urlblock-modifier); -Ou métodos permitidos via [`$method`](#method-modifier). +Or allowed methods via [`$method`](#method-modifier). -Ou regras com [`$header`](#header-modifier). +Or rules with [`$header`](#header-modifier). -A presença de quaisquer modificadores de tipo de conteúdo adiciona `(50 + 50 / N)`, onde `N` é o número de modificadores presentes, por exemplo: `||example.com^$image,script` adicionará `50 + 50 / 2 = 50 + 25 = 75` ao peso total da regra. +The presence of any content-type modifiers adds `(50 + 50 / N)`, where `N` is the number of modifiers present, for example: `||example.com^$image,script` will add `50 + 50 / 2 = 50 + 25 = 75` to the total weight of the rule. The `$all` also belongs to this category, because it implicitly adds all content-type modifiers, e.g., `$document,subdocument,image,script,media,` + `$popup`. -O `$popup` também pertence a esta categoria porque adiciona implicitamente o modificador `$document`. Da mesma forma, exceções específicas adicionam `$document,subdocument`. +The `$popup` also belongs to this category, because it implicitly adds the modifier `$document`. Similarly, specific exceptions add `$document,subdocument`. -Se houver um modificador `$method` na regra com métodos permitidos, ele adiciona `(50 + 50 / N)`, onde `N` é o número de métodos permitidos, por exemplo: `||example.com^$method=GET|POST|PUT` adicionará `50 + 50 / 3 = 50 + 16,6 = 67` ao peso total da regra. +If there is a `$method` modifier in the rule with allowed methods it adds `(50 + 50 / N)`, where `N` is the number of methods allowed, for example: `||example.com^$method=GET|POST|PUT` will add `50 + 50 / 3 = 50 + 16.6 = 67` to the total weight of the rule. -Se houver um modificador `$header` na regra, ele adiciona `50`. +If there is a `$header` modifier in the rule, it adds `50`. #### `$domain` ou `$app` com domínios ou aplicativos permitidos {#priority-category-3} -Domínios especificados através de `$domain` ou aplicativos especificados através de `$app` adicionam `100 + 100 / N`, onde `N` é o número de valores modificadores, por exemplo: `||example.com^$domain=example.com|example.org|example.net` adicionará `100 + 100 / 3 = 134,3 = 135` ou `||example.com^$app=org.example.app1|org.example.app2` adicionará `100 + 100 / 2 = 151` ou `||example.com^$domain=example.com,app=org.example.app1|org.example.app2` adicionará `100 + 100/1` (parte $domain) e `100 + 100/2` (parte $app), totalizando `350`. +Specified domains through `$domain` or specified applications through `$app` add `100 + 100 / N`, where `N` is the number of modifier values for example: `||example.com^$domain=example.com|example.org|example.net` will add `100 + 100 / 3 = 134.3 = 135` or `||example.com^$app=org.example.app1|org.example.app2` will add `100 + 100 / 2 = 151` or `||example.com^$domain=example.com,app=org.example.app1|org.example.app2` will add `100 + 100/1` ($domain part) and `100 + 100/2` ($app part), totaling `350`. -Os valores do modificador que são expressões regulares ou tld serão interpretados como entradas normais do tipo `example.com` e contados um por um, por exemplo: `||example.com^$domain=example.*` adicionarão `100 + 100 / 1 = 200` ou `||example.com^$domain=example.*|adguard.*` adicionarão `100 + 100 / 2 = 150`. +Modifier values that are regexps or tld will be interpreted as normal entries of the form `example.com` and counted one by one, for example: `||example.com^$domain=example.*` will add `100 + 100 / 1 = 200` or `||example.com^$domain=example.*|adguard.*` will add `100 + 100 / 2 = 150`. #### `$redirect` regras {#priority-category-6} @@ -2997,7 +3086,7 @@ Os valores do modificador que são expressões regulares ou tld serão interpret - [`$redirect`](#redirect-modifier), - [`$redirect-rule`](#redirect-rule-modifier). -Cada um deles adiciona `10^3` à prioridade da regra. +Each of which adds `10^3` to rule priority. #### Exceções específicas {#priority-category-4} @@ -3012,15 +3101,15 @@ Cada um deles adiciona `10^3` à prioridade da regra. - [`$specifichide`](#specifichide-modifier), - [`$urlblock`](#urlblock-modifier); -Cada um dos quais adiciona `10^4` à prioridade. +Each of which adds `10^4` to the priority. -Assim como a exceção com [`$document modifier`](#document-modifier): porque é um alias para `$elemhide,content,jsinject,urlblock,extensão`. Ele adicionará `10^4` para cada modificador da [lista superior](#priority-category-4), `10^4 * 5` no total. +As well as exception with [`$document modifier`](#document-modifier): because it's an alias for `$elemhide,content,jsinject,urlblock,extension`. It will add `10^4` for each modifier from [the top list](#priority-category-4), `10^4 * 5` in total. -Além disso, cada uma dessas exceções adiciona implicitamente os dois modificadores de tipo de conteúdo permitidos `$document,subdocument`. +In addition, each of these exceptions implicitly adds the two allowed content-type modifiers `$document,subdocument`. #### Regras da lista de permissões {#priority-category-5} -O modificador `@@` adiciona `10^5` à prioridade da regra. +Modifier `@@` adds `10^5` to rule priority. #### Regras `$important` {#priority-category-7} @@ -3094,7 +3183,7 @@ However, basic rules may not be enough to block ads. Sometimes you need to hide ::: -## Regras cosméticas {#cosmetic-rules} +## Cosmetic rules {#cosmetic-rules} :::info @@ -3140,11 +3229,11 @@ Element hiding rules are not dependent on each other. If there is a rule `exampl **Limitações** -O Safari não é compatível com domínios permitidos e não permitidos. Portanto, as regras como `example.org,~foo.example.org##.textad` são inválidas no AdGuard para Safari. +Safari does not support both allowed and disallowed domains. So the rules like `example.org,~foo.example.org##.textad` are invalid in AdGuard for Safari. **Exceptions** -As exceções podem desativar algumas regras em domínios específicos. Elas são muito semelhantes às regras de exceção habituais, mas em vez de `##` você deve usar `#@#`. +Exceptions can disable some rules on particular domains. They are very similar to usual exception rules, but instead of `##` you have to use `#@#`. For example, there is a rule in filter: @@ -3158,23 +3247,23 @@ If you want to disable it for `example.com`, you can create an exception rule: example.com#@#.textad ``` -Sometimes, it may be necessary to disable all restriction rules. Por exemplo, para realizar testes. Para isso, use a regra de exclusão sem especificar um domínio. Ele desativará completamente a regra elemhide CSS correspondente em TODOS os domínios: +Sometimes, it may be necessary to disable all restriction rules. For example, to conduct tests. To do this, use the exclusion rule without specifying a domain. It will completely disable matching CSS elemhide rule on ALL domains: ```adblock #@#.textad ``` -O mesmo pode ser alcançado adicionando esta regra: +The same can be achieved by adding this rule: ```adblock *#@#.textad ``` -Recomendamos usar esse tipo de exceção somente se não for possível alterar a própria regra de ocultação. In other cases it is better to change the original rule, using domain restrictions. +We recommend to use this kind of exceptions only if it is not possible to change the hiding rule itself. In other cases it is better to change the original rule, using domain restrictions. ### Regras CSS {#cosmetic-css-rules} -Às vezes, simplesmente ocultar um elemento não é suficiente para lidar com a publicidade. Por exemplo, bloquear um elemento de publicidade pode apenas quebrar o layout da página. Neste caso, o AdGuard pode usar regras que são muito mais flexíveis do que regras de ocultação. Com essas regras, você pode basicamente adicionar qualquer estilo CSS à página. +Sometimes, simple hiding of an element is not enough to deal with advertising. For example, blocking an advertising element can just break the page layout. In this case AdGuard can use rules that are much more flexible than hiding rules. With these rules you can basically add any CSS styles to the page. **Syntax** @@ -3184,8 +3273,8 @@ domains = [domain0, domain1[, ...[, domainN]]] ``` - **`selector`** — [CSS selector](https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Getting_Started/Selectors), that defines the elements we want to apply the style to. -- **`domains`** — domain restriction for the rule. Os mesmos princípios que nas [regras de ocultação de elementos](#cosmetic-elemhide-rules). -- **`style`** — estilo CSS que queremos aplicar aos elementos selecionados. +- **`domains`** — domain restriction for the rule. Same principles as in [element hiding rules](#cosmetic-elemhide-rules). +- **`style`** — CSS style, that we want to apply to selected elements. **Examples** @@ -3197,7 +3286,7 @@ This rule will apply a style `background-color: #333!important;` to the `body` e **Exceptions** -Assim como na ocultação de elementos, há um tipo de regras que desativam a regra de estilo CSS selecionada para domínios específicos. A sintaxe da regra de exceção é quase a mesma, você só precisa mudar `#$#` para `#@$#`. +Just like with element hiding, there is a type of rules that disable the selected CSS style rule for particular domains. Exception rule syntax is almost the same, you just have to change `#$#` to `#@$#`. For example, there is a rule in filter: @@ -3215,41 +3304,41 @@ We recommend to use this kind of exceptions only if it is not possible to change :::caution Restrictions -Estilos que levam ao carregamento de qualquer recurso são proibidos. Basicamente, isso significa que você não pode usar nenhum valor do tipo `` no estilo. +Styles that lead to loading any resource are forbidden. Basically, it means that you cannot use any `` type of value in the style. ::: :::info Compatibility -As regras CSS não são suportadas pelo Bloqueador de conteúdo AdGuard. +CSS rules are not supported by AdGuard Content Blocker. -As regras de CSS podem operar de maneira diferente [dependendo da plataforma](#cosmetic-rules-priority). +CSS rules may operate differently [depending on the platform](#cosmetic-rules-priority). ::: ### Seletores CSS Estendidos {#extended-css-selectors} - [Limitações](#extended-css-limitations) -- [Pseudo-classe `:has()`](#extended-css-has) -- [Pseudo-classe `:contains()`](#extended-css-contains) -- [Pseudo-classe `:matches-css()`](#extended-css-matches-css) -- [Pseudo-classe `:matches-attr()`](#extended-css-matches-attr) -- [Pseudo-classe `:matches-property()`](#extended-css-property) -- [Pseudo-classe `:xpath()`](#extended-css-xpath) -- [Pseudo-classe `:nth-ancestor()`](#extended-css-nth-ancestor) -- [Pseudo-classe `:upward()`](#extended-css-upward) -- [Pseudo-classe `:remove()` e pseudo-propriedade `remover`](#remove-pseudos) -- [Pseudo-classe `:is()`](#extended-css-is) -- [Pseudo-classe `:not()`](#extended-css-not) -- [Pseudo-classe `:if-not()` (excluída)](#extended-css-if-not) +- [Pseudo-class `:has()`](#extended-css-has) +- [Pseudo-class `:contains()`](#extended-css-contains) +- [Pseudo-class `:matches-css()`](#extended-css-matches-css) +- [Pseudo-class `:matches-attr()`](#extended-css-matches-attr) +- [Pseudo-class `:matches-property()`](#extended-css-property) +- [Pseudo-class `:xpath()`](#extended-css-xpath) +- [Pseudo-class `:nth-ancestor()`](#extended-css-nth-ancestor) +- [Pseudo-class `:upward()`](#extended-css-upward) +- [Pseudo-class `:remove()` and pseudo-property `remove`](#remove-pseudos) +- [Pseudo-class `:is()`](#extended-css-is) +- [Pseudo-class `:not()`](#extended-css-not) +- [Pseudo-class `:if-not()` (removed)](#extended-css-if-not) -CSS 3.0 não é sempre suficiente para bloquear anúncios. Para resolver esse problema, o AdGuard estende as capacidades do CSS ao adicionar suporte para os novos pseudo-elementos. Desenvolvemos uma [biblioteca de código aberto](https://github.com/AdguardTeam/ExtendedCss) separada para seleção de elementos não padronizados e aplicação de estilos CSS com propriedades estendidas. +CSS 3.0 is not always enough to block ads. To solve this problem AdGuard extends CSS capabilities by adding support for the new pseudo-elements. We have developed a separate [open-source library](https://github.com/AdguardTeam/ExtendedCss) for non-standard element selecting and applying CSS styles with extended properties. -A ideia de capacidades estendidas é uma oportunidade de combinar elementos do DOM com seletores com base em sua própria representação (estilo, conteúdo de texto, etc.) ou relações com outros elementos. Há também uma oportunidade de aplicar estilos com propriedades CSS não padrão. +The idea of extended capabilities is an opportunity to match DOM elements with selectors based on their own representation (style, text content, etc.) or relations with other elements. There is also an opportunity to apply styles with non-standard CSS properties. -**Área do aplicativo** +**Application area** -Seletores Estendidos podem ser usados em qualquer regra cosmética, sejam elas [regras de ocultação de elementos](#cosmetic-elemhide-rules) ou [regras CSS](#cosmetic-css-rules). +Extended selectors can be used in any cosmetic rule, whether they are [element hiding rules](#cosmetic-elemhide-rules) or [CSS rules](#cosmetic-css-rules). :::info Compatibility @@ -3293,7 +3382,7 @@ Pseudo-class names are case-insensitive, e.g. `:HAS()` works as `:has()`. Still 2. Specific pseudo-class may have its own limitations: [`:has()`](#extended-css-has-limitations), [`:xpath()`](#extended-css-xpath-limitations), [`:nth-ancestor()`](#extended-css-nth-ancestor-limitations), [`:upward()`](#extended-css-upward-limitations), [`:is()`](#extended-css-is-limitations), [`:not()`](#extended-css-not-limitations), and [`:remove()`](#extended-css-remove-limitations). -#### Pseudo-classe `:has()` {#extended-css-has} +#### Pseudo-class `:has()` {#extended-css-has} Draft CSS 4.0 specification describes the [`:has()` pseudo-class](https://www.w3.org/TR/selectors-4/#relational). Unfortunately, [it is not yet supported](https://caniuse.com/css-has) by all popular browsers. @@ -3396,7 +3485,7 @@ Native implementation does not allow any usage of `:scope` inside the `:has()` a ::: -#### Pseudo-classe `:contains()` {#extended-css-contains} +#### Pseudo-class `:contains()` {#extended-css-contains} The `:contains()` pseudo-class principle is very simple: it allows to select the elements that contain specified text or which content matches a specified regular expression. Regexp flags are supported. @@ -3522,7 +3611,7 @@ Obsolete pseudo-classes `:matches-css-before()` and `:matches-css-after()` are n ::: -#### Pseudo-classe `:matches-attr()` {#extended-css-matches-attr} +#### Pseudo-class `:matches-attr()` {#extended-css-matches-attr} The `:matches-attr()` pseudo-class allows selecting an element by its attributes, especially if they are randomized. @@ -3549,21 +3638,21 @@ For **regexp** patterns `"` and `\` should be **escaped**, e.g. `div:matches-att
``` -`div:matches-attr("data-*"="adBanner")` seleciona o elemento `div#target2`: +`div:matches-attr("data-*"="adBanner")` selects the element `div#target2`: ```html
``` -`div:matches-attr(*unit*=/^click$/)` seleciona o elemento `div#target3`: +`div:matches-attr(*unit*=/^click$/)` selects the element `div#target3`: ```html
``` -`*:matches-attr("/.{5,}delay$/"="/^[0-9]*$/")` seleciona o elemento `#target4`: +`*:matches-attr("/.{5,}delay$/"="/^[0-9]*$/")` selects the element `#target4`: ```html @@ -3574,13 +3663,13 @@ For **regexp** patterns `"` and `\` should be **escaped**, e.g. `div:matches-att :::caution Restrictions -Padrões Regexp **não são compatíveis** com flags. +Regexp patterns **do not support** flags. ::: -#### Pseudo-classe `:matches-property()` {#extended-css-property} +#### Pseudo-class `:matches-property()` {#extended-css-property} -A pseudo-classe `:matches-property()` permite selecionar um elemento correspondendo às suas propriedades. +The `:matches-property()` pseudo-class allows selecting an element by matching its properties. **Syntax** @@ -3653,7 +3742,7 @@ Regexp patterns **do not support** flags. ::: -#### Pseudo-classe `:xpath()` {#extended-css-xpath} +#### Pseudo-class `:xpath()` {#extended-css-xpath} The `:xpath()` pseudo-class allows selecting an element by evaluating an XPath expression. @@ -3692,7 +3781,7 @@ Works properly only at the end of selector, except for [pseudo-class :remove()]( ``` -#### Pseudo-classe `:nth-ancestor()` {#extended-css-nth-ancestor} +#### Pseudo-class `:nth-ancestor()` {#extended-css-nth-ancestor} The `:nth-ancestor()` pseudo-class allows to lookup the *nth* ancestor relative to the previously selected element. @@ -3737,7 +3826,7 @@ For such DOM: `.child:nth-ancestor(1)` selects the element `div#target1`, `div[class="inner"]:nth-ancestor(3)` selects the element `div#target2`. -#### Pseudo-classe `:upward()` {#extended-css-upward} +#### Pseudo-class `:upward()` {#extended-css-upward} The `:upward()` pseudo-class allows to lookup the ancestor relative to the previously selected element. @@ -3777,7 +3866,7 @@ For such DOM: `.inner:upward(div[data])` selects the element `div#target1`, `.inner:upward(div[id])` selects the element `div#target2`, `.child:upward(1)` selects the element `div#target1`, `.inner:upward(3)` selects the element `div#target2`. -#### Pseudo-classe `:remove()` e pseudo-propriedade `remover` {#remove-pseudos} +#### Pseudo-class `:remove()` and pseudo-property `remove` {#remove-pseudos} Sometimes, it is necessary to remove a matching element instead of hiding it or applying custom styles. In order to do it, you can use the `:remove()` pseudo-class as well as the `remove` pseudo-property. @@ -3819,7 +3908,7 @@ Rules with the `remove` pseudo-property must use `#$?#` marker: `$` for CSS-styl ::: -#### Pseudo-classe `:is()` {#extended-css-is} +#### Pseudo-class `:is()` {#extended-css-is} The `:is()` pseudo-class allows to match any element that can be selected by any of selectors passed to it. Invalid selectors are skipped and the pseudo-class deals with valid ones with no error thrown. Our implementation of the [native `:is()` pseudo-class](https://developer.mozilla.org/en-US/docs/Web/CSS/:is). @@ -3865,7 +3954,7 @@ Due to limitations `:is(*:not([class]) > .banner)'` does not work but `:is(*:not ``` -#### Pseudo-classe `:not()` {#extended-css-not} +#### Pseudo-class `:not()` {#extended-css-not} The `:not()` pseudo-class allows to select elements which are *not matched* by selectors passed as argument. Invalid argument selectors are not allowed and error is to be thrown. Our implementation of the [`:not()` pseudo-class](https://developer.mozilla.org/en-US/docs/Web/CSS/:not). @@ -3901,7 +3990,7 @@ The `:not()` is considered as a standard CSS pseudo-class inside the argument of ``` -#### Pseudo-classe `:if-not()` (excluída) {#extended-css-if-not} +#### Pseudo-class `:if-not()` (removed) {#extended-css-if-not} :::danger Removal notice @@ -3921,7 +4010,7 @@ The way **element hiding** and **CSS rules** are applied is platform-specific. **Extended CSS selectors** use JavaScript to work and basically add an inline style themselves, therefore they can override any style. -## Regras de filtragem HTML {#html-filtering-rules} +## HTML filtering rules {#html-filtering-rules} In most cases, the basis and cosmetic rules are enough to filter ads. But sometimes it is necessary to change the HTML-code of the page itself before it is loaded. This is when you need filtering rules for HTML content. They allow to indicate the HTML elements to be cut out before the browser loads the page. @@ -4060,7 +4149,7 @@ This special attribute may become unsupported in the future. Prefer using the `: ::: -Specifies the minimum length for content of HTML element. Se este parâmetro estiver definido e o comprimento do conteúdo for menor que o valor predefinido, uma regra não se aplica ao elemento. +Specifies the minimum length for content of HTML element. If this parameter is set and the content length is less than preset value, a rule does not apply to the element. Por exemplo: @@ -4068,11 +4157,11 @@ Por exemplo: $$div[tag-content="banner"][min-length="400"] ``` -Esta regra irá remover todos os elementos `div`, cujo código contém a substring `banner` e cujo comprimento excede `400` caracteres. +This rule will remove all the `div` elements, whose code contains the substring `banner` and the length of which exceeds `400` characters. :::caution Limitations -O atributo especial `min-length` não deve aparecer em um seletor à esquerda de um combinador `>`. +The `min-length` special attribute must not appear in a selector to the left of a `>` combinator. ::: @@ -4094,27 +4183,27 @@ ou :::note Compatibility -`:-abp-contains()` e `:has-text()` são sinônimos para `:contains()`. +`:-abp-contains()` and `:has-text()` are synonyms for `:contains()`. ::: :::info Compatibility -A pseudoclasse `:contains()` é compatível com o AdGuard para Windows, Mac e Android com [CoreLibs][] v1.13 ou posterior. +The `:contains()` pseudo-class is supported by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.13 or later. ::: -Requer que o HTML interno do elemento contenha o texto especificado ou corresponda à expressão regular especificada. +Requires that the inner HTML of the element contains the specified text or matches the specified regular expression. :::caution Limitations -Uma pseudo-classe `:contains()` não deve aparecer em um seletor à esquerda de um combinador `>`. +A `:contains()` pseudo-class must not appear in a selector to the left of a `>` combinator. ::: ### Exceptions -Assim como nas regras de ocultação, há um tipo especial de regras que desativam a regra de filtragem HTML selecionada para domínios específicos. A sintaxe é a mesma, você só precisa mudar `$$` para `$@$`. +Similar to hiding rules, there is a special type of rules that disable the selected HTML filtering rule for particular domains. The syntax is the same, you just have to change `$$` to `$@$`. For example, there is a rule in filter: @@ -4128,19 +4217,19 @@ If you want to disable it for `example.com`, you can create an exception rule: example.com$@$script[tag-content="banner"] ``` -Sometimes, it may be necessary to disable all restriction rules. Por exemplo, para realizar testes. Para isso, use a regra de exclusão sem especificar um domínio. +Sometimes, it may be necessary to disable all restriction rules. For example, to conduct tests. To do this, use the exclusion rule without specifying a domain. ```adblock $@$script[tag-content="banner"] ``` -Recomendamos usar esse tipo de exceção somente se não for possível alterar a própria regra de ocultação. In other cases it is better to change the original rule, using domain restrictions. +We recommend to use this kind of exceptions only if it is not possible to change the hiding rule itself. In other cases it is better to change the original rule, using domain restrictions. ## JavaScript rules {#javascript-rules} -O AdGuard oferece um tipo especial de regras que permite injetar qualquer código JavaScript nas páginas dos sites. +AdGuard supports a special type of rules that allows you to inject any JavaScript code to websites pages. -Nós **recomendamos fortemente** o uso de [scriptlets](#scriptlets) em vez de regras JavaScript sempre que possível. As regras do JS devem ajudar na depuração, mas como uma solução de longo prazo, uma regra de script deve ser usada. +We **strongly recommend** using [scriptlets](#scriptlets) instead of JavaScript rules whenever possible. JS rules are supposed to help with debugging, but as a long-time solution a scriptlet rule should be used. **Syntax** @@ -4148,8 +4237,8 @@ Nós **recomendamos fortemente** o uso de [scriptlets](#scriptlets) em vez de re rule = [domains] "#%#" script ``` -- **`domains`** — restrição de domínio para a regra. Os mesmos princípios que nas [regras de ocultação de elementos](#cosmetic-elemhide-rules). -- **`script`** — código JavaScript arbitrário **em uma string**. +- **`domains`** — domain restriction for the rule. Same principles as in [element hiding rules](#cosmetic-elemhide-rules). +- **`script`** — arbitrary JavaScript code **in one string**. **Examples** @@ -4157,7 +4246,7 @@ rule = [domains] "#%#" script **Exceptions** -Similar to hiding rules, there is a special type of rules that disable the selected JavaScript rule for particular domains. A sintaxe é a mesma, você só precisa mudar `#%#` para `#@%#`. +Similar to hiding rules, there is a special type of rules that disable the selected JavaScript rule for particular domains. The syntax is the same, you just have to change `#%#` to `#@%#`. For example, there is a rule in filter: @@ -4171,63 +4260,63 @@ If you want to disable it for `example.com`, you can create an exception rule: example.com#@%#window.__gaq = undefined; ``` -Sometimes, it may be necessary to disable all restriction rules. Por exemplo, para realizar testes. Para isso, use a regra de exclusão sem especificar um domínio. +Sometimes, it may be necessary to disable all restriction rules. For example, to conduct tests. To do this, use the exclusion rule without specifying a domain. ```adblock #@%#window.__gaq = undefined; ``` -Recomendamos usar esse tipo de exceção somente se não for possível alterar a própria regra de ocultação. In other cases it is better to change the original rule, using domain restrictions. +We recommend to use this kind of exceptions only if it is not possible to change the hiding rule itself. In other cases it is better to change the original rule, using domain restrictions. :::caution Restrictions -As regras de JavaScript só podem ser usadas [**em filtros confiáveis**](#trusted-filters). +JavaScript rules can only be used [**in trusted filters**](#trusted-filters). ::: :::info Compatibility -As regras JavaScript não são compatíveis com o Bloqueador de conteúdo AdGuard. +JavaScript rules are not supported by AdGuard Content Blocker. ::: ## Regras de scriptlets {#scriptlets} -Scriptlet é uma função JavaScript que fornece capacidades estendidas para bloqueio de conteúdo. Essas funções podem ser usadas de maneira declarativa nas regras de filtragem do AdGuard. +Scriptlet is a JavaScript function that provides extended capabilities for content blocking. These functions can be used in a declarative manner in AdGuard filtering rules. :::note -AdGuard oferece suporte a muitos scriptlets diferentes. Para alcançar a compatibilidade entre bloqueadores, também oferecemos suporte à sintaxe do uBO e ABP. +AdGuard supports a lot of different scriptlets. In order to achieve cross-blocker compatibility, we also support syntax of uBO and ABP. ::: -**Sintaxe das regras de bloqueio** +**Blocking rules syntax** ```text [domains]#%#//scriptlet(name[, arguments]) ``` -- `domains` — opcional, uma lista de domínios onde a regra deve ser aplicada; +- `domains` — optional, a list of domains where the rule should be applied; - `name` — required, a name of the scriptlet from the AdGuard Scriptlets library; -- `arguments` — opcional, uma lista de `string` argumentos (nenhum outro tipo de argumento é suportado). +- `arguments` — optional, a list of `string` arguments (no other types of arguments are supported). **Examples** -1. Aplique o `abort-on-property-read` scriptlet em todas as páginas de `example.org` e seus subdomínios, e passe um argumento `alert`: +1. Apply the `abort-on-property-read` scriptlet on all pages of `example.org` and its subdomains, and pass it an `alert` argument: ```adblock example.org#%#//scriptlet('abort-on-property-read', 'alert') ``` -1. Remova a classe `branding` de todos os elementos `div[class^="inner"]` em todas as páginas de `example.org` e seus subdomínios: +1. Remove the `branding` class from all `div[class^="inner"]` elements on all pages of `example.org` and its subdomains: ```adblock example.org#%#//scriptlet('remove-class', 'branding', 'div[class^="inner"]') ``` -**Sintaxe das regras de exceção** +**Exception rules syntax** -As regras de exceção podem desativar alguns scriptlets em domínios específicos. A sintaxe para regras de scriptlet de exceção é semelhante às regras normais de scriptlet, mas usa `#@%#` em vez de `#%#`: +Exception rules can disable some scriptlets on particular domains. The syntax for exception scriptlet rules is similar to normal scriptlet rules but uses `#@%#` instead of `#%#`: ```text [domains]#@%#//scriptlet([name[, arguments]]) @@ -4239,28 +4328,28 @@ As regras de exceção podem desativar alguns scriptlets em domínios específic **Examples** -1. Desativar regra de scriptlet específica para que apenas `abort-on-property-read` seja aplicada somente em `example.org` e seus subdomínios: +1. Disable specific scriptlet rule so that only `abort-on-property-read` is applied only on `example.org` and its subdomains: ```adblock example.org,example.com#%#//scriptlet("abort-on-property-read", "alert") example.com#@%#//scriptlet("abort-on-property-read", "alert") ``` -1. Desativar todos os `abort-on-property-read` scriptlets para `example.com` e seus subdomínios: +1. Disable all `abort-on-property-read` scriptlets for `example.com` and its subdomains: ```adblock example.org,example.com#%#//scriptlet("abort-on-property-read", "alert") example.com#@%#//scriptlet("abort-on-property-read") ``` -1. Desativar todos os scriptlets para `example.com` e seus subdomínios: +1. Disable all scriptlets for `example.com` and its subdomains: ```adblock example.org,example.com#%#//scriptlet("abort-on-property-read", "alert") example.com#@%#//scriptlet() ``` -1. Aplique `set-constant` e `set-cookie` a qualquer página web, mas devido à regra de exceção de scriptlet especial apenas o scriptlet `set-constant` será aplicado em `example.org` e seus subdomínios: +1. Apply `set-constant` and `set-cookie` to any web page, but due to special scriptlet exception rule only the `set-constant` scriptlet will be applied on `example.org` and its subdomains: ```adblock #%#//scriptlet('set-constant', 'adList', 'emptyArr') @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "Extensão de navegador AdGuard para Chrome MV3" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/ad-filtering/how-ad-blocking-works.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/ad-filtering/how-ad-blocking-works.md index f10541226c7..aaa6f25f30f 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/ad-filtering/how-ad-blocking-works.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/ad-filtering/how-ad-blocking-works.md @@ -51,7 +51,7 @@ Every web page has a Document Object Model (DOM), an HTML document containing th This method allows you to avoid above-mentioned blank spaces and ad leftovers, as well as perform other more complicated tasks. -### Regras de filtragem HTML +### HTML filtering rules In most cases, it's enough to use the above-mentioned basic and cosmetic rules to filter ads. But when it is necessary to change the HTML code of the page itself before it is loaded, you need filtering rules for HTML content. These rules allow you to specify the HTML elements to be cut out before the browser even loads the page. diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/extensions.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/extensions.md index 2a752134cc5..53b54ab67dd 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/extensions.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/extensions.md @@ -39,7 +39,7 @@ Essa versão do Assistente é antiga e não faz sentido usá-la em novos sistema ::: -#### Desativar AMP +#### Disable AMP Um script pré-instalado apenas no AdGuard para Android. Ele desativa o AMP (Accelerated Mobile Pages) na página de resultados de pesquisa do Google. Saiba mais sobre este userscript e como instalá-lo no [GitHub](https://github.com/AdguardTeam/DisableAMP). diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/license/legacy.md index 3ea4aa0bdd3..9b4e6244378 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: Perguntas frequentes sobre licenças herdadas sidebar_position: 6 --- -Escrevemos este artigo para evitar confusão e explicar em detalhes como você pode renovar/atualizar uma licença AdGuard desatualizada (herdada). +Escrevemos este artigo para evitar confusão e explicar em detalhes como você pode renovar/atualizar uma licença AdGuard desatualizada (obsoleta). -## Sobre as licenças desatualizadas +## Sobre as licenças obsoleta Inicialmente, licenças dos seguintes tipos estavam disponíveis para ativar os produtos AdGuard: @@ -27,54 +27,52 @@ Para todos os tipos (Standard, Mobile, Premium) havia opções de licença anual Em outubro de 2019, o AdGuard mudou para o novo sistema de licenciamento: a partir de então, as licenças ainda podem ser compradas por 1 ano ou Vitalícia, mas seus tipos passaram a ser **Pessoal** (para até 3 dispositivos) ou **Familiar** (para até 9 dispositivos). -Mais uma alteração: **chaves de licença do novo tipo agora podem ser usadas em qualquer dispositivo, em qualquer combinação. Por exemplo, uma licença Pessoal pode ser usada no Android, Mac e iOS, assim como em dois computadores Windows e um tablet Apple.** +Outra mudança é que os **novos tipos de chaves de licença agora podem ser usadas em qualquer dispositivo, em qualquer combinação**. Por exemplo, uma licença Personal pode ser usada no Android, Windows e iOS, assim como em dois computadores Windows e um tablet Apple. -## O que aconteceu com as licenças desatualizadas? +## O que aconteceu com as licenças obsoletas? -As Standard automaticamente se tornaram universais, o que significa que podem ser ativadas em quaisquer dispositivos. +**Licenças padrão** foram automaticamente transformadas em **universais**, o que significa que podem ser ativadas em qualquer dispositivo. -As licenças móveis permaneceram inalteradas e limitadas por plataforma (elas ainda podem ser usadas apenas em telefones ou tablets). +**Licenças para dispositivos móveis** permaneceram inalteradas e limitadas por plataforma (elas ainda podem ser usadas apenas em telefones ou tablets). -As licenças premium também permaneceram inalteradas e limitadas por plataforma. E embora as **licenças Premium agora sejam exibidas em sua conta pessoal pelo número total de dispositivos**, elas ainda podem ser ativadas no conjunto de dispositivos desktop + móvel. +**Licenças premium** também permaneceram inalteradas e limitadas por plataforma. E embora as **licenças Premium agora sejam exibidas em sua conta pessoal pelo número total de dispositivos**, elas ainda podem ser ativadas no conjunto de dispositivos desktop + móvel. Por exemplo, é assim que a tecla 1+1 aparece: -![Chave 1+1](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![Chave 1+1](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *Mas, apesar do número total de dispositivos (2), ela pode ser ativada em 1 desktop e 1 dispositivo móvel.* > Todas as licenças desatualizadas têm um selo "herdada" na conta do AdGuard. E elas são convertidas automaticamente para um novo tipo quando você as renova ou atualiza. Mas existem algumas nuances. Vamos ver quais licenças podem ser convertidas para um novo tipo e como fazer isso. -## Eu tenho uma chave desatualizada (herdada). Quais opções de renovação/atualização estão disponíveis para mim? +## Como renovar ou atualizar uma chave obsoleta -Você pode verificar isso na [página de renovação](https://adguard.com/renew.html) ou na sua [conta AdGuard](https://adguardaccount.com/main.html): +Você pode estender/renovar ou atualizar uma licença obsoleta em sua [conta AdGuard](https://adguardaccount.com) ou na [página de extensão ou upgrade](https://adguard.com/renew.html). -![Fazer upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Vá para a guia "Minhas licenças" e verifique quais ações estão disponíveis para você para cada chave específica. Explicaremos a seguir com exemplos específicos. +Para estender/renovar ou atualizar uma licença obsoleta na sua conta AdGuard, vá para a aba *Licenças*, encontre a licença necessária e selecione uma das opções disponíveis. -### Licenças para 1/2/3 dispositivos +![Renove ou atualize uma licença em sua conta AdGuard](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**As licenças anuais** para 1, 2, 3 dispositivos podem ser convertidas para Pessoal ou Familiar: +Ou vá para a [página Estender ou fazer um upgrade](https://adguard.com/renew.html), insira sua licença e clique em *Aplicar*. Na nova página, selecione uma das opções disponíveis. -![Atualizar ou renovar](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Escolha com base em quantos dispositivos você precisa proteger. +### Licenças para 1/2/3 dispositivos -Em vez de renovação, você pode mudar para Vitalícia: +Licenças anuais para 3 dispositivos celulares podem ser convertidas para licenças pessoais ou atualizadas para licenças familiares: -![Vitalícia](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Atualizar licenças anuais para 1, 2, 3 dispositivos](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**As licenças vitalícias** só podem ser convertidas para Familiar (9 dispositivos) devido a limitações técnicas: +> Se você tiver uma **licença padrão para 3 dispositivos**, ela já funciona como a **Personal**. Se você renovar sua **licença móvel** para 3 dispositivos, você poderá usá-la em um **conjunto diferente de dispositivos**, não apenas em celulares. -![Atualização vitalícia](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +Você pode também atualizar sua licença para Vitalícia: -### Licenças para 4+ dispositivos (até 9) +![Atualizar para Vitalício](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**As chaves anuais** desta configuração só podem ser convertidas em uma licença Familiar: +As **licenças vitalícias** só podem ser atualizadas para Familiar (9 dispositivos) devido a limitações técnicas. -![Licença anual para 4 dispositivos](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licenças para 4+ dispositivos (até 9) -**As licenças vitalícias** para 4 ou mais dispositivos não podem ser atualizadas devido a limitações técnicas: +Licenças **anuais** para 4 ou mais dispositivos podem ser atualizadas para as licenças Familiar e Vitalícia. -![Licença vitalícia para 4 dispositivos](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +No entanto, se você já possui uma licença **Vitalícia**, o upgrade não pode ser feito devido a limitações técnicas. ### Licenças para mais de 9 dispositivos diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/license/what-is.md index 96428361d66..eaffe266bd3 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ Existem também licenças que o usuário pode adquirir de outras fontes ou obter - **As licenças para distribuidores** e **licenças de presente** podem ou não ser limitadas por tempo. Licenças com data de validade só podem ser renovadas manualmente - Individual: até 3 dispositivos - Familiar: até 9 dispositivos -- **A licença do AdGuard Pro para iOS** é adquirida e gerenciada por meio da App Store e só pode ser usada em dispositivos iOS e iPadOS com o mesmo ID Apple +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::dica diff --git a/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/stealth-mode.md b/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/stealth-mode.md index 3b9f2886ab8..88222c9b943 100644 --- a/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/stealth-mode.md +++ b/i18n/pt-BR/docusaurus-plugin-content-docs/current/general/stealth-mode.md @@ -3,7 +3,7 @@ title: Modo invisível (Proteção contra rastreamento) sidebar_position: 4 --- -Muitos sites coletam informações sobre seus visitantes, como endereço IP, navegador instalado e sistema operacional, resolução de tela e até mesmo a página da qual o visitante foi redirecionado. Algumas páginas web utilizam cookies para marcar o seu navegador e guardar as suas configurações e preferências pessoais, ou para “reconhecê-lo” na sua próxima visita. *Tracking protection* safeguards your personal information from such data- and statistics-gathering systems. +Muitos sites coletam informações sobre seus visitantes, como endereço IP, navegador instalado e sistema operacional, resolução de tela e até mesmo a página da qual o visitante foi redirecionado. Algumas páginas web utilizam cookies para marcar o seu navegador e guardar as suas configurações e preferências pessoais, ou para “reconhecê-lo” na sua próxima visita. A *Proteção contra rastreamento* protege suas informações pessoais desses sistemas de coleta de dados e estatísticas. Você pode ajustar de forma flexível o funcionamento do Modo Sigiloso: por exemplo, você pode proibir o site de receber a solicitação de pesquisa que você usou para encontrá-lo na Internet, excluir automaticamente os cookies de terceiros e do próprio site, desativar o compartilhamento de geolocalização do navegador que pode ser usado para rastrear seu paradeiro e ocultar seu verdadeiro endereço IP ou até mesmo substituí-lo por um aleatório. @@ -95,7 +95,7 @@ Você também pode definir um valor arbitrário para o Referer inserindo-o no ca Observe que, para poder filtrar o tráfego, os aplicativos AdGuard "interceptam" as solicitações do navegador para o servidor. As solicitações para servidores de anúncios, rastreamento e phishing podem ser alteradas antes de serem enviadas ao servidor ou bloqueadas completamente. O mesmo vale para a opção *Ocultar referenciador de terceiros*: o AdGuard intercepta solicitações HTTP(S), em particular para remover ou alterar o cabeçalho do referenciador se esta opção estiver habilitada. No entanto, isso só acontece depois que essas solicitações "saem" do navegador. Isso significa que, se você monitorar o Referer dentro do navegador (por exemplo, com a ajuda das Ferramentas de Desenvolvedor do Chrome), você verá o Referer original porque a solicitação ainda não chegou ao AdGuard. Você pode usar software como [Fiddler](https://www.telerik.com/fiddler) para garantir que o Referer seja alterado corretamente. -Due to the nature of all web browser extensions, AdGuard Browser Extension instead works 'inside' the web browser. Ela alterará o Referer ali mesmo, então as Ferramentas do Desenvolvedor mostrarão o Referer desejado para suas solicitações. +Devido à natureza de todas as extensões de navegador, a Extensão do AdGuard para navegador funciona "dentro" do navegador. Ela alterará o Referer ali mesmo, então as Ferramentas do Desenvolvedor mostrarão o Referer desejado para suas solicitações. ### Ocultar User-Agent {#useragent} diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index b2503a46e1d..6dbf209da44 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ The _Low-level settings_ section is for expert users. [Read more about low-level This section allows you to manage HTTPS filtering settings, filters, and userscripts, and set up a proxy server. -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filters @@ -57,11 +57,19 @@ If you activate too many filters, some websites may work incorrectly. [Read more about filters](https://adguard.com/en/blog/what-are-filters.html) -### Scripts de utilizador +### Extensions + +Extensions allow you to add userscripts and userstyles. + +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 5e75a51f1e8..b5525cd735c 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 24b41b032ca..8f7344f7ade 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index da99768471a..0341d942127 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: How to protect AdGuard from being disabled by the system -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 7367e63cef9..784a7c9587c 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ You can access it by navigating to *Statistics* → *Battery usage*. Inside you will find a chart that shows the AdGuard battery resource consumption within the last 24 hours, with an option to get more detailed hour-to-hour data by tapping on the chart. Besides that, there’s also a numeric breakdown of the relevant data and a short technical explanation. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### How much battery resource does AdGuard really consume? First, let us lay down a bit of theory and links with necessary data. diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 6f1876d0079..0563d2a0336 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index d98274a0489..c77491236e7 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index deebee15677..c716cc3ed93 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Manual installation of the security certificate into the Firefox browser -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index c5b7755321a..05d28c3b6ea 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 54b325ec582..52016424603 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 79723d1f221..b9f70d23922 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problems caused by multiple user profiles -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 6b9fddc4500..f95d206303e 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: How to set up outbound proxy -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index b9e9396152a..4ae364e8290 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 96b31c31295..25de8d83319 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index adfd7139869..5d8aa06bad9 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: How to block ads in the YouTube app -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 43c9e9aee82..67126401ab4 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,23 +5,25 @@ sidebar_position: 2 ## Install AdGuard for Linux -To install AdGuard, enter: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` @@ -35,37 +37,97 @@ You can verify the signature to prove it’s an official version of AdGuard by u ::: -## Activate license +## Initial setup -AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don't have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -To log in or create an account, enter: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -To reset your license, enter: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -To view the license info, enter: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Initial setup +4. After activation, you can continue to work with the program: -To get AdGuard up and running, complete the initial setup. This includes installing the AdGuard CA certificate, enabling the necessary filters, and selecting the proxy mode. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -To run the configuration wizard, enter: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). ## Uninstall AdGuard for Linux @@ -73,19 +135,19 @@ To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 4ede8a490a1..2487dcaac3b 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Settings and protection management sidebar_position: 3 --- +## Available commands + To get a list of all available AdGuard commands, enter: -``` +```sh adguard-cli --help-all ``` ## Enable and disable protection +### Enable protection + To enable protection, enter: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + To disable protection, enter: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + To view the protection status, enter: -``` +```sh adguard-cli status ``` -## Check for updates +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Check for updates To check for updates, enter: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + To update AdGuard for Linux, enter: -``` +```sh adguard-cli update ``` +### Update script output + To view the update script output, enter: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Use the `config` command to configure AdGuard for Linux. Subcommands: - `show`: Show the current configuration in `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configure an option in `proxy.yaml` - - `listen_ports.http_proxy`: HTTP listening port - - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `listen_ports.http_proxy`: HTTP listening port + - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `get`: Get the current status of the above options ## Manage filters @@ -64,8 +90,32 @@ Use the `config` command to configure AdGuard for Linux. Subcommands: Use the `filters` command to configure AdGuard for Linux. Subcommands: - `list`: List installed filters - - `--all`: View all filters + + - `--all`: View all filters + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Install a filter. Enter the URL of the filter you want to install + - `enable`: Enable a filter. Enter the name or ID of the filter + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Disable a filter. Enter the name or ID of the filter + - `update`: Update filters + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index 412685edf25..86c048ff7a0 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ This page describes the features and details of AdGuard’s central management o ## 1. Download the MSI {#msi-download} -Download the [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi) +Download the [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Download the [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi) +Download the [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configure the settings for your network {#settings-configuring} diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/pt/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index fcf7b09e90e..d8558e99ed4 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + is converted to + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-ff]: #what-product "AdGuard Browser Extension for Firefox" diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/pt/docusaurus-plugin-content-docs/current/general/license/legacy.md index 6b1c2a74395..1e68e937061 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: Legacy licenses FAQ sidebar_position: 6 --- -We have written this article to avoid confusion and explain in detail how you can renew/upgrade an outdated (legacy) AdGuard license. +We have written this article to avoid confusion and explain in detail how you can renew/upgrade a legacy AdGuard license. -## About the outdated licenses +## About legacy licenses Initially licenses of the following types were available to activate AdGuard products: @@ -27,54 +27,52 @@ For all types (Standard, Mobile, Premium) there were options for a Yearly and Li In October 2019 AdGuard switched to the new licensing system: from then on, licenses can still be purchased for 1 year or Lifetime, but their types have become **Personal** (for up to 3 devices) or **Family** (for up to 9 devices). -One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal license can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet.** +Another change is that the **new types of license keys can now be used on any device, in any combination**. For example, a Personal license can be used on Android, Mac and iOS, as well as on two Windows computers and an Apple tablet. -## What happened to the outdated licenses? +## What happened to the legacy licenses? -Standard were automatically made universal, which means that they can be activated on any devices. +**Standard licenses** were automatically made **universal**, which means that they can be activated on any device. -Mobile licenses remained unchanged and platform-limited (they can still only be used on phones or tablets). +**Mobile licenses** remained unchanged and platform-limited (they can still only be used on phones or tablets). -Premium licenses also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. +**Premium licenses** also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. For example, this is how the 1+1 key looks like: -![1+1 key](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 key](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *But despite the total number of devices (2) it can be activated on 1 desktop and 1 mobile device.* > All the outdated licenses have a "legacy" badge in the AdGuard account. And they are automatically converted to a new type when you either renew or upgrade them. But there are some nuances. Let's see which licenses can be converted to a new type and how to do it. -## I have an outdated (legacy) key. What renewal/upgrade options are available for me? +## How to renew or upgrade a legacy key -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +You can extend/renew or upgrade a legacy license in your [AdGuard account](https://adguardaccount.com) or on the [Extend or upgrade page](https://adguard.com/renew.html). -![Upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Go to "My licenses" tab and check what actions are available to you for each specific key. Below we will explain with specific examples. +To extend/renew or upgrade a legacy license in your AdGuard account, go to the *Licenses* tab, find the license you need, and select one of the available options. -### Licenses for 1/2/3 devices +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Yearly** licenses for 1, 2, 3 devices can be converted to either Personal or Family: +Or go to the [Extend or upgrade page](https://adguard.com/renew.html), enter your license, and click *Apply*. On the new page, select one of the available options. -![Upgrade or renew](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Choose based on how many devices you need to protect. +### Licenses for 1/2/3 devices -Instead of renewal you can switch to Lifetime: +Mobile Yearly licenses for 3 devices can be converted to Personal licenses or upgraded to Family ones: -![Lifetime](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Upgrade Yearly licenses for 1, 2, 3 devices](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Lifetime** licenses can only be converted to Family (9 devices) due to technical limitations: +> If you have a **Standard license for 3 devices**, it already works as a **Personal** license. If you renew your **Mobile license** for 3 devices, you will be able to use it on a **different set of device**s, not just phones. -![Lifetime upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +You can also upgrade your license to Lifetime: -### Licenses for 4+ devices (up to 9) +![Upgrade to Lifetime](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Yearly** keys of this configuration can only be converted into a Family license: +**Lifetime** licenses can only be upgraded to Family (9 devices) due to technical limitations. -![Yearly license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licenses for 4+ devices (up to 9) -**Lifetime** licenses for 4 or more devices cannot be upgraded due to technical limitation: +**Yearly** licenses for 4 or more devices can be upgraded to Family and Lifetime licenses. -![Lifetime license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +However, if you already have a **Lifetime** license, it cannot be upgraded due to technical limitations. ### Licenses for 9+ devices diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/pt/docusaurus-plugin-content-docs/current/general/license/what-is.md index a3b22328a24..fd9fa685ce2 100644 --- a/i18n/pt/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/pt/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ There are also licenses that the user can purchase from other sources or get for - **Distributor licenses** and **gifted licenses** can be both time-limited and non-time limited. Licenses with an expiration date can only be renewed manually - Personal — up to 3 devices - Family — up to 9 devices -- **The AdGuard Pro for iOS license** is purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index e98d019e471..297c1d3ed6b 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ Secțiunea _Setări de nivel scăzut_ este pentru utilizatorii avansați. [Read Această secțiune îți permite să gestionezi setările de filtrare HTTPS, filtrele și script-urile de utilizator, și să configurezi un server proxy. -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filtre @@ -57,84 +57,92 @@ Dacă activezi prea multe filtre, unele site-uri pot funcționa incorect. [Citește mai multe despre filtre](https://adguard.com/en/blog/what-are-filters.html) -### Userscripts +### Extensii -Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. Pentru a instala scripturi de utilizator, ai nevoie de un manager special de scripturi de utilizator. AdGuard are o astfel de funcționalitate și îți permite să adaugi scripturi de utilizator prin URL sau din fișier. +Extensions allow you to add userscripts and userstyles. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) + +Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. + +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra -AdGuard Extra este un script de utilizator personalizat care blochează reclame complexe și mecanisme care reinjectează reclame pe site-uri web. +AdGuard Extra is a custom userscript that blocks complex ads and mechanisms that reinject ads to websites. -#### Dezactivare AMP +#### Disable AMP -Dezactivarea AMP este un script de utilizator care dezactivează [Pagini accelerate pentru mobile](https://en.wikipedia.org/wiki/Accelerated_Mobile_Pages) pe pagina de rezultate Google. +Disable AMP is a userscript that disables [Accelerated mobile pages](https://en.wikipedia.org/wiki/Accelerated_Mobile_Pages) on the Google search results page. ### Rețea #### HTTPS filtering -Pentru a bloca reclame și trackere pe cele mai multe site-uri și în cele mai multe aplicații, AdGuard trebuie să filtreze traficul lor HTTPS. [Citește mai multe despre filtrarea HTTPS](/general/https-filtering/what-is-https-filtering) +To block ads and trackers on most websites and in most apps, AdGuard needs to filter their HTTPS traffic. [Read more about HTTPS filtering](/general/https-filtering/what-is-https-filtering) -##### Certificate de securitate +##### Security certificates -Pentru a gestiona traficul criptat, AdGuard instalează certificatul său CA pe dispozitivul tău. Este sigur: traficul este filtrat local și AdGuard verifică securitatea conexiunii. +To manage encrypted traffic, AdGuard installs its CA certificate on your device. It's safe: the traffic is filtered locally and AdGuard verifies the security of the connection. -Pe versiunile mai vechi de Android, certificatul este instalat automat. Pe Android 11 și versiuni ulterioare, trebuie să-l instalezi manual. [Instrucțiuni de instalare](/adguard-for-android/solving-problems/manual-certificate/) +On older versions of Android, the certificate is installed automatically. On Android 11 and later, you need to install it manually. [Installation instructions](/adguard-for-android/solving-problems/manual-certificate/) -Certificatul CA din stocarea utilizatorului este suficient pentru a filtra traficul HTTPS în browsere și în unele aplicații. Cu toate acestea, există aplicații care au încredere doar în certificatele din stocarea de sistem. Pentru a filtra traficul HTTPS acolo, trebuie să instalezi certificatul CA al AdGuard în stocarea de sistem. [Instrucțiuni](/adguard-for-android/solving-problems/https-certificate-for-rooted/) +The CA certificate in the user store is enough to filter HTTPS traffic in browsers and some apps. However, there are apps that only trust certificates from the system store. To filter HTTPS traffic there, you need to install AdGuard's CA certificate into the system store. [Instructions](/adguard-for-android/solving-problems/https-certificate-for-rooted/) -##### Aplicații filtrate HTTPS +##### HTTPS-filtered apps -Această secțiune conține lista aplicațiilor pentru care AdGuard filtrează traficul HTTPS. Te rugăm să reții că setarea poate fi aplicată pentru toate aplicațiile doar dacă ai certificate CA atât în stocarea utilizatorului, cât și în stocarea de sistem. +This section contains the list of apps for which AdGuard filters HTTPS traffic. Please note that the setting can be applied for all apps only if you have CA certificates both in the user store and in the system store. -##### Site-uri web filtrate HTTPS +##### HTTPS-filtered websites -Această setare îți permite să gestionezi site-urile pentru care AdGuard ar trebui să filtreze traficul HTTPS. +This setting allows you to manage websites for which AdGuard should filter HTTPS traffic. -Filtrarea HTTPS permite AdGuard să filtreze conținutul cererilor și răspunsurilor, dar noi nu colectăm sau stocăm niciodată aceste date. Cu toate acestea, pentru a spori securitatea, [excludem site-urile care conțin informații sensibile din filtrarea HTTPS](/general/https-filtering/what-is-https-filtering/#financial-websites-and-websites-with-sensitive-personal-data). +HTTPS filtering allows AdGuard to filter the content of requests and responses, but we never collect or store this data. However, to increase security, we [exclude websites that contain potentially sensitive information from HTTPS filtering](/general/https-filtering/what-is-https-filtering/#financial-websites-and-websites-with-sensitive-personal-data). -Poți adăuga de asemenea site-uri pe care le consideri necesare excluderilor prin selectarea uneia dintre moduri: +You can also add websites that you consider necessary to exclusions by selecting one of the modes: -- Excluderea anumitor site-uri din filtrarea HTTPS -- Filtrarea traficului HTTPS doar pe site-urile adăugate la excluderi +- Exclude specific websites from HTTPS filtering +- Filter HTTPS traffic only on the websites added to exclusions -Implicit, nu filtrăm de asemenea site-uri cu certificate de validare extinsă (EV), cum ar fi site-urile financiare. Dacă este necesar, puteți activa opțiunea _Filtrați site-urile web cu certificate EV_. +By default, we also do not filter websites with Extended Validation (EV) certificates, such as financial websites. Dacă este necesar, puteți activa opțiunea _Filtrați site-urile web cu certificate EV_. #### Proxy -Poți configura AdGuard să direcționeze tot traficul dispozitivului tău printr-un server proxy. [Cum să configurezi un proxy extern](/adguard-for-android/solving-problems/outbound-proxy) +You can set up AdGuard to route all your device's traffic through your proxy server. [How to set up an outbound proxy](/adguard-for-android/solving-problems/outbound-proxy) In this section, you can also set up a third-party VPN to work with AdGuard, if your VPN provider allows it. -Sub _Aplicații care funcționează prin proxy_, poți selecta aplicații care își vor direcționa traficul prin proxy-ul tău specificat. Dacă ai activat _Integrarea cu AdGuard VPN_, această setare joacă rolul de excluderi ale aplicațiilor pentru AdGuard VPN: îți permite să specifici aplicații care să fie dirijate prin tunelul VPN AdGuard. +Under _Apps operating through proxy_, you can select apps that will route their traffic through your specified proxy. If you have _Integration with AdGuard VPN_ enabled, this setting plays the role of AdGuard VPN's app exclusions: it allows you to specify apps to be routed through the AdGuard VPN tunnel. -#### Mod de rutare +#### Routing mode -Această secțiune îți permite să selectezi metoda de filtrare a traficului. +This section allows you to select the traffic filtering method. -- _VPN local_ filtrează traficul printr-un VPN creat local. Acesta este cel mai fiabil mod. Din cauza restricțiilor Android, este de asemenea singura metodă de filtrare a traficului la nivel de sistem disponibilă pe dispozitivele ne-rădăcinate. +- _Local VPN_ filters traffic through a locally created VPN. This is the most reliable mode. Due to Android restrictions, it is also the only system-wide traffic filtering method available on non-rooted devices. :::note -Modul _VPN local_ nu permite utilizarea AdGuard simultan cu alte VPN-uri. Pentru a folosi un alt VPN cu AdGuard, trebuie să-l reconfigurezi pentru a funcționa în modul proxy și să configurezi un proxy extern în AdGuard. Pentru AdGuard VPN, acest lucru se face automat cu ajutorul [_Modului integrat_](/adguard-for-android/features/integration-with-vpn). +The _Local VPN_ mode doesn't allow AdGuard to be used simultaneously with other VPNs. To use another VPN with AdGuard, you need to reconfigure it to work in proxy mode and set up an outbound proxy in AdGuard. For AdGuard VPN, this is done automatically with the help of the [_Integrated mode_](/adguard-for-android/features/integration-with-vpn). ::: -- _Proxy automat_ este o metodă alternativă de rutare a traficului care nu necesită utilizarea unui VPN. Un avantaj semnificativ este că poate fi rulat în paralel cu un VPN. Acest mod necesită acces root. +- _Automatic proxy_ is an alternative traffic routing method that does not require the use of a VPN. One significant advantage is that it can be run in parallel with a VPN. This mode requires root access. -- _Proxy manual_ implică configurarea unui server proxy pe un port specific, care poate fi apoi configurat în setările Wi-Fi. Acest mod necesită acces root pentru Android 10 și versiuni superioare. +- _Manual proxy_ involves setting up a proxy server on a specific port, which can then be configured in Wi-Fi settings. This mode requires root access for Android 10 and above. ## License -În această secțiune, poți găsi informații despre licența ta și să o gestionezi: +In this section, you can find information about your license and manage it: -- Cumpără o licență AdGuard pentru a activa [caracteristicile versiunii complete](/adguard-for-android/features/free-vs-full) -- Conectează-te la contul tău AdGuard sau introdu cheia de licență pentru a activa licența ta -- Înscrie-te pentru a activa perioada ta de probă de 7 zile dacă nu ai folosit-o încă +- Buy an AdGuard license to activate [the full version's features](/adguard-for-android/features/free-vs-full) +- Log in to your AdGuard account or enter the license key to activate your license +- Sign up to activate your 7-day trial period if you haven't used it yet - Refresh the license status from the three-dots menu (⋮) -- Deschide contul AdGuard pentru a-ți gestiona licența acolo +- Open the AdGuard account to manage your license there - Reset your license — for example, if you've reached device limit for this license and want to apply another one ![License screen \*mobile_border](https://cdn.adtidy.org/blog/new/3wyh5hlicense.png) diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 45df370470a..e4f17a481b8 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: Cum instalez AdGuard pentru Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index db7c79a6799..56411d88096 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index 8e5ecf3faa7..a14ec4179eb 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: How to protect AdGuard from being disabled by the system -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 06e9120b1ea..bca8fbc54b1 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ Cu toate acestea, utilizatorii AdGuard pot obține întotdeauna o imagine clară În interior vei găsi un grafic care arată consumul de resurse al bateriei AdGuard în ultimele 24 de ore, cu o opțiune de a obține date mai detaliate oră de oră atingând graficul. În plus, există o defalcare numerică a datelor relevante și o scurtă explicație tehnică. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### Cât de multă resursă de baterie consumă de fapt AdGuard? În primul rând, să stabilim câteva teorii și legături cu datele necesare. diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index cd09050d2d6..c8b4fe0fe7a 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Probleme cunoscute de compatibilitate cu aplicațiile Android -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index 31a91cb105f..293229a865b 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ Acest articol se referă la AdGuard pentru Android, un blocant de reclame multif ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index 9ddcde684a3..e091b17c199 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Instalare manuală a certificatului de securitate în browserul Firefox -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index 8f3e4b4a88b..09845aec79b 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Mutarea certificatului CA în stocarea sistemului pe dispozitivele cu acces root -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 36fc678fcf6..ea5fd8b10dd 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 5e811c80a9b..ad4f5b98c8c 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Probleme cauzate de mai multe profile de utilizator -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index b1a0f28b994..6f49ff9e5cf 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: Cum să configurați proxy-ul de ieșire -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index 1f49a80f8c9..c758d433177 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: Cum să folosești Samsung Pay cu AdGuard în Coreea de Sud -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 09cad3ea3b7..23b09a3c3d9 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Instalarea certificatului într-un folder sigur -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index 41a57213457..770b667f5f5 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: Cum să blocați reclamele în aplicația YouTube -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 43c9e9aee82..67126401ab4 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,23 +5,25 @@ sidebar_position: 2 ## Install AdGuard for Linux -To install AdGuard, enter: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` @@ -35,37 +37,97 @@ You can verify the signature to prove it’s an official version of AdGuard by u ::: -## Activate license +## Initial setup -AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don't have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -To log in or create an account, enter: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -To reset your license, enter: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -To view the license info, enter: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Initial setup +4. After activation, you can continue to work with the program: -To get AdGuard up and running, complete the initial setup. This includes installing the AdGuard CA certificate, enabling the necessary filters, and selecting the proxy mode. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -To run the configuration wizard, enter: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). ## Uninstall AdGuard for Linux @@ -73,19 +135,19 @@ To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 026db43f85a..ca46161790b 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Settings and protection management sidebar_position: 3 --- +## Available commands + To get a list of all available AdGuard commands, enter: -``` +```sh adguard-cli --help-all ``` ## Enable and disable protection +### Enable protection + To enable protection, enter: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + To disable protection, enter: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + To view the protection status, enter: -``` +```sh adguard-cli status ``` -## Căutare actualizări +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Căutare actualizări To check for updates, enter: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + To update AdGuard for Linux, enter: -``` +```sh adguard-cli update ``` +### Update script output + To view the update script output, enter: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Use the `config` command to configure AdGuard for Linux. Subcommands: - `show`: Show the current configuration in `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configure an option in `proxy.yaml` - `listen_ports.http_proxy`: HTTP listening port - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `get`: Get the current status of the above options ## Manage filters @@ -64,8 +90,32 @@ Use the `config` command to configure AdGuard for Linux. Subcommands: Use the `filters` command to configure AdGuard for Linux. Subcommands: - `list`: List installed filters + - `--all`: View all filters + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Install a filter. Enter the URL of the filter you want to install + - `enable`: Enable a filter. Enter the name or ID of the filter + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Disable a filter. Enter the name or ID of the filter + - `update`: Update filters + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index d1ad2e0736c..676bee135f8 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ Această pagină descrie caracteristicile și detaliile gestionării centrale a ## 1. Descărcați MSI-ul {#msi-download} -Download the [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi) +Download the [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Download the [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi) +Download the [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configurați setările pentru rețeaua dumneavoastră {#settings-configuring} diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/ro/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index 3bcd5cfb4fb..37bca3fb700 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Regulile de filtrare susțin numeroase modificatoare care vă permit să ajustați comportamentul regulii. Iată un exemplu de regulă cu unele modificatoare simple. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ Următoarele modificatoare sunt cele mai simple și utilizate frecvent. Basicall | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ Următoarele modificatoare sunt cele mai simple și utilizate frecvent. Basicall - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard va încerca să închidă fila browser-ului cu orice adresă care coresp 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. De exemplu: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + este convertit în + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "Extensie de browser AdGuard pentru Chrome MV3" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/general/extensions.md b/i18n/ro/docusaurus-plugin-content-docs/current/general/extensions.md index fc30ff89853..7f5d6ba0b34 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/general/extensions.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/general/extensions.md @@ -39,7 +39,7 @@ Această versiune a Asistentului este veche și nu are sens să o folosiți pe s ::: -#### Dezactivare AMP +#### Disable AMP Un script care este preinstalat numai în AdGuard pentru Android. Acesta dezactivează AMP (Pagini Mobile Accelerate) pe pagina de rezultate ale căutării Google. Aflați mai multe despre acest userscript și cum să-l instalați pe [GitHub](https://github.com/AdguardTeam/DisableAMP). diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/ro/docusaurus-plugin-content-docs/current/general/license/legacy.md index 474804d6ccc..98adca62068 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: Întrebări frecvente despre licențele legate de moștenire sidebar_position: 6 --- -Am scris acest articol pentru a evita confuziile și a explica în detaliu cum puteți reînnoi/moderniza o licență AdGuard învechită. +We have written this article to avoid confusion and explain in detail how you can renew/upgrade a legacy AdGuard license. -## Despre licențele învechite +## About legacy licenses Inițial, licențele de următoarele tipuri erau disponibile pentru activarea produselor AdGuard: @@ -27,57 +27,55 @@ Pentru toate tipurile (Standard, Mobile, Premium) existau opțiuni pentru o lice În octombrie 2019, AdGuard a trecut la un nou sistem de licențiere: de atunci, licențele pot fi cumpărate fie pentru 1 an, fie pe viață, dar tipurile lor au devenit **Personal** (pentru până la 3 aparate) sau **Familial** (pentru până la 9 aparate). -O altă schimbare: **cheile de licență de nou tip pot fi acum folosite pe orice aparat, în orice combinație. For example, a Personal license can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet.** +Another change is that the **new types of license keys can now be used on any device, in any combination**. For example, a Personal license can be used on Android, Mac and iOS, as well as on two Windows computers and an Apple tablet. -## Ce s-a întâmplat cu licențele învechite? +## What happened to the legacy licenses? -Licențele Standard au devenit automat universale, ceea ce înseamnă că pot fi activate pe orice aparate. +**Standard licenses** were automatically made **universal**, which means that they can be activated on any device. -Licențele Mobile au rămas neschimbate și limitate la platformă (pot fi utilizate doar pe telefoane sau tablete). +**Mobile licenses** remained unchanged and platform-limited (they can still only be used on phones or tablets). -Licențele Premium de asemenea au rămas neschimbate și limitate la platformă. Și deși **licențele Premium sunt acum afișate în contul dumneavoastră personal în funcție de numărul total de aparate**, ele pot fi în continuare activate pe un set de aparate desktop + mobile. +**Premium licenses** also remained unchanged and platform-limited. Și deși **licențele Premium sunt acum afișate în contul dumneavoastră personal în funcție de numărul total de aparate**, ele pot fi în continuare activate pe un set de aparate desktop + mobile. De exemplu, așa arată cheia 1+1: -![1+1 key](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 key](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *Dar, în ciuda numărului total de aparate (2), ea poate fi activată pe 1 desktop și 1 aparat mobil.* > Toate licențele învechite au un semn "legacy" în contul AdGuard. Și sunt convertite automat la un nou tip când le reînnoiți sau le modernizați. Dar există câteva nuanțe. Să vedem ce licențe pot fi convertite la un nou tip și cum să facem acest lucru. -## Am o cheie învechită. Ce opțiuni de reînnoire/modernizare sunt disponibile pentru mine? +## How to renew or upgrade a legacy key -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +You can extend/renew or upgrade a legacy license in your [AdGuard account](https://adguardaccount.com) or on the [Extend or upgrade page](https://adguard.com/renew.html). -![Upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Mergeți la fila "Licențele mele" și verificați ce acțiuni sunt disponibile pentru fiecare cheie specifică. Mai jos vom explica cu exemple specifice. +To extend/renew or upgrade a legacy license in your AdGuard account, go to the *Licenses* tab, find the license you need, and select one of the available options. -### Licențe pentru 1/2/3 aparate +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Yearly** licenses for 1, 2, 3 devices can be converted to either Personal or Family: +Or go to the [Extend or upgrade page](https://adguard.com/renew.html), enter your license, and click *Apply*. On the new page, select one of the available options. -![Actualizați sau reînnoiți](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Alegeți în funcție de câte aparate trebuie să protejați. +### Licențe pentru 1/2/3 aparate -Instead of renewal you can switch to Lifetime: +Mobile Yearly licenses for 3 devices can be converted to Personal licenses or upgraded to Family ones: -![Pe viață](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Upgrade Yearly licenses for 1, 2, 3 devices](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Licențele pe viață** pot fi convertite doar în Familial (9 aparate) din cauza unor limitări tehnice: +> If you have a **Standard license for 3 devices**, it already works as a **Personal** license. If you renew your **Mobile license** for 3 devices, you will be able to use it on a **different set of device**s, not just phones. -![Lifetime upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +You can also upgrade your license to Lifetime: -### Licențe pentru 4+ aparate (până la 9) +![Upgrade to Lifetime](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Yearly** keys of this configuration can only be converted into a Family license: +**Lifetime** licenses can only be upgraded to Family (9 devices) due to technical limitations. -![Licența anuală pentru 4 aparate](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licențe pentru 4+ aparate (până la 9) -**Licențele pe viață** pentru 4 sau mai multe aparate nu pot fi actualizate din cauza limitărilor tehnice: +**Yearly** licenses for 4 or more devices can be upgraded to Family and Lifetime licenses. -![Licența pe viață pentru 4 aparate](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +However, if you already have a **Lifetime** license, it cannot be upgraded due to technical limitations. ### Licențe pentru 9+ aparate -Chei Premium (5+5 și mai multe) și chei personalizate pentru 10+ aparate pe care le-ați achiziționat individual cu ajutorul managerilor noștri. +Premium keys (5+5 and more) and custom keys for 10+ devices that you purchased individually with the help of our managers. -These are quite unique cases, so if you want to upgrade your license to Lifetime, please contact us at partners@adguard.com. Vă vom face o ofertă specială în funcție de configurația specifică a licenței dumneavoastră. +These are quite unique cases, so if you want to upgrade your license to Lifetime, please contact us at partners@adguard.com. We will make you a special offer depending on the specific configuration of your license. diff --git a/i18n/ro/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/ro/docusaurus-plugin-content-docs/current/general/license/what-is.md index a3b22328a24..fd9fa685ce2 100644 --- a/i18n/ro/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/ro/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ There are also licenses that the user can purchase from other sources or get for - **Distributor licenses** and **gifted licenses** can be both time-limited and non-time limited. Licenses with an expiration date can only be renewed manually - Personal — up to 3 devices - Family — up to 9 devices -- **The AdGuard Pro for iOS license** is purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/annoyance-blocking.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/annoyance-blocking.md index 7dbb31e0aaa..83a4e9ab816 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/annoyance-blocking.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/annoyance-blocking.md @@ -9,7 +9,7 @@ sidebar_position: 3 ::: -The Annoyance blocking feature can be accessed by tapping the _Protection_ tab (second-left icon at the bottom of the screen) and then selecting _Annoyance blocking_. +Чтобы найти функцию, откройте вкладку _Защита_ (второй слева значок в нижней части экрана) и выберите _Блокировка раздражителей_. В основе этой функции лежит Фильтр раздражителей, который блокирует всплывающие окна, окна онлайн-помощников, уведомления о куки, предложения скачать мобильное приложение и прочие раздражители, которые не являются рекламой, но могут мешать вам в интернете. [Подробнее о фильтрах раздражителей](/general/ad-filtering/adguard-filters/#adguard-filters) diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 6828d4839f8..f4b52297b47 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ _Уровень логирования_ определяет, какие дан В этом разделе можно управлять настройками HTTPS-фильтрации, фильтрами и пользовательскими скриптами, а также настраивать прокси-сервер. -![Фильтрация \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Фильтры @@ -57,102 +57,110 @@ AdGuard блокирует рекламу, трекеры и раздражит [Подробнее о фильтрах](https://adguard.com/ru/blog/what-are-filters.html) -### Пользовательские скрипты +### Расширения -Пользовательские скрипты — это мини-программы, написанные на JavaScript и меняющие поведение одного или нескольких сайтов. Для установки пользовательских скриптов нужна специальная программа — менеджер скриптов. AdGuard может играть эту роль и позволяет устанавливать пользовательские скрипты по URL или из файла. +Extensions allow you to add userscripts and userstyles. -![Пользовательские скрипты \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) + +Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. + +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra -AdGuard Extra — это специальный пользовательский скрипт, который блокирует сложную рекламу и механизмы повторного внедрения рекламы на сайты. +AdGuard Extra is a custom userscript that blocks complex ads and mechanisms that reinject ads to websites. -#### Отключить AMP +#### Disable AMP -Отключить AMP — это пользовательский скрипт, который отключает [Accelerated mobile pages](https://ru.wikipedia.org/wiki/Accelerated_mobile_pages) на странице результатов поиска Google. +Disable AMP is a userscript that disables [Accelerated mobile pages](https://en.wikipedia.org/wiki/Accelerated_Mobile_Pages) on the Google search results page. ### Сеть #### HTTPS-фильтрация -Чтобы блокировать рекламу и трекеры на большинстве сайтов и в большинстве приложений, AdGuard нужно фильтровать HTTPS-трафик. [Подробнее об HTTPS-фильтрации](/general/https-filtering/what-is-https-filtering) +To block ads and trackers on most websites and in most apps, AdGuard needs to filter their HTTPS traffic. [Read more about HTTPS filtering](/general/https-filtering/what-is-https-filtering) -##### Сертификат безопасности +##### Security certificates -Чтобы управлять зашифрованным трафиком, AdGuard устанавливает на устройство сертификат ЦС. Это безопасно: трафик фильтруется локально, а AdGuard проверяет безопасность соединения. +To manage encrypted traffic, AdGuard installs its CA certificate on your device. It's safe: the traffic is filtered locally and AdGuard verifies the security of the connection. -В старых версиях Android сертификат устанавливается автоматически. На Android 11 и выше сертификат нужно устанавливать вручную. [Инструкция по установке](/adguard-for-android/solving-problems/manual-certificate/) +On older versions of Android, the certificate is installed automatically. On Android 11 and later, you need to install it manually. [Installation instructions](/adguard-for-android/solving-problems/manual-certificate/) -Сертификата в пользовательском хранилище достаточно для фильтрации HTTPS-трафика в браузерах и некоторых приложениях. Однако есть приложения, которые доверяют только сертификатам из системного хранилища. Чтобы фильтровать HTTPS-трафик подобных приложений, вам понадобится установить сертификат AdGuard в системное хранилище. [Инструкция](/adguard-for-android/solving-problems/https-certificate-for-rooted/) +The CA certificate in the user store is enough to filter HTTPS traffic in browsers and some apps. However, there are apps that only trust certificates from the system store. To filter HTTPS traffic there, you need to install AdGuard's CA certificate into the system store. [Instructions](/adguard-for-android/solving-problems/https-certificate-for-rooted/) -##### Приложения с HTTPS-фильтрацией +##### HTTPS-filtered apps -В этом разделе содержится список приложений, для которых AdGuard фильтрует HTTPS-трафик. Обратите внимание, что настройку можно применить ко всем приложениям только в том случае, если у вас есть сертификаты ЦС как в пользовательском, так и в системном хранилище. +This section contains the list of apps for which AdGuard filters HTTPS traffic. Please note that the setting can be applied for all apps only if you have CA certificates both in the user store and in the system store. -##### Сайты с HTTPS-фильтрацией +##### HTTPS-filtered websites -Эта настройка позволяет вам управлять сайтами, для которых AdGuard должен фильтровать HTTPS-трафик. +This setting allows you to manage websites for which AdGuard should filter HTTPS traffic. -HTTPS-фильтрация позволяет AdGuard фильтровать содержимое запросов и ответов, но мы никогда не собираем и не храним эти данные. Однако для повышения безопасности мы [исключаем из HTTPS-фильтрации сайты, содержащие потенциально конфиденциальную информацию](/general/https-filtering/what-is-https-filtering/#financial-websites-and-websites-with-sensitive-personal-data). +HTTPS filtering allows AdGuard to filter the content of requests and responses, but we never collect or store this data. However, to increase security, we [exclude websites that contain potentially sensitive information from HTTPS filtering](/general/https-filtering/what-is-https-filtering/#financial-websites-and-websites-with-sensitive-personal-data). -Вы также можете добавить в исключения сайты, которые считаете необходимыми, выбрав один из режимов: +You can also add websites that you consider necessary to exclusions by selecting one of the modes: -- Исключить определённые сайты из HTTPS-фильтрации -- Фильтровать HTTPS-трафик только на сайтах, добавленных в исключения +- Exclude specific websites from HTTPS filtering +- Filter HTTPS traffic only on the websites added to exclusions -По умолчанию мы также не фильтруем сайты с сертификатами Extended Validation (EV), например, сайты финансовых организаций. При необходимости вы можете включить опцию _Фильтровать сайты с EV-сертификатами_. +By default, we also do not filter websites with Extended Validation (EV) certificates, such as financial websites. При необходимости вы можете включить опцию _Фильтровать сайты с EV-сертификатами_. -#### Прокси +#### Proxy -Вы можете настроить AdGuard так, чтобы он пропускал весь трафик устройства через прокси-сервер. [Как настроить исходящий прокси](/adguard-for-android/solving-problems/outbound-proxy) +You can set up AdGuard to route all your device's traffic through your proxy server. [How to set up an outbound proxy](/adguard-for-android/solving-problems/outbound-proxy) -В этом разделе вы также можете настроить сторонний VPN для работы с AdGuard, ваш VPN-провайдер это позволяет. +In this section, you can also set up a third-party VPN to work with AdGuard, if your VPN provider allows it. -Во вкладке _Приложения, работающие через прокси_ можно выбрать приложения, которые будут направлять свой трафик через указанный вами прокси-сервер. Если у вас включена _Интеграция с AdGuard VPN_, эта настройка заменяет функцию исключений приложений в AdGuard VPN: в Приложениях, работающих через прокси, можно указать приложения, которые будут направляться через туннель AdGuard VPN. +Under _Apps operating through proxy_, you can select apps that will route their traffic through your specified proxy. If you have _Integration with AdGuard VPN_ enabled, this setting plays the role of AdGuard VPN's app exclusions: it allows you to specify apps to be routed through the AdGuard VPN tunnel. -#### Режим маршрутизации +#### Routing mode -Здесь вы можете выбрать метод фильтрации трафика. +This section allows you to select the traffic filtering method. -- _Локальный VPN_ фильтрует трафик через локально созданный VPN. Это самый надёжный режим. Из-за ограничений Android это также единственный способ фильтрации трафика на системном уровне, доступный на нерутованных устройствах. +- _Local VPN_ filters traffic through a locally created VPN. This is the most reliable mode. Due to Android restrictions, it is also the only system-wide traffic filtering method available on non-rooted devices. :::note -Режим _Локальный VPN_ не позволяет использовать AdGuard одновременно с другими VPN. Чтобы использовать другой VPN с AdGuard, вам необходимо перенастроить его для работы в режиме прокси и настроить исходящий прокси в AdGuard. Для AdGuard VPN это делается автоматически с помощью [_Режима интегрирации_](/adguard-for-android/features/integration-with-vpn). +The _Local VPN_ mode doesn't allow AdGuard to be used simultaneously with other VPNs. To use another VPN with AdGuard, you need to reconfigure it to work in proxy mode and set up an outbound proxy in AdGuard. For AdGuard VPN, this is done automatically with the help of the [_Integrated mode_](/adguard-for-android/features/integration-with-vpn). ::: -- _Автоматический прокси_ — альтернативный метод маршрутизации трафика, не требующий использования VPN. Одним из его существенных преимуществ является то, что его можно запускать параллельно с VPN. Этот режим требует root-доступа. +- _Automatic proxy_ is an alternative traffic routing method that does not require the use of a VPN. One significant advantage is that it can be run in parallel with a VPN. This mode requires root access. -- В режиме _Ручной прокси_ настраивается порт для прокси, который затем нужно указать в настройках Wi-Fi. Для этого режима требуется root-доступ на Android 10 и выше. +- _Manual proxy_ involves setting up a proxy server on a specific port, which can then be configured in Wi-Fi settings. This mode requires root access for Android 10 and above. ## Лицензия -В этом разделе вы можете узнать больше о лицензии и управлять ей: +In this section, you can find information about your license and manage it: -- Купите лицензию AdGuard, чтобы активировать [функции полной версии](/adguard-for-android/features/free-vs-full) -- Войти в аккаунт AdGuard или ввести лицензионный ключ для активации лицензии -- Зарегистрироваться для активации 7-дневного пробного периода, если вы ещё не воспользовались им -- Обновите статус лицензии в меню с тремя точками (⋮) -- Открыть личный кабинет AdGuard, чтобы продлить или улучшить лицензию -- Сбросить лицензию — например, если вы достигли лимита устройств для неё и хотите применить другую +- Buy an AdGuard license to activate [the full version's features](/adguard-for-android/features/free-vs-full) +- Log in to your AdGuard account or enter the license key to activate your license +- Sign up to activate your 7-day trial period if you haven't used it yet +- Refresh the license status from the three-dots menu (⋮) +- Open the AdGuard account to manage your license there +- Reset your license — for example, if you've reached device limit for this license and want to apply another one -![Экран лицензии \*mobile_border](https://cdn.adtidy.org/blog/new/3wyh5hlicense.png) +![License screen \*mobile_border](https://cdn.adtidy.org/blog/new/3wyh5hlicense.png) ## Поддержка -Этот раздел поможет, если у вас есть вопросы или предложения по улучшению AdGuard для Android. Мы рекомендуем ознакомиться с _[FAQ](https://adguard.com/support/adguard_for_android.html)_ или этой базой знаний, прежде чем обращаться в поддержку. +Use this section if you have any questions or suggestions regarding AdGuard for Android. We recommend consulting _[FAQ](https://adguard.com/support/adguard_for_android.html)_ or this knowledge base before contacting support. -![Поддержка \*mobile_border](https://cdn.adtidy.org/blog/new/cz55usupport.png) +![Support \*mobile_border](https://cdn.adtidy.org/blog/new/cz55usupport.png) -Если вы заметили пропущенную рекламу, сообщите об этом в разделе _Сообщить о некорректной блокировке_. +If you notice a missed ad, please report it via _Report incorrect blocking_. -Если приложение работает некорректно, выберите _Сообщить об ошибке_. По возможности опишите проблему подробно и прикрепите логи приложения. [Как описать проблему](/guides/report-bugs/#how-to-describe-a-problem) +For unexpected app behavior, select _Report a bug_. If possible, describe your problem in detail and add app logs. [How to describe an issue](/guides/report-bugs/#how-to-describe-a-problem) -Предложить улучшение можно в разделе _Предложить функцию_. +For your suggestions, use _Request a feature_. :::note -GitHub — ещё один способ сообщать об ошибках и предлагать новые функции. [Инструкции и ссылки на репозитории](/guides/report-bugs/#adguard-for-android) +GitHub is an alternative way to report bugs and suggest new features. [Instructions and repository links](/guides/report-bugs/#adguard-for-android) ::: diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 386153fa316..454b25b5ed3 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: Как установить AdGuard для Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index d7353454052..203fcbd1be2 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: Как отключить функцию Автоблокировка на Samsung -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index 22b0edfc682..f428fb80cc9 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: Как настроить фоновую работу AdGuard -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 8b29091f717..39b10d76095 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ sidebar_position: 1 Внутри вы найдёте график, показывающий реальное потребление ресурса батареи AdGuard запоследние 24 часа, с возможностью получить более детальную информацию о почасовом расходе, нажав на график. Кроме того, там также есть числовая разбивка релевантных данных и краткое техническое пояснение. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### Сколько заряда батареи на самом деле потребляет AdGuard? Для начала приведём немного теории и ссылок с необходимыми данными. diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 31f32084b9a..3f57068b642 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Известные проблемы совместимости с приложениями для Android -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index 0965f946e17..ab1554ae542 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Проблемы, вызванные расширением ограниченных настроек -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ sidebar_position: 18 ::: -Стремясь повысить уровень конфиденциальности пользователей, Google расширила настройки ограничений в Android 15. Теперь для включения дополнительных настроек, таких как _Доступ к использованию приложений_, требуется дополнительное разрешение. Поскольку функции _[Фаервол](/adguard-for-android/features/protection/firewall)_ и _[Обнаружение Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ требуют включения настройки _Доступ к использованию приложений_ для их правильной работы, у вас могли возникнуть проблемы с их использованием. Чтобы решить эти проблемы, выполните следующие действия: +Стремясь повысить уровень конфиденциальности пользователей, Google расширила настройки ограничений в Android 15. Теперь для включения дополнительных настроек, таких как _Доступ к использованию приложений_, требуется дополнительное разрешение. Поскольку функции _[Фаервол](/adguard-for-android/features/protection/firewall)_ и _[Обнаружение Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ требуют включения настройки _Доступ к использованию приложений_ для их правильной работы, у вас могли возникнуть проблемы с их использованием. To resolve these issues, please follow the steps below. :::note @@ -17,20 +17,44 @@ AdGuard придерживается строгой политики без ло ::: -1. На вашем Android-устройстве откройте приложение **Настройки**. -2. Нажмите **Приложения**. -3. Нажмите **AdGuard** +## Basic instructions -![AdGuard в приложениях \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted1.png) +1. On your Android device, open the **Settings app**. +2. Tap **Apps**. +3. Tap **AdGuard** -Если вы не можете найти его, сначала нажмите **Просмотреть все приложения** или **Информация о приложении**. +![AdGuard in Apps \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted1.png) -1. Нажмите **Еще** (⁝) → _Разрешить ограниченные настройки_. +If you can't find it, first tap **See all apps** or **App info**. -![Разрешить ограниченные настройки \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted2.png) +1. Tap **More** (⁝) → _Allow restricted settings_. -Следуйте инструкциям на экране. +![Allow restricted settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted2.png) -Готово! Теперь функции _Фаервол_ и _Обнаружение Samsung Pay_ будут работать корректно. +Follow the on-screen instructions. -![Ограниченные настройки разрешены для AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) +All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. + +![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index 052bf191e08..4786f77b54f 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Ручная установка сертификата безопасности в браузере Firefox -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index 2470404854d..27d0d8e02fe 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Перемещение сертификата ЦС в системное хранилище на рутованных устройствах -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 1d10e1fe229..88f8d028be7 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Установка сертификата на устройствах с Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index d57f6a65614..246bb3ae37d 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Проблемы, вызванные использованием нескольких профилей пользователей -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 0ac803cfb21..627a3837c3d 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: Как настроить исходящий прокси -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index 0a7b242e295..a81c178fa45 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: Как использовать Samsung Pay с AdGuard в Южной Корее -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index d75a8c0fb4a..8d35dcd53d0 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Установка сертификата в Защищённую папку -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index daa2088b184..1d3a387355b 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: Как заблокировать рекламу в приложении YouTube -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-ios/features/free-vs-full.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-ios/features/free-vs-full.md index cbeac3046e0..b19d2f9e851 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-ios/features/free-vs-full.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-ios/features/free-vs-full.md @@ -27,6 +27,6 @@ AdGuard для iOS с подпиской Premium и AdGuard Pro блокирую 2. **Расширенная защита** позволяет использовать расширенные правила для блокировки сложной рекламы, которую нельзя заблокировать обычным способом. -3. **More filter options:** When purchasing AdGuard Premium, you get access to custom and security filters. +3. **Больше фильтров:** с AdGuard Premium у вас появляется возможность добавлять собственные фильтры, а также использовать фильтры безопасности. Вы можете получить доступ к этим функциям, [купив лицензию](https://adguard.com/license.html). diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index e1d6de1d494..af58afc256e 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -3,90 +3,152 @@ title: Установка, настройка и удаление sidebar_position: 2 --- -## Установите AdGuard для Linux +## Установка AdGuard для Linux -Чтобы установить AdGuard, введите: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Релиз +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Бета +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` -При необходимости введите пароль администратора. +If required, enter your admin password. -Нажмите `y`, чтобы создать ссылку в `/usr/local/bin` на исполняемый файл, и дождитесь завершения установки. +Press `y` to create a link in `/usr/local/bin` to the executable and wait until the installation is complete. :::note -Вы можете проверить подпись и убедиться, что это официальная версия AdGuard, используя инструмент `gpg`. [Подробнее на GitHub](https://github.com/AdguardTeam/AdGuardCLI?tab=readme-ov-file#verify-releases) +You can verify the signature to prove it’s an official version of AdGuard by using the `gpg` tool. [Read more on GitHub](https://github.com/AdguardTeam/AdGuardCLI?tab=readme-ov-file#verify-releases) ::: -## Активировать лицензию +## Initial setup -Для AdGuard для Linux нужна [лицензия AdGuard](https://adguard.com/license.html). Если у вас ещё нет лицензии, вы можете войти или создать аккаунт, чтобы получить бесплатную 14-дневную пробную версию. Если у вас уже есть лицензия, войдите, чтобы активировать её. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -Чтобы войти или создать аккаунт, введите: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -Чтобы сбросить лицензию, введите: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -Чтобы просмотреть информацию о лицензии, введите: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Первичная настройка +4. After activation, you can continue to work with the program: -Чтобы запустить AdGuard, завершите начальную настройку. В неё входит установка сертификата AdGuard CA, включение необходимых фильтров и выбор режима прокси-сервера. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -Для запуска мастера настройки введите: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` -## Удалите AdGuard для Linux + or view the license info by entering -Чтобы удалить AdGuard, введите: + ```sh + adguard-cli license + ``` -Релиз +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: -``` + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). + +## Uninstall AdGuard for Linux + +To uninstall AdGuard, enter: + +Release + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` -Бета +Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` -При необходимости введите пароль администратора. +If required, enter your admin password. diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index cb6e8adcd8b..89ad89b5c44 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Настройки и управление защитой sidebar_position: 3 --- +## Available commands + Чтобы увидеть список всех доступных команд AdGuard, введите: -``` +```sh adguard-cli --help-all ``` ## Включить и отключить защиту +### Enable protection + Чтобы включить защиту, введите: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + Чтобы отключить защиту, введите: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + Чтобы просмотреть статус защиты, введите: -``` +```sh adguard-cli status ``` -## Проверить обновления +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Проверить обновления Чтобы проверить наличие обновлений, введите: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + Чтобы обновить AdGuard для Linux, введите: -``` +```sh adguard-cli update ``` +### Update script output + Чтобы просмотреть вывод скрипта обновления, введите: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Используйте команду `config` для настройки AdGuard для Linux. Подкоманды: - `show`: показать текущую конфигурацию в `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: настроить параметр в `proxy.yaml` - `listen_ports.http_proxy`: порт прослушивания HTTP - `proxy_mode`: режим прокси-сервера (`manual` или `auto`) + - `get`: получить текущий статус указанных выше опций ## Управлять фильтрами @@ -64,8 +90,32 @@ adguard-cli update -v Используйте команду `filters` для настройки AdGuard для Linux. Подкоманды: - `list`: список установленных фильтров + - `--all`: просмотреть все фильтры + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: установить фильтр. Введите URL-адрес фильтра, который хотите установить + - `enable`: включить фильтр. Введите имя или ID фильтра + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: отключить фильтр. Введите имя или ID фильтра + - `update`: обновить фильтры + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-safari/features/content-blockers/adguard-social.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-safari/features/content-blockers/adguard-social.md index ef70960b821..5bd99c85d01 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-safari/features/content-blockers/adguard-social.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-safari/features/content-blockers/adguard-social.md @@ -3,4 +3,4 @@ title: AdGuard Виджеты соцсетей sidebar_position: 4 --- -_AdGuard Виджеты соцсетей_ содержит фильтры, блокирующие кнопки, виджеты, скрипты и иконки социальных сетей. Other annoyance filters can also be found in this section: filters against popups, mobile app banners, cookie notices, and more. Чтобы включить их, найдите _Виджеты социальных сетей_ во вкладке «Фильтры». +_AdGuard Виджеты соцсетей_ содержит фильтры, блокирующие кнопки, виджеты, скрипты и иконки социальных сетей. В этом разделе можно найти и другие фильтры раздражителей: фильтры против всплывающих окон, баннеров мобильных приложений, уведомлений о файлах cookie и т. п. Чтобы включить их, найдите _Виджеты социальных сетей_ во вкладке «Фильтры». diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index ee03d24404a..65e860122d7 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ sidebar_position: 5 ## 1. Скачайте MSI-установщик {#msi-download} -Скачать [AdGuard MSI x86](https://cdn.adtidy.org/distr/windows/AdGuard_x86.msi) +Скачать [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Скачать [AdGuard MSI x64](https://cdn.adtidy.org/distr/windows/AdGuard_x64.msi) +Скачать [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Настройте параметры сети {#settings-configuring} diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md index 1de8221eebc..a1ed1662008 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/features/extensions.md @@ -33,7 +33,7 @@ AdGuard Extra — это мини-программа, которая меняе **Блокировщик всплывающих окон** -Это расширение блокирует всплывающие окна при просмотре веб-страниц. Some popups are considered useful — they may contain settings for site administering or additional reference information demonstrated upon clicking a link. Вот почему вы можете отключить Блокировщик, если это необходимо. Это расширение также не работает на сайтах, добавленных в список исключений AdGuard. По умолчанию это расширение отключено, но вы можете включить его в настройках приложения. +Это расширение блокирует всплывающие окна при просмотре веб-страниц. Некоторые всплывающие окна считаются полезными — они могут содержать настройки для администрирования сайта или справочную информацию, отображаемую при переходе по ссылке. Вот почему вы можете отключить Блокировщик, если это необходимо. Это расширение также не работает на сайтах, добавленных в список исключений AdGuard. По умолчанию это расширение отключено, но вы можете включить его в настройках приложения. **Web of Trust** diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md index 923e90a06b1..39f5161bdf9 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/features/settings.md @@ -23,7 +23,7 @@ sidebar_position: 2 ### Блокировщик рекламы -Это основной модуль AdGuard для Windows, блокирующий рекламу на сайтах, которые вы посещаете, и в приложениях, установленных на вашем устройстве. To filter out advertising and privacy-threatening content such as banners, popups, or trackers AdGuard uses different filters — groups of rules with a similar purpose written with a [special syntax](/general/ad-filtering/create-own-filters). [Что такое фильтры и как они работают](/general/ad-filtering/how-ad-blocking-works) +Это основной модуль AdGuard для Windows, блокирующий рекламу на сайтах, которые вы посещаете, и в приложениях, установленных на вашем устройстве. Для фильтрации рекламы и контента, угрожающего конфиденциальности, такого как баннеры, всплывающие окна или трекеры, AdGuard использует разные фильтры — группы правил с похожим назначением, написанные с использованием [специального синтаксиса](/general/ad-filtering/create-own-filters). [Что такое фильтры и как они работают](/general/ad-filtering/how-ad-blocking-works) ![Блокировка рекламы \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/settings_ad_blocker.png) @@ -54,7 +54,7 @@ sidebar_position: 2 Защита от фишинга надёжно защищает от вредоносных и мошеннических сайтов. Нет, AdGuard для Windows — это не антивирус. Он не остановит загрузку вируса, если она уже началась, и не удалит уже существующие вирусы. Но он предупредит вас, если вы собираетесь перейти на сайт, домен которого был добавлен в нашу базу «ненадёжных сайтов», или загрузить файл с такого сайта. [Как работает Защита от фишинга](/general/browsing-security) -In this module, you can: +В этом модуле вы можете: - включить уведомления для блокировки запросов к вредоносным и фишинговым сайтам, - активировать звуковые уведомления, @@ -70,31 +70,31 @@ In this module, you can: ![DNS-защита \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/dns-settings.png) -In the DNS protection module of AdGuard for Windows, you can choose DNS servers from known DNS providers, including AdGuard DNS, which blocks ads and trackers, AdGuard DNS Family Protection, which also blocks adult content, or AdGuard DNS Non-filtering, which provides a secure and reliable connection but doesn’t filter anything. You can even add custom DNS servers and rules using [DNS rule syntax](https://adguard-dns.io/kb/general/dns-filtering-syntax/). If necessary, you can add [DNS filters of your choice](https://filterlists.com). +В _DNS-защите_ вы можете выбрать DNS-серверы от известных DNS-провайдеров, в том числе [AdGuard DNS](https://adguard-dns.io/kb/), который блокирует рекламу и трекеры, AdGuard DNS Семейный, который дополнительно блокирует контент для взрослых, или Нефильтрующий AdGuard DNS, который обеспечивает безопасное и надёжное соединение, но ничего не фильтрует. Вы даже можете добавлять пользовательские DNS-серверы и правила, используя [синтаксис DNS-правил](https://adguard-dns.io/kb/general/dns-filtering-syntax/). При необходимости вы можете добавить [DNS-фильтры из списка](https://filterlists.com). Начиная с версии 7.20, вы также можете добавлять фильтры, просто выбирая их из списка заранее созданных, доверенных фильтров. Для удобства они сгруппированы в четыре категории: -- **General**: block ads and trackers -- **Regional**: block ads and trackers on language-specific websites -- **Security**: block phishing and unreliable websites -- **Other**: cover special use cases that don’t fit into the above categories +- **Основные**: блокируют рекламу и трекеры +- **Региональные**: блокируют рекламу и трекеры на сайтах на определённых языках +- **Безопасность**: блокируют фишинг и ненадёжные сайты +- **Другое**: охватывают особые случаи использования, которые не попадают в вышеуказанные категории ![DNS-фильтры \*border](https://cdn.adtidy.org/content/release_notes/ad_blocker/windows/v7.20/dns_filters/en.png) -### Parental Control +### Родительский контроль -There are several websites to which access should be restricted from a PC used by children. This task is accomplished by Parental Control. +Бывают сайты, доступ к которым стоит ограничивать, если компьютером пользуются дети. Эту задачу выполняет Родительский контроль. -![Parental Control \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/parental-control.png) +![Родительский контроль \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/parental-control.png) -The module checks the contents of web pages opened in the browser and filters those with content undesirable for children: images and texts for adults, crude language, violence, drug propaganda, etc. Parental Control settings are password-protected so that the child is not able to go round the restrictions. This module not only blocks directions to undesirable sites but can also delete the links that are inappropriate for children from the search results. +Модуль проверяет содержимое веб-страниц, открытых в браузере, и отфильтровывает страницы с нежелательным для детей контентом: изображения и тексты для взрослых, ненормативная лексика, насилие, пропаганда наркотиков и т. д. Настройки Родительского контроля защищены паролем, чтобы ребёнок не смог обойти ограничения. Этот модуль не только блокирует доступ к нежелательным сайтам, но и удаляет неподходящие для детей ссылки из результатов поиска. -In the _Parental Control_ module you can enable the _Safe search_ and manage the _blocklist_ and the _allowlist_ to customize how this option works. You can also check the _Block executable files download_ box to prevent your child from downloading and installing software on the computer. There are two more options in the _Parental Control_ module: you can select a specific Windows user to be protected by _Parental Control_ and set a password to protect AdGuard settings from change. +В модуле _Родительский контроль_ вы можете включить _Безопасный поиск_, а также указать, на какие сайты _Родительский контроль_ должен распространяться. Вы также можете включить функцию _Запретить загрузку программ_, чтобы ваш ребёнок не мог загружать и устанавливать программное обеспечение на компьютер. В модуле _Родительский контроль_ есть ещё две опции: вы можете выбрать конкретного пользователя Windows для защиты с помощью _Родительского контроля_ и установить пароль для защиты настроек AdGuard от изменений. -![Parental Control \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/parental-control.png) +![Родительский контроль \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/parental-control.png) ### Браузерный помощник -![Browser Assistant \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/browser-assistant/browser-assistant.png) +![Браузерный помощник \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/browser-assistant/browser-assistant.png) -From this tab you can easily proceed to install AdGuard Browser Assistant, which primary function is to manage filtering directly from the browser. We explained more about how to work with it and what to do if there is no Browser Assistant for your browser in the [separate article](/adguard-for-windows/browser-assistant.md). +Из этой вкладки вы можете легко перейти к установке Браузерного помощника AdGuard, основная функция которого — управлять фильтрацией прямо из браузера. Подробнее о том, как с ним работать и что делать, если для вашего браузера нет Помощника, мы рассказали [в отдельной статье](/adguard-for-windows/browser-assistant.md). diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md index 4f12de8fb0b..1656c6eaba7 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/common-installer-errors.md @@ -38,10 +38,10 @@ sidebar_position: 6 - Запустите и пройдите перерегистрацию службы установщика Microsoft. На это потребуется некоторое время. - Нажмите *Win + R* и введите **services.msc**. - - Find in the list and double-click *Windows Installer*. + - Найдите в списке и дважды щёлкните на *Установщик Windows*. - Нажмите кнопку *Начать* под *Статусом сервиса* и нажмите *ОК*. Если статус **Запущен**, сначала нажмите *Остановить*, а затем *Запустить*. - - Press *Win + R*, type ***msiexec /unregister***, and hit *Enter*. - - Press *Win + R* again, type ***msiexec /regserver***, and hit *Enter* + - Нажмите *Win + R*, введите ***msiexec /unregister*** и нажмите *Enter*. + - Снова нажмите *Win + R*, введите ***msiexec /regserver*** и нажмите *Enter* - Перезагрузите компьютер и запустите установщик заново. Иногда этого достаточно, чтобы устранить проблему. @@ -68,10 +68,10 @@ sidebar_position: 6 - Запустите и пройдите перерегистрацию службы установщика Microsoft. На это потребуется некоторое время. - Нажмите *Win + R* и введите ***services.msc***. - - Find in the list and double-click *Windows Installer*. + - Найдите в списке и дважды щёлкните на *Установщик Windows*. - Нажмите кнопку *Начать* под *Статусом сервиса* и нажмите *ОК*. Если статус **Запущен**, сначала нажмите *Остановить*, а затем *Запустить*. - - Press *Win + R*, type ***msiexec /unregister***, and hit *Enter*. - - Press *Win + R* again, type ***msiexec /regserver***, and hit *Enter* + - Нажмите *Win + R*, введите ***msiexec /unregister*** и нажмите *Enter*. + - Снова нажмите *Win + R*, введите ***msiexec /regserver*** и нажмите *Enter* - Получите полный доступ к диску для установки. Возможно, что ошибка 1603 возникает, если у вас нет полного доступа к местоположению файла. Это решение также требует некоторой работы: diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md index 7ef3bab03dc..79dd4563287 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/low-level-settings.md @@ -73,7 +73,7 @@ sidebar_position: 7 ### Открывать главное окно при запуске системы -Включите эту опцию, чтобы главное окно AdGuard открывалось при каждом запуске системы. This setting, which doesn't affect whether the actual filtering service is launched or not, is located in *Settings → General Settings*. +Включите эту опцию, чтобы главное окно AdGuard открывалось при каждом запуске системы. Эта настройка не влияет на то, запущена ли реальная фильтрация или нет. Она находится в разделе *Настройки → Общие настройки*. ### Включать фильтрацию при запуске системы diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/general/account/2fa.md b/i18n/ru/docusaurus-plugin-content-docs/current/general/account/2fa.md index da80dc61d70..53e7e278dce 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/general/account/2fa.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/general/account/2fa.md @@ -11,7 +11,7 @@ sidebar_position: 3 ## Как настроить -1. Log into your [AdGuard account](https://auth.adguardaccount.com/login.html) and go to the *Settings* tab: +1. Войдите в свой [аккаунт AdGuard](https://auth.adguardaccount.com/login.html) и перейдите во вкладку *Настройки*: ![Настройки личного кабинета AdGuard *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_1.png) diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/general/account/features.md b/i18n/ru/docusaurus-plugin-content-docs/current/general/account/features.md index 17020d48483..061d35c204d 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/general/account/features.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/general/account/features.md @@ -24,9 +24,9 @@ sidebar_position: 2 - привязать и отвязать, - продлить, -- upgraded. +- улучшить, -Вы можете дать имена устройствам, привязанным к лицензиям Блокировщика AdGuard. To unbind unused devices, click the number of bound devices next to *Devices*, then select `>` → *Remove*. +Вы можете дать имена устройствам, привязанным к лицензиям Блокировщика AdGuard. Чтобы отвязать неиспользуемые устройства, нажмите на число рядом с *Устройствами*, затем на стрелку и *Удалить*. ## Покупки diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/general/account/register.md b/i18n/ru/docusaurus-plugin-content-docs/current/general/account/register.md index e87804868c0..1abbc058d79 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/general/account/register.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/general/account/register.md @@ -5,7 +5,7 @@ sidebar_position: 1 ## Что такое личный кабинет AdGuard -[AdGuard account](https://adguardaccount.com/) is a user account that stores information about your AdGuard licenses and subscriptions, active devices, your purchase history, preferred language, and other preferences. Многие продукты AdGuard можно активировать с помощью данных аккаунта AdGuard, при условии, что он содержит действующую лицензию. +[Личный кабинет AdGuard](https://adguardaccount.com/) — это пользовательский аккаунт, в котором хранится информация о ваших лицензиях и подписках AdGuard, активных устройствах, истории покупок, предпочтительном языке и других настройках. Многие продукты AdGuard можно активировать с помощью данных аккаунта AdGuard, при условии, что он содержит действующую лицензию. ## Как создать личный кабинет @@ -29,4 +29,4 @@ sidebar_position: 1 ## Как создать личный кабинет через социальную сеть -To create an account via a social network, simply follow the [link](https://auth.adguardaccount.com/login.html) and log in to your account. После регистрации проверьте почту — там будет письмо с подтверждением. Останется только установить пароль. И готово — теперь вам доступны все возможности [личного кабинета AdGuard](https://adguard.com/kb/general/account/features/). +Чтобы создать личный кабинет через социальную сеть, достаточно перейти [по ссылке](https://auth.adguardaccount.com/login.html) и войти в свой аккаунт. После регистрации проверьте почту — там будет письмо с подтверждением. Останется только установить пароль. И готово — теперь вам доступны все возможности [личного кабинета AdGuard](https://adguard.com/kb/general/account/features/). diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/ru/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index ce278e5402b..d8b6983d0b4 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,11 +65,11 @@ toc_max_heading_level: 4 - `https://example.org/banner/img` -### Модификаторы базовых правил {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Правила фильтрации поддерживают множество модификаторов, которые позволяют вам точно настраивать поведение правила. Вот пример правила с некоторыми простыми модификаторами. -![Модификаторы базовых правил](https://cdn.adtidy.org/content/kb/ad_blocker/general/2_basic_rule_options.svg) +![Basic rule modifiers](https://cdn.adtidy.org/content/kb/ad_blocker/general/2_basic_rule_options.svg) **Это правило блокирует:** @@ -232,7 +232,7 @@ AdGuard Content Blocker — это расширение для браузеро - `$replace` - `$urltransform` -#### Косметические правила +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Конвертер Safari поддерживает большинство [косметических правил](#cosmetic-rules), хотя поддерживаются только правила сокрытия элементов с базовыми CSS-селекторами нативно через блокировку контента Safari, все остальные необходимо интерпретировать с помощью дополнительного расширения. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### Правила фильтрации HTML +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [Правила HTML-фильтрации](#html-filtering-rules) **не поддерживаются** и не будут поддерживаться в будущем. К сожалению, Safari не предоставляет необходимых технических возможностей для их реализации. @@ -360,7 +360,7 @@ Wildcard-символы поддерживаются для TLD-доменов - `@@||example.com$document ` — наиболее общее правило-исключение. Такое правило полностью отключает фильтрацию на домене `example.com` и всех его поддоменах. Существует ряд параметров, которые также можно использовать в правилах-исключениях. Более подробно о правилах-исключениях и параметрах, которые могут в таких правилах использоваться, написано [ниже](#exception-modifiers). -### Модификаторы базовых правил +### Basic rule modifiers - [Базовые модификаторы](#basic-rules-basic-modifiers) - [Модификаторы типа контента](#content-type-modifiers) @@ -396,8 +396,8 @@ Wildcard-символы поддерживаются для TLD-доменов | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,8 +405,7 @@ Wildcard-символы поддерживаются для TLD-доменов - ✅ — полностью поддерживается - ✅ * — поддерживается, но надёжность может быть разной или могут возникнуть ограничения; ознакомьтесь с описанием модификатора для получения подробной информации -- ⏳ — планируется к реализации, но пока недоступен ни в одном продукте -- ❌ — не поддерживается +- ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari не поддерживает одновременно разрешённ :::info Совместимость -Правила с регулярными выражениями в модификаторе `$domain` поддерживаются в AdGuard для Windows, AdGuard для Mac и AdGuard для Android [с CoreLibs][] версии 1.11 или выше и в Браузерном расширении AdGuard [с TSUrlFilter][] версии 3.0.0 или выше. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. В AdGuard для Windows, Mac и Android [с CoreLibs 1.12 или более поздней версии][] вместо модификатора `$domain` можно также использовать `$from`. @@ -617,13 +616,14 @@ h_value = string / regexp :::caution Ограничения 1. Модификатор `$header` может быть сопоставлен, только когда заголовки получены. Если запрос блокируется или перенаправляется на более ранней стадии, модификатор не может быть применён. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Совместимость -Правила с модификатором `$header` поддерживаются в AdGuard для Windows, AdGuard для Mac и AdGuard для Android [с CoreLibs][] версии 1.11 или выше и в Браузерном расширении AdGuard [с TSUrlFilter][] версии 3.0.0 или выше. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ h_value = string / regexp :::info Совместимость -Правила с модификатором `$method` поддерживаются в AdGuard для Windows, AdGuard для Mac и AdGuard для Android [с CoreLibs][] 1.12 или более поздней версии, а также в Браузерном расширении AdGuard для Chrome, Firefox и Edge с [TSUrlFilter][] 2.1.1 или более поздней версии. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard будет пытаться закрыть браузерную вкла 1. Модификатор `$popup` лучше всего работает в расширении AdGuard для браузеров на базе Chromium и Firefox. 1. [В AdGuard для Chrome MV3][ext-mv3] правила с модификатором [`$popup`][popup-in-mv3] не будут работать, поэтому мы отключаем их преобразование в декларативные правила. Мы попытаемся использовать их только в нашем движке [TSUrlFilter][] и закрывать новые вкладки программно. 1. В AdGuard для iOS и AdGuard для Safari `$popup`-правила просто заблокируют страницу. -1. В AdGuard для Windows, AdGuard для Mac и AdGuard для Android модификатор `$popup` в некоторых случаях может не обнаружить всплывающее окно, и оно не будет заблокировано. Модификатор `$popup` применяет тип контента `document` со специальным флагом, который передаётся блокирующей странице. Блокирующая страница сама может провести некоторые проверки и закрыть окно, если это действительно всплывающее окно. В противном случае страница должна быть загружена. Его можно комбинировать с другими модификаторами типа запроса, такими как `$third-party`, `$strict-third-party`, `$strict-first-party` и `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. Модификатор `$popup` применяет тип контента `document` со специальным флагом, который передаётся блокирующей странице. Блокирующая страница сама может провести некоторые проверки и закрыть окно, если это действительно всплывающее окно. В противном случае страница должна быть загружена. Его можно комбинировать с другими модификаторами типа запроса, такими как `$third-party`, `$strict-third-party`, `$strict-first-party` и `$important`. ::: @@ -727,7 +727,7 @@ AdGuard будет пытаться закрыть браузерную вкла :::info Совместимость -Правила с модификатором `$strict-first-party` поддерживаются в AdGuard для Windows, AdGuard для Mac и AdGuard для Android с [CoreLibs][] версии 1.16 или выше. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ AdGuard будет пытаться закрыть браузерную вкла :::info Совместимость -Правила с модификатором `$strict-third-party` поддерживаются в AdGuard для Windows, AdGuard для Mac и AdGuard для Android с [CoreLibs][] версии 1.16 или выше. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ AdGuard будет пытаться закрыть браузерную вкла :::info Совместимость -Правила с модификатором `$to` поддерживаются в AdGuard для Windows, AdGuard для Mac и AdGuard для Android [с CoreLibs][] версии 1.12 или выше и в Браузерном расширении AdGuard [с TSUrlFilter][] версии 2.1.3 или выше. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -843,7 +843,7 @@ AdGuard будет пытаться закрыть браузерную вкла - ✅ — полностью поддерживается - ✅ * — поддерживается, но надёжность может быть разной или могут возникнуть ограничения; ознакомьтесь с описанием модификатора для получения подробной информации -- ❌ — не поддерживается +- ❌ — not supported - 🚫 — удалён и больше не поддерживается ::: @@ -1043,7 +1043,7 @@ AdGuard для Windows, Mac и Android часто не может точно о - ✅ — полностью поддерживается - ✅ * — поддерживается, но надёжность может быть разной или могут возникнуть ограничения; ознакомьтесь с описанием модификатора для получения подробной информации -- ❌ — не поддерживается +- ❌ — not supported ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Совместимость - Только AdGuard для Windows, Mac и Android имеют технические возможности для поддержки правил с модификатором `$extension`. -- Правила с модификатором `$extension` поддерживаются в AdGuard для Windows, AdGuard для Mac и AdGuard для Android [с CoreLibs][] версии 1.13 или выше. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ $stealth [= opt1 [| opt2 [| opt3 [...]]]] :::info Совместимость - Защита от трекинга доступна в AdGuard для Windows, AdGuard для Mac, AdGuard для Android и расширении AdGuard для Firefox и браузеров на базе Chromium, за исключением AdGuard для Chrome MV3. Все остальные продукты будут игнорировать правила с модификатором `$stealth`. -- Правила с модификатором `$stealth` поддерживаются в AdGuard для Windows, AdGuard для Mac и AdGuard для Android [с CoreLibs][] версии 1.10 или выше и в Браузерном расширении AdGuard [с TSUrlFilter][] версии 3.0.0 или выше. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,37 +1326,36 @@ domain.com###banner -| Модификатор \ Продукты | [Приложения CoreLibs][cl-apps] | [AdGuard для Chromium][ext-chr] | [AdGuard для Chrome MV3][ext-mv3] | [AdGuard для Firefox][ext-ff] | [AdGuard для iOS][ios-app] | [AdGuard для Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "устарел") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "устарел") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Модификатор \ Продукты | [Приложения CoreLibs][cl-apps] | [AdGuard для Chromium][ext-chr] | [AdGuard для Chrome MV3][ext-mv3] | [AdGuard для Firefox][ext-ff] | [AdGuard для iOS][ios-app] | [AdGuard для Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "устарел") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "устарел") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — полностью поддерживается - ✅ * — поддерживается, но надёжность может быть разной или могут возникнуть ограничения; ознакомьтесь с описанием модификатора для получения подробной информации -- ⏳ — планируется к реализации, но пока недоступен ни в одном продукте -- ❌ — не поддерживается -- 👎 — устарел; всё ещё поддерживается, но в будущем будет удалён +- ❌ — not supported +- 👎 — deprecated; still supported but will be removed in the future ::: @@ -1670,7 +1669,7 @@ preroll.ts :::info Совместимость -Правила с модификатором `$hls` поддерживаются в AdGuard для Windows, AdGuard для Mac и AdGuard для Android с [CoreLibs][] версии 10 или выше. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ https://www.site24x7.com/tools/jsonpath-finder-validator.html https://jsonpathfi :::info Совместимость -Правила с модификатором `$jsonprune` поддерживаются в AdGuard для Windows, AdGuard для Mac и AdGuard для Android с [CoreLibs][] версии 10 или выше. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ https://www.site24x7.com/tools/jsonpath-finder-validator.html https://jsonpathfi :::info Совместимость -Правила с модификатором `$xmlprune` поддерживаются в AdGuard для Windows, AdGuard для Mac и AdGuard для Android с [CoreLibs][] версии 15 или выше. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox игнорирует заголовок `Permissions-Policy`. Подро :::info Совместимость -- Правила с модификатором `$permissions` поддерживаются в AdGuard для Windows, AdGuard для Mac и AdGuard для Android [с CoreLibs][] версии 1.11 или выше и в Браузерном расширении AdGuard [с TSUrlFilter][] версии 3.0.0 или выше. -- Разделитель `|` вместо запятой поддерживается в AdGuard для Windows, AdGuard для Mac и AdGuard для Android [с CoreLibs][] версии 1.14 или выше и в Браузерном расширении AdGuard [с TSUrlFilter][] версии 3.0.0 или выше. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ AdGuard использует тот же синтаксис правил фил :::info Совместимость -Правила с модификатором `$referrerpolicy` поддерживаются в AdGuard для Windows, AdGuard для Mac и AdGuard для Android с [CoreLibs][] версии 1.12 или выше. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,9 +2388,77 @@ AdGuard использует тот же синтаксис правил фил @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Ограничения + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. Например: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + преобразуется в + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Ограничения -Этот тип правил может использоваться [**только в доверенных фильтрах**](#trusted-filters). +This type of rules can only be used [**in trusted filters**](#trusted-filters). 1. Чтобы избежать потенциальных проблем с безопасностью, `$removeheader` не может убрать следующие заголовки: - `access-control-allow-origin` @@ -2449,7 +2516,7 @@ AdGuard использует тот же синтаксис правил фил :::info Совместимость -Правила с модификатором `$removeheader` поддерживаются в AdGuard для Windows, AdGuard для Mac, AdGuard для Android, а также в Браузерном расширении AdGuard для Chrome, Firefox и Edge. +Rules with `$removeheader` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Chrome, Firefox, and Edge. ::: @@ -2457,76 +2524,76 @@ AdGuard использует тот же синтаксис правил фил :::note -Модификатор `$removeparam` — это полный аналог модификатора `$queryprune`. Поскольку модификатор `$queryprune` считается устаревшим, рекомендуем везде использовать только модификатор `$removeparam`. +`$queryprune` is an alias of `$removeparam`. Since `$queryprune` is deprecated, avoid using it and use `$removeparam` instead. ::: -Правила с модификатором `$removeparam` предназначены для того, чтобы убирать параметры запроса из URL-адресов. Обратите внимание, что такие правила применяются только к запросам `GET`, `HEAD`, `OPTIONS` и иногда к `POST`. +Rules with `$removeparam` modifier are intended to strip query parameters from requests' URLs. Please note that such rules are only applied to `GET`, `HEAD`, `OPTIONS`, and sometimes `POST` requests. **Синтаксис** **Базовый синтаксис** -- `$removeparam=param` убирает параметр запроса с именем `param` из URL любого запроса. Например, запрос к `http://example.com/page?param=1&&another=2` будет преобразован в `http://example.com/page?another=2`. +- `$removeparam=param` removes query parameter with the name `param` from URLs of any request, e.g. a request to `http://example.com/page?param=1&another=2` will be transformed into `http://example.com/page?another=2`. -**Регулярные выражения** +**Regular expressions** -Вы также можете использовать регулярные выражения, чтобы выбрать нужные параметры запроса или их значения: +You can also use regular expressions to match query parameters and/or their values: -- `$removeparam=/regexp/[options]` убирает из URL-адреса любого запроса все параметры, соответствующие заданному регулярному выражению `regexp`. В отличие от базового синтаксиса, это означает *«‎убрать параметры запроса, нормализованные к строке `name=value`, которая соответствует `регулярному выражению`»*. `[options]` — это список опций регулярного выражения. На данный момент единственная поддерживаемая опция — это `i`, делающая соответствие нечувствительным к регистру. +- `$removeparam=/regexp/[options]` — removes query parameters that matches the `regexp` regular expression from URLs of any request. Unlike basic syntax, it means *"remove query parameters normalized to a `name=value` string which match the `regexp` regular expression"*. `[options]` here is the list of regular expression options. At the moment, the only supported option is `i` which makes matching case-insensitive. **Экранирование специальных символов** -Специальные символы должны быть закодированы в правиле URL, чтобы правильно соответствовать тексту URL. +Special characters should be URL-encoded in a rule to correctly match the URL text. -Например, чтобы удалить `?$param=true`, вы должны использовать правило `$removeparam=%24param`. +For example, to remove `?$param=true`, you should use the `$removeparam=%24param` rule. :::note -Пробелы и запятые также должны быть закодированы в URL, в противном случае правило не будет соответствовать URL. Однако `.`, `-`, `_` и `~` следует использовать как есть, поскольку они не помечены как зарезервированные символы в кодировке URL. +Spaces and commas should also be URL-encoded, otherwise the rule won't match the URL. However, `.`, `-`, `_`, and `~` should be used as they are, since they are not marked as reserved characters in URL encoding. ::: -Не забывайте экранировать специальные символы, такие как `.` в регулярных выражениях. Используйте для этого символ `\`. Например, экранированная точка должна выглядеть так: `\.`. +Remember to escape special characters like `.` in the regular expressions. Use the `\` character to do this. For example, an escaped dot should look like this: `\.`. :::note -Правила с регулярными выражениями применяются как к названию, так и к значению параметра. Чтобы свести к минимуму ошибки, рекомендуется начинать каждое регулярное выражение с `/^`, если только вы не хотите специально работать со значениями параметров. +Regexp-type rules apply to both the name and value of the parameter. To minimize errors, it is safer to start each regexp with `/^`, unless you are specifically targeting parameter values. ::: -**Удалите все параметры запроса** +**Remove all query parameters** -Укажите «‎голый» `$removeparam`, чтобы удалить все параметры запроса: +Specify naked `$removeparam` to remove all query parameters: -- `||example.org^$removeparam` удаляет все параметры запроса из URL-адресов, соответствующих правилу `||example.org^`. +- `||example.org^$removeparam` — removes all query parameters from URLs matching `||example.org^`. -**Инверсия** +**Inversion** -Используйте `~`, чтобы применить инверсию: +Use `~` to apply inversion: -- `$removeparam=~param` удаляет все параметры запроса, кроме `param`. -- `$removeparam=~/regexp/` удаляет все параметры запроса, которые не совпадают с заданным регулярным выражением `regexp`. +- `$removeparam=~param` — removes all query parameters with the name different from `param`. +- `$removeparam=~/regexp/` — removes all query parameters that do not match the `regexp` regular expression. :::note -Если `~` не встречается в начале правила, то в тексте оно рассматривается как символ. +If `~` does not appear at the beginning of the rule, it is treated as a symbol in the text. ::: -**Исключение правил с `$removeparam`** +**Negating `$removeparam`** -Этот тип правил работает практически так же, как и в случае с модификаторами [`$csp`](#csp-modifier) и [`$redirect`](#redirect-modifier). +This sort of rules work pretty much the same way it works with [`$csp`](#csp-modifier) and [`$redirect`](#redirect-modifier) modifiers. -Используйте `@@`, чтобы исключить правило с `$removeparam`: +Use `@@` to negate `$removeparam`: -- `@@||example.org^$removeparam` не даёт применять правила с `$removeparam` для URL, соответствующих `example.org`. -- `@@||example.org^$removeparam=param` не даёт применять правила с `$removeparam=param` для запросов к `example.org`. -- `@@||example.org^$removeparam=/regexp/` не даёт применять правила с `$removeparam=/regexp/` для запросов к `example.org`. +- `@@||example.org^$removeparam` negates all `$removeparam` rules for URLs that match `||example.org^`. +- `@@||example.org^$removeparam=param` negates the rule with `$removeparam=param` for any request matching `||example.org^`. +- `@@||example.org^$removeparam=/regexp/` negates the rule with `$removeparam=/regexp/` for any request matching `||example.org^`. **Несколько правил, соответствующих одному запросу** -В случае, когда несколько правил с `$removeparam` соответствуют одному запросу, они все будут применены по очереди. +In the case when multiple `$removeparam` rules match a single request, each of them will be applied one by one. **Примеры** @@ -2536,15 +2603,15 @@ $removeparam=/^(utm_content|utm_campaign|utm_referrer)=/ @@||example.com^$removeparam ``` -С помощью этих правил некоторые [UTM-параметры](https://ru.wikipedia.org/wiki/UTM-метки) будут удалены из любого запроса, за исключением запросов к `example.com`, которые не будут удалены вообще. Например, `http://google.com/page?utm_source=s&utm_referrer= fb.com&utm_content=img` будет преобразован в `http://google.com/page`, но на `http://example.com/page?utm_source=s&utm_referrer=fb.com&utm_content=img` правило блокировки не повлияет. +With these rules some [UTM parameters](https://en.wikipedia.org/wiki/UTM_parameters) will be stripped out from any request, except that requests to `example.com` will not be stripped at all, e.g. `http://google.com/page?utm_source=s&utm_referrer=fb.com&utm_content=img` will be transformed to `http://google.com/page`, but `http://example.com/page?utm_source=s&utm_referrer=fb.com&utm_content=img` will not be affected by the blocking rule. -- `$removeparam=utm_source` удаляет параметр `utm_source` из всех запросов. +- `$removeparam=utm_source` removes `utm_source` query parameter from all requests. -- `$removeparam=/utm_.*/` удаляет все параметры `utm_*` из URL любого запроса. Например, запрос `http://example.com/page?utm_source=test` будет трансформирован в `http://example.com/page`. +- `$removeparam=/utm_.*/` removes all `utm_* query` parameters from URL queries of any request, e.g. a request to `http://example.com/page?utm_source=test` will be transformed to `http://example.com/page`. -- `$removeparam=/^utm_source=campaign$/` удаляет параметр `utm_source` со значением `campaign`. Не затрагивает другие параметры `utm_source`. +- `$removeparam=/^utm_source=campaign$/` removes `utm_source` query parameter with the value equal to `campaign`. It does not touch other `utm_source` parameters. -**Исключение правила с `$removeparam` и замена его другим** +**Negating one `$removeparam` rule and replacing it with a different rule** ```adblock $removeparam=/^(gclid|yclid|fbclid)=/ @@ -2552,9 +2619,9 @@ $removeparam=/^(gclid|yclid|fbclid)=/ ||example.com^$removeparam=/^(yclid|fbclid)=/ ``` -Эти правила удаляют Click ID Google, Яндекса и Facebook. Есть одно исключение: Google Click ID (gclid) не будет удалён из запросов к example.com. +With these rules, Google, Yandex, and Facebook Click IDs will be removed from all requests. There is one exception: Google Click ID (gclid) will not be removed from requests to example.com. -**Исключение правила с `$removeparam` для всех параметров** +**Negating `$removeparam` for all parameters** ```adblock $removeparam=/^(utm_source|utm_medium|utm_term)=/ @@ -2562,18 +2629,18 @@ $removeparam=/^(utm_content|utm_campaign|utm_referrer)=/ @@||example.com^$removeparam ``` -Эти правила удаляют указанные UTM-параметры из всех запросов, кроме запросов к `example.org`. +With these rules, specified UTM parameters will be removed from any request save for requests to `example.org`. -Правила с `$removeparam` также можно отключить с помощью правил исключений с `$document` и `$urlblock`. Но базовые правила исключений без модификаторов не могут этого сделать. Например, `@@||example.com^` не отключит `$removeparam=p` для запросов к **example.com**, а вот `@@||example.com^$urlblock` — отключит. +`$removeparam` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$removeparam=p` for requests to **example.com**, but `@@||example.com^$urlblock` will. -##### Ограничения модификатора `$removeparam` {#removeparam-modifier-limitations} +##### `$removeparam` modifier limitations {#removeparam-modifier-limitations} :::caution Ограничения -[AdGuard для Chrome MV3][ext-mv3] имеет некоторые ограничения: +[AdGuard for Chrome MV3][ext-mv3] has some limitations: -- Регулярные выражения, отрицание и правила белого списка не поддерживаются. -- Группа похожих правил `$removeparam` будет объединена в одно. Пример: +- Regular expressions, negation and allowlist rules are not supported. +- Group of similar `$removeparam` rules will be combined into one. Пример: ```bash ||testcases.adguard.com$xmlhttprequest,removeparam=p1case1 @@ -2646,45 +2713,45 @@ $removeparam=/^(utm_content|utm_campaign|utm_referrer)=/ :::info Совместимость -- Правила с модификатором `$removeparam` поддерживаются в AdGuard для Windows, AdGuard для Mac и AdGuard для Android с [CoreLibs][] версии 1.7 или выше, а также в Браузерном расширении AdGuard версии 3.6 или выше. -- Синтаксис `$removeparam` для регулярных выражений поддерживается в AdGuard для Windows, AdGuard для Mac и AdGuard для Android с [CoreLibs][] версии 1.8 или выше, а также в Браузерном расширении AdGuard версии 4.0 или выше. -- Запросы `POST` поддерживаются только в AdGuard для Windows, Mac и Android с [CoreLibs][] версии 1.10 или выше, и в Браузерном расширении AdGuard с [TSWebExtension][] версии 0.4.6 или выше. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. +- `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. ::: #### **`$replace`** {#replace-modifier} -Этот модификатор полностью меняет поведение правила. Когда он применяется, правило не блокирует запрос. Вместо этого ответ модифицируется. +Этот модификатор полностью меняет поведение правила. If it is applied, the rule will not block the request. The response is going to be modified instead. -Вам потребуется знание регулярных выражений, чтобы использовать модификатор `$replace`. +You will need some knowledge of regular expressions to use `$replace` modifier. -**Функции** +**Features** -- Правила с `$replace` применяются к любому текстовому ответу, но не применяются к binary (`media`, `image`, `object` и т. д.). -- Правила с `$replace` не применяются к ответам размером больше 10 МБ. -- Правила с `$replace` обладают более высоким приоритетом, чем другие базовые правила (**включая** правила исключений). Если запрос соответствует двум различным правилам, одно из которых имеет модификатор `$replace`, применится именно это правило. -- Правила исключений уровня document с модификаторами `$content` или `$document` отменяют срабатывание правил `$replace`, даже если запрос им соответствует. -- Прочие правила исключений уровня document (с модификаторами `$generichide`, `$elemhide` или `$jsinject`) применяются вместе с правилами `$replace`. Это означает, что вы можете изменять содержимое страницы при помощи правила `$replace` и отключить косметические правила там же. +- `$replace` rules apply to any text response, but will not apply to binary (`media`, `image`, `object`, etc.). +- `$replace` rules do not apply if the size of the original response is more than 10 MB. +- `$replace` rules have a higher priority than other basic rules (**including** exception rules). So if a request natches two different rules, one of which has the `$replace` modifier, this rule will be applied. +- Document-level exception rules with `$content` or `$document` modifiers do disable `$replace` rules for requests matching them. +- Other document-level exception rules (`$generichide`, `$elemhide` or `$jsinject` modifiers) are applied alongside `$replace` rules. It means that you can modify the page content with a `$replace` rule and disable cosmetic rules there at the same time. -Значение `$replace` может быть пустым в случае правил исключений. Более подробную информацию вы найдёте в разделе с примерами. +`$replace` value can be empty in the case of exception rules. See examples section for further information. **Несколько правил, соответствующих одному запросу** -В случае, когда несколько правил `$replace` соответствуют одному запросу, мы применим каждое из них. **Правила будут применяться в алфавитном порядке.** +In case if multiple `$replace` rules match a single request, we will apply each of them. **The order is defined alphabetically.** **Синтаксис** -В целом синтаксис `$replace` аналогичен замене регулярными выражениями [в Perl](http://perldoc.perl.org/perlrequick.html#Search-and-replace). +In general, `$replace` syntax is similar to replacement with regular expressions [in Perl](http://perldoc.perl.org/perlrequick.html#Search-and-replace). ```text replace = "/" regexp "/" replacement "/" modifiers ``` -- **`regexp`** — регулярное выражение. -- **`replacement`** — строка, которая будет использована для замены строки в соответствии с `regexp`. -- **`modifiers `** — флаги регулярных выражений. Например, `i` — поиск без учёта регистра, `s` — режим одной строки. +- **`regexp`** — a regular expression. +- **`replacement`** — a string that will be used to replace the string corresponding to `regexp`. +- **`modifiers`** — a regular expression flags. For example, `i` — insensitive search, or `s` — single-line mode. -В значении `$replace` необходимо экранировать два символа: запятую `,` и знак доллара `$`. Используйте для этого обратный слеш `\`. Например, экранированная запятая будет выглядеть так: `\,`. +In the `$replace` value, two characters must be escaped: comma `,` and dollar sign `$`. Use backslash `\` for it. For example, an escaped comma looks like this: `\,`. **Примеры** @@ -2692,79 +2759,79 @@ replace = "/" regexp "/" replacement "/" modifiers ||example.org^$replace=/()[\s\S]*<\/VAST>/\$1<\/VAST>/i ``` -У этого правила три части: +There are three parts in this rule: -- `regexp` (регулярное выражение) — `()(.|\s)*<\/VAST>` -- `replacement` (замена) — `\$1<\/VAST>` где `$` экранируется -- `modifiers` (флаги регулярных выражений) — `i` для поиска без учёта регистра +- `regexp` — `()(.|\s)*<\/VAST>`; +- `replacement` — `\$1<\/VAST>` where `$` is escaped; +- `modifiers` — `i` for insensitive search. -Здесь вы можете увидеть, как работает это правило: http://regexr.com/3cesk +You can see how this rule works here: http://regexr.com/3cesk -**Несколько правил с `$replace`** +**Multiple `$replace` rules** 1. `||example.org^$replace=/X/Y/` 2. `||example.org^$replace=/Z/Y/` 3. `@@||example.org/page/*$replace=/Z/Y/` -- Правила 1 и 2 будут применены ко всем запросам, отправленным к `example.org`. -- Правило 2 отключено для запросов, соответствующих `||example.org/page/`, **но правило 1 при этом всё равно работает!** +- Both rule 1 and 2 will be applied to all requests sent to `example.org`. +- Rule 2 is disabled for requests matching `||example.org/page/`, **but rule 1 still works!** -**Отключение правил с `$replace`** +**Disabling `$replace` rules** -- `@@||example.org^$replace` отключит все правила `$replace`, соответствующие `||example.org^`. -- `@@||example.org^$document` или `@@||example.org^$content` отключит все правила `$replace`, **исходящие** со страниц домена `example.org`, **включая саму эту страницу**. +- `@@||example.org^$replace` will disable all `$replace` rules matching `||example.org^`. +- `@@||example.org^$document` or `@@||example.org^$content` will disable all `$replace` rules **originated from** pages of `example.org` **including the page itself**. :::caution Ограничения -Правила с модификатором `$replace` могут использоваться [**только в доверенных фильтрах**](#trusted-filters). +Rules with the `$replace` modifier can only be used [**in trusted filters**](#trusted-filters). ::: :::info Совместимость -Правила с модификатором `$replace` поддерживаются в AdGuard для Windows, AdGuard для Mac, AdGuard для Android, а также в Браузерном расширении AdGuard для Firefox. Другие расширения не могут модифицировать содержимое страниц на сетевом уровне, поэтому там эти правила не работают. +Rules with `$replace` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox. Such rules do not work in extensions for other browsers because they are unable to modify content on the network level. ::: #### **`$urltransform`** {#urltransform-modifier} -Правила `$urltransform` позволяют изменять URL-адрес запроса, заменяя текст, соответствующий регулярным выражениям. +The `$urltransform` rules allow you to modify the request URL by replacing text matched by a regular expression. -**Функции** +**Features** -- Правила `$urltransform` обычно применяются только к частям URL-адреса, относящимся к пути и запросу, одно исключение см. ниже. -- `$urltransform` не будет применяться, если исходный URL-адрес заблокирован другими правилами. -- `$urltransform` будет применяться перед правилами `$removeparam`. +- `$urltransform` rules normally only apply to the path and query parts of the URL, see below for one exception. +- `$urltransform` will not be applied if the original URL is blocked by other rules. +- `$urltransform` will be applied before `$removeparam` rules. -Значение `$urltransform` может быть пустым для правил исключений. +The `$urltransform` value can be empty for exception rules. **Несколько правил, соответствующих одному запросу** -Если несколько правил `$urltransform` соответствуют одному запросу, мы применим каждое из них. **Правила будут применяться в алфавитном порядке.** +If multiple `$urltransform` rules match a single request, we will apply each of them. **The order is defined alphabetically.** **Синтаксис** -Синтаксис `$urltransform` аналогичен замене регулярными выражениями [в Perl](http://perldoc.perl.org/perlrequick.html#Search-and-replace). +`$urltransform` syntax is similar to replacement with regular expressions [in Perl](http://perldoc.perl.org/perlrequick.html#Search-and-replace). ```text urltransform = "/" regexp "/" replacement "/" modifiers ``` -- **`regexp`** — регулярное выражение. -- **`replacement`** — строка, которая будет использована для замены строки в соответствии с `regexp`. -- **`modifiers `** — флаги регулярных выражений. Например, `i` — поиск без учёта регистра, `s` — режим одной строки. +- **`regexp`** — a regular expression. +- **`replacement`** — a string that will be used to replace the string corresponding to `regexp`. +- **`modifiers`** — a regular expression flags. For example, `i` — insensitive search, or `s` — single-line mode. -В значении `$urltransform` необходимо экранировать два символа: запятую `,` и знак доллара `$`. Для этого используйте обратный слеш `\`. Например, экранированная запятая будет выглядеть так: `\,`. +In the `$urltransform` value, two characters must be escaped: the comma `,` and the dollar sign `$`. Use the backslash character `\` for this. For example, an escaped comma looks like this: `\,`. -**Изменение происхождения** +**Changing the origin** :::info Совместимость -Этот раздел относится только к AdGuard для Windows, AdGuard для Mac и AdGuard для Android с [CoreLibs][] 1.17 или более поздней версии. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: -Как указано выше, обычно правилам `$urltransform` разрешено изменять только части пути и запроса URL-адреса. Однако, если `regexp` правила начинается со строки `^http`, то полный URL ищется и может быть изменён правилом. Такое правило не будет применяться, если преобразование URL не может быть выполнено с помощью HTTP-перенаправления (например, если метод запроса — `POST`). +As stated above, normally `$urltransform` rules are only allowed to change the path and query parts of the URL. However, if the rule's `regexp` begins with the string `^http`, then the full URL is searched and can be modified by the rule. Such a rule will not be applied if the URL transformation can not be achieved via an HTTP redirect (for example, if the request's method is `POST`). **Примеры** @@ -2772,56 +2839,78 @@ urltransform = "/" regexp "/" replacement "/" modifiers ||example.org^$urltransform=/(pref\/).*\/(suf)/\$1\$2/i ``` -У этого правила три части: +There are three parts in this rule: -- `regexp` — `(pref\/).*\/(suf)` -- `replacement` — `\$1\$2`, где `$` экранируется -- `modifiers` (флаги регулярных выражений) — `i` для поиска без учёта регистра +- `regexp` — `(pref\/).*\/(suf)`; +- `replacement` — `\$1\$2` where `$` is escaped; +- `modifiers` — `i` for insensitive search. -**Несколько правил с `$urltransform`** +**Multiple `$urltransform` rules** 1. `||example.org^$urltransform=/X/Y/` 2. `||example.org^$urltransform=/Z/Y/` 3. `@@||example.org/page/*$urltransform=/Z/Y/` -- Правила 1 и 2 будут применены ко всем запросам, отправленным к `example.org`. -- Правило 2 отключено для запросов, соответствующих `||example.org/page/`, **но правило 1 при этом всё равно работает!** +- Both rule 1 and 2 will be applied to all requests sent to `example.org`. +- Rule 2 is disabled for requests matching `||example.org/page/`, **but rule 1 still works!** -**Повторное сопоставление правил после преобразования URL** +**Re-matching rules after transforming the URL** -После применения всех соответствующих правил `$urltransform` преобразованный запрос будет сопоставлен со всеми остальными правилами: +After applying all matching `$urltransform` rules, the transformed request will be matched against all other rules: -Например, при следующих правилах: +E.g., with the following rules: ```adblock ||example.com^$urltransform=/firstpath/secondpath/ ||example.com/secondpath^ ``` -запрос к `https://example.com/firstpath` будет заблокирован. +the request to `https://example.com/firstpath` will be blocked. + +**Disabling `$urltransform` rules** + +- `@@||example.org^$urltransform` will disable all `$urltransform` rules matching `||example.org^`. +- `@@||example.org^$urltransform=/Z/Y/` will disable the rule with `$urltransform=/Z/Y/` for any request matching `||example.org^`. + +`$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. + +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` -**Отключение правил с `$urltransform`** +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: -- `@@||example.org^$urltransform` отключит все правила с `$urltransform`, где есть `||example.org^`. -- `@@||example.org^$urltransform=/Z/Y/` отключит правило с `$urltransform=/Z/Y/` для любого запроса, соответствующего `||example.org^`. +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` -Правила с `$urltransform` также можно отключить, используя правила исключений с `$document` и `$urlblock`. Но базовые правила исключений без модификаторов не могут этого сделать. Например, `@@||example.com^` не отключит `$urltransform=/X/Y/` для запросов к **example.com**, а `@@||example.com^$urlblock` отключит. +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. :::caution Ограничения -Правила с модификатором `$urltransform` могут использоваться [**только в доверенных фильтрах**](#trusted-filters). +Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). ::: :::info Совместимость -Правила с модификатором `$urltransform` поддерживаются в AdGuard для Windows, AdGuard для Mac и AdGuard для Android с [CoreLibs][] версии 1.15 или выше. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: #### **`noop`** {#noop-modifier} -Модификатор `noop` не делает ничего и используется только для того, чтобы улучшить читаемость правил. Он состоит из последовательности символов нижнего подчёркивания (`_`) произвольной длины и может фигурировать в правиле так часто, как это необходимо. +`noop` modifier does nothing and can be used solely to increase rules' readability. It consists of a sequence of underscore characters (`_`) of arbitrary length and can appear in a rule as often as needed. **Примеры** @@ -2832,84 +2921,84 @@ urltransform = "/" regexp "/" replacement "/" modifiers :::info Совместимость -Правила с модификатором `noop` не поддерживаются в AdGuard Content Blocker. +Rules with `noop` modifier are not supported by AdGuard Content Blocker. ::: #### **`$empty` (устаревший)** {#empty-modifier} -:::caution Скоро устареет +:::caution Deprecation notice -Этот модификатор считается устаревшим. Вместо него теперь используется [модификатор `$redirect`](#redirect-modifier). Правила с `$empty` всё ещё поддерживаются и преобразуются в `$redirect=nooptext`, но в будущем перестанут поддерживаться. +This modifier is deprecated in favor of the [`$redirect` modifier](#redirect-modifier). Rules with `$empty` are still supported and being converted into `$redirect=nooptext` now but the support shall be removed in the future. ::: -Обычно заблокированный запрос выглядит для браузера как ошибка сервера. В случае применения модификатора `$empty` AdGuard эмулирует пустой ответ сервера со статусом `200 OK`. +Usually, blocked requests look like a server error to browser. If you use `$empty` modifier, AdGuard will emulate a blank response from the server with`200 OK` status. **Примеры** -- `||example.org^$empty` возвращает пустой ответ для всех запросов к домену `example.org` и всех его поддоменов. +- `||example.org^$empty` returns an empty response to all requests to `example.org` and all subdomains. :::info Совместимость -Правила с модификатором `$empty` не поддерживаются в AdGuard Content Blocker, AdGuard для iOS и AdGuard для Safari. +Rules with `$empty` modifier are not supported by AdGuard Content Blocker, AdGuard for iOS, and AdGuard for Safari. ::: #### **`$mp4` (устаревший)** {#mp4-modifier} -:::caution Скоро устареет +:::caution Deprecation notice -Этот модификатор считается устаревшим. Вместо него теперь используется [модификатор `$redirect`](#redirect-modifier). Правила с `$mp4` всё ещё поддерживаются и преобразуются в `$redirect=noopmp4-1s,media`, но в будущем перестанут поддерживаться. +This modifier is deprecated in favor of the [`$redirect` modifier](#redirect-modifier). Rules with `$mp4` are still supported and being converted into `$redirect=noopmp4-1s,media` now but the support shall be removed in the future. ::: -В качестве ответа на заблокированный запрос AdGuard возвращает короткую видео-заглушку. +As a response to blocked request AdGuard returns a short video placeholder. **Примеры** -- `||example.com/videos/$mp4` блокирует загрузку видео с адресов `||example.com/videos/*` и заменяет ответ на видео-заглушку. +- `||example.com/videos/$mp4` blocks all video downloads from `||example.com/videos/*` and changes the response to a video placeholder. :::info Совместимость -Правила с модификатором `$mp4` не поддерживаются в AdGuard Content Blocker, AdGuard для iOS и AdGuard для Safari. +Rules with `$mp4` modifier are not supported by AdGuard Content Blocker, AdGuard for iOS, and AdGuard for Safari. ::: ### Приоритеты правил {#rule-priorities} -Каждое правило имеет свой приоритет, что необходимо, когда запросу соответствует несколько правил и фильтрующий механизм должен выбрать одно из них. Приоритет измеряется целым положительным числом. +Each rule has its own priority, which is necessary when several rules match the request and the filtering engine needs to select one of them. Priority is measured by a positive integer. -:::note Конфликты +:::note Collisions -Когда два правила с одинаковым приоритетом соответствуют одному и тому же запросу, реализация механизма фильтрации определяет, какое из них будет выбрано. +When two rules with the same priority match the same request, the filter engine implementation determines which one is chosen. ::: :::info -Концепция приоритетов правил становится всё более важной в свете Manifest V3, поскольку существующие правила должны быть преобразованы в правила declarativeNetRequest. +The concept of rule priorities becomes increasingly important in light of Manifest V3, as the existing rules need to be converted to declarativeNetRequest rules. ::: #### Расчёт приоритетов -Для расчёта приоритета мы разделили модификаторы на разные группы. Эти группы ранжируются по степени приоритетности, от низшей к высшей. Модификатор, существенно сужающий область действия правила, увеличивает вес его общего приоритета. И наоборот, если правило применяется к более широкому кругу запросов, то его приоритет снижается. +To calculate priority, we've categorized modifiers into different groups. These groups are ranked based on their priority, from lowest to highest. A modifier that significantly narrows the scope of a rule adds more weight to its total priority. Conversely, if a rule applies to a broader range of requests, its priority decreases. -Следует отметить, что существуют случаи, когда модификатор с одним параметром имеет более высокий приоритет, чем тот, у которого много параметров. Например, в случае `$domain=example.com|example.org`правило, включающее два домена, имеет несколько более широкую область действия, чем правило с одним указанным доменом, поэтому его приоритет ниже. +It's worth noting that there are cases where a single-parameter modifier has a higher priority than multi-parameter ones. For instance, in the case of `$domain=example.com|example.org`, a rule that includes two domains has a slightly broader effective area than a rule with one specified domain, therefore its priority is lower. -Базовый приоритет любого правила равен 1. Если вычисленный приоритет — число с плавающей точкой, то оно будет **округлено в большую сторону** до наименьшего целого числа, большего или равного вычисленному приоритету. +The base priority of any rule is 1. If the calculated priority is a floating-point number, it will be **rounded up** to the smallest integer greater than or equal to the calculated priority. :::info Совместимость -- Понятие приоритета было введено [в tsurlfilter][] 2.1.0 и [CoreLibs][] 1.13. До этого в AdGuard не было специального алгоритма вычисления приоритетов, и обработка конфликтов могла отличаться в зависимости от продукта и версии AdGuard. -- AdGuard для iOS, Safari и AdGuard Content Blocker зависят от реализации браузера и не могут следовать указанным здесь правилам. +- The concept of priority has been introduced in [TSUrlFilter][] v2.1.0 and [CoreLibs][] v1.13. Before that AdGuard didn't have any special priority computation algorithm and collisions handling could be different depending on AdGuard product and version. +- AdGuard for iOS, Safari, and AdGuard Content Blocker rely on the browsers implementation and they cannot follow the rules specified here. ::: :::note -Псевдонимы-модификаторы (`1p`, `3p` и т. д.) не входят в эти категории, однако они используются в движке для вычисления приоритета правила. +Modifier aliases (`1p`, `3p`, etc.) are not included in these categories, however, they are utilized within the engine to compute the rule priority. ::: @@ -2917,22 +3006,22 @@ urltransform = "/" regexp "/" replacement "/" modifiers -- [`$app`](#app-modifier) с исключаемыми приложениями с использованием `~`, +- [`$app`](#app-modifier) with negated applications using `~`, - [`$denyallow`](#denyallow-modifier), -- [`$domain`](#domain-modifier) с исключаемыми доменами с использованием `~`, +- [`$domain`](#domain-modifier) with negated domains using `~`, - [`$match-case`](#match-case-modifier), -- [`$method`](#method-modifier) с исключаемыми методами с использованием `~`, +- [`$method`](#method-modifier) with negated methods using `~`, - [`$strict-first-party`](#strict-first-party-modifier), - [`$strict-third-party`](#strict-third-party-modifier), - [`$third-party`](#third-party-modifier), - [`$to`](#to-modifier), -- ограниченные модификаторы [сontent-type](#content-type-modifiers) с `~`. +- restricted [content-types](#content-type-modifiers) with `~`. -При работе с исключаемым доменом, приложением, методом или типом содержимого мы добавляем **1 балл** за существование самого модификатора, независимо от количества исключаемых доменов или типов содержимого. Это связано с тем, что область действия правила и так бесконечно широка. Проще говоря, запрещая несколько доменов, модификаторов content-type, методов или приложений, мы лишь немного сужаем область действия правила. +When dealing with a negated domain, app, method, or content-type, we add **1 point** for the existence of the modifier itself, regardless of the quantity of negated domains or content-types. This is because the rule's scope is already infinitely broad. Put simply, by prohibiting multiple domains, content-types, methods or apps, the scope of the rule becomes only minimally smaller. #### Определённые модификаторы content-type, методы, заголовки, $all, $popup, специальные исключения {#priority-category-2} -Все правильные типы контента: +All valid content types: @@ -2949,15 +3038,15 @@ urltransform = "/" regexp "/" replacement "/" modifiers - [`$websocket`](#websocket-modifier), - [`$xmlhttprequest`](#xmlhttprequest-modifier); -Сюда также входят правила, которые неявно добавляют все типы контента: +This also includes rules that implicitly add all content types: - [`$all`](#all-modifier); -Или правила, которые неявно добавляют модификатор `$document`: +Or rules that implicitly add the modifier `$document`: - [`$popup`](#popup-modifier); -Или некоторые специальные исключения, которые неявно добавляют `$document,subdocument`: +Or some specific exceptions that implicitly add `$document,subdocument`: @@ -2970,25 +3059,25 @@ urltransform = "/" regexp "/" replacement "/" modifiers - [`$specifichide`](#specifichide-modifier), - [`$urlblock`](#urlblock-modifier); -Или методы, разрешённые модификатором [`$method`](#method-modifier). +Or allowed methods via [`$method`](#method-modifier). -Или правила с [`$header`](#header-modifier). +Or rules with [`$header`](#header-modifier). -Наличие любых модификаторов content-type добавляет `(50 + 50 / N)`, где `N` — количество модификаторов, например: `||example.com^$image,script` добавит `50 + 50 / 2 = 50 + 25 = 75` к общему весу правила. +The presence of any content-type modifiers adds `(50 + 50 / N)`, where `N` is the number of modifiers present, for example: `||example.com^$image,script` will add `50 + 50 / 2 = 50 + 25 = 75` to the total weight of the rule. The `$all` also belongs to this category, because it implicitly adds all content-type modifiers, e.g., `$document,subdocument,image,script,media,` + `$popup`. -К этой категории относится и `$popup`, так как в нём неявно добавляется модификатор `$document`. Аналогично, конкретные исключения добавляют `$document,subdocument`. +The `$popup` also belongs to this category, because it implicitly adds the modifier `$document`. Similarly, specific exceptions add `$document,subdocument`. -Если в правиле есть модификатор `$method` с разрешёнными методами, то он добавляет `(50 + 50 / N)`, где `N` — количество разрешённых методов, например: `||example.com^$method=GET|POST|PUT` добавит `50 + 50 / 3 = 50 + 16,6 = 67` к общему весу правила. +If there is a `$method` modifier in the rule with allowed methods it adds `(50 + 50 / N)`, where `N` is the number of methods allowed, for example: `||example.com^$method=GET|POST|PUT` will add `50 + 50 / 3 = 50 + 16.6 = 67` to the total weight of the rule. -Если в правиле есть модификатор `$header`, то он добавляет `50`. +If there is a `$header` modifier in the rule, it adds `50`. #### `$domain` или `$app` с разрешёнными доменами или приложениями {#priority-category-3} -Домены или приложения, указанные с помощью `$domain` и `$app` соответственно, добавят `100 + 100 / N`, где `N` — количество значений модификатора, например: `||example.com^$domain=example.com|example.org|example.net` добавит `100 + 100 / 3 = 135` или `||example.com^$app=org.example.app1|org.example.app2` добавит `100 + 100 / 2 = 100 + 51 = 151` или `||example.com^$domain=example.com,app=org.example.app1|org.example.app2` добавит `100 + 100/1` (часть $domain) и `100 + 100/2` (часть $app) — в сумме `350`. +Specified domains through `$domain` or specified applications through `$app` add `100 + 100 / N`, where `N` is the number of modifier values for example: `||example.com^$domain=example.com|example.org|example.net` will add `100 + 100 / 3 = 134.3 = 135` or `||example.com^$app=org.example.app1|org.example.app2` will add `100 + 100 / 2 = 151` or `||example.com^$domain=example.com,app=org.example.app1|org.example.app2` will add `100 + 100/1` ($domain part) and `100 + 100/2` ($app part), totaling `350`. -Значения модификаторов regexps или tld будут интерпретироваться как обычные записи вида `example.com` и считаться по одному, например: `||example.com^$domain=example.*` будет добавлено `100 + 100 / 1 = 200` или `||example.com^$domain=example.*|adguard.*` будет добавлено `100 + 100 / 2 = 150`. +Modifier values that are regexps or tld will be interpreted as normal entries of the form `example.com` and counted one by one, for example: `||example.com^$domain=example.*` will add `100 + 100 / 1 = 200` or `||example.com^$domain=example.*|adguard.*` will add `100 + 100 / 2 = 150`. #### Правила `$redirect` {#priority-category-6} @@ -2997,7 +3086,7 @@ The `$all` also belongs to this category, because it implicitly adds all content - [`$redirect`](#redirect-modifier), - [`$redirect-rule`](#redirect-rule-modifier). -Каждое из них добавляет `10^3` к приоритету правила. +Each of which adds `10^3` to rule priority. #### Особые исключения {#priority-category-4} @@ -3012,19 +3101,19 @@ The `$all` also belongs to this category, because it implicitly adds all content - [`$specifichide`](#specifichide-modifier), - [`$urlblock`](#urlblock-modifier); -Каждое из них добавляет `10^4` к приоритету. +Each of which adds `10^4` to the priority. -Исключение с модификатором [`$document`](#document-modifier) в том числе: это псевдоним для `$elemhide, content,jsinject,urlblock,extension`. Оно добавит `10^4` для каждого модификатора из [верхнего списка](#priority-category-4), `10^4 * 5` в сумме. +As well as exception with [`$document modifier`](#document-modifier): because it's an alias for `$elemhide,content,jsinject,urlblock,extension`. It will add `10^4` for each modifier from [the top list](#priority-category-4), `10^4 * 5` in total. -Кроме того, каждое из этих исключений неявно добавляет два разрешённых модификатора типа контента: `$document,subdocument`. +In addition, each of these exceptions implicitly adds the two allowed content-type modifiers `$document,subdocument`. #### Правила белого списка {#priority-category-5} -Модификатор `@@` добавляет `10^5` к приоритету правила. +Modifier `@@` adds `10^5` to rule priority. #### Правила `$important` {#priority-category-7} -Модификатор [`$important`](#important-modifier) добавляет `10^6` к приоритету правила. +Modifier [`$important`](#important-modifier) adds `10^6` to rule priority. #### Правила, для которых нет веса приоритета {#priority-category-extra} @@ -3040,43 +3129,43 @@ The [`$replace`](#replace-modifier) modifier takes precedence over all blocking 1. `||example.com^` - Вес правила без модификаторов: `1`. + Weight of the rule without modifiers: `1`. 1. `||example.com^$match-case` - Вес правила: базовый вес + вес модификатора из [категории 1](#priority-category-1): `1 + 1 = 2`. + Rule weight: base weight + weight of the modifier from [category 1](#priority-category-1): `1 + 1 = 2`. 1. `||example.org^$removeparam=p` - Вес правила: базовый вес + 0, так как $removeparam [не участвует](#priority-category-extra) в расчёте приоритета: `1 + 0 = 1`. + Rule weight: base weight + 0, since $removeparam [is not involved](#priority-category-extra) in the priority calculation: `1 + 0 = 1`. 1. `||example.org^$document,redirect=nooptext` - Вес правила: базовый вес + допустимый тип содержимого, [категория 3](#priority-category-3) + $redirect из [категория 6](#priority-category-6): `1 + (100 + 100 / 1) + 1000 = 1201`. + Rule weight: base weight + allowed content type, [category 3](#priority-category-3) + $redirect from [category 6](#priority-category-6): `1 + (100 + 100 / 1) + 1000 = 1201`. 1. `@@||example.org^$removeparam=p,document` - Вес правила: базовый вес + правило белого списка, [категория 5](#priority-category-5) + 0, потому что $removeparam [не участвует](#priority-category-extra) в расчёте приоритета + разрешённый тип контента, [категория 2](#priority-category-2): `1 + 10000 + 0 + (50 + 50 / 1) = 10101`. + Rule weight: base weight + allowlist rule, [category 5](#priority-category-5) + 0 because $removeparam [is not involved](#priority-category-extra) in the priority calculation + allowed content type, [category 2](#priority-category-2): `1 + 10000 + 0 + (50 + 50 / 1) = 10101`. 1. `@@||example.com/ad/*$domain=example.org|example.net,important` - Вес правила: базовый вес + правило белого списка, [категория 5](#priority-category-5) + важное правило, [категория 7](#priority-category-7) + разрешённые домены, [категория 3](#priority-category-3): `1 + 10000 + 1000000 + (100 + 100 / 2) = 1010152`. + Rule weight: base weight + allowlist rule, [category 5](#priority-category-5) + important rule, [category 7](#priority-category-7) + allowed domains, [category 3](#priority-category-3): `1 + 10000 + 1000000 + (100 + 100 / 2) = 1010152`. -1. `@@||example.org^$document` без дополнительных модификаторов — это псевдоним для `@@|||example.com^$elemhide,content,jsinject,urlblock,extension` +1. `@@||example.org^$document` without additional modifiers is an alias for `@@||example.com^$elemhide,content,jsinject,urlblock,extension` - Вес правила: базовый вес + специфические исключения, [категория 4](#priority-category-4) + два разрешённых типа контента (document и subdocument), [категория 2](#priority-category-2): `1 + 10000 * 4 + (50 + 50 / 2) = 40076`. + Rule weight: base weight + specific exceptions, [category 4](#priority-category-4) + two allowed content types (document and subdocument), [category 2](#priority-category-2): `1 + 10000 * 4 + (50 + 50 / 2) = 40076`. 1. `*$script,domain=a.com,denyallow=x.com|y.com` - Вес правила: базовый вес + разрешённый тип контента, [категория 2](#priority-category-2) + разрешённый домен, [категория 3](#priority-category-3) + отказ, [категория 1](#priority-category-1): `1 + (50 + 50/1) + (100 + 100 / 1) + 1 = 303`. + Rule weight: base weight + allowed content type, [category 2](#priority-category-2) + allowed domain, [category 3](#priority-category-3) + denyallow, [category 1](#priority-category-1): `1 + (50 + 50/1) + (100 + 100 / 1) + 1 = 303`. -1. `||example.com^$all` — псевдоним для `||example.com^$document,subdocument,image,script,media и т. д. + $popup` +1. `||example.com^$all` — alias to `||example.com^$document,subdocument,image,script,media,etc. + $popup` - Вес правила: базовый вес + всплывающее окно ([категория 1](#priority-category-1)) + разрешённые типы контента ([категория 2](#priority-category-2)): `1 + 1 + (50 + 50/12) = 55`. + Rule weight: base weight + popup ([category 1](#priority-category-1)) + allowed content types ([category 2](#priority-category-2)): `1 + 1 + (50 + 50/12) = 55`. ## Другие правила {#non-basic-rules} -Базовых правил может быть недостаточно для блокировки рекламы. Иногда для этого требуется скрыть какой-нибудь элемент или изменить часть HTML-кода страницы, при этом ничего не сломав. Для этого предназначены правила, описанные в данном разделе. +However, basic rules may not be enough to block ads. Sometimes you need to hide an element or change part of the HTML code of a web page without breaking anything. The rules described in this section are created specifically for this purpose. | Категории \ Продукты | [Приложения CoreLibs][cl-apps] | [AdGuard для Chromium][ext-chr] | [AdGuard для Chrome MV3][ext-mv3] | [AdGuard для Firefox][ext-ff] | [AdGuard для iOS][ios-app] | [AdGuard для Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | | --------------------------------------------- |:------------------------------:|:-------------------------------:|:---------------------------------:|:-----------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| @@ -3090,23 +3179,23 @@ The [`$replace`](#replace-modifier) modifier takes precedence over all blocking :::note - ✅ — полностью поддерживается -- ❌ — не поддерживается +- ❌ — not supported ::: -## Косметические правила {#cosmetic-rules} +## Cosmetic rules {#cosmetic-rules} :::info -Для работы с косметическими правилами необходимы знания HTML и CSS. Итак, если вы хотите научиться создавать такие правила, рекомендуем ознакомиться [с этой документацией](https://developer.mozilla.org/ru/docs/Learn_web_development/Core/Styling_basics/What_is_CSS). +Work with non-basic rules requires the basic knowledge of HTML and CSS. So, if you want to learn how to make such rules, we recommend to get acquainted with [this documentation](https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Getting_started/What_is_CSS). ::: ### Правила скрытия элементов {#cosmetic-elemhide-rules} -Правила скрытия элементов предназначены, как это следует из их названия, для скрытия элементов веб-страниц. По сути это аналогично применению стиля `{ display: none; }` к выбранному элементу. +Element hiding rules are used to hide the elements of web pages. It is similar to applying `{ display: none; }` style to selected element. -Правила скрытия элементов работают по-разному, и их приоритет меняется [в зависимости от платформы](#cosmetic-rules-priority). +Element hiding rules may operate differently [depending on the platform](#cosmetic-rules-priority). #### Синтаксис @@ -3115,66 +3204,66 @@ The [`$replace`](#replace-modifier) modifier takes precedence over all blocking domains = [domain0, domain1[, ...[, domainN]]] ``` -- **`selector`** — [CSS селектор](https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Getting_Started/Selectors), определяет элементы, которые нужно скрыть. -- **`domains`** — доменное ограничение для правила. +- **`selector`** — [CSS selector](https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Getting_Started/Selectors), defines the elements to be hidden. +- **`domains`** — domain restriction for the rule. -Если вы хотите ограничить область действия одним или более доменами, просто перечислите их через запятую. Например: `example.org,example.com##selector`. +If you want to limit the rule application area to certain domains, just enter them separated with commas. For example: `example.org,example.com##selector`. -Это правило будет работать также на всех поддоменах `example.org` и `example.com`. +This rule will be also applied to all subdomains of `example.org` and `example.com`. -Если вы хотите, чтобы правило не применялось к определённым доменам, начните доменное имя со знака `~`. Например: `~example.org##selector`. +Если вы хотите, чтобы правило не применялось к определённым доменам, начните доменное имя со знака `~`. For example: `~example.org##selector`. -Вы можете использовать оба подхода в одном правиле. Например, правило `example.org,~subdomain.example.org##domain` будет работать для домена `example.org` и всех его поддоменов, **кроме `subdomain.example.org`**. +You can use both approaches in a single rule. For example, `example.org,~subdomain.example.org##domain` will work for `example.org` and all subdomains, **except `subdomain.example.org`**. :::note -Правила скрытия не зависят друг от друга. Если в фильтре есть правило `example.org##selector` и вы добавляете правило `~example.org##selector`, то оба этих правила будут применены независимо друг от друга. +Element hiding rules are not dependent on each other. If there is a rule `example.org##selector` in the filter and you add `~example.org##selector` both rules will be applied independently. ::: **Примеры** -- `example.com##div.textad` скроет элемент `div` с классом `textad` на домене `example.com` и всех его поддоменах. -- `example.com,example.org###adblock` скроет элемент с атрибутом `id` равным `adblock` на доменах `example.com`, `example.org` и всех их поддоменах. -- `~example.com##.textad` скроет элемент с классом `textad` на всех доменах, кроме `example.com` и всех его поддоменов. +- `example.com##div.textad` — hides a `div` with the class `textad` at `example.com` and all subdomains. +- `example.com,example.org###adblock` — hides an element with attribute `id` equals `adblock` at `example.com`, `example.org` and all subdomains. +- `~example.com##.textad` — hides an element with the class `textad` at all domains, except `example.com` and its subdomains. **Ограничения** -Safari не поддерживает одновременно разрешённые и запрещённые домены. Поэтому правила вида `example.org,~foo.example.org##.textad` не работают в AdGuard для Safari. +Safari does not support both allowed and disallowed domains. So the rules like `example.org,~foo.example.org##.textad` are invalid in AdGuard for Safari. **Исключения** -Исключения могут отключать некоторые правила на определённых доменах. Они очень похожи на обычные правила-исключения, только вместо `##` нужно использовать `#@#`. +Exceptions can disable some rules on particular domains. They are very similar to usual exception rules, but instead of `##` you have to use `#@#`. -Например, в фильтре есть правило: +For example, there is a rule in filter: ```adblock ##.textad ``` -Если вы хотите отключить его для домена `example.com`, вы можете создать правило исключения: +If you want to disable it for `example.com`, you can create an exception rule: ```adblock example.com#@#.textad ``` -В некоторых случаях может потребоваться отключение всех запрещающих правил. Например, на время тестирования. Для этого воспользуйтесь правилом исключения без указания домена. Это полностью отключит соответствующее правило CSS elemhide для ВСЕХ доменов: +Sometimes, it may be necessary to disable all restriction rules. For example, to conduct tests. To do this, use the exclusion rule without specifying a domain. It will completely disable matching CSS elemhide rule on ALL domains: ```adblock #@#.textad ``` -Правило такого вида даст аналогичный результат: +The same can be achieved by adding this rule: ```adblock *#@#.textad ``` -Применять такие исключения рекомендуется только в случае, когда изменить само правило скрытия невозможно. Во всех остальных случаях лучше изменить исходное правило, используя ограничение на домены. +We recommend to use this kind of exceptions only if it is not possible to change the hiding rule itself. In other cases it is better to change the original rule, using domain restrictions. ### CSS-правила {#cosmetic-css-rules} -Иногда недостаточно просто скрыть какой-либо элемент, чтобы заблокировать рекламу. Например, блокировка рекламного элемента может просто сломать вёрстку сайта. Для таких случаев AdGuard позволяет использовать гораздо более гибкие правила, чем обычные правила скрытия. С помощью таких правил вы можете добавить на страницу практически любой CSS-стиль. +Sometimes, simple hiding of an element is not enough to deal with advertising. For example, blocking an advertising element can just break the page layout. In this case AdGuard can use rules that are much more flexible than hiding rules. With these rules you can basically add any CSS styles to the page. **Синтаксис** @@ -3183,9 +3272,9 @@ example.com#@#.textad domains = [domain0, domain1[, ...[, domainN]]] ``` -- **`selector`** — [CSS-селектор](https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Getting_Started/Selectors), определяющий элементы, к которым мы хотим применить стиль. -- **`domains`** — ограничение на домены, на страницах которых будет применено правило. Строится по тем же правилам, что и в случае [правил скрытия элементов](#cosmetic-elemhide-rules). -- **`style`** — CSS-стиль, который мы хотим применить к выбранным элементам. +- **`selector`** — [CSS selector](https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Getting_Started/Selectors), that defines the elements we want to apply the style to. +- **`domains`** — domain restriction for the rule. Same principles as in [element hiding rules](#cosmetic-elemhide-rules). +- **`style`** — CSS style, that we want to apply to selected elements. **Примеры** @@ -3193,123 +3282,123 @@ domains = [domain0, domain1[, ...[, domainN]]] example.com#$#body { background-color: #333!important; } ``` -Это правило применит стиль `background-color: #333!important;` к элементу `body` для домена `example.com` и всех его поддоменов. +This rule will apply a style `background-color: #333!important;` to the `body` element at `example.com` and all subdomains. **Исключения** -По аналогии с правилами скрытия существует специальный тип правил, отключающий действие выбранного правила CSS-стилей для определённых доменов. Синтаксис правил-исключений практически такой же, только маркер `#$#` заменяется на `#@$#`. +Just like with element hiding, there is a type of rules that disable the selected CSS style rule for particular domains. Exception rule syntax is almost the same, you just have to change `#$#` to `#@$#`. -Например, в фильтре есть правило: +For example, there is a rule in filter: ```adblock #$#.textad { visibility: hidden; } ``` -Если вы хотите отключить его для домена `example.com`, вы можете создать правило исключения: +If you want to disable it for `example.com`, you can create an exception rule: ```adblock example.com#@$#.textad { visibility: hidden; } ``` -Применять такие исключения рекомендуется только в случае, когда невозможно изменить само CSS-правило. Во всех остальных случаях лучше изменить исходное правило, используя ограничение на домены. +We recommend to use this kind of exceptions only if it is not possible to change the CSS rule itself. In other cases it is better to change the original rule, using domain restrictions. :::caution Ограничения -Запрещено использование стилей, которые могут приводить к загрузке каких-либо ресурсов. Это означает, что нельзя использовать атрибуты типа ``. +Styles that lead to loading any resource are forbidden. Basically, it means that you cannot use any `` type of value in the style. ::: :::info Совместимость -CSS-правила не поддерживаются в AdGuard Content Blocker. +CSS rules are not supported by AdGuard Content Blocker. -CSS-правила работают по-разному, и их приоритет меняется [в зависимости от платформы](#cosmetic-rules-priority). +CSS rules may operate differently [depending on the platform](#cosmetic-rules-priority). ::: ### Расширенные CSS-селекторы {#extended-css-selectors} - [Ограничения](#extended-css-limitations) -- [Псевдокласс `:has()`](#extended-css-has) -- [Псевдокласс `:contains()`](#extended-css-contains) +- [Pseudo-class `:has()`](#extended-css-has) +- [Pseudo-class `:contains()`](#extended-css-contains) - [Псевдокласс `:matches-css()`](#extended-css-matches-css) -- [Псевдокласс `:matches-attr()`](#extended-css-matches-attr) -- [Псевдокласс `:matches-property()`](#extended-css-property) -- [Псевдокласс `:xpath()`](#extended-css-xpath) -- [Псевдокласс `:nth-ancestor()`](#extended-css-nth-ancestor) -- [Псевдокласс `:upward()`](#extended-css-upward) -- [Псевдокласс `:remove()` и псевдосвойство `remove`](#remove-pseudos) -- [Псевдокласс `:is()`](#extended-css-is) -- [Псевдокласс `:not()`](#extended-css-not) -- [Псевдокласс `:if-not()` (удалён)](#extended-css-if-not) +- [Pseudo-class `:matches-attr()`](#extended-css-matches-attr) +- [Pseudo-class `:matches-property()`](#extended-css-property) +- [Pseudo-class `:xpath()`](#extended-css-xpath) +- [Pseudo-class `:nth-ancestor()`](#extended-css-nth-ancestor) +- [Pseudo-class `:upward()`](#extended-css-upward) +- [Pseudo-class `:remove()` and pseudo-property `remove`](#remove-pseudos) +- [Pseudo-class `:is()`](#extended-css-is) +- [Pseudo-class `:not()`](#extended-css-not) +- [Pseudo-class `:if-not()` (removed)](#extended-css-if-not) -Возможностей CSS 3.0 не всегда хватает для блокировки рекламы. Чтобы решить эту проблему, AdGuard расширяет возможности CSS, добавляя поддержку новых псевдоэлементов. Мы разработали отдельную [библиотеку с открытым исходным кодом](https://github.com/AdguardTeam/ExtendedCss) для выбора нестандартных элементов и применения CSS-стилей с расширенными свойствами. +CSS 3.0 is not always enough to block ads. To solve this problem AdGuard extends CSS capabilities by adding support for the new pseudo-elements. We have developed a separate [open-source library](https://github.com/AdguardTeam/ExtendedCss) for non-standard element selecting and applying CSS styles with extended properties. -Идея расширенных возможностей заключается в возможности сопоставлять элементы DOM с селекторами на основе их собственного представления (стиль, текстовое содержимое и т. д.) или отношений с другими элементами. Также есть возможность применить стили с нестандартными свойствами CSS. +The idea of extended capabilities is an opportunity to match DOM elements with selectors based on their own representation (style, text content, etc.) or relations with other elements. There is also an opportunity to apply styles with non-standard CSS properties. -**Область применения** +**Application area** -Расширенные селекторы можно применять в любом косметическом правиле, будь то [правила скрытия элементов](#cosmetic-elemhide-rules) или [CSS-правила](#cosmetic-css-rules). +Extended selectors can be used in any cosmetic rule, whether they are [element hiding rules](#cosmetic-elemhide-rules) or [CSS rules](#cosmetic-css-rules). :::info Совместимость -Правила с расширенными CSS-селекторами не поддерживаются в Блокировщике контента AdGuard. +Rules with extended CSS selectors are not supported by AdGuard Content Blocker. ::: **Синтаксис** -Независимо от того, какие CSS-псевдоклассы вы используете в правиле, вы можете использовать специальные маркеры для принудительного применения этих правил с помощью ExtendedCss. Рекомендуется использовать эти маркеры для всех косметических расширенных CSS-правил, чтобы их было легче отличить. +Regardless of the CSS pseudo-classes you are using in the rule, you can use special markers to force applying these rules by ExtendedCss. It is recommended to use these markers for all extended CSS cosmetic rules so that it was easier to find them. -Синтаксис расширенных CSS-правил: +The syntax for extended CSS rules: -- `#?#` — для скрытия элемента, `#@?#` — для исключений -- `#$?#` — для CSS правил, `#@$?#` — для исключений +- `#?#` — for element hiding, `#@?#` — for exceptions +- `#$?#` — for CSS rules, `#@$?#` — for exceptions -Мы **настоятельно рекомендуем** использовать эти маркеры каждый раз, когда вы используете расширенный CSS-селектор. +We **strongly recommend** using these markers any time when you use an extended CSS selector. **Примеры** -- `example.org#?#div:has(> a[target="_blank"][rel="nofollow"])` — это правило блокирует все элементы `div`, которые содержат дочерний элемент со ссылкой с атрибутами `[target="_blank"][rel="nofollow"]`. При этом правило будет работать только для домена `example.org` и всех его поддоменов. -- `example.com#$?#h3:contains(cookies) { display: none!important; }` — это правило устанавливает стиль `display: none!important` для всех элементов `h3`, которые содержат слово `cookies`. При этом правило будет работать только для домена `example.com` и всех его поддоменов. -- `example.net#?#.banner:matches-css(width: 360px)` — это правило блокирует все элементы `.banner`, которые содержат стиль `width: 360px`. При этом правило будет работать только для домена `example.net` и всех его поддоменов. -- `example.net#@?#.banner:matches-css(width: 360px)` — это правило отключает действие предыдущего правила. +- `example.org#?#div:has(> a[target="_blank"][rel="nofollow"])` — this rule blocks all `div` elements containing a child node that has a link with the attributes `[target="_blank"][rel="nofollow"]`. The rule applies only to `example.org` and its subdomains. +- `example.com#$?#h3:contains(cookies) { display: none!important; }` — this rule sets the style `display: none!important` to all `h3` elements that contain the word `cookies`. The rule applies only to `example.com` and all its subdomains. +- `example.net#?#.banner:matches-css(width: 360px)` — this rule blocks all `.banner` elements with the style property `width: 360px`. The rule applies only to `example.net` and its subdomains. +- `example.net#@?#.banner:matches-css(width: 360px)` — this rule will disable the previous rule. -Вы можете применять стандартные CSS-селекторы с помощью библиотеки ExtendedCss, используя маркер правила `#?#`. Например, `#?#div.banner`. +You can apply standard CSS selectors using the ExtendedCss library by using the rule marker `#?#`, e.g. `#?#div.banner`. -Подробнее [об отладке расширенных селекторов](#selectors-debugging-mode). +Learn more about [how to debug extended selectors](#selectors-debugging-mode). :::note -Некоторые псевдоклассы не требуют селектора перед ними. Несмотря на это, добавление [Универсального селектора](https://www.w3.org/TR/selectors-4/#the-universal-selector) `*` облегчает чтение расширенного селектора, хотя и не влияет на поведение при подборе. Поэтому селектор `#block :has(> .inner)` работает точно так же, как `#block *:has(> .inner)`, но второй более понятен. +Some pseudo-classes do not require selector before it. Still adding the [universal selector](https://www.w3.org/TR/selectors-4/#the-universal-selector) `*` makes an extended selector easier to read, even though it has no effect on the matching behavior. So selector `#block :has(> .inner)` works exactly like `#block *:has(> .inner)`, but the second one is more obvious. -Названия псевдоклассов не чувствительны к регистру, например, `:HAS()` работает как `:has()`. Несмотря на это, в основном используются названия в нижнем регистре. +Pseudo-class names are case-insensitive, e.g. `:HAS()` works as `:has()`. Still the lower-case names are used commonly. ::: #### Ограничения ExtendedCss {#extended-css-limitations} -1. CSS [комментарии](https://developer.mozilla.org/en-US/docs/Web/CSS/Comments) и [правила](https://developer.mozilla.org/en-US/docs/Web/CSS/At-rule) не поддерживаются. +1. CSS [comments](https://developer.mozilla.org/en-US/docs/Web/CSS/Comments) and [at-rules](https://developer.mozilla.org/en-US/docs/Web/CSS/At-rule) are not supported. -2. Специфичные псевдоклассы могут иметь свои ограничения: [`:has()`](#extended-css-has-limitations), [`:xpath()`](#extended-css-xpath-limitations), [`:nth-ancestor()`](#extended-css-nth-ancestor-limitations), [`:upward()`](#extended-css-upward-limitations), [`:is()`](#extended-css-is-limitations), [`:not()`](#extended-css-not-limitations), и [`:remove()`](#extended-css-remove-limitations). +2. Specific pseudo-class may have its own limitations: [`:has()`](#extended-css-has-limitations), [`:xpath()`](#extended-css-xpath-limitations), [`:nth-ancestor()`](#extended-css-nth-ancestor-limitations), [`:upward()`](#extended-css-upward-limitations), [`:is()`](#extended-css-is-limitations), [`:not()`](#extended-css-not-limitations), and [`:remove()`](#extended-css-remove-limitations). -#### Псевдокласс `:has()` {#extended-css-has} +#### Pseudo-class `:has()` {#extended-css-has} -Проект спецификации CSS **4.0** описывает псевдокласс [`:has()`](https://www.w3.org/TR/selectors-4/#relational). К сожалению, популярные браузеры [пока не поддерживают этот псевдокласс](https://caniuse.com/css-has). +Draft CSS 4.0 specification describes the [`:has()` pseudo-class](https://www.w3.org/TR/selectors-4/#relational). Unfortunately, [it is not yet supported](https://caniuse.com/css-has) by all popular browsers. :::note -Правила с псевдоклассом `:has()` должны использовать [нативную реализацию `:has()`](https://developer.mozilla.org/ru/docs/Web/Css/:has), если они содержат маркер `##` и если это возможно, то есть без других расширенных селекторов внутри. Чтобы принудительно применить правила ExtendedCss с `:has()`, используйте маркер `#?#`/`#$?#` явно. +Rules with the `:has()` pseudo-class must use the [native implementation of `:has()`](https://developer.mozilla.org/en-US/docs/Web/CSS/:has) if they use `##` marker and if it is possible, i.e. with no other extended selectors inside. To force applying of ExtendedCss rules with `:has()`, use `#?#`/`#$?#` marker explicitly. ::: -**Совместимость с другими псевдоклассами** +**Compatibility with other pseudo-classes** -Синонимы `:-abp-has()` поддерживаются ExtendedCss для лучшей совместимости. +Synonyms `:-abp-has()` is supported by ExtendedCss for better compatibility. :::danger Уведомление об удалении -`:if()` больше не поддерживается как синоним для `:has()`. +`:if()` is no longer supported as a synonym for `:has()`. ::: @@ -3319,27 +3408,27 @@ CSS-правила работают по-разному, и их приорит [target]:has(selector) ``` -- `target` — необязательный, стандартный или расширенный CSS-селектор, может быть пропущен для проверки *любых* элементов -- `subject` — обязателен. Стандартный или расширенный CSS-селектор +- `target` — optional, standard or extended CSS selector, can be skipped for checking *any* element +- `selector` — required, standard or extended CSS selector -Псевдокласс `:has()` выбирает `target`-элементы, которые подходят под `selector`. Также `селектор` может начинаться с комбинатора. +The pseudo-class `:has()` selects the `target` elements that fit to the `selector`. Also the `selector` can start with a combinator. -Список селекторов можно задать и в `selector`. В этом случае **все** селекторы в списке будут сопоставляться. В будущем это будет исправлено для [``](https://www.w3.org/TR/selectors-4/#typedef-forgiving-relative-selector-list) в качестве аргумента. +A selector list can be set in `selector` as well. In this case **all** selectors in the list are being matched for now. In the future it will be fixed for [``](https://www.w3.org/TR/selectors-4/#typedef-forgiving-relative-selector-list) as argument. -##### Ограничения `:has()` {#extended-css-has-limitations} +##### `:has()` limitations {#extended-css-has-limitations} -Использование псевдокласса `:has()` [ограничено для некоторых случаев (2, 3)](https://bugs.chromium.org/p/chromium/issues/detail?id=669058#c54): +Usage of the `:has()` pseudo-class is [restricted for some cases (2, 3)](https://bugs.chromium.org/p/chromium/issues/detail?id=669058#c54): -- запретить `:has()` внутри псевдоселекторов, принимающих только составные селекторы; -- запретить `:has()` после обычных псевдоэлементов. +- disallow `:has()` inside the pseudos accepting only compound selectors; +- disallow `:has()` after regular pseudo-elements. -Родной псевдокласс `:has()` не позволяет использовать `:has()`, `:is()` и `:where()` внутри `:has()`-аргумента, чтобы избежать увеличения сложности недействительности аргумента `:has()` ([случай 1](https://bugs.chromium.org/p/chromium/issues/detail?id=669058#c54)). Но ранее ExtendedCss не имел такого ограничения, а списки фильтров уже содержат такие правила, поэтому мы не стали добавлять это ограничение в ExtendedCss и разрешили использовать `:has()` внутри `:has()`, как это было возможно ранее. Чтобы использовать его, просто принудительно используйте ExtendedCss, установив маркер `#?#`/`#$?#`. +Native `:has()` pseudo-class does not allow `:has()`, `:is()`, `:where()` inside `:has()` argument to avoid increasing the `:has()` invalidation complexity ([case 1](https://bugs.chromium.org/p/chromium/issues/detail?id=669058#c54)). But ExtendedCss did not have such limitation earlier and filter lists already contain such rules, so we have not added this limitation to ExtendedCss and allow to use `:has()` inside `:has()` as it was possible before. To use it, just force ExtendedCss usage by setting `#?#`/`#$?#` rule marker. -Нативная реализация не позволяет использовать `:scope` внутри аргумента `:has()` ([[1]](https://github.com/w3c/csswg-drafts/issues/7211), [[2]](https://github.com/w3c/csswg-drafts/issues/6399)). Тем не менее, в списках фильтров есть правила `div:has(:scope a)`, которые мы продолжаем поддерживать, просто преобразуя их в `div:has(> a)`, как это делалось ранее. +Native implementation does not allow any usage of `:scope` inside the `:has()` argument ([[1]](https://github.com/w3c/csswg-drafts/issues/7211), [[2]](https://github.com/w3c/csswg-drafts/issues/6399)). Still, there are some such rules in filter lists: `div:has(:scope a)` which we continue to support by simply converting them to `div:has(> a)`, as it used to be done previously. **Примеры** -`div:has(.banner)` выбирает все `div`-элементы, которые **включают** элемент с классом `banner`: +`div:has(.banner)` selects all `div` elements which **include** an element with the `banner` class: ```html @@ -3349,7 +3438,7 @@ CSS-правила работают по-разному, и их приорит ``` -`div:has(> .banner)` выбирает все `div`-элементы, которые **включают** элемент класса `banner` в качестве *прямого дочернего* элемента `div`: +`div:has(> .banner)` selects all `div` elements which **include** an `banner` class element as a *direct child* of `div`: ```html @@ -3359,7 +3448,7 @@ CSS-правила работают по-разному, и их приорит ``` -`div:has(+ .banner)` выбирает все `div`-элементы, **предшествующие** элементу класса `banner`, который *непосредственно следует* за `div`, и оба являются детьми одного родителя: +`div:has(+ .banner)` selects all `div` elements **preceding** `banner` class element which *immediately follows* the `div` and both are children of the same parent: ```html @@ -3369,7 +3458,7 @@ CSS-правила работают по-разному, и их приорит Not selected ``` -`div:has(~ .banner)` выбирает все `div`-элементы, **предшествующие** элементу класса `banner`, который *следует* за `div`, но *не обязательно сразу*, и оба являются детьми одного родителя: +`div:has(~ .banner)` selects all `div` elements **preceding** `banner` class element which *follows* the `div` but *not necessarily immediately* and both are children of the same parent: ```html @@ -3379,7 +3468,7 @@ CSS-правила работают по-разному, и их приорит ``` -`div:has(span, .banner)` выбирает все элементы `div`, которые **включают в себя** как элемент `span`, так и элемент класса `banner`: +`div:has(span, .banner)` selects all `div` elements which **include both** `span` element and `banner` class element: ```html @@ -3390,25 +3479,25 @@ CSS-правила работают по-разному, и их приорит ``` -:::danger Старый синтаксис +:::danger Old syntax -[Синтаксис обратной совместимости для `:has()`](https://github.com/AdguardTeam/ExtendedCss#old-syntax-has) поддерживается, но **не рекомендуется**. +[Backward compatible syntax for `:has()`](https://github.com/AdguardTeam/ExtendedCss#old-syntax-has) is supported but **not recommended**. ::: -#### Псевдокласс `:contains()` {#extended-css-contains} +#### Pseudo-class `:contains()` {#extended-css-contains} -Принцип действия псевдокласса `:contains()` очень прост: он позволяет выбрать элементы, которые содержат заданный текст или содержимое которых соответствует указанному регулярному выражению. Поддерживаются флаги регулярных выражений. +The `:contains()` pseudo-class principle is very simple: it allows to select the elements that contain specified text or which content matches a specified regular expression. Regexp flags are supported. :::note -Псевдокласс `:contains()` использует для сопоставления свойство элемента `textContent`, а не `innerHTML`. +The `:contains()` pseudo-class uses the `textContent` element property for matching, not the `innerHTML`. ::: -**Совместимость с другими псевдоклассами** +**Compatibility with other pseudo-classes** -Синонимы `:-abp-contains()` и `:has-text()` поддерживаются для лучшей совместимости. +Synonyms `:-abp-contains()` and `:has-text()` are supported for better compatibility. **Синтаксис** @@ -3416,12 +3505,12 @@ CSS-правила работают по-разному, и их приорит [target]:contains(match) ``` -- `target` — необязательный, стандартный или расширенный CSS-селектор, может быть пропущен для проверки *любых* элементов -- `match` — требуется, строка или регулярное выражение для соответствия элементу `textContent`. Также поддерживаются флаги регулярных выражений. +- `target` — optional, standard or extended CSS selector, can be skipped for checking *any* element +- `match` — required, string or regular expression for matching element `textContent`. Regular expression flags are supported. **Примеры** -Для таких DOM: +For such DOM: ```html @@ -3430,7 +3519,7 @@ CSS-правила работают по-разному, и их приорит
Not selected
``` -элемент `div#match` может быть выбран любым из этих расширенных селекторов: +the element `div#match` can be selected by any of these extended selectors: ```adblock ! plain text @@ -3445,19 +3534,19 @@ div:contains(/it .*banner/gi) :::note -Выбран только `div` с `id=match`, так как следующий элемент не содержит текст, а `banner` — это часть кода, а не текст. +Only the `div` with `id=match` is selected because the next element does not contain any text, and `banner` is a part of code, not a text. ::: -:::danger Старый синтаксис +:::danger Old syntax -[Синтаксис обратной совместимости для `:contains()`](https://github.com/AdguardTeam/ExtendedCss#old-syntax-contains) поддерживается, но **не рекомендуется**. +[Backward compatible syntax for `:contains()`](https://github.com/AdguardTeam/ExtendedCss#old-syntax-contains) is supported but **not recommended**. ::: #### Псевдокласс `:matches-css()` {#extended-css-matches-css} -Псевдокласс `:matches-css()` позволяет сопоставить элемент по свойствам его текущего стиля. Работа псевдокласса основана на использовании метода [`Window.getComputedStyle()`](https://developer.mozilla.org/en-US/docs/Web/API/Window/getComputedStyle). +The `:matches-css()` pseudo-class allows to match the element by its current style properties. The work of the pseudo-class is based on using the [`Window.getComputedStyle()`](https://developer.mozilla.org/en-US/docs/Web/API/Window/getComputedStyle) method. **Синтаксис** @@ -3465,20 +3554,20 @@ div:contains(/it .*banner/gi) [target]:matches-css([pseudo-element, ] property: pattern) ``` -- `target` — необязательный, стандартный или расширенный CSS-селектор, может быть пропущен для проверки *любых* элементов -- `pseudo-element` — необязательный, допустимый стандартный псевдоэлемент, например, `before`, `after`, `first-line` и т. д. -- `property` — требуется, название CSS-свойства, которое будет проверено у элемента -- `pattern` — требуется, шаблон значений, который использует то же простое сопоставление с подстановочными знаками, что и в основных правилах фильтрации URL-адресов, или регулярное выражение. Для этого типа соответствия AdGuard не обращает внимание на регистр. В случае с регулярными выражениями шаблон будет выглядеть так: `/regexp/`. +- `target` — optional, standard or extended CSS selector, can be skipped for checking *any* element +- `pseudo-element` — optional, valid standard pseudo-element, e.g. `before`, `after`, `first-line`, etc. +- `property` — required, a name of CSS property to check the element for +- `pattern` — required, a value pattern that is using the same simple wildcard matching as in the basic URL filtering rules or a regular expression. For this type of matching, AdGuard always does matching in a case-insensitive manner. In the case of a regular expression, the pattern looks like `/regexp/`. -**Экранирование и снятие специальных символов** +**Special characters escaping and unescaping** -Для **нерегулярных выражений** паттерны `(`,`)`,`[`,`]` должны быть **без экранирования**, например, `:matches-css(background-image:url(data:*))`. +For **non-regexp** patterns `(`,`)`,`[`,`]` must be **unescaped**, e.g. `:matches-css(background-image:url(data:*))`. -Для **регулярных выражений** паттерны `\` должны быть **экранированы**, например, `:matches-css(background-image: /^url\\("data:image\\/gif;base64.+/)`. +For **regexp** patterns `\` should be **escaped**, e.g. `:matches-css(background-image: /^url\\("data:image\\/gif;base64.+/)`. **Примеры** -Для таких DOM: +For such DOM: ```html @@ -3491,7 +3580,7 @@ div:contains(/it .*banner/gi)
``` -`div`-элементы с псевдоэлементом `::before` и с указанным свойством `content` могут быть выбраны любым из этих расширенных селекторов: +the `div` elements with pseudo-element `::before` and with specified `content` property can be selected by any of these extended selectors: ```adblock ! паттерн строки @@ -3506,25 +3595,25 @@ div:matches-css(before, content: /block me/) :::caution Ограничения -Паттерны регулярных выражений **не поддерживают** флаги. +Regexp patterns **do not support** flags. ::: :::info Совместимость -Устаревшие псевдоклассы `:matches-css-before()` и `:matches-css-after()` больше не рекомендуются, но по-прежнему поддерживаются для лучшей совместимости. +Obsolete pseudo-classes `:matches-css-before()` and `:matches-css-after()` are no longer recommended but still are supported for better compatibility. ::: -:::danger Старый синтаксис +:::danger Old syntax -[Синтаксис обратной совместимости для `:matches-css()`](https://github.com/AdguardTeam/ExtendedCss#old-syntax-matches-css) поддерживается, но **не рекомендуется**. +[Backward compatible syntax for `:matches-css()`](https://github.com/AdguardTeam/ExtendedCss#old-syntax-matches-css) is supported but **not recommended**. ::: -#### Псевдокласс `:matches-attr()` {#extended-css-matches-attr} +#### Pseudo-class `:matches-attr()` {#extended-css-matches-attr} -Псевдокласс `:matches-attr()` позволяет выбрать элемент по его атрибутам, особенно если они рандомизированы. +The `:matches-attr()` pseudo-class allows selecting an element by its attributes, especially if they are randomized. **Синтаксис** @@ -3532,38 +3621,38 @@ div:matches-css(before, content: /block me/) [target]:matches-attr("name"[="value"]) ``` -- `target` — необязательный, стандартный или расширенный CSS-селектор, может быть пропущен для проверки *любых* элементов -- `name` — требуется, простая строка, *или* строка с подстановочным знаком, *или* регулярное выражение для сопоставления имени атрибута -- `value` — необязательный, простая строка, *или* строка с подстановочным знаком, *или* регулярное выражение для сопоставления значения атрибута +- `target` — optional, standard or extended CSS selector, can be skipped for checking *any* element +- `name` — required, simple string *or* string with wildcard *or* regular expression for attribute name matching +- `value` — optional, simple string *or* string with wildcard *or* regular expression for attribute value matching **Экранирование специальных символов** -Для паттернов **регулярных выражений** `"` и `\` должны быть **экранированы**, например, `div:matches-attr(class=/[\\w]{5}/)`. +For **regexp** patterns `"` and `\` should be **escaped**, e.g. `div:matches-attr(class=/[\\w]{5}/)`. **Примеры** -`div:matches-attr("ad-link")` выбирает элемент `div#target1`: +`div:matches-attr("ad-link")` selects the element `div#target1`: ```html
``` -`div:matches-attr("data-*"="adBanner")` выбирает элемент `div#target2`: +`div:matches-attr("data-*"="adBanner")` selects the element `div#target2`: ```html
``` -`div:matches-attr(*unit*=/^click$/)` выбирает элемент `div#target3`: +`div:matches-attr(*unit*=/^click$/)` selects the element `div#target3`: ```html
``` -`*:matches-attr("/.{5,}delay$/"="/^[0-9]*$/")` выбирает элемент `#target4`: +`*:matches-attr("/.{5,}delay$/"="/^[0-9]*$/")` selects the element `#target4`: ```html @@ -3574,13 +3663,13 @@ div:matches-css(before, content: /block me/) :::caution Ограничения -Паттерны регулярных выражений **не поддерживают** флаги. +Regexp patterns **do not support** flags. ::: -#### Псевдокласс `:matches-property()` {#extended-css-property} +#### Pseudo-class `:matches-property()` {#extended-css-property} -Псевдокласс `:matches-property()` позволяет выбирать элемент, сопоставляя его свойства. +The `:matches-property()` pseudo-class allows selecting an element by matching its properties. **Синтаксис** @@ -3588,23 +3677,23 @@ div:matches-css(before, content: /block me/) [target]:matches-property("name"[="value"]) ``` -- `target` — необязательный, стандартный или расширенный CSS-селектор, может быть пропущен для проверки *любых* элементов -- `name` — требуется, простая строка, *или* строка с подстановочным знаком, *или* регулярное выражение для сопоставления имени свойства элемента -- `value` — необязательный, простая строка, *или* строка с подстановочным знаком, *или* регулярное выражение для сопоставления значения свойства элемента +- `target` — optional, standard or extended CSS selector, can be skipped for checking *any* element +- `name` — required, simple string *or* string with wildcard *or* regular expression for element property name matching +- `value` — optional, simple string *or* string with wildcard *or* regular expression for element property value matching **Экранирование специальных символов** -Для паттернов **регулярных выражений** `"` и `\` должны быть экранированы, например, `div:matches-property(prop=/[\\w]{4}/)`. +For **regexp** patterns `"` and `\` must be escaped, e.g. `div:matches-property(prop=/[\\w]{4}/)`. :::note -Паттерны регулярных выражений поддерживаются в `name` для любого свойства в цепочке, например, `prop./^unit[\\d]{4}$/.type`. +Regexp patterns are supported in `name` for any property in chain, e.g. `prop./^unit[\\d]{4}$/.type`. ::: **Примеры** -Элемент с такими свойствами: +An element with such properties: ```javascript divProperties = { @@ -3624,7 +3713,7 @@ divProperties = { }; ``` -может быть выбран любым из этих расширенных селекторов: +can be selected by any of these extended selectors: ```adblock div:matches-property(check.track) @@ -3638,24 +3727,24 @@ div:matches-property(memoizedProps.key="null") div:matches-property(memoizedProps._owner.src=/ad/) ``` -:::tip Для разработчиков фильтров +:::tip For filter maintainers -Чтобы проверить свойства конкретного элемента, сделайте следующее: +To check properties of a specific element, do the following: -1. Проверьте элемент страницы или выберите его в Инструментах разработчика браузера во вкладке `Элементы` -1. Запустите `console.dir($0)` во вкладке `Консоль` +1. Inspect the page element or select it in `Elements` tab of browser DevTools +1. Run `console.dir($0)` in `Console` tab ::: :::caution Ограничения -Паттерны регулярных выражений **не поддерживают** флаги. +Regexp patterns **do not support** flags. ::: -#### Псевдокласс `:xpath()` {#extended-css-xpath} +#### Pseudo-class `:xpath()` {#extended-css-xpath} -Псевдокласс `:xpath()` позволяет выбирать элементы согласно выражению XPath. +The `:xpath()` pseudo-class allows selecting an element by evaluating an XPath expression. **Синтаксис** @@ -3663,27 +3752,27 @@ div:matches-property(memoizedProps._owner.src=/ad/) [target]:xpath(expression) ``` -- `target` — необязательный, стандартный или расширенный CSS-селектор -- `expression` — требуется, допустимое XPath выражение +- `target`- optional, standard or extended CSS selector +- `expression` — required, valid XPath expression -##### Ограничения `:xpath()` {#extended-css-xpath-limitations} +##### `:xpath()` limitations {#extended-css-xpath-limitations} -`target` можно опустить, поэтому использовать его необязательно. Для любого другого псевдокласса это будет означать «применить ко *всем* узлам DOM», но в случае `:xpath()` это просто означает «применить к *целым* документам», и такое применение значительно замедляет выбор элементов. Вот почему такие правила, как `#?#:xpath(expression)`, ограничены поиском внутри тега `body`. Например, правило `#?#:xpath(//div[@data-st-area=\'Advert\'])` парсится как `#?#body:xpath(//div[@data-st- area=\'Advert\'])`. +`target` can be omitted so it is optional. For any other pseudo-class that would mean "apply to *all* DOM nodes", but in case of `:xpath()` it just means "apply to the *whole* document", and such applying slows elements selecting significantly. That's why rules like `#?#:xpath(expression)` are limited to looking inside the `body` tag. For example, rule `#?#:xpath(//div[@data-st-area=\'Advert\'])` is parsed as `#?#body:xpath(//div[@data-st-area=\'Advert\'])`. -Расширенные селекторы с `target`, определённым как *любой* селектор, — `*:xpath(expression)` — всё ещё можно использовать, но не рекомендуется. Поэтому следует уточнить `target`. +Extended selectors with defined `target` as *any* selector — `*:xpath(expression)` — can still be used but it is not recommended, so `target` should be specified instead. -Корректно работает только в конце селектора, за исключением псевдокласса [:remove()](#remove-pseudos). +Works properly only at the end of selector, except for [pseudo-class :remove()](#remove-pseudos). **Примеры** -`:xpath(//*[@class="banner"])` выбирает элемент `div#target1`: +`:xpath(//*[@class="banner"])` selects the element `div#target1`: ```html ``` -`:xpath(//*[@class="inner"]/..)` выбирает элемент `div#target2`: +`:xpath(//*[@class="inner"]/..)` selects the element `div#target2`: ```html @@ -3692,16 +3781,16 @@ div:matches-property(memoizedProps._owner.src=/ad/) ``` -#### Псевдокласс `:nth-ancestor()` {#extended-css-nth-ancestor} +#### Pseudo-class `:nth-ancestor()` {#extended-css-nth-ancestor} -Псевдокласс `:nth-ancestor()` позволяет искать *n-ного* предка по отношению к ранее выбранному элементу. +The `:nth-ancestor()` pseudo-class allows to lookup the *nth* ancestor relative to the previously selected element. ```text subject:nth-ancestor(n) ``` -- `subject` — обязателен. Стандартный или расширенный CSS-селектор -- `n` — обязателен. Число >= 1 и < 256, расстояние до нужного родителя от элемента, выбранного `subject` +- `subject` — required, standard or extended CSS selector +- `n` — required, number >= 1 and < 256, distance to the needed ancestor from the element selected by `subject` **Синтаксис** @@ -3709,16 +3798,16 @@ subject:nth-ancestor(n) subject:nth-ancestor(n) ``` -- `subject` — обязателен. Стандартный или расширенный CSS-селектор -- `n` — обязателен. Число >= 1 и < 256, расстояние до нужного родителя от элемента, выбранного `subject` +- `subject` — required, standard or extended CSS selector +- `n` — required, number >= 1 and < 256, distance to the needed ancestor from the element selected by `subject` -##### Ограничения `:nth-ancestor()` {#extended-css-nth-ancestor-limitations} +##### `:nth-ancestor()` limitations {#extended-css-nth-ancestor-limitations} -Псевдокласс `:nth-ancestor()` не поддерживается внутри аргумента псевдокласса [`:not()`](#extended-css-not). +The `:nth-ancestor()` pseudo-class is not supported inside the argument of the [`:not()` pseudo-class](#extended-css-not). **Примеры** -Для таких DOM: +For such DOM: ```html @@ -3735,11 +3824,11 @@ subject:nth-ancestor(n) ``` -`.child:nth-ancestor(1)` выбирает элемент `div#target1`, `div[class="inner"]:nth-ancestor(3)` выбирает элемент `div#target2`. +`.child:nth-ancestor(1)` selects the element `div#target1`, `div[class="inner"]:nth-ancestor(3)` selects the element `div#target2`. -#### Псевдокласс `:upward()` {#extended-css-upward} +#### Pseudo-class `:upward()` {#extended-css-upward} -Псевдокласс `:upward()` позволяет искать предка по отношению к ранее выбранному элементу. +The `:upward()` pseudo-class allows to lookup the ancestor relative to the previously selected element. **Синтаксис** @@ -3747,18 +3836,18 @@ subject:nth-ancestor(n) subject:upward(ancestor) ``` -- `subject` — обязателен. Стандартный или расширенный CSS-селектор -- `ancestor` — требуется, спецификация для предка элемента, выбранного `subject`, может быть задана как: - - *число* >= 1 и < 256 для указания расстояния до нужного предка, то же, что и [`:nth-ancestor()`](#extended-css-nth-ancestor) - - *стандартный CSS-селектор* для поиска ближайшего предка +- `subject` — required, standard or extended CSS selector +- `ancestor` — required, specification for the ancestor of the element selected by `subject`, can be set as: + - *number* >= 1 and < 256 for distance to the needed ancestor, same as [`:nth-ancestor()`](#extended-css-nth-ancestor) + - *standard CSS selector* for matching closest ancestor -##### Ограничения `:upward()` {#extended-css-upward-limitations} +##### `:upward()` limitations {#extended-css-upward-limitations} -Псевдокласс `:upward()` не поддерживается внутри аргумента псевдокласса [`:not()`](#extended-css-not). +The `:upward()` pseudo-class is not supported inside the argument of the [`:not()` pseudo-class](#extended-css-not). **Примеры** -Для таких DOM: +For such DOM: ```html @@ -3775,13 +3864,13 @@ subject:upward(ancestor) ``` -`.inner:upward(div[data])` выбирает элемент `div#target1`, `.inner:upward(div[id])` выбирает элемент `div#target2`, `.child:upward(1)` выбирает элемент `div#target1`, `.inner:upward(3)` выбирает элемент `div#target2`. +`.inner:upward(div[data])` selects the element `div#target1`, `.inner:upward(div[id])` selects the element `div#target2`, `.child:upward(1)` selects the element `div#target1`, `.inner:upward(3)` selects the element `div#target2`. -#### Псевдокласс `:remove()` и псевдосвойство `remove` {#remove-pseudos} +#### Pseudo-class `:remove()` and pseudo-property `remove` {#remove-pseudos} -Иногда необходимо удалить определённый элемент, а не просто скрыть его или применить какие-либо правила стиля. Для этого можно использовать псевдокласс `:remove()`, а также псевдосвойство `remove`. +Sometimes, it is necessary to remove a matching element instead of hiding it or applying custom styles. In order to do it, you can use the `:remove()` pseudo-class as well as the `remove` pseudo-property. -**Псевдокласс `:remove()` может быть только в конце селектора.** +**Pseudo-class `:remove()` can be placed only at the end of a selector.** **Синтаксис** @@ -3793,15 +3882,15 @@ selector:remove() selector { remove: true; } ``` -- `subject` — обязателен. Стандартный или расширенный CSS-селектор +- `selector` — required, standard or extended CSS selector -##### Ограничения `:remove()` и `remove` {#extended-css-remove-limitations} +##### `:remove()` and `remove` limitations {#extended-css-remove-limitations} -Псевдокласс `:remove()` может корректно работать только в конце селектора. +The `:remove()` pseudo-class is limited to work properly only at the end of selector. -Для применения псевдокласса `:remove()` к любому элементу следует использовать [универсальный селектор](https://www.w3.org/TR/selectors-4/#the-universal-selector) `*`. В противном случае такой расширенный селектор может считаться некорректным. Например, `.banner > :remove()` недействителен для удаления любого дочернего элемента класса `banner`, поэтому он должен выглядеть как `.banner > *:remove()`. +For applying the `:remove()` pseudo-class to any element, the [universal selector](https://www.w3.org/TR/selectors-4/#the-universal-selector) `*` should be used. Otherwise such extended selector may be considered as invalid, e.g. `.banner > :remove()` is not valid for removing any child element of `banner` class element, so it should look like `.banner > *:remove()`. -Если используется псевдокласс `:remove()` или псевдосвойство `remove`, все свойства стиля игнорируются, кроме псевдосвойства [`debug`](#selectors-debug-mode). +If the `:remove()` pseudo-class or the `remove` pseudo-property is used, all style properties are ignored except for the [`debug` pseudo-property](#selectors-debug-mode). **Примеры** @@ -3815,13 +3904,13 @@ div[class]:has(> a > img) { remove: true; } :::note -Правила с псевдосвойством `remove` должны использовать маркер `#$?#`: `$` для синтаксиса правил CSS-стиля, `?` для синтаксиса ExtendedCss. +Rules with the `remove` pseudo-property must use `#$?#` marker: `$` for CSS-style rule syntax, `?` for ExtendedCss syntax. ::: -#### Псевдокласс `:is()` {#extended-css-is} +#### Pseudo-class `:is()` {#extended-css-is} -Псевдокласс `:is()` позволяет сопоставить любой элемент, который может быть выбран любым из переданных ему селекторов. Некорректные селекторы пропускаются, и псевдокласс работает с допустимыми селекторами без каких-либо ошибок. Наша реализация [нативного`:is()` псевдокласса](https://developer.mozilla.org/ru/docs/Web/CSS/:is). +The `:is()` pseudo-class allows to match any element that can be selected by any of selectors passed to it. Invalid selectors are skipped and the pseudo-class deals with valid ones with no error thrown. Our implementation of the [native `:is()` pseudo-class](https://developer.mozilla.org/en-US/docs/Web/CSS/:is). **Синтаксис** @@ -3829,20 +3918,20 @@ div[class]:has(> a > img) { remove: true; } [target]:is(selectors) ``` -- `target` — необязательный, стандартный или расширенный CSS-селектор, может быть пропущен для проверки *любых* элементов -- `selectors` — [*щадящий список*](https://drafts.csswg.org/selectors-4/#typedef-forgiving-selector-list) стандартных и расширенных селекторов. Для расширенных селекторов поддерживаются только составные селекторы, а не сложные. +- `target` — optional, standard or extended CSS selector, can be skipped for checking *any* element +- `selectors` — [*forgiving selector list*](https://drafts.csswg.org/selectors-4/#typedef-forgiving-selector-list) of standard or extended selectors. For extended selectors, only compound selectors are supported, not complex. -##### Ограничения `:is()` {#extended-css-is-limitations} +##### `:is()` limitations {#extended-css-is-limitations} -Правила с псевдоклассом `:is()` должны использовать [нативную реализацию `:is()`](https://developer.mozilla.org/ru/docs/Web/CSS/:is), если они используют маркер `##` и если это возможно, то есть без других расширенных селекторов внутри. Чтобы принудительно применить правила ExtendedCss с `:is()`, используйте маркер `#?#`/`#$?#` явно. +Rules with the `:is()` pseudo-class must use the [native implementation of `:is()`](https://developer.mozilla.org/en-US/docs/Web/CSS/:is) if rules use `##` marker and it is possible, i.e. with no other extended selectors inside. To force applying ExtendedCss rules with `:is()`, use `#?#`/`#$?#` marker explicitly. -Если `selectors` аргумент псевдокласса `:is()` — расширенный селектор, то из-за того, как псевдокласс `:is()` реализован в ExtendedCss 2.0, его невозможно применить к верхнему узлу DOM, который является `html`, т.е. `#?#html:is()` не работает. Таким образом, если `target` не определён или определён как [универсальный селектор](https://www.w3.org/TR/selectors-4/#the-universal-selector) `*`, применение расширенного псевдокласса ограничено **`html`дочерними элементами**, например, правила `#?#:is(...)` и `#?#*:is(...)` парсятся как `#?#html *:is(...)`. Обратите внимание, что для стандартного аргумента селектора такого ограничения нет, т.е. `#?#html:is(.locked)` работает нормально. +If the `:is()` pseudo-class argument `selectors` is an extended selector, due to the way how the `:is()` pseudo-class is implemented in ExtendedCss v2.0, it is impossible to apply it to the top DOM node which is `html`, i.e. `#?#html:is()` does not work. So if `target` is not defined or defined as the [universal selector](https://www.w3.org/TR/selectors-4/#the-universal-selector) `*`, the extended pseudo-class applying is limited to **`html`'s children**, e.g. rules `#?#:is(...)` and `#?#*:is(...)` are parsed as `#?#html *:is(...)`. Please note that there is no such limitation for a standard selector argument, i.e. `#?#html:is(.locked)` works fine. -[Сложные селекторы](https://www.w3.org/TR/selectors-4/#complex) с расширенными псевдоклассами не поддерживаются в качестве аргумента `selectors` для псевдокласса `:is()` — разрешены только [составные](https://www.w3.org/TR/selectors-4/#compound). Ознакомьтесь с примерами, чтобы разобраться в деталях. +[Complex selectors](https://www.w3.org/TR/selectors-4/#complex) with extended pseudo-classes are not supported as `selectors` argument for `:is()` pseudo-class, only [compound ones](https://www.w3.org/TR/selectors-4/#compound) are allowed. Check examples below for more details. **Примеры** -`#container *:is(.inner, .footer)` выбирает только элемент `div#target1`: +`#container *:is(.inner, .footer)` selects only the element `div#target1`: ```html @@ -3855,7 +3944,7 @@ div[class]:has(> a > img) { remove: true; } ``` -Из-за ограничений `:is(*:not([class]) > .banner)'` не работает, но `:is(*:not([class]):has(> .banner))` можно использовать вместо него для выбора элемента `div#target2`: +Due to limitations `:is(*:not([class]) > .banner)'` does not work but `:is(*:not([class]):has(> .banner))` can be used instead of it to select the element `div#target2`: ```html @@ -3867,7 +3956,7 @@ div[class]:has(> a > img) { remove: true; } #### Псевдокласс `:not()` {#extended-css-not} -Псевдокласс `:not()` позволяет выбрать элементы, которые *не соответствуют* селекторам, переданным в качестве аргумента. Неправильные селекторы аргументов не допускаются, и будет выдана ошибка. Наша реализация [псевдокласса`:not()`](https://developer.mozilla.org/en-US/docs/Web/CSS/:not). +The `:not()` pseudo-class allows to select elements which are *not matched* by selectors passed as argument. Invalid argument selectors are not allowed and error is to be thrown. Our implementation of the [`:not()` pseudo-class](https://developer.mozilla.org/en-US/docs/Web/CSS/:not). **Синтаксис** @@ -3875,22 +3964,22 @@ div[class]:has(> a > img) { remove: true; } [target]:not(selectors) ``` -- `target` — необязательный, стандартный или расширенный CSS-селектор, может быть пропущен для проверки *любых* элементов -- `selectors` — список стандартных или расширенных селекторов +- `target` — optional, standard or extended CSS selector, can be skipped for checking *any* element +- `selectors` — list of standard or extended selectors -##### Ограничения `:not()` {#extended-css-not-limitations} +##### `:not()` limitations {#extended-css-not-limitations} -Правила с псевдоклассом `:not()` должны использовать [нативную реализацию `:not()`](https://developer.mozilla.org/en-US/docs/Web/CSS/:not), если они используют маркер `##` и если это возможно, то есть без других расширенных селекторов внутри. Чтобы принудительно применить правила ExtendedCss с `:not()`, используйте маркер `#?#`/`#$?#` явно. +Rules with the `:not()` pseudo-class must use the [native implementation of `:not()`](https://developer.mozilla.org/en-US/docs/Web/CSS/:not) if rules use `##` marker and it is possible, i.e. with no other extended selectors inside. To force applying ExtendedCss rules with `:not()`, use `#?#`/`#$?#` marker explicitly. -Если `selectors` аргумент псевдокласса `:not()` — расширенный селектор, то из-за того, как псевдокласс `:not()` реализован в ExtendedCss 2.0, его невозможно применить к верхнему узлу DOM, который является `html`, т.е. `#?#html:not()` не работает. Таким образом, если `target` не определён или определён как [универсальный селектор](https://www.w3.org/TR/selectors-4/#the-universal-selector) `*`, применение расширенного псевдокласса ограничено **дочерними `html`-элементами**, например, правила `#?#:not(...)` и `#?#*:not(...)` парсятся как `#?#html *:not(...)`. Обратите внимание, что для стандартного аргумента селектора такого ограничения нет, т.е. `#?#html:not(.locked)` работает нормально. +If the `:not()` pseudo-class argument `selectors` is an extended selector, due to the way how the `:not()` pseudo-class is implemented in ExtendedCss v2.0, it is impossible to apply it to the top DOM node which is `html`, i.e. `#?#html:not()` does not work. So if `target` is not defined or defined as the [universal selector](https://www.w3.org/TR/selectors-4/#the-universal-selector) `*`, the extended pseudo-class applying is limited to **`html`'s children**, e.g. rules `#?#:not(...)` and `#?#*:not(...)` are parsed as `#?#html *:not(...)`. Please note that there is no such limitation for a standard selector argument, i.e. `#?#html:not(.locked)` works fine. -Псевдокласс `:not()` рассматривается как стандартный псевдокласс CSS внутри аргумента псевдокласса [`:upward()`](#extended-css-upward), поскольку `:upward()` поддерживает только стандартные селекторы. +The `:not()` is considered as a standard CSS pseudo-class inside the argument of the [`:upward()` pseudo-class](#extended-css-upward) because `:upward()` supports only standard selectors. -«Восходящие» псевдоклассы [`:nth-ancestor()`](#extended-css-nth-ancestor) и [`:upward()`](#extended-css-upward) не поддерживаются внутри аргумента `selectors` для псевдокласса `:not()`. +"Up-looking" pseudo-classes which are [`:nth-ancestor()`](#extended-css-nth-ancestor) and [`:upward()`](#extended-css-upward) are not supported inside `selectors` argument for `:not()` pseudo-class. **Примеры** -`#container > *:not(h2, .text)` выбирает только элемент `div#target1`: +`#container > *:not(h2, .text)` selects only the element `div#target1`: ```html @@ -3905,29 +3994,29 @@ div[class]:has(> a > img) { remove: true; } :::danger Уведомление об удалении -Псевдокласс `:if-not()` удалён и больше не поддерживается. Правила с ним не работают. +The `:if-not()` pseudo-class is removed and is no longer supported. Правила с ним не работают. ::: -Этот псевдокласс изначально был сокращением для `:not(:has())`. Он поддерживался ExtendedCss для лучшей совместимости с подписками на некоторые фильтры. +This pseudo-class was basically a shortcut for `:not(:has())`. It was supported by ExtendedCss for better compatibility with some filters subscriptions. ### Приоритет косметических правил {#cosmetic-rules-priority} -То, как применяются правила **скрытия элементов** и **CSS-правила**, зависит от платформы. +The way **element hiding** and **CSS rules** are applied is platform-specific. -**В AdGuard для Windows, Mac и Android** мы используем таблицу стилей, встроенную в страницу. Приоритет у косметических правил такой же, как и у любых других таблиц стилей CSS на сайтах. Но есть ограничение: [правила скрытия элементов](#cosmetic-elemhide-rules) и [CSS-правила](#cosmetic-css-rules) не могут обходить встроенные стили. В таких случаях рекомендуется использовать расширенные селекторы или HTML-фильтрацию. +**In AdGuard for Windows, Mac, and Android**, we use a stylesheet injected into the page. The priority of cosmetic rules is the same as any other websites' CSS stylesheet. But there is a limitation: [element hiding](#cosmetic-elemhide-rules) and [CSS rules](#cosmetic-css-rules) cannot override inline styles. In such cases, it is recommended to use extended selectors or HTML filtering. -**In AdGuard Browser Extension**, the so-called "user stylesheets" are used. Их приоритет выше, даже чем у встроенных стилей. +**In AdGuard Browser Extension**, the so-called "user stylesheets" are used. They have higher priority than even the inline styles. -**Расширенные CSS-селекторы** используют для работы JavaScript и добавляют встроенные стили сами, поэтому могут игнорировать любой стиль. +**Extended CSS selectors** use JavaScript to work and basically add an inline style themselves, therefore they can override any style. -## Правила фильтрации HTML {#html-filtering-rules} +## HTML filtering rules {#html-filtering-rules} -В большинстве случаев для фильтрации рекламы достаточно базовых и косметических правил. Но иногда необходимо изменить HTML-код самой страницы перед её загрузкой. Для этого применяются правила фильтрации HTML-контента. Они позволяют указать, какие HTML-элементы необходимо вырезать из страницы перед тем, как страница попадёт в браузер. +In most cases, the basis and cosmetic rules are enough to filter ads. But sometimes it is necessary to change the HTML-code of the page itself before it is loaded. This is when you need filtering rules for HTML content. They allow to indicate the HTML elements to be cut out before the browser loads the page. :::info Совместимость -Правила HTML-фильтрации поддерживаются в AdGuard для Windows, AdGuard для Mac, AdGuard для Android, а также в Браузерном расширении AdGuard для Firefox. Такие правила не работают в расширениях для других браузеров, потому что они не могут модифицировать содержимое страниц на сетевом уровне. +HTML filtering rules are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox. Such rules do not work in extensions for other browsers because they are unable to modify content on network level. ::: @@ -3943,46 +4032,46 @@ pseudoClasses = pseudoClass *pseudoClass pseudoClass = ":" pseudoName [ "(" pseudoArgs ")" ] ``` -- **`tagName`** — имя элемента в нижнем регистре, например, `div` или `script`. -- **`domains`** — ограничение на домены, на страницах которых будет применено правило. Те же принципы, что и в [синтаксисе правил скрытия элементов](#cosmetic-elemhide-rules). -- **`attributes`** — список атрибутов, ограничивающих выбор элементов. `name` — имя атрибута, `value` — подстрока, которая содержится в значении атрибута. -- **`pseudoName`** — имя псевдокласса. -- **`pseudoArgs`** — аргументы псевдокласса, записанного в виде функции. -- **`combinator`** — оператор, который работает аналогично [CSS-комбинатору дочерних элементов](https://developer.mozilla.org/ru/docs/Web/CSS/Child_combinator): то есть `selector` справа от `combinator` будет относиться только к элементу, прямой родительский элемент которого соответствует `selector` слева от `combinator`. +- **`tagName`** — name of the element in lower case, for example, `div` or `script`. +- **`domains`** — domain restriction for the rule. Same principles as in [element hiding rule syntax](#cosmetic-elemhide-rules). +- **`attributes`** — a list of attributes that limit the selection of elements. `name` — attribute name, `value` — substring, that is contained in attribute value. +- **`pseudoName`** — the name of a pseudo-class. +- **`pseudoArgs`** — the arguments of a function-style pseudo-class. +- **`combinator`** — an operator that works similarly to the [CSS child combinator](https://developer.mozilla.org/en-US/docs/Web/CSS/Child_combinator): that is, the `selector` on the right of the `combinator` will only match an element whose direct parent matches the `selector` on the left of the `combinator`. ### Примеры -**HTML-код:** +**HTML code:** ```html ``` -**Правило:** +**Rule:** ```adblock example.org$$script[data-src="banner"] ``` -Это правило удалит из кода страниц все элементы `script` со значением `data-src`, содержащим подстроку `banner`. Правило применяется только к `example.org` и всем его поддоменам. +This rule removes all `script` elements with the attribute `data-src` containing the substring `banner`. The rule applies only to `example.org` and all its subdomains. ### Специальные атрибуты -Помимо обычных атрибутов, значение которых проверяется у каждого элемента, существует набор специальных атрибутов, которые изменяют принцип работы правила. Ниже приведен список этих атрибутов: +In addition to usual attributes, which value is every element checked for, there is a set of special attributes that change the way a rule works. Below there is a list of these attributes: #### `tag-content` -:::caution Скоро устареет +:::caution Deprecation notice -В будущем этот специальный атрибут может перестать поддерживаться. Предпочтительнее использовать псевдокласс `:contains()` там, где это возможно. +This special attribute may become unsupported in the future. Prefer using the `:contains()` pseudo-class where it is available. ::: -Это наиболее часто используемый специальный атрибут. Он ограничивает выбор теми элементами, внутренний HTML-код которых содержит указанную подстроку. +This is the most frequently used special attribute. It limits selection with those elements whose innerHTML code contains the specified substring. -Вы должны использовать `""`, чтобы избежать `"`, например: `$$script[tag-content="alert(""this is ad"")"]` +You must use `""` to escape `"`, for instance: `$$script[tag-content="alert(""this is ad"")"]` -Например, рассмотрим такой HTML-код: +For example, take a look at this HTML code: ```html ``` -Следующее правило удалит все `script` элементы с подстрокой `banner` в их коде: +Following rule will delete all `script` elements with a `banner` substring in their code: ```adblock $$script[tag-content="banner"] @@ -3998,45 +4087,45 @@ $$script[tag-content="banner"] :::caution Ограничения -Специальный атрибут `tag-content` не должен появляться в селекторе слева от комбинатора `>`. +The `tag-content` special attribute must not appear in a selector to the left of a `>` combinator. ::: #### `wildcard` -:::caution Скоро устареет +:::caution Deprecation notice -В будущем этот специальный атрибут может перестать поддерживаться. Предпочтительнее использовать псевдокласс `:contains()` там, где это возможно. +This special attribute may become unsupported in the future. Prefer using the `:contains()` pseudo-class where it is available. ::: -Этот специальный атрибут работает почти как `tag-content` и позволяет проверить внутренний HTML-код документа. Rule will check if HTML code of the element fits the [search pattern](https://en.wikipedia.org/wiki/Glob_(programming)). +This special attribute works almost like `tag-content` and allows you to check the innerHTML code of the document. Rule will check if HTML code of the element fits the [search pattern](https://en.wikipedia.org/wiki/Glob_(programming)). -Вы должны использовать `""`, чтобы избежать `"`, например: `$$script[wildcard=""banner""]` +You must use `""` to escape `"`, for instance: `$$script[wildcard=""banner""]` -Например: `$$script[wildcard="*banner*text*"]` +For example: `$$script[wildcard="*banner*text*"]` -Оно проверяет, что код элемента содержит две последовательные подстроки `banner` и `text`. +It checks if the element code contains the two consecutive substrings `banner` and `text`. :::caution Ограничения -Специальный атрибут `wildcard` не должен появляться в селекторе слева от комбинатора `>`. +The `wildcard` special attribute must not appear in a selector to the left of a `>` combinator. ::: #### `max-length` -:::caution Скоро устареет +:::caution Deprecation notice -В будущем этот специальный атрибут может перестать поддерживаться. Предпочитайте использовать псевдокласс `:contains()` с регулярным выражением, где это возможно. +This special attribute may become unsupported in the future. Prefer using the `:contains()` pseudo-class with a regular expression where it is available. ::: -Задает максимальную длину содержимого HTML-элемента. Если этот параметр задан и длина содержимого превышает заданное значение, правило не применяется к элементу. +Specifies the maximum length for content of HTML element. If this parameter is set and the content length exceeds the value, a rule does not apply to the element. -**Значение по умолчанию** +**Default value** -Если этот параметр не указан, то максимальная длина `` считается равной 8192. +If this parameter is not specified, the `max-length` is considered to be 8192. Например: @@ -4044,23 +4133,23 @@ $$script[tag-content="banner"] $$div[tag-content="banner"][max-length="400"] ``` -Это правило удалит все элементы `div`, код которых содержит подстроку `banner` и длина которых не превышает `400` символов. +This rule will remove all the `div` elements, whose code contains the substring `banner` and the length of which does not exceed `400` characters. :::caution Ограничения -Специальный атрибут `max-length` не должен появляться в селекторе слева от комбинатора `>`. +The `max-length` special attribute must not appear in a selector to the left of a `>` combinator. ::: #### `min-length` -:::caution Скоро устареет +:::caution Deprecation notice -В будущем этот специальный атрибут может перестать поддерживаться. Предпочитайте использовать псевдокласс `:contains()` с регулярным выражением, где это возможно. +This special attribute may become unsupported in the future. Prefer using the `:contains()` pseudo-class with a regular expression where it is available. ::: -Задаёт минимальную длину содержимого HTML-элемента. Если этот параметр задан и длина содержимого меньше заданного значения, правило не применяется к элементу. +Specifies the minimum length for content of HTML element. If this parameter is set and the content length is less than preset value, a rule does not apply to the element. Например: @@ -4068,11 +4157,11 @@ $$div[tag-content="banner"][max-length="400"] $$div[tag-content="banner"][min-length="400"] ``` -Это правило удалит все элементы `div`, код которых содержит подстроку `banner` и длина которых превышает `400` символов. +This rule will remove all the `div` elements, whose code contains the substring `banner` and the length of which exceeds `400` characters. :::caution Ограничения -Специальный атрибут `min-length` не должен появляться в селекторе слева от комбинатора `>`. +The `min-length` special attribute must not appear in a selector to the left of a `>` combinator. ::: @@ -4092,55 +4181,55 @@ $$div[tag-content="banner"][min-length="400"] :contains(/reg(ular)?ex(pression)?/) ``` -:::note Совместимость +:::note Compatibility -`:-abp-contains()` и `:has-text()` являются синонимами для `:contains()`. +`:-abp-contains()` and `:has-text()` are synonyms for `:contains()`. ::: :::info Совместимость -Псевдокласс `:contains()` поддерживается AdGuard для Windows, Mac и Android с [CoreLibs][] 1.13 или более поздней версией. +The `:contains()` pseudo-class is supported by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.13 or later. ::: -Требует, чтобы внутренний HTML-код элемента содержал указанный текст или соответствовал указанному регулярному выражению. +Requires that the inner HTML of the element contains the specified text or matches the specified regular expression. :::caution Ограничения -Псевдокласс `:contains()` не должен появляться в селекторе слева от комбинатора `>`. +A `:contains()` pseudo-class must not appear in a selector to the left of a `>` combinator. ::: ### Исключения -По аналогии с правилами скрытия, существует специальный тип правил, отключающий действие выбранного правила HTML-фильтрации для определённых доменов. Синтаксис правил-исключений такой же, только маркер `$$` заменяется на `$@$`. +Similar to hiding rules, there is a special type of rules that disable the selected HTML filtering rule for particular domains. The syntax is the same, you just have to change `$$` to `$@$`. -Например, в фильтре есть правило: +For example, there is a rule in filter: ```adblock $$script[tag-content="banner"] ``` -Если вы хотите отключить его для домена `example.com`, вы можете создать правило исключения: +If you want to disable it for `example.com`, you can create an exception rule: ```adblock example.com$@$script[tag-content="banner"] ``` -В некоторых случаях может потребоваться отключение всех запрещающих правил. Например, на время тестирования. Для этого воспользуйтесь правилом исключения без указания домена. +Sometimes, it may be necessary to disable all restriction rules. For example, to conduct tests. To do this, use the exclusion rule without specifying a domain. ```adblock $@$script[tag-content="banner"] ``` -Применять такие исключения рекомендуется только в случае, когда изменить само правило скрытия невозможно. Во всех остальных случаях лучше изменить исходное правило, используя ограничение на домены. +We recommend to use this kind of exceptions only if it is not possible to change the hiding rule itself. In other cases it is better to change the original rule, using domain restrictions. ## Правила JavaScript {#javascript-rules} -AdGuard поддерживает особый тип правил, который позволяет внедрять любой код JavaScript на страницы сайтов. +AdGuard supports a special type of rules that allows you to inject any JavaScript code to websites pages. -Мы **настоятельно рекомендуем** использовать [скриптлеты](#scriptlets) вместо JavaScript-правил везде, где это возможно. JS-правила должны помочь в процессе отладки, но в качестве долгосрочного решения следует использовать скриптлеты. +We **strongly recommend** using [scriptlets](#scriptlets) instead of JavaScript rules whenever possible. JS rules are supposed to help with debugging, but as a long-time solution a scriptlet rule should be used. **Синтаксис** @@ -4148,119 +4237,119 @@ AdGuard поддерживает особый тип правил, которы rule = [domains] "#%#" script ``` -- **`domains`** — доменное ограничение для правила. Строится по тем же правилам, что и в случае [правил скрытия элементов](#cosmetic-elemhide-rules). -- **`script`** — произвольный JavaScript-код **в одну строку**. +- **`domains`** — domain restriction for the rule. Same principles as in [element hiding rules](#cosmetic-elemhide-rules). +- **`script`** — arbitrary JavaScript code **in one string**. **Примеры** -- `example.org#%#window.__gaq = undefined;` выполняет код `window.__gaq = undefined;` на всех страницах сайта `example.org` и всех его поддоменах. +- `example.org#%#window.__gaq = undefined;` executes the code `window.__gaq = undefined;` on all pages at `example.org` and all subdomains. **Исключения** -Similar to hiding rules, there is a special type of rules that disable the selected JavaScript rule for particular domains. Синтаксис правил-исключений такой же, только маркер `#%#` заменяется на `#@%#`. +Similar to hiding rules, there is a special type of rules that disable the selected JavaScript rule for particular domains. The syntax is the same, you just have to change `#%#` to `#@%#`. -Например, в фильтре есть правило: +For example, there is a rule in filter: ```adblock #%#window.__gaq = undefined; ``` -Если вы хотите отключить его для домена `example.com`, вы можете создать правило исключения: +If you want to disable it for `example.com`, you can create an exception rule: ```adblock example.com#@%#window.__gaq = undefined; ``` -В некоторых случаях может потребоваться отключение всех запрещающих правил. Например, на время тестирования. Для этого воспользуйтесь правилом исключения без указания домена. +Sometimes, it may be necessary to disable all restriction rules. For example, to conduct tests. To do this, use the exclusion rule without specifying a domain. ```adblock #@%#window.__gaq = undefined; ``` -Применять такие исключения рекомендуется только в случае, когда изменить само правило скрытия невозможно. Во всех остальных случаях лучше изменить исходное правило, используя ограничение на домены. +We recommend to use this kind of exceptions only if it is not possible to change the hiding rule itself. In other cases it is better to change the original rule, using domain restrictions. :::caution Ограничения -Правила JavaScript можно использовать только [**в доверенных фильтрах**](#trusted-filters). +JavaScript rules can only be used [**in trusted filters**](#trusted-filters). ::: :::info Совместимость -Правила JavaScript не поддерживаются блокировщиком контента AdGuard. +JavaScript rules are not supported by AdGuard Content Blocker. ::: ## Правила скриптлета {#scriptlets} -Скриптлет — это функция JavaScript с расширенными возможностями для блокировки контента. Такие функции могут использоваться в декларативной манере в правилах фильтрации AdGuard. +Scriptlet is a JavaScript function that provides extended capabilities for content blocking. These functions can be used in a declarative manner in AdGuard filtering rules. :::note -AdGuard поддерживает множество различных скриптлетов. Чтобы добиться совместимости между различными блокировщиками, мы также поддерживаем синтаксис uBO и ABP. +AdGuard supports a lot of different scriptlets. In order to achieve cross-blocker compatibility, we also support syntax of uBO and ABP. ::: -**Синтаксис правил блокировки** +**Blocking rules syntax** ```text [domains]#%#//scriptlet(name[, arguments]) ``` -- `domains` — опционально, список доменов, к которым должно применяться правило; +- `domains` — optional, a list of domains where the rule should be applied; - `name` — required, a name of the scriptlet from the AdGuard Scriptlets library; -- `arguments` — опционально, список аргументов в формате `string` (другие типы аргументов не поддерживаются). +- `arguments` — optional, a list of `string` arguments (no other types of arguments are supported). **Примеры** -1. Примените скриптлет `abort-on-property-read` на всех страницах сайта `example.org` и его поддоменах, и передайте ему аргумент `alert`: +1. Apply the `abort-on-property-read` scriptlet on all pages of `example.org` and its subdomains, and pass it an `alert` argument: ```adblock example.org#%#//scriptlet('abort-on-property-read', 'alert') ``` -1. Удалить класс `branding` из всех элементов `div[class^="inner"]` на всех страницах сайта `example.org` и его поддоменах: +1. Remove the `branding` class from all `div[class^="inner"]` elements on all pages of `example.org` and its subdomains: ```adblock example.org#%#//scriptlet('remove-class', 'branding', 'div[class^="inner"]') ``` -**Синтаксис правил исключений** +**Exception rules syntax** -Правила исключений могут отключать некоторые скриптлеты на определённых доменах. Синтаксис правил исключений скриптлетов аналогичен обычным правилам скриптлетов, но использует `#@%#` вместо `#%#`: +Exception rules can disable some scriptlets on particular domains. The syntax for exception scriptlet rules is similar to normal scriptlet rules but uses `#@%#` instead of `#%#`: ```text [domains]#@%#//scriptlet([name[, arguments]]) ``` -- `domains` — опционально, список доменов, к которым должно применяться правило; -- `имя` — опционально, имя скриптлета, который следует исключить; если не задано, все скриптлеты не будут применены; -- `arguments` — опционально, список аргументов `string` для соответствия одному и тому же правилу блокировки и его отключения. +- `domains` — optional, a list of domains where the rule should be applied; +- `name` — optional, a name of the scriptlet to except from the applying; if not set, all scriptlets will not be applied; +- `arguments` — optional, a list of `string` arguments to match the same blocking rule and disable it. **Примеры** -1. Отключите определённое правило скриптов, чтобы применялось только `abort-on-property-read` только на `example.org` и его поддоменах: +1. Disable specific scriptlet rule so that only `abort-on-property-read` is applied only on `example.org` and its subdomains: ```adblock example.org,example.com#%#//scriptlet("abort-on-property-read", "alert") example.com#@%#//scriptlet("abort-on-property-read", "alert") ``` -1. Отключите все скриптлеты `abort-on-property-read` для `example.com` и его поддоменов: +1. Disable all `abort-on-property-read` scriptlets for `example.com` and its subdomains: ```adblock example.org,example.com#%#//scriptlet("abort-on-property-read", "alert") example.com#@%#//scriptlet("abort-on-property-read") ``` -1. Отключите все скриптлеты для `example.com` и его поддоменов: +1. Disable all scriptlets for `example.com` and its subdomains: ```adblock example.org,example.com#%#//scriptlet("abort-on-property-read", "alert") example.com#@%#//scriptlet() ``` -1. Примените `set-constant` и `set-cookie` к любой веб-странице, но из-за специального правила исключения скриптов только скрипт `set-constant` будет применен на `example.org` и его поддоменах: +1. Apply `set-constant` and `set-cookie` to any web page, but due to special scriptlet exception rule only the `set-constant` scriptlet will be applied on `example.org` and its subdomains: ```adblock #%#//scriptlet('set-constant', 'adList', 'emptyArr') @@ -4268,7 +4357,7 @@ AdGuard поддерживает множество различных скри example.org#@%#//scriptlet('set-cookie') ``` -1. Примените `adjust-setInterval` к любой веб-странице и `set-local-storage-item` на `example.com` и его поддоменах, но есть также несколько правил исключения скриптов, поэтому правила скриптлетов не будут применяться на `example.com` и его поддоменах: +1. Apply `adjust-setInterval` to any web page and `set-local-storage-item` on `example.com` and its subdomains, but there are also multiple scriptlet exception rules, so no scriptlet rules will be applied on `example.com` and its subdomains: ```adblock #%#//scriptlet('adjust-setInterval', 'count', '*', '0.001') @@ -4276,61 +4365,61 @@ AdGuard поддерживает множество различных скри example.com#@%#//scriptlet() ``` -Подробнее [об отладке скриптлетов](#debug-scriptlets). +Learn more about [how to debug scriptlets](#debug-scriptlets). -Более подробную информацию о скриптлетах можно найти [на GitHub](https://github.com/AdguardTeam/Scriptlets#scriptlets). +More information about scriptlets can be found [on GitHub](https://github.com/AdguardTeam/Scriptlets#scriptlets). :::info Совместимость -Скриптлеты не поддерживаются в AdGuard Content Blocker. +Scriptlet rules are not supported by AdGuard Content Blocker. -Полный синтаксис правил исключений скриптлетов поддерживается AdGuard для Windows, AdGuard для Mac и AdGuard для Android с [CoreLibs][] v1.16 или более поздней версией, а также расширением браузера AdGuard для Chrome, Firefox и Edge с [TSUrlFilter][] v3.0 или более поздней версией. Предыдущие версии поддерживали только правила исключений, которые отключали определённые скриптлеты. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: ### Доверенные скриптлеты {#trusted-scriptlets} -Доверенные скриптлеты — это [скриптлеты](#scriptlets) с расширенной функциональностью. У них тот же синтаксис и ограничения. У имён доверенных скриптлетов есть префикс `trust-`, например, `trust-set-cookie`, чтобы их было легко отличить от обычных скриптлетов. +Trusted scriptlets are [scriptlets](#scriptlets) with extended functionality. It means the same syntax and restrictions. Trusted scriptlet names are prefixed with `trusted-`, e.g. `trusted-set-cookie`, to be easily distinguished from common scriptlets. :::note -Доверенные скриптлеты несовместимы с другими блокировщиками рекламы, кроме AdGuard. +Trusted scriptlets are not compatible with other ad blockers except AdGuard. ::: :::caution Ограничения -Доверенные скриптлеты правила можно использовать только [**в доверенных фильтрах**](#trusted-filters). +Trusted scriptlets rules can only be used [**in trusted filters**](#trusted-filters). ::: :::info Совместимость -Доверенные скриптлеты не поддерживаются в AdGuard Content Blocker. +Trusted scriptlets rules are not supported by AdGuard Content Blocker. ::: -Подробнее [об отладке скриптлетов](#debug-scriptlets). +Learn more about [how to debug scriptlets](#debug-scriptlets). -Более подробную информацию о доверенных скриптлетах можно найти [на GitHub](https://github.com/AdguardTeam/Scriptlets#trusted-scriptlets). +More information about trusted scriptlets can be found [on GitHub](https://github.com/AdguardTeam/Scriptlets#trusted-scriptlets). ## Модификаторы для небазовых правил {#non-basic-rules-modifiers} -Поведение любого правила можно изменить, используя модификаторы, описанные ниже. +Each rule can be modified using the modifiers described in the following paragraphs. -**Синтаксис** {#non-basic-rules-modifiers-syntax} +**Syntax** {#non-basic-rules-modifiers-syntax} ```text rule = "[$" modifiers "]" [rule text] modifiers = modifier0[, modifier1[, ...[, modifierN]]] ``` -- **`modifier`** — набор модификаторов, описанных ниже. -- **`rule text`** — правило, которое нужно модифицировать. +- **`modifier`** — set of the modifiers described below. +- **`rule text`** — a rule to be modified. -Например: `[$domain=example.com,app=test_app]##selector`. +For example, `[$domain=example.com,app=test_app]##selector`. -В значениях модификаторов следующие символы должны быть экранированы: `[`, `]`, `,` и `\` (если он не используется для экранирования). Используйте `\`, чтобы экранировать их. Например, экранированная скобка выглядит так: `\]`. +In the modifiers values, the following characters must be escaped: `[`, `]`, `,`, and `\` (unless it is used for the escaping). Use `\` to escape them. For example, an escaped bracket looks like this: `\]`. | Модификатор \ Продукты | [Приложения CoreLibs][cl-apps] | [AdGuard для Chromium][ext-chr] | [AdGuard для Chrome MV3][ext-mv3] | [AdGuard для Firefox][ext-ff] | [AdGuard для iOS][ios-app] | [AdGuard для Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | | ------------------------------------- |:------------------------------:|:---------------------------------------------:|:------------------------------------------------:|:---------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| @@ -4343,49 +4432,49 @@ modifiers = modifier0[, modifier1[, ...[, modifierN]]] - ✅ — полностью поддерживается - ✅ * — поддерживается, но надёжность может быть разной или могут возникнуть ограничения; ознакомьтесь с описанием модификатора для получения подробной информации -- ❌ — не поддерживается +- ❌ — not supported ::: ### **`$app`** {#non-basic-app-modifier} -Модификатор `$app` ограничивает действие правила до конкретного приложения или списка приложений. Поведение и синтаксис модификатора полностью совпадают с соответствующим [модификатором `$app` для базовых правил](#app-modifier). +`$app` modifier lets you narrow the rule coverage down to a specific application or a list of applications. The modifier's behavior and syntax perfectly match the corresponding [basic rules `$app` modifier](#app-modifier). **Примеры** -- `[$app=org.example.app]example.com##.textad` скрывает `div` с классом `textad` на `example.com` и всех поддоменах в запросах, отправленных из приложения Android `org.example.app`. -- `[$app=~org.example.app1|~org.example.app2]example.com##.textad` скрывает `div` с классом `textad` на `example.com` и всех поддоменах в запросах, отправленных из любого приложения, кроме `org.example.app1` и `org.example.app2`. -- `[$app=com.apple.Safari]example.org#%#//scriptlet('prevent-setInterval', 'check', '!300')` применяет скриптлет `prevent-setInterval` только в браузере Safari на Mac. -- `[$app=org.example.app]#@#.textad` отключает все правила `##.textad` для всех доменов при использовании `org.example.app`. +- `[$app=org.example.app]example.com##.textad` hides a `div` with the class `textad` at `example.com` and all subdomains in requests sent from the `org.example.app` Android app. +- `[$app=~org.example.app1|~org.example.app2]example.com##.textad` hides a `div` with the class `textad` at `example.com` and all subdomains in requests sent from any app except `org.example.app1` and `org.example.app2`. +- `[$app=com.apple.Safari]example.org#%#//scriptlet('prevent-setInterval', 'check', '!300')` applies scriptlet `prevent-setInterval` only in Safari browser on Mac. +- `[$app=org.example.app]#@#.textad` disables all `##.textad` rules for all domains while using `org.example.app`. :::info Совместимость -Такие правила с модификатором `$app` поддерживаются AdGuard для Windows, AdGuard для Mac и AdGuard для Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: ### **`$domain`** {#non-basic-domain-modifier} -Модификатор `$domain` ограничивает область действия правила списком доменов и их поддоменов. Поведение и синтаксис модификатора полностью совпадают с соответствующим [модификатором `$domain` для базовых правил](#domain-modifier). +`$domain` modifier limits the rule application area to a list of domains and their subdomains. The modifier's behavior and syntax perfectly match the corresponding [basic rules `$domain` modifier](#domain-modifier). **Примеры** -- `[$domain=example.com]##.textad` скроет элемент `div` с классом `textad` на домене `example.com` и всех его поддоменах. -- `[$domain=example.com|example.org]` скроет элемент с атрибутом `id` равным `adblock` на доменах `example.com`, `example.org` и всех их поддоменах. -- `[$domain=~example.com]##.textad` — это правило скроет `div` элементы с классом `textad` на всех доменах, кроме `example.com` и всех его поддоменов. +- `[$domain=example.com]##.textad` — hides a `div` with the class `textad` at `example.com` and all subdomains. +- `[$domain=example.com|example.org]###adblock` — hides an element with attribute `id` equals `adblock` at `example.com`, `example.org` and all subdomains. +- `[$domain=~example.com]##.textad` — this rule hides `div` elements of the class `textad` for all domains, except `example.com` and its subdomains. -Существует 2 способа указать ограничения домена для небазовых правил: +There are 2 ways to specify domain restrictions for non-basic rules: -1. «классический»: обозначить ограничение на домены перед маской и атрибутами правила: `example.com##.textad`; -2. с помощью модификаторов: обозначить ограничение на домены через модификатор `$domain`: `[$domain=example.com]##.textad`. +1. the "classic" way is to specify domains before rule mask and attributes: `example.com##.textad`; +2. the modifier approach is to specify domains via `$domain` modifier: `[$domain=example.com]##.textad`. -Однако правила с ограничением доменов смешанного стиля считаются недействительными. Так, например, правило `[$domain=example.org]example.com##.textad` будет проигнорировано. +But rules with mixed style domains restriction are considered invalid. So, for example, the rule `[$domain=example.org]example.com##.textad` will be ignored. ### Небазовые ограничения модификатора `$domain` {#non-basic-domain-modifier-limitations} :::caution Ограничения -Так как небазовый `$domain` работает так же, как и базовый, он имеет те же [ограничения](#domain-modifier-limitations). +Since the non-basic `$domain` works the same as the basic one, it has the same [limitations](#domain-modifier-limitations). ::: @@ -4397,7 +4486,7 @@ Such rules with `$domain` modifier are supported by AdGuard for Windows, AdGuard ### **`$path`** {#non-basic-path-modifier} -Модификатор `$path` ограничивает область применения правила определёнными местами или страницами на сайтах. +`$path` modifier limits the rule application area to specific locations or pages on websites. **Синтаксис** @@ -4405,34 +4494,34 @@ Such rules with `$domain` modifier are supported by AdGuard for Windows, AdGuard $path ["=" pattern] ``` -`pattern` — опционально, маска пути, которой ограничивается правило. Его синтаксис и поведение почти такие же, как [в шаблоне базовых правил](#basic-rules-syntax). Вы также можете использовать [специальные символы](#basic-rules-special-characters), кроме `||`, который в этом случае не имеет смысла (см. примеры ниже). +`pattern` — optional, a path mask to which the rule is restricted. Its syntax and behavior are pretty much the same as with the [pattern for basic rules](#basic-rules-syntax). You can also use [special characters](#basic-rules-special-characters), except for `||`, which does not make any sense in this case (see examples below). -Если не задан `pattern` для `$path`, правило будет применяться только на главной странице сайта. +If `pattern` is not set for `$path`, rule will apply only on the main page of website. -Модификатор `$path` также соответствует строке запроса. +`$path` modifier matches the query string as well. -Модификатор `$path` поддерживает регулярные выражения [так же, как и базовые правила](#regexp-support). +`$path` modifier supports regular expressions in [the same way](#regexp-support) basic rules do. **Примеры** -- `[$path=page.html]##.textad` скрывает `div` с классом `textad` на `/page.html` или `/page.html?` или `/sub/page.html` или `/another_page.html` -- `[$path=/page.html]##.textad` скрывает `div` с классом `textad` на `/page.html` или `/page.html?` или `/sub/page.html` любого домена, но не `/another_page.html` -- `[$path=|/page.html]##.textad` скрывает `div` с классом `textad` на `/page.html` или `/page.html?` любого домена, но не `/sub/page.html` -- `[$path=/page.html|]##.textad` скрывает `div` с классом `textad` на `/page.html` или `/sub/page.html` любого домена, но не на `/page.html?` -- `[$path=/page*.html]example.com##.textad` скрывает `div` с классом `textad` на `/page1.html`, `/page2.html` или любом другом пути, соответствующем `/page<...>.html` сайта `example.com` -- `[$path]example.com##.textad` скрывает `div` с классом `textad` на главной странице `example.com` -- `[$domain=example.com,path=/page.html]##.textad` скрывает `div` с классом `textad` на `page.html` домена `example.com` и всех его поддоменах, но не на `another_page.html` -- `[$path=/\\/(sub1|sub2)\\/page\\.html/]##.textad` скрывает `div` с классом `textad` как на `/sub1/page.html`, так и на `/sub2/page.html` любого домена (обратите внимание на [специальные экранированные символы](#non-basic-rules-modifiers-syntax)) +- `[$path=page.html]##.textad` hides a `div` with the class `textad` at `/page.html` or `/page.html?` or `/sub/page.html` or `/another_page.html` +- `[$path=/page.html]##.textad` hides a `div` with the class `textad` at `/page.html` or `/page.html?` or `/sub/page.html` of any domain but not at `/another_page.html` +- `[$path=|/page.html]##.textad` hides a `div` with the class `textad` at `/page.html` or `/page.html?` of any domain but not at `/sub/page.html` +- `[$path=/page.html|]##.textad` hides a `div` with the class `textad` at `/page.html` or `/sub/page.html` of any domain but not at `/page.html?` +- `[$path=/page*.html]example.com##.textad` hides a `div` with the class `textad` at `/page1.html` or `/page2.html` or any other path matching `/page<...>.html` of `example.com` +- `[$path]example.com##.textad` hides a `div` with the class `textad` at the main page of `example.com` +- `[$domain=example.com,path=/page.html]##.textad` hides a `div` with the class `textad` at `page.html` of `example.com` and all subdomains but not at `another_page.html` +- `[$path=/\\/(sub1|sub2)\\/page\\.html/]##.textad` hides a `div` with the class `textad` at both `/sub1/page.html` and `/sub2/page.html` of any domain (please note the [escaped special characters](#non-basic-rules-modifiers-syntax)) :::info Совместимость -Правила с модификатором `$path` не поддерживаются AdGuard Content Blocker. +Rules with `$path` modifier are not supported by AdGuard Content Blocker. ::: ### **`$url`** {#non-basic-url-modifier} -Модификатор `$url` ограничивает действие правила URL-адресами, соответствующими указанной маске. +`$url` modifier limits the rule application area to URLs matching the specified mask. **Синтаксис** @@ -4440,51 +4529,51 @@ $path ["=" pattern] url = pattern ``` -где `pattern` практически то же самое, что и [`pattern` базовых правил](#basic-rules-syntax) за исключением того, что [некоторые символы](#non-basic-rules-modifiers-syntax) должны быть экранированы. [Специальные символы](#basic-rules-special-characters) и [регулярные выражения](#regexp-support) также поддерживаются. +where `pattern` is pretty much the same as [`pattern` of the basic rules](#basic-rules-syntax) assuming that [some characters](#non-basic-rules-modifiers-syntax) must be escaped. The [special characters](#basic-rules-special-characters) and [regular expressions](#regexp-support) are supported as well. **Примеры** -- `[$url=||example.com/content/*]##div.textad` скрывает `div` с классом `textad` в запросах, например, к `https://example.com/content/article.html` и `https://subdomain.example.com/content/article.html`. -- `[$url=||example.org^]###adblock` скрывает элемент с атрибутом `id` равным `adblock` в запросах к `example.org` и всем его поддоменам. -- `[$url=/\[a-z\]+\\.example\\.com^/]##.textad` скрывает `div` элементы класса `textad` для всех доменов, соответствующих регулярному выражению `[a-z]+\.example\.com^`. +- `[$url=||example.com/content/*]##div.textad` hides a `div` with the class `textad` at addresses like `https://example.com/content/article.html` and even `https://subdomain.example.com/content/article.html`. +- `[$url=||example.org^]###adblock` hides an element with attribute `id` equal to `adblock` at `example.org` and its subdomains. +- `[$url=/\[a-z\]+\\.example\\.com^/]##.textad` hides `div` elements of the class `textad` for all domains matching the regular expression `[a-z]+\.example\.com^`. #### Ограничения модификатора `$url` {#non-basic-url-modifier-limitations} :::caution Ограничения -В Браузерном расширении AdGuard небазовый модификатор `$url` несовместим с доменно-специфичными правилами и другими небазовыми модификаторами — [`$domain`](#non-basic-domain-modifier) и [`$path`](#non-basic-path-modifier). Например, правило `[$url=/category/*]example.com###textad` не будет применено. +In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with domain-specific rules and other non-basic modifiers — [`$domain`](#non-basic-domain-modifier) and [`$path`](#non-basic-path-modifier). For example, the rule `[$url=/category/*]example.com###textad` will not be applied. ::: :::info Совместимость -Правила с модификатором `$url` поддерживаются в AdGuard для Windows, AdGuard для Mac и AdGuard для Android [с CoreLibs][] версии 1.11 или выше, и в Браузерном расширении AdGuard [с TSUrlFilter][] версии 3.0.0 или выше. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: ## Информация для разработчиков фильтров -Если вы разрабатываете сторонний фильтр, известный AdGuard, вам может быть интересна информация, представленная в этом разделе. Имейте в виду, что подсказки будут применяться только к зарегистрированным фильтрам. Фильтр считается зарегистрированным и известным AdGuard, если он присутствует [в индексе известных фильтров](https://filters.adtidy.org/extension/chromium/filters.json). Если вы хотите, чтобы ваш фильтр был зарегистрирован, направьте запрос в [репозиторий AdguardFilters](https://github.com/AdguardTeam/AdguardFilters). +If you maintain a third-party filter that is known to AdGuard, you might be interested in the information presented in this section. Please note that hints will be applied to registered filters only. The filter is considered to be registered and known by AdGuard, if it is present in the [known filters index](https://filters.adtidy.org/extension/chromium/filters.json). If you want your filter to be registered, please file an issue to [AdguardFilters repo](https://github.com/AdguardTeam/AdguardFilters). ### Директивы препроцессора -Мы предоставляем директивы препроцессора, которые могут использоваться разработчиками фильтров для улучшения совместимости с различными блокировщиками рекламы, а также обеспечиваем: +We provide preprocessor directives that can be used by filter maintainers to improve compatibility with different ad blockers and provide: -- [включение файла](#include-directive) -- [условное применение правил по типу блокировщика рекламы](#conditions-directive) -- [указание блокировщика содержимого для правил, применяемых в Safari](#safari-affinity-directive) +- [including a file](#include-directive) +- [applying rules conditionally by ad blocker type](#conditions-directive) +- [content blocker specifying for rules applying in Safari](#safari-affinity-directive) :::note -Любая ошибка в директиве препроцессора приведёт к тому, что AdGuard не сможет обновить фильтр так же, как если бы URL-адрес фильтра был недоступен. +Any mistake in a preprocessor directive will lead to AdGuard failing the filter update in the same way as if the filter URL was unavailable. -Директивы препроцессора можно использовать в пользовательских правилах или в пользовательских фильтрах. +Preprocessor directives can be used in the user rules or in the custom filters. ::: #### Включение файла {#include-directive} -Директива `!#include` позволяет включить содержимое указанного файла в фильтр. Она поддерживает только файлы из того же источника, чтобы удостовериться, что разработчик фильтров является владельцем указанного файла. Включённый файл также может содержать директивы препроцессора (даже другие `!#include`-директивы). Блокировщики должны принимать во внимание случай рекурсивного использования `!#include` и внедрять защитный механизм. +The `!#include` directive allows to include contents of a specified file into the filter. It supports only files from the same origin to make sure that the filter maintainer is in control of the specified file. The included file can also contain pre-directives (even other `!#include` directives). Ad blockers should consider the case of recursive `!#include` and implement a protection mechanism. **Синтаксис** @@ -4492,17 +4581,17 @@ url = pattern !#include file_path ``` -где `file_path` — абсолютный или относительный путь к файлу одного и того же источника, который должен быть включён. +where `file_path` is a same origin absolute or relative file path to be included. -Файлы должны находиться на том же домене, но могут быть расположены в другой директории. +The files must originate from the same domain, but may be located in a different folder. -Если включённый файл не найден или недоступен, не будут работать обновления всего фильтра. +If included file is not found or unavailable, the whole filter update should fail. -Ограничение по источнику должно быть отключено для локальных пользовательских фильтров. +Same-origin limitation should be disabled for local custom filters. **Примеры** -URL фильтра: `https://example.org/path/filter.txt` +Filter URL: `https://example.org/path/filter.txt` ```adblock ! Корректный (тот же источник): @@ -4518,17 +4607,17 @@ URL фильтра: `https://example.org/path/filter.txt` #### Условия {#conditions-directive} -Разработчики фильтра могут использовать условия, чтобы подставлять разные правила в зависимости от типа блокировщика. Директива с условием, начинающаяся с директивы `!#if`, должна явно прерываться директивой `!#endif`. Условия поддерживают все основные логические операторы. +Filter maintainers can use conditions to supply different rules depending on the ad blocker type. A conditional directive beginning with an `!#if` directive must explicitly be terminated with an `!#endif` directive. Conditions support all basic logical operators. -Есть два возможных сценария: +There are two possible scenarios: -1. Если блокировщик рекламы встречает директиву `!#if` и не встречает директиву `!#else`, то он компилирует код между директивами `!#if` и `!#endif` только в том случае, если указанное условие истинно. +1. When an ad blocker encounters an `!#if` directive and no `!#else` directive, it will compile the code between `!#if` and `!#endif` directives only if the specified condition is true. -1. Если существует директива `!#else`, код между `!#if` и `!#else` будет скомпилирован, если условие истинно; в противном случае будет скомпилирован код между `!#else` и `!#endif`. +1. If there is an `!#else` directive, the code between `!#if` and `!#else` will be compiled if the condition is true; otherwise, the code between `!#else` and `!#endif` will be compiled. :::note -Пробелы имеют значение. `!#if` является допустимой директивой, а `!# if` — нет. +Whitespaces matter. `!#if` is a valid directive, while `!# if` is not. ::: @@ -4552,26 +4641,27 @@ false_conditions_rules_list где: -- `!#if (условия)` — начало блока при выполнении условий -- `conditions` — точно так же, как и в случае с некоторыми популярными языками программирования, условия препроцессинга основаны на константах, объявляемых блокировщиками. Разработчики блокировщиков самостоятельно определяют, какие именно константы объявлять. Возможные значения: - - `adguard` объявляется всегда; даёт разработчикам фильтров понять, что это один из продуктов AdGuard; должно быть достаточно в 95% случаев - - специфичные для конкретных продуктов константы, которые нужны в редких случаях, когда правило должно работать (или не работать — тогда перед константой используйте `!`) только для конкретного продукта: - - `adguard_app_windows` — AdGuard для Windows - - `adguard_app_mac` — AdGuard для Mac - - `adguard_app_android` — AdGuard для Android - - `adguard_app_ios` — AdGuard для iOS - - `adguard_ext_safari` — AdGuard для Safari - - `adguard_ext_chromium` — Браузерное расширение AdGuard для Chrome (и браузеры на основе Chrome, например, новый Microsoft Edge) - - `adguard_ext_chromium_mv3` — [AdGuard для Chrome MV3][ext-mv3] - - `adguard_ext_firefox` — Браузерное расширение AdGuard для Firefox - - `adguard_ext_edge` — Браузерное расширение AdGuard для Edge Legacy - - `adguard_ext_opera` — Браузерное расширение AdGuard для Opera - - `adguard_ext_android_cb` — AdGuard Content Blocker для мобильных браузеров Samsung и Яндекс - - `ext_ublock` — особый случай; эта константа объявляется, когда версия фильтра для uBlock компилируется при помощи [FiltersRegistry][] - - `cap_html_filtering` — продукты, поддерживающие правила HTML-фильтрации: AdGuard для Windows, AdGuard для Mac и AdGuard для Android -- `!#else` — начало блока, когда условия ложны -- `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — списки правил -- `!#endif` — конец блока +- `!#if (conditions)` — start of the block when conditions are true +- `conditions` — just like in some popular programming languages, preprocessor conditions are based on constants declared by ad blockers. Authors of ad blockers define on their own what exact constants they declare. Possible values: + - `adguard` always declared; shows maintainers that this is one of AdGuard products; should be enough in 95% of cases + - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: + - `adguard_app_windows` — AdGuard for Windows + - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux + - `adguard_app_android` — AdGuard for Android + - `adguard_app_ios` — AdGuard for iOS + - `adguard_ext_safari` — AdGuard for Safari + - `adguard_ext_chromium` — AdGuard Browser Extension for Chrome (and chromium-based browsers, e.g. new Microsoft Edge) + - `adguard_ext_chromium_mv3` — [AdGuard for Chrome MV3][ext-mv3] + - `adguard_ext_firefox` — AdGuard Browser Extension for Firefox + - `adguard_ext_edge` — AdGuard Browser Extension for Edge Legacy + - `adguard_ext_opera` — AdGuard Browser Extension for Opera + - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers + - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux +- `!#else` — start of the block when conditions are false +- `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules +- `!#endif` — end of the block **Примеры** @@ -4603,34 +4693,34 @@ domain.com##div.ad :::info Совместимость -Директива `!#else` поддерживается [FiltersDownloader][gh-filters-downloader] 1.1.20 или более поздней версии. +The `!#else` directive is supported by the [FiltersDownloader][gh-filters-downloader] v1.1.20 or later. -Он уже поддерживается для списков фильтров, составленных с помощью [FiltersRegistry][], но всё ещё может не поддерживаться продуктами AdGuard при добавлении списка фильтров с `!#else` в качестве пользовательского. Следующие продукты будут поддерживать его в указанных версиях или более поздних версиях: +It is already supported for filter lists compiled by the [FiltersRegistry][], but it still may not be supported by AdGuard products when adding a filter list with `!#else` as a custom one. The following products will support it in the mentioned versions or later: -- AdGuard для Windows, Mac и Android c [CoreLibs][] 1.13; -- Браузерное расширение AdGuard 4.2.208; -- AdGuard 1.11.16 для Safari. +- AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.13; +- AdGuard Browser Extension v4.2.208; +- AdGuard v1.11.16 for Safari. ::: #### Правила фильтрации в Safari {#safari-affinity-directive} -Лимит каждого блокировщика контента Safari — 150 000 активных правил. Но в AdGuard для Safari и AdGuard для iOS мы разделили правила на 6 блокировщиков контента, тем самым увеличив лимит правил до 900 000. +Safari's limit for each content blocker is 150,000 active rules. But in AdGuard for Safari and AdGuard for iOS, we've split the rules into 6 content blockers, thus increasing the rule limit to 900,000. -Какие фильтры содержатся в каждом блокировщике контента: +Here is the composition of each content blocker: -- AdGuard General — Блокировка рекламы, Языковые -- AdGuard Privacy — Антитрекинг -- AdGuard Social — Виджеты социальных сетей, Раздражители -- AdGuard Security — Безопасность -- AdGuard Other — Другие -- AdGuard Custom — Собственные +- AdGuard General — Ad Blocking, Language-specific +- AdGuard Privacy — Privacy +- AdGuard Social — Social Widgets, Annoyances +- AdGuard Security — Security +- AdGuard Other — Other +- AdGuard Custom — Custom -Пользовательские правила и белый список добавляются в каждый блокировщик контента. +User rules and allowlist are added to every content blocker. :::caution -Основной недостаток использования нескольких блокировщиков контента в том, что правила из разных блокировщиков применяются независимо друг от друга. На правила блокировки это не влияет, но с правилами разблокировки могут быть проблемы. Если правило блокировки есть в одном блокировщике контента, а исключение — в другом, то исключение не сработает. Разработчики фильтров используют `!#safari_cb_affinity`, чтобы указать, к какому блокировщику контента принадлежат правила. +The main disadvantage of using multiple content blockers is that rules from different blockers are applied independently. Blocking rules are not affected by this, but unblocking rules may cause problems. If a blocking rule is in one content blocker and an exception is in another, the exception will not work. Filter maintainers use `!#safari_cb_affinity` to define Safari content blocker affinity for the rules inside of the directive block. ::: @@ -4644,17 +4734,17 @@ rules_list где: -- `!#safari_cb_affinity(content_blockers)` — начало блока -- `content_blockers` — список блокировщиков контента, разделённых запятой. Возможные значения: - - `general` — блокировщик контента AdGuard General - - `privacy` — блокировщик контента AdGuard Privacy - - `social` — блокировщик контента AdGuard Social - - `security` — блокировщик контента AdGuard Security - - `other` — блокировщик контента AdGuard Other - - `custom` — блокировщик контента AdGuard Custom - - `all` — специальное ключевое слово, которое означает, что правила должны быть включены во **все** блокировщики контента -- `rules_list` — список правил -- `!#safari_cb_affinity` — конец блока +- `!#safari_cb_affinity(content_blockers)` — start of the block +- `content_blockers` — comma-separated list of content blockers. Possible values: + - `general` — AdGuard General content blocker + - `privacy` — AdGuard Privacy content blocker + - `social` — AdGuard Social content blocker + - `security` — AdGuard Security content blocker + - `other` — AdGuard Other content blocker + - `custom` — AdGuard Custom content blocker + - `all` — special keyword that means that the rules must be included into **all** content blockers +- `rules_list` — list of rules +- `!#safari_cb_affinity` — end of the block **Примеры** @@ -4674,7 +4764,7 @@ example.org#@#.adBanner ### Подсказки -Hint (подсказка) — это специальный комментарий, инструкция к компилятору фильтров, используемому на стороне сервера (см. [FiltersRegistry][]). +"Hint" is a special comment, instruction to the filters compiler used on the server side (see [FiltersRegistry][]). **Синтаксис** @@ -4682,13 +4772,13 @@ Hint (подсказка) — это специальный комментари !+ HINT_NAME1(PARAMS) HINT_NAME2(PARAMS) ``` -Можно применить несколько подсказок. +Multiple hints can be applied. #### Подсказка `NOT_OPTIMIZED` -Для каждого фильтра AdGuard существуют две версии: полная и оптимизированная. Оптимизированная версия намного легче и не содержит правил, которые не используются вообще или используются редко. +For each filter, AdGuard compiles two versions: full and optimized. Optimized version is much more lightweight and does not contain rules which are not used at all or used rarely. -Частота использования правил определяется собранной [статистикой по рекламным фильтрам](../tracking-filter-statistics). Но оптимизация основана также на исходной конфигурации для каждого фильтра. Например, вот так это выглядит для Базового фильтра: +Rules usage frequency comes from the collected [filter rules statistics](../tracking-filter-statistics). But filters optimization is based on more than that — some filters have specific configuration. This is how it looks like for Base filter: ```text "filter": Базовый фильтр AdGuard, @@ -4700,27 +4790,27 @@ Hint (подсказка) — это специальный комментари где: -- **filter** — идентификатор фильтра -- **percent** — ожидаемый процент оптимизации `~= (количество правил в оптимизированном фильтре) / (количество правил в исходном фильтре) * 100` -- **minPercent** — нижняя граница значения `percent` -- **maxPercent** — верхняя граница значения `percent` -- **strict** — если включены `percent < minPercent` или `percent > maxPercent` и строгий режим, то компиляция фильтра должна завершиться неудачно, в противном случае должны использоваться оригинальные правила +- **filter** — filter identifier +- **percent** — expected optimization percent `~= (rules count in optimized filter) / (rules count in original filter) * 100` +- **minPercent** — lower bound of `percent` value +- **maxPercent** — upper bound of `percent` value +- **strict** — if `percent < minPercent` OR `percent > maxPercent` and strict mode is on then filter compilation should fail, otherwise original rules must be used -Другими словами, `percent` — это «уровень сжатия». Например, для Базового фильтра он настроен на 40%. Это означает, что алгоритм оптимизации должен убрать 60% правил. +In other words, `percent` is the "compression level". For instance, for the Base filter it is configured to 40%. It means that optimization algorithm should strip 60% of rules. -В итоге, вот так выглядят версии Базового фильтра для Браузерного расширения AdGuard для Chrome: +Eventually, here are the two versions of the Base filter for AdGuard Browser Extension: -- полная: https://filters.adtidy.org/extension/chromium/filters/2.txt -- оптимизированная: https://filters.adtidy.org/extension/chromium/filters/2_optimized.txt +- full: https://filters.adtidy.org/extension/chromium/filters/2.txt +- optimized: https://filters.adtidy.org/extension/chromium/filters/2_optimized.txt -**Если вы хотите добавить правило, которое не должно удаляться при оптимизации, используйте подсказку `NOT_OPTIMIZED`:** +**If you want to add a rule which should not be removed at optimization use the `NOT_OPTIMIZED` hint:** ```adblock !+ NOT_OPTIMIZED ||example.org^ ``` -**А такое правило не будет оптимизировано только для AdGuard для Android:** +**And this rule will not be optimized only for AdGuard for Android:** ```adblock !+ NOT_OPTIMIZED PLATFORM(android) @@ -4729,27 +4819,29 @@ Hint (подсказка) — это специальный комментари #### Подсказки `PLATFORM` и `NOT_PLATFORM` -Записи этого типа позволяют указывать платформу, для которой применяется правило. Ниже представлен список используемых платформ и ссылки на Базовый фильтр для каждой из них: +Used to specify the platforms to apply the rules. List of existing platforms and links to Base filter, for example, for each of them: + +- `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `windows` — AdGuard для Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) -- `mac` — AdGuard для Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) -- `android` — AdGuard для Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) +- `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) -- `ios` — AdGuard для iOS — [https://filters.adtidy.org/ios/filters/2.txt](https://filters.adtidy.org/ios/filters/2.txt) +- `ios` — AdGuard for iOS — [https://filters.adtidy.org/ios/filters/2.txt](https://filters.adtidy.org/ios/filters/2.txt) -- `ext_chromium` — Браузерное расширение AdGuard для Chrome — [https://filters.adtidy.org/extension/chromium/filters/2.txt](https://filters.adtidy.org/extension/chromium/filters/2.txt) +- `ext_chromium` — AdGuard Browser Extension for Chrome — [https://filters.adtidy.org/extension/chromium/filters/2.txt](https://filters.adtidy.org/extension/chromium/filters/2.txt) -- `ext_chromium` — Браузерное расширение AdGuard для Chrome MV3 — [https://filters.adtidy.org/extension/chromium-mv3/filters/2.txt](https://filters.adtidy.org/extension/chromium-mv3/filters/2.txt) +- `ext_chromium_mv3` — AdGuard Browser Extension for Chrome MV3 — [https://filters.adtidy.org/extension/chromium-mv3/filters/2.txt](https://filters.adtidy.org/extension/chromium-mv3/filters/2.txt) -- `ext_ff` — Браузерное расширение AdGuard для Firefox — [https://filters.adtidy.org/extension/firefox/filters/2.txt](https://filters.adtidy.org/extension/firefox/filters/2.txt) +- `ext_ff` — AdGuard Browser Extension for Firefox — [https://filters.adtidy.org/extension/firefox/filters/2.txt](https://filters.adtidy.org/extension/firefox/filters/2.txt) -- `ext_edge` — Браузерное расширение AdGuard для Edge — [https://filters.adtidy.org/extension/edge/filters/2.txt](https://filters.adtidy.org/extension/edge/filters/2.txt) +- `ext_edge` — AdGuard Browser Extension for Edge — [https://filters.adtidy.org/extension/edge/filters/2.txt](https://filters.adtidy.org/extension/edge/filters/2.txt) -- `ext_opera` — Браузерное расширение AdGuard для Opera — [https://filters.adtidy.org/extension/opera/filters/2.txt](https://filters.adtidy.org/extension/opera/filters/2.txt) +- `ext_opera` — AdGuard Browser Extension for Opera — [https://filters.adtidy.org/extension/opera/filters/2.txt](https://filters.adtidy.org/extension/opera/filters/2.txt) -- `ext_safari` — AdGuard для Safari — [https://filters.adtidy.org/extension/safari/filters/2.txt](https://filters.adtidy.org/extension/safari/filters/2.txt) +- `ext_safari` — AdGuard for Safari — [https://filters.adtidy.org/extension/safari/filters/2.txt](https://filters.adtidy.org/extension/safari/filters/2.txt) - `ext_android_cb` — AdGuard Content Blocker — [https://filters.adtidy.org/extension/android-content-blocker/filters/2.txt](https://filters.adtidy.org/extension/android-content-blocker/filters/2.txt) @@ -4757,95 +4849,106 @@ Hint (подсказка) — это специальный комментари **Примеры** -Это правило будет действовать только в AdGuard для Windows, Mac и Android: +This rule will be available only in AdGuard for Windows, Mac, Android: ```adblock !+ PLATFORM(windows,mac,android) ||example.org^ ``` -За исключением AdGuard для Safari, AdGuard Content Blocker и AdGuard для iOS, это правило доступно на всех платформах: +Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, this rule is available on all platforms: ```adblock !+ NOT_PLATFORM(ext_safari, ext_android_cb, ios) ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## Отладка правил фильтрации -Хоть самые простые правила фильтрации и возможно придумать «в голове», для чего-то чуть более сложного вам потребуются дополнительная помощь в их отладке и повторении. Есть инструменты, которые помогут вам в этом. Вы можете использовать «Инструменты разработчика» в Chrome и их аналоги в других браузерах, но большинство продуктов AdGuard предоставляют и другой инструмент — Журнал фильтрации. +It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. ### Журнал фильтрации -Журнал фильтрации — продвинутый инструмент, который полезен в основном разработчикам фильтров. В нём отображаются все веб-запросы, проходящие через AdGuard, даётся исчерпывающая информация по каждому из них, предлагаются различные опции сортировки и другие полезные возможности. +Filtering log is an advanced tool that will be helpful mostly to filter developers. It lists all web requests that pass through AdGuard, gives you exhaustive information on each of them, offers multiple sorting options, and has other useful features. -В зависимости от того, какой продукт AdGuard вы используете, журнал фильтрации может находиться в разных местах. +Depending on which AdGuard product you are using, Filtering log can be located in different places. -- В **AdGuard для Windows** вы найдёте его во вкладке настроек *Антибаннер* или через меню трея -- В **AdGuard для Mac** он располагается в разделе *Настройки → Дополнительно → Журнал фильтрации* -- В **AdGuard для Android** его можно найти в разделе *Статистика → Недавняя активность*. *Доступ к недавней активности* также можно получить из *Помощника* -- В **Браузерном расширении AdGuard** он находится во вкладке настроек *Дополнительно*, а также доступен по клику правой кнопкой мыши по иконке расширения. Только веб-браузеры на основе Chromium и Firefox отображают применённые **правила скрытия элементов** (включая CSS, ExtCSS) и **JS-правила и скриптлеты** в своих Журналах фильтрации +- In **AdGuard for Windows**, you can find it in the *Ad Blocker* tab or via the tray menu +- In **AdGuard for Mac**, it is located in *Settings → Advanced → Filtering log* +- In **AdGuard for Android**, you can find it under *Statistics → Recent activity*. *Recent activity* can also be accessed from the *Assistant* +- In **AdGuard Browser Extension**, it is accessible from the *Miscellaneous* settings tab or by right-clicking the extension icon. Only Chromium- and Firefox-based web browsers show applied **element hiding rules** (including CSS, ExtCSS) and **JS rules and scriptlets** in their Filtering logs :::note -В **AdGuard для iOS** и в **AdGuard для Safari** Журнал фильтрации отсутствует из-за особенностей реализации блокировщиков контента в Safari. AdGuard сам не видит веб-запросы и поэтому не может отображать их. +In **AdGuard for iOS** and **AdGuard for Safari**, Filtering log does not exist because of the way content blockers are implemented in Safari. AdGuard does not see the web requests and therefore cannot display them. ::: ### Режим отладки селекторов {#selectors-debug-mode} -Иногда может понадобиться проверить производительность того или иного селектора или таблицы стилей. Чтобы сделать это без непосредственного взаимодействия с JavaScript, вы можете использовать свойство стиля `debug`. Когда `ExtendedCss` встречает это свойство, он включает режим отладки для конкретного селектора или для всех селекторов, в зависимости от значения `debug`. +Sometimes, you might need to check the performance of a given selector or a stylesheet. In order to do it without interacting with JavaScript directly, you can use a special `debug` style property. When `ExtendedCss` meets this property, it enables the debugging mode either for a single selector or for all selectors, depending on the `debug` value. -Откройте консоль браузера, находясь на веб-странице, чтобы посмотреть статистику по времени, затраченному на применение селектора(-ов). В режиме отладки следующая статистика отображается в виде объекта, где каждый из отлаживаемых селекторов является ключом, а значение — объектом с такими свойствами: +Open the browser console while on a web page to see the timing statistics for selector(s) that were applied there. Debugging mode displays the following stats as object where each of the debugged selectors are keys, and value is an object with such properties: -**Всегда выводится:** +**Always printed:** -- `selectorParsed` — текст разобранного селектора, может отличаться от входного -- `timings` — список узлов DOM, соответствующих селектору - - `appliesCount` — общее количество раз, когда на странице был применён селектор - - `appliesTimings` — время, которое ушло на применение селектора на странице, для каждого из случаев применения этого селектора (в миллисекундах) - - `meanTiming` — среднее время, ушедшее на применение селектора на странице - - `standardDeviation` — стандартное отклонение - - `timingsSum` — общее время, ушедшее на все применения селектора на текущей странице +- `selectorParsed` — text of the parsed selector, may differ from the input one +- `timings` — list of DOM nodes matched by the selector + - `appliesCount` — total number of times that the selector has been applied on the page + - `appliesTimings` — time that it took to apply the selector on the page, for each of the instances that it has been applied (in milliseconds) + - `meanTiming` — mean time that it took to apply the selector on the page + - `standardDeviation` — standard deviation + - `timingsSum` — total time it took to apply the selector on the page across all instances -**Выводится только для удаления псевдонимов:** +**Printed only for remove pseudos:** -- `removed` — флаг, сигнализирующий об удалении элементов +- `removed` — flag to signal if elements were removed -**Выводится, если элементы не удалены:** +**Printed if elements are not removed:** -- `matchedElements` — список узлов DOM, соответствующих селектору -- `styleApplied` — объявление обработанного стиля правила, связанного с селектором +- `matchedElements` — list of DOM nodes matched by the selector +- `styleApplied` — parsed rule style declaration related to the selector **Примеры** -**Отладка конкретного селектора:** +**Debugging a single selector:** -Когда значение свойства `debug` равно `true`, информация только по этому селектору будет отображена в консоли браузера. +When the value of the `debug` property is `true`, only information about this selector will be shown in the browser console. ```adblock #$?#.banner { display: none; debug: true; } ``` -**Включение глобальной отладки:** +**Enabling global debug:** -Когда значение свойства `debug` равно `global`, в консоли будет отображаться информация по всем CSS-селекторам, которые были применены на данной странице, для всех правил из любого из включённых фильтров. +When the value of the `debug` property is `global`, the console will display information about all extended CSS selectors that have matches on the current page, for all the rules from any of the enabled filters. ```adblock #$?#.banner { display: none; debug: global; } ``` -**Тестирование расширенных селекторов без AdGuard** +**Testing extended selectors without AdGuard** -ExtendedCss может быть выполнен на любой странице без использования какого-либо продукта AdGuard. Для этого скопируйте и запустите следующий код в консоли браузера: +ExtendedCss can be executed on any page without using any AdGuard product. In order to do that you should copy and execute the following code in a browser console: ```js !function(e,t,d){C=e.createElement(t),C.src=d,C.onload=function(){alert("ExtendedCss loaded successfully")},s=e.getElementsByTagName(t)[0],s?s.parentNode.insertBefore(C,s):(h=e.getElementsByTagName("head")[0],h.appendChild(C))}(document,"script","https://AdguardTeam.github.io/ExtendedCss/extended-css.min.js"); ``` -Или установите пользовательский скрипт [ExtendedCssDebugger](https://github.com/AdguardTeam/Userscripts/blob/master/extendedCssDebugger/extended-css.debugger.user.js). +Alternatively, install the [ExtendedCssDebugger userscript](https://github.com/AdguardTeam/Userscripts/blob/master/extendedCssDebugger/extended-css.debugger.user.js). -Теперь вы можете использовать `ExtendedCss` глобально и запустить его метод [`query()`](https://github.com/AdguardTeam/ExtendedCss#extended-css-query) как `Document.querySelectorAll()`. +Now you can now use the `ExtendedCss` from global scope, and run its method [`query()`](https://github.com/AdguardTeam/ExtendedCss#extended-css-query) as `Document.querySelectorAll()`. **Примеры** @@ -4858,9 +4961,9 @@ ExtendedCss.query(selector); ### Отладка скриптлетов {#debug-scriptlets} -Если вы используете Браузерное расширение AdGuard и хотите отладить правило [скриптлета](#scriptlets) или [доверенного скриптлета](#trusted-scriptlets), то можете получить дополнительную информацию, открыв журнал фильтрации. В этом случае скриптлеты перейдут в режим отладки и будут записывать больше информации в браузерную консоль. +If you are using AdGuard Browser Extension and want to debug a [scriptlet](#scriptlets) or a [trusted scriptlet](#trusted-scriptlets) rule, you can get additional information by opening the Filtering log. In that case, scriptlets will switch to debug mode and there will be more information in the browser console. -Следующие скриптлеты разработаны специально для отладки: +The following scriptlets are especially developed for debug purposes: - [`debug-current-inline-script`](https://github.com/AdguardTeam/Scriptlets/blob/master/wiki/about-scriptlets.md#debug-current-inline-script) - [`debug-on-property-read`](https://github.com/AdguardTeam/Scriptlets/blob/master/wiki/about-scriptlets.md#debug-on-property-read) @@ -4870,14 +4973,14 @@ ExtendedCss.query(selector); - [`log-eval`](https://github.com/AdguardTeam/Scriptlets/blob/master/wiki/about-scriptlets.md#log-eval) - [`log`](https://github.com/AdguardTeam/Scriptlets/blob/master/wiki/about-scriptlets.md#log) -Следующие скриптлеты тоже могут быть использованы для отладки: +The following scriptlets also may be used for debug purposes: - [`json-prune`](https://github.com/AdguardTeam/Scriptlets/blob/master/wiki/about-scriptlets.md#json-prune) - [`prevent-fetch`](https://github.com/AdguardTeam/Scriptlets/blob/master/wiki/about-scriptlets.md#prevent-fetch) - [`prevent-requestAnimationFrame`](https://github.com/AdguardTeam/Scriptlets/blob/master/wiki/about-scriptlets.md#prevent-requestanimationframe) - [`prevent-setInterval`](https://github.com/AdguardTeam/Scriptlets/blob/master/wiki/about-scriptlets.md#prevent-setinterval) - [`prevent-setTimeout`](https://github.com/AdguardTeam/Scriptlets/blob/master/wiki/about-scriptlets.md#prevent-settimeout) -- [`prevent-window-open`](https://github.com/AdguardTeam/Scriptlets/blob/master/wiki/about-scriptlets.md#prevent-window-open) с указанным параметром `replacement` +- [`prevent-window-open`](https://github.com/AdguardTeam/Scriptlets/blob/master/wiki/about-scriptlets.md#prevent-window-open) with specified `replacement` parameter - [`prevent-xhr`](https://github.com/AdguardTeam/Scriptlets/blob/master/wiki/about-scriptlets.md#prevent-xhr) - [`trusted-replace-fetch-response`](https://github.com/AdguardTeam/Scriptlets/blob/master/wiki/about-trusted-scriptlets.md#trusted-replace-fetch-response) - [`trusted-replace-xhr-response`](https://github.com/AdguardTeam/Scriptlets/blob/master/wiki/about-trusted-scriptlets.md#trusted-replace-xhr-response) @@ -4886,13 +4989,13 @@ ExtendedCss.query(selector); ### Краткие обозначения продуктов {#what-product} -1. `CoreLibs apps` — [AdGuard для Windows](/adguard-for-windows/features/home-screen), [AdGuard для Mac](/adguard-for-mac/features/main) и [AdGuard для Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera -1. `AdGuard для Chrome MV3` — [Браузерное расширение AdGuard для Chrome MV3](/adguard-browser-extension/mv3-version) -1. `AdGuard для Firefox` — [Браузерное расширение AdGuard](/adguard-browser-extension/availability) для Firefox -1. `AdGuard для iOS` — [AdGuard для iOS](/adguard-for-ios/features/safari-protection) и AdGuard Pro для iOS (для мобильного браузера Safari) -1. `AdGuard для Safari` — [AdGuard для десктопного браузера Safari](/adguard-for-safari/features/general) -1. `AdGuard Content Blocker` — [Блокировщик контента](/adguard-content-blocker/overview) для мобильных браузеров Android: Samsung Internet и Яндекс Браузера +1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) +1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox +1. `AdGuard for iOS` — [AdGuard for iOS](/adguard-for-ios/features/safari-protection) and AdGuard Pro for iOS (for mobile Safari browser) +1. `AdGuard for Safari` — [AdGuard for desktop Safari browser](/adguard-for-safari/features/general) +1. `AdGuard Content Blocker` — [Content Blocker](/adguard-content-blocker/overview) for Android mobile browsers: Samsung Internet and Yandex Browser ### Краткие обозначения совместимости {#what-compatibility} @@ -4900,10 +5003,10 @@ ExtendedCss.query(selector); - ✅ — полностью поддерживается - ✅ * — поддерживается, но надёжность может быть разной или могут возникнуть ограничения; ознакомьтесь с описанием модификатора для получения подробной информации -- 🧩 — может быть уже реализован в nightly- или бета-версиях, но пока не поддерживается в релизных версиях +- 🧩 — may already be implemented in nightly or beta versions but is not yet supported in release versions - ⏳ — планируется к реализации, но пока недоступен ни в одном продукте -- ❌ — не поддерживается -- 👎 — устарел; всё ещё поддерживается, но в будущем будет удалён +- ❌ — not supported +- 👎 — deprecated; still supported but will be removed in the future - 🚫 — удалён и больше не поддерживается ::: @@ -4916,13 +5019,12 @@ ExtendedCss.query(selector); [jsinject-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/release/v3.1/packages/tsurlfilter/src/rules/declarative-converter#jsinject -[cl-apps]: #what-product "AdGuard для Windows, Mac и Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "Браузерное расширение AdGuard для Chrome и других браузеров на основе Chromium" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-mv3]: #what-product "Браузерное расширение AdGuard для Chrome MV3" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-mv3]: #what-product "Браузерное расширение AdGuard MV3 для Chrome" -[ext-mv3]: #what-product "Браузерное расширение AdGuard для Chrome MV3" [ext-ff]: #what-product "Браузерное расширение AdGuard для Firefox" [ios-app]: #what-product "AdGuard for iOS and AdGuard Pro for iOS" [ios-app]: #what-product "AdGuard для iOS и AdGuard Pro для iOS" @@ -4933,13 +5035,9 @@ ExtendedCss.query(selector); [gh-filters-downloader]: https://github.com/AdguardTeam/FiltersDownloader [c CoreLibs]: https://adguard.com/en/blog/introducing-corelibs.html -[с CoreLibs]: https://adguard.com/en/blog/introducing-corelibs.html [с CoreLibs 1.12 или более поздней версии]: https://adguard.com/ru/blog/introducing-corelibs.html -[CoreLibs]: https://adguard.com/en/blog/introducing-corelibs.html [с CoreLibs]: https://adguard.com/ru/blog/introducing-corelibs.html -[CoreLibs]: https://adguard.com/ru/blog/introducing-corelibs.html [FiltersRegistry]: https://github.com/AdguardTeam/FiltersRegistry -[с TSUrlFilter]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter#tsurlfilter +[CoreLibs]: https://adguard.com/en/blog/introducing-corelibs.html [TSUrlFilter]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter#tsurlfilter -[в tsurlfilter]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter#tsurlfilter [TSWebExtension]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tswebextension#tswebextension diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/general/extensions.md b/i18n/ru/docusaurus-plugin-content-docs/current/general/extensions.md index ae854217c4d..16f3d9cba2e 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/general/extensions.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/general/extensions.md @@ -39,7 +39,7 @@ AdGuard может значительно расширять функциона ::: -#### Отключить AMP +#### Disable AMP Скрипт, который предустановлен только в AdGuard для Android. Он отключает AMP (Accelerated Mobile Pages или «ускоренные мобильные страницы») на странице результатов поиска Google. [На GitHub](https://github.com/AdguardTeam/DisableAMP) есть подробности об этом пользовательском скрипте и о том, как его установить. diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/general/https-filtering/what-is-https-filtering.md b/i18n/ru/docusaurus-plugin-content-docs/current/general/https-filtering/what-is-https-filtering.md index a7d917f8f5c..b0457bb352b 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/general/https-filtering/what-is-https-filtering.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/general/https-filtering/what-is-https-filtering.md @@ -27,11 +27,11 @@ HTTPS (аббр. от англ. HyperText Transfer Protocol Secure) — расш Для лучшего понимания мы изобразили этот процесс на картинке: -![How HTTPS filtering works](https://cdn.adtidy.org/public/Adguard/Blog/https/what_is_https_filtering.png) +![Как работает HTTPS-фильтрация](https://cdn.adtidy.org/public/Adguard/Blog/https/what_is_https_filtering.png) ### Остаётся ли мой трафик зашифрованным и безопасным? -Конечно! Ваше соединение с удалённым сервером остаётся зашифрованным и защищённым. AdGuard, just like a browser, checks the server’s certificate before determining if the connection should be filtered or not. +Конечно! Ваше соединение с удалённым сервером остаётся зашифрованным и защищённым. AdGuard, как и браузер, проверяет сертификат сервера, прежде чем решить, фильтровать ли соединение. Однако HTTPS-фильтрация имеет свои недостатки. Самым важным из них является то, что она скрывает от браузера свойства реального сертификата, используемого сайтом. Вместо этого браузер видит сертификат, сгенерированный AdGuard. @@ -51,7 +51,7 @@ AdGuard предоставляет возможность исключить и ### Известные проблемы, связанные с HTTPS-фильтрацией -A [2017 study](https://cdn.adtidy.org/public/Adguard/Blog/https/interception-ndss17.pdf) found that 5 to 10% of HTTPS connections were established by HTTPS filtering applications. Обычно это делают разнообразные антивирусы. Плохая новость заключается в том, что 24 из 26 протестированных антивирусов тем или иным способом снижали уровень безопасности соединения, а две трети создавали соединения, подверженные взлому. +[Исследование 2017 года](https://cdn.adtidy.org/public/Adguard/Blog/https/interception-ndss17.pdf) показало, что 5–10% HTTPS-соединений устаналиваются приложениями с HTTPS-фильтрацией. Обычно это делают разнообразные антивирусы. Плохая новость заключается в том, что 24 из 26 протестированных антивирусов тем или иным способом снижали уровень безопасности соединения, а две трети создавали соединения, подверженные взлому. Исследователи пришли к простому выводу: сообщество интернет-безопасности должно обратить пристальное внимание на приложения, фильтрующие защищённые соединения. И разработчики такого ПО должны уделять серьёзное внимание качеству фильтрации. @@ -71,7 +71,7 @@ A [2017 study](https://cdn.adtidy.org/public/Adguard/Blog/https/interception-nds ### Как самостоятельно проверить качество HTTPS -Существует несколько сайтов, созданных специально для проверки качества HTTPS-соединений. Эти сайты проверяют, подвержен ли браузер (или, в нашем случае, ваш браузер плюс AdGuard) распространённым уязвимостям. If you plan to use any program that filters HTTPS, not necessarily AdGuard (e.g., an antivirus), we advise that you check the connection quality using these websites. +Существует несколько сайтов, созданных специально для проверки качества HTTPS-соединений. Эти сайты проверяют, подвержен ли браузер (или, в нашем случае, ваш браузер плюс AdGuard) распространённым уязвимостям. Если вы собираетесь использовать программу, фильтрующую HTTPS (не обязательно AdGuard, это может быть антивирус), мы советуем проверить качество соединения на этих сайтах. - [https://www.ssllabs.com/ssltest/viewMyClient.html](https://www.ssllabs.com/ssltest/viewMyClient.html) - [https://www.howsmyssl.com/](https://www.howsmyssl.com/) diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/ru/docusaurus-plugin-content-docs/current/general/license/legacy.md index 7eb6e021995..a4ee3e2dd59 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: 'Устаревшие лицензии: часто задаваемые sidebar_position: 6 --- -Мы написали эту статью, чтобы избежать путаницы и подробно объяснить, как можно продлить/обновить устаревшую лицензию AdGuard. +We have written this article to avoid confusion and explain in detail how you can renew/upgrade a legacy AdGuard license. -## Об устаревших лицензиях +## About legacy licenses Изначально для активации продуктов AdGuard были доступны лицензии следующих типов: @@ -27,57 +27,55 @@ sidebar_position: 6 С октября 2019 года AdGuard перешёл на новую систему тарифов: теперь лицензии также можно купить на 1 год или навечно, но они стали **Персональными** (на 3 устройства) или **Семейными** (на 9 устройств). -Ещё одно изменение: **ключи нового типа можно использовать на любых устройствах, в любых комбинациях. Например, Персональную лицензию можно использовать на Android, Мас и iOS, точно так же, как и, например, на двух компьютерах Windows и планшете Apple.** +Another change is that the **new types of license keys can now be used on any device, in any combination**. For example, a Personal license can be used on Android, Mac and iOS, as well as on two Windows computers and an Apple tablet. -## Что стало с устаревшими лицензиями +## What happened to the legacy licenses? -Стандартные автоматически стали универсальными, а это значит, что их можно активировать на любых устройствах. +**Standard licenses** were automatically made **universal**, which means that they can be activated on any device. -Мобильные ключи остались без изменений и сохранили ограничение по платформе (их по-прежнему можно использовать только на телефонах/планшетах). +**Mobile licenses** remained unchanged and platform-limited (they can still only be used on phones or tablets). -Премиум-ключи также сохранили разграничение по платформам (используются пополам на десктопных и мобильных устройствах). Теперь все **Премиум-лицензии отображаются в личном кабинете по суммарному количеству устройств**. Их по-прежнему можно активировать на десктопных и мобильных устройствах. +**Premium licenses** also remained unchanged and platform-limited. Теперь все **Премиум-лицензии отображаются в личном кабинете по суммарному количеству устройств**. Их по-прежнему можно активировать на десктопных и мобильных устройствах. Вот так, например, выглядит ключ 1+1: -![ключ 1+1](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![ключ 1+1](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *Несмотря отображение общего количества устройств, использоваться он может всё так же на одном десктопном и одном мобильном устройстве.* > Все устаревшие лицензии отображаются в личном кабинете с пометкой «старая версия». Они автоматически преобразуются в новый тип, когда вы их улучшаете или продлеваете. Однако тут есть небольшие технические ограничения. Ниже рассказываем, какие лицензии можно преобразовать в ключи нового типа и как это сделать. -## У меня устаревший ключ. Как я могу продлить или улучшить его? +## How to renew or upgrade a legacy key -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +You can extend/renew or upgrade a legacy license in your [AdGuard account](https://adguardaccount.com) or on the [Extend or upgrade page](https://adguard.com/renew.html). -![Улучшить](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Перейдите в «Мои лицензии» и проверьте, какие улучшения вам доступны для каждого конкретного ключа. Ниже поясним на конкретных примерах. +To extend/renew or upgrade a legacy license in your AdGuard account, go to the *Licenses* tab, find the license you need, and select one of the available options. -### Лицензии на 1/2/3 устройства +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Годовые** лицензии на 1, 2, 3 устройства могут быть сконвертированы как в Персональную, так и в Семейную лицензию при продлении: +Or go to the [Extend or upgrade page](https://adguard.com/renew.html), enter your license, and click *Apply*. On the new page, select one of the available options. -![Обновить или улучшить](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Выбирайте, сколько устройств вам нужно защитить. +### Лицензии на 1/2/3 устройства -Вы также можете не продлевать лицензии, а сделать их вечными: +Mobile Yearly licenses for 3 devices can be converted to Personal licenses or upgraded to Family ones: -![Вечная](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Upgrade Yearly licenses for 1, 2, 3 devices](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Вечные** лицензии из-за технических ограничений можно конвертировать только в Семейные (на 9 устройств): +> If you have a **Standard license for 3 devices**, it already works as a **Personal** license. If you renew your **Mobile license** for 3 devices, you will be able to use it on a **different set of device**s, not just phones. -![Улучшить до Вечной](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +You can also upgrade your license to Lifetime: -### Лицензии на 4+ устройства (до 9) +![Upgrade to Lifetime](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Годовые** ключи такой конфигурации можно превратить только в Семейную лицензию: +**Lifetime** licenses can only be upgraded to Family (9 devices) due to technical limitations. -![Годовая лицензия на 4 устройства](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Лицензии на 4+ устройства (до 9) -**Вечные** ключи на 4 и более устройств нельзя улучшить. Здесь также действует техническое ограничение: +**Yearly** licenses for 4 or more devices can be upgraded to Family and Lifetime licenses. -![Вечная лицензия на 4 устройства](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +However, if you already have a **Lifetime** license, it cannot be upgraded due to technical limitations. ### Лицензии на 9+ устройств -Речь о премиум-ключах 5+5 (и далее) и на специальные ключи от 10 устройств, которые вы приобретали у наших менеджеров в индивидуальном порядке. +Premium keys (5+5 and more) and custom keys for 10+ devices that you purchased individually with the help of our managers. -Это достаточно уникальные случаи, поэтому если вы захотите улучшить подобную Годовую лицензию до Вечной, то, пожалуйста, напишите нам на partners@adguard.com. Мы вышлем вам спецпредложение в зависимости от конкретной конфигурации вашей лицензии. +These are quite unique cases, so if you want to upgrade your license to Lifetime, please contact us at partners@adguard.com. We will make you a special offer depending on the specific configuration of your license. diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/ru/docusaurus-plugin-content-docs/current/general/license/what-is.md index fa9a6aafb89..8a03193b926 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ sidebar_position: 1 - **Дистрибьюторские лицензии** и **подарочные лицензии** могут быть как ограниченными по времени, так и вечными. Лицензии с ограниченным сроком действия можно обновить только вручную - Персональная — до 3 устройств - Семейная — до 9 устройств -- Купить и управлять **лицензией AdGuard Pro для iOS** можно через App Store. Её можно использовать только на устройствах iOS и iPadOS с одним и тем же Apple ID +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md b/i18n/ru/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md index cd6dc097f47..e840c75339a 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/guides/proxy-certificate.md @@ -21,7 +21,7 @@ HTTP-трафик будет фильтроваться в любом случа 1. Запишите IP-адрес компьютера с установленным AdGuard. -1. Убедитесь, что защита AdGuard включена. На компьютере с Windows установите флажок **Использовать AdGuard как HTTP-прокси** во вкладке **Сеть** в его настройках. On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. Убедитесь, что защита AdGuard включена. На компьютере с Windows установите флажок **Использовать AdGuard как HTTP-прокси** во вкладке **Сеть** в его настройках. На Mac перейдите в **Настройки** → **Сеть** и включите **HTTP-прокси**. 1. На том же компьютере с AdGuard перейдите по этой ссылке: [http://local.adguard.org/cert](http://local.adguard.org/cert). @@ -55,7 +55,7 @@ HTTP-трафик будет фильтроваться в любом случа 1. Нажмите **Настройка** во вкладке *Использовать прокси-сервер*. -1. Включите эту опцию. For **Proxy IP address**, type the IP address of your computer that you noted in step 1. В поле **Порт** введите порт, выбранный в сетевых настройках десктопного приложения AdGuard. +1. Включите эту опцию. В поле **IP-адрес прокси-сервера** введите IP-адрес из пункта 1. В поле **Порт** введите порт, выбранный в сетевых настройках десктопного приложения AdGuard. 1. Нажмите **Сохранить**. @@ -63,7 +63,7 @@ HTTP-трафик будет фильтроваться в любом случа 1. Запишите IP-адрес компьютера с установленным AdGuard. -1. Убедитесь, что защита AdGuard включена. На компьютере с Windows установите флажок **Использовать AdGuard как HTTP-прокси** во вкладке **Сеть** в его настройках. On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. Убедитесь, что защита AdGuard включена. На компьютере с Windows установите флажок **Использовать AdGuard как HTTP-прокси** во вкладке **Сеть** в его настройках. На Mac перейдите в **Настройки** → **Сеть** и включите **HTTP-прокси**. 1. Перейдите по этой ссылке, используя веб-браузер: [http://local.adguard.org/cert](http://local.adguard.org/cert). @@ -95,7 +95,7 @@ HTTP-трафик будет фильтроваться в любом случа 1. Запишите IP-адрес компьютера с установленным AdGuard. -1. Убедитесь, что защита AdGuard включена. На компьютере с Windows установите флажок **Использовать AdGuard как HTTP-прокси** во вкладке **Сеть** в его настройках. On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. Убедитесь, что защита AdGuard включена. На компьютере с Windows установите флажок **Использовать AdGuard как HTTP-прокси** во вкладке **Сеть** в его настройках. На Mac перейдите в **Настройки** → **Сеть** и включите **HTTP-прокси**. 1. На том же компьютере с AdGuard перейдите по этой ссылке, используя браузер: [http://local.adguard.org/cert](http://local.adguard.org/cert). @@ -109,13 +109,13 @@ HTTP-трафик будет фильтроваться в любом случа 1. Откройте настройки активной сети Wi-Fi. -1. Измените **Тип прокси** на **Вручную**. For **Proxy hostname**, enter the noted IP address of your computer you noted in step 1. В поле **Порт** введите порт, выбранный в сетевых настройках десктопного приложения AdGuard. +1. Измените **Тип прокси** на **Вручную**. В поле **Имя узла прокси** введите IP-адрес из пункта 1. В поле **Порт** введите порт, выбранный в сетевых настройках десктопного приложения AdGuard. ### iOS {#ios} 1. Запишите IP-адрес компьютера с установленным AdGuard. -1. Убедитесь, что защита AdGuard включена. На компьютере с Windows установите флажок **Использовать AdGuard как HTTP-прокси** во вкладке **Сеть** в его настройках. On a Mac, go to **Settings** → **Preferences** → **Network** and enable **HTTP proxy**. +1. Убедитесь, что защита AdGuard включена. На компьютере с Windows установите флажок **Использовать AdGuard как HTTP-прокси** во вкладке **Сеть** в его настройках. На Mac перейдите в **Настройки** → **Сеть** и включите **HTTP-прокси**. 1. На том же компьютере с AdGuard перейдите по этой ссылке, используя браузер: [http://local.adguard.org/cert](http://local.adguard.org/cert). diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/miscellaneous/contribute/beta-testing.md b/i18n/ru/docusaurus-plugin-content-docs/current/miscellaneous/contribute/beta-testing.md index 346bea74342..b870f461b74 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/miscellaneous/contribute/beta-testing.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/miscellaneous/contribute/beta-testing.md @@ -17,11 +17,11 @@ sidebar_position: 1 Вам также понадобится устройство, на которое вы будете устанавливать приложение, и [ссылка на страницу бета-тестирования](https://adguard.com/beta.html). Там вы найдёте больше информации о том, как присоединиться к нашей программе и тестировать приложения AdGuard для Windows, Mac, Android и iOS. -Если вы хотите пропустить описание и сразу перейти к делу, то вам [сюда](https://surveys.adguard.com/beta_testing_program/form.html). Your application will be reviewed within 1–3 working days, and you'll get a reply via email. +Если вы хотите пропустить описание и сразу перейти к делу, то вам [сюда](https://surveys.adguard.com/beta_testing_program/form.html). Ваша заявка будет рассмотрена в течение 1–3 рабочих дней. Вы получите ответ по почте. :::note -To get the AdGuard for iOS beta or nightly build, first you have to install [TestFlight](https://apps.apple.com/app/testflight/id899247664) on your iOS device. +Чтобы получить бета- или nightly-сборку AdGuard для iOS, установите [Testflight](https://apps.apple.com/app/testflight/id899247664) на своё iOS-устройство. ::: @@ -37,10 +37,10 @@ To get the AdGuard for iOS beta or nightly build, first you have to install [Tes ## Как активировать бета/nightly-ключ в приложении iOS {#ios} -If you have already received a beta or nightly key and it is listed in your `adguard.com` account, go to the app and open the license section (Get Premium). Введите учётные данные вашего аккаунта AdGuard. После этого премиум-функции станут доступны автоматически. +Если вы уже получили бета/nightly-ключ и он указан в вашем аккаунте `adguard.com`, зайдите в приложение и откройте раздел лицензии (Получить премиум). Введите учётные данные вашего аккаунта AdGuard. После этого премиум-функции станут доступны автоматически. ### Что ещё? -There is not much more to add. Вам не нужно старательно искать ошибки. Вы можете продолжать использовать AdGuard как обычно. Однако, если вы столкнётесь с ошибкой, пожалуйста, сообщите о ней. Мы будем вам очень признательны. +Вот и всё. Вам не нужно старательно искать ошибки. Вы можете продолжать использовать AdGuard как обычно. Однако, если вы столкнётесь с ошибкой, пожалуйста, сообщите о ней. Мы будем вам очень признательны. -Occasionally, you will receive our newsletters, keeping you informed of the latest changes in the beta/nightly (in case you missed them) and other important news. Вы можете отписаться в любой момент. +Время от времени вы будете получать письма, информирующие вас о последних изменениях в бета-/nightly-версии (на случай, если вы их пропустили) и других важных новостях. Вы можете отписаться в любой момент. diff --git a/i18n/ru/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/rewards.md b/i18n/ru/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/rewards.md index 2dac2788eee..f619f46dc9b 100644 --- a/i18n/ru/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/rewards.md +++ b/i18n/ru/docusaurus-plugin-content-docs/current/miscellaneous/contribute/translate/rewards.md @@ -37,7 +37,7 @@ sidebar_position: 6 > Здравствуйте! > -> Я перевел(а) более 5 000 слов в AdGuard для Android на (*ваш язык*) — статистика во вложении. As a reward, I’d like to request an AdGuard VPN license and an Ad Blocker license My email is (*your email address*). My Crowdin username is (*your username*). +> Я перевел(а) более 5 000 слов в AdGuard для Android на (*ваш язык*) — статистика во вложении. Хочу запросить лицензию AdGuard VPN и лицензию Блокировщика рекламы. Мой адрес почты: *ваш адрес*. Я в Crowdin: *ваше имя пользователя*. ## Как проверить, сколько вы перевели diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 92bfd87a1dd..fa490098e78 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ The _Low-level settings_ section is for expert users. [Read more about low-level This section allows you to manage HTTPS filtering settings, filters, and userscripts, and set up a proxy server. -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filters @@ -57,11 +57,19 @@ If you activate too many filters, some websites may work incorrectly. [Read more about filters](https://adguard.com/en/blog/what-are-filters.html) -### Userscripts +### Extensions + +Extensions allow you to add userscripts and userstyles. + +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 5e75a51f1e8..b5525cd735c 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 24b41b032ca..8f7344f7ade 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index da99768471a..0341d942127 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: How to protect AdGuard from being disabled by the system -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 7367e63cef9..784a7c9587c 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ You can access it by navigating to *Statistics* → *Battery usage*. Inside you will find a chart that shows the AdGuard battery resource consumption within the last 24 hours, with an option to get more detailed hour-to-hour data by tapping on the chart. Besides that, there’s also a numeric breakdown of the relevant data and a short technical explanation. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### How much battery resource does AdGuard really consume? First, let us lay down a bit of theory and links with necessary data. diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 6f1876d0079..0563d2a0336 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index d98274a0489..c77491236e7 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index deebee15677..c716cc3ed93 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Manual installation of the security certificate into the Firefox browser -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index c5b7755321a..05d28c3b6ea 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 54b325ec582..52016424603 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 79723d1f221..b9f70d23922 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problems caused by multiple user profiles -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 6b9fddc4500..f95d206303e 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: How to set up outbound proxy -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index b9e9396152a..4ae364e8290 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 96b31c31295..25de8d83319 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index adfd7139869..5d8aa06bad9 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: How to block ads in the YouTube app -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 43c9e9aee82..67126401ab4 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,23 +5,25 @@ sidebar_position: 2 ## Install AdGuard for Linux -To install AdGuard, enter: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` @@ -35,37 +37,97 @@ You can verify the signature to prove it’s an official version of AdGuard by u ::: -## Activate license +## Initial setup -AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don't have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -To log in or create an account, enter: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -To reset your license, enter: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -To view the license info, enter: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Initial setup +4. After activation, you can continue to work with the program: -To get AdGuard up and running, complete the initial setup. This includes installing the AdGuard CA certificate, enabling the necessary filters, and selecting the proxy mode. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -To run the configuration wizard, enter: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). ## Uninstall AdGuard for Linux @@ -73,19 +135,19 @@ To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 4ede8a490a1..2487dcaac3b 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Settings and protection management sidebar_position: 3 --- +## Available commands + To get a list of all available AdGuard commands, enter: -``` +```sh adguard-cli --help-all ``` ## Enable and disable protection +### Enable protection + To enable protection, enter: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + To disable protection, enter: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + To view the protection status, enter: -``` +```sh adguard-cli status ``` -## Check for updates +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Check for updates To check for updates, enter: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + To update AdGuard for Linux, enter: -``` +```sh adguard-cli update ``` +### Update script output + To view the update script output, enter: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Use the `config` command to configure AdGuard for Linux. Subcommands: - `show`: Show the current configuration in `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configure an option in `proxy.yaml` - - `listen_ports.http_proxy`: HTTP listening port - - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `listen_ports.http_proxy`: HTTP listening port + - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `get`: Get the current status of the above options ## Manage filters @@ -64,8 +90,32 @@ Use the `config` command to configure AdGuard for Linux. Subcommands: Use the `filters` command to configure AdGuard for Linux. Subcommands: - `list`: List installed filters - - `--all`: View all filters + + - `--all`: View all filters + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Install a filter. Enter the URL of the filter you want to install + - `enable`: Enable a filter. Enter the name or ID of the filter + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Disable a filter. Enter the name or ID of the filter + - `update`: Update filters + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index 412685edf25..86c048ff7a0 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ This page describes the features and details of AdGuard’s central management o ## 1. Download the MSI {#msi-download} -Download the [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi) +Download the [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Download the [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi) +Download the [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configure the settings for your network {#settings-configuring} diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/sk/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index cf76ff7fe89..24b6011caf1 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + is converted to + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-ff]: #what-product "AdGuard Browser Extension for Firefox" diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/sk/docusaurus-plugin-content-docs/current/general/license/legacy.md index 6b1c2a74395..1e68e937061 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: Legacy licenses FAQ sidebar_position: 6 --- -We have written this article to avoid confusion and explain in detail how you can renew/upgrade an outdated (legacy) AdGuard license. +We have written this article to avoid confusion and explain in detail how you can renew/upgrade a legacy AdGuard license. -## About the outdated licenses +## About legacy licenses Initially licenses of the following types were available to activate AdGuard products: @@ -27,54 +27,52 @@ For all types (Standard, Mobile, Premium) there were options for a Yearly and Li In October 2019 AdGuard switched to the new licensing system: from then on, licenses can still be purchased for 1 year or Lifetime, but their types have become **Personal** (for up to 3 devices) or **Family** (for up to 9 devices). -One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal license can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet.** +Another change is that the **new types of license keys can now be used on any device, in any combination**. For example, a Personal license can be used on Android, Mac and iOS, as well as on two Windows computers and an Apple tablet. -## What happened to the outdated licenses? +## What happened to the legacy licenses? -Standard were automatically made universal, which means that they can be activated on any devices. +**Standard licenses** were automatically made **universal**, which means that they can be activated on any device. -Mobile licenses remained unchanged and platform-limited (they can still only be used on phones or tablets). +**Mobile licenses** remained unchanged and platform-limited (they can still only be used on phones or tablets). -Premium licenses also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. +**Premium licenses** also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. For example, this is how the 1+1 key looks like: -![1+1 key](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 key](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *But despite the total number of devices (2) it can be activated on 1 desktop and 1 mobile device.* > All the outdated licenses have a "legacy" badge in the AdGuard account. And they are automatically converted to a new type when you either renew or upgrade them. But there are some nuances. Let's see which licenses can be converted to a new type and how to do it. -## I have an outdated (legacy) key. What renewal/upgrade options are available for me? +## How to renew or upgrade a legacy key -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +You can extend/renew or upgrade a legacy license in your [AdGuard account](https://adguardaccount.com) or on the [Extend or upgrade page](https://adguard.com/renew.html). -![Upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Go to "My licenses" tab and check what actions are available to you for each specific key. Below we will explain with specific examples. +To extend/renew or upgrade a legacy license in your AdGuard account, go to the *Licenses* tab, find the license you need, and select one of the available options. -### Licenses for 1/2/3 devices +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Yearly** licenses for 1, 2, 3 devices can be converted to either Personal or Family: +Or go to the [Extend or upgrade page](https://adguard.com/renew.html), enter your license, and click *Apply*. On the new page, select one of the available options. -![Upgrade or renew](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Choose based on how many devices you need to protect. +### Licenses for 1/2/3 devices -Instead of renewal you can switch to Lifetime: +Mobile Yearly licenses for 3 devices can be converted to Personal licenses or upgraded to Family ones: -![Lifetime](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Upgrade Yearly licenses for 1, 2, 3 devices](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Lifetime** licenses can only be converted to Family (9 devices) due to technical limitations: +> If you have a **Standard license for 3 devices**, it already works as a **Personal** license. If you renew your **Mobile license** for 3 devices, you will be able to use it on a **different set of device**s, not just phones. -![Lifetime upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +You can also upgrade your license to Lifetime: -### Licenses for 4+ devices (up to 9) +![Upgrade to Lifetime](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Yearly** keys of this configuration can only be converted into a Family license: +**Lifetime** licenses can only be upgraded to Family (9 devices) due to technical limitations. -![Yearly license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licenses for 4+ devices (up to 9) -**Lifetime** licenses for 4 or more devices cannot be upgraded due to technical limitation: +**Yearly** licenses for 4 or more devices can be upgraded to Family and Lifetime licenses. -![Lifetime license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +However, if you already have a **Lifetime** license, it cannot be upgraded due to technical limitations. ### Licenses for 9+ devices diff --git a/i18n/sk/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/sk/docusaurus-plugin-content-docs/current/general/license/what-is.md index a3b22328a24..fd9fa685ce2 100644 --- a/i18n/sk/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/sk/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ There are also licenses that the user can purchase from other sources or get for - **Distributor licenses** and **gifted licenses** can be both time-limited and non-time limited. Licenses with an expiration date can only be renewed manually - Personal — up to 3 devices - Family — up to 9 devices -- **The AdGuard Pro for iOS license** is purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 92bfd87a1dd..fa490098e78 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ The _Low-level settings_ section is for expert users. [Read more about low-level This section allows you to manage HTTPS filtering settings, filters, and userscripts, and set up a proxy server. -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filters @@ -57,11 +57,19 @@ If you activate too many filters, some websites may work incorrectly. [Read more about filters](https://adguard.com/en/blog/what-are-filters.html) -### Userscripts +### Extensions + +Extensions allow you to add userscripts and userstyles. + +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 5e75a51f1e8..b5525cd735c 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 24b41b032ca..8f7344f7ade 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index da99768471a..0341d942127 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: How to protect AdGuard from being disabled by the system -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 7367e63cef9..784a7c9587c 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ You can access it by navigating to *Statistics* → *Battery usage*. Inside you will find a chart that shows the AdGuard battery resource consumption within the last 24 hours, with an option to get more detailed hour-to-hour data by tapping on the chart. Besides that, there’s also a numeric breakdown of the relevant data and a short technical explanation. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### How much battery resource does AdGuard really consume? First, let us lay down a bit of theory and links with necessary data. diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 6f1876d0079..0563d2a0336 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index d98274a0489..c77491236e7 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index deebee15677..c716cc3ed93 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Manual installation of the security certificate into the Firefox browser -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index c5b7755321a..05d28c3b6ea 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 54b325ec582..52016424603 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 79723d1f221..b9f70d23922 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problems caused by multiple user profiles -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 6b9fddc4500..f95d206303e 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: How to set up outbound proxy -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index b9e9396152a..4ae364e8290 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 96b31c31295..25de8d83319 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index adfd7139869..5d8aa06bad9 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: How to block ads in the YouTube app -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 43c9e9aee82..67126401ab4 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,23 +5,25 @@ sidebar_position: 2 ## Install AdGuard for Linux -To install AdGuard, enter: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` @@ -35,37 +37,97 @@ You can verify the signature to prove it’s an official version of AdGuard by u ::: -## Activate license +## Initial setup -AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don't have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -To log in or create an account, enter: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -To reset your license, enter: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -To view the license info, enter: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Initial setup +4. After activation, you can continue to work with the program: -To get AdGuard up and running, complete the initial setup. This includes installing the AdGuard CA certificate, enabling the necessary filters, and selecting the proxy mode. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -To run the configuration wizard, enter: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). ## Uninstall AdGuard for Linux @@ -73,19 +135,19 @@ To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 4ede8a490a1..2487dcaac3b 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Settings and protection management sidebar_position: 3 --- +## Available commands + To get a list of all available AdGuard commands, enter: -``` +```sh adguard-cli --help-all ``` ## Enable and disable protection +### Enable protection + To enable protection, enter: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + To disable protection, enter: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + To view the protection status, enter: -``` +```sh adguard-cli status ``` -## Check for updates +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Check for updates To check for updates, enter: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + To update AdGuard for Linux, enter: -``` +```sh adguard-cli update ``` +### Update script output + To view the update script output, enter: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Use the `config` command to configure AdGuard for Linux. Subcommands: - `show`: Show the current configuration in `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configure an option in `proxy.yaml` - - `listen_ports.http_proxy`: HTTP listening port - - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `listen_ports.http_proxy`: HTTP listening port + - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `get`: Get the current status of the above options ## Manage filters @@ -64,8 +90,32 @@ Use the `config` command to configure AdGuard for Linux. Subcommands: Use the `filters` command to configure AdGuard for Linux. Subcommands: - `list`: List installed filters - - `--all`: View all filters + + - `--all`: View all filters + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Install a filter. Enter the URL of the filter you want to install + - `enable`: Enable a filter. Enter the name or ID of the filter + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Disable a filter. Enter the name or ID of the filter + - `update`: Update filters + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index 412685edf25..86c048ff7a0 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ This page describes the features and details of AdGuard’s central management o ## 1. Download the MSI {#msi-download} -Download the [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi) +Download the [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Download the [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi) +Download the [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configure the settings for your network {#settings-configuring} diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/sl/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index cf76ff7fe89..24b6011caf1 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + is converted to + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-ff]: #what-product "AdGuard Browser Extension for Firefox" diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/sl/docusaurus-plugin-content-docs/current/general/license/legacy.md index 6b1c2a74395..1e68e937061 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: Legacy licenses FAQ sidebar_position: 6 --- -We have written this article to avoid confusion and explain in detail how you can renew/upgrade an outdated (legacy) AdGuard license. +We have written this article to avoid confusion and explain in detail how you can renew/upgrade a legacy AdGuard license. -## About the outdated licenses +## About legacy licenses Initially licenses of the following types were available to activate AdGuard products: @@ -27,54 +27,52 @@ For all types (Standard, Mobile, Premium) there were options for a Yearly and Li In October 2019 AdGuard switched to the new licensing system: from then on, licenses can still be purchased for 1 year or Lifetime, but their types have become **Personal** (for up to 3 devices) or **Family** (for up to 9 devices). -One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal license can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet.** +Another change is that the **new types of license keys can now be used on any device, in any combination**. For example, a Personal license can be used on Android, Mac and iOS, as well as on two Windows computers and an Apple tablet. -## What happened to the outdated licenses? +## What happened to the legacy licenses? -Standard were automatically made universal, which means that they can be activated on any devices. +**Standard licenses** were automatically made **universal**, which means that they can be activated on any device. -Mobile licenses remained unchanged and platform-limited (they can still only be used on phones or tablets). +**Mobile licenses** remained unchanged and platform-limited (they can still only be used on phones or tablets). -Premium licenses also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. +**Premium licenses** also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. For example, this is how the 1+1 key looks like: -![1+1 key](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 key](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *But despite the total number of devices (2) it can be activated on 1 desktop and 1 mobile device.* > All the outdated licenses have a "legacy" badge in the AdGuard account. And they are automatically converted to a new type when you either renew or upgrade them. But there are some nuances. Let's see which licenses can be converted to a new type and how to do it. -## I have an outdated (legacy) key. What renewal/upgrade options are available for me? +## How to renew or upgrade a legacy key -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +You can extend/renew or upgrade a legacy license in your [AdGuard account](https://adguardaccount.com) or on the [Extend or upgrade page](https://adguard.com/renew.html). -![Upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Go to "My licenses" tab and check what actions are available to you for each specific key. Below we will explain with specific examples. +To extend/renew or upgrade a legacy license in your AdGuard account, go to the *Licenses* tab, find the license you need, and select one of the available options. -### Licenses for 1/2/3 devices +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Yearly** licenses for 1, 2, 3 devices can be converted to either Personal or Family: +Or go to the [Extend or upgrade page](https://adguard.com/renew.html), enter your license, and click *Apply*. On the new page, select one of the available options. -![Upgrade or renew](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Choose based on how many devices you need to protect. +### Licenses for 1/2/3 devices -Instead of renewal you can switch to Lifetime: +Mobile Yearly licenses for 3 devices can be converted to Personal licenses or upgraded to Family ones: -![Lifetime](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Upgrade Yearly licenses for 1, 2, 3 devices](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Lifetime** licenses can only be converted to Family (9 devices) due to technical limitations: +> If you have a **Standard license for 3 devices**, it already works as a **Personal** license. If you renew your **Mobile license** for 3 devices, you will be able to use it on a **different set of device**s, not just phones. -![Lifetime upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +You can also upgrade your license to Lifetime: -### Licenses for 4+ devices (up to 9) +![Upgrade to Lifetime](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Yearly** keys of this configuration can only be converted into a Family license: +**Lifetime** licenses can only be upgraded to Family (9 devices) due to technical limitations. -![Yearly license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licenses for 4+ devices (up to 9) -**Lifetime** licenses for 4 or more devices cannot be upgraded due to technical limitation: +**Yearly** licenses for 4 or more devices can be upgraded to Family and Lifetime licenses. -![Lifetime license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +However, if you already have a **Lifetime** license, it cannot be upgraded due to technical limitations. ### Licenses for 9+ devices diff --git a/i18n/sl/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/sl/docusaurus-plugin-content-docs/current/general/license/what-is.md index a3b22328a24..fd9fa685ce2 100644 --- a/i18n/sl/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/sl/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ There are also licenses that the user can purchase from other sources or get for - **Distributor licenses** and **gifted licenses** can be both time-limited and non-time limited. Licenses with an expiration date can only be renewed manually - Personal — up to 3 devices - Family — up to 9 devices -- **The AdGuard Pro for iOS license** is purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/compatibility.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/compatibility.md index bc8b5bec5d2..e9d2fb03171 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/compatibility.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/compatibility.md @@ -17,7 +17,7 @@ If you have the desktop version of AdGuard installed on your PC, it is better to ## AdGuard Browser Assistant -![AdGuard Browser Assistant \*mobile\_border](https://cdn.adtidy.org/content/kb/ad_blocker/browser_extension/ad_blocker_browser_extension_assistant.png) +![AdGuard Browser Assistant \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/browser_extension/ad_blocker_browser_extension_assistant.png) AdGuard Browser Assistant is a browser extension that works and feels just like AdGuard Browser Extension, but it's much lighter and doesn't interfere with the desktop apps. You can [read more about Browser Assistant for Windows](/adguard-for-windows/browser-assistant) or [Mac](/adguard-for-mac/features/browser-assistant), or [download it from our website](https://adguard.com/adguard-assistant/overview.html). diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/features/main-menu.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/features/main-menu.md index 4849d210fc4..eebf61e34d7 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/features/main-menu.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/features/main-menu.md @@ -11,7 +11,7 @@ This article is about the AdGuard Browser Extension, which safeguards only your The extension's main page can be accessed by clicking the extension's icon on the toolbar of your browser. -![Main menu \*mobile\_border](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/ad_blocker_browser_extension_main.png) +![Main menu \*mobile_border](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/ad_blocker_browser_extension_main.png) On the main page, you can hide any element on any page manually (a corresponding rule will be added to the _User rules_), open the _Filtering log_ to view the complete information about your browser's traffic and block requests on the go, or look at a website’s security report. Besides, you can submit a complaint about any website (for example, if there are missed ads on the page, our filter engineers will review the report and fix the problem) and see the statistics on applied blocking rules. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/mv3-version.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/mv3-version.md index 1c49edaf3a6..d10f3e8722a 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/mv3-version.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/mv3-version.md @@ -21,19 +21,19 @@ The old beta extension will be renamed to [**AdGuard Ad Blocker MV2**](https://c - **Filtering log** - ![Filtering log \*border](https://cdn.adtidy.org/content/blog/mv3/new/log.png) + ![Filtering log \*border](https://cdn.adtidy.org/content/blog/mv3/new/log.png) - Due to DNR restrictions, we can’t show exactly which rule worked, but we will provide an “assumed rule that was triggered” based on our engine. For precise information, you’ll need to install the “unpacked” form of the extension in your browser yourself. You’ll find detailed instructions on how to do this in a [separate article](/adguard-browser-extension/solving-problems/debug-rules/). + Due to DNR restrictions, we can’t show exactly which rule worked, but we will provide an “assumed rule that was triggered” based on our engine. For precise information, you’ll need to install the “unpacked” form of the extension in your browser yourself. You’ll find detailed instructions on how to do this in a [separate article](/adguard-browser-extension/solving-problems/debug-rules/). - _Tracking protection_ (formerly known as _Stealth mode_) - ![Tracking protection \*border](https://cdn.adtidy.org/content/blog/mv3/new/tracking_screen.png) + ![Tracking protection \*border](https://cdn.adtidy.org/content/blog/mv3/new/tracking_screen.png) - There are no _Cookies_ section, along with _Self-destruction of first-party cookies_ and _Self-destruction of third-party cookies_ since we cannot set the TTL of cookies using declarative rules. + There are no _Cookies_ section, along with _Self-destruction of first-party cookies_ and _Self-destruction of third-party cookies_ since we cannot set the TTL of cookies using declarative rules. - _Phishing & malware protection_ is no longer available in the general settings. To protect yourself from malicious websites and scams, enable the appropriate _Security_ filters in the _Filters_ tab. - ![Security \*border](https://cdn.adtidy.org/content/blog/mv3/new/security.png) + ![Security \*border](https://cdn.adtidy.org/content/blog/mv3/new/security.png) ## Limitations diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/solving-problems/debug-rules.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/solving-problems/debug-rules.md index 23251b3d6cb..b42117945b2 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/solving-problems/debug-rules.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/solving-problems/debug-rules.md @@ -19,61 +19,61 @@ These instructions are also meant for problematic cases where you want to modify 1. Clone the repository: - ```bash - git clone git@github.com:AdguardTeam/AdguardBrowserExtension.git - ``` + ```bash + git clone git@github.com:AdguardTeam/AdguardBrowserExtension.git + ``` 2. Navigate to the directory: - ```bash - cd AdguardBrowserExtension - ``` + ```bash + cd AdguardBrowserExtension + ``` 3. Switch to the `v5.0` branch: - ```bash - git checkout v5.0 - ``` + ```bash + git checkout v5.0 + ``` 4. Install dependencies: - ```bash - yarn install - ``` + ```bash + yarn install + ``` ## How to build extension 1. Switch to the `v5.0` branch: - ```bash - git checkout v5.0 - ``` + ```bash + git checkout v5.0 + ``` 2. Run the following command in the terminal: - ```bash - yarn dev chrome-mv3 - ``` + ```bash + yarn dev chrome-mv3 + ``` 3. The built extension will be located in the directory: - ```bash - ./build/dev/chrome-mv3 - ``` + ```bash + ./build/dev/chrome-mv3 + ``` ## How to install unpacked in the browser 1. Turn on developer mode: - ![Developer mode](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/developer_mode.png) + ![Developer mode](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/developer_mode.png) 2. Click _Load unpacked_: - ![Load unpacked](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/load_unpacked.png) + ![Load unpacked](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/load_unpacked.png) 3. Select the extension directory and click `Select`: - ![Select](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/select.png) + ![Select](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/select.png) That’s it! @@ -83,16 +83,16 @@ That’s it! 2. Convert the rules from txt to declarative form: - ```bash - yarn convert-declarative - ``` + ```bash + yarn convert-declarative + ``` 3. Build the extension again: - ```bash - yarn dev chrome-mv3 - ``` + ```bash + yarn dev chrome-mv3 + ``` 4. Reload the extension in the browser: - ![Reload extension](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/reload_extension.png) + ![Reload extension](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/reload_extension.png) diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/solving-problems/logs.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/solving-problems/logs.md index e3920acb8c0..fe6cd49616e 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/solving-problems/logs.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-browser-extension/solving-problems/logs.md @@ -13,19 +13,19 @@ sidebar_position: 1 3. Enable _Developer mode_. - ![Developer mode \*border](https://cdn.adguardvpn.com/content/kb/ad_blocker/browser_extension/developer_mode1.png) + ![Developer mode \*border](https://cdn.adguardvpn.com/content/kb/ad_blocker/browser_extension/developer_mode1.png) 4. Click `background.html`. - ![Background \*border](https://cdn.adguardvpn.com/content/kb/ad_blocker/browser_extension/background1.png) + ![Background \*border](https://cdn.adguardvpn.com/content/kb/ad_blocker/browser_extension/background1.png) 5. Open the tab _Console_. - ![The Console tab \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/console.png) + ![The Console tab \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/console.png) 6. Open the context menu and select _Save as…_. - ![Save as \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/save.png) + ![Save as \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/save.png) ### Firefox @@ -35,19 +35,19 @@ sidebar_position: 1 3. Click _Debug Add-ons_. - ![Debug Add-ons \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/add-ons.png) + ![Debug Add-ons \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/add-ons.png) 4. Click _Inspect_. - ![Inspect \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/inspect.png) + ![Inspect \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/inspect.png) 5. Go to the tab _Console_. - ![Console \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/ff_console.png) + ![Console \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/ff_console.png) 6. Click _Save all Messages to File_. - ![Save \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/save-to-file.png) + ![Save \*border](https://cdn.adguardvpn.com/content/kb/vpn/browser_extension/save-to-file.png) ## Sending logs diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/ad-blocking.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/ad-blocking.md index 8f2a21d7101..de6ec21ff68 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/ad-blocking.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/ad-blocking.md @@ -21,4 +21,4 @@ Basic protection effectively blocks ads on most websites. For more customized ad - Create user rules — AdGuard will apply them on specified websites. [Learn how to create your own user rules](/general/ad-filtering/create-own-filters) -![Ad blocking \*mobile\_border](https://cdn.adtidy.org/blog/new/o44x5ad_blocking.png) +![Ad blocking \*mobile_border](https://cdn.adtidy.org/blog/new/o44x5ad_blocking.png) diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/browsing-security.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/browsing-security.md index ccd17b2d456..5345f7a3fbc 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/browsing-security.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/browsing-security.md @@ -13,11 +13,11 @@ The Browsing security module can be accessed by tapping the _Protection_ tab (se Browsing security protects you from visiting phishing and malicious websites. It also warns you about potential malware. -![Browsing security \*mobile\_border](https://cdn.adtidy.org/blog/new/1y6a8browsing_security.png) +![Browsing security \*mobile_border](https://cdn.adtidy.org/blog/new/1y6a8browsing_security.png) If you're about to visit a dangerous website, Browsing security will show you the following warning: -![Browsing security warning \*mobile\_border](https://cdn.adtidy.org/blog/new/o8s3Screenshot_2023-06-29-15-49-01-514-edit_com.android.chrome.jpg) +![Browsing security warning \*mobile_border](https://cdn.adtidy.org/blog/new/o8s3Screenshot_2023-06-29-15-49-01-514-edit_com.android.chrome.jpg) :::warning diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/dns-protection.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/dns-protection.md index 3ecae5f658d..90c66effc5a 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/dns-protection.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/dns-protection.md @@ -25,7 +25,7 @@ _DNS protection_ allows you to filter DNS requests with the help of a selected D - You can also block and unblock domains by creating user rules. You might need to consult our article about [DNS filtering rule syntax](https://adguard-dns.io/kb/general/dns-filtering-syntax/) -![DNS protection \*mobile\_border](https://cdn.adtidy.org/blog/new/u8qtxdns_protection.png) +![DNS protection \*mobile_border](https://cdn.adtidy.org/blog/new/u8qtxdns_protection.png) #### DNS server diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/firewall/firewall.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/firewall/firewall.md index 2417406eb35..a06ab0869e6 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/firewall/firewall.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/firewall/firewall.md @@ -13,13 +13,13 @@ The Firewall module can be accessed by tapping the _Protection_ tab (second-left This feature helps manage Internet access for specific apps installed on your device and for the device in general. -![Firewall \*mobile\_border](https://cdn.adtidy.org/blog/new/gdn94firewall.png) +![Firewall \*mobile_border](https://cdn.adtidy.org/blog/new/gdn94firewall.png) ### Global firewall rules This section allows you to control Internet access for the entire device. -![Global firewall rules \*mobile\_border](https://cdn.adtidy.org/blog/new/4zx2nhglobal_rules.png) +![Global firewall rules \*mobile_border](https://cdn.adtidy.org/blog/new/4zx2nhglobal_rules.png) These rules apply to all apps on your device unless you've set custom rules for them. @@ -29,15 +29,15 @@ In this section, you can control Internet access for specific apps — restrict 1. Open _Custom firewall rules_. Under _Apps with custom rules_, tap _Add app_. - ![Custom firewall rules \*mobile\_border](https://cdn.adtidy.org/blog/new/qkxpecustom_rules.png) + ![Custom firewall rules \*mobile_border](https://cdn.adtidy.org/blog/new/qkxpecustom_rules.png) 2. Select the app for which you want to set individual rules. - ![Adding an app to Custom firewall rules \*mobile\_border](https://cdn.adtidy.org/blog/new/2db47fadding_app.png) + ![Adding an app to Custom firewall rules \*mobile_border](https://cdn.adtidy.org/blog/new/2db47fadding_app.png) 3. In _Available custom rules_, select the ones you want to configure and tap the “+” icon. The rules will now appear in _Applied custom rules_. - ![Added rule \*mobile\_border](https://cdn.adtidy.org/blog/new/6fzjladded_rule.png) + ![Added rule \*mobile_border](https://cdn.adtidy.org/blog/new/6fzjladded_rule.png) 4. If you need to block a specific type of connection, toggle the switch to the left. If you want to allow it, leave the switch enabled. **Custom rules override global ones**: any changes you make in _Global firewall rules_ will not affect this app. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/firewall/quick-actions.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/firewall/quick-actions.md index 5f13eb2a6ed..25dd48b0c4a 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/firewall/quick-actions.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/firewall/quick-actions.md @@ -13,6 +13,6 @@ Quick actions can be found inside the _Firewall_ module, which can be accessed b _Quick actions_ are based on the requests from _Recent activity_ (which can be found in [_Statistics_](/adguard-for-android/features/statistics)). This section shows which apps have recently connected to the Internet. -![Quick actions \*mobile\_border](https://cdn.adtidy.org/blog/new/yigrfquick_actions.png) +![Quick actions \*mobile_border](https://cdn.adtidy.org/blog/new/yigrfquick_actions.png) If you see an app that shouldn't be using the Internet at all or an app that you haven't used recently, you can block its access on the fly. This will not be possible unless the _Firewall_ module is turned on. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/tracking-protection.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/tracking-protection.md index a867a6d217b..cba74f78efd 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/tracking-protection.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/tracking-protection.md @@ -13,7 +13,7 @@ The Tracking protection module can be accessed by tapping the _Protection_ tab ( _Tracking protection_ (formerly known as _Stealth Mode_) prevents websites from collecting information about you, such as your IP addresses, information about your browser and operating system, screen resolution, and the page you came or were redirected from. It can also block cookies that websites use to mark your browser, save your personal settings and user preferences, or recognize you on your next visit. -![Tracking protection \*mobile\_border](https://cdn.adtidy.org/blog/new/y5fuztracking_protection.png) +![Tracking protection \*mobile_border](https://cdn.adtidy.org/blog/new/y5fuztracking_protection.png) _Tracking protection_ has three pre-configured levels of privacy protection (_Standard_, _High_, and _Extreme_) and one user-defined level (_Custom_). @@ -21,60 +21,60 @@ Here are the active features of the pre-configured levels: 1. **Standard** - a. _Block trackers_. This feature uses _AdGuard Tracking Protection filter_ to protect you from online counters and web analytics tools + a. _Block trackers_. This feature uses _AdGuard Tracking Protection filter_ to protect you from online counters and web analytics tools - b. _Ask websites not to track you_. This feature sends the [Global Privacy Control](https://globalprivacycontrol.org/) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) signals to the websites you visit, asking web apps to disable tracking of your activity + b. _Ask websites not to track you_. This feature sends the [Global Privacy Control](https://globalprivacycontrol.org/) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) signals to the websites you visit, asking web apps to disable tracking of your activity - c. _Remove X-Client-Data header_. This feature prevents Google Chrome from sending information about its version and modifications to Google domains (including DoubleClick and Google Analytics) + c. _Remove X-Client-Data header_. This feature prevents Google Chrome from sending information about its version and modifications to Google domains (including DoubleClick and Google Analytics) 2. **High** - a. _Block trackers_. This feature uses _AdGuard Tracking Protection filter_ to protect you from online counters and web analytics tools + a. _Block trackers_. This feature uses _AdGuard Tracking Protection filter_ to protect you from online counters and web analytics tools - b. _Remove tracking parameters from URLs_. This feature uses _AdGuard URL Tracking filter_ to remove tracking parameters, such as `utm_*` and `fb_ref`, from page URLs + b. _Remove tracking parameters from URLs_. This feature uses _AdGuard URL Tracking filter_ to remove tracking parameters, such as `utm_*` and `fb_ref`, from page URLs - c. _Hide your search queries_. This feature hides queries for websites visited from a search engine + c. _Hide your search queries_. This feature hides queries for websites visited from a search engine - d. _Ask websites not to track you_. This feature sends the [Global Privacy Control](https://globalprivacycontrol.org/) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) signals to the websites you visit, asking web apps to disable tracking of your activity + d. _Ask websites not to track you_. This feature sends the [Global Privacy Control](https://globalprivacycontrol.org/) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) signals to the websites you visit, asking web apps to disable tracking of your activity - e. _Self-destruction of third-party cookies_. This feature limits the lifetime of third-party cookies to 180 minutes + e. _Self-destruction of third-party cookies_. This feature limits the lifetime of third-party cookies to 180 minutes - :::caution + :::caution - This feature deletes all third-party cookies after their forced expiration. This includes your logins through social networks or other third-party services. You may need to re-log in to some websites periodically or experience other cookie-related issues. To block only tracking cookies, use the _Standard_ protection level. + This feature deletes all third-party cookies after their forced expiration. This includes your logins through social networks or other third-party services. You may need to re-log in to some websites periodically or experience other cookie-related issues. To block only tracking cookies, use the _Standard_ protection level. - ::: + ::: - f. _Remove X-Client-Data header_. This feature prevents Google Chrome from sending its version and modifications information to Google domains (including DoubleClick and Google Analytics) + f. _Remove X-Client-Data header_. This feature prevents Google Chrome from sending its version and modifications information to Google domains (including DoubleClick and Google Analytics) 3. **Extreme** (formerly known as _Ultimate_) - a. _Block trackers_. This feature uses _AdGuard Tracking Protection filter_ to protect you from online counters and web analytics tools + a. _Block trackers_. This feature uses _AdGuard Tracking Protection filter_ to protect you from online counters and web analytics tools - b. _Remove tracking parameters from URLs_. This feature uses _AdGuard URL Tracking filter_ to remove tracking parameters, such as `utm_*` and `fb_ref`, from page URLs + b. _Remove tracking parameters from URLs_. This feature uses _AdGuard URL Tracking filter_ to remove tracking parameters, such as `utm_*` and `fb_ref`, from page URLs - c. _Hide your search queries_. This feature hides queries for websites visited from a search engine + c. _Hide your search queries_. This feature hides queries for websites visited from a search engine - d. _Ask websites not to track you_. This feature sends the [Global Privacy Control](https://globalprivacycontrol.org/) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) signals to the websites you visit, asking web apps to disable tracking of your activity + d. _Ask websites not to track you_. This feature sends the [Global Privacy Control](https://globalprivacycontrol.org/) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) signals to the websites you visit, asking web apps to disable tracking of your activity - e. _Self-destruction of third-party cookies_. This feature limits the lifetime of third-party cookies to 180 minutes + e. _Self-destruction of third-party cookies_. This feature limits the lifetime of third-party cookies to 180 minutes - :::caution + :::caution - This feature deletes all third-party cookies after their forced expiration. This includes your logins through social networks or other third-party services. You may need to re-log in to some websites periodically or experience other cookie-related issues. To block only tracking cookies, use the _Standard_ protection level. + This feature deletes all third-party cookies after their forced expiration. This includes your logins through social networks or other third-party services. You may need to re-log in to some websites periodically or experience other cookie-related issues. To block only tracking cookies, use the _Standard_ protection level. - ::: + ::: - f. _Block WebRTC_. This feature blocks WebRTC, a known vulnerability that can leak your real IP address even if you use a proxy or VPN + f. _Block WebRTC_. This feature blocks WebRTC, a known vulnerability that can leak your real IP address even if you use a proxy or VPN - g. _Block Push API_. This feature prevents your browsers from receiving push messages from servers + g. _Block Push API_. This feature prevents your browsers from receiving push messages from servers - h. _Block Location API_. This feature prevents browsers from accessing your GPS data and determining your location + h. _Block Location API_. This feature prevents browsers from accessing your GPS data and determining your location - i. _Hide Referer from third parties_. This feature prevents third parties from knowing which websites you visit. It hides the HTTP header that contains the URL of the initial page and replaces it with a default or custom one that you can set + i. _Hide Referer from third parties_. This feature prevents third parties from knowing which websites you visit. It hides the HTTP header that contains the URL of the initial page and replaces it with a default or custom one that you can set - j. _Hide your User-Agent_. This feature removes identifying information from the User-Agent header, which typically includes the name and version of the browser, the operating system, and language settings + j. _Hide your User-Agent_. This feature removes identifying information from the User-Agent header, which typically includes the name and version of the browser, the operating system, and language settings - k. _Remove X-Client-Data header_. This feature prevents Google Chrome from sending its version and modifications information to Google domains (including DoubleClick and Google Analytics) + k. _Remove X-Client-Data header_. This feature prevents Google Chrome from sending its version and modifications information to Google domains (including DoubleClick and Google Analytics) You can tweak individual settings in _Tracking protection_ and come up with a custom configuration. Every setting has a description that will help you understand its role. [Read more about what the various _Tracking protection_ settings do](/general/stealth-mode) and utilize them cautiously, as some may interfere with the functionality of websites and browser extensions. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 92bfd87a1dd..fa490098e78 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ The _Low-level settings_ section is for expert users. [Read more about low-level This section allows you to manage HTTPS filtering settings, filters, and userscripts, and set up a proxy server. -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filters @@ -57,11 +57,19 @@ If you activate too many filters, some websites may work incorrectly. [Read more about filters](https://adguard.com/en/blog/what-are-filters.html) -### Userscripts +### Extensions + +Extensions allow you to add userscripts and userstyles. + +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/statistics.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/statistics.md index 654a48442f2..bbe4f9a5b11 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/statistics.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/features/statistics.md @@ -11,7 +11,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro The _Statistics_ module can be accessed by tapping the _Statistics_ tab (fourth icon from the left at the bottom of the screen). This feature gives you a complete picture of what is happening with the traffic on your device: how many requests are being sent and to which companies, how much data is being uploaded and downloaded, what requests are being blocked, and more. You can choose to display the statistics for the selected time period: 24 hours, 7 days, 30 days, or all time. -![Statistics \*mobile\_border](https://cdn.adtidy.org/blog/new/czy5rStatistics.jpeg?mw=1360) +![Statistics \*mobile_border](https://cdn.adtidy.org/blog/new/czy5rStatistics.jpeg?mw=1360) The stats are categorized into different sections. @@ -33,7 +33,7 @@ This section displays stats for all apps installed on your device. You can sort Tap _View all apps_ to expand the list of your apps, sorted by the number of ads, trackers, or requests. -![List of apps \*mobile\_border](https://cdn.adtidy.org/blog/new/toq0mkScreenshot_20230627-235219_AdGuard.jpg) +![List of apps \*mobile_border](https://cdn.adtidy.org/blog/new/toq0mkScreenshot_20230627-235219_AdGuard.jpg) If you tap an app, you can see its full stats: the requests it sends and the domains and companies it reaches out to. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 5e75a51f1e8..b5525cd735c 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 24b41b032ca..8f7344f7ade 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index da99768471a..0341d942127 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: How to protect AdGuard from being disabled by the system -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 7367e63cef9..784a7c9587c 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ You can access it by navigating to *Statistics* → *Battery usage*. Inside you will find a chart that shows the AdGuard battery resource consumption within the last 24 hours, with an option to get more detailed hour-to-hour data by tapping on the chart. Besides that, there’s also a numeric breakdown of the relevant data and a short technical explanation. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### How much battery resource does AdGuard really consume? First, let us lay down a bit of theory and links with necessary data. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 6f1876d0079..0563d2a0336 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index d98274a0489..c77491236e7 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index deebee15677..c716cc3ed93 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Manual installation of the security certificate into the Firefox browser -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index c5b7755321a..05d28c3b6ea 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 54b325ec582..52016424603 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 79723d1f221..b9f70d23922 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problems caused by multiple user profiles -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 6b9fddc4500..f95d206303e 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: How to set up outbound proxy -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index b9e9396152a..4ae364e8290 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 96b31c31295..25de8d83319 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index adfd7139869..5d8aa06bad9 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: How to block ads in the YouTube app -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/activity.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/activity.md index 572d17baf4d..99df82c5a49 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/activity.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/activity.md @@ -11,7 +11,7 @@ This article is about AdGuard for iOS, a multifunctional ad blocker that protect _Activity_ screen is the 'information hub' of AdGuard's DNS protection suite. You can quickswitch to it by tapping the third icon in the bottom bar. N.b. this screen is only seen when DNS protection is enabled. -![Activity screen \*mobile\_border](https://cdn.adtidy.org/content/github/ad_blocker/ios/activity.png) +![Activity screen \*mobile_border](https://cdn.adtidy.org/content/github/ad_blocker/ios/activity.png) This is where AdGuard displays statistics about the device's DNS requests, such as total number, number of blocked requests and data saved by blocking them. AdGuard can display the statistics for a day, a week, a month or in total. @@ -25,7 +25,7 @@ AdGuard does not send this information anywhere. It is 100% local and does not l Tap any request to view more details. There will also be buttons to add the request to Blocklist/Allowlist in one tap. -![Request details \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/request_info_en.jpeg) +![Request details \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/request_info_en.jpeg) Above the activity feed, there are _Most active_ and _Most blocked_ companies. Tap each to see data based on the last 1500 requests. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/advanced-protection.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/advanced-protection.md index 3fce549ccdc..ed1b15ff982 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/advanced-protection.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/advanced-protection.md @@ -11,7 +11,7 @@ This article is about AdGuard for iOS, a multifunctional ad blocker that protect In iOS 15, Apple added support for Safari Web Extensions and we added a new _Advanced protection_ module to AdGuard for iOS. It allows AdGuard to apply advanced filtering rules, such as [CSS rules](/general/ad-filtering/create-own-filters#cosmetic-css-rules), [Extended CSS selectors](/general/ad-filtering/create-own-filters#extended-css-selectors), and [scriptlets](/general/ad-filtering/create-own-filters#scriptlets) to deal with even the complex ads, such as YouTube ads. -![Advanced protection screen \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/protection_screen_15_en.jpeg) +![Advanced protection screen \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/protection_screen_15_en.jpeg) ### How to enable @@ -23,4 +23,4 @@ The _Advanced protection_ only works on iOS 15 and later versions. If you are us ::: -![Protection screen on iOS 14 and earlier \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/protection_screen_14_en.jpeg) +![Protection screen on iOS 14 and earlier \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/protection_screen_14_en.jpeg) diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/assistant.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/assistant.md index 535bc6e43d9..0d52cf9cc42 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/assistant.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/assistant.md @@ -11,7 +11,7 @@ This article is about AdGuard for iOS, a multifunctional ad blocker that protect ### Assistant {#assistant} -![Safari Assistant \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/assistant_en.jpeg) +![Safari Assistant \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/assistant_en.jpeg) Assistant is a tool that helps you manage filtering in Safari right from the browser without switching back to the app. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/dns-protection.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/dns-protection.md index 5774624e7fa..4489fb78f01 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/dns-protection.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/dns-protection.md @@ -19,7 +19,7 @@ To be able to manage DNS settings, AdGuard apps require establishing a local VPN ### DNS implementation {#dns-implementation} -![DNS implementation screen \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/implementation_en.jpeg) +![DNS implementation screen \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/implementation_en.jpeg) This section has two options: AdGuard and Native implementation. Basically, these are two methods of setting up DNS. @@ -29,7 +29,7 @@ In Native implementation, the DNS is handled by the system and not the app. This The next section you'll see on the DNS Protection screen is DNS server. It shows the currently selected DNS server and encryption type. To change either, tap the button to enter the DNS server screen. -![DNS servers \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/dns_server_en.jpeg) +![DNS servers \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/dns_server_en.jpeg) Servers differ by their speed, employed protocol, trustworthiness, logging policy, etc. By default, AdGuard will suggest several DNS servers from among the most popular ones (including AdGuard DNS). Tap any to change the encryption type (if such option is provided by the server's owner) or to view the server's homepage. We added labels such as `No logging policy`, `Ad blocking`, `Security` to help you make a choice. @@ -51,7 +51,7 @@ To check if everything is set up correctly, visit our [diagnostics page](https:/ ### Network settings {#network-settings} -![Network settings screen \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/network_settings_en.jpeg) +![Network settings screen \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/network_settings_en.jpeg) Users can also handle their DNS security on the Network settings screen. _Filter mobile data_ and _Filter Wi-Fi_ enable or disable DNS protection for the respective network types. Further down, at _Wi-Fi exceptions_, you can exclude particular Wi-Fi networks from DNS protection (for example, you might want to exclude your home network if you use [AdGuard Home](https://adguard.com/adguard-home/overview.html)). @@ -63,7 +63,7 @@ How to access: _Protection_ (the shield icon in the bottom menu bar) → _DNS protection_ → _DNS filtering_ -![DNS filtering screen \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/dns_filtering_en.jpeg) +![DNS filtering screen \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/dns_filtering_en.jpeg) #### DNS filters {#dns-filters} diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/low-level-settings.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/low-level-settings.md index 5de687dd0cc..a599e400576 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/low-level-settings.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/low-level-settings.md @@ -9,7 +9,7 @@ This article is about AdGuard for iOS, a multifunctional ad blocker that protect ::: -![Low-level settings \*mobile\_border](https://cdn.adtidy.org/public/Adguard/Blog/ios_lowlevel.PNG) +![Low-level settings \*mobile_border](https://cdn.adtidy.org/public/Adguard/Blog/ios_lowlevel.PNG) To open the _Low-level settings_, go to _Settings_ → _General_ → (Enable _Advanced mode_ if it's off) → _Advanced settings_ → _Low-level settings_. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/other-features.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/other-features.md index 79e14d80c0d..7f21aa99943 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/other-features.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/other-features.md @@ -13,9 +13,9 @@ While Safari content blocking and DNS protection are indisputably two major modu ### **Dark theme** -![Light theme \*mobile\_border](https://cdn.adtidy.org/blog/new/26vo4homelight.jpeg) +![Light theme \*mobile_border](https://cdn.adtidy.org/blog/new/26vo4homelight.jpeg) -![Dark theme \*mobile\_border](https://cdn.adtidy.org/blog/new/bgko8homedark.jpeg) +![Dark theme \*mobile_border](https://cdn.adtidy.org/blog/new/bgko8homedark.jpeg) Residing right at the top of **Settings** → **General** screen, this setting allows you to switch between dark and light themes. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/safari-protection.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/safari-protection.md index 390548c4188..5a8d4bb20e0 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/safari-protection.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-ios/features/safari-protection.md @@ -15,7 +15,7 @@ Content blockers serve as 'containers' for filtering rules that do the actual jo All content blockers, their statuses, which thematic filters they currently include, and a total number of used filtering rules can be found on the respective screen in _Advanced settings_ (tap the gear icon at the bottom right → _General_ → _Advanced settings_ → _Content blockers_). -![Content blockers \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/content_blockers_en.jpeg) +![Content blockers \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/content_blockers_en.jpeg) :::tip @@ -29,7 +29,7 @@ Content blockers' work is based on filters, also sometimes referred to as filter All filters are grouped into thematic categories. To see the full list of these categories (not to be confused with content blockers), open the _Protection_ section by tapping the shield icon, then go to _Safari protection_ → _Filters_. -![Filter groups \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/filters_group_en.jpeg) +![Filter groups \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/filters_group_en.jpeg) There are eight of them, each category unites several filters that serve and share a common purpose, i.e. blocking ads, social media widgets, cookie notices, protecting the user from online scams. To decide which filters suit your needs, read their descriptions and navigate by the labels (`ads`, `privacy`, `recommended`, etc.). @@ -47,7 +47,7 @@ Here you can add new rules — either by entering them manually, or by using [th Learn [how to create your own ad filters](/general/ad-filtering/create-own-filters). But please note that many of them won't work in Safari on iOS. -![User rules screen \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/user_rules_en.jpeg) +![User rules screen \*mobile_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/user_rules_en.jpeg) ### Allowlist {#allowlist} diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-linux/feedback.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-linux/feedback.md index ed211629a91..96884fa74de 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-linux/feedback.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-linux/feedback.md @@ -20,18 +20,18 @@ If you want to support the implementation of a new feature or bugfix, you can vo 1. Enable debug logging: - `adguard-cli config set log_level debug` + `adguard-cli config set log_level debug` 2. Reproduce the problem and try to remember the exact time it occurred. 3. Wait a while, then export the logs: - `adguard-cli export-logs` + `adguard-cli export-logs` - The archived log file will be downloaded to the application folder by default, and the path to the logs will be written to the console. + The archived log file will be downloaded to the application folder by default, and the path to the logs will be written to the console. 4. Send the log file to . Specify the time of the error and attach a link to your GitHub issue or its number (it appears as #number next to the title). Alternatively, you can upload the log file to Google Drive and share it with . Attach the file link to your GitHub issue. 5. Switch the logging mode back to `info`: - `adguard-cli config set log_level info` + `adguard-cli config set log_level info` diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 43c9e9aee82..67126401ab4 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,23 +5,25 @@ sidebar_position: 2 ## Install AdGuard for Linux -To install AdGuard, enter: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` @@ -35,37 +37,97 @@ You can verify the signature to prove it’s an official version of AdGuard by u ::: -## Activate license +## Initial setup -AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don't have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -To log in or create an account, enter: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -To reset your license, enter: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -To view the license info, enter: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Initial setup +4. After activation, you can continue to work with the program: -To get AdGuard up and running, complete the initial setup. This includes installing the AdGuard CA certificate, enabling the necessary filters, and selecting the proxy mode. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -To run the configuration wizard, enter: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). ## Uninstall AdGuard for Linux @@ -73,19 +135,19 @@ To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 4ede8a490a1..2487dcaac3b 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Settings and protection management sidebar_position: 3 --- +## Available commands + To get a list of all available AdGuard commands, enter: -``` +```sh adguard-cli --help-all ``` ## Enable and disable protection +### Enable protection + To enable protection, enter: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + To disable protection, enter: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + To view the protection status, enter: -``` +```sh adguard-cli status ``` -## Check for updates +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Check for updates To check for updates, enter: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + To update AdGuard for Linux, enter: -``` +```sh adguard-cli update ``` +### Update script output + To view the update script output, enter: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Use the `config` command to configure AdGuard for Linux. Subcommands: - `show`: Show the current configuration in `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configure an option in `proxy.yaml` - - `listen_ports.http_proxy`: HTTP listening port - - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `listen_ports.http_proxy`: HTTP listening port + - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `get`: Get the current status of the above options ## Manage filters @@ -64,8 +90,32 @@ Use the `config` command to configure AdGuard for Linux. Subcommands: Use the `filters` command to configure AdGuard for Linux. Subcommands: - `list`: List installed filters - - `--all`: View all filters + + - `--all`: View all filters + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Install a filter. Enter the URL of the filter you want to install + - `enable`: Enable a filter. Enter the name or ID of the filter + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Disable a filter. Enter the name or ID of the filter + - `update`: Update filters + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/ads-not-blocked.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/ads-not-blocked.md index 7f5779c0a05..0613994d881 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/ads-not-blocked.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/ads-not-blocked.md @@ -17,7 +17,7 @@ In some cases, filtering may not work and ads may still be displayed even though 2. Click _Safari_ in the left upper corner menu. 3. Click _Settings…_ → _Extensions_. 4. Clear the checkboxes for AdGuard’s extensions: _Custom_, _General_, _Other_, _Privacy_, _Security_, _Social_, _AdGuard for Safari_, and _AdGuard Assistant_. - ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) + ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) 5. Restart Safari. 6. Return to _Settings..._ → _Extensions_ and re-enable the content-blocking extensions. 7. Open AdGuard for Safari app. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/filters-after-disable.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/filters-after-disable.md index 08a7f136eba..30bf4489c28 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/filters-after-disable.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/filters-after-disable.md @@ -17,7 +17,7 @@ If filtering doesn’t stop when AdGuard for Safari is disabled, it may be becau 2. Click _Safari_ in the left upper corner menu. 3. Click _Settings…_ → _Extensions_. 4. Clear the checkboxes for AdGuard’s extensions: _Custom_, _General_, _Other_, _Privacy_, _Security_, _Social_, _AdGuard for Safari_, and _AdGuard Assistant_. - ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) + ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) 5. Restart Safari. 6. Return to _Settings..._ → _Extensions_ and re-enable the content-blocking extensions. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/logs.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/logs.md index 1874b6ee6c9..2e336f0d2f8 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/logs.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/logs.md @@ -27,4 +27,4 @@ AdGuard is committed to protecting your privacy. We strictly follow our [Privacy 1. Open the [AdGuard for Safari GitHub repo](https://github.com/AdguardTeam/AdGuardForSafari/issues) and click _New issue_. 2. Send the log file to devteam@adguard.com. Include the time of the bug and attach a link to your issue or its number (it appears as #number next to the title). - Alternatively, you can upload the log file to Google Drive and send it to devteam@adguard.com. Add the file link to your GitHub issue. + Alternatively, you can upload the log file to Google Drive and send it to devteam@adguard.com. Add the file link to your GitHub issue. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/private-sonoma.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/private-sonoma.md index 2bacecdef7c..3d771e6c161 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/private-sonoma.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/private-sonoma.md @@ -15,7 +15,7 @@ This article is about AdGuard for Safari, which safeguards only your Safari brow 2. Click _Safari_ in the left upper corner menu. 3. Click _Settings…_ → _Extensions_. 4. Check _Allow in Private Browsing_ for all AdGuard extensions. - ![Checked private browsing](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-sonoma-private.png) + ![Checked private browsing](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-sonoma-private.png) If this doesn’t help and ads are still not being blocked, please contact our support at support@adguard.com. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/rule-limit.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/rule-limit.md index d47cacd87da..fd956cb94f7 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/rule-limit.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-safari/solving-problems/rule-limit.md @@ -31,6 +31,6 @@ However, **an extension can contain up to 150,000 rules**. If you exceed this li 1. Open AdGuard for Safari app. 2. Scroll down and click _Content blockers_. 3. Below each content blocker, you can see the enabled filters and the number of active rules. - ![Content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-cb.png) + ![Content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-cb.png) If more than 150,000 rules are enabled in a content blocker, you may need to disable some filters or user rules from it. Go to _Filters_, select the problematic category, and disable the filters or user rules you don’t need. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index 412685edf25..86c048ff7a0 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ This page describes the features and details of AdGuard’s central management o ## 1. Download the MSI {#msi-download} -Download the [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi) +Download the [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Download the [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi) +Download the [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configure the settings for your network {#settings-configuring} diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-windows/features/home-screen.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-windows/features/home-screen.md index 68db37af985..b1adcc3ff6a 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-windows/features/home-screen.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-windows/features/home-screen.md @@ -11,6 +11,6 @@ This article covers AdGuard for Windows, a multifunctional ad blocker that prote AdGuard for Windows is an easy-to-use tool that blocks annoying banners, popups, video ads, and trackers. But that's not all: it helps you save traffic, load web pages faster, and protect your computer from undesirable and potentially malicious websites. AdGuard also protects you from phishing websites and keeps your kids away from inappropriate content. -![Main screen \*mobile\_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/home-screen.png) +![Main screen \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/home-screen.png) Once you start AdGuard for Windows, you will see the main screen of the app. Its most noticeable detail is the _enable/disable protection_ button. Also, on this screen you can monitor blocked ads, trackers and threats statistics, find out the current version of the app or update it. Furthermore, there are four tabs in the upper right corner: _Settings_, _Support_, _License_, and _About_. Each of these is worth talking about separately. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-windows/features/network.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-windows/features/network.md index 217edb38423..fabafeb762b 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-windows/features/network.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-windows/features/network.md @@ -11,7 +11,7 @@ This article covers AdGuard for Windows, a multifunctional ad blocker that prote The _Network_ module is dedicated to network filtering, and here you will find additional network-related options. Two of them are enabled by default: _Enable traffic filtering_ and _Filter HTTPS_. These are important extra precautions to better filter your web space. Most websites are now using HTTPS, and the same applies to advertising. From many websites, like youtube.com, facebook.com, and x.com, it is impossible to remove ads without HTTPS filtering. So keep the _Filter HTTPS_ feature enabled unless you have a strong reason not to. -![Network Settings \*mobile\_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/network-settings.png) +![Network Settings \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/network-settings.png) In this module you can select the checkbox _Use AdGuard as an HTTP proxy_ to use AdGuard as a regular HTTP proxy which will filter all traffic passing through it. You can also enable the _Filter websites with EV certificates_ feature. Extended Validation (EV) SSL Certificates offer a stronger safety guarantee; owners of such websites have to pass a thorough and globally standardized identity verification process defined by EV guidelines. Which is the reason why some users trust websites with such certificates and prefer not to filter them. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-windows/features/others.md b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-windows/features/others.md index 9d46f2dfe43..5481bbf38cc 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-windows/features/others.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/adguard-for-windows/features/others.md @@ -13,13 +13,13 @@ There are other useful AdGuard options that shouldn't go unnoticed in this artic ### Support -![Support \*mobile\_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/support.png) +![Support \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/support.png) By clicking the Support tab you will open a dialog box through which you can report a bug, submit a feature request, or simply share your opinion of the product. ### License -![License \*mobile\_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/license.png) +![License \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/license.png) This tab contains information about your license. Here you can: @@ -28,13 +28,13 @@ This tab contains information about your license. Here you can: ### About -![About \*mobile\_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/about.png) +![About \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/about.png) In addition to information about the current version of the program, this tab provides some useful links to Licese agreement, Privacy policy, Acknowledgements, Discussions, and Version history pages. ### Check for updates -![Check for updates \*mobile\_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/check-updates.png) +![Check for updates \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/check-updates.png) To check for filters and userscripts updates, click the rotating arrows icon in the upper right corner of the app's main screen. diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/sv/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index cf76ff7fe89..24b6011caf1 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + is converted to + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-ff]: #what-product "AdGuard Browser Extension for Firefox" diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/general/extensions.md b/i18n/sv/docusaurus-plugin-content-docs/current/general/extensions.md index 71af31364c3..243bf9620fa 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/general/extensions.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/general/extensions.md @@ -363,30 +363,30 @@ We don’t support userstyles that contain `@var` or `@advanced` in the metadata 3. To create a userstyle, first write the title with metadata, for example - ```CSS - /* ==UserStyle== - @name New userstyle - @version 1.0 - ==/UserStyle== */ - ``` + ```CSS + /* ==UserStyle== + @name New userstyle + @version 1.0 + ==/UserStyle== */ + ``` 4. Write the CSS part after the meta data. AdGuard supports website domain names matching (`@-moz-document domain(…), …`). For example: - ```CSS - body { - background: gray; - } - ``` - - Or: - - ```CSS - @-moz-document domain('example.org'), - domain('example.net'), - domain('example.com') body { - background: gray; - } - ``` + ```CSS + body { + background: gray; + } + ``` + + Or: + + ```CSS + @-moz-document domain('example.org'), + domain('example.net'), + domain('example.com') body { + background: gray; + } + ``` 5. Once you’re finished, press _Save and Close_. Your new userstyle has been successfully added to AdGuard diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/sv/docusaurus-plugin-content-docs/current/general/license/legacy.md index 6b1c2a74395..1e68e937061 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: Legacy licenses FAQ sidebar_position: 6 --- -We have written this article to avoid confusion and explain in detail how you can renew/upgrade an outdated (legacy) AdGuard license. +We have written this article to avoid confusion and explain in detail how you can renew/upgrade a legacy AdGuard license. -## About the outdated licenses +## About legacy licenses Initially licenses of the following types were available to activate AdGuard products: @@ -27,54 +27,52 @@ For all types (Standard, Mobile, Premium) there were options for a Yearly and Li In October 2019 AdGuard switched to the new licensing system: from then on, licenses can still be purchased for 1 year or Lifetime, but their types have become **Personal** (for up to 3 devices) or **Family** (for up to 9 devices). -One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal license can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet.** +Another change is that the **new types of license keys can now be used on any device, in any combination**. For example, a Personal license can be used on Android, Mac and iOS, as well as on two Windows computers and an Apple tablet. -## What happened to the outdated licenses? +## What happened to the legacy licenses? -Standard were automatically made universal, which means that they can be activated on any devices. +**Standard licenses** were automatically made **universal**, which means that they can be activated on any device. -Mobile licenses remained unchanged and platform-limited (they can still only be used on phones or tablets). +**Mobile licenses** remained unchanged and platform-limited (they can still only be used on phones or tablets). -Premium licenses also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. +**Premium licenses** also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. For example, this is how the 1+1 key looks like: -![1+1 key](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 key](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *But despite the total number of devices (2) it can be activated on 1 desktop and 1 mobile device.* > All the outdated licenses have a "legacy" badge in the AdGuard account. And they are automatically converted to a new type when you either renew or upgrade them. But there are some nuances. Let's see which licenses can be converted to a new type and how to do it. -## I have an outdated (legacy) key. What renewal/upgrade options are available for me? +## How to renew or upgrade a legacy key -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +You can extend/renew or upgrade a legacy license in your [AdGuard account](https://adguardaccount.com) or on the [Extend or upgrade page](https://adguard.com/renew.html). -![Upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Go to "My licenses" tab and check what actions are available to you for each specific key. Below we will explain with specific examples. +To extend/renew or upgrade a legacy license in your AdGuard account, go to the *Licenses* tab, find the license you need, and select one of the available options. -### Licenses for 1/2/3 devices +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Yearly** licenses for 1, 2, 3 devices can be converted to either Personal or Family: +Or go to the [Extend or upgrade page](https://adguard.com/renew.html), enter your license, and click *Apply*. On the new page, select one of the available options. -![Upgrade or renew](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Choose based on how many devices you need to protect. +### Licenses for 1/2/3 devices -Instead of renewal you can switch to Lifetime: +Mobile Yearly licenses for 3 devices can be converted to Personal licenses or upgraded to Family ones: -![Lifetime](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Upgrade Yearly licenses for 1, 2, 3 devices](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Lifetime** licenses can only be converted to Family (9 devices) due to technical limitations: +> If you have a **Standard license for 3 devices**, it already works as a **Personal** license. If you renew your **Mobile license** for 3 devices, you will be able to use it on a **different set of device**s, not just phones. -![Lifetime upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +You can also upgrade your license to Lifetime: -### Licenses for 4+ devices (up to 9) +![Upgrade to Lifetime](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Yearly** keys of this configuration can only be converted into a Family license: +**Lifetime** licenses can only be upgraded to Family (9 devices) due to technical limitations. -![Yearly license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licenses for 4+ devices (up to 9) -**Lifetime** licenses for 4 or more devices cannot be upgraded due to technical limitation: +**Yearly** licenses for 4 or more devices can be upgraded to Family and Lifetime licenses. -![Lifetime license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +However, if you already have a **Lifetime** license, it cannot be upgraded due to technical limitations. ### Licenses for 9+ devices diff --git a/i18n/sv/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/sv/docusaurus-plugin-content-docs/current/general/license/what-is.md index a3b22328a24..fd9fa685ce2 100644 --- a/i18n/sv/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/sv/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ There are also licenses that the user can purchase from other sources or get for - **Distributor licenses** and **gifted licenses** can be both time-limited and non-time limited. Licenses with an expiration date can only be renewed manually - Personal — up to 3 devices - Family — up to 9 devices -- **The AdGuard Pro for iOS license** is purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 92bfd87a1dd..fa490098e78 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ The _Low-level settings_ section is for expert users. [Read more about low-level This section allows you to manage HTTPS filtering settings, filters, and userscripts, and set up a proxy server. -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filters @@ -57,11 +57,19 @@ If you activate too many filters, some websites may work incorrectly. [Read more about filters](https://adguard.com/en/blog/what-are-filters.html) -### Userscripts +### Extensions + +Extensions allow you to add userscripts and userstyles. + +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +Userstyles are like userscripts that allow you to change how web pages look in the browser without modifying their content. They work by adding CSS styles to the website’s existing styles. For example, if you want a dark theme on a website that doesn’t offer one, you can use a userstyle to do it. + +To add a userstyle, go to _Settings_ → _Filtering_ → _Extensions_→ _Add extension_ → _Import from file or URL_. You can find ready-made user styles [online](https://userstyles.world/). + +To create your own style, tap _Add extension_ → _Create userstyle_. #### AdGuard Extra diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 5e75a51f1e8..b5525cd735c 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 24b41b032ca..8f7344f7ade 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: How to disable the Samsung Auto Blocker feature -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index da99768471a..0341d942127 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: How to protect AdGuard from being disabled by the system -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index 7367e63cef9..784a7c9587c 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ You can access it by navigating to *Statistics* → *Battery usage*. Inside you will find a chart that shows the AdGuard battery resource consumption within the last 24 hours, with an option to get more detailed hour-to-hour data by tapping on the chart. Besides that, there’s also a numeric breakdown of the relevant data and a short technical explanation. +There are several other parameters below the chart: *CPU foreground*, *CPU background*, *Mobile data usage*, and *Wi-Fi data usage*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### How much battery resource does AdGuard really consume? First, let us lay down a bit of theory and links with necessary data. diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index 6f1876d0079..0563d2a0336 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index d98274a0489..c77491236e7 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Problems caused by extending restricted settings -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below: +In an effort to improve user privacy, Google has expanded the restriction settings in Android 15. More settings, such as _App usage access_, now require an additional permission to be enabled. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,6 +17,8 @@ AdGuard has a strict no-logging policy, which means that we do not collect your ::: +## Basic instructions + 1. On your Android device, open the **Settings app**. 2. Tap **Apps**. 3. Tap **AdGuard** @@ -34,3 +36,25 @@ Follow the on-screen instructions. All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## For OneUI 7.0 users + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Follow these steps to configure app usage access: + +1. Open _System settings_ → _Apps_ + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Tap the menu icon (⋮) in the top-right corner, then select _Special access_ + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Special access menu \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. Find and enable _AdGuard_ + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index deebee15677..c716cc3ed93 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Manual installation of the security certificate into the Firefox browser -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index c5b7755321a..05d28c3b6ea 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index 54b325ec582..52016424603 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index 79723d1f221..b9f70d23922 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Problems caused by multiple user profiles -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 6b9fddc4500..f95d206303e 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: How to set up outbound proxy -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index b9e9396152a..4ae364e8290 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 96b31c31295..25de8d83319 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Certificate installation in a Secure folder -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index adfd7139869..5d8aa06bad9 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: How to block ads in the YouTube app -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 43c9e9aee82..67126401ab4 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,23 +5,25 @@ sidebar_position: 2 ## Install AdGuard for Linux -To install AdGuard, enter: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` @@ -35,37 +37,97 @@ You can verify the signature to prove it’s an official version of AdGuard by u ::: -## Activate license +## Initial setup -AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don't have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -To log in or create an account, enter: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -To reset your license, enter: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -To view the license info, enter: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## Initial setup +4. After activation, you can continue to work with the program: -To get AdGuard up and running, complete the initial setup. This includes installing the AdGuard CA certificate, enabling the necessary filters, and selecting the proxy mode. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -To run the configuration wizard, enter: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + or: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). ## Uninstall AdGuard for Linux @@ -73,19 +135,19 @@ To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index 4ede8a490a1..2487dcaac3b 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Settings and protection management sidebar_position: 3 --- +## Available commands + To get a list of all available AdGuard commands, enter: -``` +```sh adguard-cli --help-all ``` ## Enable and disable protection +### Enable protection + To enable protection, enter: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + To disable protection, enter: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + To view the protection status, enter: -``` +```sh adguard-cli status ``` -## Check for updates +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Updates + +### Check for updates To check for updates, enter: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + To update AdGuard for Linux, enter: -``` +```sh adguard-cli update ``` +### Update script output + To view the update script output, enter: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Use the `config` command to configure AdGuard for Linux. Subcommands: - `show`: Show the current configuration in `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configure an option in `proxy.yaml` - - `listen_ports.http_proxy`: HTTP listening port - - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `listen_ports.http_proxy`: HTTP listening port + - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `get`: Get the current status of the above options ## Manage filters @@ -64,8 +90,32 @@ Use the `config` command to configure AdGuard for Linux. Subcommands: Use the `filters` command to configure AdGuard for Linux. Subcommands: - `list`: List installed filters - - `--all`: View all filters + + - `--all`: View all filters + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Install a filter. Enter the URL of the filter you want to install + - `enable`: Enable a filter. Enter the name or ID of the filter + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Disable a filter. Enter the name or ID of the filter + - `update`: Update filters + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Edit the config file directly: + - To determine the location of the config file, run `adguard-cli config show | grep "Config location"`. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..1fac57de8bb --- /dev/null +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI interaction +sidebar_position: 5 +--- + +## AdGuard VPN CLI interaction + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index 412685edf25..86c048ff7a0 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ This page describes the features and details of AdGuard’s central management o ## 1. Download the MSI {#msi-download} -Download the [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi) +Download the [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Download the [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi) +Download the [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Configure the settings for your network {#settings-configuring} diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/ta/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index cf76ff7fe89..24b6011caf1 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Basic rule modifiers {#basic-rule-modifiers} +### Basic rule modifiers {#basic-rule-modifiers-examples} Filtering rules support numerous modifiers that allow you to fine-tune the rule behavior. Here is an example of a rule with some simple modifiers. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Cosmetic rules +#### Cosmetic rules {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtering rules +#### HTML filtering rules {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Basically, they | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Basically, they - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Compatibility -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. In that case, the modifier mat :::caution Restrictions 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Compatibility -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Compatibility -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Blocking page itself can do some checks and close the window if it is really a popup. Otherwise, page should be loaded. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Compatibility -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Compatibility - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Compatibility - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,35 +1326,34 @@ These modifiers are able to completely change the behavior of basic rules. -| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:-------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Modifier \ Products | [CoreLibs apps][cl-apps] | [AdGuard for Chromium][ext-chr] | [AdGuard for Chrome MV3][ext-mv3] | [AdGuard for Firefox][ext-ff] | [AdGuard for iOS][ios-app] | [AdGuard for Safari][ext-saf] | [AdGuard Content Blocker][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------:|:-----------------------------:|:---------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::note - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — feature that is planned to be implemented but is not yet available in any product - ❌ — not supported - 👎 — deprecated; still supported but will be removed in the future @@ -1670,7 +1669,7 @@ preroll.ts :::info Compatibility -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Compatibility -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Compatibility -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox ignores the `Permissions-Policy` header. For more information, see [this :::info Compatibility -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Compatibility -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Group of similar `$removeheader` rules will be combined into one declarative rule. For example: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + is converted to + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::caution Restrictions This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Compatibility -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Compatibility -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::caution Restrictions Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Compatibility -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -4284,7 +4373,7 @@ More information about scriptlets can be found [on GitHub](https://github.com/Ad Scriptlet rules are not supported by AdGuard Content Blocker. -The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. +The full syntax of scriptlet exception rules is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v3.0 or later. Previous versions only support exception rules that disable specific scriptlets. ::: @@ -4360,7 +4449,7 @@ In the modifiers values, the following characters must be escaped: `[`, `]`, `,` :::info Compatibility -Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android. +Such rules with `$app` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux. ::: @@ -4458,7 +4547,7 @@ In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with d :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$url` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -4558,6 +4647,7 @@ where: - product-specific constants for cases when you need a rule to work (or not work — then `!` should be used before constant) in a specific product only: - `adguard_app_windows` — AdGuard for Windows - `adguard_app_mac` — AdGuard for Mac + - `adguard_app_cli` — AdGuard for Linux - `adguard_app_android` — AdGuard for Android - `adguard_app_ios` — AdGuard for iOS - `adguard_ext_safari` — AdGuard for Safari @@ -4568,7 +4658,7 @@ where: - `adguard_ext_opera` — AdGuard Browser Extension for Opera - `adguard_ext_android_cb` — AdGuard Content Blocker for mobile Samsung and Yandex browsers - `ext_ublock` — special case; this one is declared when a uBlock version of a filter is compiled by the [FiltersRegistry][] - - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, and AdGuard for Android + - `cap_html_filtering` — products that support HTML filtering rules: AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux - `!#else` — start of the block when conditions are false - `rules_list`, `true_conditions_rules_list`, `false_conditions_rules_list` — lists of rules - `!#endif` — end of the block @@ -4733,7 +4823,9 @@ Used to specify the platforms to apply the rules. List of existing platforms and - `windows` — AdGuard for Windows — [https://filters.adtidy.org/windows/filters/2.txt](https://filters.adtidy.org/windows/filters/2.txt) -- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v2/filters/2.txt](https://filters.adtidy.org/mac_v2/filters/2.txt) +- `mac` — AdGuard for Mac — [https://filters.adtidy.org/mac_v3/filters/2.txt](https://filters.adtidy.org/mac_v3/filters/2.txt) + +- `cli` — AdGuard for Linux — [https://filters.adtidy.org/cli/filters/2.txt](https://filters.adtidy.org/cli/filters/2.txt) - `android` — AdGuard for Android — [https://filters.adtidy.org/android/filters/2.txt](https://filters.adtidy.org/android/filters/2.txt) @@ -4771,6 +4863,17 @@ Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, thi ||example.org^ ``` +#### `NOT_VALIDATE` + +This hint is used to skip validation of the rule. It is useful for rules for which support has not yet been added to the filters compiler, or for rules that are incorrectly discarded. + +**If you want to add a rule that should not be validated, use the `NOT_VALIDATE` hint:** + +```adblock +!+ NOT_VALIDATE +||example.org^$newmodifier +``` + ## How to debug filtering rules It may be possible to create simple filtering rules "in your head" but for anything even slightly more complicated you will need additional tools to debug and iterate them. There are tools to assist you with that. You can use DevTools in Chrome and its analogs in other browsers but most AdGuard products provide another one — Filtering log. @@ -4886,7 +4989,7 @@ The following scriptlets also may be used for debug purposes: ### Product shortcuts {#what-product} -1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), and [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking) +1. `CoreLibs apps` — [AdGuard for Windows](/adguard-for-windows/features/home-screen), [AdGuard for Mac](/adguard-for-mac/features/main), [AdGuard for Android](/adguard-for-android/features/protection/ad-blocking), and [AdGuard for Linux](/adguard-for-linux) 1. `AdGuard for Chromium` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Chrome and other Chromium-based browsers such as Microsoft Edge and Opera 1. `AdGuard for Chrome MV3` — [AdGuard Browser Extension for Chrome MV3](/adguard-browser-extension/mv3-version) 1. `AdGuard for Firefox` — [AdGuard Browser Extension](/adguard-browser-extension/availability) for Firefox @@ -4918,7 +5021,7 @@ The following scriptlets also may be used for debug purposes: [badfilter-in-mv3]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/tsurlfilter/src/rules/declarative-converter#badfilter -[cl-apps]: #what-product "AdGuard for Windows, Mac, Android" +[cl-apps]: #what-product "AdGuard for Windows, Mac, Linux, Android" [ext-chr]: #what-product "AdGuard Browser Extension for Chrome and other Chromium-based browsers" [ext-mv3]: #what-product "AdGuard Browser Extension for Chrome MV3" [ext-ff]: #what-product "AdGuard Browser Extension for Firefox" diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/general/license/legacy.md b/i18n/ta/docusaurus-plugin-content-docs/current/general/license/legacy.md index 6b1c2a74395..1e68e937061 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/general/license/legacy.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/general/license/legacy.md @@ -3,9 +3,9 @@ title: Legacy licenses FAQ sidebar_position: 6 --- -We have written this article to avoid confusion and explain in detail how you can renew/upgrade an outdated (legacy) AdGuard license. +We have written this article to avoid confusion and explain in detail how you can renew/upgrade a legacy AdGuard license. -## About the outdated licenses +## About legacy licenses Initially licenses of the following types were available to activate AdGuard products: @@ -27,54 +27,52 @@ For all types (Standard, Mobile, Premium) there were options for a Yearly and Li In October 2019 AdGuard switched to the new licensing system: from then on, licenses can still be purchased for 1 year or Lifetime, but their types have become **Personal** (for up to 3 devices) or **Family** (for up to 9 devices). -One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal license can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet.** +Another change is that the **new types of license keys can now be used on any device, in any combination**. For example, a Personal license can be used on Android, Mac and iOS, as well as on two Windows computers and an Apple tablet. -## What happened to the outdated licenses? +## What happened to the legacy licenses? -Standard were automatically made universal, which means that they can be activated on any devices. +**Standard licenses** were automatically made **universal**, which means that they can be activated on any device. -Mobile licenses remained unchanged and platform-limited (they can still only be used on phones or tablets). +**Mobile licenses** remained unchanged and platform-limited (they can still only be used on phones or tablets). -Premium licenses also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. +**Premium licenses** also remained unchanged and platform-limited. And although **Premium licenses are now displayed in your personal account by the total number of devices**, they can still be activated on desktop + mobile set of devices. For example, this is how the 1+1 key looks like: -![1+1 key](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/1.outdatedlicenses_en.png) +![1+1 key](https://cdn.adtidy.org/blog/new/7rh5nlicense1.png) *But despite the total number of devices (2) it can be activated on 1 desktop and 1 mobile device.* > All the outdated licenses have a "legacy" badge in the AdGuard account. And they are automatically converted to a new type when you either renew or upgrade them. But there are some nuances. Let's see which licenses can be converted to a new type and how to do it. -## I have an outdated (legacy) key. What renewal/upgrade options are available for me? +## How to renew or upgrade a legacy key -You can check this on the [renewal page](https://adguard.com/renew.html) or in your [AdGuard account](https://adguardaccount.com/main.html): +You can extend/renew or upgrade a legacy license in your [AdGuard account](https://adguardaccount.com) or on the [Extend or upgrade page](https://adguard.com/renew.html). -![Upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/2.switch_en.png) -> Go to "My licenses" tab and check what actions are available to you for each specific key. Below we will explain with specific examples. +To extend/renew or upgrade a legacy license in your AdGuard account, go to the *Licenses* tab, find the license you need, and select one of the available options. -### Licenses for 1/2/3 devices +![Renew or upgrade a license in your AdGuard account](https://cdn.adtidy.org/blog/new/rf4zgklicense2.png) -**Yearly** licenses for 1, 2, 3 devices can be converted to either Personal or Family: +Or go to the [Extend or upgrade page](https://adguard.com/renew.html), enter your license, and click *Apply*. On the new page, select one of the available options. -![Upgrade or renew](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/3.yearly_en.png) -> Choose based on how many devices you need to protect. +### Licenses for 1/2/3 devices -Instead of renewal you can switch to Lifetime: +Mobile Yearly licenses for 3 devices can be converted to Personal licenses or upgraded to Family ones: -![Lifetime](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/4.lifetime_en.png) +![Upgrade Yearly licenses for 1, 2, 3 devices](https://cdn.adtidy.org/blog/new/fh5r7upgrade3.png) -**Lifetime** licenses can only be converted to Family (9 devices) due to technical limitations: +> If you have a **Standard license for 3 devices**, it already works as a **Personal** license. If you renew your **Mobile license** for 3 devices, you will be able to use it on a **different set of device**s, not just phones. -![Lifetime upgrade](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/5.lifetimeupgrade_en.png) +You can also upgrade your license to Lifetime: -### Licenses for 4+ devices (up to 9) +![Upgrade to Lifetime](https://cdn.adtidy.org/blog/new/7j4l6gupgrade4.png) -**Yearly** keys of this configuration can only be converted into a Family license: +**Lifetime** licenses can only be upgraded to Family (9 devices) due to technical limitations. -![Yearly license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/6.yearly4+devices_en.png) +### Licenses for 4+ devices (up to 9) -**Lifetime** licenses for 4 or more devices cannot be upgraded due to technical limitation: +**Yearly** licenses for 4 or more devices can be upgraded to Family and Lifetime licenses. -![Lifetime license for 4 devices](https://cdn.adtidy.org/public/Adguard/kb/newscreenshots/En/General/legacy-licenses/7.lifetime4+devices_en.png) +However, if you already have a **Lifetime** license, it cannot be upgraded due to technical limitations. ### Licenses for 9+ devices diff --git a/i18n/ta/docusaurus-plugin-content-docs/current/general/license/what-is.md b/i18n/ta/docusaurus-plugin-content-docs/current/general/license/what-is.md index a3b22328a24..fd9fa685ce2 100644 --- a/i18n/ta/docusaurus-plugin-content-docs/current/general/license/what-is.md +++ b/i18n/ta/docusaurus-plugin-content-docs/current/general/license/what-is.md @@ -25,7 +25,7 @@ There are also licenses that the user can purchase from other sources or get for - **Distributor licenses** and **gifted licenses** can be both time-limited and non-time limited. Licenses with an expiration date can only be renewed manually - Personal — up to 3 devices - Family — up to 9 devices -- **The AdGuard Pro for iOS license** is purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID +- **AdGuard for iOS** and **AdGuard Pro** licenses are purchased and managed through the App Store and can only be used on iOS and iPadOS devices with the same Apple ID :::tip diff --git a/i18n/tr/docusaurus-plugin-content-docs/current.json b/i18n/tr/docusaurus-plugin-content-docs/current.json index a5fd8bcf267..37e83d8ae64 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current.json +++ b/i18n/tr/docusaurus-plugin-content-docs/current.json @@ -84,7 +84,7 @@ "description": "The label for category Features overview in sidebar tutorialSidebar" }, "sidebar.tutorialSidebar.category.Features": { - "message": "Özellikler", + "message": "Features", "description": "The label for category Features in sidebar tutorialSidebar" }, "sidebar.tutorialSidebar.category.Content Blockers": { diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-browser-extension/adguard-browser-extension.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-browser-extension/adguard-browser-extension.md index 85f62a442f3..61ce0048516 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-browser-extension/adguard-browser-extension.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-browser-extension/adguard-browser-extension.md @@ -9,7 +9,7 @@ Bu makale, yalnızca tarayıcınızı koruyan AdGuard Tarayıcı Uzantısı hakk ::: -## Özellikler +## Features Main features and settings available in the AdGuard Browser Extension diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-browser-extension/features/features.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-browser-extension/features/features.md index 5cf61ebbb82..9198e6c8a7b 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-browser-extension/features/features.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-browser-extension/features/features.md @@ -1,5 +1,5 @@ --- -title: Özellikler +title: Features sidebar_position: 1 --- diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/adguard-for-android.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/adguard-for-android.md index fe9112e159f..f2e7e436dfc 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/adguard-for-android.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/adguard-for-android.md @@ -9,7 +9,7 @@ Bu makale, cihazınızı sistem düzeyinde koruyan çok işlevli bir reklam enge ::: -## Özellikler +## Features Main features and settings available in AdGuard for Android diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/features/features.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/features/features.md index f8cb3a46c97..879be078b83 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/features/features.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/features/features.md @@ -1,5 +1,5 @@ --- -title: Özellikler +title: Features sidebar_position: 1 --- diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md index 6fd157f41ea..6740a823992 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/features/settings.md @@ -39,7 +39,7 @@ The _Low-level settings_ section is for expert users. [Read more about low-level This section allows you to manage HTTPS filtering settings, filters, and userscripts, and set up a proxy server. -![Filtering \*mobile_border](https://cdn.adtidy.org/blog/new/7v5c6filtering.png) +![Filtering \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/filtering.jpg) ### Filtreler @@ -57,17 +57,25 @@ If you activate too many filters, some websites may work incorrectly. [Read more about filters](https://adguard.com/en/blog/what-are-filters.html) -### Kullanıcı Betikleri +### Uzantılar -Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. Bir kullanıcı betiği yüklemek için özel bir kullanıcı betiği yöneticisine ihtiyacınız vardır. AdGuard has such a functionality and allows you to add userscripts by URL or from file. +Uzantılar, kullanıcı betikleri ve kullanıcı stilleri eklemenize izin verir. -![Userscripts \*mobile_border](https://cdn.adtidy.org/blog/new/isv6userscripts.png) +![Extensions \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/extensions.jpg) + +Userscripts are miniprograms written in JavaScript that extend the functionality of one or more websites. To install a userscripts, you need a special userscript manager. AdGuard has such a functionality and allows you to add userscripts by URL or from file. + +Kullanıcı stilleri, web sayfalarının içeriğini değiştirmeden tarayıcıda nasıl göründüğünü değiştirmenize olanak tanıyan kullanıcı betikleri gibidir. Sitenin mevcut stillerine CSS stilleri ekleyerek çalışırlar. Örneğin, koyu bir tema sunmayan bir sitede koyu bir tema istiyorsanız, bunu yapmak için bir kullanıcı stili kullanabilirsiniz. + +Kullanıcı stili eklemek için _Ayarlar_ → _Filtreleme_ → _Uzantılar_→ _Uzantı ekle_ → _Dosyadan veya URL'den içe aktar_ öğesine gidin. [İnternette](https://userstyles.world/) hazır kullanıcı stilleri bulabilirsiniz. + +Kendi stilinizi oluşturmak için _Uzantı ekle_ → _Kullanıcı stili oluştur_ öğesine dokunun. #### AdGuard Extra -AdGuard Extra, karmaşık reklamları ve reklamları sitelere yeniden enjekte eden mekanizmaları engelleyen özel bir kullanıcı betiğidir. +AdGuard Extra is a custom userscript that blocks complex ads and mechanisms that reinject ads to websites. -#### AMP'yi devre dışı bırak +#### Disable AMP Disable AMP is a userscript that disables [Accelerated mobile pages](https://en.wikipedia.org/wiki/Accelerated_Mobile_Pages) on the Google search results page. @@ -77,23 +85,23 @@ Disable AMP is a userscript that disables [Accelerated mobile pages](https://en. To block ads and trackers on most websites and in most apps, AdGuard needs to filter their HTTPS traffic. [Read more about HTTPS filtering](/general/https-filtering/what-is-https-filtering) -##### Güvenlik sertifikaları +##### Security certificates -Şifrelenmiş trafiği yönetmek için AdGuard, CA sertifikasını cihazınıza yükler. Güvenlidir: trafik yerel olarak filtrelenir ve AdGuard bağlantının güvenliğini doğrular. +To manage encrypted traffic, AdGuard installs its CA certificate on your device. It's safe: the traffic is filtered locally and AdGuard verifies the security of the connection. -Android'in eski sürümlerinde sertifika otomatik olarak yüklenir. On Android 11 and later, you need to install it manually. [Installation instructions](/adguard-for-android/solving-problems/manual-certificate/) +On older versions of Android, the certificate is installed automatically. On Android 11 and later, you need to install it manually. [Installation instructions](/adguard-for-android/solving-problems/manual-certificate/) -The CA certificate in the user store is enough to filter HTTPS traffic in browsers and some apps. Ancak, yalnızca sistem depolamasındaki sertifikalara güvenen uygulamalar vardır. Buradaki HTTPS trafiğini filtrelemek için AdGuard'ın CA sertifikasını sistem depolamasına yüklemeniz gerekir. [Instructions](/adguard-for-android/solving-problems/https-certificate-for-rooted/) +The CA certificate in the user store is enough to filter HTTPS traffic in browsers and some apps. However, there are apps that only trust certificates from the system store. To filter HTTPS traffic there, you need to install AdGuard's CA certificate into the system store. [Instructions](/adguard-for-android/solving-problems/https-certificate-for-rooted/) -##### HTTPS filtrelenen uygulamalar +##### HTTPS-filtered apps -Bu bölüm, AdGuard'ın HTTPS trafiğini filtrelediği uygulamaların listesini içerir. Please note that the setting can be applied for all apps only if you have CA certificates both in the user store and in the system store. +This section contains the list of apps for which AdGuard filters HTTPS traffic. Please note that the setting can be applied for all apps only if you have CA certificates both in the user store and in the system store. -##### HTTPS filtrelenmiş siteler +##### HTTPS-filtered websites -Bu ayar, AdGuard'ın HTTPS trafiğini filtrelemesi gereken siteleri yönetmenizi sağlar. +This setting allows you to manage websites for which AdGuard should filter HTTPS traffic. -HTTPS filtreleme, AdGuard'ın isteklerin ve yanıtların içeriğini filtrelemesini sağlar, ancak bu verileri asla toplamaz veya saklamayız. However, to increase security, we [exclude websites that contain potentially sensitive information from HTTPS filtering](/general/https-filtering/what-is-https-filtering/#financial-websites-and-websites-with-sensitive-personal-data). +HTTPS filtering allows AdGuard to filter the content of requests and responses, but we never collect or store this data. However, to increase security, we [exclude websites that contain potentially sensitive information from HTTPS filtering](/general/https-filtering/what-is-https-filtering/#financial-websites-and-websites-with-sensitive-personal-data). You can also add websites that you consider necessary to exclusions by selecting one of the modes: @@ -110,11 +118,11 @@ In this section, you can also set up a third-party VPN to work with AdGuard, if Under _Apps operating through proxy_, you can select apps that will route their traffic through your specified proxy. If you have _Integration with AdGuard VPN_ enabled, this setting plays the role of AdGuard VPN's app exclusions: it allows you to specify apps to be routed through the AdGuard VPN tunnel. -#### Yönlendirme modu +#### Routing mode -Bu bölüm trafik filtreleme yöntemini seçmenizi sağlar. +This section allows you to select the traffic filtering method. -- _Local VPN_ filters traffic through a locally created VPN. Bu en güvenilir moddur. Due to Android restrictions, it is also the only system-wide traffic filtering method available on non-rooted devices. +- _Local VPN_ filters traffic through a locally created VPN. This is the most reliable mode. Due to Android restrictions, it is also the only system-wide traffic filtering method available on non-rooted devices. :::note diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md index 72c8ffdba12..32b1b919d08 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -1,6 +1,6 @@ --- title: How to install AdGuard for Android TV -sidebar_position: 16 +sidebar_position: 15 --- :::info diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md index 6e7eaa47f0f..94ad0c26147 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/auto-blocker.md @@ -1,6 +1,6 @@ --- title: Samsung Otomatik Engelleyici özelliği nasıl devre dışı bırakılır -sidebar_position: 19 +sidebar_position: 18 --- :::info diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md index a47fedb1762..4e26a7facf5 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/background-work.md @@ -1,6 +1,6 @@ --- title: How to protect AdGuard from being disabled by the system -sidebar_position: 9 +sidebar_position: 8 --- :::info diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md index bbcd686c319..d8e9310186b 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/battery.md @@ -23,6 +23,12 @@ You can access it by navigating to *Statistics* → *Battery usage*. Inside you will find a chart that shows the AdGuard battery resource consumption within the last 24 hours, with an option to get more detailed hour-to-hour data by tapping on the chart. Besides that, there’s also a numeric breakdown of the relevant data and a short technical explanation. +Tablonun altında birkaç parametre daha var: *İşlemci ön planı*, *İşlemci arka planı*, *Mobil veri kullanımı*, ve *Wi-Fi veri kullanımı*. + +*CPU foreground* and *CPU background* show how much CPU time is used by AdGuard when the app is active or running in the background. + +And with *Mobile data usage* and *Wi-Fi data usage*, you can see how much traffic AdGuard consumed when your phone was using mobile Internet or connected to Wi-Fi. + ### How much battery resource does AdGuard really consume? First, let us lay down a bit of theory and links with necessary data. diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md index a1c31e550e1..8645a9562b2 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/compatibility-issues.md @@ -1,6 +1,6 @@ --- title: Known compatibility issues with Android apps -sidebar_position: 15 +sidebar_position: 14 --- :::info @@ -18,7 +18,7 @@ AdGuard'ı *Yerel VPN* filtreleme modunda kullanıyorsanız, diğer VPN uygulama - Switch to the *Automatic proxy* mode. When you do that, AdGuard will no longer use local VPN and will reconfigure iptables instead - Switch to the *Manual proxy* mode. To do this, go to *Settings* → *Filtering* → *Network* → *Routing mode* -:::note Uyumluluk +:::note Compatibility The *Automatic proxy* mode is only accessible on rooted devices. For *Manual proxy*, rooting is required on devices running on Android 10 or later. diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md index e2eba8ac30f..63595bbebc7 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/extending-restricted-settings.md @@ -1,6 +1,6 @@ --- title: Kısıtlı ayarların genişletilmesinden kaynaklanan sorunlar -sidebar_position: 18 +sidebar_position: 17 --- :::info @@ -9,7 +9,7 @@ Bu makale, cihazınızı sistem düzeyinde koruyan çok işlevli bir reklam enge ::: -Kullanıcı gizliliğini artırmak amacıyla Google, Android 15'teki kısıtlama ayarlarını genişletti. _Uygulama kullanım erişimi_ gibi daha fazla ayarın etkinleştirilmesi için artık ek bir izin gerekiyor. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. Bu sorunları çözmek için lütfen aşağıdaki adımları izleyin: +Kullanıcı gizliliğini artırmak amacıyla Google, Android 15'teki kısıtlama ayarlarını genişletti. _Uygulama kullanım erişimi_ gibi daha fazla ayarın etkinleştirilmesi için artık ek bir izin gerekiyor. Since the _[Firewall](/adguard-for-android/features/protection/firewall)_ and _[Detect Samsung Pay](/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea)_ features require the _App usage access_ setting to be enabled for them to work properly, you may have experienced problems using them. To resolve these issues, please follow the steps below. :::note @@ -17,11 +17,13 @@ AdGuard'ın mutlak bir kayıt tutmama politikası vardır, bu da verilerinizi to ::: -1. Android cihazınızda **Ayarlar uygulaması** öğesini açın. -2. **Uygulamalar** öğesine dokunun. -3. **AdGuard** öğesine dokunun +## Temel talimatlar -![Uygulamalarda AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solution_problems/problems-caused-by-extending-restricted-settings/restricted1.png) +1. On your Android device, open the **Settings app**. +2. Tap **Apps**. +3. Tap **AdGuard** + +![AdGuard in Apps \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted1.png) If you can't find it, first tap **See all apps** or **App info**. @@ -29,8 +31,30 @@ If you can't find it, first tap **See all apps** or **App info**. ![Allow restricted settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted2.png) -Ekrandaki talimatları izleyin. +Follow the on-screen instructions. -Hepsi tamam! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. +All done! Now the _Firewall_ and _Detect Samsung Pay_ features will work correctly. ![Restricted settings allowed for AdGuard \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/restricted3.png) + +## OneUI 7.0 kullanıcıları için + +For Samsung devices with OneUI 7.0, the app permission settings follow a different path. Uygulama kullanım erişimini yapılandırmak için şu adımları izleyin: + +1. _Sistem ayarları_ → _Uygulamalar_ öğesini açın + +![Apps settings \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/apps.jpg) + +1. Sağ üst köşedeki menü simgesine (⋮) dokunun ve ardından _Özel erişim_ öğesini seçin + +![Special access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/three-dots.jpg) + +1. Select _Usage data access_ + +![Özel erişim menüsü \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/special.jpg) + +1. _AdGuard_ öğesini bulun ve etkinleştirin + +![Usage data access \*mobile](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/problems-caused-by-extending-restricted-settings/usage_data.jpg) + +All done! diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md index 388576da0e1..947d81f92ae 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/firefox-certificates.md @@ -1,6 +1,6 @@ --- title: Güvenlik sertifikasının Firefox tarayıcısına elle yükleme -sidebar_position: 11 +sidebar_position: 10 --- :::info diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md index b1849142add..5131425b29f 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/https-certificate-for-rooted.md @@ -1,6 +1,6 @@ --- title: Moving the CA certificate to the system store on rooted devices -sidebar_position: 14 +sidebar_position: 13 --- :::info diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md index e3c8e2dd0d6..cc21919f57c 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/manual-certificate.md @@ -1,6 +1,6 @@ --- title: Certificate installation on devices with Android 11+ -sidebar_position: 12 +sidebar_position: 11 --- :::info diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md index f469a6e59b7..8ebe2584143 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -1,6 +1,6 @@ --- title: Birden çok kullanıcı profilinden kaynaklanan sorunlar -sidebar_position: 10 +sidebar_position: 9 --- :::info diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md index 77d679ccd48..843bd4945e8 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md @@ -1,6 +1,6 @@ --- title: Giden proxy nasıl ayarlanır -sidebar_position: 8 +sidebar_position: 7 --- :::info diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md index f341cd4ac45..651952985c9 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/samsungpay-with-adguard-in-south-korea.md @@ -1,6 +1,6 @@ --- title: How to use Samsung Pay with AdGuard in South Korea -sidebar_position: 17 +sidebar_position: 16 --- :::info diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md index 90a42393973..85121941b85 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/secure-folder.md @@ -1,6 +1,6 @@ --- title: Güvenli bir klasöre sertifika yükleme -sidebar_position: 13 +sidebar_position: 12 --- :::info diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md index bf4f8388991..63f878a3d2f 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/youtube-ads.md @@ -1,6 +1,6 @@ --- title: YouTube uygulamasında reklamlar nasıl engellenir -sidebar_position: 7 +sidebar_position: 6 --- :::info diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-ios/adguard-for-ios.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-ios/adguard-for-ios.md index a7931f897c1..1787f3d4c88 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-ios/adguard-for-ios.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-ios/adguard-for-ios.md @@ -3,7 +3,7 @@ title: iOS için AdGuard sidebar_position: 1 --- -## Özellikler +## Features Main features and settings available in AdGuard for iOS diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-ios/features/features.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-ios/features/features.md index 6d504692618..ad7f301d9f9 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-ios/features/features.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-ios/features/features.md @@ -1,5 +1,5 @@ --- -title: Özellikler +title: Features sidebar_position: 1 --- diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md index 42e123c3345..ed31cc47192 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-linux/installation.md @@ -5,88 +5,150 @@ sidebar_position: 2 ## Linux için AdGuard'ı yükleme -AdGuard'ı kurmak için şunu girin: +Open the command line on your computer. On Linux, use the keyboard shortcut _Ctrl+Alt+T_. On Mac, type _Terminal_ in the search field. -Release +To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. -``` +**Release**: + +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v ``` -Beta +**Beta**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v ``` -Nightly +**Nightly**: -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v ``` -Gerekirse, yönetici parolanızı girin. +If required, enter your admin password. Press `y` to create a link in `/usr/local/bin` to the executable and wait until the installation is complete. :::note -AdGuard'ın resmi bir sürümü olduğunu kanıtlamak için `gpg` aracını kullanarak imzayı doğrulayabilirsiniz. [GitHub'da daha fazlasını okuyun](https://github.com/AdguardTeam/AdGuardCLI?tab=readme-ov-file#verify-releases) +You can verify the signature to prove it’s an official version of AdGuard by using the `gpg` tool. [Read more on GitHub](https://github.com/AdguardTeam/AdGuardCLI?tab=readme-ov-file#verify-releases) ::: -## Activate license +## Initial setup -AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don't have a license yet, you can log in or create an account to get a free 14-day trial. Zaten bir lisansınız varsa, etkinleştirmek için giriş yapın. +AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). Henüz bir lisansınız yoksa, 14 günlük ücretsiz denemeyi edinmek için giriş yapabilir veya bir hesap oluşturabilirsiniz. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: -Giriş yapmak veya hesap oluşturmak için şunu yazın: +1. After installation, enter: -``` -adguard-cli activate -``` + ```sh + adguard-cli activate + ``` -Lisansınızı sıfırlamak için şunu yazın: +2. Then select the desired option: -``` -adguard-cli reset-license -``` + ![adguard-cli activate \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation1.png) -Lisans bilgilerini görüntülemek için şunu yazın: +3. Once you have a license, follow the provided link to proceed with the activation: -``` -adguard-cli license -``` + ![Activate license \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation2.png) -## İlk kurulum +4. After activation, you can continue to work with the program: -To get AdGuard up and running, complete the initial setup. Buna AdGuard CA sertifikasının yüklenmesi, gerekli filtrelerin etkinleştirilmesi ve proxy modunun seçilmesi dâhildir. + ![Successful activation \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation3.png) -Yapılandırma sihirbazını çalıştırmak için şunu yazın: +5. You can also reset your license by entering: -``` -adguard-cli configure -``` + ```sh + adguard-cli reset-license + ``` + + or view the license info by entering + + ```sh + adguard-cli license + ``` + +6. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: + + ```sh + adguard-cli configure + ``` + + ![Setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation4.png) + + The wizard will ask basic questions required for the initial setup. + +7. After that, you can start the AdGuard protection by entering + + ```sh + adguard-cli start + ``` + + ![Start protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation5.png) + +8. You can check the protection status using: + + ```sh + adguard-cli status + ``` + + and stop it with: + + ```sh + adguard-cli stop + ``` + + ![Stop protecton \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +9. To check the current configuration, enter: + + ```sh + adguard-cli config show + ``` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + + The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. + + As an alternative, you can use the commands: + + ```sh + adguard-cli config get + ``` + + veya: + + ```sh + adguard-cli config set + ``` + + They are primarily intended for scripting, though. + +For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). ## Uninstall AdGuard for Linux -AdGuard'ı kaldırmak için şunu yazın: +To uninstall AdGuard, enter: Release -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u ``` Beta -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u ``` Nightly -``` +```sh curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u ``` -Gerekirse, yönetici parolanızı girin. +If required, enter your admin password. diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md index dc913a3df69..ae947852b76 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md @@ -3,49 +3,71 @@ title: Ayarlar ve koruma yönetimi sidebar_position: 3 --- +## Available commands + Mevcut tüm AdGuard komutlarının listesini almak için şunu yazın: -``` +```sh adguard-cli --help-all ``` ## Enable and disable protection +### Enable protection + Korumayı etkinleştirmek için şunu yazın: -``` +```sh adguard-cli start ``` +This command attempts to configure a redirection to the proxy. + +![Start protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/start-protection.gif) + +### Disable protection + Korumayı devre dışı bırakmak için şunu yazın: -``` +```sh adguard-cli stop ``` +This command not only stops the proxy but also stops the trafic from redirecting to it. + +### Check protection status + Koruma durumunu görüntülemek için şunu yazın: -``` +```sh adguard-cli status ``` -## Güncellemeleri denetleyin +![Status/Stop protection \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation6.png) + +## Güncellemeler + +### Güncellemeleri denetleyin Güncellemeleri denetlemek için şunu yazın: -``` +```sh adguard-cli check-update ``` +### Update AdGuard for Linux + Linux için AdGuard'ı güncellemek için şunu yazın: -``` +```sh adguard-cli update ``` +### Update script output + To view the update script output, enter: -``` +```sh adguard-cli update -v ``` @@ -54,9 +76,13 @@ adguard-cli update -v Linux için AdGuard'ı yapılandırmak için `config` komutunu kullanın. Alt komutlar: - `show`: Show the current configuration in `proxy.yaml` + + ![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png) + - `set`: Configure an option in `proxy.yaml` - `listen_ports.http_proxy`: HTTP listening port - `proxy_mode`: Proxy mode (`manual` or `auto`) + - `get`: Get the current status of the above options ## Manage filters @@ -64,8 +90,32 @@ Linux için AdGuard'ı yapılandırmak için `config` komutunu kullanın. Alt ko Use the `filters` command to configure AdGuard for Linux. Alt komutlar: - `list`: List installed filters + - `--all`: View all filters + + ![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png) + - `install`: Install a filter. Yüklemek istediğiniz filtrenin URL'sini girin + - `enable`: Enable a filter. Filtrenin adını veya kimliğini girin + + ![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png) + - `disable`: Disable a filter. Filtrenin adını veya kimliğini girin + - `update`: Update filters + +## Changing the proxy server listen address in manual proxy mode + +By default, the proxy server listens on `127.0.0.1` — the address of the loopback network interface. +There are two ways to make the proxy server listen on a different interface: + +1. Run `adguard-cli config set listen_address
` where `
` is the address to listen on. +2. Yapılandırma dosyasını doğrudan düzenleyin: + - Yapılandırma dosyasının konumunu belirlemek için `adguard-cli config show | grep "Config location"` komutunu çalıştırın. + - Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`. + +If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured: + +- When running `adguard-cli config set listen_address
` where `
` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured. +- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values. diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md new file mode 100644 index 00000000000..810fae18437 --- /dev/null +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-linux/vpn-cli-interaction.md @@ -0,0 +1,16 @@ +--- +title: AdGuard VPN CLI etkileşimi +sidebar_position: 5 +--- + +## AdGuard VPN CLI etkileşimi + +Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. + +These are the two possible solutions: + +- Switch AdGuard CLI to **manual proxy mode**. + - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. +- Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. Bu durumda şunları akılda tutmak önemlidir: + - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. + - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-mac/adguard-for-mac.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-mac/adguard-for-mac.md index 4c61c8ab613..aa103e9003f 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-mac/adguard-for-mac.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-mac/adguard-for-mac.md @@ -9,7 +9,7 @@ Bu makale, cihazınızı sistem düzeyinde koruyan çok işlevli bir reklam enge ::: -## Özellikler +## Features Main features and settings available in AdGuard for Mac diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-mac/features/features.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-mac/features/features.md index 40ab14518e8..95649112a60 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-mac/features/features.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-mac/features/features.md @@ -1,5 +1,5 @@ --- -title: Özellikler +title: Features sidebar_position: 1 --- diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-safari/adguard-for-safari.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-safari/adguard-for-safari.md index b2b6096309a..3211869dd1f 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-safari/adguard-for-safari.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-safari/adguard-for-safari.md @@ -9,7 +9,7 @@ Bu makale, yalnızca Safari tarayıcınızı koruyan Safari için AdGuard hakkı ::: -## Özellikler +## Features Main features and settings available in AdGuard for Safari diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-safari/features/features.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-safari/features/features.md index 114ec05dc52..3b764876338 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-safari/features/features.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-safari/features/features.md @@ -1,5 +1,5 @@ --- -title: Özellikler +title: Features sidebar_position: 1 --- diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-windows/adguard-for-windows.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-windows/adguard-for-windows.md index b0dfef74ba8..19695d34a61 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-windows/adguard-for-windows.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-windows/adguard-for-windows.md @@ -9,7 +9,7 @@ Bu makale, cihazınızı sistem düzeyinde koruyan çok işlevli bir reklam enge ::: -## Özellikler +## Features Main features and settings available in AdGuard for Windows diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md index 39d98dd4fd8..3e2a4e09047 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-windows/admins-documentation.md @@ -7,9 +7,9 @@ Bu sayfada AdGuard'ın politika ve tercihlere ilişkin merkezi yönetiminin öze ## 1. MSI'ı indirin {#msi-download} -Download the [AdGuard MSI x86](https://static.adguard.com/windows/setup86.msi) +Download the [AdGuard MSI x86](https://agrd.io/adguard_setup86_msi) -Download the [AdGuard MSI x64](https://static.adguard.com/windows/setup64.msi) +Download the [AdGuard MSI x64](https://agrd.io/adguard_setup64_msi) ## 2. Ağınız için ayarları yapılandırın {#settings-configuring} diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-windows/features/features.md b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-windows/features/features.md index 7631b75d2a5..5edb4eea5cb 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-windows/features/features.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/adguard-for-windows/features/features.md @@ -1,5 +1,5 @@ --- -title: Özellikler +title: Features sidebar_position: 1 --- diff --git a/i18n/tr/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md b/i18n/tr/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md index e697ce1df18..de714956e1b 100644 --- a/i18n/tr/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md +++ b/i18n/tr/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md @@ -65,7 +65,7 @@ By default, such rules do not work for document requests. This means that the `| - `https://example.org/banner/img` -### Temel kural değiştiriciler {#basic-rule-modifiers} +### Temel kural değiştiriciler {#basic-rule-modifiers-examples} Filtreleme kuralları, kural davranışında ince ayar yapmanıza izin veren çok sayıda değiştiriciyi destekler. İşte bazı basit değiştiriciler içeren bir kural örneği. @@ -232,7 +232,7 @@ Safari Converter supports a substantial subset of [basic rules](#basic-rules) an - `$replace` - `$urltransform` -#### Kozmetik kuralları +#### Kozmetik kuralları {#cosmetic-rules-safari-limitations} Safari Converter supports most of the [cosmetic rules](#cosmetic-rules) although only element hiding rules with basic CSS selectors are supported natively via Safari Content Blocking, everything else needs to be interpreted by an additional extension. @@ -256,7 +256,7 @@ For scriptlet rules, it is **very important** that they are run as early as poss ::: -#### HTML filtreleme kuralları +#### HTML filtreleme kuralları {#html-filtering-rules-safari-limitations} [HTML filtering rules](#html-filtering-rules) are **not supported** and will not be supported in the future. Unfortunately, Safari does not provide necessary technical capabilities to implement them. @@ -396,8 +396,8 @@ The following modifiers are the most simple and frequently used. Temel olarak, s | [$match-case](#match-case-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$method](#method-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | | [$popup](#popup-modifier) | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ | ✅ [*[3]](#popup-modifier-limitations) | ✅ [*[3]](#popup-modifier-limitations) | ❌ | -| [$strict-first-party](#strict-first-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$strict-third-party](#strict-third-party-modifier) | ⏳ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-first-party](#strict-first-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$strict-third-party](#strict-third-party-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$third-party](#third-party-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | [$to](#to-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | @@ -405,7 +405,6 @@ The following modifiers are the most simple and frequently used. Temel olarak, s - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — uygulanması planlanan ancak henüz hiçbir üründe mevcut olmayan özellik - ❌ — not supported ::: @@ -579,7 +578,7 @@ Safari does not support the simultaneous use of allowed and disallowed domains, :::info Uyumluluk -Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with regular expressions in the `$domain` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.12 or later the `$domain` modifier can be alternatively spelled as `$from`. @@ -617,13 +616,14 @@ The modifier part, `":" h_value`, may be omitted. Bu durumda, değiştirici yaln :::dikkat Kısıtlamalar 1. The `$header` modifier can be matched only when headers are received. So if the request is blocked or redirected at an earlier stage, the modifier cannot be applied. -1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier), [`$important`](#important-modifier), and [`$badfilter`](#badfilter-modifier). + +1. In AdGuard Browser Extension, the `$header` modifier is only compatible with [`$csp`](#csp-modifier), [`$removeheader`](#removeheader-modifier) (response headers only), [`$important`](#important-modifier), [`$badfilter`](#badfilter-modifier), [`$domain`](#domain-modifier), [`$third-party`](#third-party-modifier), [`$match-case`](#match-case-modifier), and [content-type modifiers](#content-type-modifiers) such as [`$script`](#script-modifier) and [`$stylesheet`](#stylesheet-modifier). The rules with other modifiers are considered invalid and will be discarded. ::: :::info Uyumluluk -Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +Rules with the `$header` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -682,7 +682,7 @@ Rules with mixed negated and not negated values are considered invalid. So, for :::info Uyumluluk -Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. +Rules with `$method` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension for Chrome, Firefox, and Edge with [TSUrlFilter][] v2.1.1 or later. ::: @@ -701,7 +701,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki 1. The `$popup` modifier works best in AdGuard Browser Extension for Chromium-based browsers and Firefox. 1. In [AdGuard for Chrome MV3][ext-mv3] rules with the [`$popup`][popup-in-mv3] modifier would not work, so we disable converting them to declarative rules. We will try to use them only in our [TSUrlFilter][] engine and close new tabs programmatically. 1. In AdGuard for iOS and AdGuard for Safari, `$popup` rules simply block the page right away. -1. In AdGuard for Windows, AdGuard for Mac, and AdGuard for Android, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Sayfanın kendisinin engellenmesi bazı kontroller yapabilir ve eğer gerçekten bir açılır pencere ise pencereyi kapatabilir. Aksi takdirde, sayfa yüklenmelidir. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. +1. In AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux, the `$popup` modifier may not detect a popup in some cases and it will not be blocked. The `$popup` modifier applies the `document` content type with a special flag which is passed to a blocking page. Sayfanın kendisinin engellenmesi bazı kontroller yapabilir ve eğer gerçekten bir açılır pencere ise pencereyi kapatabilir. Aksi takdirde, sayfa yüklenmelidir. It can be combined with other request type modifiers, such as `$third-party`, `$strict-third-party`, `$strict-first-party`, and `$important`. ::: @@ -727,7 +727,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Uyumluluk -Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -747,7 +747,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st :::info Uyumluluk -Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.16 or later. +Rules with the `$strict-third-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.16 or later. ::: @@ -800,7 +800,7 @@ Tam değiştirici adını kullanmak yerine daha kısa bir ad (takma ad) kullanab :::info Uyumluluk -Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. +Rules with the `$to` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later, and AdGuard Browser Extension with [TSUrlFilter][] v2.1.3 or later. ::: @@ -1129,7 +1129,7 @@ $extension="userscript name\, with \"quote\"" :::info Uyumluluk - Only AdGuard for Windows, Mac, Android are technically capable of using rules with `$extension` modifier. -- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.13 or later. +- Rules with `$extension` modifier with specific userscript name are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.13 or later. ::: @@ -1209,7 +1209,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::info Uyumluluk - Tracking protection (formerly Stealth Mode) is available in AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard Browser Extension for Firefox and Chromium-based browsers, except AdGuard for Chrome MV3. All other products will ignore the rules with `$stealth` modifier. -- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with `$stealth` modifier with specific options are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -1326,37 +1326,36 @@ These modifiers are able to completely change the behavior of basic rules. -| Değiştirici \ Ürünler | [CoreLibs uygulamaları][cl-apps] | [Chromium için AdGuard][ext-chr] | [Chrome MV3 için AdGuard][ext-mv3] | [Firefox için AdGuard][ext-ff] | [iOS için AdGuard][ios-app] | [Safari için AdGuard][ext-saf] | [AdGuard İçerik Engelleyici][and-cb] | -| ------------------------------------------- |:-------------------------------------------:|:--------------------------------:|:-------------------------------------------:|:-------------------------------------------:|:---------------------------:|:------------------------------:|:------------------------------------:| -| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | -| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | -| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ⏳ | ❌ | ❌ | ❌ | ❌ | -| [$removeheader](#removeheader-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | -| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | -| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | -| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | -| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| Değiştirici \ Ürünler | [CoreLibs uygulamaları][cl-apps] | [Chromium için AdGuard][ext-chr] | [Chrome MV3 için AdGuard][ext-mv3] | [Firefox için AdGuard][ext-ff] | [iOS için AdGuard][ios-app] | [Safari için AdGuard][ext-saf] | [AdGuard İçerik Engelleyici][and-cb] | +| ------------------------------------------- |:-------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:--------------------------------------------:|:---------------------------:|:------------------------------:|:------------------------------------:| +| [$all](#all-modifier) | ✅ | ✅ | ✅ [*[1]](#all-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$badfilter](#badfilter-modifier) | ✅ | ✅ | ✅ [*[2]](#badfilter-modifier-limitations) | ✅ | ✅ | ✅ | ❌ | +| [$cookie](#cookie-modifier) | ✅ | ✅ | ✅ [*[3]](#cookie-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$csp](#csp-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$hls](#hls-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$inline-font](#inline-font-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$inline-script](#inline-script-modifier) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$jsonprune](#jsonprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$xmlprune](#xmlprune-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$network](#network-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$permissions](#permissions-modifier) | ✅ [*[4]](#permissions-modifier-limitations) | ✅ | ✅ | ✅ [*[4]](#permissions-modifier-limitations) | ❌ | ❌ | ❌ | +| [$redirect](#redirect-modifier) | ✅ | ✅ | ✅ [*[5]](#redirect-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$redirect-rule](#redirect-rule-modifier) | ✅ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$referrerpolicy](#referrerpolicy-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [$removeheader](#removeheader-modifier) | ✅ | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ✅ [*[7]](#removeheader-modifier-limitations) | ❌ | ❌ | ❌ | +| [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ | +| [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | +| [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | +| [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | +| [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | :::not - ✅ — fully supported - ✅ * — supported, but reliability may vary or limitations may occur; check the modifier description for more details -- ⏳ — uygulanması planlanan ancak henüz hiçbir üründe mevcut olmayan özellik -- ❌ — desteklenmiyor -- 👎 — kullanımdan kaldırıldı; hâlâ destekleniyor ancak gelecekte kaldırılacaktır +- ❌ — not supported +- 👎 — deprecated; still supported but will be removed in the future ::: @@ -1670,7 +1669,7 @@ preroll.ts :::info Uyumluluk -Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$hls` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -1915,7 +1914,7 @@ In AdGuard for Windows, Mac and Android with [CoreLibs][] v1.11 or later, JSONPa :::info Uyumluluk -Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.10 or later. +Rules with the `$jsonprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.10 or later. ::: @@ -2153,7 +2152,7 @@ When multiple `$xmlprune` rules match the same request, they are applied in lexi :::info Uyumluluk -Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$xmlprune` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2251,8 +2250,8 @@ Firefox, `Permissions-Policy` başlığını yok sayar. Daha fazla bilgi için [ :::info Uyumluluk -- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. -- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Rules with the `$permissions` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. +- Pipe separator `|` instead of escaped comma is supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.14 or later, and AdGuard Browser Extension with [TSUrlFilter][] v3.0.0 or later. ::: @@ -2341,7 +2340,7 @@ If a request matches multiple `$referrerpolicy` rules not disabled by exceptions :::info Uyumluluk -Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.12 or later. +Rules with the `$referrerpolicy` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.12 or later. ::: @@ -2389,6 +2388,74 @@ In case of multiple `$removeheader` rules matching a single request, we will app @@||example.org/path/$removeheader ``` +##### `$removeheader` modifier limitations {#removeheader-modifier-limitations} + +:::caution Limitations + +[AdGuard for Chrome MV3][ext-mv3] has some limitations: + +- Negation and allowlist rules are not supported. +- Benzer `$removeheader` kurallar grubu tek bir bildirimsel kuralda birleştirilecektir. Örneğin: + + ```bash + ||testcases.adguard.com$xmlhttprequest,removeheader=p1case1 + ||testcases.adguard.com$xmlhttprequest,removeheader=P2Case1 + $xmlhttprequest,removeheader=p1case2 + $xmlhttprequest,removeheader=P2case2 + ``` + + is converted to + + ```bash + [ + { + "id": 1, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case1", + "operation": "remove" + }, + { + "header": "P2Case1", + "operation": "remove" + }, + ] + }, + "condition": { + "urlFilter": "||testcases.adguard.com", + "resourceTypes": [ + "xmlhttprequest" + ] + } + }, + { + "id": 2, + "action": { + "type": "modifyHeaders", + "responseHeaders": [ + { + "header": "p1case2", + "operation": "remove" + }, + { + "header": "P2case2", + "operation": "remove" + } + ] + }, + "condition": { + "resourceTypes": [ + "xmlhttprequest" + ] + } + } + ] + ``` + +::: + :::dikkat Kısıtlamalar This type of rules can only be used [**in trusted filters**](#trusted-filters). @@ -2465,7 +2532,7 @@ Rules with `$removeparam` modifier are intended to strip query parameters from r **Söz dizimi** -**Temel söz dizimi** +**Basic syntax** - `$removeparam=param` removes query parameter with the name `param` from URLs of any request, e.g. a request to `http://example.com/page?param=1&another=2` will be transformed into `http://example.com/page?another=2`. @@ -2477,17 +2544,17 @@ You can also use regular expressions to match query parameters and/or their valu **Escaping special characters** -URL metnini doğru şekilde eşleştirmek için özel karakterler bir kuralda URL olarak kodlanmalıdır. +Special characters should be URL-encoded in a rule to correctly match the URL text. -Örneğin, `?$param=true` kuralını kaldırmak için `$removeparam=%24parama` kuralını kullanmalısınız. +For example, to remove `?$param=true`, you should use the `$removeparam=%24param` rule. :::not -Boşluklar ve virgüller de URL ile kodlanmalıdır, aksi takdirde kural URL ile eşleşmez. Ancak, `.`, `-`, `_` ve `~` URL kodlamasında ayrılmış karakterler olarak işaretlenmedikleri için oldukları gibi kullanılmalıdır. +Spaces and commas should also be URL-encoded, otherwise the rule won't match the URL. However, `.`, `-`, `_`, and `~` should be used as they are, since they are not marked as reserved characters in URL encoding. ::: -Remember to escape special characters like `.` in the regular expressions. Bunu yapmak için `\` karakterini kullanın. Örneğin, kaçan bir nokta şu şekilde görünmelidir: `\.`. +Remember to escape special characters like `.` in the regular expressions. Use the `\` character to do this. For example, an escaped dot should look like this: `\.`. :::not @@ -2510,7 +2577,7 @@ Use `~` to apply inversion: :::not -Eğer `~` kuralın başında yer almıyorsa, metin içinde bir sembol olarak değerlendirilir. +If `~` does not appear at the beginning of the rule, it is treated as a symbol in the text. ::: @@ -2646,7 +2713,7 @@ With these rules, specified UTM parameters will be removed from any request save :::info Uyumluluk -- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. +- Rules with `$removeparam` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.7 or later, and AdGuard Browser Extension v3.6 or later. - `$removeparam` syntax for regular expressions is supported AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.8 or later, and AdGuard Browser Extension v4.0 or later. - `POST` request types are supported only by AdGuard for Windows, Mac, and Android with [CoreLibs][] v1.10 or later, and AdGuard Browser Extension with [TSWebExtension][] v0.4.6 or later. @@ -2658,7 +2725,7 @@ This modifier completely changes the rule behavior. If it is applied, the rule w You will need some knowledge of regular expressions to use `$replace` modifier. -**Özellikler** +**Features** - `$replace` rules apply to any text response, but will not apply to binary (`media`, `image`, `object`, etc.). - `$replace` rules do not apply if the size of the original response is more than 10 MB. @@ -2666,7 +2733,7 @@ You will need some knowledge of regular expressions to use `$replace` modifier. - Document-level exception rules with `$content` or `$document` modifiers do disable `$replace` rules for requests matching them. - Other document-level exception rules (`$generichide`, `$elemhide` or `$jsinject` modifiers) are applied alongside `$replace` rules. It means that you can modify the page content with a `$replace` rule and disable cosmetic rules there at the same time. -`$replace` value can be empty in the case of exception rules. Daha fazla bilgi için örnekler bölümüne bakın. +`$replace` value can be empty in the case of exception rules. See examples section for further information. **Multiple rules matching a single request** @@ -2692,7 +2759,7 @@ In the `$replace` value, two characters must be escaped: comma `,` and dollar si ||example.org^$replace=/()[\s\S]*<\/VAST>/\$1<\/VAST>/i ``` -Bu kuralın üç bölümü vardır: +There are three parts in this rule: - `regexp` — `()(.|\s)*<\/VAST>`; - `replacement` — `\$1<\/VAST>` where `$` is escaped; @@ -2730,7 +2797,7 @@ Rules with `$replace` modifier are supported by AdGuard for Windows, AdGuard for The `$urltransform` rules allow you to modify the request URL by replacing text matched by a regular expression. -**Özellikler** +**Features** - `$urltransform` rules normally only apply to the path and query parts of the URL, see below for one exception. - `$urltransform` will not be applied if the original URL is blocked by other rules. @@ -2760,7 +2827,7 @@ In the `$urltransform` value, two characters must be escaped: the comma `,` and :::info Uyumluluk -This section only applies to AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.17 or later. +This section only applies to AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.17 or later. ::: @@ -2772,7 +2839,7 @@ As stated above, normally `$urltransform` rules are only allowed to change the p ||example.org^$urltransform=/(pref\/).*\/(suf)/\$1\$2/i ``` -Bu kuralın üç bölümü vardır: +There are three parts in this rule: - `regexp` — `(pref\/).*\/(suf)`; - `replacement` — `\$1\$2` where `$` is escaped; @@ -2807,6 +2874,28 @@ the request to `https://example.com/firstpath` will be blocked. `$urltransform` rules can also be disabled by `$document` and `$urlblock` exception rules. But basic exception rules without modifiers do not do that. For example, `@@||example.com^` will not disable `$urltransform=/X/Y/` for requests to **example.com**, but `@@||example.com^$urlblock` will. +**The rule example for cleaning affiliate links** + +Many websites use tracking URLs to monitor clicks before redirecting to the actual destination. These URLs contain marketing parameters and analytics tokens that can be removed to improve privacy. + +Below is an example of how to obtain the clean destination link to bypass tracking websites and go directly to the destination. + +In our example: + + 1. The initial URL (with click tracking): `https://www.aff.example.com/visit?url=https%3A%2F%2Fwww.somestore.com%2F%26referrer%3Dhttps%3A%2F%2Fwww.aff.example.com%2F%26ref%3Dref-123` + 1. Tracking URL after decoding special characters: `https://www.aff.example.com/visit?url=https://www.somestore.com/` + 1. The website you want to visit: `https://www.somestore.com` + +To clean the URL, we first need to decode special characters (like `%3A` → `:`, `%2F` → `/`, etc.) and extract the real URL from the tracking parameters. We will use the `$urltransform` modifier to do this. The following 4 rules replace URL-encoded symbols with their real characters: + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3A/:/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%2F/\//` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3F/?/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%3D/=/` `/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/%26/&/` + +After that, we need to write the rule that will block the tracking website and redirect you directly to the target address (somestore.com): + +`/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com\/visit\?url=/$urltransform=/^https?:\/\/(?:[a-z0-9-]+\.)*?aff\.example\.com.*url=([^&]*).*/\$1/` + +Tracking links will now be automatically cleaned up, allowing direct navigation to the destination website without tracking. + :::dikkat Kısıtlamalar Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). @@ -2815,7 +2904,7 @@ Rules with the `$urltransform` modifier can only be used [**in trusted filters** :::info Uyumluluk -Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs][] v1.15 or later. +Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with [CoreLibs][] v1.15 or later. ::: @@ -2949,7 +3038,7 @@ All valid content types: - [`$websocket`](#websocket-modifier), - [`$xmlhttprequest`](#xmlhttprequest-modifier); -Bu, tüm içerik türlerini dolaylı olarak ekleyen kuralları da içerir: +This also includes rules that implicitly add all content types: - [`$all`](#all-modifier); @@ -3012,7 +3101,7 @@ Each of which adds `10^3` to rule priority. - [`$specifichide`](#specifichide-modifier), - [`$urlblock`](#urlblock-modifier); -Bunların her biri önceliğe `10^4` ekler. +Each of which adds `10^4` to the priority. As well as exception with [`$document modifier`](#document-modifier): because it's an alias for `$elemhide,content,jsinject,urlblock,extension`. It will add `10^4` for each modifier from [the top list](#priority-category-4), `10^4 * 5` in total. @@ -3122,7 +3211,7 @@ If you want to limit the rule application area to certain domains, just enter th This rule will be also applied to all subdomains of `example.org` and `example.com`. -If you want the rule not to be applied to certain domains, start a domain name with `~` sign. Örneğin: `~example.org##selector`. +If you want the rule not to be applied to certain domains, start a domain name with `~` sign. For example: `~example.org##selector`. You can use both approaches in a single rule. For example, `example.org,~subdomain.example.org##domain` will work for `example.org` and all subdomains, **except `subdomain.example.org`**. @@ -3195,7 +3284,7 @@ example.com#$#body { background-color: #333!important; } This rule will apply a style `background-color: #333!important;` to the `body` element at `example.com` and all subdomains. -**İstisnalar** +**Exceptions** Just like with element hiding, there is a type of rules that disable the selected CSS style rule for particular domains. Exception rule syntax is almost the same, you just have to change `#$#` to `#@$#`. @@ -3247,7 +3336,7 @@ CSS 3.0 is not always enough to block ads. To solve this problem AdGuard extends The idea of extended capabilities is an opportunity to match DOM elements with selectors based on their own representation (style, text content, etc.) or relations with other elements. There is also an opportunity to apply styles with non-standard CSS properties. -**Uygulama alanı** +**Application area** Extended selectors can be used in any cosmetic rule, whether they are [element hiding rules](#cosmetic-elemhide-rules) or [CSS rules](#cosmetic-css-rules). @@ -3700,7 +3789,7 @@ The `:nth-ancestor()` pseudo-class allows to lookup the *nth* ancestor relative subject:nth-ancestor(n) ``` -- `subject` — gerekli, standart veya genişletilmiş CSS seçici +- `subject` — required, standard or extended CSS selector - `n` — required, number >= 1 and < 256, distance to the needed ancestor from the element selected by `subject` **Söz dizimi** @@ -3709,7 +3798,7 @@ subject:nth-ancestor(n) subject:nth-ancestor(n) ``` -- `subject` — gerekli, standart veya genişletilmiş CSS seçici +- `subject` — required, standard or extended CSS selector - `n` — required, number >= 1 and < 256, distance to the needed ancestor from the element selected by `subject` ##### `:nth-ancestor()` limitations {#extended-css-nth-ancestor-limitations} @@ -3747,7 +3836,7 @@ The `:upward()` pseudo-class allows to lookup the ancestor relative to the previ subject:upward(ancestor) ``` -- `subject` — gerekli, standart veya genişletilmiş CSS seçici +- `subject` — required, standard or extended CSS selector - `ancestor` — required, specification for the ancestor of the element selected by `subject`, can be set as: - *number* >= 1 and < 256 for distance to the needed ancestor, same as [`:nth-ancestor()`](#extended-css-nth-ancestor) - *standard CSS selector* for matching closest ancestor @@ -3952,7 +4041,7 @@ pseudoClasses = pseudoClass *pseudoClass ### Örnekler -**HTML kodu:** +**HTML code:** ```html @@ -3982,7 +4071,7 @@ This is the most frequently used special attribute. It limits selection with tho You must use `""` to escape `"`, for instance: `$$script[tag-content="alert(""this is ad"")"]` -Örneğin, şu HTML koduna bir göz atın: +For example, take a look at this HTML code: ```html