docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "facebook_social_plugins": {
<mask> "name": "Facebook Social Plugins",
<mask> "categoryId": 7,
<mask> "url": "https://developers.facebook.com/plugins",
<mask> "companyId": "facebook"
<mask> },
<mask> "facetz.dca": {
<mask> "name": "Facetz.DCA",
<mask> "categoryId": 4,
<mask> "url": "http://facetz.net",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard"
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "instagram_com": {
<mask> "name": "Instagram",
<mask> "categoryId": 8,
<mask> "url": "https://www.facebook.com/",
<mask> "companyId": "facebook"
<mask> },
<mask> "instant_check_mate": {
<mask> "name": "Instant Check Mate",
<mask> "categoryId": 2,
<mask> "url": "https://www.instantcheckmate.com/",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "telstra": {
"name": "Telstra",
"categoryId": 8,
"url": "https://www.telstra.com.au/",
"companyId": "telstra",
"source": "AdGuard"
},
"medialab": {
"name": "MediaLab.AI Inc.",
"categoryId": 8,
"url": "https://medialab.la/",
"companyId": "medialab",
"source": "AdGuard"
}, </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> add "oztam": {
"name": "OzTAM",
"categoryId": 8,
"url": "https://oztam.com.au/",
"companyId": "oztam",
"source": "AdGuard"
},
"oppo": {
"name": "OPPO",
"categoryId": 101,
"url": "https://www.oppo.com/",
"companyId": "oppo",
"source": "AdGuard"
}, </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard"
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "facebook_audience": {
<mask> "name": "Facebook Audience Network",
<mask> "categoryId": 4,
<mask> "url": "https://www.facebook.com/business/products/audience-network",
<mask> "companyId": "facebook",
<mask> "source": "AdGuard"
<mask> },
<mask> "crashlytics": {
<mask> "name": "Crashlytics",
<mask> "categoryId": 101,
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> add "oztam": {
"name": "OzTAM",
"categoryId": 8,
"url": "https://oztam.com.au/",
"companyId": "oztam",
"source": "AdGuard"
},
"oppo": {
"name": "OPPO",
"categoryId": 101,
"url": "https://www.oppo.com/",
"companyId": "oppo",
"source": "AdGuard"
}, </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard"
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep add keep keep keep keep
|
<mask> "source": "AdGuard"
<mask> },
<mask> "google_trust_services": {
<mask> "name": "Google Trust Services",
<mask> "categoryId": 5,
<mask> "url": "https://pki.goog/",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "sectigo": {
"name": "Sectigo Limited",
"categoryId": 5,
"url": "https://www.solaredge.com/",
"companyId": "sectigo",
"source": "AdGuard"
}, </s> add "oztam": {
"name": "OzTAM",
"categoryId": 8,
"url": "https://oztam.com.au/",
"companyId": "oztam",
"source": "AdGuard"
},
"oppo": {
"name": "OPPO",
"categoryId": 101,
"url": "https://www.oppo.com/",
"companyId": "oppo",
"source": "AdGuard"
}, </s> add "kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
}, </s> add "telstra": {
"name": "Telstra",
"categoryId": 8,
"url": "https://www.telstra.com.au/",
"companyId": "telstra",
"source": "AdGuard"
},
"medialab": {
"name": "MediaLab.AI Inc.",
"categoryId": 8,
"url": "https://medialab.la/",
"companyId": "medialab",
"source": "AdGuard"
}, </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard"
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep keep keep add keep keep keep keep keep
|
<mask> "url": "https://branch.io/",
<mask> "companyId": "branch_metrics_inc",
<mask> "source": "AdGuard"
<mask> },
<mask> "qualcomm": {
<mask> "name": "Qualcomm",
<mask> "categoryId": 8,
<mask> "url": "https://www.qualcomm.com/",
<mask> "companyId": "qualcomm",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "oztam": {
"name": "OzTAM",
"categoryId": 8,
"url": "https://oztam.com.au/",
"companyId": "oztam",
"source": "AdGuard"
},
"oppo": {
"name": "OPPO",
"categoryId": 101,
"url": "https://www.oppo.com/",
"companyId": "oppo",
"source": "AdGuard"
}, </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> add "sectigo": {
"name": "Sectigo Limited",
"categoryId": 5,
"url": "https://www.solaredge.com/",
"companyId": "sectigo",
"source": "AdGuard"
}, </s> add "kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
}, </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> add "gmail": {
"name": "Gmail",
"categoryId": 13,
"url": "https://mail.google.com/",
"companyId": "google",
"source": "AdGuard"
},
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep keep keep add keep keep keep keep keep
|
<mask> "url": "https://www.solaredge.com/",
<mask> "companyId": "solaredge",
<mask> "source": "AdGuard"
<mask> },
<mask> "element": {
<mask> "name": "Element",
<mask> "categoryId": 7,
<mask> "url": "https://element.io/",
<mask> "companyId": "element",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
}, </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard"
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep add keep keep keep keep keep keep
|
<mask> "source": "AdGuard"
<mask> },
<mask> "outlook": {
<mask> "name": "Microsoft Outlook",
<mask> "categoryId": 13,
<mask> "url": "https://outlook.live.com/",
<mask> "companyId": "microsoft",
<mask> "source": "AdGuard"
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "gmail": {
"name": "Gmail",
"categoryId": 13,
"url": "https://mail.google.com/",
"companyId": "google",
"source": "AdGuard"
}, </s> add "kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
}, </s> add "telstra": {
"name": "Telstra",
"categoryId": 8,
"url": "https://www.telstra.com.au/",
"companyId": "telstra",
"source": "AdGuard"
},
"medialab": {
"name": "MediaLab.AI Inc.",
"categoryId": 8,
"url": "https://medialab.la/",
"companyId": "medialab",
"source": "AdGuard"
}, </s> add "sectigo": {
"name": "Sectigo Limited",
"categoryId": 5,
"url": "https://www.solaredge.com/",
"companyId": "sectigo",
"source": "AdGuard"
}, </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard"
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep add keep keep keep keep keep keep
|
<mask> "source": "AdGuard"
<mask> },
<mask> "plex": {
<mask> "name": "Plex",
<mask> "categoryId": 0,
<mask> "url": "https://www.plex.tv/",
<mask> "companyId": "plex",
<mask> "source": "AdGuard"
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "oztam": {
"name": "OzTAM",
"categoryId": 8,
"url": "https://oztam.com.au/",
"companyId": "oztam",
"source": "AdGuard"
},
"oppo": {
"name": "OPPO",
"categoryId": 101,
"url": "https://www.oppo.com/",
"companyId": "oppo",
"source": "AdGuard"
}, </s> add "telstra": {
"name": "Telstra",
"categoryId": 8,
"url": "https://www.telstra.com.au/",
"companyId": "telstra",
"source": "AdGuard"
},
"medialab": {
"name": "MediaLab.AI Inc.",
"categoryId": 8,
"url": "https://medialab.la/",
"companyId": "medialab",
"source": "AdGuard"
}, </s> add "sectigo": {
"name": "Sectigo Limited",
"categoryId": 5,
"url": "https://www.solaredge.com/",
"companyId": "sectigo",
"source": "AdGuard"
}, </s> add "gmail": {
"name": "Gmail",
"categoryId": 13,
"url": "https://mail.google.com/",
"companyId": "google",
"source": "AdGuard"
}, </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard"
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep add keep keep keep keep keep keep
|
<mask> "zwaar.org": "zwaar",
<mask> "extend.tv": "zypmedia",
<mask> "slack.com": "slack",
<mask> "slackb.com": "slack",
<mask> "slack-edge.com": "slack",
<mask> "slack-imgs.com": "slack",
<mask> "addlive.io": "snap",
<mask> "feelinsonice.com": "snap",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "addlive.io": "snap",
"feelinsonice.com": "snap",
"sc-cdn.net": "snap",
"sc-corp.net": "snap",
"sc-gw.com": "snap",
"sc-jpl.com": "snap",
"sc-prod.net": "snap",
"snap-dev.net": "snap",
"snapads.com": "snap",
"snapkit.com": "snap", </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17 </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> add "oppomobile.com": "oppo",
"heytapmobi.com": "oppo",
"heytapmobile.com": "oppo",
"heytapdl.com": "oppo",
"allawnos.com": "oppo",
"allawntech.com": "oppo", </s> add "kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
}, </s> add "oztam": {
"name": "OzTAM",
"categoryId": 8,
"url": "https://oztam.com.au/",
"companyId": "oztam",
"source": "AdGuard"
},
"oppo": {
"name": "OPPO",
"categoryId": 101,
"url": "https://www.oppo.com/",
"companyId": "oppo",
"source": "AdGuard"
},
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep keep keep add keep keep keep keep
|
<mask> "slack.com": "slack",
<mask> "slackb.com": "slack",
<mask> "slack-edge.com": "slack",
<mask> "slack-imgs.com": "slack",
<mask> "adguard.app": "adguard",
<mask> "adguard.io": "adguard",
<mask> "adguard.org": "adguard",
<mask> "adguard-dns.com": "adguard",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "whatsapp.net": "whatsapp",
"whatsapp.com": "whatsapp",
"telstra.com.au": "telstra",
"telstra.com": "telstra", </s> add "oppomobile.com": "oppo",
"heytapmobi.com": "oppo",
"heytapmobile.com": "oppo",
"heytapdl.com": "oppo",
"allawnos.com": "oppo",
"allawntech.com": "oppo", </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17 </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> add "kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
}, </s> add "oztam": {
"name": "OzTAM",
"categoryId": 8,
"url": "https://oztam.com.au/",
"companyId": "oztam",
"source": "AdGuard"
},
"oppo": {
"name": "OPPO",
"categoryId": 101,
"url": "https://www.oppo.com/",
"companyId": "oppo",
"source": "AdGuard"
},
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep keep add keep keep keep keep keep keep
|
<mask> "adguard-vpn.com": "adguard",
<mask> "adguardvpn.com": "adguard",
<mask> "adguard-vpn.online": "adguard",
<mask> "nflximg.com": "netflix",
<mask> "element.io": "element",
<mask> "riot.im": "element",
<mask> "gvt1.com": "google_servers",
<mask> "gvt2.com": "google_servers",
<mask> "gvt3.com": "google_servers",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "gvt1.com": "google_servers",
"gvt2.com": "google_servers",
"gvt3.com": "google_servers", </s> add "addlive.io": "snap",
"feelinsonice.com": "snap",
"sc-cdn.net": "snap",
"sc-corp.net": "snap",
"sc-gw.com": "snap",
"sc-jpl.com": "snap",
"sc-prod.net": "snap",
"snap-dev.net": "snap",
"snapads.com": "snap",
"snapkit.com": "snap", </s> add "akaquill.net": "akamai_technologies",
"me.com": "apple", </s> add "sectigo": {
"name": "Sectigo Limited",
"categoryId": 5,
"url": "https://www.solaredge.com/",
"companyId": "sectigo",
"source": "AdGuard"
}, </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> add "gmail": {
"name": "Gmail",
"categoryId": 13,
"url": "https://mail.google.com/",
"companyId": "google",
"source": "AdGuard"
},
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep keep keep add keep keep keep keep keep keep
|
<mask> "allawntech.com": "oppo",
<mask> "nflximg.com": "netflix",
<mask> "element.io": "element",
<mask> "riot.im": "element",
<mask> "akadns.net": "akamai_technologies",
<mask> "akamaiedge.net": "akamai_technologies",
<mask> "akaquill.net": "akamai_technologies",
<mask> "me.com": "apple",
<mask> "apple.news": "apple",
<mask> "apple-dns.net": "apple",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "akaquill.net": "akamai_technologies",
"me.com": "apple", </s> add "oppomobile.com": "oppo",
"heytapmobi.com": "oppo",
"heytapmobile.com": "oppo",
"heytapdl.com": "oppo",
"allawnos.com": "oppo",
"allawntech.com": "oppo", </s> add "itunes.com": "apple", </s> add "kik.com": "kik",
"apikik.com": "kik",
"kik-live.com": "kik", </s> add "cdn-apple.com": "apple",
"apple-mapkit.com": "apple",
"icons.axm-usercontent-apple.com": "apple",
"apple-cloudkit.com": "apple",
"apzones.com": "apple",
"apple-livephotoskit.com": "apple",
"safebrowsing.apple": "apple",
"safebrowsing.g.applimg.com": "apple", </s> remove "l-msedge.net": "microsoft",
</s> add "medialab.la": "medialab",
"media-lab.ai": "medialab",
"phicdn.net": "digicert_trust_seal",
"e-msedge.net": "msedge",
"l-msedge.net": "msedge",
"exp-tas.com": "vscode",
"vscode-unpkg.net": "vscode",
"v0cdn.net": "vscode",
"vscode-cdn.net": "vscode",
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep keep add keep keep keep keep keep
|
<mask> "gvt3.com": "google_servers",
<mask> "akadns.net": "akamai_technologies",
<mask> "akamaiedge.net": "akamai_technologies",
<mask> "apple.news": "apple",
<mask> "apple-dns.net": "apple",
<mask> "aaplimg.com": "apple",
<mask> "icloud.com": "apple",
<mask> "itunes.com": "apple",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "gvt1.com": "google_servers",
"gvt2.com": "google_servers",
"gvt3.com": "google_servers", </s> add "itunes.com": "apple", </s> add "kik.com": "kik",
"apikik.com": "kik",
"kik-live.com": "kik", </s> add "cdn-apple.com": "apple",
"apple-mapkit.com": "apple",
"icons.axm-usercontent-apple.com": "apple",
"apple-cloudkit.com": "apple",
"apzones.com": "apple",
"apple-livephotoskit.com": "apple",
"safebrowsing.apple": "apple",
"safebrowsing.g.applimg.com": "apple", </s> remove "l-msedge.net": "microsoft",
</s> add "medialab.la": "medialab",
"media-lab.ai": "medialab",
"phicdn.net": "digicert_trust_seal",
"e-msedge.net": "msedge",
"l-msedge.net": "msedge",
"exp-tas.com": "vscode",
"vscode-unpkg.net": "vscode",
"v0cdn.net": "vscode",
"vscode-cdn.net": "vscode", </s> add "oppomobile.com": "oppo",
"heytapmobi.com": "oppo",
"heytapmobile.com": "oppo",
"heytapdl.com": "oppo",
"allawnos.com": "oppo",
"allawntech.com": "oppo",
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep keep add keep keep keep keep
|
<mask> "apple-dns.net": "apple",
<mask> "aaplimg.com": "apple",
<mask> "icloud.com": "apple",
<mask> "icloud-content.com": "apple",
<mask> "kik.com": "kik",
<mask> "apikik.com": "kik",
<mask> "kik-live.com": "kik",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "kik.com": "kik",
"apikik.com": "kik",
"kik-live.com": "kik", </s> add "cdn-apple.com": "apple",
"apple-mapkit.com": "apple",
"icons.axm-usercontent-apple.com": "apple",
"apple-cloudkit.com": "apple",
"apzones.com": "apple",
"apple-livephotoskit.com": "apple",
"safebrowsing.apple": "apple",
"safebrowsing.g.applimg.com": "apple", </s> add "akaquill.net": "akamai_technologies",
"me.com": "apple", </s> remove "l-msedge.net": "microsoft",
</s> add "medialab.la": "medialab",
"media-lab.ai": "medialab",
"phicdn.net": "digicert_trust_seal",
"e-msedge.net": "msedge",
"l-msedge.net": "msedge",
"exp-tas.com": "vscode",
"vscode-unpkg.net": "vscode",
"v0cdn.net": "vscode",
"vscode-cdn.net": "vscode", </s> add "gvt1.com": "google_servers",
"gvt2.com": "google_servers",
"gvt3.com": "google_servers", </s> add "kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
},
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep keep add keep keep keep keep keep
|
<mask> "icloud.com": "apple",
<mask> "itunes.com": "apple",
<mask> "icloud-content.com": "apple",
<mask> "mzstatic.com": "apple",
<mask> "cdn-apple.com": "apple",
<mask> "apple-mapkit.com": "apple",
<mask> "icons.axm-usercontent-apple.com": "apple",
<mask> "apple-cloudkit.com": "apple",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "cdn-apple.com": "apple",
"apple-mapkit.com": "apple",
"icons.axm-usercontent-apple.com": "apple",
"apple-cloudkit.com": "apple",
"apzones.com": "apple",
"apple-livephotoskit.com": "apple",
"safebrowsing.apple": "apple",
"safebrowsing.g.applimg.com": "apple", </s> add "itunes.com": "apple", </s> add "akaquill.net": "akamai_technologies",
"me.com": "apple", </s> remove "l-msedge.net": "microsoft",
</s> add "medialab.la": "medialab",
"media-lab.ai": "medialab",
"phicdn.net": "digicert_trust_seal",
"e-msedge.net": "msedge",
"l-msedge.net": "msedge",
"exp-tas.com": "vscode",
"vscode-unpkg.net": "vscode",
"v0cdn.net": "vscode",
"vscode-cdn.net": "vscode", </s> add "gvt1.com": "google_servers",
"gvt2.com": "google_servers",
"gvt3.com": "google_servers", </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard"
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep add keep keep keep keep keep keep
|
<mask> "kik-live.com": "kik",
<mask> "mzstatic.com": "apple",
<mask> "matrix.org": "matrix",
<mask> "medialab.la": "medialab",
<mask> "media-lab.ai": "medialab",
<mask> "phicdn.net": "digicert_trust_seal",
<mask> "e-msedge.net": "msedge",
<mask> "l-msedge.net": "msedge",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "l-msedge.net": "microsoft",
</s> add "medialab.la": "medialab",
"media-lab.ai": "medialab",
"phicdn.net": "digicert_trust_seal",
"e-msedge.net": "msedge",
"l-msedge.net": "msedge",
"exp-tas.com": "vscode",
"vscode-unpkg.net": "vscode",
"v0cdn.net": "vscode",
"vscode-cdn.net": "vscode", </s> add "kik.com": "kik",
"apikik.com": "kik",
"kik-live.com": "kik", </s> add "itunes.com": "apple", </s> add "telstra": {
"name": "Telstra",
"categoryId": 8,
"url": "https://www.telstra.com.au/",
"companyId": "telstra",
"source": "AdGuard"
},
"medialab": {
"name": "MediaLab.AI Inc.",
"categoryId": 8,
"url": "https://medialab.la/",
"companyId": "medialab",
"source": "AdGuard"
}, </s> add "akaquill.net": "akamai_technologies",
"me.com": "apple", </s> add "gvt1.com": "google_servers",
"gvt2.com": "google_servers",
"gvt3.com": "google_servers",
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "icloud.com": "apple",
<mask> "icloud-content.com": "apple",
<mask> "mzstatic.com": "apple",
<mask> "matrix.org": "matrix",
<mask> "l-msedge.net": "microsoft",
<mask> "iadsdk.apple.com": "apple_ads",
<mask> "showrss.info": "showrss",
<mask> "solaredge.com": "solaredge",
<mask> "crashlytics.com": "crashlytics",
<mask> "flurry.com": "flurry",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "sectigo.com": "sectigo", </s> add "cdn-apple.com": "apple",
"apple-mapkit.com": "apple",
"icons.axm-usercontent-apple.com": "apple",
"apple-cloudkit.com": "apple",
"apzones.com": "apple",
"apple-livephotoskit.com": "apple",
"safebrowsing.apple": "apple",
"safebrowsing.g.applimg.com": "apple", </s> add "kik.com": "kik",
"apikik.com": "kik",
"kik-live.com": "kik", </s> add "cloudflare-dns.com": "cloudflare", </s> add "itunes.com": "apple", </s> add "akaquill.net": "akamai_technologies",
"me.com": "apple",
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep keep keep add keep keep keep keep keep keep
|
<mask> "v0cdn.net": "vscode",
<mask> "vscode-cdn.net": "vscode",
<mask> "iadsdk.apple.com": "apple_ads",
<mask> "showrss.info": "showrss",
<mask> "solaredge.com": "solaredge",
<mask> "crashlytics.com": "crashlytics",
<mask> "cloudflare-dns.com": "cloudflare",
<mask> "flurry.com": "flurry",
<mask> "hockeyapp.net": "hockeyapp",
<mask> "app-measurement.com": "firebase",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "cloudflare-dns.com": "cloudflare", </s> remove "l-msedge.net": "microsoft",
</s> add "medialab.la": "medialab",
"media-lab.ai": "medialab",
"phicdn.net": "digicert_trust_seal",
"e-msedge.net": "msedge",
"l-msedge.net": "msedge",
"exp-tas.com": "vscode",
"vscode-unpkg.net": "vscode",
"v0cdn.net": "vscode",
"vscode-cdn.net": "vscode", </s> add "sectigo": {
"name": "Sectigo Limited",
"categoryId": 5,
"url": "https://www.solaredge.com/",
"companyId": "sectigo",
"source": "AdGuard"
}, </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17 </s> add "oppomobile.com": "oppo",
"heytapmobi.com": "oppo",
"heytapmobile.com": "oppo",
"heytapdl.com": "oppo",
"allawnos.com": "oppo",
"allawntech.com": "oppo", </s> add "whatsapp.net": "whatsapp",
"whatsapp.com": "whatsapp",
"telstra.com.au": "telstra",
"telstra.com": "telstra",
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep keep add keep keep keep keep
|
<mask> "sectigo.com": "sectigo",
<mask> "solaredge.com": "solaredge",
<mask> "crashlytics.com": "crashlytics",
<mask> "flurry.com": "flurry",
<mask> "hockeyapp.net": "hockeyapp",
<mask> "app-measurement.com": "firebase",
<mask> "appmetrica.yandex.com": "yandex_appmetrica",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "sectigo.com": "sectigo", </s> remove "l-msedge.net": "microsoft",
</s> add "medialab.la": "medialab",
"media-lab.ai": "medialab",
"phicdn.net": "digicert_trust_seal",
"e-msedge.net": "msedge",
"l-msedge.net": "msedge",
"exp-tas.com": "vscode",
"vscode-unpkg.net": "vscode",
"v0cdn.net": "vscode",
"vscode-cdn.net": "vscode", </s> add "sectigo": {
"name": "Sectigo Limited",
"categoryId": 5,
"url": "https://www.solaredge.com/",
"companyId": "sectigo",
"source": "AdGuard"
}, </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17 </s> add "oppomobile.com": "oppo",
"heytapmobi.com": "oppo",
"heytapmobile.com": "oppo",
"heytapdl.com": "oppo",
"allawnos.com": "oppo",
"allawntech.com": "oppo", </s> add "whatsapp.net": "whatsapp",
"whatsapp.com": "whatsapp",
"telstra.com.au": "telstra",
"telstra.com": "telstra",
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep add keep keep keep keep keep keep
|
<mask> "letsencrypt.org": "lets_encrypt",
<mask> "lencr.org": "lets_encrypt",
<mask> "mobileapptracking.com": "branch",
<mask> "ntp.org": "ntppool",
<mask> "ntppool.org": "ntppool",
<mask> "plex.tv": "plex",
<mask> "plex.direct": "plex",
<mask> "edgecastcdn.net": "markmonitor",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "ntp.org": "ntppool",
"ntppool.org": "ntppool", </s> add "usertrust.com": "trustlogo", </s> add "kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
}, </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17 </s> add "oppomobile.com": "oppo",
"heytapmobi.com": "oppo",
"heytapmobile.com": "oppo",
"heytapdl.com": "oppo",
"allawnos.com": "oppo",
"allawntech.com": "oppo", </s> add "whatsapp.net": "whatsapp",
"whatsapp.com": "whatsapp",
"telstra.com.au": "telstra",
"telstra.com": "telstra",
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep keep add keep keep keep keep keep keep
|
<mask> "lencr.org": "lets_encrypt",
<mask> "oztam.com.au": "oztam",
<mask> "mobileapptracking.com": "branch",
<mask> "plex.tv": "plex",
<mask> "plex.direct": "plex",
<mask> "edgecastcdn.net": "markmonitor",
<mask> "appcenter.ms": "appcenter",
<mask> "unityads.unity3d.com": "unity_ads",
<mask> "usertrust.com": "trustlogo",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "oztam.com.au": "oztam", </s> add "usertrust.com": "trustlogo", </s> add "kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
}, </s> add "oztam": {
"name": "OzTAM",
"categoryId": 8,
"url": "https://oztam.com.au/",
"companyId": "oztam",
"source": "AdGuard"
},
"oppo": {
"name": "OPPO",
"categoryId": 101,
"url": "https://www.oppo.com/",
"companyId": "oppo",
"source": "AdGuard"
}, </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17 </s> add "oppomobile.com": "oppo",
"heytapmobi.com": "oppo",
"heytapmobile.com": "oppo",
"heytapdl.com": "oppo",
"allawnos.com": "oppo",
"allawntech.com": "oppo",
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep keep add keep keep keep keep keep
|
<mask> "edgecastcdn.net": "markmonitor",
<mask> "appcenter.ms": "appcenter",
<mask> "unityads.unity3d.com": "unity_ads",
<mask> "azure.com": "azure",
<mask> "trafficmanager.net": "azure",
<mask> "hotmail.com": "outlook",
<mask> "outlook.com": "outlook",
<mask> "bttn.io": "button",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "outlook.com": "outlook", </s> add "ntp.org": "ntppool",
"ntppool.org": "ntppool", </s> remove "qualcomm.com": "qualcomm"
</s> add "qualcomm.com": "qualcomm",
"gmail.com": "gmail" </s> add "oztam.com.au": "oztam", </s> add "kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
}, </s> add "oztam": {
"name": "OzTAM",
"categoryId": 8,
"url": "https://oztam.com.au/",
"companyId": "oztam",
"source": "AdGuard"
},
"oppo": {
"name": "OPPO",
"categoryId": 101,
"url": "https://www.oppo.com/",
"companyId": "oppo",
"source": "AdGuard"
},
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep add keep keep keep keep
|
<mask> "trafficmanager.net": "azure",
<mask> "hotmail.com": "outlook",
<mask> "bttn.io": "button",
<mask> "pki.goog": "google_trust_services",
<mask> "xtracloud.net": "qualcomm",
<mask> "qualcomm.com": "qualcomm",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "qualcomm.com": "qualcomm"
</s> add "qualcomm.com": "qualcomm",
"gmail.com": "gmail" </s> add "usertrust.com": "trustlogo", </s> add "telstra": {
"name": "Telstra",
"categoryId": 8,
"url": "https://www.telstra.com.au/",
"companyId": "telstra",
"source": "AdGuard"
},
"medialab": {
"name": "MediaLab.AI Inc.",
"categoryId": 8,
"url": "https://medialab.la/",
"companyId": "medialab",
"source": "AdGuard"
}, </s> add "oppomobile.com": "oppo",
"heytapmobi.com": "oppo",
"heytapmobile.com": "oppo",
"heytapdl.com": "oppo",
"allawnos.com": "oppo",
"allawntech.com": "oppo", </s> add "whatsapp.net": "whatsapp",
"whatsapp.com": "whatsapp",
"telstra.com.au": "telstra",
"telstra.com": "telstra", </s> add "kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
},
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep keep keep keep replace keep keep
|
<mask> "hotmail.com": "outlook",
<mask> "bttn.io": "button",
<mask> "pki.goog": "google_trust_services",
<mask> "xtracloud.net": "qualcomm",
<mask> "qualcomm.com": "qualcomm"
<mask> }
<mask> } </s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "outlook.com": "outlook", </s> add "usertrust.com": "trustlogo", </s> add "telstra": {
"name": "Telstra",
"categoryId": 8,
"url": "https://www.telstra.com.au/",
"companyId": "telstra",
"source": "AdGuard"
},
"medialab": {
"name": "MediaLab.AI Inc.",
"categoryId": 8,
"url": "https://medialab.la/",
"companyId": "medialab",
"source": "AdGuard"
}, </s> add "oppomobile.com": "oppo",
"heytapmobi.com": "oppo",
"heytapmobile.com": "oppo",
"heytapdl.com": "oppo",
"allawnos.com": "oppo",
"allawntech.com": "oppo", </s> add "whatsapp.net": "whatsapp",
"whatsapp.com": "whatsapp",
"telstra.com.au": "telstra",
"telstra.com": "telstra", </s> add "kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
},
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
client/src/helpers/trackers/trackers.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
<mask> github.com/josharian/native v1.1.0 // indirect
<mask> github.com/mdlayher/packet v1.1.1 // indirect
<mask> github.com/mdlayher/socket v0.4.0 // indirect
<mask> github.com/onsi/ginkgo/v2 v2.8.1 // indirect
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
<mask> github.com/pierrec/lz4/v4 v4.1.17 // indirect
<mask> github.com/pkg/errors v0.9.1 // indirect
<mask> github.com/pmezard/go-difflib v1.0.0 // indirect
<mask> github.com/quic-go/qpack v0.4.0 // indirect
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
</s> add github.com/quic-go/qtls-go1-19 v0.2.1 // indirect
github.com/quic-go/qtls-go1-20 v0.1.1 // indirect
github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect </s> remove github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU=
github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc=
github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q=
</s> add github.com/onsi/ginkgo/v2 v2.8.3 h1:RpbK1G8nWPNaCVFBWsOGnEQQGgASi6b8fxcWBvDYjxQ=
github.com/onsi/ginkgo/v2 v2.8.3/go.mod h1:6OaUA8BCi0aZfmzYT/q9AacwTzDpNbxILUT+TlBq6MY=
github.com/onsi/gomega v1.27.0 h1:QLidEla4bXUuZVFa4KX6JHCsuGgbi85LC/pCHrt/O08= </s> remove github.com/quic-go/qtls-go1-19 v0.2.0 h1:Cvn2WdhyViFUHoOqK52i51k4nDX8EwIh5VJiVM4nttk=
github.com/quic-go/qtls-go1-19 v0.2.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
github.com/quic-go/qtls-go1-20 v0.1.0 h1:d1PK3ErFy9t7zxKsG3NXBJXZjp/kMLoIb3y/kV54oAI=
github.com/quic-go/qtls-go1-20 v0.1.0/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
</s> add github.com/quic-go/qtls-go1-19 v0.2.1 h1:aJcKNMkH5ASEJB9FXNeZCyTEIHU1J7MmHyz1Q1TSG1A=
github.com/quic-go/qtls-go1-19 v0.2.1/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
github.com/quic-go/qtls-go1-20 v0.1.1 h1:KbChDlg82d3IHqaj2bn6GfKRj84Per2VGf5XV3wSwQk=
github.com/quic-go/qtls-go1-20 v0.1.1/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= </s> remove golang.org/x/tools v0.6.0
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30
honnef.co/go/tools v0.4.1
</s> add golang.org/x/tools v0.6.1-0.20230217175706-3102dad5faf9
golang.org/x/vuln v0.0.0-20230217204342-b91abcc5ae3c
honnef.co/go/tools v0.4.2 </s> remove honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo=
honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
</s> add honnef.co/go/tools v0.4.2 h1:6qXr+R5w+ktL5UkwEbPp+fEvfyoMPche6GkOpGHZcLc=
honnef.co/go/tools v0.4.2/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
go.mod
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> github.com/pkg/errors v0.9.1 // indirect
<mask> github.com/pmezard/go-difflib v1.0.0 // indirect
<mask> github.com/quic-go/qpack v0.4.0 // indirect
<mask> github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
<mask> github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
<mask> github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
<mask> github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
<mask> golang.org/x/mod v0.8.0 // indirect
<mask> golang.org/x/sync v0.1.0 // indirect
<mask> golang.org/x/text v0.7.0 // indirect
<mask> golang.org/x/tools v0.6.0 // indirect
<mask> )
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove github.com/onsi/ginkgo/v2 v2.8.1 // indirect
</s> add github.com/onsi/ginkgo/v2 v2.8.3 // indirect </s> remove github.com/quic-go/qtls-go1-19 v0.2.0 h1:Cvn2WdhyViFUHoOqK52i51k4nDX8EwIh5VJiVM4nttk=
github.com/quic-go/qtls-go1-19 v0.2.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
github.com/quic-go/qtls-go1-20 v0.1.0 h1:d1PK3ErFy9t7zxKsG3NXBJXZjp/kMLoIb3y/kV54oAI=
github.com/quic-go/qtls-go1-20 v0.1.0/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
</s> add github.com/quic-go/qtls-go1-19 v0.2.1 h1:aJcKNMkH5ASEJB9FXNeZCyTEIHU1J7MmHyz1Q1TSG1A=
github.com/quic-go/qtls-go1-19 v0.2.1/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
github.com/quic-go/qtls-go1-20 v0.1.1 h1:KbChDlg82d3IHqaj2bn6GfKRj84Per2VGf5XV3wSwQk=
github.com/quic-go/qtls-go1-20 v0.1.1/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= </s> remove golang.org/x/tools v0.6.0
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30
honnef.co/go/tools v0.4.1
</s> add golang.org/x/tools v0.6.1-0.20230217175706-3102dad5faf9
golang.org/x/vuln v0.0.0-20230217204342-b91abcc5ae3c
honnef.co/go/tools v0.4.2 </s> remove github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c h1:PHoGTnweZP+KIg/8Zc6+iOesrIF5yHkpb4GBDxHm7yE=
github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c/go.mod h1:eLL9Nub3yfAho7qB0MzZizFhTU2QkLeoVsWdHtDW264=
</s> add github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 h1:tHNk7XK9GkmKUR6Gh8gVBKXc2MVSZ4G/NnWLtzw4gNA=
github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923/go.mod h1:eLL9Nub3yfAho7qB0MzZizFhTU2QkLeoVsWdHtDW264= </s> remove golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 h1:Q4B8LhSjZGto/+P5REBb4N51ec2H4efRqjBIeJ6nv/Y=
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE=
</s> add golang.org/x/tools v0.6.1-0.20230217175706-3102dad5faf9 h1:IuFp2CklNBim6OdHXn/1P4VoeKt5pA2jcDKWlboqtlQ=
golang.org/x/tools v0.6.1-0.20230217175706-3102dad5faf9/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/vuln v0.0.0-20230217204342-b91abcc5ae3c h1:7/jJkMpaKZMxdyOQ7IP7aPbJQaDk4cOUxtXtWHQ1cSk=
golang.org/x/vuln v0.0.0-20230217204342-b91abcc5ae3c/go.mod h1:LTLnfk/dpXDNKsX6aCg/cI4LyCVnTyrQhgV/yLJuly0= </s> remove honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo=
honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
</s> add honnef.co/go/tools v0.4.2 h1:6qXr+R5w+ktL5UkwEbPp+fEvfyoMPche6GkOpGHZcLc=
honnef.co/go/tools v0.4.2/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
go.mod
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
<mask> github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
<mask> github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
<mask> github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
<mask> github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU=
<mask> github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc=
<mask> github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q=
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
<mask> github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
<mask> github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc=
<mask> github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove github.com/onsi/ginkgo/v2 v2.8.1 // indirect
</s> add github.com/onsi/ginkgo/v2 v2.8.3 // indirect </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17 </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> add "addlive.io": "snap",
"feelinsonice.com": "snap",
"sc-cdn.net": "snap",
"sc-corp.net": "snap",
"sc-gw.com": "snap",
"sc-jpl.com": "snap",
"sc-prod.net": "snap",
"snap-dev.net": "snap",
"snapads.com": "snap",
"snapkit.com": "snap", </s> add "whatsapp.net": "whatsapp",
"whatsapp.com": "whatsapp",
"telstra.com.au": "telstra",
"telstra.com": "telstra", </s> add "kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
},
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
go.sum
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
<mask> github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
<mask> github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U=
<mask> github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc=
<mask> github.com/quic-go/qtls-go1-19 v0.2.0 h1:Cvn2WdhyViFUHoOqK52i51k4nDX8EwIh5VJiVM4nttk=
<mask> github.com/quic-go/qtls-go1-19 v0.2.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
<mask> github.com/quic-go/qtls-go1-20 v0.1.0 h1:d1PK3ErFy9t7zxKsG3NXBJXZjp/kMLoIb3y/kV54oAI=
<mask> github.com/quic-go/qtls-go1-20 v0.1.0/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
<mask> github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA=
<mask> github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo=
<mask> github.com/shirou/gopsutil/v3 v3.21.8 h1:nKct+uP0TV8DjjNiHanKf8SAuub+GNsbrOtM9Nl9biA=
<mask> github.com/shirou/gopsutil/v3 v3.21.8/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ=
<mask> github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
</s> add github.com/quic-go/qtls-go1-19 v0.2.1 // indirect
github.com/quic-go/qtls-go1-20 v0.1.1 // indirect
github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect </s> remove github.com/onsi/ginkgo/v2 v2.8.1 // indirect
</s> add github.com/onsi/ginkgo/v2 v2.8.3 // indirect </s> remove honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo=
honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
</s> add honnef.co/go/tools v0.4.2 h1:6qXr+R5w+ktL5UkwEbPp+fEvfyoMPche6GkOpGHZcLc=
honnef.co/go/tools v0.4.2/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> remove golang.org/x/tools v0.6.0
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30
honnef.co/go/tools v0.4.1
</s> add golang.org/x/tools v0.6.1-0.20230217175706-3102dad5faf9
golang.org/x/vuln v0.0.0-20230217204342-b91abcc5ae3c
honnef.co/go/tools v0.4.2 </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17 </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard"
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
go.sum
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
<mask> github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ=
<mask> github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
<mask> github.com/u-root/uio v0.0.0-20221213070652-c3537552635f/go.mod h1:IogEAUBXDEwX7oR/BMmCctShYs80ql4hF0ySdzGxf7E=
<mask> github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c h1:PHoGTnweZP+KIg/8Zc6+iOesrIF5yHkpb4GBDxHm7yE=
<mask> github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c/go.mod h1:eLL9Nub3yfAho7qB0MzZizFhTU2QkLeoVsWdHtDW264=
<mask> github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
<mask> go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
<mask> go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
<mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
</s> add github.com/quic-go/qtls-go1-19 v0.2.1 // indirect
github.com/quic-go/qtls-go1-20 v0.1.1 // indirect
github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17 </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> add "addlive.io": "snap",
"feelinsonice.com": "snap",
"sc-cdn.net": "snap",
"sc-corp.net": "snap",
"sc-gw.com": "snap",
"sc-jpl.com": "snap",
"sc-prod.net": "snap",
"snap-dev.net": "snap",
"snapads.com": "snap",
"snapkit.com": "snap", </s> add "whatsapp.net": "whatsapp",
"whatsapp.com": "whatsapp",
"telstra.com.au": "telstra",
"telstra.com": "telstra", </s> add "kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
},
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
go.sum
|
keep keep add keep keep keep keep keep
|
<mask> "||zuckerberg.com^",
<mask> "||zuckerberg.net^",
<mask> },
<mask> }, {
<mask> ID: "hulu",
<mask> Name: "Hulu",
<mask> IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 50 50\"><path d=\"M 0 15 L 0 34 L 4 34 L 4 25 C 4 24.5 4.398438 24 5 24 L 8 24 C 8.5 24 9 24.398438 9 25 L 9 34 L 13 34 L 13 24 C 13 21.800781 11.199219 20 9 20 L 4 20 L 4 15 Z M 30 15 L 30 34 L 34 34 L 34 15 Z M 15 20 L 15 30 C 15 32.199219 16.800781 34 19 34 L 24 34 C 26.199219 34 27.992188 32.199219 28.09375 30 L 28.09375 20 L 24.09375 20 L 24.09375 28.90625 C 24.09375 29.507813 23.601563 30 23 30 L 20.09375 30 C 19.492188 30 19 29.507813 19 28.90625 L 19 20 Z M 36 20 L 36 30 C 36 32.199219 37.800781 34 40 34 L 45 34 C 47.199219 34 49 32.199219 49 30 L 49 20 L 45 20 L 45 29 C 45 29.5 44.601563 30 44 30 L 41 30 C 40.5 30 40 29.601563 40 29 L 40 20 Z\" /></svg>"),
<mask> Rules: []string{
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> add "oztam": {
"name": "OzTAM",
"categoryId": 8,
"url": "https://oztam.com.au/",
"companyId": "oztam",
"source": "AdGuard"
},
"oppo": {
"name": "OPPO",
"categoryId": 101,
"url": "https://www.oppo.com/",
"companyId": "oppo",
"source": "AdGuard"
}, </s> add "telstra": {
"name": "Telstra",
"categoryId": 8,
"url": "https://www.telstra.com.au/",
"companyId": "telstra",
"source": "AdGuard"
},
"medialab": {
"name": "MediaLab.AI Inc.",
"categoryId": 8,
"url": "https://medialab.la/",
"companyId": "medialab",
"source": "AdGuard"
}, </s> add "gmail": {
"name": "Gmail",
"categoryId": 13,
"url": "https://mail.google.com/",
"companyId": "google",
"source": "AdGuard"
}, </s> add "kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
}, </s> remove "name": "POL: Polish filters for Pi hole",
</s> add "name": "POL: Polish filters for Pi-hole", </s> add "sectigo": {
"name": "Sectigo Limited",
"categoryId": 5,
"url": "https://www.solaredge.com/",
"companyId": "sectigo",
"source": "AdGuard"
},
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
internal/filtering/servicelist.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "||mstdn.jp^",
<mask> "||mstdn.party^",
<mask> "||mstdn.social^",
<mask> "||muenchen.social^",
<mask> "||nerdculture.de^",
<mask> "||newsie.social^",
<mask> "||noc.social^",
<mask> "||norden.social^",
<mask> "||nrw.social^",
<mask> "||o3o.ca^",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17 </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> add "addlive.io": "snap",
"feelinsonice.com": "snap",
"sc-cdn.net": "snap",
"sc-corp.net": "snap",
"sc-gw.com": "snap",
"sc-jpl.com": "snap",
"sc-prod.net": "snap",
"snap-dev.net": "snap",
"snapads.com": "snap",
"snapkit.com": "snap", </s> add "whatsapp.net": "whatsapp",
"whatsapp.com": "whatsapp",
"telstra.com.au": "telstra",
"telstra.com": "telstra", </s> add "kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
}, </s> add "oztam": {
"name": "OzTAM",
"categoryId": 8,
"url": "https://oztam.com.au/",
"companyId": "oztam",
"source": "AdGuard"
},
"oppo": {
"name": "OPPO",
"categoryId": 101,
"url": "https://www.oppo.com/",
"companyId": "oppo",
"source": "AdGuard"
},
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
internal/filtering/servicelist.go
|
keep keep keep add keep keep keep keep
|
<mask> "||socel.net^",
<mask> "||social.anoxinon.de^",
<mask> "||social.cologne^",
<mask> "||social.dev-wiki.de^",
<mask> "||social.politicaconciencia.org^",
<mask> "||social.vivaldi.net^",
<mask> "||sself.co^",
<mask> "||stranger.social^",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17 </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> add "addlive.io": "snap",
"feelinsonice.com": "snap",
"sc-cdn.net": "snap",
"sc-corp.net": "snap",
"sc-gw.com": "snap",
"sc-jpl.com": "snap",
"sc-prod.net": "snap",
"snap-dev.net": "snap",
"snapads.com": "snap",
"snapkit.com": "snap", </s> add "whatsapp.net": "whatsapp",
"whatsapp.com": "whatsapp",
"telstra.com.au": "telstra",
"telstra.com": "telstra", </s> add "kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
}, </s> add "oztam": {
"name": "OzTAM",
"categoryId": 8,
"url": "https://oztam.com.au/",
"companyId": "oztam",
"source": "AdGuard"
},
"oppo": {
"name": "OPPO",
"categoryId": 101,
"url": "https://www.oppo.com/",
"companyId": "oppo",
"source": "AdGuard"
},
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
internal/filtering/servicelist.go
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28
<mask> github.com/kisielk/errcheck v1.6.3
<mask> github.com/kyoh86/looppointer v0.2.1
<mask> github.com/securego/gosec/v2 v2.15.0
<mask> golang.org/x/tools v0.6.0
<mask> golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30
<mask> honnef.co/go/tools v0.4.1
<mask> mvdan.cc/gofumpt v0.4.0
<mask> mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95
<mask> )
<mask>
<mask> require (
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo=
honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
</s> add honnef.co/go/tools v0.4.2 h1:6qXr+R5w+ktL5UkwEbPp+fEvfyoMPche6GkOpGHZcLc=
honnef.co/go/tools v0.4.2/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> remove golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 h1:Q4B8LhSjZGto/+P5REBb4N51ec2H4efRqjBIeJ6nv/Y=
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE=
</s> add golang.org/x/tools v0.6.1-0.20230217175706-3102dad5faf9 h1:IuFp2CklNBim6OdHXn/1P4VoeKt5pA2jcDKWlboqtlQ=
golang.org/x/tools v0.6.1-0.20230217175706-3102dad5faf9/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/vuln v0.0.0-20230217204342-b91abcc5ae3c h1:7/jJkMpaKZMxdyOQ7IP7aPbJQaDk4cOUxtXtWHQ1cSk=
golang.org/x/vuln v0.0.0-20230217204342-b91abcc5ae3c/go.mod h1:LTLnfk/dpXDNKsX6aCg/cI4LyCVnTyrQhgV/yLJuly0= </s> remove github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
</s> add github.com/quic-go/qtls-go1-19 v0.2.1 // indirect
github.com/quic-go/qtls-go1-20 v0.1.1 // indirect
github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect </s> remove github.com/quic-go/qtls-go1-19 v0.2.0 h1:Cvn2WdhyViFUHoOqK52i51k4nDX8EwIh5VJiVM4nttk=
github.com/quic-go/qtls-go1-19 v0.2.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
github.com/quic-go/qtls-go1-20 v0.1.0 h1:d1PK3ErFy9t7zxKsG3NXBJXZjp/kMLoIb3y/kV54oAI=
github.com/quic-go/qtls-go1-20 v0.1.0/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
</s> add github.com/quic-go/qtls-go1-19 v0.2.1 h1:aJcKNMkH5ASEJB9FXNeZCyTEIHU1J7MmHyz1Q1TSG1A=
github.com/quic-go/qtls-go1-19 v0.2.1/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
github.com/quic-go/qtls-go1-20 v0.1.1 h1:KbChDlg82d3IHqaj2bn6GfKRj84Per2VGf5XV3wSwQk=
github.com/quic-go/qtls-go1-20 v0.1.1/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= </s> remove github.com/onsi/ginkgo/v2 v2.8.1 // indirect
</s> add github.com/onsi/ginkgo/v2 v2.8.3 // indirect </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
internal/tools/go.mod
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
<mask> golang.org/x/tools v0.0.0-20201007032633-0806396f153e/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
<mask> golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
<mask> golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
<mask> golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
<mask> golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
<mask> golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 h1:Q4B8LhSjZGto/+P5REBb4N51ec2H4efRqjBIeJ6nv/Y=
<mask> golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE=
<mask> golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove golang.org/x/tools v0.6.0
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30
honnef.co/go/tools v0.4.1
</s> add golang.org/x/tools v0.6.1-0.20230217175706-3102dad5faf9
golang.org/x/vuln v0.0.0-20230217204342-b91abcc5ae3c
honnef.co/go/tools v0.4.2 </s> remove github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
</s> add github.com/quic-go/qtls-go1-19 v0.2.1 // indirect
github.com/quic-go/qtls-go1-20 v0.1.1 // indirect
github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect </s> remove honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo=
honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
</s> add honnef.co/go/tools v0.4.2 h1:6qXr+R5w+ktL5UkwEbPp+fEvfyoMPche6GkOpGHZcLc=
honnef.co/go/tools v0.4.2/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17 </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> add "whatsapp.net": "whatsapp",
"whatsapp.com": "whatsapp",
"telstra.com.au": "telstra",
"telstra.com": "telstra",
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
internal/tools/go.sum
|
keep keep keep keep replace replace keep keep keep keep
|
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
<mask> gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
<mask> gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
<mask> honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo=
<mask> honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
<mask> mvdan.cc/gofumpt v0.4.0 h1:JVf4NN1mIpHogBj7ABpgOyZc65/UUOkKQFkoURsz4MM=
<mask> mvdan.cc/gofumpt v0.4.0/go.mod h1:PljLOHDeZqgS8opHRKLzp2It2VBuSdteAgqUfzMTxlQ=
<mask> mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 h1:n/xhncJPSt0YzfOhnyn41XxUdrWQNgmLBG72FE27Fqw=
<mask> mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95/go.mod h1:2vU506e8nGWodqcci641NLi4im2twWSq4Lod756epHQ=
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove golang.org/x/tools v0.6.0
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30
honnef.co/go/tools v0.4.1
</s> add golang.org/x/tools v0.6.1-0.20230217175706-3102dad5faf9
golang.org/x/vuln v0.0.0-20230217204342-b91abcc5ae3c
honnef.co/go/tools v0.4.2 </s> remove golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 h1:Q4B8LhSjZGto/+P5REBb4N51ec2H4efRqjBIeJ6nv/Y=
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE=
</s> add golang.org/x/tools v0.6.1-0.20230217175706-3102dad5faf9 h1:IuFp2CklNBim6OdHXn/1P4VoeKt5pA2jcDKWlboqtlQ=
golang.org/x/tools v0.6.1-0.20230217175706-3102dad5faf9/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/vuln v0.0.0-20230217204342-b91abcc5ae3c h1:7/jJkMpaKZMxdyOQ7IP7aPbJQaDk4cOUxtXtWHQ1cSk=
golang.org/x/vuln v0.0.0-20230217204342-b91abcc5ae3c/go.mod h1:LTLnfk/dpXDNKsX6aCg/cI4LyCVnTyrQhgV/yLJuly0= </s> remove github.com/quic-go/qtls-go1-19 v0.2.0 h1:Cvn2WdhyViFUHoOqK52i51k4nDX8EwIh5VJiVM4nttk=
github.com/quic-go/qtls-go1-19 v0.2.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
github.com/quic-go/qtls-go1-20 v0.1.0 h1:d1PK3ErFy9t7zxKsG3NXBJXZjp/kMLoIb3y/kV54oAI=
github.com/quic-go/qtls-go1-20 v0.1.0/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
</s> add github.com/quic-go/qtls-go1-19 v0.2.1 h1:aJcKNMkH5ASEJB9FXNeZCyTEIHU1J7MmHyz1Q1TSG1A=
github.com/quic-go/qtls-go1-19 v0.2.1/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
github.com/quic-go/qtls-go1-20 v0.1.1 h1:KbChDlg82d3IHqaj2bn6GfKRj84Per2VGf5XV3wSwQk=
github.com/quic-go/qtls-go1-20 v0.1.1/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= </s> remove github.com/onsi/ginkgo/v2 v2.8.1 // indirect
</s> add github.com/onsi/ginkgo/v2 v2.8.3 // indirect </s> remove github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
</s> add github.com/quic-go/qtls-go1-19 v0.2.1 // indirect
github.com/quic-go/qtls-go1-20 v0.1.1 // indirect
github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
internal/tools/go.sum
|
keep keep replace keep keep keep keep keep
|
<mask> # A docker file for scripts/make/build-docker.sh.
<mask>
<mask> FROM alpine:3.16
<mask>
<mask> ARG BUILD_DATE
<mask> ARG VERSION
<mask> ARG VCS_REF
<mask>
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "name": "POL: Polish filters for Pi hole",
</s> add "name": "POL: Polish filters for Pi-hole", </s> remove golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 h1:Q4B8LhSjZGto/+P5REBb4N51ec2H4efRqjBIeJ6nv/Y=
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE=
</s> add golang.org/x/tools v0.6.1-0.20230217175706-3102dad5faf9 h1:IuFp2CklNBim6OdHXn/1P4VoeKt5pA2jcDKWlboqtlQ=
golang.org/x/tools v0.6.1-0.20230217175706-3102dad5faf9/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/vuln v0.0.0-20230217204342-b91abcc5ae3c h1:7/jJkMpaKZMxdyOQ7IP7aPbJQaDk4cOUxtXtWHQ1cSk=
golang.org/x/vuln v0.0.0-20230217204342-b91abcc5ae3c/go.mod h1:LTLnfk/dpXDNKsX6aCg/cI4LyCVnTyrQhgV/yLJuly0= </s> remove golang.org/x/tools v0.6.0
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30
honnef.co/go/tools v0.4.1
</s> add golang.org/x/tools v0.6.1-0.20230217175706-3102dad5faf9
golang.org/x/vuln v0.0.0-20230217204342-b91abcc5ae3c
honnef.co/go/tools v0.4.2 </s> add "addlive.io": "snap",
"feelinsonice.com": "snap",
"sc-cdn.net": "snap",
"sc-corp.net": "snap",
"sc-gw.com": "snap",
"sc-jpl.com": "snap",
"sc-prod.net": "snap",
"snap-dev.net": "snap",
"snapads.com": "snap",
"snapkit.com": "snap", </s> add "whatsapp.net": "whatsapp",
"whatsapp.com": "whatsapp",
"telstra.com.au": "telstra",
"telstra.com": "telstra", </s> add "kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
},
|
https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df
|
scripts/make/Dockerfile
|
keep keep add keep keep keep keep keep keep
|
<mask> "dns_providers": "Here is a <0>list of known DNS providers</0> to choose from.",
<mask> "update_now": "Update now",
<mask> "update_failed": "Auto-update failed. Please <a>follow these steps</a> to update manually.",
<mask> "processing_update": "Please wait, AdGuard Home is being updated",
<mask> "clients_title": "Clients",
<mask> "clients_desc": "Configure devices connected to AdGuard Home",
<mask> "settings_global": "Global",
<mask> "settings_custom": "Custom",
<mask> "table_client": "Client",
</s> Pull request: all: imp ann url
Updates #4209.
Squashed commit of the following:
commit 0c31a59c5bf6bcc27a4779adf226d9a1ac9eece1
Merge: 803f32db 8455940b
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 1 19:33:55 2022 +0300
Merge branch 'master' into 4209-ann-url
commit 803f32dbc7276077a4374ed0f5e0a1fa36f91c9b
Author: Ildar Kamalov <[email protected]>
Date: Tue Feb 1 14:46:47 2022 +0300
client: add manual update link to update topline
commit ca375b52fa53503a3987b9723eb9a1d74878e890
Author: Ainar Garipov <[email protected]>
Date: Mon Jan 31 20:49:42 2022 +0300
all: imp ann url </s> remove {canAutoUpdate
&& <button
type="button"
className="btn btn-sm btn-primary ml-3"
onClick={handleUpdate}
disabled={processingUpdate}
>
<Trans>update_now</Trans>
</button>
}
</s> add
{canAutoUpdate ? (
<button
type="button"
className="btn btn-sm btn-primary ml-3"
onClick={handleUpdate}
disabled={processingUpdate}
>
<Trans>update_now</Trans>
</button>
) : (
<Trans components={{
a: (
<a href={MANUAL_UPDATE_LINK} target="_blank" rel="noopener noreferrer" key="0">
Link
</a>
),
}}>
manual_update
</Trans>
)} </s> add import { MANUAL_UPDATE_LINK } from '../../helpers/constants';
|
https://github.com/AdguardTeam/AdGuardHome/commit/76fa60498e6c67dc4b9222e8fcaa4a8f85de27eb
|
client/src/__locales/en.json
|
keep add keep keep keep keep keep
|
<mask> import Topline from './Topline';
<mask> import { getUpdate } from '../../actions';
<mask>
<mask> const UpdateTopline = () => {
<mask> const {
<mask> announcementUrl,
<mask> newVersion,
</s> Pull request: all: imp ann url
Updates #4209.
Squashed commit of the following:
commit 0c31a59c5bf6bcc27a4779adf226d9a1ac9eece1
Merge: 803f32db 8455940b
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 1 19:33:55 2022 +0300
Merge branch 'master' into 4209-ann-url
commit 803f32dbc7276077a4374ed0f5e0a1fa36f91c9b
Author: Ildar Kamalov <[email protected]>
Date: Tue Feb 1 14:46:47 2022 +0300
client: add manual update link to update topline
commit ca375b52fa53503a3987b9723eb9a1d74878e890
Author: Ainar Garipov <[email protected]>
Date: Mon Jan 31 20:49:42 2022 +0300
all: imp ann url </s> remove {canAutoUpdate
&& <button
type="button"
className="btn btn-sm btn-primary ml-3"
onClick={handleUpdate}
disabled={processingUpdate}
>
<Trans>update_now</Trans>
</button>
}
</s> add
{canAutoUpdate ? (
<button
type="button"
className="btn btn-sm btn-primary ml-3"
onClick={handleUpdate}
disabled={processingUpdate}
>
<Trans>update_now</Trans>
</button>
) : (
<Trans components={{
a: (
<a href={MANUAL_UPDATE_LINK} target="_blank" rel="noopener noreferrer" key="0">
Link
</a>
),
}}>
manual_update
</Trans>
)} </s> add "manual_update": "Please <a>follow these steps</a> to update manually.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/76fa60498e6c67dc4b9222e8fcaa4a8f85de27eb
|
client/src/components/ui/UpdateTopline.js
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> ]}
<mask> >
<mask> update_announcement
<mask> </Trans>
<mask> {canAutoUpdate
<mask> && <button
<mask> type="button"
<mask> className="btn btn-sm btn-primary ml-3"
<mask> onClick={handleUpdate}
<mask> disabled={processingUpdate}
<mask> >
<mask> <Trans>update_now</Trans>
<mask> </button>
<mask> }
<mask> </>
<mask> </Topline>;
<mask> };
<mask>
<mask> export default UpdateTopline;
</s> Pull request: all: imp ann url
Updates #4209.
Squashed commit of the following:
commit 0c31a59c5bf6bcc27a4779adf226d9a1ac9eece1
Merge: 803f32db 8455940b
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 1 19:33:55 2022 +0300
Merge branch 'master' into 4209-ann-url
commit 803f32dbc7276077a4374ed0f5e0a1fa36f91c9b
Author: Ildar Kamalov <[email protected]>
Date: Tue Feb 1 14:46:47 2022 +0300
client: add manual update link to update topline
commit ca375b52fa53503a3987b9723eb9a1d74878e890
Author: Ainar Garipov <[email protected]>
Date: Mon Jan 31 20:49:42 2022 +0300
all: imp ann url </s> add import { MANUAL_UPDATE_LINK } from '../../helpers/constants'; </s> add "manual_update": "Please <a>follow these steps</a> to update manually.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/76fa60498e6c67dc4b9222e8fcaa4a8f85de27eb
|
client/src/components/ui/UpdateTopline.js
|
replace replace replace replace
|
<mask> client/* linguist-vendored
<mask> client/src/__locales/*.json binary
<mask> # Make an exception for the english locale, as it is the base one.
<mask> client/src/__locales/en.json -binary
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.", </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.", </s> add "download_mobileconfig": "Download configuration file", </s> remove "rule_label": "Rule",
</s> add "rule_label": "Rule(s)", </s> remove "check_rule": "Rule: {{rule}}",
</s> add </s> remove return request(url, locale);
});
</s> add requests.push(request(url, locale));
// Don't request the Crowdin API too aggressively to prevent spurious
// 400 errors.
await sleep(200);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
.gitattributes
|
keep keep add keep keep keep keep keep
|
<mask> "form_error_ip_format": "Invalid IP format",
<mask> "form_error_mac_format": "Invalid MAC format",
<mask> "form_error_client_id_format": "Invalid client ID format",
<mask> "form_error_positive": "Must be greater than 0",
<mask> "form_error_negative": "Must be equal to 0 or greater",
<mask> "range_end_error": "Must be greater than range start",
<mask> "dhcp_form_gateway_input": "Gateway IP",
<mask> "dhcp_form_subnet_input": "Subnet mask",
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> add "form_error_server_name": "Nome server non valido", </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.", </s> add "download_mobileconfig": "Download configuration file", </s> remove "client_identifier_desc": "Klien dapat diidentifikasi dengan alamat IP atau alamat MAC. Harap dicatat bahwa menggunakan MAC sebagai pengidentifikasi hanya dimungkinkan jika AdGuard Home juga merupakan <0>server DHCP</0>",
</s> add </s> add "dns_over_quic": "DNS-over-QUIC",
"client_id": "Client ID",
"client_id_placeholder": "Enter client ID",
"client_id_desc": "Different clients can be identified by a special client ID. <a>Here</a> you can learn more about how to identify clients.", </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
client/src/__locales/en.json
|
keep add keep keep keep keep keep keep
|
<mask> "dns_over_https": "DNS-over-HTTPS",
<mask> "dns_over_tls": "DNS-over-TLS",
<mask> "download_mobileconfig_doh": "Download .mobileconfig for DNS-over-HTTPS",
<mask> "download_mobileconfig_dot": "Download .mobileconfig for DNS-over-TLS",
<mask> "download_mobileconfig": "Download configuration file",
<mask> "plain_dns": "Plain DNS",
<mask> "form_enter_rate_limit": "Enter rate limit",
<mask> "rate_limit": "Rate limit",
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> add "download_mobileconfig": "Download configuration file", </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.", </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.", </s> add "setup_dns_privacy_ioc_mac": "iOS and macOS configuration", </s> remove client/* linguist-vendored
client/src/__locales/*.json binary
# Make an exception for the english locale, as it is the base one.
client/src/__locales/en.json -binary
</s> add client/* linguist-vendored </s> remove const requests = locales.map((locale) => {
</s> add const requests = [];
for (let i = 0; i < locales.length; i++) {
const locale = locales[i];
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
client/src/__locales/en.json
|
keep keep add keep keep keep keep keep keep
|
<mask> "client_id_desc": "Different clients can be identified by a special client ID. <a>Here</a> you can learn more about how to identify clients.",
<mask> "download_mobileconfig_doh": "Download .mobileconfig for DNS-over-HTTPS",
<mask> "download_mobileconfig_dot": "Download .mobileconfig for DNS-over-TLS",
<mask> "plain_dns": "Plain DNS",
<mask> "form_enter_rate_limit": "Enter rate limit",
<mask> "rate_limit": "Rate limit",
<mask> "edns_enable": "Enable EDNS Client Subnet",
<mask> "edns_cs_desc": "If enabled, AdGuard Home will be sending clients' subnets to the DNS servers.",
<mask> "rate_limit_desc": "The number of requests per second that a single client is allowed to make (setting it to 0 means unlimited)",
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> add "dns_over_quic": "DNS-over-QUIC",
"client_id": "Client ID",
"client_id_placeholder": "Enter client ID",
"client_id_desc": "Different clients can be identified by a special client ID. <a>Here</a> you can learn more about how to identify clients.", </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.", </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.", </s> remove "check_rule": "Rule: {{rule}}",
</s> add </s> add "form_error_server_name": "Invalid server name", </s> remove "rule_label": "Rule",
</s> add "rule_label": "Rule(s)",
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
client/src/__locales/en.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "tracker_source": "Tracker source",
<mask> "source_label": "Source",
<mask> "found_in_known_domain_db": "Found in the known domains database.",
<mask> "category_label": "Category",
<mask> "rule_label": "Rule",
<mask> "list_label": "List",
<mask> "unknown_filter": "Unknown filter {{filterId}}",
<mask> "known_tracker": "Known tracker",
<mask> "install_welcome_title": "Welcome to AdGuard Home!",
<mask> "install_welcome_desc": "AdGuard Home is a network-wide ad-and-tracker blocking DNS server. Its purpose is to let you control your entire network and all your devices, and it does not require using a client-side program.",
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> remove "rule_label": "Regel",
</s> add "rule_label": "Regel(s)", </s> remove "rule_label": "Aturan",
</s> add </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.", </s> remove "check_rule": "Rule: {{rule}}",
</s> add </s> add "setup_dns_privacy_ioc_mac": "iOS and macOS configuration", </s> add "download_mobileconfig": "Download configuration file",
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
client/src/__locales/en.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "encryption_desc": "Encryption (HTTPS/TLS) support for both DNS and admin web interface",
<mask> "encryption_config_saved": "Encryption config saved",
<mask> "encryption_server": "Server name",
<mask> "encryption_server_enter": "Enter your domain name",
<mask> "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.",
<mask> "encryption_redirect": "Redirect to HTTPS automatically",
<mask> "encryption_redirect_desc": "If checked, AdGuard Home will automatically redirect you from HTTP to HTTPS addresses.",
<mask> "encryption_https": "HTTPS port",
<mask> "encryption_https_desc": "If HTTPS port is configured, AdGuard Home admin interface will be accessible via HTTPS, and it will also provide DNS-over-HTTPS on '/dns-query' location.",
<mask> "encryption_dot": "DNS-over-TLS port",
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> remove "encryption_server_desc": "Untuk menggunakan HTTPS, Anda harus memasukkan nama server yang cocok dengan sertifikat SSL Anda.",
</s> add </s> remove "encryption_server_desc": "Om HTTPS te gebruiken, voer de naam in van de server overeenkomstig met het SSL certificaat.",
</s> add "encryption_server_desc": "Om HTTPS te gebruiken, moet je de servernaam invoeren die overeenkomt met je SSL-certificaat of jokerteken-certificaat. Als het veld niet is ingesteld, accepteert het TLS-verbindingen voor elk domein.", </s> add "setup_dns_privacy_ioc_mac": "iOS and macOS configuration", </s> add "download_mobileconfig": "Download configuration file", </s> remove "rule_label": "Rule",
</s> add "rule_label": "Rule(s)", </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
client/src/__locales/en.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "client_new": "New Client",
<mask> "client_edit": "Edit Client",
<mask> "client_identifier": "Identifier",
<mask> "ip_address": "IP address",
<mask> "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
<mask> "form_enter_ip": "Enter IP",
<mask> "form_enter_mac": "Enter MAC",
<mask> "form_enter_id": "Enter identifier",
<mask> "form_add_id": "Add identifier",
<mask> "form_client_name": "Enter client name",
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> remove "client_identifier_desc": "Klien dapat diidentifikasi dengan alamat IP atau alamat MAC. Harap dicatat bahwa menggunakan MAC sebagai pengidentifikasi hanya dimungkinkan jika AdGuard Home juga merupakan <0>server DHCP</0>",
</s> add </s> add "dns_over_quic": "DNS-over-QUIC",
"client_id": "Client ID",
"client_id_placeholder": "Enter client ID",
"client_id_desc": "Different clients can be identified by a special client ID. <a>Here</a> you can learn more about how to identify clients.", </s> add "download_mobileconfig": "Download configuration file", </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.", </s> add "form_error_server_name": "Invalid server name", </s> add "form_error_server_name": "Nome server non valido",
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
client/src/__locales/en.json
|
keep add keep keep keep keep
|
<mask> "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> supports <1>DNS-over-HTTPS</1>.",
<mask> "setup_dns_privacy_other_5": "You will find more implementations <0>here</0> and <1>here</1>.",
<mask> "setup_dns_notice": "In order to use <1>DNS-over-HTTPS</1> or <1>DNS-over-TLS</1>, you need to <0>configure Encryption</0> in AdGuard Home settings.",
<mask> "rewrite_added": "DNS rewrite for \"{{key}}\" successfully added",
<mask> "rewrite_deleted": "DNS rewrite for \"{{key}}\" successfully deleted",
<mask> "rewrite_add": "Add DNS rewrite",
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> add "setup_dns_privacy_ioc_mac": "iOS en macOS configuratie", </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.", </s> add "download_mobileconfig": "Download configuration file", </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.", </s> remove "rule_label": "Rule",
</s> add "rule_label": "Rule(s)", </s> add "dns_over_quic": "DNS-over-QUIC",
"client_id": "Client ID",
"client_id_placeholder": "Enter client ID",
"client_id_desc": "Different clients can be identified by a special client ID. <a>Here</a> you can learn more about how to identify clients.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
client/src/__locales/en.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "host_whitelisted": "The host is whitelisted",
<mask> "check_ip": "IP addresses: {{ip}}",
<mask> "check_cname": "CNAME: {{cname}}",
<mask> "check_reason": "Reason: {{reason}}",
<mask> "check_rule": "Rule: {{rule}}",
<mask> "check_service": "Service name: {{service}}",
<mask> "service_name": "Service name",
<mask> "check_not_found": "Not found in your filter lists",
<mask> "client_confirm_block": "Are you sure you want to block the client \"{{ip}}\"?",
<mask> "client_confirm_unblock": "Are you sure you want to unblock the client \"{{ip}}\"?",
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> remove "check_rule": "Aturan: {{rule}}",
</s> add </s> remove "check_rule": "Regel: {{rule}}",
</s> add </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.", </s> remove "rule_label": "Rule",
</s> add "rule_label": "Rule(s)", </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.", </s> add "download_mobileconfig": "Download configuration file",
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
client/src/__locales/en.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "tracker_source": "Sumber pelacak",
<mask> "source_label": "Sumber",
<mask> "found_in_known_domain_db": "Ditemukan di database domain dikenal",
<mask> "category_label": "Kategori",
<mask> "rule_label": "Aturan",
<mask> "list_label": "Daftar",
<mask> "unknown_filter": "Penyaringan {{filterId}} tidak dikenal",
<mask> "known_tracker": "Pelacak yang dikenal",
<mask> "install_welcome_title": "Selamat datang di AdGuard Home!",
<mask> "install_welcome_desc": "AdGuard Home adalah sebuah server DNS pemblokiran iklan dan pelacak di jaringan. Tujuannya adalah memungkinkan anda mengkontrol seluruh jaringan dan semua perangkat anda, dan ini tidak membutuhkan aplikasi tambahan di klien",
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> remove "rule_label": "Rule",
</s> add "rule_label": "Rule(s)", </s> remove "rule_label": "Regel",
</s> add "rule_label": "Regel(s)", </s> remove "encryption_server_desc": "Untuk menggunakan HTTPS, Anda harus memasukkan nama server yang cocok dengan sertifikat SSL Anda.",
</s> add </s> remove "check_rule": "Aturan: {{rule}}",
</s> add </s> add "form_error_server_name": "Nome server non valido", </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
client/src/__locales/id.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "encryption_desc": "Enkripsi (HTTPS / TLS) untuk DNS dan antarmuka admin",
<mask> "encryption_config_saved": "Pengaturan enkripsi telah tersimpan",
<mask> "encryption_server": "Nama server",
<mask> "encryption_server_enter": "Masukkan nama domain anda",
<mask> "encryption_server_desc": "Untuk menggunakan HTTPS, Anda harus memasukkan nama server yang cocok dengan sertifikat SSL Anda.",
<mask> "encryption_redirect": "Alihkan ke HTTPS secara otomatis",
<mask> "encryption_redirect_desc": "Jika dicentang, AdGuard Home akan secara otomatis mengarahkan anda dari HTTP ke alamat HTTPS.",
<mask> "encryption_https": "Port HTTPS",
<mask> "encryption_https_desc": "Jika port HTTPS dikonfigurasi, antarmuka admin Home AdGuard akan dapat diakses melalui HTTPS, dan itu juga akan memberikan DNS-over-HTTPS di lokasi '/ dns-query'.",
<mask> "encryption_dot": "Port DNS-over-TLS",
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.", </s> remove "encryption_server_desc": "Om HTTPS te gebruiken, voer de naam in van de server overeenkomstig met het SSL certificaat.",
</s> add "encryption_server_desc": "Om HTTPS te gebruiken, moet je de servernaam invoeren die overeenkomt met je SSL-certificaat of jokerteken-certificaat. Als het veld niet is ingesteld, accepteert het TLS-verbindingen voor elk domein.", </s> remove "client_identifier_desc": "Klien dapat diidentifikasi dengan alamat IP atau alamat MAC. Harap dicatat bahwa menggunakan MAC sebagai pengidentifikasi hanya dimungkinkan jika AdGuard Home juga merupakan <0>server DHCP</0>",
</s> add </s> remove "rule_label": "Aturan",
</s> add </s> remove "check_rule": "Aturan: {{rule}}",
</s> add </s> add "form_error_server_name": "Nome server non valido",
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
client/src/__locales/id.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "client_new": "Klien Baru",
<mask> "client_edit": "Ubah Klien",
<mask> "client_identifier": "Identifikasi",
<mask> "ip_address": "Alamat IP",
<mask> "client_identifier_desc": "Klien dapat diidentifikasi dengan alamat IP atau alamat MAC. Harap dicatat bahwa menggunakan MAC sebagai pengidentifikasi hanya dimungkinkan jika AdGuard Home juga merupakan <0>server DHCP</0>",
<mask> "form_enter_ip": "Masukkan IP",
<mask> "form_enter_mac": "Masukkan MAC",
<mask> "form_enter_id": "Masukkan pengenal",
<mask> "form_add_id": "Tambah pengenal",
<mask> "form_client_name": "Masukkan nama klien",
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.", </s> remove "encryption_server_desc": "Untuk menggunakan HTTPS, Anda harus memasukkan nama server yang cocok dengan sertifikat SSL Anda.",
</s> add </s> add "form_error_server_name": "Invalid server name", </s> add "form_error_server_name": "Nome server non valido", </s> remove "check_rule": "Aturan: {{rule}}",
</s> add </s> remove "rule_label": "Aturan",
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
client/src/__locales/id.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "host_whitelisted": "Host didaftar putihkan",
<mask> "check_ip": "Alamat IP: {{ip}}",
<mask> "check_cname": "CNAME: {{cname}}",
<mask> "check_reason": "Alasan: {{reason}}",
<mask> "check_rule": "Aturan: {{rule}}",
<mask> "check_service": "Nama layanan: {{service}}",
<mask> "service_name": "Nama layanan",
<mask> "check_not_found": "Tidak di temukan di daftar penyaringan anda",
<mask> "client_confirm_block": "Apa anda yakin ingin mem-blokir klien ini \"{{ip}}\"?",
<mask> "client_confirm_unblock": "Apa anda yakin ingin meng-unblock klien ini \"{{ip}}\"?",
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> remove "check_rule": "Rule: {{rule}}",
</s> add </s> remove "check_rule": "Regel: {{rule}}",
</s> add </s> remove "rule_label": "Aturan",
</s> add </s> remove "encryption_server_desc": "Untuk menggunakan HTTPS, Anda harus memasukkan nama server yang cocok dengan sertifikat SSL Anda.",
</s> add </s> add "form_error_server_name": "Nome server non valido", </s> remove "client_identifier_desc": "Klien dapat diidentifikasi dengan alamat IP atau alamat MAC. Harap dicatat bahwa menggunakan MAC sebagai pengidentifikasi hanya dimungkinkan jika AdGuard Home juga merupakan <0>server DHCP</0>",
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
client/src/__locales/id.json
|
keep keep keep add keep keep keep keep keep keep
|
<mask> "form_error_ip6_format": "Formato IPv6 non valido",
<mask> "form_error_ip_format": "Formato IPv4 non valido",
<mask> "form_error_mac_format": "Formato MAC non valido",
<mask> "form_error_client_id_format": "Formato ID cliente non valido",
<mask> "form_error_positive": "Deve essere maggiore di 0",
<mask> "form_error_negative": "Deve essere maggiore o uguale a 0 (zero)",
<mask> "range_end_error": "Deve essere maggiore dell'intervallo di inizio",
<mask> "dhcp_form_gateway_input": "IP Gateway",
<mask> "dhcp_form_subnet_input": "Subnet mask",
<mask> "dhcp_form_range_title": "Range indirizzi IP",
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> add "form_error_server_name": "Invalid server name", </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.", </s> remove "rule_label": "Aturan",
</s> add </s> remove "check_rule": "Aturan: {{rule}}",
</s> add </s> remove "client_identifier_desc": "Klien dapat diidentifikasi dengan alamat IP atau alamat MAC. Harap dicatat bahwa menggunakan MAC sebagai pengidentifikasi hanya dimungkinkan jika AdGuard Home juga merupakan <0>server DHCP</0>",
</s> add </s> add "download_mobileconfig": "Download configuration file",
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
client/src/__locales/it.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "tracker_source": "Bron volger",
<mask> "source_label": "Bron",
<mask> "found_in_known_domain_db": "Gevonden in de bekende domeingegevensbank.",
<mask> "category_label": "Categorie",
<mask> "rule_label": "Regel",
<mask> "list_label": "Lijst",
<mask> "unknown_filter": "Onbekend filter {{filterId}}",
<mask> "known_tracker": "Bekende volger",
<mask> "install_welcome_title": "Welkom bij AdGuard Home!",
<mask> "install_welcome_desc": "AdGuard Home is een netwerk DNS-server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.",
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> remove "rule_label": "Rule",
</s> add "rule_label": "Rule(s)", </s> remove "rule_label": "Aturan",
</s> add </s> remove "encryption_server_desc": "Om HTTPS te gebruiken, voer de naam in van de server overeenkomstig met het SSL certificaat.",
</s> add "encryption_server_desc": "Om HTTPS te gebruiken, moet je de servernaam invoeren die overeenkomt met je SSL-certificaat of jokerteken-certificaat. Als het veld niet is ingesteld, accepteert het TLS-verbindingen voor elk domein.", </s> add "setup_dns_privacy_ioc_mac": "iOS en macOS configuratie", </s> remove "check_rule": "Regel: {{rule}}",
</s> add </s> remove "check_rule": "Rule: {{rule}}",
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
client/src/__locales/nl.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "encryption_desc": "Encryptie (HTTPS/TLS) ondersteuning voor DNS en admin web interface",
<mask> "encryption_config_saved": "Encryptie configuratie opgeslagen",
<mask> "encryption_server": "Server naam",
<mask> "encryption_server_enter": "Voer domein naam in",
<mask> "encryption_server_desc": "Om HTTPS te gebruiken, voer de naam in van de server overeenkomstig met het SSL certificaat.",
<mask> "encryption_redirect": "Herleid automatisch naar HTTPS",
<mask> "encryption_redirect_desc": "Indien ingeschakeld, zal AdGuard Home je automatisch herleiden van HTTP naar HTTPS.",
<mask> "encryption_https": "HTTPS poort",
<mask> "encryption_https_desc": "Als de HTTPS-poort is geconfigureerd, is de AdGuard Home beheerders interface toegankelijk via HTTPS en biedt deze ook DNS-via-HTTPS op de locatie '/ dns-query'.",
<mask> "encryption_dot": "DNS-via-TLS poort",
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.", </s> remove "encryption_server_desc": "Untuk menggunakan HTTPS, Anda harus memasukkan nama server yang cocok dengan sertifikat SSL Anda.",
</s> add </s> add "setup_dns_privacy_ioc_mac": "iOS en macOS configuratie", </s> remove "rule_label": "Regel",
</s> add "rule_label": "Regel(s)", </s> remove "check_rule": "Regel: {{rule}}",
</s> add </s> remove "rule_label": "Rule",
</s> add "rule_label": "Rule(s)",
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
client/src/__locales/nl.json
|
keep keep keep add keep keep keep keep keep
|
<mask> "setup_dns_privacy_other_2": "<0>dnsproxy</0> ondersteunt alle bekende beveiligde DNS-protocollen.",
<mask> "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> ondersteunt <1>DNS-via-HTTPS</1>.",
<mask> "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> ondersteunt <1>DNS-via-HTTPS</1>.",
<mask> "setup_dns_privacy_other_5": "U vindt meer implementaties <0> hier </0> en <1> hier </1>.",
<mask> "setup_dns_notice": "Om <1>DNS-via-HTTPS</1> of <1>DNS-via-TLS</1> te gebruiken, moet je <0>Versleuteling configureren</0> in de AdGuard Home instellingen.",
<mask> "rewrite_added": "DNS-herschrijving voor \"{{key}}\" met succes toegevoegd",
<mask> "rewrite_deleted": "DNS-herschrijving voor \"{{key}}\" met succes verwijderd",
<mask> "rewrite_add": "DNS-herschrijving toevoegen",
<mask> "rewrite_not_found": "Geen DNS-herschrijving gevonden",
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> add "setup_dns_privacy_ioc_mac": "iOS and macOS configuration", </s> remove "encryption_server_desc": "Om HTTPS te gebruiken, voer de naam in van de server overeenkomstig met het SSL certificaat.",
</s> add "encryption_server_desc": "Om HTTPS te gebruiken, moet je de servernaam invoeren die overeenkomt met je SSL-certificaat of jokerteken-certificaat. Als het veld niet is ingesteld, accepteert het TLS-verbindingen voor elk domein.", </s> remove "check_rule": "Regel: {{rule}}",
</s> add </s> remove "rule_label": "Regel",
</s> add "rule_label": "Regel(s)", </s> add "download_mobileconfig": "Download configuration file", </s> remove "rule_label": "Rule",
</s> add "rule_label": "Rule(s)",
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
client/src/__locales/nl.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "host_whitelisted": "De host staat op de toestemmingslijst",
<mask> "check_ip": "IP-adressen: {{ip}}",
<mask> "check_cname": "CNAME: {{cname}}",
<mask> "check_reason": "Reden: {{reason}}",
<mask> "check_rule": "Regel: {{rule}}",
<mask> "check_service": "Servicenaam: {{service}}",
<mask> "service_name": "Naam service",
<mask> "check_not_found": "Niet in je lijst met filters gevonden",
<mask> "client_confirm_block": "Weet je zeker dat je client \"{{ip}}\" wil blokkeren?",
<mask> "client_confirm_unblock": "Weet je zeker dat je client \"{{ip}}\" niet meer wil blokkeren?",
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> remove "check_rule": "Rule: {{rule}}",
</s> add </s> remove "check_rule": "Aturan: {{rule}}",
</s> add </s> remove "encryption_server_desc": "Om HTTPS te gebruiken, voer de naam in van de server overeenkomstig met het SSL certificaat.",
</s> add "encryption_server_desc": "Om HTTPS te gebruiken, moet je de servernaam invoeren die overeenkomt met je SSL-certificaat of jokerteken-certificaat. Als het veld niet is ingesteld, accepteert het TLS-verbindingen voor elk domein.", </s> add "setup_dns_privacy_ioc_mac": "iOS en macOS configuratie", </s> remove "rule_label": "Regel",
</s> add "rule_label": "Regel(s)", </s> add "dns_over_quic": "DNS-over-QUIC",
"client_id": "Client ID",
"client_id_placeholder": "Enter client ID",
"client_id_desc": "Different clients can be identified by a special client ID. <a>Here</a> you can learn more about how to identify clients.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
client/src/__locales/nl.json
|
keep keep keep add keep keep keep keep keep
|
<mask> console.log(err);
<mask> return `${locale} - Not OK`;
<mask> }));
<mask>
<mask> /**
<mask> * Download locales
<mask> */
<mask> const download = async () => {
<mask> const locales = LOCALES_LIST;
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> remove const download = () => {
</s> add const download = async () => { </s> remove const requests = locales.map((locale) => {
</s> add const requests = [];
for (let i = 0; i < locales.length; i++) {
const locale = locales[i]; </s> remove return request(url, locale);
});
</s> add requests.push(request(url, locale));
// Don't request the Crowdin API too aggressively to prevent spurious
// 400 errors.
await sleep(200);
} </s> remove "version": "0.2.0",
</s> add "version": "0.1.0", </s> remove "check_rule": "Rule: {{rule}}",
</s> add </s> add "form_error_server_name": "Invalid server name",
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
scripts/translations/download.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> /**
<mask> * Download locales
<mask> */
<mask> const download = () => {
<mask> const locales = LOCALES_LIST;
<mask>
<mask> if (!TWOSKY_URI) {
<mask> console.error('No credentials');
<mask> return;
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> add /**
* Sleep.
* @param {number} ms
*/
const sleep = (ms) => new Promise((resolve) => {
setTimeout(resolve, ms);
});
</s> remove const requests = locales.map((locale) => {
</s> add const requests = [];
for (let i = 0; i < locales.length; i++) {
const locale = locales[i]; </s> remove return request(url, locale);
});
</s> add requests.push(request(url, locale));
// Don't request the Crowdin API too aggressively to prevent spurious
// 400 errors.
await sleep(200);
} </s> remove "version": "0.2.0",
</s> add "version": "0.1.0", </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.", </s> remove "check_rule": "Rule: {{rule}}",
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
scripts/translations/download.js
|
keep keep keep replace keep replace replace keep keep keep
|
<mask> return;
<mask> }
<mask>
<mask> const requests = locales.map((locale) => {
<mask> const url = getRequestUrl(locale, TWOSKY_URI, TWOSKY_PROJECT_ID);
<mask> return request(url, locale);
<mask> });
<mask>
<mask> Promise
<mask> .all(requests)
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> add /**
* Sleep.
* @param {number} ms
*/
const sleep = (ms) => new Promise((resolve) => {
setTimeout(resolve, ms);
});
</s> remove const download = () => {
</s> add const download = async () => { </s> remove "version": "0.2.0",
</s> add "version": "0.1.0", </s> add "download_mobileconfig": "Download configuration file", </s> remove "check_rule": "Rule: {{rule}}",
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
scripts/translations/download.js
|
keep keep replace keep keep keep keep keep
|
<mask> {
<mask> "name": "translations",
<mask> "version": "0.2.0",
<mask> "lockfileVersion": 1,
<mask> "requires": true,
<mask> "dependencies": {
<mask> "ajv": {
<mask> "version": "6.5.5",
</s> Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master
Updates #2643.
Squashed commit of the following:
commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:41:52 2021 +0300
all: reupd locales
commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:41 2021 +0300
scripts: imp translations downloading
commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 10 14:33:10 2021 +0300
Merge branch 'master' into revert-locales
commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 16:52:56 2021 +0300
Merge branch 'master' into revert-locales
commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 13:17:30 2021 +0300
Merge branch 'master' into revert-locales
commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 9 12:47:47 2021 +0300
client: revert 5a1e04c2 </s> remove const download = () => {
</s> add const download = async () => { </s> remove const requests = locales.map((locale) => {
</s> add const requests = [];
for (let i = 0; i < locales.length; i++) {
const locale = locales[i]; </s> add /**
* Sleep.
* @param {number} ms
*/
const sleep = (ms) => new Promise((resolve) => {
setTimeout(resolve, ms);
});
</s> remove return request(url, locale);
});
</s> add requests.push(request(url, locale));
// Don't request the Crowdin API too aggressively to prevent spurious
// 400 errors.
await sleep(200);
} </s> remove "check_rule": "Rule: {{rule}}",
</s> add </s> add "form_error_server_name": "Invalid server name",
|
https://github.com/AdguardTeam/AdGuardHome/commit/771a32cc9d8eaab12c09af406f2a1a82d54c68bf
|
scripts/translations/package-lock.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "blocked_threats": "Blokir Ancaman",
<mask> "allowed": "Dibolehkan",
<mask> "filtered": "Tersaring",
<mask> "rewritten": "Tulis ulang",
<mask> "safe_search": "Pencarian aman",
<mask> "blocklist": "Daftar blokir",
<mask> "milliseconds_abbreviation": "ms",
<mask> "cache_size": "Ukuran cache",
<mask> "cache_size_desc": "Ukuran DNS cache (dalam bit)",
<mask> "cache_ttl_min_override": "Tumpuk TTL minimum",
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "safe_search": "Ricerca sicura",
</s> add "safe_search": "Ricerca Sicura", </s> remove "cache_size_desc": "Dimensioni cache DNS (in byte)",
</s> add "cache_size_desc": "Dimensioni cache DNS (in byte).", </s> remove "cache_size_desc": "DNS cache grootte (in bytes)",
</s> add "cache_size_desc": "DNS-cache grootte (in bytes).", </s> remove "cache_ttl_min_override_desc": "Estende i valori brevi (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS",
"cache_ttl_max_override_desc": "Imposta un periodo massimo di attivazione (in secondi) per le voci nella cache DNS",
"ttl_cache_validation": "Il valore minimo della cache TTL deve essere inferiore o uguale al valore massimo",
</s> add "cache_ttl_min_override_desc": "Estende i valori di breve durata (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS.",
"cache_ttl_max_override_desc": "Imposta un valore di durata massima (secondi) per le voci nella cache DNS.",
"ttl_cache_validation": "La sovrascrittura del valore TTL minimo della cache deve essere inferiore o uguale a quello massimo.", </s> remove "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
</s> add "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden.",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache.",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde.", </s> remove "encryption_desc": "Encryptie (HTTPS/TLS) ondersteuning voor DNS en admin web interface",
</s> add "encryption_desc": "Encryptie (HTTPS/TLS) ondersteuning voor DNS en admin web interface.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/id.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "port_53_faq_link": "Port 53 sering ditempati oleh layanan \"DNSStubListener\" atau \"systemd-resolved\". Silakan baca <0>instruksi ini</0> tentang cara menyelesaikan ini.",
<mask> "adg_will_drop_dns_queries": "AdGuard Home akan menghapus semua permintaan DNS dari klien ini.",
<mask> "filter_allowlist": "PERINGATAN: Tindakan ini juga akan mengecualikan aturan \"{{disallowed_rule}}\" dari daftar klien yang diizinkan.",
<mask> "last_rule_in_allowlist": "Tidak dapat melarang klien ini karena mengecualikan aturan \"{{disallowed_rule}}\" akan MENONAKTIFKAN daftar \"Klien yang diizinkan\".",
<mask> "experimental": "Eksperimental",
<mask> "use_saved_key": "Gunakan kunci yang disimpan sebelumnya",
<mask> "parental_control": "Kontrol Orang Tua",
<mask> "safe_browsing": "Penjelajahan Aman",
<mask> "served_from_cache": "{{value}} <i>(disajikan dari cache)</i>"
<mask> }
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "experimental": "Experimenteel",
</s> add </s> remove "served_from_cache": "{{value}} <i>(geleverd vanuit cache)</i>"
</s> add "served_from_cache": "{{value}} <i>(geleverd vanuit cache)</i>",
"form_error_password_length": "Wachtwoord moet minimaal {{value}} tekens lang zijn." </s> remove "served_from_cache": "{{value}} <i>(fornito dalla cache)</i>"
</s> add "served_from_cache": "{{value}} <i>(fornito dalla cache)</i>",
"form_error_password_length": "La password deve essere lunga almeno {{value}} caratteri." </s> remove "safe_search": "Pencarian aman",
</s> add "safe_search": "Aktifkan Pencarian Aman", </s> remove "dns_status_error": "Fout bij het oproepen van de DNS-server status",
</s> add "dns_status_error": "Fout bij het controleren van de DNS-server status.", </s> remove "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
</s> add "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden.",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache.",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/id.json
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> "dhcp_leases_not_found": "Nessun lease DHCP trovato",
<mask> "dhcp_config_saved": "Salvataggio configurazione server DHCP riuscito",
<mask> "dhcp_ipv4_settings": "Impostazioni DHCP IPv4",
<mask> "dhcp_ipv6_settings": "Impostazioni DHCP IPv6",
<mask> "form_error_required": "Campo richiesto",
<mask> "form_error_ip4_format": "Indirizzo IPv4 non valido",
<mask> "form_error_ip4_range_start_format": "Indirizzo IPV4 non valido dell'intervallo iniziale",
<mask> "form_error_ip4_range_end_format": "Indirizzo IPV4 non valido dell'intervallo finale",
<mask> "form_error_ip4_gateway_format": "Indirizzo gateway IPv4 non valido",
<mask> "form_error_ip6_format": "Indirizzo IPv6 non valido",
<mask> "form_error_ip_format": "Indirizzo IP non valido",
<mask> "form_error_mac_format": "Indirizzo MAC non valido",
<mask> "form_error_client_id_format": "Il client ID deve contenere solo numeri, lettere minuscole e trattini",
<mask> "form_error_server_name": "Nome server non valido",
<mask> "form_error_subnet": "La subnet \"{{cidr}}\" non contiene l'indirizzo IP \"{{ip}}\"",
<mask> "form_error_positive": "Deve essere maggiore di 0",
<mask> "out_of_range_error": "Deve essere fuori intervallo \"{{start}}\"-\"{{end}}\"",
<mask> "lower_range_start_error": "Deve essere inferiore dell'intervallo di inizio",
<mask> "greater_range_start_error": "Deve essere maggiore dell'intervallo di inizio",
<mask> "greater_range_end_error": "Deve essere maggiore dell'intervallo di fine",
<mask> "subnet_error": "Gli indirizzi devono trovarsi in una sottorete",
<mask> "gateway_or_subnet_invalid": "Maschera di sottorete non valida",
<mask> "dhcp_form_gateway_input": "IP Gateway",
<mask> "dhcp_form_subnet_input": "Maschera di sottorete",
<mask> "dhcp_form_range_title": "Intervallo di indirizzi IP",
<mask> "dhcp_form_range_start": "Intervallo iniziale",
<mask> "dhcp_form_range_end": "Intervallo finale",
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "form_error_domain_format": "Formato del dominio non valido",
"form_error_answer_format": "Formato di risposta non valido",
</s> add "form_error_domain_format": "Formato del dominio non valido.",
"form_error_answer_format": "Formato di risposta non valido.", </s> remove "form_error_url_format": "Formato url non valido",
"form_error_url_or_path_format": "URL o percorso assoluto dell'elenco non validi",
</s> add "form_error_url_format": "Formato URL non valido.",
"form_error_url_or_path_format": "URL o percorso assoluto dell'elenco non validi.", </s> remove "cache_ttl_min_override_desc": "Estende i valori brevi (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS",
"cache_ttl_max_override_desc": "Imposta un periodo massimo di attivazione (in secondi) per le voci nella cache DNS",
"ttl_cache_validation": "Il valore minimo della cache TTL deve essere inferiore o uguale al valore massimo",
</s> add "cache_ttl_min_override_desc": "Estende i valori di breve durata (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS.",
"cache_ttl_max_override_desc": "Imposta un valore di durata massima (secondi) per le voci nella cache DNS.",
"ttl_cache_validation": "La sovrascrittura del valore TTL minimo della cache deve essere inferiore o uguale a quello massimo.", </s> remove "clients_title": "Client",
"clients_desc": "Configura i dispositivi connessi ad AdGuard Home",
</s> add "clients_title": "Client persistenti",
"clients_desc": "Configura le registrazioni dei client persistenti per i dispositivi connessi ad AdGuard Home.", </s> remove "served_from_cache": "{{value}} <i>(fornito dalla cache)</i>"
</s> add "served_from_cache": "{{value}} <i>(fornito dalla cache)</i>",
"form_error_password_length": "La password deve essere lunga almeno {{value}} caratteri." </s> remove "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
</s> add "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden.",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache.",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/it.json
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> "choose_blocklist": "Scegli liste nere",
<mask> "choose_allowlist": "Scegli liste bianche",
<mask> "enter_valid_blocklist": "Inserisci un URL valido alla lista nera.",
<mask> "enter_valid_allowlist": "Inserisci un URL valido alla lista bianca.",
<mask> "form_error_url_format": "Formato url non valido",
<mask> "form_error_url_or_path_format": "URL o percorso assoluto dell'elenco non validi",
<mask> "custom_filter_rules": "Regole filtri personalizzate",
<mask> "custom_filter_rules_hint": "Inserisci una regola per riga. Puoi utilizzare la sintassi delle regole blocca-annunci o quelle dei file hosts.",
<mask> "system_host_files": "File host di sistema",
<mask> "examples_title": "Esempi",
<mask> "example_meaning_filter_block": "blocca accesso al dominio example.org e a tutti i suoi sottodomini",
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "form_error_domain_format": "Formato del dominio non valido",
"form_error_answer_format": "Formato di risposta non valido",
</s> add "form_error_domain_format": "Formato del dominio non valido.",
"form_error_answer_format": "Formato di risposta non valido.", </s> remove "form_error_url_format": "Neveljaven format URL naslova",
</s> add "form_error_url_format": "Neveljaven format URL naslova.", </s> remove "cache_ttl_min_override_desc": "Estende i valori brevi (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS",
"cache_ttl_max_override_desc": "Imposta un periodo massimo di attivazione (in secondi) per le voci nella cache DNS",
"ttl_cache_validation": "Il valore minimo della cache TTL deve essere inferiore o uguale al valore massimo",
</s> add "cache_ttl_min_override_desc": "Estende i valori di breve durata (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS.",
"cache_ttl_max_override_desc": "Imposta un valore di durata massima (secondi) per le voci nella cache DNS.",
"ttl_cache_validation": "La sovrascrittura del valore TTL minimo della cache deve essere inferiore o uguale a quello massimo.", </s> remove "form_error_required": "Campo richiesto",
"form_error_ip4_format": "Indirizzo IPv4 non valido",
"form_error_ip4_range_start_format": "Indirizzo IPV4 non valido dell'intervallo iniziale",
"form_error_ip4_range_end_format": "Indirizzo IPV4 non valido dell'intervallo finale",
"form_error_ip4_gateway_format": "Indirizzo gateway IPv4 non valido",
"form_error_ip6_format": "Indirizzo IPv6 non valido",
"form_error_ip_format": "Indirizzo IP non valido",
"form_error_mac_format": "Indirizzo MAC non valido",
"form_error_client_id_format": "Il client ID deve contenere solo numeri, lettere minuscole e trattini",
"form_error_server_name": "Nome server non valido",
"form_error_subnet": "La subnet \"{{cidr}}\" non contiene l'indirizzo IP \"{{ip}}\"",
"form_error_positive": "Deve essere maggiore di 0",
"out_of_range_error": "Deve essere fuori intervallo \"{{start}}\"-\"{{end}}\"",
"lower_range_start_error": "Deve essere inferiore dell'intervallo di inizio",
"greater_range_start_error": "Deve essere maggiore dell'intervallo di inizio",
"greater_range_end_error": "Deve essere maggiore dell'intervallo di fine",
"subnet_error": "Gli indirizzi devono trovarsi in una sottorete",
"gateway_or_subnet_invalid": "Maschera di sottorete non valida",
</s> add "form_error_required": "Campo richiesto.",
"form_error_ip4_format": "Indirizzo IPv4 non valido.",
"form_error_ip4_range_start_format": "Indirizzo IPV4 non valido dell'intervallo iniziale.",
"form_error_ip4_range_end_format": "Indirizzo IPV4 non valido dell'intervallo finale.",
"form_error_ip4_gateway_format": "Indirizzo gateway IPv4 non valido.",
"form_error_ip6_format": "Indirizzo IPv6 non valido.",
"form_error_ip_format": "Indirizzo IP non valido.",
"form_error_mac_format": "Indirizzo MAC non valido.",
"form_error_client_id_format": "Il ClientID deve contenere solo numeri, lettere minuscole, e trattini.",
"form_error_server_name": "Nome server non valido.",
"form_error_subnet": "Il subnet \"{{cidr}}\" non contiene l'indirizzo IP \"{{ip}}\".",
"form_error_positive": "Deve essere maggiore di 0.",
"out_of_range_error": "Deve essere fuori intervallo \"{{start}}\"-\"{{end}}\".",
"lower_range_start_error": "Deve essere inferiore dell'intervallo di inizio.",
"greater_range_start_error": "Deve essere maggiore dell'intervallo di inizio.",
"greater_range_end_error": "Deve essere maggiore dell'intervallo di fine.",
"subnet_error": "Gli indirizzi devono trovarsi in una sottorete.",
"gateway_or_subnet_invalid": "Maschera di sottorete non valida.", </s> remove "clients_title": "Client",
"clients_desc": "Configura i dispositivi connessi ad AdGuard Home",
</s> add "clients_title": "Client persistenti",
"clients_desc": "Configura le registrazioni dei client persistenti per i dispositivi connessi ad AdGuard Home.", </s> remove "disabled_parental_toast": "Ouderlijk toezicht uitgeschakeld",
"enabled_parental_toast": "Ouderlijk toezicht ingeschakeld",
"disabled_safe_search_toast": "Veilig zoeken uitgeschakeld",
"enabled_save_search_toast": "Veilig zoeken ingeschakeld",
</s> add "disabled_parental_toast": "Uitgeschakeld ouderlijk toezicht",
"enabled_parental_toast": "Ingeschakeld Ouderlijk toezicht",
"disabled_safe_search_toast": "Uitgeschakeld Veilig zoeken",
"enabled_save_search_toast": "Ingeschakeld Veilig zoeken",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/it.json
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> "update_now": "Aggiorna ora",
<mask> "update_failed": "Aggiornamento automatico non riuscito. Ti suggeriamo di <a>seguire questi passaggi</a> per aggiornare manualmente.",
<mask> "manual_update": "Ti invitiamo a <a>seguire questi passaggi</a> per aggiornare manualmente.",
<mask> "processing_update": "Perfavore aspetta, AdGuard Home si sta aggiornando",
<mask> "clients_title": "Client",
<mask> "clients_desc": "Configura i dispositivi connessi ad AdGuard Home",
<mask> "settings_global": "Globale",
<mask> "settings_custom": "Personalizzato",
<mask> "table_client": "Client",
<mask> "table_name": "Nome",
<mask> "save_btn": "Salva",
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "clients_title": "Gebruikers",
"clients_desc": "Configureer apparaten die gebruik maken van AdGuard Home",
</s> add "clients_title": "Permanente clients",
"clients_desc": "Permanente client-records configureren voor apparaten verboden met AdGuard Home.", </s> remove "cache_ttl_min_override_desc": "Estende i valori brevi (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS",
"cache_ttl_max_override_desc": "Imposta un periodo massimo di attivazione (in secondi) per le voci nella cache DNS",
"ttl_cache_validation": "Il valore minimo della cache TTL deve essere inferiore o uguale al valore massimo",
</s> add "cache_ttl_min_override_desc": "Estende i valori di breve durata (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS.",
"cache_ttl_max_override_desc": "Imposta un valore di durata massima (secondi) per le voci nella cache DNS.",
"ttl_cache_validation": "La sovrascrittura del valore TTL minimo della cache deve essere inferiore o uguale a quello massimo.", </s> remove "form_error_url_format": "Formato url non valido",
"form_error_url_or_path_format": "URL o percorso assoluto dell'elenco non validi",
</s> add "form_error_url_format": "Formato URL non valido.",
"form_error_url_or_path_format": "URL o percorso assoluto dell'elenco non validi.", </s> remove "form_error_required": "Campo richiesto",
"form_error_ip4_format": "Indirizzo IPv4 non valido",
"form_error_ip4_range_start_format": "Indirizzo IPV4 non valido dell'intervallo iniziale",
"form_error_ip4_range_end_format": "Indirizzo IPV4 non valido dell'intervallo finale",
"form_error_ip4_gateway_format": "Indirizzo gateway IPv4 non valido",
"form_error_ip6_format": "Indirizzo IPv6 non valido",
"form_error_ip_format": "Indirizzo IP non valido",
"form_error_mac_format": "Indirizzo MAC non valido",
"form_error_client_id_format": "Il client ID deve contenere solo numeri, lettere minuscole e trattini",
"form_error_server_name": "Nome server non valido",
"form_error_subnet": "La subnet \"{{cidr}}\" non contiene l'indirizzo IP \"{{ip}}\"",
"form_error_positive": "Deve essere maggiore di 0",
"out_of_range_error": "Deve essere fuori intervallo \"{{start}}\"-\"{{end}}\"",
"lower_range_start_error": "Deve essere inferiore dell'intervallo di inizio",
"greater_range_start_error": "Deve essere maggiore dell'intervallo di inizio",
"greater_range_end_error": "Deve essere maggiore dell'intervallo di fine",
"subnet_error": "Gli indirizzi devono trovarsi in una sottorete",
"gateway_or_subnet_invalid": "Maschera di sottorete non valida",
</s> add "form_error_required": "Campo richiesto.",
"form_error_ip4_format": "Indirizzo IPv4 non valido.",
"form_error_ip4_range_start_format": "Indirizzo IPV4 non valido dell'intervallo iniziale.",
"form_error_ip4_range_end_format": "Indirizzo IPV4 non valido dell'intervallo finale.",
"form_error_ip4_gateway_format": "Indirizzo gateway IPv4 non valido.",
"form_error_ip6_format": "Indirizzo IPv6 non valido.",
"form_error_ip_format": "Indirizzo IP non valido.",
"form_error_mac_format": "Indirizzo MAC non valido.",
"form_error_client_id_format": "Il ClientID deve contenere solo numeri, lettere minuscole, e trattini.",
"form_error_server_name": "Nome server non valido.",
"form_error_subnet": "Il subnet \"{{cidr}}\" non contiene l'indirizzo IP \"{{ip}}\".",
"form_error_positive": "Deve essere maggiore di 0.",
"out_of_range_error": "Deve essere fuori intervallo \"{{start}}\"-\"{{end}}\".",
"lower_range_start_error": "Deve essere inferiore dell'intervallo di inizio.",
"greater_range_start_error": "Deve essere maggiore dell'intervallo di inizio.",
"greater_range_end_error": "Deve essere maggiore dell'intervallo di fine.",
"subnet_error": "Gli indirizzi devono trovarsi in una sottorete.",
"gateway_or_subnet_invalid": "Maschera di sottorete non valida.", </s> remove "form_error_domain_format": "Formato del dominio non valido",
"form_error_answer_format": "Formato di risposta non valido",
</s> add "form_error_domain_format": "Formato del dominio non valido.",
"form_error_answer_format": "Formato di risposta non valido.", </s> remove "form_error_port": "Geldige poortwaarde invoeren",
</s> add "form_error_port": "Geldig poortnummer invoeren.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/it.json
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> "rewrite_hosts_applied": "Riscritto dal file delle regole host",
<mask> "dns_rewrites": "Riscrittura DNS",
<mask> "form_domain": "Inserisci il dominio",
<mask> "form_answer": "Inserisci l'indirizzo IP o il nome del dominio",
<mask> "form_error_domain_format": "Formato del dominio non valido",
<mask> "form_error_answer_format": "Formato di risposta non valido",
<mask> "configure": "Configura",
<mask> "main_settings": "Impostazioni principali",
<mask> "block_services": "Blocca servizi specifici",
<mask> "blocked_services": "Servizi bloccati",
<mask> "blocked_services_desc": "Consente di bloccare rapidamente siti e servizi popolari.",
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "form_error_url_format": "Formato url non valido",
"form_error_url_or_path_format": "URL o percorso assoluto dell'elenco non validi",
</s> add "form_error_url_format": "Formato URL non valido.",
"form_error_url_or_path_format": "URL o percorso assoluto dell'elenco non validi.", </s> remove "form_error_domain_format": "Ongeldige domeinnaam",
"form_error_answer_format": "Ongeldig antwoord",
</s> add "form_error_domain_format": "Ongeldige opmaak domein.",
"form_error_answer_format": "Ongeldig opmaak antwoord.", </s> remove "form_error_required": "Campo richiesto",
"form_error_ip4_format": "Indirizzo IPv4 non valido",
"form_error_ip4_range_start_format": "Indirizzo IPV4 non valido dell'intervallo iniziale",
"form_error_ip4_range_end_format": "Indirizzo IPV4 non valido dell'intervallo finale",
"form_error_ip4_gateway_format": "Indirizzo gateway IPv4 non valido",
"form_error_ip6_format": "Indirizzo IPv6 non valido",
"form_error_ip_format": "Indirizzo IP non valido",
"form_error_mac_format": "Indirizzo MAC non valido",
"form_error_client_id_format": "Il client ID deve contenere solo numeri, lettere minuscole e trattini",
"form_error_server_name": "Nome server non valido",
"form_error_subnet": "La subnet \"{{cidr}}\" non contiene l'indirizzo IP \"{{ip}}\"",
"form_error_positive": "Deve essere maggiore di 0",
"out_of_range_error": "Deve essere fuori intervallo \"{{start}}\"-\"{{end}}\"",
"lower_range_start_error": "Deve essere inferiore dell'intervallo di inizio",
"greater_range_start_error": "Deve essere maggiore dell'intervallo di inizio",
"greater_range_end_error": "Deve essere maggiore dell'intervallo di fine",
"subnet_error": "Gli indirizzi devono trovarsi in una sottorete",
"gateway_or_subnet_invalid": "Maschera di sottorete non valida",
</s> add "form_error_required": "Campo richiesto.",
"form_error_ip4_format": "Indirizzo IPv4 non valido.",
"form_error_ip4_range_start_format": "Indirizzo IPV4 non valido dell'intervallo iniziale.",
"form_error_ip4_range_end_format": "Indirizzo IPV4 non valido dell'intervallo finale.",
"form_error_ip4_gateway_format": "Indirizzo gateway IPv4 non valido.",
"form_error_ip6_format": "Indirizzo IPv6 non valido.",
"form_error_ip_format": "Indirizzo IP non valido.",
"form_error_mac_format": "Indirizzo MAC non valido.",
"form_error_client_id_format": "Il ClientID deve contenere solo numeri, lettere minuscole, e trattini.",
"form_error_server_name": "Nome server non valido.",
"form_error_subnet": "Il subnet \"{{cidr}}\" non contiene l'indirizzo IP \"{{ip}}\".",
"form_error_positive": "Deve essere maggiore di 0.",
"out_of_range_error": "Deve essere fuori intervallo \"{{start}}\"-\"{{end}}\".",
"lower_range_start_error": "Deve essere inferiore dell'intervallo di inizio.",
"greater_range_start_error": "Deve essere maggiore dell'intervallo di inizio.",
"greater_range_end_error": "Deve essere maggiore dell'intervallo di fine.",
"subnet_error": "Gli indirizzi devono trovarsi in una sottorete.",
"gateway_or_subnet_invalid": "Maschera di sottorete non valida.", </s> remove "cache_ttl_min_override_desc": "Estende i valori brevi (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS",
"cache_ttl_max_override_desc": "Imposta un periodo massimo di attivazione (in secondi) per le voci nella cache DNS",
"ttl_cache_validation": "Il valore minimo della cache TTL deve essere inferiore o uguale al valore massimo",
</s> add "cache_ttl_min_override_desc": "Estende i valori di breve durata (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS.",
"cache_ttl_max_override_desc": "Imposta un valore di durata massima (secondi) per le voci nella cache DNS.",
"ttl_cache_validation": "La sovrascrittura del valore TTL minimo della cache deve essere inferiore o uguale a quello massimo.", </s> remove "clients_title": "Client",
"clients_desc": "Configura i dispositivi connessi ad AdGuard Home",
</s> add "clients_title": "Client persistenti",
"clients_desc": "Configura le registrazioni dei client persistenti per i dispositivi connessi ad AdGuard Home.", </s> remove "form_error_url_format": "Neveljaven format URL naslova",
</s> add "form_error_url_format": "Neveljaven format URL naslova.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/it.json
|
keep keep keep replace keep keep keep replace keep keep keep keep
|
<mask> "allowed": "Consentito",
<mask> "filtered": "Filtrato",
<mask> "rewritten": "Riscritto",
<mask> "safe_search": "Ricerca sicura",
<mask> "blocklist": "Lista nera",
<mask> "milliseconds_abbreviation": "ms",
<mask> "cache_size": "Dimensioni cache",
<mask> "cache_size_desc": "Dimensioni cache DNS (in byte)",
<mask> "cache_ttl_min_override": "Sovrascrivi TTL minimo",
<mask> "cache_ttl_max_override": "Sovrascrivi TTL massimo",
<mask> "enter_cache_size": "Immetti dimensioni cache (in byte)",
<mask> "enter_cache_ttl_min_override": "Immetti TTL minimo (in secondi)",
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "cache_ttl_min_override_desc": "Estende i valori brevi (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS",
"cache_ttl_max_override_desc": "Imposta un periodo massimo di attivazione (in secondi) per le voci nella cache DNS",
"ttl_cache_validation": "Il valore minimo della cache TTL deve essere inferiore o uguale al valore massimo",
</s> add "cache_ttl_min_override_desc": "Estende i valori di breve durata (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS.",
"cache_ttl_max_override_desc": "Imposta un valore di durata massima (secondi) per le voci nella cache DNS.",
"ttl_cache_validation": "La sovrascrittura del valore TTL minimo della cache deve essere inferiore o uguale a quello massimo.", </s> remove "cache_size_desc": "DNS cache grootte (in bytes)",
</s> add "cache_size_desc": "DNS-cache grootte (in bytes).", </s> remove "safe_search": "Pencarian aman",
</s> add "safe_search": "Aktifkan Pencarian Aman", </s> remove "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
</s> add "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden.",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache.",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde.", </s> remove "encryption_desc": "Encryptie (HTTPS/TLS) ondersteuning voor DNS en admin web interface",
</s> add "encryption_desc": "Encryptie (HTTPS/TLS) ondersteuning voor DNS en admin web interface.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/it.json
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> "cache_ttl_max_override": "Sovrascrivi TTL massimo",
<mask> "enter_cache_size": "Immetti dimensioni cache (in byte)",
<mask> "enter_cache_ttl_min_override": "Immetti TTL minimo (in secondi)",
<mask> "enter_cache_ttl_max_override": "Immetti TTL massimo (in secondi)",
<mask> "cache_ttl_min_override_desc": "Estende i valori brevi (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS",
<mask> "cache_ttl_max_override_desc": "Imposta un periodo massimo di attivazione (in secondi) per le voci nella cache DNS",
<mask> "ttl_cache_validation": "Il valore minimo della cache TTL deve essere inferiore o uguale al valore massimo",
<mask> "cache_optimistic": "Optimistic caching",
<mask> "cache_optimistic_desc": "Fai in modo che AdGuard Home risponda dalla cache anche quando le voci risultano scadute e prova anche ad aggiornarle.",
<mask> "filter_category_general": "Generali",
<mask> "filter_category_security": "Sicurezza",
<mask> "filter_category_regional": "Regionale",
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "cache_size_desc": "Dimensioni cache DNS (in byte)",
</s> add "cache_size_desc": "Dimensioni cache DNS (in byte).", </s> remove "cache_size_desc": "DNS cache grootte (in bytes)",
</s> add "cache_size_desc": "DNS-cache grootte (in bytes).", </s> remove "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
</s> add "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden.",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache.",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde.", </s> remove "safe_search": "Ricerca sicura",
</s> add "safe_search": "Ricerca Sicura", </s> remove "form_error_url_format": "Formato url non valido",
"form_error_url_or_path_format": "URL o percorso assoluto dell'elenco non validi",
</s> add "form_error_url_format": "Formato URL non valido.",
"form_error_url_or_path_format": "URL o percorso assoluto dell'elenco non validi.", </s> remove "clients_title": "Client",
"clients_desc": "Configura i dispositivi connessi ad AdGuard Home",
</s> add "clients_title": "Client persistenti",
"clients_desc": "Configura le registrazioni dei client persistenti per i dispositivi connessi ad AdGuard Home.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/it.json
|
keep keep keep keep replace keep
|
<mask> "experimental": "Sperimentale",
<mask> "use_saved_key": "Utilizza la chiave salvata in precedenza",
<mask> "parental_control": "Controllo Parentale",
<mask> "safe_browsing": "Navigazione Sicura",
<mask> "served_from_cache": "{{value}} <i>(fornito dalla cache)</i>"
<mask> }
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "served_from_cache": "{{value}} <i>(geleverd vanuit cache)</i>"
</s> add "served_from_cache": "{{value}} <i>(geleverd vanuit cache)</i>",
"form_error_password_length": "Wachtwoord moet minimaal {{value}} tekens lang zijn." </s> remove "experimental": "Eksperimental",
</s> add </s> remove "experimental": "Experimenteel",
</s> add </s> remove "cache_ttl_min_override_desc": "Estende i valori brevi (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS",
"cache_ttl_max_override_desc": "Imposta un periodo massimo di attivazione (in secondi) per le voci nella cache DNS",
"ttl_cache_validation": "Il valore minimo della cache TTL deve essere inferiore o uguale al valore massimo",
</s> add "cache_ttl_min_override_desc": "Estende i valori di breve durata (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS.",
"cache_ttl_max_override_desc": "Imposta un valore di durata massima (secondi) per le voci nella cache DNS.",
"ttl_cache_validation": "La sovrascrittura del valore TTL minimo della cache deve essere inferiore o uguale a quello massimo.", </s> remove "safe_search": "Ricerca sicura",
</s> add "safe_search": "Ricerca Sicura", </s> remove "form_error_url_format": "Formato url non valido",
"form_error_url_or_path_format": "URL o percorso assoluto dell'elenco non validi",
</s> add "form_error_url_format": "Formato URL non valido.",
"form_error_url_or_path_format": "URL o percorso assoluto dell'elenco non validi.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/it.json
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> "disabled_filtering_toast": "Filters uitgeschakeld",
<mask> "enabled_filtering_toast": "Filters ingeschakeld",
<mask> "disabled_safe_browsing_toast": "Veilig browsen uitgeschakeld",
<mask> "enabled_safe_browsing_toast": "Veilig browsen ingeschakeld",
<mask> "disabled_parental_toast": "Ouderlijk toezicht uitgeschakeld",
<mask> "enabled_parental_toast": "Ouderlijk toezicht ingeschakeld",
<mask> "disabled_safe_search_toast": "Veilig zoeken uitgeschakeld",
<mask> "enabled_save_search_toast": "Veilig zoeken ingeschakeld",
<mask> "enabled_table_header": "Ingeschakeld",
<mask> "name_table_header": "Naam",
<mask> "list_url_table_header": "URL lijst",
<mask> "rules_count_table_header": "Aantal regels",
<mask> "last_time_updated_table_header": "Laatste update",
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "served_from_cache": "{{value}} <i>(geleverd vanuit cache)</i>"
</s> add "served_from_cache": "{{value}} <i>(geleverd vanuit cache)</i>",
"form_error_password_length": "Wachtwoord moet minimaal {{value}} tekens lang zijn." </s> remove "experimental": "Experimenteel",
</s> add </s> remove "cache_size_desc": "DNS cache grootte (in bytes)",
</s> add "cache_size_desc": "DNS-cache grootte (in bytes).", </s> remove "form_error_url_format": "Formato url non valido",
"form_error_url_or_path_format": "URL o percorso assoluto dell'elenco non validi",
</s> add "form_error_url_format": "Formato URL non valido.",
"form_error_url_or_path_format": "URL o percorso assoluto dell'elenco non validi.", </s> remove "clients_title": "Gebruikers",
"clients_desc": "Configureer apparaten die gebruik maken van AdGuard Home",
</s> add "clients_title": "Permanente clients",
"clients_desc": "Permanente client-records configureren voor apparaten verboden met AdGuard Home.", </s> remove "form_error_url_format": "Neveljaven format URL naslova",
</s> add "form_error_url_format": "Neveljaven format URL naslova.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/nl.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "install_settings_title": "Admin webinterface",
<mask> "install_settings_listen": "Luister interface",
<mask> "install_settings_port": "Poort",
<mask> "install_settings_interface_link": "De webinterface van AdGuard Home admin is beschikbaar op de volgende adressen:",
<mask> "form_error_port": "Geldige poortwaarde invoeren",
<mask> "install_settings_dns": "DNS-server",
<mask> "install_settings_dns_desc": "Je moet jouw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:",
<mask> "install_settings_all_interfaces": "Alle interfaces",
<mask> "install_auth_title": "Authenticatie",
<mask> "install_auth_desc": "Wachtwoordverificatie voor je AdGuard Home-beheerderswebinterface moet worden geconfigureerd. Zelfs als AdGuard Home alleen toegankelijk is in je lokale netwerk, is het nog steeds belangrijk om het te beschermen tegen onbeperkte toegang.",
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "tags_desc": "Je kunt tags selecteren die overeenkomen met de client. Tags kunnen worden opgenomen in de filterregels en je kunt ze dan nauwkeuriger toepassen. <0> Meer informatie </0>",
</s> add "tags_desc": "Je kunt labels selecteren die overeenkomen met de client. Labels kunnen worden opgenomen in de filterregels om ze \n nauwkeuriger toe te passen. <0>Meer informatie</0>.", </s> remove "clients_title": "Gebruikers",
"clients_desc": "Configureer apparaten die gebruik maken van AdGuard Home",
</s> add "clients_title": "Permanente clients",
"clients_desc": "Permanente client-records configureren voor apparaten verboden met AdGuard Home.", </s> remove "dns_status_error": "Fout bij het oproepen van de DNS-server status",
</s> add "dns_status_error": "Fout bij het controleren van de DNS-server status.", </s> remove "encryption_desc": "Encryptie (HTTPS/TLS) ondersteuning voor DNS en admin web interface",
</s> add "encryption_desc": "Encryptie (HTTPS/TLS) ondersteuning voor DNS en admin web interface.", </s> remove "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
</s> add "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden.",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache.",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde.", </s> remove "experimental": "Experimenteel",
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/nl.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "next": "Volgende",
<mask> "open_dashboard": "Open Dashboard",
<mask> "install_saved": "Succesvol opgeslagen",
<mask> "encryption_title": "Encryptie",
<mask> "encryption_desc": "Encryptie (HTTPS/TLS) ondersteuning voor DNS en admin web interface",
<mask> "encryption_config_saved": "Versleuteling configuratie opgeslagen",
<mask> "encryption_server": "Server naam",
<mask> "encryption_server_enter": "Voer domein naam in",
<mask> "encryption_server_desc": "Om HTTPS te gebruiken, moet je de servernaam invoeren die overeenkomt met je SSL-certificaat of jokerteken-certificaat. Als het veld niet is ingesteld, accepteert het TLS-verbindingen voor elk domein.",
<mask> "encryption_redirect": "Herleid automatisch naar HTTPS",
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "form_error_port": "Geldige poortwaarde invoeren",
</s> add "form_error_port": "Geldig poortnummer invoeren.", </s> remove "form_error_port_range": "Poort nummer invoeren tussen 80 en 65535",
"form_error_port_unsafe": "Dit is een onveilige poort",
"form_error_equal": "Mag niet gelijk zijn",
"form_error_password": "Wachtwoord komt niet overeen",
</s> add "form_error_port_range": "Poortnummer invoeren tussen 80 en 65535.",
"form_error_port_unsafe": "Dit is een onveilige poort.",
"form_error_equal": "Mag niet gelijk zijn.",
"form_error_password": "Wachtwoord komt niet overeen.", </s> remove "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
</s> add "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden.",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache.",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde.", </s> remove "dns_status_error": "Fout bij het oproepen van de DNS-server status",
</s> add "dns_status_error": "Fout bij het controleren van de DNS-server status.", </s> remove "tags_desc": "Je kunt tags selecteren die overeenkomen met de client. Tags kunnen worden opgenomen in de filterregels en je kunt ze dan nauwkeuriger toepassen. <0> Meer informatie </0>",
</s> add "tags_desc": "Je kunt labels selecteren die overeenkomen met de client. Labels kunnen worden opgenomen in de filterregels om ze \n nauwkeuriger toe te passen. <0>Meer informatie</0>.", </s> remove "check_desc": "Controleer of de hostnaam wordt gefilterd",
</s> add "check_desc": "Controleren of een hostnaam wordt gefilterd.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/nl.json
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> "encryption_hostnames": "Hostnamen",
<mask> "encryption_reset": "Ben je zeker dat je de encryptie instellingen wil resetten?",
<mask> "topline_expiring_certificate": "Jouw SSL-certificaat vervalt binnenkort. Werk de <0>encryptie-instellingen</0> bij.",
<mask> "topline_expired_certificate": "Jouw SSL-certificaat is vervallen. Werk de <0>encryptie-instellingen</0> bij.",
<mask> "form_error_port_range": "Poort nummer invoeren tussen 80 en 65535",
<mask> "form_error_port_unsafe": "Dit is een onveilige poort",
<mask> "form_error_equal": "Mag niet gelijk zijn",
<mask> "form_error_password": "Wachtwoord komt niet overeen",
<mask> "reset_settings": "Reset Instellingen",
<mask> "update_announcement": "AdGuard Home{{version}} is nu beschikbaar! <0>klik hier</0> voor meer info.",
<mask> "setup_guide": "Installatie gids",
<mask> "dns_addresses": "DNS adressen",
<mask> "dns_start": "DNS-server aan het opstarten",
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "dns_status_error": "Fout bij het oproepen van de DNS-server status",
</s> add "dns_status_error": "Fout bij het controleren van de DNS-server status.", </s> remove "encryption_desc": "Encryptie (HTTPS/TLS) ondersteuning voor DNS en admin web interface",
</s> add "encryption_desc": "Encryptie (HTTPS/TLS) ondersteuning voor DNS en admin web interface.", </s> remove "experimental": "Experimenteel",
</s> add </s> remove "form_error_port": "Geldige poortwaarde invoeren",
</s> add "form_error_port": "Geldig poortnummer invoeren.", </s> remove "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
</s> add "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden.",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache.",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde.", </s> remove "check_desc": "Controleer of de hostnaam wordt gefilterd",
</s> add "check_desc": "Controleren of een hostnaam wordt gefilterd.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/nl.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "update_announcement": "AdGuard Home{{version}} is nu beschikbaar! <0>klik hier</0> voor meer info.",
<mask> "setup_guide": "Installatie gids",
<mask> "dns_addresses": "DNS adressen",
<mask> "dns_start": "DNS-server aan het opstarten",
<mask> "dns_status_error": "Fout bij het oproepen van de DNS-server status",
<mask> "down": "Uitgeschakeld",
<mask> "fix": "Los op",
<mask> "dns_providers": "hier is een <0>lijst of gekende DNS providers</0> waarvan je kan kiezen.",
<mask> "update_now": "Update nu",
<mask> "update_failed": "Automatisch bijwerken is mislukt. <a>Volg deze stappen</a> om handmatig bij te werken.",
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "form_error_port_range": "Poort nummer invoeren tussen 80 en 65535",
"form_error_port_unsafe": "Dit is een onveilige poort",
"form_error_equal": "Mag niet gelijk zijn",
"form_error_password": "Wachtwoord komt niet overeen",
</s> add "form_error_port_range": "Poortnummer invoeren tussen 80 en 65535.",
"form_error_port_unsafe": "Dit is een onveilige poort.",
"form_error_equal": "Mag niet gelijk zijn.",
"form_error_password": "Wachtwoord komt niet overeen.", </s> remove "clients_title": "Gebruikers",
"clients_desc": "Configureer apparaten die gebruik maken van AdGuard Home",
</s> add "clients_title": "Permanente clients",
"clients_desc": "Permanente client-records configureren voor apparaten verboden met AdGuard Home.", </s> remove "form_error_port": "Geldige poortwaarde invoeren",
</s> add "form_error_port": "Geldig poortnummer invoeren.", </s> remove "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
</s> add "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden.",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache.",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde.", </s> remove "experimental": "Experimenteel",
</s> add </s> remove "encryption_desc": "Encryptie (HTTPS/TLS) ondersteuning voor DNS en admin web interface",
</s> add "encryption_desc": "Encryptie (HTTPS/TLS) ondersteuning voor DNS en admin web interface.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/nl.json
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> "update_now": "Update nu",
<mask> "update_failed": "Automatisch bijwerken is mislukt. <a>Volg deze stappen</a> om handmatig bij te werken.",
<mask> "manual_update": "<a>Volg deze stappen</a> om handmatig bij te werken.",
<mask> "processing_update": "Even geduld, AdGuard Home wordt bijgewerkt",
<mask> "clients_title": "Gebruikers",
<mask> "clients_desc": "Configureer apparaten die gebruik maken van AdGuard Home",
<mask> "settings_global": "Globaal",
<mask> "settings_custom": "Aangepast",
<mask> "table_client": "Gebruiker",
<mask> "table_name": "Naam",
<mask> "save_btn": "Opslaan",
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "dns_status_error": "Fout bij het oproepen van de DNS-server status",
</s> add "dns_status_error": "Fout bij het controleren van de DNS-server status.", </s> remove "clients_title": "Client",
"clients_desc": "Configura i dispositivi connessi ad AdGuard Home",
</s> add "clients_title": "Client persistenti",
"clients_desc": "Configura le registrazioni dei client persistenti per i dispositivi connessi ad AdGuard Home.", </s> remove "form_error_port": "Geldige poortwaarde invoeren",
</s> add "form_error_port": "Geldig poortnummer invoeren.", </s> remove "tags_desc": "Je kunt tags selecteren die overeenkomen met de client. Tags kunnen worden opgenomen in de filterregels en je kunt ze dan nauwkeuriger toepassen. <0> Meer informatie </0>",
</s> add "tags_desc": "Je kunt labels selecteren die overeenkomen met de client. Labels kunnen worden opgenomen in de filterregels om ze \n nauwkeuriger toe te passen. <0>Meer informatie</0>.", </s> remove "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
</s> add "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden.",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache.",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde.", </s> remove "experimental": "Experimenteel",
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/nl.json
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> "rewrite_hosts_applied": "Geherdefinieerd door de filterregel van de host",
<mask> "dns_rewrites": "DNS herschrijvingen",
<mask> "form_domain": "Vul domein of wildcard in",
<mask> "form_answer": "Vul IP adres of domeinnaam in",
<mask> "form_error_domain_format": "Ongeldige domeinnaam",
<mask> "form_error_answer_format": "Ongeldig antwoord",
<mask> "configure": "Bewerk",
<mask> "main_settings": "Algemene instellingen",
<mask> "block_services": "Specifieke services blokkeren",
<mask> "blocked_services": "Geblokkeerde services",
<mask> "blocked_services_desc": "Hiermee kunt u populaire sites en services snel blokkeren.",
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "form_error_domain_format": "Formato del dominio non valido",
"form_error_answer_format": "Formato di risposta non valido",
</s> add "form_error_domain_format": "Formato del dominio non valido.",
"form_error_answer_format": "Formato di risposta non valido.", </s> remove "check_desc": "Controleer of de hostnaam wordt gefilterd",
</s> add "check_desc": "Controleren of een hostnaam wordt gefilterd.", </s> remove "tags_desc": "Je kunt tags selecteren die overeenkomen met de client. Tags kunnen worden opgenomen in de filterregels en je kunt ze dan nauwkeuriger toepassen. <0> Meer informatie </0>",
</s> add "tags_desc": "Je kunt labels selecteren die overeenkomen met de client. Labels kunnen worden opgenomen in de filterregels om ze \n nauwkeuriger toe te passen. <0>Meer informatie</0>.", </s> remove "experimental": "Experimenteel",
</s> add </s> remove "encryption_desc": "Encryptie (HTTPS/TLS) ondersteuning voor DNS en admin web interface",
</s> add "encryption_desc": "Encryptie (HTTPS/TLS) ondersteuning voor DNS en admin web interface.", </s> remove "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
</s> add "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden.",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache.",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/nl.json
|
keep keep keep keep replace keep keep replace keep keep keep
|
<mask> "autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home jouw systeem om de AdGuard Home DNS-server te gebruiken.",
<mask> "autofix_warning_list": "De volgende taken worden uitgevoerd: <0> Deactiveren van Systeem DNSStubListener</0> <0> DNS-serveradres instellen op 127.0.0.1 </0> <0> Symbolisch koppelingsdoel van /etc/resolv.conf vervangen door /run/systemd/resolve/resolv.conf </0> <0> Stop DNSStubListener (herlaad systemd-resolved service) </0>",
<mask> "autofix_warning_result": "Als gevolg hiervan worden alle DNS-verzoeken van je systeem standaard door AdGuard Home verwerkt.",
<mask> "tags_title": "Labels",
<mask> "tags_desc": "Je kunt tags selecteren die overeenkomen met de client. Tags kunnen worden opgenomen in de filterregels en je kunt ze dan nauwkeuriger toepassen. <0> Meer informatie </0>",
<mask> "form_select_tags": "Client tags selecteren",
<mask> "check_title": "Controleer de filtering",
<mask> "check_desc": "Controleer of de hostnaam wordt gefilterd",
<mask> "check": "Controleren",
<mask> "form_enter_host": "Voer een hostnaam in",
<mask> "filtered_custom_rules": "Gefilterd door aangepaste filterregels",
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "form_error_port": "Geldige poortwaarde invoeren",
</s> add "form_error_port": "Geldig poortnummer invoeren.", </s> remove "experimental": "Experimenteel",
</s> add </s> remove "form_error_domain_format": "Ongeldige domeinnaam",
"form_error_answer_format": "Ongeldig antwoord",
</s> add "form_error_domain_format": "Ongeldige opmaak domein.",
"form_error_answer_format": "Ongeldig opmaak antwoord.", </s> remove "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
</s> add "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden.",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache.",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde.", </s> remove "clients_title": "Gebruikers",
"clients_desc": "Configureer apparaten die gebruik maken van AdGuard Home",
</s> add "clients_title": "Permanente clients",
"clients_desc": "Permanente client-records configureren voor apparaten verboden met AdGuard Home.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/nl.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "safe_search": "Veilig zoeken",
<mask> "blocklist": "Blokkeerlijst",
<mask> "milliseconds_abbreviation": "ms",
<mask> "cache_size": "Cache grootte",
<mask> "cache_size_desc": "DNS cache grootte (in bytes)",
<mask> "cache_ttl_min_override": "Minimale TTL overschrijven",
<mask> "cache_ttl_max_override": "Maximale TTL overschrijven",
<mask> "enter_cache_size": "Cache grootte invoeren (bytes)",
<mask> "enter_cache_ttl_min_override": "Minimum TTL invoeren (seconden)",
<mask> "enter_cache_ttl_max_override": "Maximum TTL invoeren (seconden)",
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
</s> add "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden.",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache.",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde.", </s> remove "cache_size_desc": "Dimensioni cache DNS (in byte)",
</s> add "cache_size_desc": "Dimensioni cache DNS (in byte).", </s> remove "safe_search": "Ricerca sicura",
</s> add "safe_search": "Ricerca Sicura", </s> remove "safe_search": "Pencarian aman",
</s> add "safe_search": "Aktifkan Pencarian Aman", </s> remove "cache_ttl_min_override_desc": "Estende i valori brevi (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS",
"cache_ttl_max_override_desc": "Imposta un periodo massimo di attivazione (in secondi) per le voci nella cache DNS",
"ttl_cache_validation": "Il valore minimo della cache TTL deve essere inferiore o uguale al valore massimo",
</s> add "cache_ttl_min_override_desc": "Estende i valori di breve durata (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS.",
"cache_ttl_max_override_desc": "Imposta un valore di durata massima (secondi) per le voci nella cache DNS.",
"ttl_cache_validation": "La sovrascrittura del valore TTL minimo della cache deve essere inferiore o uguale a quello massimo.", </s> remove "form_error_port_range": "Poort nummer invoeren tussen 80 en 65535",
"form_error_port_unsafe": "Dit is een onveilige poort",
"form_error_equal": "Mag niet gelijk zijn",
"form_error_password": "Wachtwoord komt niet overeen",
</s> add "form_error_port_range": "Poortnummer invoeren tussen 80 en 65535.",
"form_error_port_unsafe": "Dit is een onveilige poort.",
"form_error_equal": "Mag niet gelijk zijn.",
"form_error_password": "Wachtwoord komt niet overeen.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/nl.json
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> "cache_ttl_max_override": "Maximale TTL overschrijven",
<mask> "enter_cache_size": "Cache grootte invoeren (bytes)",
<mask> "enter_cache_ttl_min_override": "Minimum TTL invoeren (seconden)",
<mask> "enter_cache_ttl_max_override": "Maximum TTL invoeren (seconden)",
<mask> "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden",
<mask> "cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache",
<mask> "ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
<mask> "cache_optimistic": "Optimistisch cachen",
<mask> "cache_optimistic_desc": "Laat AdGuard Home reageren vanuit de cache, zelfs als de vermeldingen zijn verlopen en probeer deze ook te vernieuwen.",
<mask> "filter_category_general": "Algemeen",
<mask> "filter_category_security": "Beveiliging",
<mask> "filter_category_regional": "Regionaal",
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "cache_size_desc": "DNS cache grootte (in bytes)",
</s> add "cache_size_desc": "DNS-cache grootte (in bytes).", </s> remove "cache_ttl_min_override_desc": "Estende i valori brevi (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS",
"cache_ttl_max_override_desc": "Imposta un periodo massimo di attivazione (in secondi) per le voci nella cache DNS",
"ttl_cache_validation": "Il valore minimo della cache TTL deve essere inferiore o uguale al valore massimo",
</s> add "cache_ttl_min_override_desc": "Estende i valori di breve durata (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS.",
"cache_ttl_max_override_desc": "Imposta un valore di durata massima (secondi) per le voci nella cache DNS.",
"ttl_cache_validation": "La sovrascrittura del valore TTL minimo della cache deve essere inferiore o uguale a quello massimo.", </s> remove "experimental": "Experimenteel",
</s> add </s> remove "dns_status_error": "Fout bij het oproepen van de DNS-server status",
</s> add "dns_status_error": "Fout bij het controleren van de DNS-server status.", </s> remove "form_error_port": "Geldige poortwaarde invoeren",
</s> add "form_error_port": "Geldig poortnummer invoeren.", </s> remove "form_error_port_range": "Poort nummer invoeren tussen 80 en 65535",
"form_error_port_unsafe": "Dit is een onveilige poort",
"form_error_equal": "Mag niet gelijk zijn",
"form_error_password": "Wachtwoord komt niet overeen",
</s> add "form_error_port_range": "Poortnummer invoeren tussen 80 en 65535.",
"form_error_port_unsafe": "Dit is een onveilige poort.",
"form_error_equal": "Mag niet gelijk zijn.",
"form_error_password": "Wachtwoord komt niet overeen.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/nl.json
|
keep keep replace keep keep keep replace
|
<mask> "filter_allowlist": "WAARSCHUWING: Deze actie zal ook de regel \"{{disallowed_rule}}\" uitsluiten van de lijst met toegestane clients.",
<mask> "last_rule_in_allowlist": "Kan deze client niet weigeren omdat het uitsluiten van de regel \"{{disallowed_rule}}\" de lijst \"Toegestane clients\" zal UITSCHAKELEN.",
<mask> "experimental": "Experimenteel",
<mask> "use_saved_key": "De eerder opgeslagen sleutel gebruiken",
<mask> "parental_control": "Ouderlijk toezicht",
<mask> "safe_browsing": "Veilig browsen",
<mask> "served_from_cache": "{{value}} <i>(geleverd vanuit cache)</i>"
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "experimental": "Eksperimental",
</s> add </s> remove "served_from_cache": "{{value}} <i>(fornito dalla cache)</i>"
</s> add "served_from_cache": "{{value}} <i>(fornito dalla cache)</i>",
"form_error_password_length": "La password deve essere lunga almeno {{value}} caratteri." </s> remove "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
</s> add "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden.",
"cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache.",
"ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde.", </s> remove "check_desc": "Controleer of de hostnaam wordt gefilterd",
</s> add "check_desc": "Controleren of een hostnaam wordt gefilterd.", </s> remove "dns_status_error": "Fout bij het oproepen van de DNS-server status",
</s> add "dns_status_error": "Fout bij het controleren van de DNS-server status.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/nl.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "choose_blocklist": "Izberite sezname za zaviranje",
<mask> "choose_allowlist": "Izberite sezname dovoljenih",
<mask> "enter_valid_blocklist": "Vnesite veljaven URL naslov seznama nedovoljenih.",
<mask> "enter_valid_allowlist": "Vnesite veljaven URL naslov seznama dovoljenih.",
<mask> "form_error_url_format": "Neveljaven format URL naslova",
<mask> "form_error_url_or_path_format": "Neveljaven URL ali absolutna pot seznama",
<mask> "custom_filter_rules": "Pravila filtriranja po meri",
<mask> "custom_filter_rules_hint": "V vrstico vnesite eno pravilo. Uporabite lahko pravila zaviranja oglasov ali sintakso gostiteljskih datotek.",
<mask> "system_host_files": "Sistemske gostiteljske datooteke",
<mask> "examples_title": "Primeri",
</s> Pull request: client: upd i18n
Updates #2643.
Squashed commit of the following:
commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <[email protected]>
Date: Mon Feb 21 16:58:10 2022 +0300
client: upd i18n </s> remove "form_error_url_format": "Formato url non valido",
"form_error_url_or_path_format": "URL o percorso assoluto dell'elenco non validi",
</s> add "form_error_url_format": "Formato URL non valido.",
"form_error_url_or_path_format": "URL o percorso assoluto dell'elenco non validi.", </s> remove "served_from_cache": "{{value}} <i>(geleverd vanuit cache)</i>"
</s> add "served_from_cache": "{{value}} <i>(geleverd vanuit cache)</i>",
"form_error_password_length": "Wachtwoord moet minimaal {{value}} tekens lang zijn." </s> remove "experimental": "Eksperimental",
</s> add </s> remove "form_error_required": "Campo richiesto",
"form_error_ip4_format": "Indirizzo IPv4 non valido",
"form_error_ip4_range_start_format": "Indirizzo IPV4 non valido dell'intervallo iniziale",
"form_error_ip4_range_end_format": "Indirizzo IPV4 non valido dell'intervallo finale",
"form_error_ip4_gateway_format": "Indirizzo gateway IPv4 non valido",
"form_error_ip6_format": "Indirizzo IPv6 non valido",
"form_error_ip_format": "Indirizzo IP non valido",
"form_error_mac_format": "Indirizzo MAC non valido",
"form_error_client_id_format": "Il client ID deve contenere solo numeri, lettere minuscole e trattini",
"form_error_server_name": "Nome server non valido",
"form_error_subnet": "La subnet \"{{cidr}}\" non contiene l'indirizzo IP \"{{ip}}\"",
"form_error_positive": "Deve essere maggiore di 0",
"out_of_range_error": "Deve essere fuori intervallo \"{{start}}\"-\"{{end}}\"",
"lower_range_start_error": "Deve essere inferiore dell'intervallo di inizio",
"greater_range_start_error": "Deve essere maggiore dell'intervallo di inizio",
"greater_range_end_error": "Deve essere maggiore dell'intervallo di fine",
"subnet_error": "Gli indirizzi devono trovarsi in una sottorete",
"gateway_or_subnet_invalid": "Maschera di sottorete non valida",
</s> add "form_error_required": "Campo richiesto.",
"form_error_ip4_format": "Indirizzo IPv4 non valido.",
"form_error_ip4_range_start_format": "Indirizzo IPV4 non valido dell'intervallo iniziale.",
"form_error_ip4_range_end_format": "Indirizzo IPV4 non valido dell'intervallo finale.",
"form_error_ip4_gateway_format": "Indirizzo gateway IPv4 non valido.",
"form_error_ip6_format": "Indirizzo IPv6 non valido.",
"form_error_ip_format": "Indirizzo IP non valido.",
"form_error_mac_format": "Indirizzo MAC non valido.",
"form_error_client_id_format": "Il ClientID deve contenere solo numeri, lettere minuscole, e trattini.",
"form_error_server_name": "Nome server non valido.",
"form_error_subnet": "Il subnet \"{{cidr}}\" non contiene l'indirizzo IP \"{{ip}}\".",
"form_error_positive": "Deve essere maggiore di 0.",
"out_of_range_error": "Deve essere fuori intervallo \"{{start}}\"-\"{{end}}\".",
"lower_range_start_error": "Deve essere inferiore dell'intervallo di inizio.",
"greater_range_start_error": "Deve essere maggiore dell'intervallo di inizio.",
"greater_range_end_error": "Deve essere maggiore dell'intervallo di fine.",
"subnet_error": "Gli indirizzi devono trovarsi in una sottorete.",
"gateway_or_subnet_invalid": "Maschera di sottorete non valida.", </s> remove "clients_title": "Client",
"clients_desc": "Configura i dispositivi connessi ad AdGuard Home",
</s> add "clients_title": "Client persistenti",
"clients_desc": "Configura le registrazioni dei client persistenti per i dispositivi connessi ad AdGuard Home.", </s> remove "form_error_domain_format": "Formato del dominio non valido",
"form_error_answer_format": "Formato di risposta non valido",
</s> add "form_error_domain_format": "Formato del dominio non valido.",
"form_error_answer_format": "Formato di risposta non valido.",
|
https://github.com/AdguardTeam/AdGuardHome/commit/773b80a96978b41cef5556bb881150ff26f25d84
|
client/src/__locales/sl.json
|
keep replace keep replace keep keep keep
|
<mask> if tc.wantErrMsg == "" {
<mask> assert.Nil(t, err)
<mask> } else {
<mask> require.NotNil(t, err)
<mask> assert.Equal(t, tc.wantErrMsg, err.Error())
<mask> }
<mask>
</s> Pull request: dhcpd: normalize client host
Updates #2946.
Squashed commit of the following:
commit f830c03ddee65f7e86c43baa00a7dcc022091d93
Merge: df6c83d7 327e76cd
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 15:55:58 2021 +0300
Merge branch 'master' into 2946-norm-dhcp-host
commit df6c83d7d117b718110a035216e708d5131bf71c
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 15:49:03 2021 +0300
dhcpd: imp docs
commit 1407e9bd7b7694bd3069349faba3ec9ff5eb468b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 15:27:38 2021 +0300
dhcpd: normalize client host </s> remove lease.Hostname = req.HostName()
</s> add lease.Hostname, err = s.normalizeHostname(req.HostName())
if err != nil {
log.Error("dhcpv4: cannot normalize hostname for %s: %s", mac, err)
return nil, false
}
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove func (s *v4Server) processRequest(req, resp *dhcpv4.DHCPv4) (*Lease, bool) {
var lease *Lease
</s> add func (s *v4Server) processRequest(req, resp *dhcpv4.DHCPv4) (lease *Lease, ok bool) {
var err error
</s> add "strings"
|
https://github.com/AdguardTeam/AdGuardHome/commit/773f02cf7d3edaa2f4cf594142a6cb3b6c4a90d7
|
internal/dhcpd/nullbool_test.go
|
keep keep keep keep replace keep keep keep
|
<mask> A nullBool
<mask> }
<mask>
<mask> err := json.Unmarshal([]byte(`{"A":true}`), &got)
<mask> require.Nil(t, err)
<mask> assert.Equal(t, want, got.A)
<mask> })
<mask> }
</s> Pull request: dhcpd: normalize client host
Updates #2946.
Squashed commit of the following:
commit f830c03ddee65f7e86c43baa00a7dcc022091d93
Merge: df6c83d7 327e76cd
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 15:55:58 2021 +0300
Merge branch 'master' into 2946-norm-dhcp-host
commit df6c83d7d117b718110a035216e708d5131bf71c
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 15:49:03 2021 +0300
dhcpd: imp docs
commit 1407e9bd7b7694bd3069349faba3ec9ff5eb468b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 15:27:38 2021 +0300
dhcpd: normalize client host </s> remove require.NotNil(t, err)
</s> add require.Error(t, err)
</s> remove assert.Nil(t, err)
</s> add assert.NoError(t, err) </s> remove lease.Hostname = req.HostName()
</s> add lease.Hostname, err = s.normalizeHostname(req.HostName())
if err != nil {
log.Error("dhcpv4: cannot normalize hostname for %s: %s", mac, err)
return nil, false
}
</s> remove func (s *v4Server) processRequest(req, resp *dhcpv4.DHCPv4) (*Lease, bool) {
var lease *Lease
</s> add func (s *v4Server) processRequest(req, resp *dhcpv4.DHCPv4) (lease *Lease, ok bool) {
var err error
</s> add "strings"
|
https://github.com/AdguardTeam/AdGuardHome/commit/773f02cf7d3edaa2f4cf594142a6cb3b6c4a90d7
|
internal/dhcpd/nullbool_test.go
|
keep add keep keep keep keep keep keep
|
<mask> "fmt"
<mask> "net"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: dhcpd: normalize client host
Updates #2946.
Squashed commit of the following:
commit f830c03ddee65f7e86c43baa00a7dcc022091d93
Merge: df6c83d7 327e76cd
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 15:55:58 2021 +0300
Merge branch 'master' into 2946-norm-dhcp-host
commit df6c83d7d117b718110a035216e708d5131bf71c
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 15:49:03 2021 +0300
dhcpd: imp docs
commit 1407e9bd7b7694bd3069349faba3ec9ff5eb468b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 15:27:38 2021 +0300
dhcpd: normalize client host </s> remove lease.Hostname = req.HostName()
</s> add lease.Hostname, err = s.normalizeHostname(req.HostName())
if err != nil {
log.Error("dhcpv4: cannot normalize hostname for %s: %s", mac, err)
return nil, false
}
</s> remove func (s *v4Server) processRequest(req, resp *dhcpv4.DHCPv4) (*Lease, bool) {
var lease *Lease
</s> add func (s *v4Server) processRequest(req, resp *dhcpv4.DHCPv4) (lease *Lease, ok bool) {
var err error
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.NotNil(t, err)
</s> add require.Error(t, err)
</s> remove assert.Nil(t, err)
</s> add assert.NoError(t, err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/773f02cf7d3edaa2f4cf594142a6cb3b6c4a90d7
|
internal/dhcpd/v4.go
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> }
<mask>
<mask> // Process Request request and return lease
<mask> // Return false if we don't need to reply
<mask> func (s *v4Server) processRequest(req, resp *dhcpv4.DHCPv4) (*Lease, bool) {
<mask> var lease *Lease
<mask> mac := req.ClientHWAddr
<mask> reqIP := req.RequestedIPAddress()
<mask> if reqIP == nil {
<mask> reqIP = req.ClientIPAddr
<mask> }
</s> Pull request: dhcpd: normalize client host
Updates #2946.
Squashed commit of the following:
commit f830c03ddee65f7e86c43baa00a7dcc022091d93
Merge: df6c83d7 327e76cd
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 15:55:58 2021 +0300
Merge branch 'master' into 2946-norm-dhcp-host
commit df6c83d7d117b718110a035216e708d5131bf71c
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 15:49:03 2021 +0300
dhcpd: imp docs
commit 1407e9bd7b7694bd3069349faba3ec9ff5eb468b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 15:27:38 2021 +0300
dhcpd: normalize client host </s> remove lease.Hostname = req.HostName()
</s> add lease.Hostname, err = s.normalizeHostname(req.HostName())
if err != nil {
log.Error("dhcpv4: cannot normalize hostname for %s: %s", mac, err)
return nil, false
}
</s> remove assert.Nil(t, err)
</s> add assert.NoError(t, err) </s> remove require.NotNil(t, err)
</s> add require.Error(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> add "strings"
|
https://github.com/AdguardTeam/AdGuardHome/commit/773f02cf7d3edaa2f4cf594142a6cb3b6c4a90d7
|
internal/dhcpd/v4.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return nil, true
<mask> }
<mask>
<mask> if !lease.IsStatic() {
<mask> lease.Hostname = req.HostName()
<mask> s.commitLease(lease)
<mask> } else if len(lease.Hostname) != 0 {
<mask> o := &optFQDN{
<mask> name: lease.Hostname,
<mask> }
</s> Pull request: dhcpd: normalize client host
Updates #2946.
Squashed commit of the following:
commit f830c03ddee65f7e86c43baa00a7dcc022091d93
Merge: df6c83d7 327e76cd
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 15:55:58 2021 +0300
Merge branch 'master' into 2946-norm-dhcp-host
commit df6c83d7d117b718110a035216e708d5131bf71c
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 15:49:03 2021 +0300
dhcpd: imp docs
commit 1407e9bd7b7694bd3069349faba3ec9ff5eb468b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 15:27:38 2021 +0300
dhcpd: normalize client host </s> remove func (s *v4Server) processRequest(req, resp *dhcpv4.DHCPv4) (*Lease, bool) {
var lease *Lease
</s> add func (s *v4Server) processRequest(req, resp *dhcpv4.DHCPv4) (lease *Lease, ok bool) {
var err error
</s> remove assert.Nil(t, err)
</s> add assert.NoError(t, err) </s> remove require.NotNil(t, err)
</s> add require.Error(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> add "strings"
|
https://github.com/AdguardTeam/AdGuardHome/commit/773f02cf7d3edaa2f4cf594142a6cb3b6c4a90d7
|
internal/dhcpd/v4.go
|
keep keep keep add keep keep keep keep keep keep
|
<mask>
<mask> import (
<mask> "crypto/tls"
<mask> "fmt"
<mask> "net"
<mask> "net/http"
<mask> "os"
<mask> "os/signal"
<mask> "path/filepath"
<mask> "runtime"
</s> + app: add '--pidfile FILE' command-line parameter </s> add var pidFileName string // PID file name. Empty if no PID file was created. </s> remove os.Exit(1)
</s> add </s> add cleanupAlways() </s> add if len(args.pidFile) != 0 && writePIDFile(args.pidFile) {
pidFileName = args.pidFile
}
</s> add cleanupAlways() </s> remove os.Exit(1)
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/7746a3e6a9f204e7b7ab498c2f484cf426fb1a18
|
app.go
|
keep keep add keep keep keep keep keep
|
<mask> cond *sync.Cond // reacts to config.TLS.Enabled, PortHTTPS, CertificateChain and PrivateKey
<mask> sync.Mutex // protects config.TLS
<mask> }
<mask>
<mask> const (
<mask> // Used in config to indicate that syslog or eventlog (win) should be used for logger output
<mask> configSyslog = "syslog"
<mask> )
</s> + app: add '--pidfile FILE' command-line parameter </s> add // This function is called before application exits
func cleanupAlways() {
if len(pidFileName) != 0 {
os.Remove(pidFileName)
}
}
</s> add cleanupAlways() </s> remove os.Exit(1)
</s> add </s> remove os.Exit(1)
</s> add </s> add cleanupAlways() </s> add pidFile string // File name to save PID to
|
https://github.com/AdguardTeam/AdGuardHome/commit/7746a3e6a9f204e7b7ab498c2f484cf426fb1a18
|
app.go
|
keep add keep keep keep keep keep
|
<mask> <-signalChannel
<mask> cleanup()
<mask> os.Exit(0)
<mask> }()
<mask>
<mask> // run the protection
<mask> run(args)
</s> + app: add '--pidfile FILE' command-line parameter </s> add cleanupAlways() </s> remove os.Exit(1)
</s> add </s> add if len(args.pidFile) != 0 && writePIDFile(args.pidFile) {
pidFileName = args.pidFile
}
</s> add cleanupAlways() </s> add // This function is called before application exits
func cleanupAlways() {
if len(pidFileName) != 0 {
os.Remove(pidFileName)
}
}
</s> add pidFile string // File name to save PID to
|
https://github.com/AdguardTeam/AdGuardHome/commit/7746a3e6a9f204e7b7ab498c2f484cf426fb1a18
|
app.go
|
keep add keep keep keep keep
|
<mask> }
<mask>
<mask> // Update filters we've just loaded right away, don't wait for periodic update timer
<mask> go func() {
<mask> refreshFiltersIfNecessary(false)
<mask> }()
</s> + app: add '--pidfile FILE' command-line parameter </s> remove os.Exit(1)
</s> add </s> add cleanupAlways() </s> add // This function is called before application exits
func cleanupAlways() {
if len(pidFileName) != 0 {
os.Remove(pidFileName)
}
}
</s> remove os.Exit(1)
</s> add </s> add {"pidfile", "", "File name to save PID to", func(value string) { o.pidFile = value }, nil}, </s> add cleanupAlways()
|
https://github.com/AdguardTeam/AdGuardHome/commit/7746a3e6a9f204e7b7ab498c2f484cf426fb1a18
|
app.go
|
keep keep keep add keep keep keep keep keep
|
<mask> address := net.JoinHostPort(config.BindHost, strconv.Itoa(config.TLS.PortHTTPS))
<mask> // validate current TLS config and update warnings (it could have been loaded from file)
<mask> data := validateCertificates(config.TLS.CertificateChain, config.TLS.PrivateKey, config.TLS.ServerName)
<mask> if !data.ValidPair {
<mask> log.Fatal(data.WarningValidation)
<mask> }
<mask> config.Lock()
<mask> config.TLS.tlsConfigStatus = data // update warnings
<mask> config.Unlock()
</s> + app: add '--pidfile FILE' command-line parameter </s> remove os.Exit(1)
</s> add </s> add if len(args.pidFile) != 0 && writePIDFile(args.pidFile) {
pidFileName = args.pidFile
}
</s> add // This function is called before application exits
func cleanupAlways() {
if len(pidFileName) != 0 {
os.Remove(pidFileName)
}
}
</s> add // Write PID to a file
func writePIDFile(fn string) bool {
data := fmt.Sprintf("%d", os.Getpid())
err := ioutil.WriteFile(fn, []byte(data), 0644)
if err != nil {
log.Error("Couldn't write PID to file %s: %v", fn, err)
return false
}
return true
}
</s> add pidFile string // File name to save PID to </s> add var pidFileName string // PID file name. Empty if no PID file was created.
|
https://github.com/AdguardTeam/AdGuardHome/commit/7746a3e6a9f204e7b7ab498c2f484cf426fb1a18
|
app.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // validate current TLS config and update warnings (it could have been loaded from file)
<mask> data := validateCertificates(config.TLS.CertificateChain, config.TLS.PrivateKey, config.TLS.ServerName)
<mask> if !data.ValidPair {
<mask> log.Fatal(data.WarningValidation)
<mask> os.Exit(1)
<mask> }
<mask> config.Lock()
<mask> config.TLS.tlsConfigStatus = data // update warnings
<mask> config.Unlock()
<mask>
</s> + app: add '--pidfile FILE' command-line parameter </s> add cleanupAlways() </s> add if len(args.pidFile) != 0 && writePIDFile(args.pidFile) {
pidFileName = args.pidFile
}
</s> add // This function is called before application exits
func cleanupAlways() {
if len(pidFileName) != 0 {
os.Remove(pidFileName)
}
}
</s> add // Write PID to a file
func writePIDFile(fn string) bool {
data := fmt.Sprintf("%d", os.Getpid())
err := ioutil.WriteFile(fn, []byte(data), 0644)
if err != nil {
log.Error("Couldn't write PID to file %s: %v", fn, err)
return false
}
return true
}
</s> remove os.Exit(1)
</s> add </s> remove os.Exit(1)
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/7746a3e6a9f204e7b7ab498c2f484cf426fb1a18
|
app.go
|
keep keep keep add keep keep keep keep keep
|
<mask> privatekey := make([]byte, len(config.TLS.PrivateKey))
<mask> copy(privatekey, []byte(config.TLS.PrivateKey))
<mask> cert, err := tls.X509KeyPair(certchain, privatekey)
<mask> if err != nil {
<mask> log.Fatal(err)
<mask> }
<mask> httpsServer.cond.L.Unlock()
<mask>
<mask> // prepare HTTPS server
</s> + app: add '--pidfile FILE' command-line parameter </s> remove os.Exit(1)
</s> add </s> add // Write PID to a file
func writePIDFile(fn string) bool {
data := fmt.Sprintf("%d", os.Getpid())
err := ioutil.WriteFile(fn, []byte(data), 0644)
if err != nil {
log.Error("Couldn't write PID to file %s: %v", fn, err)
return false
}
return true
}
</s> remove os.Exit(1)
</s> add </s> add cleanupAlways() </s> add cleanupAlways() </s> remove os.Exit(1)
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/7746a3e6a9f204e7b7ab498c2f484cf426fb1a18
|
app.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> copy(privatekey, []byte(config.TLS.PrivateKey))
<mask> cert, err := tls.X509KeyPair(certchain, privatekey)
<mask> if err != nil {
<mask> log.Fatal(err)
<mask> os.Exit(1)
<mask> }
<mask> httpsServer.cond.L.Unlock()
<mask>
<mask> // prepare HTTPS server
<mask> httpsServer.server = &http.Server{
</s> + app: add '--pidfile FILE' command-line parameter </s> add cleanupAlways() </s> remove os.Exit(1)
</s> add </s> remove os.Exit(1)
</s> add </s> add // Write PID to a file
func writePIDFile(fn string) bool {
data := fmt.Sprintf("%d", os.Getpid())
err := ioutil.WriteFile(fn, []byte(data), 0644)
if err != nil {
log.Error("Couldn't write PID to file %s: %v", fn, err)
return false
}
return true
}
</s> add cleanupAlways() </s> add cleanupAlways()
|
https://github.com/AdguardTeam/AdGuardHome/commit/7746a3e6a9f204e7b7ab498c2f484cf426fb1a18
|
app.go
|
keep keep add keep keep keep keep
|
<mask> printHTTPAddresses("https")
<mask> err = httpsServer.server.ListenAndServeTLS("", "")
<mask> if err != http.ErrServerClosed {
<mask> log.Fatal(err)
<mask> }
<mask> }
<mask> }()
</s> + app: add '--pidfile FILE' command-line parameter </s> remove os.Exit(1)
</s> add </s> remove os.Exit(1)
</s> add </s> add cleanupAlways() </s> remove os.Exit(1)
</s> add </s> add cleanupAlways() </s> add if len(args.pidFile) != 0 && writePIDFile(args.pidFile) {
pidFileName = args.pidFile
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/7746a3e6a9f204e7b7ab498c2f484cf426fb1a18
|
app.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> printHTTPAddresses("https")
<mask> err = httpsServer.server.ListenAndServeTLS("", "")
<mask> if err != http.ErrServerClosed {
<mask> log.Fatal(err)
<mask> os.Exit(1)
<mask> }
<mask> }
<mask> }()
<mask>
<mask> // this loop is used as an ability to change listening host and/or port
</s> + app: add '--pidfile FILE' command-line parameter </s> add cleanupAlways() </s> remove os.Exit(1)
</s> add </s> add cleanupAlways() </s> remove os.Exit(1)
</s> add </s> add // This function is called before application exits
func cleanupAlways() {
if len(pidFileName) != 0 {
os.Remove(pidFileName)
}
}
</s> add // Write PID to a file
func writePIDFile(fn string) bool {
data := fmt.Sprintf("%d", os.Getpid())
err := ioutil.WriteFile(fn, []byte(data), 0644)
if err != nil {
log.Error("Couldn't write PID to file %s: %v", fn, err)
return false
}
return true
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/7746a3e6a9f204e7b7ab498c2f484cf426fb1a18
|
app.go
|
keep keep keep add keep keep keep keep
|
<mask> Addr: address,
<mask> }
<mask> err := httpServer.ListenAndServe()
<mask> if err != http.ErrServerClosed {
<mask> log.Fatal(err)
<mask> }
<mask> // We use ErrServerClosed as a sign that we need to rebind on new address, so go back to the start of the loop
<mask> }
</s> + app: add '--pidfile FILE' command-line parameter </s> remove os.Exit(1)
</s> add </s> remove os.Exit(1)
</s> add </s> add // Write PID to a file
func writePIDFile(fn string) bool {
data := fmt.Sprintf("%d", os.Getpid())
err := ioutil.WriteFile(fn, []byte(data), 0644)
if err != nil {
log.Error("Couldn't write PID to file %s: %v", fn, err)
return false
}
return true
}
</s> add cleanupAlways() </s> add // This function is called before application exits
func cleanupAlways() {
if len(pidFileName) != 0 {
os.Remove(pidFileName)
}
}
</s> add cleanupAlways()
|
https://github.com/AdguardTeam/AdGuardHome/commit/7746a3e6a9f204e7b7ab498c2f484cf426fb1a18
|
app.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> err := httpServer.ListenAndServe()
<mask> if err != http.ErrServerClosed {
<mask> log.Fatal(err)
<mask> os.Exit(1)
<mask> }
<mask> // We use ErrServerClosed as a sign that we need to rebind on new address, so go back to the start of the loop
<mask> }
<mask> }
<mask>
</s> + app: add '--pidfile FILE' command-line parameter </s> add cleanupAlways() </s> remove os.Exit(1)
</s> add </s> add // Write PID to a file
func writePIDFile(fn string) bool {
data := fmt.Sprintf("%d", os.Getpid())
err := ioutil.WriteFile(fn, []byte(data), 0644)
if err != nil {
log.Error("Couldn't write PID to file %s: %v", fn, err)
return false
}
return true
}
</s> add cleanupAlways() </s> remove os.Exit(1)
</s> add </s> add // This function is called before application exits
func cleanupAlways() {
if len(pidFileName) != 0 {
os.Remove(pidFileName)
}
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/7746a3e6a9f204e7b7ab498c2f484cf426fb1a18
|
app.go
|
keep add keep keep keep keep
|
<mask> }
<mask>
<mask> // initWorkingDir initializes the ourWorkingDir
<mask> // if no command-line arguments specified, we use the directory where our binary file is located
<mask> func initWorkingDir(args options) {
<mask> exec, err := os.Executable()
</s> + app: add '--pidfile FILE' command-line parameter </s> add // This function is called before application exits
func cleanupAlways() {
if len(pidFileName) != 0 {
os.Remove(pidFileName)
}
}
</s> remove os.Exit(1)
</s> add </s> add cleanupAlways() </s> add var pidFileName string // PID file name. Empty if no PID file was created. </s> add pidFile string // File name to save PID to </s> remove os.Exit(1)
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/7746a3e6a9f204e7b7ab498c2f484cf426fb1a18
|
app.go
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.