Component Translated Unfinished Unfinished words Unfinished characters Untranslated Checks Suggestions Comments
Code of Conduct Fix this component to clear its alerts. This translation is locked. 0 0 0 0 17 0 0
Collective Fix this component to clear its alerts. This translation is locked. 53% 40 904 6,470 0 39 0 0
Theme Fix this component to clear its alerts. This translation is locked. 50% 213 1,512 9,730 211 3 0 0
Glossary Website remake 0 0 0 0 0 0 0

Overview

Project website next.funkwhale.audio
Instructions for translators

THIS ISN'T READY YET

Project maintainers User avatar georgkrause

String statistics

Strings percent Hosted strings Words percent Hosted words Characters percent Hosted characters
Total 570 6,980 46,434
Source 285 3,490 23,217
Translated 55% 317 65% 4,564 65% 30,234
Needs editing 7% 42 13% 942 14% 6,695
Read-only 37% 216 21% 1,527 21% 9,819
Failing checks 10% 59 18% 1,300 19% 9,174
Strings with suggestions 0% 0 0% 0 0% 0
Untranslated strings 37% 211 21% 1,474 20% 9,505

Quick numbers

6,980
Hosted words
570
Hosted strings
55%
Translated
2
Contributors
and previous 30 days

Trends of last 30 days

+100%
Hosted words
+100%
Hosted strings
+55%
Translated
+100%
Contributors
Language Translated Unfinished Unfinished words Unfinished characters Untranslated Checks Suggestions Comments
English This language is used for source strings. Some of the components within this project have alerts. 0 0 0 0 5 0 0
French Some of the components within this project have alerts. 259 strings are not being translated here. 0 0 0 0 13 0 0
German Some of the components within this project have alerts. 26 strings are not being translated here. 2% 253 2,416 16,200 211 41 0 0
User avatar None

Failed rebase on repository

Website remake / Theme

Rebasing (1/3)
error: could not apply 1090baa... fix(precommit): Make sure the hook checks the formatting
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1090baa... fix(precommit): Make sure the hook checks the formatting
CONFLICT (add/add): Merge conflict in translations/de/LC_MESSAGES/messages.po
Auto-merging translations/de/LC_MESSAGES/messages.po
CONFLICT (add/add): Merge conflict in theme/templates/logos.html.j2
Auto-merging theme/templates/logos.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/join.html.j2
Auto-merging theme/templates/join.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/target_groups.html.j2
Auto-merging theme/templates/inc/target_groups.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/support-us.html.j2
Auto-merging theme/templates/inc/support-us.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/hero.html.j2
Auto-merging theme/templates/inc/hero.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/get-started.html.j2
Auto-merging theme/templates/inc/get-started.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/footer.html.j2
Auto-merging theme/templates/inc/footer.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/features.html.j2
Auto-merging theme/templates/inc/features.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/blogposts.html.j2
Auto-merging theme/templates/inc/blogposts.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/help.html.j2
Auto-merging theme/templates/help.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/donate.html.j2
Auto-merging theme/templates/donate.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/credits.html.j2
Auto-merging theme/templates/credits.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/contribute.html.j2
Auto-merging theme/templates/contribute.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/contact.html.j2
Auto-merging theme/templates/contact.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/apps.html.j2
Auto-merging theme/templates/apps.html.j2
CONFLICT (add/add): Merge conflict in theme/static/css/website.css
Auto-merging theme/static/css/website.css
CONFLICT (add/add): Merge conflict in pyproject.toml
Auto-merging pyproject.toml
CONFLICT (add/add): Merge conflict in poetry.lock
Auto-merging poetry.lock
CONFLICT (add/add): Merge conflict in pelicanconf.py
Auto-merging pelicanconf.py
CONFLICT (add/add): Merge conflict in messages.pot
Auto-merging messages.pot
CONFLICT (add/add): Merge conflict in content/coc/en_US.md
Auto-merging content/coc/en_US.md
CONFLICT (add/add): Merge conflict in Makefile
Auto-merging Makefile
CONFLICT (add/add): Merge conflict in .gitlab-ci.yml
Auto-merging .gitlab-ci.yml
 (1)
5 days ago
User avatar None

Failed rebase on repository

Website remake / Code of Conduct

Rebasing (1/3)
error: could not apply 1090baa... fix(precommit): Make sure the hook checks the formatting
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1090baa... fix(precommit): Make sure the hook checks the formatting
CONFLICT (add/add): Merge conflict in translations/de/LC_MESSAGES/messages.po
Auto-merging translations/de/LC_MESSAGES/messages.po
CONFLICT (add/add): Merge conflict in theme/templates/logos.html.j2
Auto-merging theme/templates/logos.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/join.html.j2
Auto-merging theme/templates/join.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/target_groups.html.j2
Auto-merging theme/templates/inc/target_groups.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/support-us.html.j2
Auto-merging theme/templates/inc/support-us.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/hero.html.j2
Auto-merging theme/templates/inc/hero.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/get-started.html.j2
Auto-merging theme/templates/inc/get-started.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/footer.html.j2
Auto-merging theme/templates/inc/footer.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/features.html.j2
Auto-merging theme/templates/inc/features.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/blogposts.html.j2
Auto-merging theme/templates/inc/blogposts.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/help.html.j2
Auto-merging theme/templates/help.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/donate.html.j2
Auto-merging theme/templates/donate.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/credits.html.j2
Auto-merging theme/templates/credits.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/contribute.html.j2
Auto-merging theme/templates/contribute.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/contact.html.j2
Auto-merging theme/templates/contact.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/apps.html.j2
Auto-merging theme/templates/apps.html.j2
CONFLICT (add/add): Merge conflict in theme/static/css/website.css
Auto-merging theme/static/css/website.css
CONFLICT (add/add): Merge conflict in pyproject.toml
Auto-merging pyproject.toml
CONFLICT (add/add): Merge conflict in poetry.lock
Auto-merging poetry.lock
CONFLICT (add/add): Merge conflict in pelicanconf.py
Auto-merging pelicanconf.py
CONFLICT (add/add): Merge conflict in messages.pot
Auto-merging messages.pot
CONFLICT (add/add): Merge conflict in content/coc/en_US.md
Auto-merging content/coc/en_US.md
CONFLICT (add/add): Merge conflict in Makefile
Auto-merging Makefile
CONFLICT (add/add): Merge conflict in .gitlab-ci.yml
Auto-merging .gitlab-ci.yml
 (1)
5 days ago
User avatar None

Failed rebase on repository

Website remake / Collective

Rebasing (1/3)
error: could not apply 1090baa... fix(precommit): Make sure the hook checks the formatting
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1090baa... fix(precommit): Make sure the hook checks the formatting
CONFLICT (add/add): Merge conflict in translations/de/LC_MESSAGES/messages.po
Auto-merging translations/de/LC_MESSAGES/messages.po
CONFLICT (add/add): Merge conflict in theme/templates/logos.html.j2
Auto-merging theme/templates/logos.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/join.html.j2
Auto-merging theme/templates/join.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/target_groups.html.j2
Auto-merging theme/templates/inc/target_groups.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/support-us.html.j2
Auto-merging theme/templates/inc/support-us.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/hero.html.j2
Auto-merging theme/templates/inc/hero.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/get-started.html.j2
Auto-merging theme/templates/inc/get-started.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/footer.html.j2
Auto-merging theme/templates/inc/footer.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/features.html.j2
Auto-merging theme/templates/inc/features.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/blogposts.html.j2
Auto-merging theme/templates/inc/blogposts.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/help.html.j2
Auto-merging theme/templates/help.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/donate.html.j2
Auto-merging theme/templates/donate.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/credits.html.j2
Auto-merging theme/templates/credits.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/contribute.html.j2
Auto-merging theme/templates/contribute.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/contact.html.j2
Auto-merging theme/templates/contact.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/apps.html.j2
Auto-merging theme/templates/apps.html.j2
CONFLICT (add/add): Merge conflict in theme/static/css/website.css
Auto-merging theme/static/css/website.css
CONFLICT (add/add): Merge conflict in pyproject.toml
Auto-merging pyproject.toml
CONFLICT (add/add): Merge conflict in poetry.lock
Auto-merging poetry.lock
CONFLICT (add/add): Merge conflict in pelicanconf.py
Auto-merging pelicanconf.py
CONFLICT (add/add): Merge conflict in messages.pot
Auto-merging messages.pot
CONFLICT (add/add): Merge conflict in content/coc/en_US.md
Auto-merging content/coc/en_US.md
CONFLICT (add/add): Merge conflict in Makefile
Auto-merging Makefile
CONFLICT (add/add): Merge conflict in .gitlab-ci.yml
Auto-merging .gitlab-ci.yml
 (1)
5 days ago
User avatar None

Failed rebase on repository

Website remake / Theme

Rebasing (1/3)
error: could not apply 1090baa... fix(precommit): Make sure the hook checks the formatting
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1090baa... fix(precommit): Make sure the hook checks the formatting
CONFLICT (add/add): Merge conflict in translations/de/LC_MESSAGES/messages.po
Auto-merging translations/de/LC_MESSAGES/messages.po
CONFLICT (add/add): Merge conflict in theme/templates/logos.html.j2
Auto-merging theme/templates/logos.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/join.html.j2
Auto-merging theme/templates/join.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/target_groups.html.j2
Auto-merging theme/templates/inc/target_groups.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/support-us.html.j2
Auto-merging theme/templates/inc/support-us.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/hero.html.j2
Auto-merging theme/templates/inc/hero.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/get-started.html.j2
Auto-merging theme/templates/inc/get-started.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/footer.html.j2
Auto-merging theme/templates/inc/footer.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/features.html.j2
Auto-merging theme/templates/inc/features.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/blogposts.html.j2
Auto-merging theme/templates/inc/blogposts.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/help.html.j2
Auto-merging theme/templates/help.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/donate.html.j2
Auto-merging theme/templates/donate.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/credits.html.j2
Auto-merging theme/templates/credits.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/contribute.html.j2
Auto-merging theme/templates/contribute.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/contact.html.j2
Auto-merging theme/templates/contact.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/apps.html.j2
Auto-merging theme/templates/apps.html.j2
CONFLICT (add/add): Merge conflict in theme/static/css/website.css
Auto-merging theme/static/css/website.css
CONFLICT (add/add): Merge conflict in pyproject.toml
Auto-merging pyproject.toml
CONFLICT (add/add): Merge conflict in poetry.lock
Auto-merging poetry.lock
CONFLICT (add/add): Merge conflict in pelicanconf.py
Auto-merging pelicanconf.py
CONFLICT (add/add): Merge conflict in messages.pot
Auto-merging messages.pot
CONFLICT (add/add): Merge conflict in content/coc/en_US.md
Auto-merging content/coc/en_US.md
CONFLICT (add/add): Merge conflict in Makefile
Auto-merging Makefile
CONFLICT (add/add): Merge conflict in .gitlab-ci.yml
Auto-merging .gitlab-ci.yml
 (1)
8 days ago
User avatar None

Failed rebase on repository

Website remake / Collective

Rebasing (1/3)
error: could not apply 1090baa... fix(precommit): Make sure the hook checks the formatting
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1090baa... fix(precommit): Make sure the hook checks the formatting
CONFLICT (add/add): Merge conflict in translations/de/LC_MESSAGES/messages.po
Auto-merging translations/de/LC_MESSAGES/messages.po
CONFLICT (add/add): Merge conflict in theme/templates/logos.html.j2
Auto-merging theme/templates/logos.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/join.html.j2
Auto-merging theme/templates/join.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/target_groups.html.j2
Auto-merging theme/templates/inc/target_groups.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/support-us.html.j2
Auto-merging theme/templates/inc/support-us.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/hero.html.j2
Auto-merging theme/templates/inc/hero.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/get-started.html.j2
Auto-merging theme/templates/inc/get-started.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/footer.html.j2
Auto-merging theme/templates/inc/footer.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/features.html.j2
Auto-merging theme/templates/inc/features.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/blogposts.html.j2
Auto-merging theme/templates/inc/blogposts.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/help.html.j2
Auto-merging theme/templates/help.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/donate.html.j2
Auto-merging theme/templates/donate.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/credits.html.j2
Auto-merging theme/templates/credits.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/contribute.html.j2
Auto-merging theme/templates/contribute.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/contact.html.j2
Auto-merging theme/templates/contact.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/apps.html.j2
Auto-merging theme/templates/apps.html.j2
CONFLICT (add/add): Merge conflict in theme/static/css/website.css
Auto-merging theme/static/css/website.css
CONFLICT (add/add): Merge conflict in pyproject.toml
Auto-merging pyproject.toml
CONFLICT (add/add): Merge conflict in poetry.lock
Auto-merging poetry.lock
CONFLICT (add/add): Merge conflict in pelicanconf.py
Auto-merging pelicanconf.py
CONFLICT (add/add): Merge conflict in messages.pot
Auto-merging messages.pot
CONFLICT (add/add): Merge conflict in content/coc/en_US.md
Auto-merging content/coc/en_US.md
CONFLICT (add/add): Merge conflict in Makefile
Auto-merging Makefile
CONFLICT (add/add): Merge conflict in .gitlab-ci.yml
Auto-merging .gitlab-ci.yml
 (1)
8 days ago
User avatar None

Failed rebase on repository

Website remake / Code of Conduct

Rebasing (1/3)
error: could not apply 1090baa... fix(precommit): Make sure the hook checks the formatting
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1090baa... fix(precommit): Make sure the hook checks the formatting
CONFLICT (add/add): Merge conflict in translations/de/LC_MESSAGES/messages.po
Auto-merging translations/de/LC_MESSAGES/messages.po
CONFLICT (add/add): Merge conflict in theme/templates/logos.html.j2
Auto-merging theme/templates/logos.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/join.html.j2
Auto-merging theme/templates/join.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/target_groups.html.j2
Auto-merging theme/templates/inc/target_groups.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/support-us.html.j2
Auto-merging theme/templates/inc/support-us.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/hero.html.j2
Auto-merging theme/templates/inc/hero.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/get-started.html.j2
Auto-merging theme/templates/inc/get-started.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/footer.html.j2
Auto-merging theme/templates/inc/footer.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/features.html.j2
Auto-merging theme/templates/inc/features.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/blogposts.html.j2
Auto-merging theme/templates/inc/blogposts.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/help.html.j2
Auto-merging theme/templates/help.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/donate.html.j2
Auto-merging theme/templates/donate.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/credits.html.j2
Auto-merging theme/templates/credits.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/contribute.html.j2
Auto-merging theme/templates/contribute.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/contact.html.j2
Auto-merging theme/templates/contact.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/apps.html.j2
Auto-merging theme/templates/apps.html.j2
CONFLICT (add/add): Merge conflict in theme/static/css/website.css
Auto-merging theme/static/css/website.css
CONFLICT (add/add): Merge conflict in pyproject.toml
Auto-merging pyproject.toml
CONFLICT (add/add): Merge conflict in poetry.lock
Auto-merging poetry.lock
CONFLICT (add/add): Merge conflict in pelicanconf.py
Auto-merging pelicanconf.py
CONFLICT (add/add): Merge conflict in messages.pot
Auto-merging messages.pot
CONFLICT (add/add): Merge conflict in content/coc/en_US.md
Auto-merging content/coc/en_US.md
CONFLICT (add/add): Merge conflict in Makefile
Auto-merging Makefile
CONFLICT (add/add): Merge conflict in .gitlab-ci.yml
Auto-merging .gitlab-ci.yml
 (1)
8 days ago
User avatar None

Received repository notification

Website remake / Theme

GitLab: https://dev.funkwhale.audio/funkwhale/funkwhale.audio, remake 8 days ago
User avatar None

Received repository notification

Website remake / Collective

GitLab: https://dev.funkwhale.audio/funkwhale/funkwhale.audio, remake 8 days ago
User avatar None

Received repository notification

Website remake / Code of Conduct

GitLab: https://dev.funkwhale.audio/funkwhale/funkwhale.audio, remake 8 days ago
User avatar None

Failed rebase on repository

Website remake / Theme

Rebasing (1/3)
error: could not apply 1090baa... fix(precommit): Make sure the hook checks the formatting
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1090baa... fix(precommit): Make sure the hook checks the formatting
CONFLICT (add/add): Merge conflict in translations/de/LC_MESSAGES/messages.po
Auto-merging translations/de/LC_MESSAGES/messages.po
CONFLICT (add/add): Merge conflict in theme/templates/logos.html.j2
Auto-merging theme/templates/logos.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/join.html.j2
Auto-merging theme/templates/join.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/target_groups.html.j2
Auto-merging theme/templates/inc/target_groups.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/support-us.html.j2
Auto-merging theme/templates/inc/support-us.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/hero.html.j2
Auto-merging theme/templates/inc/hero.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/get-started.html.j2
Auto-merging theme/templates/inc/get-started.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/footer.html.j2
Auto-merging theme/templates/inc/footer.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/features.html.j2
Auto-merging theme/templates/inc/features.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/inc/blogposts.html.j2
Auto-merging theme/templates/inc/blogposts.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/help.html.j2
Auto-merging theme/templates/help.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/donate.html.j2
Auto-merging theme/templates/donate.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/credits.html.j2
Auto-merging theme/templates/credits.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/contribute.html.j2
Auto-merging theme/templates/contribute.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/contact.html.j2
Auto-merging theme/templates/contact.html.j2
CONFLICT (add/add): Merge conflict in theme/templates/apps.html.j2
Auto-merging theme/templates/apps.html.j2
CONFLICT (add/add): Merge conflict in theme/static/css/website.css
Auto-merging theme/static/css/website.css
CONFLICT (add/add): Merge conflict in pyproject.toml
Auto-merging pyproject.toml
CONFLICT (add/add): Merge conflict in poetry.lock
Auto-merging poetry.lock
CONFLICT (add/add): Merge conflict in pelicanconf.py
Auto-merging pelicanconf.py
CONFLICT (add/add): Merge conflict in messages.pot
Auto-merging messages.pot
CONFLICT (add/add): Merge conflict in content/coc/en_US.md
Auto-merging content/coc/en_US.md
CONFLICT (add/add): Merge conflict in Makefile
Auto-merging Makefile
CONFLICT (add/add): Merge conflict in .gitlab-ci.yml
Auto-merging .gitlab-ci.yml
 (1)
8 days ago
Browse all project changes