Skip to content

fix: weblate conflict#6841

Merged
louislam merged 16 commits intomasterfrom
fix-weblate-conflict
Jan 30, 2026
Merged

fix: weblate conflict#6841
louislam merged 16 commits intomasterfrom
fix-weblate-conflict

Conversation

@louislam
Copy link
Copy Markdown
Owner

No description provided.

kurama and others added 16 commits January 29, 2026 08:51
Currently translated at 99.7% (1416 of 1419 strings)

Co-authored-by: Dorian Grasset <doriangrasset@proton.me>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/fr/
Translation: Uptime Kuma/Uptime Kuma
Currently translated at 100.0% (1427 of 1427 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 100.0% (1419 of 1419 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 100.0% (1419 of 1419 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 64.7% (919 of 1419 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 55.2% (784 of 1419 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 50.5% (718 of 1419 strings)

Co-authored-by: Kf637 <mail@kf637.tech>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/nb_NO/
Translation: Uptime Kuma/Uptime Kuma
Currently translated at 100.0% (1419 of 1419 strings)

Co-authored-by: MrEddX <mreddx@chatrix.one>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/bg/
Translation: Uptime Kuma/Uptime Kuma
Currently translated at 100.0% (1419 of 1419 strings)

Co-authored-by: Markus Fenes <mafen@users.noreply.github.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/nb_NO/
Translation: Uptime Kuma/Uptime Kuma
Currently translated at 100.0% (1433 of 1433 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1427 of 1427 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1419 of 1419 strings)

Co-authored-by: Aluisio <aluisiodeavila@hotmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/pt_BR/
Translation: Uptime Kuma/Uptime Kuma
Currently translated at 100.0% (1433 of 1433 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (1427 of 1427 strings)

Translated using Weblate (Russian)

Currently translated at 84.7% (1210 of 1427 strings)

Co-authored-by: FunNikita <mainik1111@icloud.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/ru/
Translation: Uptime Kuma/Uptime Kuma
Currently translated at 100.0% (1427 of 1427 strings)

Co-authored-by: AnnAngela <naganjue@vip.qq.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hans/
Translation: Uptime Kuma/Uptime Kuma
Currently translated at 100.0% (1427 of 1427 strings)

Co-authored-by: Jozef Gaal <preklady@mayday.sk>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/sk/
Translation: Uptime Kuma/Uptime Kuma
Currently translated at 43.6% (623 of 1427 strings)

Co-authored-by: Pere Montpeó <peremontpeo@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/ca/
Translation: Uptime Kuma/Uptime Kuma
Currently translated at 40.6% (582 of 1433 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1433 of 1433 strings)

Co-authored-by: Michael <accounts@michi.onl>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/de/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/en/
Translation: Uptime Kuma/Uptime Kuma
Currently translated at 100.0% (1433 of 1433 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1433 of 1433 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1433 of 1433 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1433 of 1433 strings)

Co-authored-by: Frank Elsinga <CommanderStorm@users.noreply.weblate.kuma.pet>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/bar/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/en/
Translation: Uptime Kuma/Uptime Kuma
Currently translated at 100.0% (1433 of 1433 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/fr/
Currently translated at 100.0% (1433 of 1433 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/ru/
Currently translated at 100.0% (1433 of 1433 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/sk/
Currently translated at 100.0% (1433 of 1433 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/de/
@louislam louislam merged commit 8b244d4 into master Jan 30, 2026
22 of 24 checks passed
@louislam louislam deleted the fix-weblate-conflict branch January 30, 2026 00:46
@CommanderStorm CommanderStorm added this to the 2.1.0 milestone Feb 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.