docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
<Card title={ t('top_clients') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> | <mask>
<mask> render() {
<mask> const { t } = this.props;
<mask> return (
<mask> <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
<mask> <ReactTable
<mask> data={map(this.props.topClients, (value, prop) => (
<mask> { ip: prop, count: value }
<mask> ))}
<mask> columns={this.columns}
</s> Convert i18n resource to key type </s> remove <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('stats_query_domain') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('top_blocked_domains') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title={ props.t('General statistics') } subtitle={ props.t('for the last 24 hours') } bodyType="card-table" refresh={props.refreshButton}>
</s> add <Card title={ props.t('general_statistics') } subtitle={ props.t('for_last_24_hours') } bodyType="card-table" refresh={props.refreshButton}> </s> remove noDataText={ t('No clients found') }
</s> add noDataText={ t('no_clients_found') } </s> remove noDataText={ t('No domains found') }
</s> add noDataText={ t('no_domains_found') } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/Clients.js |
noDataText={ t('no_clients_found') } | <mask> { ip: prop, count: value }
<mask> ))}
<mask> columns={this.columns}
<mask> showPagination={false}
<mask> noDataText={ t('No clients found') }
<mask> minRows={6}
<mask> className="-striped -highlight card-table-overflow"
<mask> />
<mask> </Card>
<mask> );
</s> Convert i18n resource to key type </s> remove noDataText={ t('No domains found') }
</s> add noDataText={ t('no_domains_found') } </s> remove noDataText={ t('No domains found') }
</s> add noDataText={ t('no_domains_found') } </s> remove <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('top_clients') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('stats_query_domain') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('top_blocked_domains') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/Clients.js |
<Card title={ props.t('general_statistics') } subtitle={ props.t('for_last_24_hours') } bodyType="card-table" refresh={props.refreshButton}> | <mask>
<mask> const tooltipType = 'tooltip-custom--narrow';
<mask>
<mask> const Counters = props => (
<mask> <Card title={ props.t('General statistics') } subtitle={ props.t('for the last 24 hours') } bodyType="card-table" refresh={props.refreshButton}>
<mask> <table className="table card-table">
<mask> <tbody>
<mask> <tr>
<mask> <td>
<mask> <Trans>DNS Queries</Trans>
</s> Convert i18n resource to key type </s> remove <Trans>DNS Queries</Trans>
<Tooltip text={ props.t('A number of DNS quieries processed for the last 24 hours') } type={tooltipType} />
</s> add <Trans>dns_query</Trans>
<Tooltip text={ props.t('number_of_dns_query_24_hours') } type={tooltipType} /> </s> remove <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('top_clients') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('top_blocked_domains') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('stats_query_domain') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove title={ t('Custom filtering rules') }
subtitle={ t('Enter one rule on a line. You can use either adblock rules or hosts files syntax.') }
</s> add title={ t('custom_filter_rules') }
subtitle={ t('custom_filter_rules_hint') } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/Counters.js |
<Trans>dns_query</Trans>
<Tooltip text={ props.t('number_of_dns_query_24_hours') } type={tooltipType} /> | <mask> <table className="table card-table">
<mask> <tbody>
<mask> <tr>
<mask> <td>
<mask> <Trans>DNS Queries</Trans>
<mask> <Tooltip text={ props.t('A number of DNS quieries processed for the last 24 hours') } type={tooltipType} />
<mask> </td>
<mask> <td className="text-right">
<mask> <span className="text-muted">
<mask> {props.dnsQueries}
<mask> </span>
</s> Convert i18n resource to key type </s> remove <Trans>Blocked malware/phishing</Trans>
<Tooltip text={ props.t('A number of DNS requests blocked by the AdGuard browsing security module') } type={tooltipType} />
</s> add <Trans>stats_malware_phishing</Trans>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours_by_sec') } type={tooltipType} /> </s> remove <Trans>Enforced safe search</Trans>
<Tooltip text={ props.t('A number of DNS requests to search engines for which Safe Search was enforced') } type={tooltipType} />
</s> add <Trans>enforced_save_search</Trans>
<Tooltip text={ props.t('number_of_dns_query_to_safe_search') } type={tooltipType} /> </s> remove <Trans>Blocked adult websites</Trans>
<Tooltip text={ props.t('A number of adult websites blocked') } type={tooltipType} />
</s> add <Trans>stats_adult</Trans>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours_adult') } type={tooltipType} /> </s> remove <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('A number of DNS requests blocked by adblock filters and hosts blocklists') } type={tooltipType} />
</s> add <Trans>blocked_by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours') } type={tooltipType} /> </s> remove <Trans>Average processing time</Trans>
<Tooltip text={ props.t('Average time in milliseconds on processing a DNS request') } type={tooltipType} />
</s> add <Trans>average_processing_time</Trans>
<Tooltip text={ props.t('average_processing_time_hint') } type={tooltipType} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/Counters.js |
<Trans>blocked_by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours') } type={tooltipType} /> | <mask> </td>
<mask> </tr>
<mask> <tr>
<mask> <td>
<mask> <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<mask> <Tooltip text={ props.t('A number of DNS requests blocked by adblock filters and hosts blocklists') } type={tooltipType} />
<mask> </td>
<mask> <td className="text-right">
<mask> <span className="text-muted">
<mask> {props.blockedFiltering}
<mask> </span>
</s> Convert i18n resource to key type </s> remove <Trans>Blocked malware/phishing</Trans>
<Tooltip text={ props.t('A number of DNS requests blocked by the AdGuard browsing security module') } type={tooltipType} />
</s> add <Trans>stats_malware_phishing</Trans>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours_by_sec') } type={tooltipType} /> </s> remove <Trans>Blocked adult websites</Trans>
<Tooltip text={ props.t('A number of adult websites blocked') } type={tooltipType} />
</s> add <Trans>stats_adult</Trans>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours_adult') } type={tooltipType} /> </s> remove <Trans>Enforced safe search</Trans>
<Tooltip text={ props.t('A number of DNS requests to search engines for which Safe Search was enforced') } type={tooltipType} />
</s> add <Trans>enforced_save_search</Trans>
<Tooltip text={ props.t('number_of_dns_query_to_safe_search') } type={tooltipType} /> </s> remove <Trans>DNS Queries</Trans>
<Tooltip text={ props.t('A number of DNS quieries processed for the last 24 hours') } type={tooltipType} />
</s> add <Trans>dns_query</Trans>
<Tooltip text={ props.t('number_of_dns_query_24_hours') } type={tooltipType} /> </s> remove <Trans>Average processing time</Trans>
<Tooltip text={ props.t('Average time in milliseconds on processing a DNS request') } type={tooltipType} />
</s> add <Trans>average_processing_time</Trans>
<Tooltip text={ props.t('average_processing_time_hint') } type={tooltipType} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/Counters.js |
<Trans>stats_malware_phishing</Trans>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours_by_sec') } type={tooltipType} /> | <mask> </td>
<mask> </tr>
<mask> <tr>
<mask> <td>
<mask> <Trans>Blocked malware/phishing</Trans>
<mask> <Tooltip text={ props.t('A number of DNS requests blocked by the AdGuard browsing security module') } type={tooltipType} />
<mask> </td>
<mask> <td className="text-right">
<mask> <span className="text-muted">
<mask> {props.replacedSafebrowsing}
<mask> </span>
</s> Convert i18n resource to key type </s> remove <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('A number of DNS requests blocked by adblock filters and hosts blocklists') } type={tooltipType} />
</s> add <Trans>blocked_by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours') } type={tooltipType} /> </s> remove <Trans>Blocked adult websites</Trans>
<Tooltip text={ props.t('A number of adult websites blocked') } type={tooltipType} />
</s> add <Trans>stats_adult</Trans>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours_adult') } type={tooltipType} /> </s> remove <Trans>Enforced safe search</Trans>
<Tooltip text={ props.t('A number of DNS requests to search engines for which Safe Search was enforced') } type={tooltipType} />
</s> add <Trans>enforced_save_search</Trans>
<Tooltip text={ props.t('number_of_dns_query_to_safe_search') } type={tooltipType} /> </s> remove <Trans>DNS Queries</Trans>
<Tooltip text={ props.t('A number of DNS quieries processed for the last 24 hours') } type={tooltipType} />
</s> add <Trans>dns_query</Trans>
<Tooltip text={ props.t('number_of_dns_query_24_hours') } type={tooltipType} /> </s> remove <Trans>Average processing time</Trans>
<Tooltip text={ props.t('Average time in milliseconds on processing a DNS request') } type={tooltipType} />
</s> add <Trans>average_processing_time</Trans>
<Tooltip text={ props.t('average_processing_time_hint') } type={tooltipType} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/Counters.js |
<Trans>stats_adult</Trans>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours_adult') } type={tooltipType} /> | <mask> </td>
<mask> </tr>
<mask> <tr>
<mask> <td>
<mask> <Trans>Blocked adult websites</Trans>
<mask> <Tooltip text={ props.t('A number of adult websites blocked') } type={tooltipType} />
<mask> </td>
<mask> <td className="text-right">
<mask> <span className="text-muted">
<mask> {props.replacedParental}
<mask> </span>
</s> Convert i18n resource to key type </s> remove <Trans>Blocked malware/phishing</Trans>
<Tooltip text={ props.t('A number of DNS requests blocked by the AdGuard browsing security module') } type={tooltipType} />
</s> add <Trans>stats_malware_phishing</Trans>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours_by_sec') } type={tooltipType} /> </s> remove <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('A number of DNS requests blocked by adblock filters and hosts blocklists') } type={tooltipType} />
</s> add <Trans>blocked_by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours') } type={tooltipType} /> </s> remove <Trans>Enforced safe search</Trans>
<Tooltip text={ props.t('A number of DNS requests to search engines for which Safe Search was enforced') } type={tooltipType} />
</s> add <Trans>enforced_save_search</Trans>
<Tooltip text={ props.t('number_of_dns_query_to_safe_search') } type={tooltipType} /> </s> remove <Trans>DNS Queries</Trans>
<Tooltip text={ props.t('A number of DNS quieries processed for the last 24 hours') } type={tooltipType} />
</s> add <Trans>dns_query</Trans>
<Tooltip text={ props.t('number_of_dns_query_24_hours') } type={tooltipType} /> </s> remove <Trans>Average processing time</Trans>
<Tooltip text={ props.t('Average time in milliseconds on processing a DNS request') } type={tooltipType} />
</s> add <Trans>average_processing_time</Trans>
<Tooltip text={ props.t('average_processing_time_hint') } type={tooltipType} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/Counters.js |
<Trans>enforced_save_search</Trans>
<Tooltip text={ props.t('number_of_dns_query_to_safe_search') } type={tooltipType} /> | <mask> </td>
<mask> </tr>
<mask> <tr>
<mask> <td>
<mask> <Trans>Enforced safe search</Trans>
<mask> <Tooltip text={ props.t('A number of DNS requests to search engines for which Safe Search was enforced') } type={tooltipType} />
<mask> </td>
<mask> <td className="text-right">
<mask> <span className="text-muted">
<mask> {props.replacedSafesearch}
<mask> </span>
</s> Convert i18n resource to key type </s> remove <Trans>Blocked malware/phishing</Trans>
<Tooltip text={ props.t('A number of DNS requests blocked by the AdGuard browsing security module') } type={tooltipType} />
</s> add <Trans>stats_malware_phishing</Trans>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours_by_sec') } type={tooltipType} /> </s> remove <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('A number of DNS requests blocked by adblock filters and hosts blocklists') } type={tooltipType} />
</s> add <Trans>blocked_by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours') } type={tooltipType} /> </s> remove <Trans>Blocked adult websites</Trans>
<Tooltip text={ props.t('A number of adult websites blocked') } type={tooltipType} />
</s> add <Trans>stats_adult</Trans>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours_adult') } type={tooltipType} /> </s> remove <Trans>DNS Queries</Trans>
<Tooltip text={ props.t('A number of DNS quieries processed for the last 24 hours') } type={tooltipType} />
</s> add <Trans>dns_query</Trans>
<Tooltip text={ props.t('number_of_dns_query_24_hours') } type={tooltipType} /> </s> remove <Trans>Average processing time</Trans>
<Tooltip text={ props.t('Average time in milliseconds on processing a DNS request') } type={tooltipType} />
</s> add <Trans>average_processing_time</Trans>
<Tooltip text={ props.t('average_processing_time_hint') } type={tooltipType} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/Counters.js |
<Trans>average_processing_time</Trans>
<Tooltip text={ props.t('average_processing_time_hint') } type={tooltipType} /> | <mask> </td>
<mask> </tr>
<mask> <tr>
<mask> <td>
<mask> <Trans>Average processing time</Trans>
<mask> <Tooltip text={ props.t('Average time in milliseconds on processing a DNS request') } type={tooltipType} />
<mask> </td>
<mask> <td className="text-right">
<mask> <span className="text-muted">
<mask> {props.avgProcessingTime}
<mask> </span>
</s> Convert i18n resource to key type </s> remove <Trans>Blocked malware/phishing</Trans>
<Tooltip text={ props.t('A number of DNS requests blocked by the AdGuard browsing security module') } type={tooltipType} />
</s> add <Trans>stats_malware_phishing</Trans>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours_by_sec') } type={tooltipType} /> </s> remove <Trans>Blocked adult websites</Trans>
<Tooltip text={ props.t('A number of adult websites blocked') } type={tooltipType} />
</s> add <Trans>stats_adult</Trans>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours_adult') } type={tooltipType} /> </s> remove <Trans>Enforced safe search</Trans>
<Tooltip text={ props.t('A number of DNS requests to search engines for which Safe Search was enforced') } type={tooltipType} />
</s> add <Trans>enforced_save_search</Trans>
<Tooltip text={ props.t('number_of_dns_query_to_safe_search') } type={tooltipType} /> </s> remove <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('A number of DNS requests blocked by adblock filters and hosts blocklists') } type={tooltipType} />
</s> add <Trans>blocked_by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours') } type={tooltipType} /> </s> remove <Trans>DNS Queries</Trans>
<Tooltip text={ props.t('A number of DNS quieries processed for the last 24 hours') } type={tooltipType} />
</s> add <Trans>dns_query</Trans>
<Tooltip text={ props.t('number_of_dns_query_24_hours') } type={tooltipType} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/Counters.js |
Header: <Trans>requests_count</Trans>, | <mask> </div>
<mask> );
<mask> },
<mask> }, {
<mask> Header: <Trans>Requests count</Trans>,
<mask> accessor: 'count',
<mask> maxWidth: 190,
<mask> Cell: ({ value }) => {
<mask> const percent = getPercent(this.props.dnsQueries, value);
<mask> const percentColor = this.getPercentColor(percent);
</s> Convert i18n resource to key type </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, </s> remove Header: t('Domain name'),
</s> add Header: t('domain_name_table_header'), </s> remove Header: t('Time'),
</s> add Header: t('time_table_header'), </s> remove Header: this.props.t('Filter URL'),
</s> add Header: this.props.t('filter_url_table_header'), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/QueriedDomains.js |
<Card title={ t('stats_query_domain') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> | <mask>
<mask> render() {
<mask> const { t } = this.props;
<mask> return (
<mask> <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
<mask> <ReactTable
<mask> data={map(this.props.topQueriedDomains, (value, prop) => (
<mask> { ip: prop, count: value }
<mask> ))}
<mask> columns={this.columns}
</s> Convert i18n resource to key type </s> remove <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('top_clients') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('top_blocked_domains') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title={ props.t('General statistics') } subtitle={ props.t('for the last 24 hours') } bodyType="card-table" refresh={props.refreshButton}>
</s> add <Card title={ props.t('general_statistics') } subtitle={ props.t('for_last_24_hours') } bodyType="card-table" refresh={props.refreshButton}> </s> remove noDataText={ t('No clients found') }
</s> add noDataText={ t('no_clients_found') } </s> remove noDataText={ t('No domains found') }
</s> add noDataText={ t('no_domains_found') } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/QueriedDomains.js |
noDataText={ t('no_domains_found') } | <mask> { ip: prop, count: value }
<mask> ))}
<mask> columns={this.columns}
<mask> showPagination={false}
<mask> noDataText={ t('No domains found') }
<mask> minRows={6}
<mask> className="-striped -highlight card-table-overflow stats__table"
<mask> />
<mask> </Card>
<mask> );
</s> Convert i18n resource to key type </s> remove noDataText={ t('No domains found') }
</s> add noDataText={ t('no_domains_found') } </s> remove noDataText={ t('No clients found') }
</s> add noDataText={ t('no_clients_found') } </s> remove <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('top_clients') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('stats_query_domain') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('top_blocked_domains') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/QueriedDomains.js |
<Trans>dns_query</Trans> | <mask> <div className="card-value card-value-stats text-blue">
<mask> {dnsQueries}
<mask> </div>
<mask> <div className="card-title-stats">
<mask> <Trans>DNS Queries</Trans>
<mask> </div>
<mask> </div>
<mask> <div className="card-chart-bg">
<mask> <Line data={queriesData} color={STATUS_COLORS.blue}/>
<mask> </div>
</s> Convert i18n resource to key type </s> remove <Trans>Blocked malware/phishing</Trans>
</s> add <Trans>stats_malware_phishing</Trans> </s> remove <Trans>Blocked adult websites</Trans>
</s> add <Trans>stats_adult</Trans> </s> remove <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
</s> add <Trans>blocked_by</Trans> <a href="#filters"><Trans>Filters</Trans></a> </s> remove <Trans>Found in the known domains database.</Trans>
</s> add <Trans>found_in_known_domain_db</Trans> </s> remove <Trans>Rule</Trans>: <strong>{this.props.rule}</strong>
</s> add <Trans>rule_label</Trans>: <strong>{this.props.rule}</strong> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/Statistics.js |
<Trans>blocked_by</Trans> <a href="#filters"><Trans>Filters</Trans></a> | <mask> <div className="card-value card-value-percent text-red">
<mask> {getPercent(dnsQueries, blockedFiltering)}
<mask> </div>
<mask> <div className="card-title-stats">
<mask> <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<mask> </div>
<mask> </div>
<mask> <div className="card-chart-bg">
<mask> <Line data={filteringData} color={STATUS_COLORS.red}/>
<mask> </div>
</s> Convert i18n resource to key type </s> remove <Trans>Blocked malware/phishing</Trans>
</s> add <Trans>stats_malware_phishing</Trans> </s> remove <Trans>Blocked adult websites</Trans>
</s> add <Trans>stats_adult</Trans> </s> remove <Trans>DNS Queries</Trans>
</s> add <Trans>dns_query</Trans> </s> remove <Trans>Report an issue</Trans>
</s> add <Trans>report_an_issue</Trans> </s> remove <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('A number of DNS requests blocked by adblock filters and hosts blocklists') } type={tooltipType} />
</s> add <Trans>blocked_by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours') } type={tooltipType} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/Statistics.js |
<Trans>stats_malware_phishing</Trans> | <mask> <div className="card-value card-value-percent text-green">
<mask> {getPercent(dnsQueries, replacedSafebrowsing)}
<mask> </div>
<mask> <div className="card-title-stats">
<mask> <Trans>Blocked malware/phishing</Trans>
<mask> </div>
<mask> </div>
<mask> <div className="card-chart-bg">
<mask> <Line data={safebrowsingData} color={STATUS_COLORS.green}/>
<mask> </div>
</s> Convert i18n resource to key type </s> remove <Trans>Blocked adult websites</Trans>
</s> add <Trans>stats_adult</Trans> </s> remove <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
</s> add <Trans>blocked_by</Trans> <a href="#filters"><Trans>Filters</Trans></a> </s> remove <Trans>DNS Queries</Trans>
</s> add <Trans>dns_query</Trans> </s> remove <Trans>Found in the known domains database.</Trans>
</s> add <Trans>found_in_known_domain_db</Trans> </s> remove <Trans>Rule</Trans>: <strong>{this.props.rule}</strong>
</s> add <Trans>rule_label</Trans>: <strong>{this.props.rule}</strong> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/Statistics.js |
<Trans>stats_adult</Trans> | <mask> <div className="card-value card-value-percent text-yellow">
<mask> {getPercent(dnsQueries, replacedParental)}
<mask> </div>
<mask> <div className="card-title-stats">
<mask> <Trans>Blocked adult websites</Trans>
<mask> </div>
<mask> </div>
<mask> <div className="card-chart-bg">
<mask> <Line data={parentalData} color={STATUS_COLORS.yellow}/>
<mask> </div>
</s> Convert i18n resource to key type </s> remove <Trans>Blocked malware/phishing</Trans>
</s> add <Trans>stats_malware_phishing</Trans> </s> remove <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
</s> add <Trans>blocked_by</Trans> <a href="#filters"><Trans>Filters</Trans></a> </s> remove <Trans>DNS Queries</Trans>
</s> add <Trans>dns_query</Trans> </s> remove <Trans>Found in the known domains database.</Trans>
</s> add <Trans>found_in_known_domain_db</Trans> </s> remove <Trans>Rule</Trans>: <strong>{this.props.rule}</strong>
</s> add <Trans>rule_label</Trans>: <strong>{this.props.rule}</strong> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/Statistics.js |
const buttonText = protectionEnabled ? 'disable_protection' : 'enable_protection'; | <mask> }
<mask>
<mask> getToggleFilteringButton = () => {
<mask> const { protectionEnabled } = this.props.dashboard;
<mask> const buttonText = protectionEnabled ? 'Disable' : 'Enable';
<mask> const buttonClass = protectionEnabled ? 'btn-gray' : 'btn-success';
<mask>
<mask> return (
<mask> <button type="button" className={`btn btn-sm mr-2 ${buttonClass}`} onClick={() => this.props.toggleProtection(protectionEnabled)}>
<mask> <Trans>{buttonText} protection</Trans>
</s> Convert i18n resource to key type </s> remove <Trans>{buttonText} protection</Trans>
</s> add <Trans>{buttonText}</Trans> </s> remove const buttonText = isFiltered ? 'Unblock' : 'Block';
</s> add const buttonText = isFiltered ? 'ublock_btn' : 'block_btn'; </s> remove changeLanguage = () => {
i18n.changeLanguage(i18n.language === 'en' ? 'vi' : 'en');
</s> add changeLanguage = (event) => {
i18n.changeLanguage(event.target.value); </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>Refresh statistics</Trans></button>;
</s> add const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>refresh_statics</Trans></button>; </s> remove Header: t('Response'),
</s> add Header: t('response_table_header'), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/index.js |
<Trans>{buttonText}</Trans> | <mask> const buttonClass = protectionEnabled ? 'btn-gray' : 'btn-success';
<mask>
<mask> return (
<mask> <button type="button" className={`btn btn-sm mr-2 ${buttonClass}`} onClick={() => this.props.toggleProtection(protectionEnabled)}>
<mask> <Trans>{buttonText} protection</Trans>
<mask> </button>
<mask> );
<mask> }
<mask>
<mask> render() {
</s> Convert i18n resource to key type </s> remove const buttonText = protectionEnabled ? 'Disable' : 'Enable';
</s> add const buttonText = protectionEnabled ? 'disable_protection' : 'enable_protection'; </s> remove const buttonText = isFiltered ? 'Unblock' : 'Block';
</s> add const buttonText = isFiltered ? 'ublock_btn' : 'block_btn'; </s> remove ><Trans>Enable log</Trans></button>
</s> add ><Trans>enabled_log_btn</Trans></button> </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>Refresh statistics</Trans></button>;
</s> add const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>refresh_statics</Trans></button>; </s> remove changeLanguage = () => {
i18n.changeLanguage(i18n.language === 'en' ? 'vi' : 'en');
</s> add changeLanguage = (event) => {
i18n.changeLanguage(event.target.value); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/index.js |
const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>refresh_statics</Trans></button>; | <mask> dashboard.processingStats ||
<mask> dashboard.processingStatsHistory ||
<mask> dashboard.processingTopStats;
<mask>
<mask> const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>Refresh statistics</Trans></button>;
<mask> const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.getAllStats()} />;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={ t('Dashboard') }>
</s> Convert i18n resource to key type </s> remove <PageTitle title={ t('Dashboard') }>
</s> add <PageTitle title={ t('dashboard') }> </s> remove ><Trans>Download log file</Trans></button>
</s> add ><Trans>download_log_file_btn</Trans></button> </s> remove ><Trans>Refresh</Trans></button>
</s> add ><Trans>refresh_btn</Trans></button> </s> remove <Trans>{buttonText} protection</Trans>
</s> add <Trans>{buttonText}</Trans> </s> remove ><Trans>Disable log</Trans></button>
</s> add ><Trans>disabled_log_btn</Trans></button> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/index.js |
<PageTitle title={ t('dashboard') }> | <mask> const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.getAllStats()} />;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={ t('Dashboard') }>
<mask> <div className="page-title__actions">
<mask> {this.getToggleFilteringButton()}
<mask> {refreshFullButton}
<mask> </div>
<mask> </PageTitle>
</s> Convert i18n resource to key type </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>Refresh statistics</Trans></button>;
</s> add const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>refresh_statics</Trans></button>; </s> remove <PageTitle title={ t('Query Log') } subtitle={ t('Last 5000 DNS queries') }>
</s> add <PageTitle title={ t('query_log') } subtitle={ t('last_5000_dns_queries') }> </s> remove <Trans>{buttonText} protection</Trans>
</s> add <Trans>{buttonText}</Trans> </s> remove <PageTitle title={ t('Settings') } />
</s> add <PageTitle title={ t('settings') } /> </s> remove ><Trans>Disable log</Trans></button>
</s> add ><Trans>disabled_log_btn</Trans></button> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Dashboard/index.js |
title={ t('custom_filter_rules') }
subtitle={ t('custom_filter_rules_hint') } | <mask> render() {
<mask> const { t } = this.props;
<mask> return (
<mask> <Card
<mask> title={ t('Custom filtering rules') }
<mask> subtitle={ t('Enter one rule on a line. You can use either adblock rules or hosts files syntax.') }
<mask> >
<mask> <form onSubmit={this.handleSubmit}>
<mask> <textarea className="form-control form-control--textarea-large" value={this.props.userRules} onChange={this.handleChange} />
<mask> <div className="card-actions">
<mask> <button
</s> Convert i18n resource to key type </s> remove title={ t('Filters and hosts blocklists') }
subtitle={ t('AdGuard Home understands basic adblock rules and hosts files syntax.') }
</s> add title={ t('filters_and_hosts') }
subtitle={ t('filters_and_hosts_hint') } </s> remove <PageTitle title={ t('Filters') } />
</s> add <PageTitle title={ t('filters') } /> </s> remove <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('top_clients') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('stats_query_domain') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('top_blocked_domains') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/UserRules.js |
<Trans>apply_btn</Trans> | <mask> className="btn btn-success btn-standart"
<mask> type="submit"
<mask> onClick={this.handleSubmit}
<mask> >
<mask> <Trans>Apply</Trans>
<mask> </button>
<mask> </div>
<mask> </form>
<mask> <hr/>
<mask> <div className="list leading-loose">
</s> Convert i18n resource to key type </s> remove <Trans>Apply</Trans>
</s> add <Trans>apply_btn</Trans> </s> remove <Trans>Test upstreams</Trans>
</s> add <Trans>test_upstream_btn</Trans> </s> remove <Trans>Examples</Trans>:
</s> add <Trans>examples_title</Trans>: </s> remove <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>Add filter</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>Check updates</Trans></button>
</s> add <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>add_filter_btn</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>cancel_btn</Trans></button> </s> remove noDataText={ t('No filters added') }
</s> add noDataText={ t('no_filters_added') } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/UserRules.js |
<Trans>examples_title</Trans>: | <mask> </div>
<mask> </form>
<mask> <hr/>
<mask> <div className="list leading-loose">
<mask> <Trans>Examples</Trans>:
<mask> <ol className="leading-loose">
<mask> <li>
<mask> <code>||example.org^</code> - { t('block access to the example.org domain and all its subdomains') }
<mask> </li>
<mask> <li>
</s> Convert i18n resource to key type </s> remove <code>||example.org^</code> - { t('block access to the example.org domain and all its subdomains') }
</s> add <code>||example.org^</code> - { t('example_meaning_filter_block') } </s> remove <code> @@||example.org^</code> - { t('unblock access to the example.org domain and all its subdomains') }
</s> add <code> @@||example.org^</code> - { t('example_meaning_filter_whitelist') } </s> remove <code>127.0.0.1 example.org</code> - { t('AdGuard Home will now return 127.0.0.1 address for the example.org domain (but not its subdomains).') }
</s> add <code>127.0.0.1 example.org</code> - { t('example_comment') } </s> remove <code>{ t('! Here goes a comment') }</code> - { t('just a comment') }
</s> add <code>{ t('example_comment') }</code> - { t('example_comment_meaning') } </s> remove <Trans>Apply</Trans>
</s> add <Trans>apply_btn</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/UserRules.js |
<code>||example.org^</code> - { t('example_meaning_filter_block') } | <mask> <div className="list leading-loose">
<mask> <Trans>Examples</Trans>:
<mask> <ol className="leading-loose">
<mask> <li>
<mask> <code>||example.org^</code> - { t('block access to the example.org domain and all its subdomains') }
<mask> </li>
<mask> <li>
<mask> <code> @@||example.org^</code> - { t('unblock access to the example.org domain and all its subdomains') }
<mask> </li>
<mask> <li>
</s> Convert i18n resource to key type </s> remove <Trans>Examples</Trans>:
</s> add <Trans>examples_title</Trans>: </s> remove <code> @@||example.org^</code> - { t('unblock access to the example.org domain and all its subdomains') }
</s> add <code> @@||example.org^</code> - { t('example_meaning_filter_whitelist') } </s> remove <code>127.0.0.1 example.org</code> - { t('AdGuard Home will now return 127.0.0.1 address for the example.org domain (but not its subdomains).') }
</s> add <code>127.0.0.1 example.org</code> - { t('example_comment') } </s> remove <code>{ t('! Here goes a comment') }</code> - { t('just a comment') }
</s> add <code>{ t('example_comment') }</code> - { t('example_comment_meaning') } </s> remove <code>{ t('# Also a comment') }</code> - { t('just a comment') }
</s> add <code>{ t('example_comment_hash') }</code> - { t('example_comment_meaning') } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/UserRules.js |
<code> @@||example.org^</code> - { t('example_meaning_filter_whitelist') } | <mask> <li>
<mask> <code>||example.org^</code> - { t('block access to the example.org domain and all its subdomains') }
<mask> </li>
<mask> <li>
<mask> <code> @@||example.org^</code> - { t('unblock access to the example.org domain and all its subdomains') }
<mask> </li>
<mask> <li>
<mask> <code>127.0.0.1 example.org</code> - { t('AdGuard Home will now return 127.0.0.1 address for the example.org domain (but not its subdomains).') }
<mask> </li>
<mask> <li>
</s> Convert i18n resource to key type </s> remove <code>127.0.0.1 example.org</code> - { t('AdGuard Home will now return 127.0.0.1 address for the example.org domain (but not its subdomains).') }
</s> add <code>127.0.0.1 example.org</code> - { t('example_comment') } </s> remove <code>||example.org^</code> - { t('block access to the example.org domain and all its subdomains') }
</s> add <code>||example.org^</code> - { t('example_meaning_filter_block') } </s> remove <Trans>Examples</Trans>:
</s> add <Trans>examples_title</Trans>: </s> remove <code>{ t('! Here goes a comment') }</code> - { t('just a comment') }
</s> add <code>{ t('example_comment') }</code> - { t('example_comment_meaning') } </s> remove <code>{ t('# Also a comment') }</code> - { t('just a comment') }
</s> add <code>{ t('example_comment_hash') }</code> - { t('example_comment_meaning') } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/UserRules.js |
<code>127.0.0.1 example.org</code> - { t('example_comment') } | <mask> <li>
<mask> <code> @@||example.org^</code> - { t('unblock access to the example.org domain and all its subdomains') }
<mask> </li>
<mask> <li>
<mask> <code>127.0.0.1 example.org</code> - { t('AdGuard Home will now return 127.0.0.1 address for the example.org domain (but not its subdomains).') }
<mask> </li>
<mask> <li>
<mask> <code>{ t('! Here goes a comment') }</code> - { t('just a comment') }
<mask> </li>
<mask> <li>
</s> Convert i18n resource to key type </s> remove <code>{ t('! Here goes a comment') }</code> - { t('just a comment') }
</s> add <code>{ t('example_comment') }</code> - { t('example_comment_meaning') } </s> remove <code> @@||example.org^</code> - { t('unblock access to the example.org domain and all its subdomains') }
</s> add <code> @@||example.org^</code> - { t('example_meaning_filter_whitelist') } </s> remove <code>||example.org^</code> - { t('block access to the example.org domain and all its subdomains') }
</s> add <code>||example.org^</code> - { t('example_meaning_filter_block') } </s> remove <code>{ t('# Also a comment') }</code> - { t('just a comment') }
</s> add <code>{ t('example_comment_hash') }</code> - { t('example_comment_meaning') } </s> remove <Trans>Examples</Trans>:
</s> add <Trans>examples_title</Trans>: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/UserRules.js |
<code>{ t('example_comment') }</code> - { t('example_comment_meaning') } | <mask> <li>
<mask> <code>127.0.0.1 example.org</code> - { t('AdGuard Home will now return 127.0.0.1 address for the example.org domain (but not its subdomains).') }
<mask> </li>
<mask> <li>
<mask> <code>{ t('! Here goes a comment') }</code> - { t('just a comment') }
<mask> </li>
<mask> <li>
<mask> <code>{ t('# Also a comment') }</code> - { t('just a comment') }
<mask> </li>
<mask> </ol>
</s> Convert i18n resource to key type </s> remove <code>127.0.0.1 example.org</code> - { t('AdGuard Home will now return 127.0.0.1 address for the example.org domain (but not its subdomains).') }
</s> add <code>127.0.0.1 example.org</code> - { t('example_comment') } </s> remove <code>{ t('# Also a comment') }</code> - { t('just a comment') }
</s> add <code>{ t('example_comment_hash') }</code> - { t('example_comment_meaning') } </s> remove <code> @@||example.org^</code> - { t('unblock access to the example.org domain and all its subdomains') }
</s> add <code> @@||example.org^</code> - { t('example_meaning_filter_whitelist') } </s> remove <code>||example.org^</code> - { t('block access to the example.org domain and all its subdomains') }
</s> add <code>||example.org^</code> - { t('example_meaning_filter_block') } </s> remove <Trans>Examples</Trans>:
</s> add <Trans>examples_title</Trans>: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/UserRules.js |
<code>{ t('example_comment_hash') }</code> - { t('example_comment_meaning') } | <mask> <li>
<mask> <code>{ t('! Here goes a comment') }</code> - { t('just a comment') }
<mask> </li>
<mask> <li>
<mask> <code>{ t('# Also a comment') }</code> - { t('just a comment') }
<mask> </li>
<mask> </ol>
<mask> </div>
<mask> </Card>
<mask> );
</s> Convert i18n resource to key type </s> remove <code>{ t('! Here goes a comment') }</code> - { t('just a comment') }
</s> add <code>{ t('example_comment') }</code> - { t('example_comment_meaning') } </s> remove <code>127.0.0.1 example.org</code> - { t('AdGuard Home will now return 127.0.0.1 address for the example.org domain (but not its subdomains).') }
</s> add <code>127.0.0.1 example.org</code> - { t('example_comment') } </s> remove <code> @@||example.org^</code> - { t('unblock access to the example.org domain and all its subdomains') }
</s> add <code> @@||example.org^</code> - { t('example_meaning_filter_whitelist') } </s> remove <code>||example.org^</code> - { t('block access to the example.org domain and all its subdomains') }
</s> add <code>||example.org^</code> - { t('example_meaning_filter_block') } </s> remove <Trans>Examples</Trans>:
</s> add <Trans>examples_title</Trans>: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/UserRules.js |
Header: this.props.t('enabled_table_header'), | <mask> );
<mask> };
<mask>
<mask> columns = [{
<mask> Header: this.props.t('Enabled'),
<mask> accessor: 'enabled',
<mask> Cell: this.renderCheckbox,
<mask> width: 90,
<mask> className: 'text-center',
<mask> }, {
</s> Convert i18n resource to key type </s> remove Header: this.props.t('Name'),
</s> add Header: this.props.t('name_table_header'), </s> remove Header: this.props.t('Last time updated'),
</s> add Header: this.props.t('last_time_updated_table_header'), </s> remove Header: this.props.t('Actions'),
</s> add Header: this.props.t('actions_table_header'), </s> remove Cell: ({ value }) => (<span title={ this.props.t('Delete') } className='remove-icon fe fe-trash-2' onClick={() => this.props.removeFilter(value)}/>),
</s> add Cell: ({ value }) => (<span title={ this.props.t('delete_table_action') } className='remove-icon fe fe-trash-2' onClick={() => this.props.removeFilter(value)}/>), </s> remove Header: t('Time'),
</s> add Header: t('time_table_header'), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/index.js |
Header: this.props.t('name_table_header'), | <mask> Cell: this.renderCheckbox,
<mask> width: 90,
<mask> className: 'text-center',
<mask> }, {
<mask> Header: this.props.t('Name'),
<mask> accessor: 'name',
<mask> Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><span className="logs__text" title={value}>{value}</span></div>),
<mask> }, {
<mask> Header: this.props.t('Filter URL'),
<mask> accessor: 'url',
</s> Convert i18n resource to key type </s> remove Header: this.props.t('Filter URL'),
</s> add Header: this.props.t('filter_url_table_header'), </s> remove Header: this.props.t('Rules count'),
</s> add Header: this.props.t('rules_count_table_header'), </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, </s> remove Header: this.props.t('Enabled'),
</s> add Header: this.props.t('enabled_table_header'), </s> remove Header: this.props.t('Actions'),
</s> add Header: this.props.t('actions_table_header'), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/index.js |
Header: this.props.t('filter_url_table_header'), | <mask> Header: this.props.t('Name'),
<mask> accessor: 'name',
<mask> Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><span className="logs__text" title={value}>{value}</span></div>),
<mask> }, {
<mask> Header: this.props.t('Filter URL'),
<mask> accessor: 'url',
<mask> Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><a href={value} target='_blank' rel='noopener noreferrer' className="link logs__text">{value}</a></div>),
<mask> }, {
<mask> Header: this.props.t('Rules count'),
<mask> accessor: 'rulesCount',
</s> Convert i18n resource to key type </s> remove Header: this.props.t('Rules count'),
</s> add Header: this.props.t('rules_count_table_header'), </s> remove Header: this.props.t('Name'),
</s> add Header: this.props.t('name_table_header'), </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, </s> remove Header: t('Domain name'),
</s> add Header: t('domain_name_table_header'), </s> remove Header: t('Time'),
</s> add Header: t('time_table_header'), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/index.js |
Header: this.props.t('rules_count_table_header'), | <mask> Header: this.props.t('Filter URL'),
<mask> accessor: 'url',
<mask> Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><a href={value} target='_blank' rel='noopener noreferrer' className="link logs__text">{value}</a></div>),
<mask> }, {
<mask> Header: this.props.t('Rules count'),
<mask> accessor: 'rulesCount',
<mask> className: 'text-center',
<mask> Cell: props => props.value.toLocaleString(),
<mask> }, {
<mask> Header: this.props.t('Last time updated'),
</s> Convert i18n resource to key type </s> remove Header: this.props.t('Filter URL'),
</s> add Header: this.props.t('filter_url_table_header'), </s> remove Header: this.props.t('Last time updated'),
</s> add Header: this.props.t('last_time_updated_table_header'), </s> remove Header: this.props.t('Name'),
</s> add Header: this.props.t('name_table_header'), </s> remove Header: this.props.t('Actions'),
</s> add Header: this.props.t('actions_table_header'), </s> remove Cell: ({ value }) => (<span title={ this.props.t('Delete') } className='remove-icon fe fe-trash-2' onClick={() => this.props.removeFilter(value)}/>),
</s> add Cell: ({ value }) => (<span title={ this.props.t('delete_table_action') } className='remove-icon fe fe-trash-2' onClick={() => this.props.removeFilter(value)}/>), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/index.js |
Header: this.props.t('last_time_updated_table_header'), | <mask> accessor: 'rulesCount',
<mask> className: 'text-center',
<mask> Cell: props => props.value.toLocaleString(),
<mask> }, {
<mask> Header: this.props.t('Last time updated'),
<mask> accessor: 'lastUpdated',
<mask> className: 'text-center',
<mask> }, {
<mask> Header: this.props.t('Actions'),
<mask> accessor: 'url',
</s> Convert i18n resource to key type </s> remove Header: this.props.t('Rules count'),
</s> add Header: this.props.t('rules_count_table_header'), </s> remove Header: this.props.t('Actions'),
</s> add Header: this.props.t('actions_table_header'), </s> remove Header: this.props.t('Name'),
</s> add Header: this.props.t('name_table_header'), </s> remove Cell: ({ value }) => (<span title={ this.props.t('Delete') } className='remove-icon fe fe-trash-2' onClick={() => this.props.removeFilter(value)}/>),
</s> add Cell: ({ value }) => (<span title={ this.props.t('delete_table_action') } className='remove-icon fe fe-trash-2' onClick={() => this.props.removeFilter(value)}/>), </s> remove Header: this.props.t('Enabled'),
</s> add Header: this.props.t('enabled_table_header'), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/index.js |
Header: this.props.t('actions_table_header'), | <mask> Header: this.props.t('Last time updated'),
<mask> accessor: 'lastUpdated',
<mask> className: 'text-center',
<mask> }, {
<mask> Header: this.props.t('Actions'),
<mask> accessor: 'url',
<mask> Cell: ({ value }) => (<span title={ this.props.t('Delete') } className='remove-icon fe fe-trash-2' onClick={() => this.props.removeFilter(value)}/>),
<mask> className: 'text-center',
<mask> width: 75,
<mask> sortable: false,
</s> Convert i18n resource to key type </s> remove Cell: ({ value }) => (<span title={ this.props.t('Delete') } className='remove-icon fe fe-trash-2' onClick={() => this.props.removeFilter(value)}/>),
</s> add Cell: ({ value }) => (<span title={ this.props.t('delete_table_action') } className='remove-icon fe fe-trash-2' onClick={() => this.props.removeFilter(value)}/>), </s> remove Header: this.props.t('Last time updated'),
</s> add Header: this.props.t('last_time_updated_table_header'), </s> remove Header: this.props.t('Rules count'),
</s> add Header: this.props.t('rules_count_table_header'), </s> remove Header: this.props.t('Name'),
</s> add Header: this.props.t('name_table_header'), </s> remove Header: this.props.t('Enabled'),
</s> add Header: this.props.t('enabled_table_header'), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/index.js |
Cell: ({ value }) => (<span title={ this.props.t('delete_table_action') } className='remove-icon fe fe-trash-2' onClick={() => this.props.removeFilter(value)}/>), | <mask> className: 'text-center',
<mask> }, {
<mask> Header: this.props.t('Actions'),
<mask> accessor: 'url',
<mask> Cell: ({ value }) => (<span title={ this.props.t('Delete') } className='remove-icon fe fe-trash-2' onClick={() => this.props.removeFilter(value)}/>),
<mask> className: 'text-center',
<mask> width: 75,
<mask> sortable: false,
<mask> },
<mask> ];
</s> Convert i18n resource to key type </s> remove Header: this.props.t('Actions'),
</s> add Header: this.props.t('actions_table_header'), </s> remove Header: this.props.t('Name'),
</s> add Header: this.props.t('name_table_header'), </s> remove Header: this.props.t('Last time updated'),
</s> add Header: this.props.t('last_time_updated_table_header'), </s> remove Header: this.props.t('Rules count'),
</s> add Header: this.props.t('rules_count_table_header'), </s> remove Header: this.props.t('Enabled'),
</s> add Header: this.props.t('enabled_table_header'), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/index.js |
<PageTitle title={ t('filters') } /> | <mask> const { t } = this.props;
<mask> const { filters, userRules } = this.props.filtering;
<mask> return (
<mask> <div>
<mask> <PageTitle title={ t('Filters') } />
<mask> <div className="content">
<mask> <div className="row">
<mask> <div className="col-md-12">
<mask> <Card
<mask> title={ t('Filters and hosts blocklists') }
</s> Convert i18n resource to key type </s> remove <PageTitle title={ t('Settings') } />
</s> add <PageTitle title={ t('settings') } /> </s> remove title={ t('Filters and hosts blocklists') }
subtitle={ t('AdGuard Home understands basic adblock rules and hosts files syntax.') }
</s> add title={ t('filters_and_hosts') }
subtitle={ t('filters_and_hosts_hint') } </s> remove <Card title={ t('General settings') } bodyType="card-body box-body--settings">
</s> add <Card title={ t('general_settings') } bodyType="card-body box-body--settings"> </s> remove <PageTitle title={ t('Query Log') } subtitle={ t('Last 5000 DNS queries') }>
</s> add <PageTitle title={ t('query_log') } subtitle={ t('last_5000_dns_queries') }> </s> remove title={ t('Custom filtering rules') }
subtitle={ t('Enter one rule on a line. You can use either adblock rules or hosts files syntax.') }
</s> add title={ t('custom_filter_rules') }
subtitle={ t('custom_filter_rules_hint') } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/index.js |
title={ t('filters_and_hosts') }
subtitle={ t('filters_and_hosts_hint') } | <mask> <div className="content">
<mask> <div className="row">
<mask> <div className="col-md-12">
<mask> <Card
<mask> title={ t('Filters and hosts blocklists') }
<mask> subtitle={ t('AdGuard Home understands basic adblock rules and hosts files syntax.') }
<mask> >
<mask> <ReactTable
<mask> data={filters}
<mask> columns={this.columns}
<mask> showPagination={false}
</s> Convert i18n resource to key type </s> remove <PageTitle title={ t('Filters') } />
</s> add <PageTitle title={ t('filters') } /> </s> remove title={ t('Custom filtering rules') }
subtitle={ t('Enter one rule on a line. You can use either adblock rules or hosts files syntax.') }
</s> add title={ t('custom_filter_rules') }
subtitle={ t('custom_filter_rules_hint') } </s> remove <Card title={ t('General settings') } bodyType="card-body box-body--settings">
</s> add <Card title={ t('general_settings') } bodyType="card-body box-body--settings"> </s> remove title={ t('Upstream DNS servers') }
subtitle={ t('If you keep this field empty, AdGuard Home will use <a href="https://1.1.1.1/" target="_blank">Cloudflare DNS</a> as an upstream. Use tls:// prefix for DNS over TLS servers.') }
</s> add title={ t('upstream_dns') }
subtitle={ t('upstream_dns_hint') } </s> remove <PageTitle title={ t('Settings') } />
</s> add <PageTitle title={ t('settings') } /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/index.js |
noDataText={ t('no_filters_added') } | <mask> <ReactTable
<mask> data={filters}
<mask> columns={this.columns}
<mask> showPagination={false}
<mask> noDataText={ t('No filters added') }
<mask> minRows={4} // TODO find out what to show if rules.length is 0
<mask> />
<mask> <div className="card-actions">
<mask> <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>Add filter</Trans></button>
<mask> <button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>Check updates</Trans></button>
</s> Convert i18n resource to key type </s> remove <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>Add filter</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>Check updates</Trans></button>
</s> add <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>add_filter_btn</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>cancel_btn</Trans></button> </s> remove ><Trans>Download log file</Trans></button>
</s> add ><Trans>download_log_file_btn</Trans></button> </s> remove ><Trans>Disable log</Trans></button>
</s> add ><Trans>disabled_log_btn</Trans></button> </s> remove <Trans>Test upstreams</Trans>
</s> add <Trans>test_upstream_btn</Trans> </s> remove ><Trans>Enable log</Trans></button>
</s> add ><Trans>enabled_log_btn</Trans></button> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/index.js |
<button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>add_filter_btn</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>cancel_btn</Trans></button> | <mask> noDataText={ t('No filters added') }
<mask> minRows={4} // TODO find out what to show if rules.length is 0
<mask> />
<mask> <div className="card-actions">
<mask> <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>Add filter</Trans></button>
<mask> <button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>Check updates</Trans></button>
<mask> </div>
<mask> </Card>
<mask> </div>
<mask> <div className="col-md-12">
<mask> <UserRules
</s> Convert i18n resource to key type </s> remove noDataText={ t('No filters added') }
</s> add noDataText={ t('no_filters_added') } </s> remove ><Trans>Download log file</Trans></button>
</s> add ><Trans>download_log_file_btn</Trans></button> </s> remove ><Trans>Disable log</Trans></button>
</s> add ><Trans>disabled_log_btn</Trans></button> </s> remove <Trans>Apply</Trans>
</s> add <Trans>apply_btn</Trans> </s> remove <Trans>Test upstreams</Trans>
</s> add <Trans>test_upstream_btn</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/index.js |
title={ t('new_filter_btn') }
inputDescription={ t('enter_valid_filter_url') } | <mask> isOpen={this.props.filtering.isFilteringModalOpen}
<mask> toggleModal={this.props.toggleFilteringModal}
<mask> addFilter={this.props.addFilter}
<mask> isFilterAdded={this.props.filtering.isFilterAdded}
<mask> title={ t('New filter subscription') }
<mask> inputDescription={ t('Enter a valid URL to a filter subscription or a hosts file.') }
<mask> />
<mask> </div>
<mask> );
<mask> }
<mask> }
</s> Convert i18n resource to key type </s> remove title={ t('Custom filtering rules') }
subtitle={ t('Enter one rule on a line. You can use either adblock rules or hosts files syntax.') }
</s> add title={ t('custom_filter_rules') }
subtitle={ t('custom_filter_rules_hint') } </s> remove <code>{ t('# Also a comment') }</code> - { t('just a comment') }
</s> add <code>{ t('example_comment_hash') }</code> - { t('example_comment_meaning') } </s> remove <code>{ t('! Here goes a comment') }</code> - { t('just a comment') }
</s> add <code>{ t('example_comment') }</code> - { t('example_comment_meaning') } </s> remove <code>127.0.0.1 example.org</code> - { t('AdGuard Home will now return 127.0.0.1 address for the example.org domain (but not its subdomains).') }
</s> add <code>127.0.0.1 example.org</code> - { t('example_comment') } </s> remove <Trans>Average processing time</Trans>
<Tooltip text={ props.t('Average time in milliseconds on processing a DNS request') } type={tooltipType} />
</s> add <Trans>average_processing_time</Trans>
<Tooltip text={ props.t('average_processing_time_hint') } type={tooltipType} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Filters/index.js |
<Trans>back</Trans> | <mask> <ul className="nav nav-tabs border-0 flex-column flex-lg-row">
<mask> <li className="nav-item border-bottom d-lg-none" onClick={this.toggleMenu}>
<mask> <div className="nav-link nav-link--back">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m19 12h-14"/><path d="m12 19-7-7 7-7"/></svg>
<mask> <Trans>Back</Trans>
<mask> </div>
<mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/" exact={true} className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" stroke="#9aa0ac" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m3 9 9-7 9 7v11a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2-2z"/><path d="m9 22v-10h6v10"/></svg>
</s> Convert i18n resource to key type </s> remove <Trans>Filters</Trans>
</s> add <Trans>filters</Trans> </s> remove <Trans>Query Log</Trans>
</s> add <Trans>query_log</Trans> </s> remove <Trans>Dashboard</Trans>
</s> add <Trans>dashboard</Trans> </s> remove <Trans>Settings</Trans>
</s> add <Trans>settings</Trans> </s> remove <Trans>FAQ</Trans>
</s> add <Trans>faq</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Header/Menu.js |
<Trans>dashboard</Trans> | <mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/" exact={true} className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" stroke="#9aa0ac" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m3 9 9-7 9 7v11a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2-2z"/><path d="m9 22v-10h6v10"/></svg>
<mask> <Trans>Dashboard</Trans>
<mask> </NavLink>
<mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/settings" className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="3"/><path d="m19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1 -2.83 0l-.06-.06a1.65 1.65 0 0 0 -1.82-.33 1.65 1.65 0 0 0 -1 1.51v.17a2 2 0 0 1 -2 2 2 2 0 0 1 -2-2v-.09a1.65 1.65 0 0 0 -1.08-1.51 1.65 1.65 0 0 0 -1.82.33l-.06.06a2 2 0 0 1 -2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0 -1.51-1h-.17a2 2 0 0 1 -2-2 2 2 0 0 1 2-2h.09a1.65 1.65 0 0 0 1.51-1.08 1.65 1.65 0 0 0 -.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33h.08a1.65 1.65 0 0 0 1-1.51v-.17a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0 -.33 1.82v.08a1.65 1.65 0 0 0 1.51 1h.17a2 2 0 0 1 2 2 2 2 0 0 1 -2 2h-.09a1.65 1.65 0 0 0 -1.51 1z"/></svg>
</s> Convert i18n resource to key type </s> remove <Trans>Settings</Trans>
</s> add <Trans>settings</Trans> </s> remove <Trans>Query Log</Trans>
</s> add <Trans>query_log</Trans> </s> remove <Trans>Filters</Trans>
</s> add <Trans>filters</Trans> </s> remove <Trans>Back</Trans>
</s> add <Trans>back</Trans> </s> remove <Trans>FAQ</Trans>
</s> add <Trans>faq</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Header/Menu.js |
<Trans>settings</Trans> | <mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/settings" className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="3"/><path d="m19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1 -2.83 0l-.06-.06a1.65 1.65 0 0 0 -1.82-.33 1.65 1.65 0 0 0 -1 1.51v.17a2 2 0 0 1 -2 2 2 2 0 0 1 -2-2v-.09a1.65 1.65 0 0 0 -1.08-1.51 1.65 1.65 0 0 0 -1.82.33l-.06.06a2 2 0 0 1 -2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0 -1.51-1h-.17a2 2 0 0 1 -2-2 2 2 0 0 1 2-2h.09a1.65 1.65 0 0 0 1.51-1.08 1.65 1.65 0 0 0 -.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33h.08a1.65 1.65 0 0 0 1-1.51v-.17a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0 -.33 1.82v.08a1.65 1.65 0 0 0 1.51 1h.17a2 2 0 0 1 2 2 2 2 0 0 1 -2 2h-.09a1.65 1.65 0 0 0 -1.51 1z"/></svg>
<mask> <Trans>Settings</Trans>
<mask> </NavLink>
<mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/filters" className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m22 3h-20l8 9.46v6.54l4 2v-8.54z"/></svg>
</s> Convert i18n resource to key type </s> remove <Trans>Dashboard</Trans>
</s> add <Trans>dashboard</Trans> </s> remove <Trans>Filters</Trans>
</s> add <Trans>filters</Trans> </s> remove <Trans>Query Log</Trans>
</s> add <Trans>query_log</Trans> </s> remove <Trans>Back</Trans>
</s> add <Trans>back</Trans> </s> remove <Trans>FAQ</Trans>
</s> add <Trans>faq</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Header/Menu.js |
<Trans>filters</Trans> | <mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/filters" className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m22 3h-20l8 9.46v6.54l4 2v-8.54z"/></svg>
<mask> <Trans>Filters</Trans>
<mask> </NavLink>
<mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/logs" className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m14 2h-8a2 2 0 0 0 -2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-12z"/><path d="m14 2v6h6"/><path d="m16 13h-8"/><path d="m16 17h-8"/><path d="m10 9h-1-1"/></svg>
</s> Convert i18n resource to key type </s> remove <Trans>Query Log</Trans>
</s> add <Trans>query_log</Trans> </s> remove <Trans>Back</Trans>
</s> add <Trans>back</Trans> </s> remove <Trans>Settings</Trans>
</s> add <Trans>settings</Trans> </s> remove <Trans>Dashboard</Trans>
</s> add <Trans>dashboard</Trans> </s> remove <Trans>FAQ</Trans>
</s> add <Trans>faq</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Header/Menu.js |
<Trans>query_log</Trans> | <mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/logs" className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m14 2h-8a2 2 0 0 0 -2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-12z"/><path d="m14 2v6h6"/><path d="m16 13h-8"/><path d="m16 17h-8"/><path d="m10 9h-1-1"/></svg>
<mask> <Trans>Query Log</Trans>
<mask> </NavLink>
<mask> </li>
<mask> <li className="nav-item">
<mask> <a href={`${REPOSITORY.URL}/wiki`} className="nav-link" target="_blank" rel="noopener noreferrer">
<mask> <svg className="nav-icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#66b574" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><circle cx="12" cy="12" r="10"></circle><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><line x1="12" y1="17" x2="12" y2="17"></line></svg>
</s> Convert i18n resource to key type </s> remove <Trans>Filters</Trans>
</s> add <Trans>filters</Trans> </s> remove <Trans>FAQ</Trans>
</s> add <Trans>faq</Trans> </s> remove <Trans>Back</Trans>
</s> add <Trans>back</Trans> </s> remove <Trans>Settings</Trans>
</s> add <Trans>settings</Trans> </s> remove <Trans>Dashboard</Trans>
</s> add <Trans>dashboard</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Header/Menu.js |
<Trans>faq</Trans> | <mask> </li>
<mask> <li className="nav-item">
<mask> <a href={`${REPOSITORY.URL}/wiki`} className="nav-link" target="_blank" rel="noopener noreferrer">
<mask> <svg className="nav-icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#66b574" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><circle cx="12" cy="12" r="10"></circle><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><line x1="12" y1="17" x2="12" y2="17"></line></svg>
<mask> <Trans>FAQ</Trans>
<mask> </a>
<mask> </li>
<mask> </ul>
<mask> </div>
<mask> </Fragment>
</s> Convert i18n resource to key type </s> remove <Trans>Query Log</Trans>
</s> add <Trans>query_log</Trans> </s> remove <Trans>Filters</Trans>
</s> add <Trans>filters</Trans> </s> remove <Trans>Back</Trans>
</s> add <Trans>back</Trans> </s> remove <Trans>Settings</Trans>
</s> add <Trans>settings</Trans> </s> remove <Trans>Dashboard</Trans>
</s> add <Trans>dashboard</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Header/Menu.js |
<Trans>{dashboard.protectionEnabled ? 'on' : 'off'}</Trans> | <mask> <img src={logo} alt="" className="header-brand-img" />
<mask> </Link>
<mask> {!dashboard.proccessing && dashboard.isCoreRunning &&
<mask> <span className={badgeClass}>
<mask> <Trans>{dashboard.protectionEnabled ? 'ON' : 'OFF'}</Trans>
<mask> </span>
<mask> }
<mask> </div>
<mask> </div>
<mask> <Menu
</s> Convert i18n resource to key type </s> remove <PageTitle title={ t('Settings') } />
</s> add <PageTitle title={ t('settings') } /> </s> remove <Trans>Filter</Trans>: <strong>{this.props.filter}</strong>
</s> add <Trans>filter_label</Trans>: <strong>{this.props.filter}</strong> </s> remove <Trans>Rule</Trans>: <strong>{this.props.rule}</strong>
</s> add <Trans>rule_label</Trans>: <strong>{this.props.rule}</strong> </s> remove <button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>Cancel</Trans></button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}><Trans>Add filter</Trans></button>
</s> add <button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>cancel_btn</Trans></button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}><Trans>add_filter_btn</Trans></button> </s> remove <Card title={ t('General settings') } bodyType="card-body box-body--settings">
</s> add <Card title={ t('general_settings') } bodyType="card-body box-body--settings"> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Header/index.js |
this.props.addSuccessToast(`${t('rule_removed_from_custom_filtering_toast')}: ${blockingRule}`); | <mask> const preparedUnblockingRule = new RegExp(`(^|\n)${escapeRegExp(unblockingRule)}($|\n)`);
<mask>
<mask> if (userRules.match(preparedBlockingRule)) {
<mask> this.props.setRules(userRules.replace(`${blockingRule}`, ''));
<mask> this.props.addSuccessToast(`${t('Rule removed from the custom filtering rules')}: ${blockingRule}`);
<mask> } else if (!userRules.match(preparedUnblockingRule)) {
<mask> this.props.setRules(`${userRules}${lineEnding}${unblockingRule}\n`);
<mask> this.props.addSuccessToast(`${t('Rule added to the custom filtering rules')}: ${unblockingRule}`);
<mask> }
<mask>
</s> Convert i18n resource to key type </s> remove this.props.addSuccessToast(`${t('Rule added to the custom filtering rules')}: ${unblockingRule}`);
</s> add this.props.addSuccessToast(`${t('rule_added_to_custom_filtering_toast')}: ${unblockingRule}`); </s> remove dispatch(addSuccessToast('Updated the custom filtering rules'));
</s> add dispatch(addSuccessToast('updated_custom_filtering_toast')); </s> remove filterName = 'Custom filtering rules';
</s> add filterName = 'custom_filter_rules'; </s> remove import i18n from '../../i18n';
</s> add import i18n, { languages } from '../../i18n'; </s> remove dispatch(addSuccessToast('All filters are already up-to-date'));
</s> add dispatch(addSuccessToast('all_filters_up_to_date_toast')); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Logs/index.js |
this.props.addSuccessToast(`${t('rule_added_to_custom_filtering_toast')}: ${unblockingRule}`); | <mask> this.props.setRules(userRules.replace(`${blockingRule}`, ''));
<mask> this.props.addSuccessToast(`${t('Rule removed from the custom filtering rules')}: ${blockingRule}`);
<mask> } else if (!userRules.match(preparedUnblockingRule)) {
<mask> this.props.setRules(`${userRules}${lineEnding}${unblockingRule}\n`);
<mask> this.props.addSuccessToast(`${t('Rule added to the custom filtering rules')}: ${unblockingRule}`);
<mask> }
<mask>
<mask> this.props.getFilteringStatus();
<mask> }
<mask>
</s> Convert i18n resource to key type </s> remove this.props.addSuccessToast(`${t('Rule removed from the custom filtering rules')}: ${blockingRule}`);
</s> add this.props.addSuccessToast(`${t('rule_removed_from_custom_filtering_toast')}: ${blockingRule}`); </s> remove dispatch(addSuccessToast('Updated the custom filtering rules'));
</s> add dispatch(addSuccessToast('updated_custom_filtering_toast')); </s> remove filterName = 'Custom filtering rules';
</s> add filterName = 'custom_filter_rules'; </s> remove import i18n from '../../i18n';
</s> add import i18n, { languages } from '../../i18n'; </s> remove <code> @@||example.org^</code> - { t('unblock access to the example.org domain and all its subdomains') }
</s> add <code> @@||example.org^</code> - { t('example_meaning_filter_whitelist') } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Logs/index.js |
const buttonText = isFiltered ? 'ublock_btn' : 'block_btn'; | <mask> }
<mask>
<mask> renderBlockingButton(isFiltered, domain) {
<mask> const buttonClass = isFiltered ? 'btn-outline-secondary' : 'btn-outline-danger';
<mask> const buttonText = isFiltered ? 'Unblock' : 'Block';
<mask>
<mask> return (
<mask> <div className="logs__action">
<mask> <button
<mask> type="button"
</s> Convert i18n resource to key type </s> remove const buttonText = protectionEnabled ? 'Disable' : 'Enable';
</s> add const buttonText = protectionEnabled ? 'disable_protection' : 'enable_protection'; </s> remove <Trans>{buttonText} protection</Trans>
</s> add <Trans>{buttonText}</Trans> </s> remove Header: t('Response'),
</s> add Header: t('response_table_header'), </s> remove changeLanguage = () => {
i18n.changeLanguage(i18n.language === 'en' ? 'vi' : 'en');
</s> add changeLanguage = (event) => {
i18n.changeLanguage(event.target.value); </s> remove <Trans>{dashboard.protectionEnabled ? 'ON' : 'OFF'}</Trans>
</s> add <Trans>{dashboard.protectionEnabled ? 'on' : 'off'}</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Logs/index.js |
Header: t('time_table_header'), | <mask>
<mask> renderLogs(logs) {
<mask> const { t } = this.props;
<mask> const columns = [{
<mask> Header: t('Time'),
<mask> accessor: 'time',
<mask> maxWidth: 110,
<mask> filterable: false,
<mask> Cell: ({ value }) => (<div className="logs__row"><span className="logs__text" title={value}>{formatTime(value)}</span></div>),
<mask> }, {
</s> Convert i18n resource to key type </s> remove Header: t('Domain name'),
</s> add Header: t('domain_name_table_header'), </s> remove Header: this.props.t('Filter URL'),
</s> add Header: this.props.t('filter_url_table_header'), </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, </s> remove Header: this.props.t('Name'),
</s> add Header: this.props.t('name_table_header'), </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Logs/index.js |
Header: t('domain_name_table_header'), | <mask> maxWidth: 110,
<mask> filterable: false,
<mask> Cell: ({ value }) => (<div className="logs__row"><span className="logs__text" title={value}>{formatTime(value)}</span></div>),
<mask> }, {
<mask> Header: t('Domain name'),
<mask> accessor: 'domain',
<mask> Cell: (row) => {
<mask> const response = row.value;
<mask> const trackerData = getTrackerData(response);
<mask>
</s> Convert i18n resource to key type </s> remove Header: t('Time'),
</s> add Header: t('time_table_header'), </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, </s> remove Header: this.props.t('Filter URL'),
</s> add Header: this.props.t('filter_url_table_header'), </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, </s> remove Header: this.props.t('Name'),
</s> add Header: this.props.t('name_table_header'), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Logs/index.js |
Header: t('type_table_header'), | <mask> </div>
<mask> );
<mask> },
<mask> }, {
<mask> Header: t('Type'),
<mask> accessor: 'type',
<mask> maxWidth: 60,
<mask> }, {
<mask> Header: t('Response'),
<mask> accessor: 'response',
</s> Convert i18n resource to key type </s> remove Header: t('Response'),
</s> add Header: t('response_table_header'), </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, </s> remove Header: this.props.t('Last time updated'),
</s> add Header: this.props.t('last_time_updated_table_header'), </s> remove Header: this.props.t('Name'),
</s> add Header: this.props.t('name_table_header'), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Logs/index.js |
Header: t('response_table_header'), | <mask> Header: t('Type'),
<mask> accessor: 'type',
<mask> maxWidth: 60,
<mask> }, {
<mask> Header: t('Response'),
<mask> accessor: 'response',
<mask> Cell: (row) => {
<mask> const responses = row.value;
<mask> const { reason } = row.original;
<mask> const isFiltered = row ? reason.indexOf('Filtered') === 0 : false;
</s> Convert i18n resource to key type </s> remove Header: t('Type'),
</s> add Header: t('type_table_header'), </s> remove Header: t('Domain name'),
</s> add Header: t('domain_name_table_header'), </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, </s> remove Header: t('Time'),
</s> add Header: t('time_table_header'), </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Logs/index.js |
filterName = 'custom_filter_rules'; | <mask> let filterName = '';
<mask>
<mask> if (reason === 'FilteredBlackList' || reason === 'NotFilteredWhiteList') {
<mask> if (filterId === 0) {
<mask> filterName = 'Custom filtering rules';
<mask> } else {
<mask> const filterItem = Object.keys(filters)
<mask> .filter(key => filters[key].id === filterId);
<mask> filterName = filters[filterItem].name;
<mask> }
</s> Convert i18n resource to key type </s> remove Header: t('Response'),
</s> add Header: t('response_table_header'), </s> remove dispatch(addSuccessToast('Specified DNS servers are working correctly'));
</s> add dispatch(addSuccessToast('dns_test_ok_toast')); </s> remove dispatch(addErrorToast({ error: t('Server "{{key}}": could not be used, please check that you\'ve written it correctly', { key }) }));
</s> add dispatch(addErrorToast({ error: t('dns_test_not_ok_toast', { key }) })); </s> remove changeLanguage = () => {
i18n.changeLanguage(i18n.language === 'en' ? 'vi' : 'en');
</s> add changeLanguage = (event) => {
i18n.changeLanguage(event.target.value); </s> remove successMessage = 'Disabled protection';
</s> add successMessage = 'disabled_protection'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Logs/index.js |
<span><Trans>empty_response_status</Trans></span> | <mask> );
<mask> }
<mask> return (
<mask> <div className="logs__row">
<mask> <span><Trans>Empty</Trans></span>
<mask> {this.renderTooltip(isFiltered, rule, filterName)}
<mask> </div>
<mask> );
<mask> },
<mask> filterMethod: (filter, row) => {
</s> Convert i18n resource to key type </s> remove <div><Trans>No settings</Trans></div>
</s> add <div><Trans>no_settings</Trans></div> </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, </s> remove <Trans>{buttonText} protection</Trans>
</s> add <Trans>{buttonText}</Trans> </s> remove Header: t('Type'),
</s> add Header: t('type_table_header'), </s> remove ><Trans>Refresh</Trans></button>
</s> add ><Trans>refresh_btn</Trans></button> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Logs/index.js |
<option value="all">{ t('show_all_filter_type') }</option>
<option value="filtered">{ t('show_filtered_type') }</option> | <mask> onChange={event => onChange(event.target.value)}
<mask> className="form-control"
<mask> value={filter ? filter.value : 'all'}
<mask> >
<mask> <option value="all">{ t('Show all') }</option>
<mask> <option value="filtered">{ t('Show filtered') }</option>
<mask> </select>,
<mask> }, {
<mask> Header: t('Client'),
<mask> accessor: 'client',
<mask> maxWidth: 250,
</s> Convert i18n resource to key type </s> remove Header: t('Response'),
</s> add Header: t('response_table_header'), </s> remove Header: t('Type'),
</s> add Header: t('type_table_header'), </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, </s> remove Header: <Trans>Requests count</Trans>,
</s> add Header: <Trans>requests_count</Trans>, </s> remove Header: t('Domain name'),
</s> add Header: t('domain_name_table_header'), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Logs/index.js |
previousText={ t('previous_btn') }
nextText={ t('next_btn') }
loadingText={ t('loading_table_status') }
pageText={ t('page_table_footer_text') }
ofText={ t('of_table_footer_text') }
rowsText={ t('rows_table_footer_text') }
noDataText={ t('no_logs_found') } | <mask> showPagination={true}
<mask> defaultPageSize={50}
<mask> minRows={7}
<mask> // Text
<mask> previousText={ t('Previous') }
<mask> nextText={ t('Next') }
<mask> loadingText={ t('Loading...') }
<mask> pageText={ t('Page') }
<mask> ofText={ t('of') }
<mask> rowsText={ t('rows') }
<mask> noDataText={ t('No logs found') }
<mask> defaultFilterMethod={(filter, row) => {
<mask> const id = filter.pivotId || filter.id;
<mask> return row[id] !== undefined ?
<mask> String(row[id]).indexOf(filter.value) !== -1 : true;
<mask> }}
</s> Convert i18n resource to key type </s> remove noDataText={ t('No clients found') }
</s> add noDataText={ t('no_clients_found') } </s> remove noDataText={ t('No domains found') }
</s> add noDataText={ t('no_domains_found') } </s> remove noDataText={ t('No domains found') }
</s> add noDataText={ t('no_domains_found') } </s> remove const buttonText = protectionEnabled ? 'Disable' : 'Enable';
</s> add const buttonText = protectionEnabled ? 'disable_protection' : 'enable_protection'; </s> remove const buttonText = isFiltered ? 'Unblock' : 'Block';
</s> add const buttonText = isFiltered ? 'ublock_btn' : 'block_btn'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Logs/index.js |
><Trans>disabled_log_btn</Trans></button> | <mask> <button
<mask> className="btn btn-gray btn-sm mr-2"
<mask> type="submit"
<mask> onClick={() => this.props.toggleLogStatus(queryLogEnabled)}
<mask> ><Trans>Disable log</Trans></button>
<mask> <button
<mask> className="btn btn-primary btn-sm mr-2"
<mask> type="submit"
<mask> onClick={this.handleDownloadButton}
<mask> ><Trans>Download log file</Trans></button>
</s> Convert i18n resource to key type </s> remove ><Trans>Download log file</Trans></button>
</s> add ><Trans>download_log_file_btn</Trans></button> </s> remove ><Trans>Enable log</Trans></button>
</s> add ><Trans>enabled_log_btn</Trans></button> </s> remove <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>Add filter</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>Check updates</Trans></button>
</s> add <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>add_filter_btn</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>cancel_btn</Trans></button> </s> remove noDataText={ t('No filters added') }
</s> add noDataText={ t('no_filters_added') } </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>Refresh statistics</Trans></button>;
</s> add const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>refresh_statics</Trans></button>; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Logs/index.js |
><Trans>download_log_file_btn</Trans></button> | <mask> <button
<mask> className="btn btn-primary btn-sm mr-2"
<mask> type="submit"
<mask> onClick={this.handleDownloadButton}
<mask> ><Trans>Download log file</Trans></button>
<mask> <button
<mask> className="btn btn-outline-primary btn-sm"
<mask> type="submit"
<mask> onClick={this.getLogs}
<mask> ><Trans>Refresh</Trans></button>
</s> Convert i18n resource to key type </s> remove ><Trans>Disable log</Trans></button>
</s> add ><Trans>disabled_log_btn</Trans></button> </s> remove ><Trans>Refresh</Trans></button>
</s> add ><Trans>refresh_btn</Trans></button> </s> remove <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>Add filter</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>Check updates</Trans></button>
</s> add <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>add_filter_btn</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>cancel_btn</Trans></button> </s> remove noDataText={ t('No filters added') }
</s> add noDataText={ t('no_filters_added') } </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>Refresh statistics</Trans></button>;
</s> add const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>refresh_statics</Trans></button>; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Logs/index.js |
><Trans>refresh_btn</Trans></button> | <mask> <button
<mask> className="btn btn-outline-primary btn-sm"
<mask> type="submit"
<mask> onClick={this.getLogs}
<mask> ><Trans>Refresh</Trans></button>
<mask> </Fragment>
<mask> );
<mask> }
<mask>
<mask> return (
</s> Convert i18n resource to key type </s> remove ><Trans>Download log file</Trans></button>
</s> add ><Trans>download_log_file_btn</Trans></button> </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>Refresh statistics</Trans></button>;
</s> add const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>refresh_statics</Trans></button>; </s> remove <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>Add filter</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>Check updates</Trans></button>
</s> add <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>add_filter_btn</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>cancel_btn</Trans></button> </s> remove ><Trans>Enable log</Trans></button>
</s> add ><Trans>enabled_log_btn</Trans></button> </s> remove <PageTitle title={ t('Dashboard') }>
</s> add <PageTitle title={ t('dashboard') }> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Logs/index.js |
><Trans>enabled_log_btn</Trans></button> | <mask> <button
<mask> className="btn btn-success btn-sm mr-2"
<mask> type="submit"
<mask> onClick={() => this.props.toggleLogStatus(queryLogEnabled)}
<mask> ><Trans>Enable log</Trans></button>
<mask> );
<mask> }
<mask>
<mask> render() {
<mask> const { queryLogs, dashboard, t } = this.props;
</s> Convert i18n resource to key type </s> remove ><Trans>Disable log</Trans></button>
</s> add ><Trans>disabled_log_btn</Trans></button> </s> remove <Trans>{buttonText} protection</Trans>
</s> add <Trans>{buttonText}</Trans> </s> remove <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>Add filter</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>Check updates</Trans></button>
</s> add <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>add_filter_btn</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>cancel_btn</Trans></button> </s> remove <PageTitle title={ t('Query Log') } subtitle={ t('Last 5000 DNS queries') }>
</s> add <PageTitle title={ t('query_log') } subtitle={ t('last_5000_dns_queries') }> </s> remove <div><Trans>No settings</Trans></div>
</s> add <div><Trans>no_settings</Trans></div> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Logs/index.js |
<PageTitle title={ t('query_log') } subtitle={ t('last_5000_dns_queries') }> | <mask> const { queryLogs, dashboard, t } = this.props;
<mask> const { queryLogEnabled } = dashboard;
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={ t('Query Log') } subtitle={ t('Last 5000 DNS queries') }>
<mask> <div className="page-title__actions">
<mask> {this.renderButtons(queryLogEnabled)}
<mask> </div>
<mask> </PageTitle>
<mask> <Card>
</s> Convert i18n resource to key type </s> remove <PageTitle title={ t('Dashboard') }>
</s> add <PageTitle title={ t('dashboard') }> </s> remove <PageTitle title={ t('Settings') } />
</s> add <PageTitle title={ t('settings') } /> </s> remove <PageTitle title={ t('Filters') } />
</s> add <PageTitle title={ t('filters') } /> </s> remove ><Trans>Enable log</Trans></button>
</s> add ><Trans>enabled_log_btn</Trans></button> </s> remove title={ t('Upstream DNS servers') }
subtitle={ t('If you keep this field empty, AdGuard Home will use <a href="https://1.1.1.1/" target="_blank">Cloudflare DNS</a> as an upstream. Use tls:// prefix for DNS over TLS servers.') }
</s> add title={ t('upstream_dns') }
subtitle={ t('upstream_dns_hint') } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Logs/index.js |
title={ t('upstream_dns') }
subtitle={ t('upstream_dns_hint') } | <mask> const { t } = this.props;
<mask>
<mask> return (
<mask> <Card
<mask> title={ t('Upstream DNS servers') }
<mask> subtitle={ t('If you keep this field empty, AdGuard Home will use <a href="https://1.1.1.1/" target="_blank">Cloudflare DNS</a> as an upstream. Use tls:// prefix for DNS over TLS servers.') }
<mask> bodyType="card-body box-body--settings"
<mask> >
<mask> <div className="row">
<mask> <div className="col">
<mask> <form>
</s> Convert i18n resource to key type </s> remove title={ t('Custom filtering rules') }
subtitle={ t('Enter one rule on a line. You can use either adblock rules or hosts files syntax.') }
</s> add title={ t('custom_filter_rules') }
subtitle={ t('custom_filter_rules_hint') } </s> remove <PageTitle title={ t('Query Log') } subtitle={ t('Last 5000 DNS queries') }>
</s> add <PageTitle title={ t('query_log') } subtitle={ t('last_5000_dns_queries') }> </s> remove <PageTitle title={ t('Filters') } />
</s> add <PageTitle title={ t('filters') } /> </s> remove title={ t('Filters and hosts blocklists') }
subtitle={ t('AdGuard Home understands basic adblock rules and hosts files syntax.') }
</s> add title={ t('filters_and_hosts') }
subtitle={ t('filters_and_hosts_hint') } </s> remove <Card title={ t('General settings') } bodyType="card-body box-body--settings">
</s> add <Card title={ t('general_settings') } bodyType="card-body box-body--settings"> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Settings/Upstream.js |
<Trans>test_upstream_btn</Trans> | <mask> className={testButtonClass}
<mask> type="button"
<mask> onClick={this.handleTest}
<mask> >
<mask> <Trans>Test upstreams</Trans>
<mask> </button>
<mask> <button
<mask> className="btn btn-success btn-standart"
<mask> type="submit"
<mask> onClick={this.handleSubmit}
</s> Convert i18n resource to key type </s> remove <Trans>Apply</Trans>
</s> add <Trans>apply_btn</Trans> </s> remove <Trans>Apply</Trans>
</s> add <Trans>apply_btn</Trans> </s> remove <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>Add filter</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>Check updates</Trans></button>
</s> add <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>add_filter_btn</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>cancel_btn</Trans></button> </s> remove noDataText={ t('No filters added') }
</s> add noDataText={ t('no_filters_added') } </s> remove <button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>Cancel</Trans></button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}><Trans>Add filter</Trans></button>
</s> add <button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>cancel_btn</Trans></button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}><Trans>add_filter_btn</Trans></button> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Settings/Upstream.js |
<Trans>apply_btn</Trans> | <mask> className="btn btn-success btn-standart"
<mask> type="submit"
<mask> onClick={this.handleSubmit}
<mask> >
<mask> <Trans>Apply</Trans>
<mask> </button>
<mask> </div>
<mask> </form>
<mask> </div>
<mask> </div>
</s> Convert i18n resource to key type </s> remove <Trans>Apply</Trans>
</s> add <Trans>apply_btn</Trans> </s> remove <Trans>Test upstreams</Trans>
</s> add <Trans>test_upstream_btn</Trans> </s> remove <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>Add filter</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>Check updates</Trans></button>
</s> add <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>add_filter_btn</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>cancel_btn</Trans></button> </s> remove <Trans>Report an issue</Trans>
</s> add <Trans>report_an_issue</Trans> </s> remove noDataText={ t('No filters added') }
</s> add noDataText={ t('no_filters_added') } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Settings/Upstream.js |
title: 'block_domain_use_filters_and_hosts',
subtitle: 'filters_block_toggle_hint', | <mask> class Settings extends Component {
<mask> settings = {
<mask> filtering: {
<mask> enabled: false,
<mask> title: 'Block domains using filters and hosts files',
<mask> subtitle: 'You can setup blocking rules in the <a href="#filters">Filters</a> settings.',
<mask> },
<mask> safebrowsing: {
<mask> enabled: false,
<mask> title: 'Use AdGuard browsing security web service',
<mask> subtitle: 'AdGuard Home will check if domain is blacklisted by the browsing security web service. It will use privacy-friendly lookup API to perform the check: only a short prefix of the domain name SHA256 hash is sent to the server.',
</s> Convert i18n resource to key type </s> remove title: 'Use AdGuard browsing security web service',
subtitle: 'AdGuard Home will check if domain is blacklisted by the browsing security web service. It will use privacy-friendly lookup API to perform the check: only a short prefix of the domain name SHA256 hash is sent to the server.',
</s> add title: 'use_adguard_browsing_sec',
subtitle: 'use_adguard_browsing_sec_hint', </s> remove title: 'Use AdGuard parental control web service',
subtitle: 'AdGuard Home will check if domain contains adult materials. It uses the same privacy-friendly API as the browsing security web service.',
</s> add title: 'use_adguard_parental',
subtitle: 'use_adguard_parental_hint', </s> remove title: 'Enforce safe search',
subtitle: 'AdGuard Home can enforce safe search in the following search engines: Google, Bing, Yandex.',
</s> add title: 'enforce_safe_search',
subtitle: 'enforce_save_search_hint', </s> remove <code> @@||example.org^</code> - { t('unblock access to the example.org domain and all its subdomains') }
</s> add <code> @@||example.org^</code> - { t('example_meaning_filter_whitelist') } </s> remove <code>127.0.0.1 example.org</code> - { t('AdGuard Home will now return 127.0.0.1 address for the example.org domain (but not its subdomains).') }
</s> add <code>127.0.0.1 example.org</code> - { t('example_comment') } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Settings/index.js |
title: 'use_adguard_browsing_sec',
subtitle: 'use_adguard_browsing_sec_hint', | <mask> subtitle: 'You can setup blocking rules in the <a href="#filters">Filters</a> settings.',
<mask> },
<mask> safebrowsing: {
<mask> enabled: false,
<mask> title: 'Use AdGuard browsing security web service',
<mask> subtitle: 'AdGuard Home will check if domain is blacklisted by the browsing security web service. It will use privacy-friendly lookup API to perform the check: only a short prefix of the domain name SHA256 hash is sent to the server.',
<mask> },
<mask> parental: {
<mask> enabled: false,
<mask> title: 'Use AdGuard parental control web service',
<mask> subtitle: 'AdGuard Home will check if domain contains adult materials. It uses the same privacy-friendly API as the browsing security web service.',
</s> Convert i18n resource to key type </s> remove title: 'Use AdGuard parental control web service',
subtitle: 'AdGuard Home will check if domain contains adult materials. It uses the same privacy-friendly API as the browsing security web service.',
</s> add title: 'use_adguard_parental',
subtitle: 'use_adguard_parental_hint', </s> remove title: 'Block domains using filters and hosts files',
subtitle: 'You can setup blocking rules in the <a href="#filters">Filters</a> settings.',
</s> add title: 'block_domain_use_filters_and_hosts',
subtitle: 'filters_block_toggle_hint', </s> remove title: 'Enforce safe search',
subtitle: 'AdGuard Home can enforce safe search in the following search engines: Google, Bing, Yandex.',
</s> add title: 'enforce_safe_search',
subtitle: 'enforce_save_search_hint', </s> remove <code> @@||example.org^</code> - { t('unblock access to the example.org domain and all its subdomains') }
</s> add <code> @@||example.org^</code> - { t('example_meaning_filter_whitelist') } </s> remove <Trans>Blocked malware/phishing</Trans>
<Tooltip text={ props.t('A number of DNS requests blocked by the AdGuard browsing security module') } type={tooltipType} />
</s> add <Trans>stats_malware_phishing</Trans>
<Tooltip text={ props.t('number_of_dns_query_blocked_24_hours_by_sec') } type={tooltipType} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Settings/index.js |
title: 'use_adguard_parental',
subtitle: 'use_adguard_parental_hint', | <mask> subtitle: 'AdGuard Home will check if domain is blacklisted by the browsing security web service. It will use privacy-friendly lookup API to perform the check: only a short prefix of the domain name SHA256 hash is sent to the server.',
<mask> },
<mask> parental: {
<mask> enabled: false,
<mask> title: 'Use AdGuard parental control web service',
<mask> subtitle: 'AdGuard Home will check if domain contains adult materials. It uses the same privacy-friendly API as the browsing security web service.',
<mask> },
<mask> safesearch: {
<mask> enabled: false,
<mask> title: 'Enforce safe search',
<mask> subtitle: 'AdGuard Home can enforce safe search in the following search engines: Google, Bing, Yandex.',
</s> Convert i18n resource to key type </s> remove title: 'Use AdGuard browsing security web service',
subtitle: 'AdGuard Home will check if domain is blacklisted by the browsing security web service. It will use privacy-friendly lookup API to perform the check: only a short prefix of the domain name SHA256 hash is sent to the server.',
</s> add title: 'use_adguard_browsing_sec',
subtitle: 'use_adguard_browsing_sec_hint', </s> remove title: 'Enforce safe search',
subtitle: 'AdGuard Home can enforce safe search in the following search engines: Google, Bing, Yandex.',
</s> add title: 'enforce_safe_search',
subtitle: 'enforce_save_search_hint', </s> remove title: 'Block domains using filters and hosts files',
subtitle: 'You can setup blocking rules in the <a href="#filters">Filters</a> settings.',
</s> add title: 'block_domain_use_filters_and_hosts',
subtitle: 'filters_block_toggle_hint', </s> remove <code> @@||example.org^</code> - { t('unblock access to the example.org domain and all its subdomains') }
</s> add <code> @@||example.org^</code> - { t('example_meaning_filter_whitelist') } </s> remove <code>127.0.0.1 example.org</code> - { t('AdGuard Home will now return 127.0.0.1 address for the example.org domain (but not its subdomains).') }
</s> add <code>127.0.0.1 example.org</code> - { t('example_comment') } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Settings/index.js |
title: 'enforce_safe_search',
subtitle: 'enforce_save_search_hint', | <mask> subtitle: 'AdGuard Home will check if domain contains adult materials. It uses the same privacy-friendly API as the browsing security web service.',
<mask> },
<mask> safesearch: {
<mask> enabled: false,
<mask> title: 'Enforce safe search',
<mask> subtitle: 'AdGuard Home can enforce safe search in the following search engines: Google, Bing, Yandex.',
<mask> },
<mask> };
<mask>
<mask> componentDidMount() {
<mask> this.props.initSettings(this.settings);
</s> Convert i18n resource to key type </s> remove title: 'Use AdGuard parental control web service',
subtitle: 'AdGuard Home will check if domain contains adult materials. It uses the same privacy-friendly API as the browsing security web service.',
</s> add title: 'use_adguard_parental',
subtitle: 'use_adguard_parental_hint', </s> remove title: 'Use AdGuard browsing security web service',
subtitle: 'AdGuard Home will check if domain is blacklisted by the browsing security web service. It will use privacy-friendly lookup API to perform the check: only a short prefix of the domain name SHA256 hash is sent to the server.',
</s> add title: 'use_adguard_browsing_sec',
subtitle: 'use_adguard_browsing_sec_hint', </s> remove title: 'Block domains using filters and hosts files',
subtitle: 'You can setup blocking rules in the <a href="#filters">Filters</a> settings.',
</s> add title: 'block_domain_use_filters_and_hosts',
subtitle: 'filters_block_toggle_hint', </s> remove <code> @@||example.org^</code> - { t('unblock access to the example.org domain and all its subdomains') }
</s> add <code> @@||example.org^</code> - { t('example_meaning_filter_whitelist') } </s> remove <code>127.0.0.1 example.org</code> - { t('AdGuard Home will now return 127.0.0.1 address for the example.org domain (but not its subdomains).') }
</s> add <code>127.0.0.1 example.org</code> - { t('example_comment') } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Settings/index.js |
this.props.addErrorToast({ error: this.props.t('no_servers_specified') }); | <mask> handleUpstreamTest = () => {
<mask> if (this.props.dashboard.upstreamDns.length > 0) {
<mask> this.props.testUpstream(this.props.dashboard.upstreamDns);
<mask> } else {
<mask> this.props.addErrorToast({ error: this.props.t('No servers specified') });
<mask> }
<mask> };
<mask>
<mask> renderSettings = (settings) => {
<mask> if (Object.keys(settings).length > 0) {
</s> Convert i18n resource to key type </s> remove filterName = 'Custom filtering rules';
</s> add filterName = 'custom_filter_rules'; </s> remove dispatch(addSuccessToast('Specified DNS servers are working correctly'));
</s> add dispatch(addSuccessToast('dns_test_ok_toast')); </s> remove dispatch(addErrorToast({ error: t('Server "{{key}}": could not be used, please check that you\'ve written it correctly', { key }) }));
</s> add dispatch(addErrorToast({ error: t('dns_test_not_ok_toast', { key }) })); </s> remove dispatch(addSuccessToast('All filters are already up-to-date'));
</s> add dispatch(addSuccessToast('all_filters_up_to_date_toast')); </s> remove changeLanguage = () => {
i18n.changeLanguage(i18n.language === 'en' ? 'vi' : 'en');
</s> add changeLanguage = (event) => {
i18n.changeLanguage(event.target.value); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Settings/index.js |
<div><Trans>no_settings</Trans></div> | <mask> />);
<mask> });
<mask> }
<mask> return (
<mask> <div><Trans>No settings</Trans></div>
<mask> );
<mask> }
<mask>
<mask> render() {
<mask> const { settings, t } = this.props;
</s> Convert i18n resource to key type </s> remove <PageTitle title={ t('Settings') } />
</s> add <PageTitle title={ t('settings') } /> </s> remove ><Trans>Enable log</Trans></button>
</s> add ><Trans>enabled_log_btn</Trans></button> </s> remove <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('top_clients') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('top_blocked_domains') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('stats_query_domain') } subtitle={ t('for_last_24_hours') } bodyType="card-table" refresh={this.props.refreshButton}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Settings/index.js |
<PageTitle title={ t('settings') } /> | <mask> const { settings, t } = this.props;
<mask> const { upstreamDns } = this.props.dashboard;
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={ t('Settings') } />
<mask> {settings.processing && <Loading />}
<mask> {!settings.processing &&
<mask> <div className="content">
<mask> <div className="row">
<mask> <div className="col-md-12">
</s> Convert i18n resource to key type </s> remove <PageTitle title={ t('Filters') } />
</s> add <PageTitle title={ t('filters') } /> </s> remove <Card title={ t('General settings') } bodyType="card-body box-body--settings">
</s> add <Card title={ t('general_settings') } bodyType="card-body box-body--settings"> </s> remove <PageTitle title={ t('Query Log') } subtitle={ t('Last 5000 DNS queries') }>
</s> add <PageTitle title={ t('query_log') } subtitle={ t('last_5000_dns_queries') }> </s> remove <div><Trans>No settings</Trans></div>
</s> add <div><Trans>no_settings</Trans></div> </s> remove title={ t('Upstream DNS servers') }
subtitle={ t('If you keep this field empty, AdGuard Home will use <a href="https://1.1.1.1/" target="_blank">Cloudflare DNS</a> as an upstream. Use tls:// prefix for DNS over TLS servers.') }
</s> add title={ t('upstream_dns') }
subtitle={ t('upstream_dns_hint') } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Settings/index.js |
<Card title={ t('general_settings') } bodyType="card-body box-body--settings"> | <mask> {!settings.processing &&
<mask> <div className="content">
<mask> <div className="row">
<mask> <div className="col-md-12">
<mask> <Card title={ t('General settings') } bodyType="card-body box-body--settings">
<mask> <div className="form">
<mask> {this.renderSettings(settings.settingsList)}
<mask> </div>
<mask> </Card>
<mask> <Upstream
</s> Convert i18n resource to key type </s> remove <PageTitle title={ t('Settings') } />
</s> add <PageTitle title={ t('settings') } /> </s> remove title={ t('Filters and hosts blocklists') }
subtitle={ t('AdGuard Home understands basic adblock rules and hosts files syntax.') }
</s> add title={ t('filters_and_hosts') }
subtitle={ t('filters_and_hosts_hint') } </s> remove <PageTitle title={ t('Filters') } />
</s> add <PageTitle title={ t('filters') } /> </s> remove title={ t('Upstream DNS servers') }
subtitle={ t('If you keep this field empty, AdGuard Home will use <a href="https://1.1.1.1/" target="_blank">Cloudflare DNS</a> as an upstream. Use tls:// prefix for DNS over TLS servers.') }
</s> add title={ t('upstream_dns') }
subtitle={ t('upstream_dns_hint') } </s> remove <Trans>Rule</Trans>: <strong>{this.props.rule}</strong>
</s> add <Trans>rule_label</Trans>: <strong>{this.props.rule}</strong> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/Settings/index.js |
import i18n, { languages } from '../../i18n'; | <mask> import React, { Component } from 'react';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import { REPOSITORY } from '../../helpers/constants';
<mask> import i18n from '../../i18n';
<mask>
<mask> class Footer extends Component {
<mask> getYear = () => {
<mask> const today = new Date();
<mask> return today.getFullYear();
</s> Convert i18n resource to key type </s> remove changeLanguage = () => {
i18n.changeLanguage(i18n.language === 'en' ? 'vi' : 'en');
</s> add changeLanguage = (event) => {
i18n.changeLanguage(event.target.value); </s> remove this.props.addSuccessToast(`${t('Rule removed from the custom filtering rules')}: ${blockingRule}`);
</s> add this.props.addSuccessToast(`${t('rule_removed_from_custom_filtering_toast')}: ${blockingRule}`); </s> remove this.props.addSuccessToast(`${t('Rule added to the custom filtering rules')}: ${unblockingRule}`);
</s> add this.props.addSuccessToast(`${t('rule_added_to_custom_filtering_toast')}: ${unblockingRule}`); </s> remove this.props.addErrorToast({ error: this.props.t('No servers specified') });
</s> add this.props.addErrorToast({ error: this.props.t('no_servers_specified') }); </s> remove const buttonText = protectionEnabled ? 'Disable' : 'Enable';
</s> add const buttonText = protectionEnabled ? 'disable_protection' : 'enable_protection'; | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/ui/Footer.js |
changeLanguage = (event) => {
i18n.changeLanguage(event.target.value); | <mask> const today = new Date();
<mask> return today.getFullYear();
<mask> };
<mask>
<mask> changeLanguage = () => {
<mask> i18n.changeLanguage(i18n.language === 'en' ? 'vi' : 'en');
<mask> }
<mask>
<mask> render() {
<mask> return (
<mask> <footer className="footer">
</s> Convert i18n resource to key type </s> remove import i18n from '../../i18n';
</s> add import i18n, { languages } from '../../i18n'; </s> remove const buttonText = protectionEnabled ? 'Disable' : 'Enable';
</s> add const buttonText = protectionEnabled ? 'disable_protection' : 'enable_protection'; </s> remove <Trans>{buttonText} protection</Trans>
</s> add <Trans>{buttonText}</Trans> </s> remove const buttonText = isFiltered ? 'Unblock' : 'Block';
</s> add const buttonText = isFiltered ? 'ublock_btn' : 'block_btn'; </s> remove Header: t('Response'),
</s> add Header: t('response_table_header'), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/ui/Footer.js |
<a href={REPOSITORY.URL} target="_blank" rel="noopener noreferrer"><Trans>homepage</Trans></a> | <mask> </div>
<mask> <div className="col-auto">
<mask> <ul className="list-inline text-center mb-0">
<mask> <li className="list-inline-item">
<mask> <a href={REPOSITORY.URL} target="_blank" rel="noopener noreferrer"><Trans>Homepage</Trans></a>
<mask> </li>
<mask> </ul>
<mask> </div>
<mask> <div className="col-auto">
<mask> <button className="btn btn-outline-info btn-sm" onClick={this.changeLanguage}
</s> Convert i18n resource to key type </s> remove <Trans>Report an issue</Trans>
</s> add <Trans>report_an_issue</Trans> </s> remove <Trans>FAQ</Trans>
</s> add <Trans>faq</Trans> </s> remove <Trans>Source</Trans>: <a className="popover__link" target="_blank" rel="noopener noreferrer" href={sourceData.url}><strong>{sourceData.name}</strong></a>
</s> add <Trans>source_label</Trans>: <a className="popover__link" target="_blank" rel="noopener noreferrer" href={sourceData.url}><strong>{sourceData.name}</strong></a> </s> remove <Trans>Name</Trans>: <a className="popover__link" target="_blank" rel="noopener noreferrer" href={data.url}><strong>{data.name}</strong></a>
</s> add <Trans>name_table_header</Trans>: <a className="popover__link" target="_blank" rel="noopener noreferrer" href={data.url}><strong>{data.name}</strong></a> </s> remove <button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>Cancel</Trans></button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}><Trans>Add filter</Trans></button>
</s> add <button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>cancel_btn</Trans></button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}><Trans>add_filter_btn</Trans></button> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/ui/Footer.js |
<Trans>report_an_issue</Trans> | <mask> </button>
<mask> </div>
<mask> <div className="col-auto">
<mask> <a href={`${REPOSITORY.URL}/issues/new`} className="btn btn-outline-primary btn-sm" target="_blank" rel="noopener noreferrer">
<mask> <Trans>Report an issue</Trans>
<mask> </a>
<mask> </div>
<mask> </div>
<mask> </div>
<mask> </div>
</s> Convert i18n resource to key type </s> remove <a href={REPOSITORY.URL} target="_blank" rel="noopener noreferrer"><Trans>Homepage</Trans></a>
</s> add <a href={REPOSITORY.URL} target="_blank" rel="noopener noreferrer"><Trans>homepage</Trans></a> </s> remove <Trans>Name</Trans>: <a className="popover__link" target="_blank" rel="noopener noreferrer" href={data.url}><strong>{data.name}</strong></a>
</s> add <Trans>name_table_header</Trans>: <a className="popover__link" target="_blank" rel="noopener noreferrer" href={data.url}><strong>{data.name}</strong></a> </s> remove <Trans>Source</Trans>: <a className="popover__link" target="_blank" rel="noopener noreferrer" href={sourceData.url}><strong>{sourceData.name}</strong></a>
</s> add <Trans>source_label</Trans>: <a className="popover__link" target="_blank" rel="noopener noreferrer" href={sourceData.url}><strong>{sourceData.name}</strong></a> </s> remove <Trans>FAQ</Trans>
</s> add <Trans>faq</Trans> </s> remove <Trans>Apply</Trans>
</s> add <Trans>apply_btn</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/ui/Footer.js |
<input type="text" className={inputNameClass} placeholder={ this.props.t('enter_name_hint') } onChange={this.handleNameChange} />
<input type="text" className={inputUrlClass} placeholder={ this.props.t('enter_url_hint') } onChange={this.handleUrlChange} /> | <mask> const renderBody = () => {
<mask> if (!this.props.isFilterAdded) {
<mask> return (
<mask> <React.Fragment>
<mask> <input type="text" className={inputNameClass} placeholder={ this.props.t('Enter name') } onChange={this.handleNameChange} />
<mask> <input type="text" className={inputUrlClass} placeholder={ this.props.t('Enter URL') } onChange={this.handleUrlChange} />
<mask> {inputDescription &&
<mask> <div className="description">
<mask> {inputDescription}
<mask> </div>}
<mask> </React.Fragment>
</s> Convert i18n resource to key type </s> remove <PageTitle title={ t('Settings') } />
</s> add <PageTitle title={ t('settings') } /> </s> remove <PageTitle title={ t('Filters') } />
</s> add <PageTitle title={ t('filters') } /> </s> remove changeLanguage = () => {
i18n.changeLanguage(i18n.language === 'en' ? 'vi' : 'en');
</s> add changeLanguage = (event) => {
i18n.changeLanguage(event.target.value); </s> remove const buttonText = protectionEnabled ? 'Disable' : 'Enable';
</s> add const buttonText = protectionEnabled ? 'disable_protection' : 'enable_protection'; </s> remove title={ t('Custom filtering rules') }
subtitle={ t('Enter one rule on a line. You can use either adblock rules or hosts files syntax.') }
</s> add title={ t('custom_filter_rules') }
subtitle={ t('custom_filter_rules_hint') } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/ui/Modal.js |
<button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>cancel_btn</Trans></button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}><Trans>add_filter_btn</Trans></button> | <mask> </div>
<mask> {
<mask> !this.props.isFilterAdded &&
<mask> <div className="modal-footer">
<mask> <button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>Cancel</Trans></button>
<mask> <button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}><Trans>Add filter</Trans></button>
<mask> </div>
<mask> }
<mask> </div>
<mask> </ReactModal>
<mask> );
</s> Convert i18n resource to key type </s> remove <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>Add filter</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>Check updates</Trans></button>
</s> add <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>add_filter_btn</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>cancel_btn</Trans></button> </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>Refresh statistics</Trans></button>;
</s> add const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>refresh_statics</Trans></button>; </s> remove <PageTitle title={ t('Dashboard') }>
</s> add <PageTitle title={ t('dashboard') }> </s> remove <Trans>Test upstreams</Trans>
</s> add <Trans>test_upstream_btn</Trans> </s> remove noDataText={ t('No filters added') }
</s> add noDataText={ t('no_filters_added') } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/ui/Modal.js |
<Trans>source_label</Trans>: <a className="popover__link" target="_blank" rel="noopener noreferrer" href={sourceData.url}><strong>{sourceData.name}</strong></a> | <mask> const sourceData = getSourceData(data);
<mask>
<mask> const source = (
<mask> <div className="popover__list-item">
<mask> <Trans>Source</Trans>: <a className="popover__link" target="_blank" rel="noopener noreferrer" href={sourceData.url}><strong>{sourceData.name}</strong></a>
<mask> </div>
<mask> );
<mask>
<mask> const tracker = (
<mask> <div className="popover__list-item">
</s> Convert i18n resource to key type </s> remove <Trans>Name</Trans>: <a className="popover__link" target="_blank" rel="noopener noreferrer" href={data.url}><strong>{data.name}</strong></a>
</s> add <Trans>name_table_header</Trans>: <a className="popover__link" target="_blank" rel="noopener noreferrer" href={data.url}><strong>{data.name}</strong></a> </s> remove <a href={REPOSITORY.URL} target="_blank" rel="noopener noreferrer"><Trans>Homepage</Trans></a>
</s> add <a href={REPOSITORY.URL} target="_blank" rel="noopener noreferrer"><Trans>homepage</Trans></a> </s> remove <Trans>Report an issue</Trans>
</s> add <Trans>report_an_issue</Trans> </s> remove <Trans>Found in the known domains database.</Trans>
</s> add <Trans>found_in_known_domain_db</Trans> </s> remove <Trans>Category</Trans>: <strong><Trans>{categoryName}</Trans></strong>
</s> add <Trans>category_label</Trans>: <strong>
<Trans>{categoryName}</Trans></strong> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/ui/Popover.js |
<Trans>name_table_header</Trans>: <a className="popover__link" target="_blank" rel="noopener noreferrer" href={data.url}><strong>{data.name}</strong></a> | <mask> );
<mask>
<mask> const tracker = (
<mask> <div className="popover__list-item">
<mask> <Trans>Name</Trans>: <a className="popover__link" target="_blank" rel="noopener noreferrer" href={data.url}><strong>{data.name}</strong></a>
<mask> </div>
<mask> );
<mask>
<mask> const categoryName = captitalizeWords(data.category);
<mask>
</s> Convert i18n resource to key type </s> remove <Trans>Source</Trans>: <a className="popover__link" target="_blank" rel="noopener noreferrer" href={sourceData.url}><strong>{sourceData.name}</strong></a>
</s> add <Trans>source_label</Trans>: <a className="popover__link" target="_blank" rel="noopener noreferrer" href={sourceData.url}><strong>{sourceData.name}</strong></a> </s> remove <a href={REPOSITORY.URL} target="_blank" rel="noopener noreferrer"><Trans>Homepage</Trans></a>
</s> add <a href={REPOSITORY.URL} target="_blank" rel="noopener noreferrer"><Trans>homepage</Trans></a> </s> remove <Trans>Report an issue</Trans>
</s> add <Trans>report_an_issue</Trans> </s> remove <span><Trans>Empty</Trans></span>
</s> add <span><Trans>empty_response_status</Trans></span> </s> remove <div><Trans>No settings</Trans></div>
</s> add <div><Trans>no_settings</Trans></div> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/ui/Popover.js |
<Trans>found_in_known_domain_db</Trans> | <mask> </div>
<mask> <div className="popover__body">
<mask> <div className="popover__list">
<mask> <div className="popover__list-title">
<mask> <Trans>Found in the known domains database.</Trans>
<mask> </div>
<mask> {tracker}
<mask> <div className="popover__list-item">
<mask> <Trans>Category</Trans>: <strong><Trans>{categoryName}</Trans></strong>
<mask> </div>
</s> Convert i18n resource to key type </s> remove <Trans>Category</Trans>: <strong><Trans>{categoryName}</Trans></strong>
</s> add <Trans>category_label</Trans>: <strong>
<Trans>{categoryName}</Trans></strong> </s> remove <Trans>Rule</Trans>: <strong>{this.props.rule}</strong>
</s> add <Trans>rule_label</Trans>: <strong>{this.props.rule}</strong> </s> remove <Trans>Source</Trans>: <a className="popover__link" target="_blank" rel="noopener noreferrer" href={sourceData.url}><strong>{sourceData.name}</strong></a>
</s> add <Trans>source_label</Trans>: <a className="popover__link" target="_blank" rel="noopener noreferrer" href={sourceData.url}><strong>{sourceData.name}</strong></a> </s> remove <Trans>DNS Queries</Trans>
</s> add <Trans>dns_query</Trans> </s> remove <Trans>Blocked malware/phishing</Trans>
</s> add <Trans>stats_malware_phishing</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/ui/Popover.js |
<Trans>category_label</Trans>: <strong>
<Trans>{categoryName}</Trans></strong> | <mask> <Trans>Found in the known domains database.</Trans>
<mask> </div>
<mask> {tracker}
<mask> <div className="popover__list-item">
<mask> <Trans>Category</Trans>: <strong><Trans>{categoryName}</Trans></strong>
<mask> </div>
<mask> {source}
<mask> </div>
<mask> </div>
<mask> </div>
</s> Convert i18n resource to key type </s> remove <Trans>Found in the known domains database.</Trans>
</s> add <Trans>found_in_known_domain_db</Trans> </s> remove <Trans>DNS Queries</Trans>
</s> add <Trans>dns_query</Trans> </s> remove <Trans>Blocked malware/phishing</Trans>
</s> add <Trans>stats_malware_phishing</Trans> </s> remove <Trans>Blocked adult websites</Trans>
</s> add <Trans>stats_adult</Trans> </s> remove <Trans>Filter</Trans>: <strong>{this.props.filter}</strong>
</s> add <Trans>filter_label</Trans>: <strong>{this.props.filter}</strong> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/ui/Popover.js |
<Trans>rule_label</Trans>: <strong>{this.props.rule}</strong> | <mask> </div>
<mask> <div className="popover__body popover__body--filter">
<mask> <div className="popover__list">
<mask> <div className="popover__list-item popover__list-item--nowrap">
<mask> <Trans>Rule</Trans>: <strong>{this.props.rule}</strong>
<mask> </div>
<mask> {this.props.filter && <div className="popover__list-item popover__list-item--nowrap">
<mask> <Trans>Filter</Trans>: <strong>{this.props.filter}</strong>
<mask> </div>}
<mask> </div>
</s> Convert i18n resource to key type </s> remove <Trans>Filter</Trans>: <strong>{this.props.filter}</strong>
</s> add <Trans>filter_label</Trans>: <strong>{this.props.filter}</strong> </s> remove <Trans>Found in the known domains database.</Trans>
</s> add <Trans>found_in_known_domain_db</Trans> </s> remove <Card title={ t('General settings') } bodyType="card-body box-body--settings">
</s> add <Card title={ t('general_settings') } bodyType="card-body box-body--settings"> </s> remove <Trans>DNS Queries</Trans>
</s> add <Trans>dns_query</Trans> </s> remove <Trans>Blocked malware/phishing</Trans>
</s> add <Trans>stats_malware_phishing</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/ui/PopoverFilter.js |
<Trans>filter_label</Trans>: <strong>{this.props.filter}</strong> | <mask> <div className="popover__list-item popover__list-item--nowrap">
<mask> <Trans>Rule</Trans>: <strong>{this.props.rule}</strong>
<mask> </div>
<mask> {this.props.filter && <div className="popover__list-item popover__list-item--nowrap">
<mask> <Trans>Filter</Trans>: <strong>{this.props.filter}</strong>
<mask> </div>}
<mask> </div>
<mask> </div>
<mask> </div>
<mask> );
</s> Convert i18n resource to key type </s> remove <Trans>Rule</Trans>: <strong>{this.props.rule}</strong>
</s> add <Trans>rule_label</Trans>: <strong>{this.props.rule}</strong> </s> remove <button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>Cancel</Trans></button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}><Trans>Add filter</Trans></button>
</s> add <button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>cancel_btn</Trans></button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}><Trans>add_filter_btn</Trans></button> </s> remove <Trans>DNS Queries</Trans>
</s> add <Trans>dns_query</Trans> </s> remove <Trans>Blocked malware/phishing</Trans>
</s> add <Trans>stats_malware_phishing</Trans> </s> remove <Trans>Blocked adult websites</Trans>
</s> add <Trans>stats_adult</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/components/ui/PopoverFilter.js |
avg_processing_time: 'average_processing_time', | <mask> export const R_URL_REQUIRES_PROTOCOL = /^https?:\/\/\w[\w_\-.]*\.[a-z]{2,8}[^\s]*$/;
<mask>
<mask> export const STATS_NAMES = {
<mask> avg_processing_time: 'Average processing time',
<mask> blocked_filtering: 'Blocked by filters',
<mask> dns_queries: 'DNS queries',
<mask> replaced_parental: 'Blocked adult websites',
<mask> replaced_safebrowsing: 'Blocked malware/phishing',
<mask> replaced_safesearch: 'Enforced safe search',
</s> Convert i18n resource to key type </s> remove replaced_parental: 'Blocked adult websites',
replaced_safebrowsing: 'Blocked malware/phishing',
replaced_safesearch: 'Enforced safe search',
</s> add replaced_parental: 'stats_adult',
replaced_safebrowsing: 'stats_malware_phishing',
replaced_safesearch: 'enforced_save_search', </s> remove dispatch(addSuccessToast('Updated the upstream DNS servers'));
</s> add dispatch(addSuccessToast('updated_upstream_dns_toast')); </s> remove title: 'Enforce safe search',
subtitle: 'AdGuard Home can enforce safe search in the following search engines: Google, Bing, Yandex.',
</s> add title: 'enforce_safe_search',
subtitle: 'enforce_save_search_hint', </s> remove title: 'Use AdGuard parental control web service',
subtitle: 'AdGuard Home will check if domain contains adult materials. It uses the same privacy-friendly API as the browsing security web service.',
</s> add title: 'use_adguard_parental',
subtitle: 'use_adguard_parental_hint', </s> remove successMessage = 'Enabled safe search';
</s> add successMessage = 'enabled_save_search_toast'; | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/helpers/constants.js |
replaced_parental: 'stats_adult',
replaced_safebrowsing: 'stats_malware_phishing',
replaced_safesearch: 'enforced_save_search', | <mask> export const STATS_NAMES = {
<mask> avg_processing_time: 'Average processing time',
<mask> blocked_filtering: 'Blocked by filters',
<mask> dns_queries: 'DNS queries',
<mask> replaced_parental: 'Blocked adult websites',
<mask> replaced_safebrowsing: 'Blocked malware/phishing',
<mask> replaced_safesearch: 'Enforced safe search',
<mask> };
<mask>
<mask> export const STATUS_COLORS = {
<mask> blue: '#467fcf',
<mask> red: '#cd201f',
</s> Convert i18n resource to key type </s> remove avg_processing_time: 'Average processing time',
</s> add avg_processing_time: 'average_processing_time', </s> remove title: 'Enforce safe search',
subtitle: 'AdGuard Home can enforce safe search in the following search engines: Google, Bing, Yandex.',
</s> add title: 'enforce_safe_search',
subtitle: 'enforce_save_search_hint', </s> remove dispatch(addSuccessToast('Updated the upstream DNS servers'));
</s> add dispatch(addSuccessToast('updated_upstream_dns_toast')); </s> remove title: 'Use AdGuard parental control web service',
subtitle: 'AdGuard Home will check if domain contains adult materials. It uses the same privacy-friendly API as the browsing security web service.',
</s> add title: 'use_adguard_parental',
subtitle: 'use_adguard_parental_hint', </s> remove changeLanguage = () => {
i18n.changeLanguage(i18n.language === 'en' ? 'vi' : 'en');
</s> add changeLanguage = (event) => {
i18n.changeLanguage(event.target.value); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/helpers/constants.js |
vi,
en, | <mask> .use(initReactI18n)
<mask> .use(reactI18nextModule) // passes i18n down to react-i18next
<mask> .init({
<mask> resources: {
<mask> vi: viResource,
<mask> },
<mask> fallbackLng: 'en',
<mask> keySeparator: false, // we use content as keys
<mask> nsSeparator: false, // Fix character in content
<mask> interpolation: {
</s> Convert i18n resource to key type </s> remove successMessage = 'Disabled filtering';
</s> add successMessage = 'disabled_filtering_toast'; </s> remove title: 'Use AdGuard browsing security web service',
subtitle: 'AdGuard Home will check if domain is blacklisted by the browsing security web service. It will use privacy-friendly lookup API to perform the check: only a short prefix of the domain name SHA256 hash is sent to the server.',
</s> add title: 'use_adguard_browsing_sec',
subtitle: 'use_adguard_browsing_sec_hint', </s> remove title: 'Use AdGuard parental control web service',
subtitle: 'AdGuard Home will check if domain contains adult materials. It uses the same privacy-friendly API as the browsing security web service.',
</s> add title: 'use_adguard_parental',
subtitle: 'use_adguard_parental_hint', </s> remove title: 'Block domains using filters and hosts files',
subtitle: 'You can setup blocking rules in the <a href="#filters">Filters</a> settings.',
</s> add title: 'block_domain_use_filters_and_hosts',
subtitle: 'filters_block_toggle_hint', </s> remove title: 'Enforce safe search',
subtitle: 'AdGuard Home can enforce safe search in the following search engines: Google, Bing, Yandex.',
</s> add title: 'enforce_safe_search',
subtitle: 'enforce_save_search_hint', | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d47a23269da9731f941609997ae9ae063524a18e | client/src/i18n.js |
const defaultParentalServer = "pctrl.adguard.com"
const defaultParentalURL = "http://%s/check-parental-control-hash?prefixes=%s&sensitivity=%d" | <mask> const defaultHTTPMaxIdleConnections = 100
<mask>
<mask> const defaultSafebrowsingServer = "sb.adtidy.org"
<mask> const defaultSafebrowsingURL = "http://%s/safebrowsing-lookup-hash.html?prefixes=%s"
<mask> const defaultParentalURL = "http://pctrl.adguard.com/check-parental-control-hash?prefixes=%s&sensitivity=%d"
<mask>
<mask> var ErrInvalidSyntax = errors.New("dnsfilter: invalid rule syntax")
<mask> var ErrInvalidParental = errors.New("dnsfilter: invalid parental sensitivity, must be either 3, 10, 13 or 17")
<mask>
<mask> const shortcutLength = 6 // used for rule search optimization, 6 hits the sweet spot
</s> dnsfilter -- do not check lookup hosts against themselves to avoid recursion </s> remove url := fmt.Sprintf(defaultParentalURL, hashparam, d.config.parentalSensitivity)
</s> add url := fmt.Sprintf(defaultParentalURL, d.config.parentalServer, hashparam, d.config.parentalSensitivity) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d49e3769a105f4dee639b9dec1112b123b7a23aa | dnsfilter/dnsfilter.go |
parentalServer string | <mask> safeSearchEnabled bool
<mask> safeBrowsingEnabled bool
<mask> safeBrowsingServer string
<mask> parentalEnabled bool
<mask> parentalSensitivity int // must be either 3, 10, 13 or 17
<mask> }
<mask>
<mask> type Rule struct {
<mask> text string // text without @@ decorators or $ options
</s> dnsfilter -- do not check lookup hosts against themselves to avoid recursion </s> remove const defaultParentalURL = "http://pctrl.adguard.com/check-parental-control-hash?prefixes=%s&sensitivity=%d"
</s> add const defaultParentalServer = "pctrl.adguard.com"
const defaultParentalURL = "http://%s/check-parental-control-hash?prefixes=%s&sensitivity=%d" </s> remove url := fmt.Sprintf(defaultParentalURL, hashparam, d.config.parentalSensitivity)
</s> add url := fmt.Sprintf(defaultParentalURL, d.config.parentalServer, hashparam, d.config.parentalSensitivity) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d49e3769a105f4dee639b9dec1112b123b7a23aa | dnsfilter/dnsfilter.go |
host = strings.ToLower(host) | <mask> if host == "" {
<mask> return Result{Reason: FilteredInvalid}, nil
<mask> }
<mask>
<mask> // try filter lists first
<mask> result, err := d.matchHost(host)
<mask> if err != nil {
</s> dnsfilter -- do not check lookup hosts against themselves to avoid recursion </s> remove url := fmt.Sprintf(defaultParentalURL, hashparam, d.config.parentalSensitivity)
</s> add url := fmt.Sprintf(defaultParentalURL, d.config.parentalServer, hashparam, d.config.parentalSensitivity) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d49e3769a105f4dee639b9dec1112b123b7a23aa | dnsfilter/dnsfilter.go |
// prevent recursion -- checking the host of safebrowsing server makes no sense
if host == d.config.safeBrowsingServer {
return Result{}, nil
} | <mask> return hashparam.String(), hashes
<mask> }
<mask>
<mask> func (d *Dnsfilter) checkSafeBrowsing(host string) (Result, error) {
<mask> format := func(hashparam string) string {
<mask> url := fmt.Sprintf(defaultSafebrowsingURL, d.config.safeBrowsingServer, hashparam)
<mask> return url
<mask> }
<mask> handleBody := func(body []byte, hashes map[string]bool) (Result, error) {
<mask> result := Result{}
</s> dnsfilter -- do not check lookup hosts against themselves to avoid recursion </s> remove url := fmt.Sprintf(defaultParentalURL, hashparam, d.config.parentalSensitivity)
</s> add url := fmt.Sprintf(defaultParentalURL, d.config.parentalServer, hashparam, d.config.parentalSensitivity) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d49e3769a105f4dee639b9dec1112b123b7a23aa | dnsfilter/dnsfilter.go |
// prevent recursion -- checking the host of parental safety server makes no sense
if host == d.config.parentalServer {
return Result{}, nil
} | <mask> return result, err
<mask> }
<mask>
<mask> func (d *Dnsfilter) checkParental(host string) (Result, error) {
<mask> format := func(hashparam string) string {
<mask> url := fmt.Sprintf(defaultParentalURL, d.config.parentalServer, hashparam, d.config.parentalSensitivity)
<mask> return url
<mask> }
<mask> handleBody := func(body []byte, hashes map[string]bool) (Result, error) {
<mask> // parse json
</s> dnsfilter -- do not check lookup hosts against themselves to avoid recursion </s> remove url := fmt.Sprintf(defaultParentalURL, hashparam, d.config.parentalSensitivity)
</s> add url := fmt.Sprintf(defaultParentalURL, d.config.parentalServer, hashparam, d.config.parentalSensitivity) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d49e3769a105f4dee639b9dec1112b123b7a23aa | dnsfilter/dnsfilter.go |
url := fmt.Sprintf(defaultParentalURL, d.config.parentalServer, hashparam, d.config.parentalSensitivity) | <mask> }
<mask>
<mask> func (d *Dnsfilter) checkParental(host string) (Result, error) {
<mask> format := func(hashparam string) string {
<mask> url := fmt.Sprintf(defaultParentalURL, hashparam, d.config.parentalSensitivity)
<mask> return url
<mask> }
<mask> handleBody := func(body []byte, hashes map[string]bool) (Result, error) {
<mask> // parse json
<mask> var m []struct {
</s> dnsfilter -- do not check lookup hosts against themselves to avoid recursion | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d49e3769a105f4dee639b9dec1112b123b7a23aa | dnsfilter/dnsfilter.go |
d.config.parentalServer = defaultParentalServer
| <mask> Timeout: defaultHTTPTimeout,
<mask> }
<mask> d.config.safeBrowsingServer = defaultSafebrowsingServer
<mask> return d
<mask> }
<mask>
<mask> func (d *Dnsfilter) Destroy() {
</s> dnsfilter -- do not check lookup hosts against themselves to avoid recursion </s> remove url := fmt.Sprintf(defaultParentalURL, hashparam, d.config.parentalSensitivity)
</s> add url := fmt.Sprintf(defaultParentalURL, d.config.parentalServer, hashparam, d.config.parentalSensitivity) </s> remove const defaultParentalURL = "http://pctrl.adguard.com/check-parental-control-hash?prefixes=%s&sensitivity=%d"
</s> add const defaultParentalServer = "pctrl.adguard.com"
const defaultParentalURL = "http://%s/check-parental-control-hash?prefixes=%s&sensitivity=%d" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d49e3769a105f4dee639b9dec1112b123b7a23aa | dnsfilter/dnsfilter.go |
// Coalesce returns the first non-zero value. It is named after the function
// COALESCE in SQL. If values or all its elements are empty, it returns a zero
// value.
func Coalesce[T comparable](values ...T) (res T) {
var zero T
for _, v := range values {
if v != zero {
return v
}
}
return zero
}
| <mask> "golang.org/x/exp/constraints"
<mask> "golang.org/x/exp/slices"
<mask> )
<mask>
<mask> // UniqChecker allows validating uniqueness of comparable items.
<mask> //
<mask> // TODO(a.garipov): The Ordered constraint is only really necessary in Validate.
<mask> // Consider ways of making this constraint comparable instead.
<mask> type UniqChecker[T constraints.Ordered] map[T]int64
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove "sync"
</s> add "testing" </s> remove return m, nil
}
// Address always returns an empty string.
func (u *TestBlockUpstream) Address() string {
return ""
}
// RequestsCount returns the number of handled requests. It's safe for
// concurrent use.
func (u *TestBlockUpstream) RequestsCount() int {
u.lock.Lock()
defer u.lock.Unlock()
return u.reqNum
}
</s> add return &UpstreamMock{
OnAddress: func() (addr string) {
return "sbpc.upstream.example"
},
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = respTmpl.Copy()
resp.SetReply(req)
resp.Answer[0].(*dns.TXT).Hdr.Name = req.Question[0].Name </s> remove // TestErrUpstream implements upstream.Upstream interface for replacing real
// upstream in tests.
type TestErrUpstream struct {
// The error returned by Exchange may be unwrapped to the Err.
Err error
</s> add return resp, nil
},
} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghalg/aghalg.go |
Hostname: "nonexistent.example", | <mask> Value: "simplehost.",
<mask> }},
<mask> }, {
<mask> req: &urlfilter.DNSRequest{
<mask> Hostname: "nonexisting",
<mask> DNSType: dns.TypeA,
<mask> },
<mask> name: "non-existing",
<mask> want: []*rules.DNSRewrite{},
<mask> }, {
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove wantErr: upstreamErr,
</s> add wantErr: aghtest.ErrUpstream, </s> remove want: "local.domain",
</s> add want: localDomainHost, </s> remove req: net.IP{1, 1, 1, 1},
</s> add req: onesIP, </s> remove want: "one.one.one.one",
</s> add want: onesHost, </s> remove host: "wmconvirus.narod.ru",
</s> add host: sbBlocked, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghnet/hostscontainer_test.go |
package aghos_test | <mask> package aghos
<mask>
<mask> import (
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove package aghos
</s> add package aghos_test </s> remove "io/fs"
</s> add </s> remove "github.com/AdguardTeam/golibs/errors"
</s> add | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghos/aghos_test.go |
package aghos_test | <mask> package aghos
<mask>
<mask> import (
<mask> "bufio"
<mask> "io"
<mask> "io/fs"
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove "io/fs"
</s> add </s> remove package aghos
</s> add package aghos_test </s> remove extUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"1.1.1.1.in-addr.arpa.": {"one.one.one.one"},
</s> add const (
onesHost = "one.one.one.one"
localDomainHost = "local.domain"
)
var (
onesIP = net.IP{1, 1, 1, 1}
localIP = net.IP{192, 168, 1, 1}
)
revExtIPv4, err := netutil.IPToReversedAddr(onesIP)
require.NoError(t, err)
extUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "external.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revExtIPv4, onesHost),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil </s> remove // Shutdown implements the agh.Service interface for *Service. svc may be nil.
</s> add // Shutdown implements the [agh.Service] interface for *Service. svc may be
// nil. | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghos/filewalker_test.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.