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

* : merge with master

Browse Source
This commit is contained in:
Andrey Meshkov
2020-09-09 14:35:11 +03:00
parent b04e12e189 ccb903c9a0
commit e781ff0cae
38 changed files with 1194 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
client/src/components/Settings/Dns/Upstream/Examples.js
View File

@@ -63,6 +63,27 @@ const Examples = (props) => (
</Trans>
</span>
</li>
<li>
<code>quic://dns-unfiltered.adguard.com:784</code> –&nbsp;
<span>
<Trans
components={[
<a
href="https://tools.ietf.org/html/draft-huitema-quic-dnsoquic-07"
target="_blank"
rel="noopener noreferrer"
key="0"
>
DNS-over-QUIC
</a>,
]}
>
example_upstream_doq
</Trans>
&nbsp;
<span className="text-lowercase">(<Trans>experimental</Trans>)</span>
</span>
</li>
<li>
<code>tcp://9.9.9.9</code> – <Trans>example_upstream_tcp</Trans>
</li>

2
client/src/components/Settings/Dns/Upstream/index.js
View File

@@ -32,7 +32,7 @@ const Upstream = () => {
dispatch(setDnsConfig(dnsConfig));
};
const upstreamDns = upstream_dns_file ? t('configured_in', { path: upstream_dns_file }) : upstream_dns;
const upstreamDns = upstream_dns_file ? t('upstream_dns_configured_in_file', { path: upstream_dns_file }) : upstream_dns;
return <Card
title={t('upstream_dns')}