Commit Graph

75 Commits

Author SHA1 Message Date
Eugene Burkov
d8f855ebfc all: resync with master 2025-03-18 14:15:50 +03:00
Ainar Garipov
effc822b85 all: sync with master 2025-02-18 19:50:19 +03:00
Ainar Garipov
8cb5781770 all: resync with master 2024-09-30 20:17:20 +03:00
Ainar Garipov
158d4f0249 all: sync with master 2024-07-03 15:38:37 +03:00
Ainar Garipov
9945cd3991 all: upd chlog; sync with master 2024-05-15 16:30:36 +03:00
Ainar Garipov
ce9bb588ed all: sync with master 2024-03-19 16:20:32 +03:00
Ainar Garipov
fbc0d981ba all: partially sync with master; upd chlog 2024-03-06 18:33:53 +03:00
Ainar Garipov
889a0eb8b3 all: upd chlog, i18n; fix os resolv 2024-02-01 15:20:53 +03:00
Ainar Garipov
25918e56fa Pull request 2100: v0.107.42-rc
Squashed commit of the following:

commit 284190f748345c7556e60b67f051ec5f6f080948
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 6 19:36:00 2023 +0300

    all: sync with master; upd chlog
2023-12-07 17:23:00 +03:00
Ainar Garipov
82ab4328d4 all: sync with master; upd chlog 2023-11-13 17:39:48 +03:00
Ainar Garipov
b21e19a223 all: sync with master; upd chlog 2023-10-18 17:04:44 +03:00
Ainar Garipov
760d466b38 all: sync with master; upd chlog 2023-10-11 17:31:41 +03:00
Ainar Garipov
258eecc55b all: sync with master; upd chlog 2023-09-11 17:51:50 +03:00
Ainar Garipov
7b93f5d7cf all: sync with master; upd chlog 2023-09-07 17:13:48 +03:00
Ainar Garipov
48ee2f8a42 all: sync with master; upd chlog 2023-07-26 13:18:44 +03:00
Ainar Garipov
b22b16d98c all: sync with master; upd chlog 2023-07-03 14:10:40 +03:00
Ainar Garipov
09718a2170 all: sync with master; upd chlog 2023-04-18 16:07:11 +03:00
Ainar Garipov
d9c57cdd9a all: sync with master; upd chlog 2023-04-12 14:48:42 +03:00
Ainar Garipov
80eb339896 all: sync with master; upd chlog 2023-02-01 15:41:34 +03:00
Ainar Garipov
a11c8e91ab all: sync with master 2022-12-15 17:50:08 +03:00
Ainar Garipov
fde9ea5cb1 all: sync with master 2022-12-07 16:46:59 +03:00
Ainar Garipov
bd64b8b014 all: sync with master 2022-11-23 16:52:05 +03:00
Ainar Garipov
c9314610d4 all: sync with master 2022-11-02 16:18:02 +03:00
Ainar Garipov
21f6ed36fe all: sync with master 2022-09-29 17:36:01 +03:00
Ainar Garipov
faf2b32389 all: sync with master 2022-09-07 18:03:18 +03:00
Ainar Garipov
d5a213c639 cherry-pick: upd-i18n
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit 366600a32ecbb163ab43b43145898bbadcfbc2e9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Aug 3 15:09:16 2022 +0300

    client: fix si-lk

commit 2a55ee3846251e53529f4ef6562e5f4939381eae
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Aug 3 15:03:45 2022 +0300

    client: upd i18n
2022-08-03 16:01:22 +03:00
Ainar Garipov
fecd146552 client: upd i18n 2022-07-13 13:43:21 +03:00
Ainar Garipov
e754e4d2f6 cherry-pick: client: upd i18n
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit 3feadfe31609ef52726b582ad6ba18bfa435a081
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Jun 3 16:34:36 2022 +0300

    client: upd i18n
2022-06-03 16:40:11 +03:00
Ainar Garipov
86e5756262 client: sync with master 2022-06-02 17:23:58 +03:00
Ainar Garipov
faa7c9aae5 cherry-pick: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit 048c245ab682f0799c2f7a7f0435a1898a482392
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Feb 21 16:58:10 2022 +0300

    client: upd i18n
2022-02-21 17:08:25 +03:00
Ainar Garipov
e2ae9e1591 cherry-pick: client: upd i18n
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit e2f9e9f52a424b7c13beebfc2f8fea3814d3b2f4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Feb 8 13:48:17 2022 +0300

    client: upd i18n
2022-02-14 17:04:18 +03:00
Ainar Garipov
12c20288e4 cherry-pick: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit bd6bc0aeaa1bd928ae39642691b913befbc0f396
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jan 25 14:04:10 2022 +0300

    client: upd i18n
2022-01-25 14:11:12 +03:00
Ainar Garipov
68452e5330 cherry-pick: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit bc3de579e00762bc2c4b62fb1f7ba73837c10bff
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 29 15:37:29 2021 +0300

    client: upd si-lk i18n again

commit 2cd5436b6e8c1918855aff58dd0958fe47b47e90
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 29 15:08:21 2021 +0300

    client: upd i18n
2021-12-29 16:03:34 +03:00
Ainar Garipov
49eb62aeb5 Pull request: client: upd i18n
Merge in DNS/adguard-home from 2643-upd-i18n to master

Squashed commit of the following:

commit 2efafe2b4c5e88b527375aa1f98d92ddd04efaed
Merge: 7a9a2f3a ed5f8271
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 15 14:45:28 2021 +0300

    Merge branch 'master' into 2643-upd-i18n

commit 7a9a2f3af3a44f66e46c2131d28e07a8204cd3bb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 15 14:41:03 2021 +0300

    client: upd i18n
2021-12-15 14:55:56 +03:00
Ainar Garipov
ed868fa46a Pull request: client: upd i18n
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit 7d9aa25a5ec3e9779abda442fd68d057e7e5842e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Nov 23 14:04:17 2021 +0300

    client: upd i18n
2021-11-23 14:21:02 +03:00
Ainar Garipov
eeb99db973 Pull request: client: upd i18n
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit 96ab70982c2f605a4f793a720451725a6c0e6c86
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Sep 14 15:49:06 2021 +0300

    client: fix de i18n typography

commit d7ef3efa09814b8c8b3a9fdce891c137fea6583b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Sep 14 15:16:15 2021 +0300

    client: upd i18n
2021-09-14 16:01:52 +03:00
Ainar Garipov
bb4cd312c2 Pull request: client: upd i18n
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit 59dadec4fe47ffb752ba13d597ad0dba35a17d93
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 31 13:22:53 2021 +0300

    client: fix ru locale

commit 38268c97dbf728c367ac280224ee6dcfef90c19a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 31 13:16:36 2021 +0300

    client: upd i18n
2021-08-31 13:28:27 +03:00
Ainar Garipov
f8fe4b310f Pull request: client: upd i18n
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit e85d6eef7fca0eb61dd83d83069a637a71c66547
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 17 15:15:45 2021 +0300

    client: upd i18n
2021-08-17 15:20:48 +03:00
Ainar Garipov
c14bde280e Pull request: client: upd i18n
Merge in DNS/adguard-home from 2643-upd-i18n to master

Squashed commit of the following:

commit 12f4de7608c7a2335a137859301ff3a51e239596
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 3 13:32:37 2021 +0300

    client: fix punct in fr

commit 01369e0985ffd0f8780e514f9af614909d3ecdb4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 3 13:27:02 2021 +0300

    client: fix punct in de, fr

commit d06ea8fe2d2ca4f50e8721d9edb0a895062ac0a0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 3 13:07:57 2021 +0300

    client: upd i18n
2021-08-03 13:40:21 +03:00
Ainar Garipov
0217c6ad11 Pull request: client: upd i18n
Merge in DNS/adguard-home from 2643-upd-i18n to master

Squashed commit of the following:

commit 328847d67d1be5632777dd146b4110d5ab1d57d4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jul 20 13:18:58 2021 +0300

    client: upd i18n more

commit b9856dbd013056aa690f7a5ca116a194d218554d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jul 20 12:52:33 2021 +0300

    client: upd i18n
2021-07-20 13:22:48 +03:00
Ainar Garipov
1a693f790b Pull request: client: upd i18n
Merge in DNS/adguard-home from 2643-upd-i18n to master

Squashed commit of the following:

commit e965f59e87ca4ac3da69bac6a1d0526d091ea02a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jul 7 13:30:43 2021 +0300

    client: upd i18n
2021-07-07 13:44:53 +03:00
Ainar Garipov
ce36c955df Pull request: client: upd i18n
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit bf45adb09443576d3fb577e1f723985e073cc312
Merge: 015ce9cf 6e9a90b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jun 16 13:38:25 2021 +0300

    Merge branch 'master' into upd-i18n

commit 015ce9cff63ff4987af955c38732b1da3a8ccffb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jun 16 13:20:38 2021 +0300

    client: upd i18n more

commit 83badda5a1e72798c4791a3c9081258a841f4a91
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jun 15 21:24:58 2021 +0300

    client: upd i18n
2021-06-16 13:43:43 +03:00
Ainar Garipov
3fb32881fb Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit e7c546c62f4e765a633ed345e57d9ff0a308f904
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jun 1 14:54:34 2021 +0300

    client: upd i18n
2021-06-01 15:14:17 +03:00
Ainar Garipov
ba63a3300d Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit aae8dd9bd79bdd52d754a2dfd3e725088d34cf33
Merge: 7708a7cb 460aa1a5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu May 6 16:41:43 2021 +0300

    Merge branch 'master' into 2643-upd-i18n

commit 7708a7cb26a1e70dc920c2e5513e6652e67f77d0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu May 6 15:46:22 2021 +0300

    client: upd i18n
2021-05-06 17:00:57 +03:00
Ainar Garipov
bc33868676 Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit 7b221535d6a403e5194aaa270790fa6b4a1404c8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 28 15:50:03 2021 +0300

    client: upd i18n
2021-04-28 16:14:04 +03:00
Ainar Garipov
c9a5a5b9c8 Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit 63048521bf6df01d1b247a3b1b8b1baf05320720
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 21 16:38:23 2021 +0300

    client: upd i18n
2021-04-21 16:48:03 +03:00
Ainar Garipov
cd9eb3b3e4 Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit b5cb0e164845fafe21964c91d14b804ec0b48606
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 19 16:21:14 2021 +0300

    client: upd i18n

commit 13ee98d64a4bd1953ea71cd51a15f5dc7cf4cf9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 19 16:11:58 2021 +0300

    client: upd i18n
2021-04-19 16:35:01 +03:00
Ainar Garipov
39b9807f19 Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit d923a934d9bca757f5abd26abc616197e5f1fec9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 19:10:08 2021 +0300

    client: upd ru

commit 114483ee80a0c850a0c25ce9c419e5d1f69d2fec
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 18:43:03 2021 +0300

    client: imp en

commit 1e57298d66d67ab4a2cbb1c3045094eefb05d667
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 17:46:07 2021 +0300

    client: fix ru

commit 5baca6561d844fe257ff6f3a70d64c9a7dc2273f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 17:39:51 2021 +0300

    client: upd i18n
2021-04-13 19:36:55 +03:00
Ainar Garipov
e710ce1100 Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit 4f6098ce31fb3e9e81d66ca613e02c9573763e13
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Mar 29 14:01:33 2021 +0300

    client: upd i18n
2021-03-29 15:39:08 +03:00
Ainar Garipov
ab81ff03f6 Pull request: all: upd translations
Merge in DNS/adguard-home from upd-locales to master

Updates #2643.

Squashed commit of the following:

commit d7f26aaa63bfc9307887301abfff4779be7eba41
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Feb 11 16:18:54 2021 +0300

    all: upd translations
2021-02-15 15:53:24 +03:00