Skip to content

Commit

Permalink
Merge pull request #485 from AdguardTeam/update-translations
Browse files Browse the repository at this point in the history
Update translations
  • Loading branch information
el-termikael authored May 27, 2024
2 parents 01c7465 + 94afb0d commit b9e1ade
Show file tree
Hide file tree
Showing 491 changed files with 7,179 additions and 3,882 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,20 @@ Servers differ by their speed, employed protocol, trustworthiness, logging polic

In addition, at the bottom of the screen there is an option to add a custom DNS server. It supports regular, DNSCrypt, DNS-over-HTTPS, DNS-over-TLS, and DNS-over-QUIC servers.

#### HTTP basic authentication for DNS-over-HTTPS

This feature brings the authentication capabilities of the HTTP protocol to DNS, which does not have built-in authentication. Authentication in DNS is useful if you want to restrict access to your custom DNS server to specific users.

To enable this feature:

1. In AdGuard DNS, go to _Server settings__Devices__Settings_ and change the DNS server to the one with authentication. Clicking _Deny other protocols_ will remove other protocol usage options, leaving only DNS-over-HTTPS authentication enabled and preventing its use by third parties. Copy the generated address.

![DNS-over-HTTPS with authentication](https://cdn.adtidy.org/content/release_notes/dns/v2-7/http-auth/http-auth-en.png)

1. In AdGuard for iOS, go to the _Protection tab__DNS protection__DNS server_ and paste the generated address into the _Add a custom DNS server_ field. Save and select the new configuration.

To check if everything is set up correctly, visit our [diagnostics page](https://adguard.com/en/test.html).

### Network settings {#network-settings}

![Network settings screen \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/network_settings_en.jpeg)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -955,7 +955,7 @@ The list of the available modifier options:

:::note

Blocking cookies and removing tracking parameters is achieved by using rules with [`$cookie`](#cookie-modifier) and [`$removeparam`](#removeparam-modifier) modifiers. Exception rules with only `$stealth` modifier will not do those things. If you want to completely disable all Stealth Mode features for a given domain, you need to include all three modifiers: `@@||example.org^$stealth,removeparam,cookie`
Blocking cookies and removing tracking parameters is achieved by using rules with the [`$cookie`](#cookie-modifier), [`$urltransform`](#urltransform-modifier) and [`$removeparam`](#removeparam-modifier) modifiers. Exception rules that contain only the `$stealth` modifier will not do these things. If you want to completely disable all Stealth mode features for a given domain, you must include all three modifiers: `@@||example.org^$stealth,removeparam,cookie`.

:::

Expand Down Expand Up @@ -1092,6 +1092,7 @@ These modifiers are able to completely change the behavior of basic rules.
| [$removeheader](#removeheader-modifier) |||||||
| [$removeparam](#removeparam-modifier) |||||||
| [$replace](#replace-modifier) |||||||
| [$urltransform](#urltransform-modifier) |||||||
| [noop](#noop-modifier) |||||||
| [$empty 👎](#empty-modifier "deprecated") |||||||
| [$mp4 👎](#mp4-modifier "deprecated") |||||||
Expand Down Expand Up @@ -2101,6 +2102,99 @@ Rules with `$replace` modifier are supported by AdGuard for Windows, Mac, and An

:::

#### **`urltransform`** {#urltransform-modifier}

The `$urltransform` rules allow you to modify the request URL by replacing the text matched by the regular expression.

**Features**

- `$urltransform` rules apply to any request URL text.
- `$urltransform` rules can also **modify the query part** of the URL.
- `$urltransform` will not be applied if the original URL is blocked by other rules.
- `$urltransform` will be applied before `$removeparam` rules.

The `$urltransform` value can be empty for exception rules.

**Multiple rules matching a single request**

If multiple `$urltransform` rules match a single request, we will apply each of them. **The order is defined alphabetically.**

**Syntax**

`$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`** — 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.

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: `\,`.

**Examples**

```adblock
||example.org^$urltransform=/(pref\/).*\/(suf)/\$1\$2/i
```

There are three parts in this rule:

- `regexp``(pref\/).*\/(suf)`;
- `replacement``\$1\$2` where `$` is escaped;
- `modifiers``i` for insensitive search.

**Multiple `$urltransform` rules**

1. `||example.org^$urltransform=/X/Y/`
2. `||example.org^$urltransform=/Z/Y/`
3. `@@||example.org/page/*$urltransform=/Z/Y/`

- 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**

If the `$urltransform` rule is applied to a request, all the rules will be re-evaluated against the new URL.

E.g., with the following rules:

```adblock
||example.com^$urltransform=/firstpath/secondpath/
||example.com/secondpath^
```

the request to `https://example.com/firstpath` will be blocked before it is sent.

However, `$urltransform` rules will **not be re-applied** in this case to avoid infinite recursion, e.g., with the following rules:

```adblock
||example.com/firstpath^$urltransform=/firstpath/secondpath/
||example.com/secondpath^$urltransform=/secondpath/firstpath/
```

the request to `https://example.com/fisrtpath` will be transformed to `https://example.com/secondpath` and the second rule will not be applied.

**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.

:::caution Restrictions

Rules with the `$urltransform` modifier can be used [**only in trusted filters**](#trusted-filters).

:::

:::info Compatibility

Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android **with CoreLibs version 1.15 or higher**.

:::

#### **`noop`** {#noop-modifier}

`noop` modifier does nothing and can be used solely to increase rules' readability. It consists of a sequence of underscore characters (`_`) of any length and can appear in a rule as many times as needed.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ The goal of ad-blocking filters is to block all types of advertising on websites
- Interstitial ads — full-screen ads on mobile devices that cover the interface of the app or web browser
- Ads leftovers that occupy large spaces or stand out against the background and attract visitors' attention (except barely discernible or unnoticeable ones)
- Anti-adblock advertising — alternative advertising displayed on the site when the main one is blocked
- Bait elements that are used by multiple known adblock detection scripts to detect an ad blocker presence for different goals including changing the way ads are shown, fingerprinting, etc.
- Site’s own advertising, if it has been blocked by general filtering rules (see *Limitations and exceptions*)
- Anti-adblock scripts that prevent site usage (see *Limitations and exceptions*)
- Advertising injected by malware, if detailed information about its loading method or steps for reproduction is provided
Expand Down Expand Up @@ -113,6 +114,7 @@ What it blocks:
- Tracking cookies
- Tracking pixels
- Tracking APIs of browsers
- Detection of the ad blocker for tracking purposes
- Privacy Sandbox functionality in Google Chrome and its forks used for tracking (Google Topics API, the Protected Audience API)

The **URL Tracking filter** is designed to remove tracking parameters from web addresses
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,20 @@ Servers differ by their speed, employed protocol, trustworthiness, logging polic

In addition, at the bottom of the screen there is an option to add a custom DNS server. It supports regular, DNSCrypt, DNS-over-HTTPS, DNS-over-TLS, and DNS-over-QUIC servers.

#### HTTP basic authentication for DNS-over-HTTPS

This feature brings the authentication capabilities of the HTTP protocol to DNS, which does not have built-in authentication. Authentication in DNS is useful if you want to restrict access to your custom DNS server to specific users.

To enable this feature:

1. In AdGuard DNS, go to _Server settings__Devices__Settings_ and change the DNS server to the one with authentication. Clicking _Deny other protocols_ will remove other protocol usage options, leaving only DNS-over-HTTPS authentication enabled and preventing its use by third parties. Copy the generated address.

![DNS-over-HTTPS with authentication](https://cdn.adtidy.org/content/release_notes/dns/v2-7/http-auth/http-auth-en.png)

1. In AdGuard for iOS, go to the _Protection tab__DNS protection__DNS server_ and paste the generated address into the _Add a custom DNS server_ field. Save and select the new configuration.

To check if everything is set up correctly, visit our [diagnostics page](https://adguard.com/en/test.html).

### Network settings {#network-settings}

![Network settings screen \*mobile\_border](https://cdn.adtidy.org/public/Adguard/kb/iOS/features/network_settings_en.jpeg)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -955,7 +955,7 @@ The list of the available modifier options:

:::note

Blocking cookies and removing tracking parameters is achieved by using rules with [`$cookie`](#cookie-modifier) and [`$removeparam`](#removeparam-modifier) modifiers. Exception rules with only `$stealth` modifier will not do those things. If you want to completely disable all Stealth Mode features for a given domain, you need to include all three modifiers: `@@||example.org^$stealth,removeparam,cookie`
Blocking cookies and removing tracking parameters is achieved by using rules with the [`$cookie`](#cookie-modifier), [`$urltransform`](#urltransform-modifier) and [`$removeparam`](#removeparam-modifier) modifiers. Exception rules that contain only the `$stealth` modifier will not do these things. If you want to completely disable all Stealth mode features for a given domain, you must include all three modifiers: `@@||example.org^$stealth,removeparam,cookie`.

:::

Expand Down Expand Up @@ -1092,6 +1092,7 @@ These modifiers are able to completely change the behavior of basic rules.
| [$removeheader](#removeheader-modifier) |||||||
| [$removeparam](#removeparam-modifier) |||||||
| [$replace](#replace-modifier) |||||||
| [$urltransform](#urltransform-modifier) |||||||
| [noop](#noop-modifier) |||||||
| [$empty 👎](#empty-modifier "deprecated") |||||||
| [$mp4 👎](#mp4-modifier "deprecated") |||||||
Expand Down Expand Up @@ -2101,6 +2102,99 @@ Rules with `$replace` modifier are supported by AdGuard for Windows, Mac, and An

:::

#### **`urltransform`** {#urltransform-modifier}

The `$urltransform` rules allow you to modify the request URL by replacing the text matched by the regular expression.

**Features**

- `$urltransform` rules apply to any request URL text.
- `$urltransform` rules can also **modify the query part** of the URL.
- `$urltransform` will not be applied if the original URL is blocked by other rules.
- `$urltransform` will be applied before `$removeparam` rules.

The `$urltransform` value can be empty for exception rules.

**Multiple rules matching a single request**

If multiple `$urltransform` rules match a single request, we will apply each of them. **The order is defined alphabetically.**

**Syntax**

`$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`** — 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.

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: `\,`.

**Examples**

```adblock
||example.org^$urltransform=/(pref\/).*\/(suf)/\$1\$2/i
```

There are three parts in this rule:

- `regexp``(pref\/).*\/(suf)`;
- `replacement``\$1\$2` where `$` is escaped;
- `modifiers``i` for insensitive search.

**Multiple `$urltransform` rules**

1. `||example.org^$urltransform=/X/Y/`
2. `||example.org^$urltransform=/Z/Y/`
3. `@@||example.org/page/*$urltransform=/Z/Y/`

- 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**

If the `$urltransform` rule is applied to a request, all the rules will be re-evaluated against the new URL.

E.g., with the following rules:

```adblock
||example.com^$urltransform=/firstpath/secondpath/
||example.com/secondpath^
```

the request to `https://example.com/firstpath` will be blocked before it is sent.

However, `$urltransform` rules will **not be re-applied** in this case to avoid infinite recursion, e.g., with the following rules:

```adblock
||example.com/firstpath^$urltransform=/firstpath/secondpath/
||example.com/secondpath^$urltransform=/secondpath/firstpath/
```

the request to `https://example.com/fisrtpath` will be transformed to `https://example.com/secondpath` and the second rule will not be applied.

**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.

:::caution Restrictions

Rules with the `$urltransform` modifier can be used [**only in trusted filters**](#trusted-filters).

:::

:::info Compatibility

Rules with the `$urltransform` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android **with CoreLibs version 1.15 or higher**.

:::

#### **`noop`** {#noop-modifier}

`noop` modifier does nothing and can be used solely to increase rules' readability. It consists of a sequence of underscore characters (`_`) of any length and can appear in a rule as many times as needed.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ The goal of ad-blocking filters is to block all types of advertising on websites
- Interstitial ads — full-screen ads on mobile devices that cover the interface of the app or web browser
- Ads leftovers that occupy large spaces or stand out against the background and attract visitors' attention (except barely discernible or unnoticeable ones)
- Anti-adblock advertising — alternative advertising displayed on the site when the main one is blocked
- Bait elements that are used by multiple known adblock detection scripts to detect an ad blocker presence for different goals including changing the way ads are shown, fingerprinting, etc.
- Site’s own advertising, if it has been blocked by general filtering rules (see *Limitations and exceptions*)
- Anti-adblock scripts that prevent site usage (see *Limitations and exceptions*)
- Advertising injected by malware, if detailed information about its loading method or steps for reproduction is provided
Expand Down Expand Up @@ -113,6 +114,7 @@ What it blocks:
- Tracking cookies
- Tracking pixels
- Tracking APIs of browsers
- Detection of the ad blocker for tracking purposes
- Privacy Sandbox functionality in Google Chrome and its forks used for tracking (Google Topics API, the Protected Audience API)

The **URL Tracking filter** is designed to remove tracking parameters from web addresses
Expand Down
Loading

0 comments on commit b9e1ade

Please sign in to comment.