daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge: * (home): update locales

Browse Source 
Merge in DNS/adguard-home from update_locales to master

Squashed commit of the following:

commit 2650ebe94614e986a02ca66aab0cca9f6b618eda
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Oct 12 19:14:05 2020 +0300

    Rename MacOs to macOs in setup_dns_privacy_4 string

commit c6d8b49be0bfd13f48b4a5a40323bcaed33a9cab
Author: Andrey Meshkov <am@adguard.com>
Date:   Mon Oct 12 18:41:23 2020 +0300

    Update locales

commit 850e87fcc9a40c6560a744363394fe8db351549b
Merge: 5dd23ebe 56e7b2f6
Author: Andrey Meshkov <am@adguard.com>
Date:   Mon Oct 12 18:27:38 2020 +0300

    fix filters string

commit 5dd23ebe06809f73760b0b54bae78659e6581837
Author: Andrey Meshkov <am@adguard.com>
Date:   Mon Oct 12 17:46:26 2020 +0300

    Update translations

commit 03bf548da40fa7881c26a16f8e7f5793a0d970af
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Oct 12 11:48:42 2020 +0300

    Update link in filters_block_toggle_hint locale

commit 4372229c8c6f61c6efa1322866c4bbce73e29acd
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Oct 9 13:25:15 2020 +0300

    Update locales

commit 7c9361fe294f4cb691798b39583e25b8f4e3879e
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Oct 8 17:59:04 2020 +0300

    Update locales

commit 4b36ba65815b311b81c94cb9b6c4890cc8517780
Merge: 0b9adc88 b97f6b3f
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Oct 8 17:37:45 2020 +0300

    Merge branch 'fix/2159' into update_locales

commit 0b9adc88ac7cc0612712d2095a116e0bec48f5bb
Merge: 1a3d98d3 51819408
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Oct 8 17:37:26 2020 +0300

    Merge branch 'update_locales' of ssh://bit.adguard.com:7999/dns/adguard-home into update_locales

commit b97f6b3f265c4ec8d55e60ef52c316b510e19aa0
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Oct 8 16:35:16 2020 +0300

    Update CheckboxField props

commit 8c4545fc554749d7aaa836cc496b2026073dfc39
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Oct 8 16:27:17 2020 +0300

    - client: 2159 Fix general settings link to filters

commit 518194088aaa9be40b2b43a2fa3097273d3ecfd8
Author: Andrey Meshkov <am@adguard.com>
Date:   Thu Oct 8 12:10:58 2020 +0300

    * (home): update locales
This commit is contained in:
Andrey Meshkov
2020-10-12 19:28:12 +03:00
parent 56e7b2f6b3
commit 3a96fdd01b
33 changed files with 710 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/__locales/en.json
View File

@@ -418,7 +418,7 @@
"setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Use <1>{{address}}</1> string.",
"setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Use <1>{{address}}</1> string.",
"setup_dns_privacy_3": "<0>Here's a list of software you can use.</0>",
"setup_dns_privacy_4": "On an iOS 14 or MacOS Big Sur device you can download special '.mobileconfig' file that adds <highlight>DNS-over-HTTPS</highlight> or <highlight>DNS-over-TLS</highlight> servers to the DNS settings.",
"setup_dns_privacy_4": "On an iOS 14 or macOS Big Sur device you can download special '.mobileconfig' file that adds <highlight>DNS-over-HTTPS</highlight> or <highlight>DNS-over-TLS</highlight> servers to the DNS settings.",
"setup_dns_privacy_android_1": "Android 9 supports DNS-over-TLS natively. To configure it, go to Settings → Network & internet → Advanced → Private DNS and enter your domain name there.",
"setup_dns_privacy_android_2": "<0>AdGuard for Android</0> supports <1>DNS-over-HTTPS</1> and <1>DNS-over-TLS</1>.",
"setup_dns_privacy_android_3": "<0>Intra</0> adds <1>DNS-over-HTTPS</1> support to Android.",
@@ -587,4 +587,4 @@
"adg_will_drop_dns_queries": "AdGuard Home will be dropping all DNS queries from this client.",
"client_not_in_allowed_clients": "The client is not allowed because it is not in the \"Allowed clients\" list.",
"experimental": "Experimental"
}
}