Commit graph

1889 commits

Author SHA1 Message Date
Milos Kozak 4c71a75b00
New Crowdin updates (#3020)
* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations exam.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations objectives.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Spanish)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Norwegian Bokmal)
2023-11-08 10:32:14 +01:00
Milos Kozak 168bc9cbdc
Merge pull request #3023 from AllWorkNoPlay-95/fix-ns-logo
Fix Nightscout logo in the Config Builder
2023-11-03 14:14:53 +01:00
Milos Kozak 47758b6b27 calculated day's difference over DST correctly 2023-11-03 14:03:57 +01:00
Samuele Mancuso 538a267f1e Fix NSClient Logo 2023-11-03 11:37:02 +01:00
Milos Kozak a6a84121da NSCv3: better error logging 2023-11-02 20:49:06 +01:00
Milos Kozak c8377edf9d List import files properly 2023-11-02 17:07:37 +01:00
Milos Kozak fecca3b107
New Crowdin updates (#2989)
* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations exam.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Norwegian Bokmal)

* Update source file strings.xml

* New translations strings.xml (Czech)

* New translations strings.xml (Hebrew)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Czech)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Italian)

* New translations strings.xml (Turkish)

* New translations strings.xml (Norwegian Bokmal)

* Update source file strings.xml

* New translations strings.xml (Czech)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (Turkish)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* Update source file strings.xml

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Czech)

* New translations strings.xml (Italian)

* New translations strings.xml (Turkish)

* New translations strings.xml (Romanian)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Dutch)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Dutch)

* New translations exam.xml (Italian)

* New translations objectives.xml (Italian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Lithuanian)

* New translations oh_strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations oh_strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations exam.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations oh_strings.xml (Lithuanian)

* New translations strings.xml (Polish)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Dutch)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations objectives.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations objectives.xml (Norwegian Bokmal)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Italian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Russian)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations objectives.xml (Norwegian Bokmal)
2023-11-01 15:22:05 +01:00
Milos Kozak 51e4a98497 NSC: improve connectivity message 2023-10-30 14:02:26 +01:00
Milos Kozak aa2ae1b99f Overview: show adjusted target in NSC mode 2023-10-30 13:54:24 +01:00
Milos Kozak 9b4d9b788b NSCv3: fix loading v1 records on full sync 2023-10-30 13:21:17 +01:00
jbr7rr e026b59208 Medtrum: Skip record if it fails 2023-10-28 19:02:30 +02:00
Milos Kozak ff0d327a15 Wear: optimize loading treed arrow 2023-10-27 13:45:35 +02:00
Milos Kozak e33a66b65e
New Crowdin updates (#2987)
* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)
2023-10-27 11:25:31 +02:00
Milos Kozak c351671b96
New Crowdin updates (#2972)
* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Turkish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Turkish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Turkish)

* Update source file strings.xml

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)
2023-10-26 16:47:12 +02:00
Milos Kozak e363ac2c6a fix showing EB tab in treatments 2023-10-25 10:07:14 +02:00
Milos Kozak 23c12077c6 fix Objective4 2023-10-25 09:58:38 +02:00
Philoul 7b5d164239 Wear CWF Fix invalid keys for topOffset, leftOffset and rotationOffset steps 2023-10-24 17:03:40 +02:00
Milos Kozak 4f5e6a8c42
New Crowdin updates (#2970)
* New translations strings.xml (Dutch)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Hebrew)
2023-10-23 20:49:29 +02:00
Milos Kozak 4637d045f5
New Crowdin updates (#2965)
* New translations strings.xml (Hebrew)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Turkish)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Spanish)

* New translations strings.xml (Polish)
2023-10-23 14:33:44 +02:00
Milos Kozak b9db721c6c
New Crowdin updates (#2963)
* New translations strings.xml (French)

* New translations strings.xml (French)

* Update source file strings.xml

* New translations strings.xml (Spanish)

* New translations strings.xml (Czech)

* New translations strings.xml (Spanish)

* New translations strings.xml (Portuguese, Brazilian)
2023-10-22 11:38:03 +02:00
Milos Kozak d4daba0583
Merge pull request #2771 from nightscout/kts
gradle.kts migration
2023-10-22 11:36:30 +02:00
Milos Kozak 7afd4239c9 rearrange resources to prevent failed build 2023-10-22 09:56:30 +02:00
Milos Kozak ba0c61f04b Merge branch 'dev' into kts 2023-10-22 00:12:34 +02:00
Milos Kozak 6f78223c0b add missing dependencies 2023-10-21 20:33:03 +02:00
Milos Kozak 8431e271b9
Merge pull request #2941 from olorinmaia/AddStringsWear
add 5 missing translations to wear
2023-10-21 19:33:29 +02:00
Milos Kozak 66614e7ae4
New Crowdin updates (#2955)
* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)
2023-10-21 19:08:33 +02:00
Milos Kozak 0c36f3f567
New Crowdin updates (#2951)
* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Catalan)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* Update source file strings.xml

* New translations strings.xml (Spanish)

* New translations strings.xml (Dutch)
2023-10-20 19:32:24 +02:00
Milos Kozak 9bd4a06b18 migrate to global kts plugin 2023-10-20 10:49:54 +02:00
Milos Kozak 741f3a9202 wear gradle -> kts 2023-10-19 22:48:49 +02:00
Milos Kozak 7e8b88b495 Merge remote-tracking branch 'origin/dev' into kts 2023-10-19 21:21:45 +02:00
Milos Kozak de7a1ee51a gradle -> kts 2023-10-19 21:18:14 +02:00
Milos Kozak fcee3679d1
Merge pull request #2942 from nightscout/dependabot/gradle/dev/com.google.firebase-firebase-bom-32.4.0
chore(deps): bump com.google.firebase:firebase-bom from 32.3.1 to 32.4.0
2023-10-19 16:21:36 +02:00
Milos Kozak 4c1b346596
New Crowdin updates (#2928)
* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations exam.xml (Norwegian Bokmal)

* New translations objectives.xml (Norwegian Bokmal)

* New translations oh_strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations exam.xml (Norwegian Bokmal)

* New translations strings.xml (Dutch)

* New translations exam.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Norwegian Bokmal)

* Update source file strings.xml

* Update source file strings.xml

* New translations strings.xml (Spanish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Norwegian Bokmal)

* Update source file strings.xml

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)
2023-10-19 16:21:08 +02:00
dependabot[bot] 8176a88c5e
chore(deps): bump com.google.firebase:firebase-bom from 32.3.1 to 32.4.0
Bumps com.google.firebase:firebase-bom from 32.3.1 to 32.4.0.

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-19 08:37:08 +00:00
Milos Kozak 9b2473fa1b
Merge pull request #2939 from Philoul/wear/new_custom_watchface
Wear CWF Several improvement for preferences integration + AAPS V2 replacement
2023-10-19 07:50:54 +02:00
olorinmaia e4ec18df26 add 5 missing translations to wear 2023-10-19 00:50:13 +02:00
Philoul 822a32f529 Wear CWF Add ShowDate preferences to CWF for AAPS v2 compatibility 2023-10-18 21:52:59 +02:00
Philoul dea7e3896c Wear CWF Text size can be tuned according to some settings 2023-10-18 21:52:26 +02:00
Milos Kozak 4ddef7a508 gradle -> kts 2023-10-18 17:04:02 +02:00
Milos Kozak 92be75150f gradle -> kts 2023-10-18 15:14:14 +02:00
Milos Kozak 495222e311 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2023-10-16 21:57:55 +02:00
Milos Kozak ae48b125ad remove unused languages 2023-10-16 21:57:32 +02:00
osodebailar 6d196e3134 fix transparency of time picker in night theme 2023-10-16 21:05:15 +02:00
Milos Kozak 71d8ded857 remove android_dependecies 2023-10-16 15:20:50 +02:00
Philoul ded1603b2a Wear CWF DynPref First working version 2023-10-16 10:24:26 +02:00
Milos Kozak b6f2ab2d21 Merge remote-tracking branch 'origin/kts' into kts 2023-10-15 23:06:03 +02:00
Milos Kozak ef1a40b938 Merge branch 'dev' into kts 2023-10-15 23:04:39 +02:00
Milos Kozak f0d21f0e7a
New Crowdin updates (#2920)
* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Catalan)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Serbian (Latin))

* New translations strings.xml (Norwegian Bokmal)

* Update source file strings.xml

* New translations strings.xml (Romanian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Spanish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Catalan)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Serbian (Latin))

* New translations strings.xml (Hebrew)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Catalan)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations oh_strings.xml (Catalan)

* New translations oh_strings.xml (Portuguese)

* New translations oh_strings.xml (Chinese Simplified)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Serbian (Latin))

* New translations oh_strings.xml (Ukrainian)

* New translations oh_strings.xml (Croatian)

* New translations strings.xml (Norwegian Bokmal)

* New translations strings.xml (Norwegian Bokmal)

* Update source file strings.xml

* Update source file strings.xml

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)
2023-10-15 21:09:43 +02:00
Milos Kozak 483a7549fa test-dependecies -> kts 2023-10-14 23:24:34 +02:00
Milos Kozak 5edc363733 Merge branch 'dev' into kts 2023-10-14 22:19:45 +02:00