Component Translated Unfinished Unfinished words Unfinished characters Untranslated Checks Suggestions Comments
Sitrep UI Apache-2.0 0 0 0 0 39 0 0
Glossary Sitrep Apache-2.0 0 0 0 0 0 0 0

Overview

Project website github.com/f-eld-ch/sitrep
Project maintainers User avatar nimdanitro
Translation license Apache-2.0 Sitrep UI Sitrep
10 days ago

String statistics

Strings percent Hosted strings Words percent Hosted words Characters percent Hosted characters
Total 400 400 4,190
Source 80 80 838
Translated 100% 400 100% 400 100% 4,190
Needs editing 0% 0 0% 0 0% 0
Read-only 20% 80 20% 80 20% 838
Failing checks 9% 39 9% 39 8% 360
Strings with suggestions 0% 0 0% 0 0% 0
Untranslated strings 0% 0 0% 0 0% 0

Quick numbers

400
Hosted words
400
Hosted strings
100%
Translated
and previous 30 days

Trends of last 30 days

Hosted words
+100%
Hosted strings
+100%
Translated
+100%
−100%
Contributors
+100%
Language Translated Unfinished Unfinished words Unfinished characters Untranslated Checks Suggestions Comments
German (Switzerland) 0 0 0 0 7 0 0
English 0 0 0 0 20 0 0
French 0 0 0 0 6 0 0
German 0 0 0 0 3 0 0
Italian 0 0 0 0 3 0 0
User avatar None

Repository rebase failed

warning: skipped previously applied commit 6643726
warning: skipped previously applied commit e6a9093
warning: skipped previously applied commit 984ee1f
warning: skipped previously applied commit ff9bf8a
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/2)
Auto-merging .github/workflows/docker-image.yml
CONFLICT (add/add): Merge conflict in .github/workflows/docker-image.yml
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging Dockerfile.hasura
CONFLICT (add/add): Merge conflict in Dockerfile.hasura
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging docker-compose.yml
CONFLICT (add/add): Merge conflict in docker-compose.yml
Auto-merging ui/index.html
CONFLICT (add/add): Merge conflict in ui/index.html
Auto-merging ui/package.json
CONFLICT (add/add): Merge conflict in ui/package.json
warning: Cannot merge binary files: ui/public/favicon.ico (HEAD vs. c6d8aee (docs: Add note for weblate))
Auto-merging ui/public/favicon.ico
CONFLICT (add/add): Merge conflict in ui/public/favicon.ico
Auto-merging ui/src/App.tsx
CONFLICT (add/add): Merge conflict in ui/src/App.tsx
Auto-merging ui/src/client.tsx
CONFLICT (add/add): Merge conflict in ui/src/client.tsx
Auto-merging ui/src/components/map/EnrichedLayerFeatures.tsx
CONFLICT (add/add): Merge conflict in ui/src/components/map/EnrichedLayerFeatures.tsx
Auto-merging ui/src/i18n/locales/de/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/de/translations.json
Auto-merging ui/src/i18n/locales/en/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/en/translations.json
Auto-merging ui/src/i18n/locales/fr/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/fr/translations.json
Auto-merging ui/src/i18n/locales/it/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/it/translations.json
Auto-merging ui/src/index.tsx
CONFLICT (add/add): Merge conflict in ui/src/index.tsx
Auto-merging ui/src/types/incident.ts
CONFLICT (add/add): Merge conflict in ui/src/types/incident.ts
Auto-merging ui/src/types/journal.ts
CONFLICT (add/add): Merge conflict in ui/src/types/journal.ts
Auto-merging ui/src/views/Layout.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/Layout.tsx
Auto-merging ui/src/views/incident/New.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/incident/New.tsx
Auto-merging ui/src/views/incident/graphql.ts
CONFLICT (add/add): Merge conflict in ui/src/views/incident/graphql.ts
Auto-merging ui/src/views/journal/EditorForms/Elements.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/journal/EditorForms/Elements.tsx
Auto-merging ui/src/views/journal/graphql.ts
CONFLICT (add/add): Merge conflict in ui/src/views/journal/graphql.ts
Auto-merging ui/src/views/map/Map.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/Map.tsx
Auto-merging ui/src/views/map/controls/BabsIconController.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/BabsIconController.tsx
Auto-merging ui/src/views/map/controls/DrawControl.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/DrawControl.tsx
Auto-merging ui/src/views/map/controls/LayerControl.scss
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/LayerControl.scss
Auto-merging ui/src/views/map/controls/LayerControl.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/LayerControl.tsx
Auto-merging ui/src/views/map/controls/StyleController.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/StyleController.tsx
Auto-merging ui/src/views/map/style.ts
CONFLICT (add/add): Merge conflict in ui/src/views/map/style.ts
Auto-merging ui/src/vite-env.d.ts
CONFLICT (add/add): Merge conflict in ui/src/vite-env.d.ts
Auto-merging ui/vite.config.ts
CONFLICT (add/add): Merge conflict in ui/vite.config.ts
Auto-merging ui/yarn.lock
CONFLICT (add/add): Merge conflict in ui/yarn.lock
error: could not apply c6d8aee... docs: Add note for weblate
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply c6d8aee... docs: Add note for weblate
 (1)
2 weeks ago
User avatar None

Repository notification received

GitHub: https://github.com/f-eld-ch/sitrep, develop 2 weeks ago
User avatar None

Repository rebase failed

warning: skipped previously applied commit 6643726
warning: skipped previously applied commit e6a9093
warning: skipped previously applied commit 984ee1f
warning: skipped previously applied commit ff9bf8a
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/2)
Auto-merging .github/workflows/docker-image.yml
CONFLICT (add/add): Merge conflict in .github/workflows/docker-image.yml
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging Dockerfile.hasura
CONFLICT (add/add): Merge conflict in Dockerfile.hasura
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging docker-compose.yml
CONFLICT (add/add): Merge conflict in docker-compose.yml
Auto-merging ui/index.html
CONFLICT (add/add): Merge conflict in ui/index.html
Auto-merging ui/package.json
CONFLICT (add/add): Merge conflict in ui/package.json
warning: Cannot merge binary files: ui/public/favicon.ico (HEAD vs. c6d8aee (docs: Add note for weblate))
Auto-merging ui/public/favicon.ico
CONFLICT (add/add): Merge conflict in ui/public/favicon.ico
Auto-merging ui/src/App.tsx
CONFLICT (add/add): Merge conflict in ui/src/App.tsx
Auto-merging ui/src/client.tsx
CONFLICT (add/add): Merge conflict in ui/src/client.tsx
Auto-merging ui/src/components/map/EnrichedLayerFeatures.tsx
CONFLICT (add/add): Merge conflict in ui/src/components/map/EnrichedLayerFeatures.tsx
Auto-merging ui/src/i18n/locales/de/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/de/translations.json
Auto-merging ui/src/i18n/locales/en/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/en/translations.json
Auto-merging ui/src/i18n/locales/fr/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/fr/translations.json
Auto-merging ui/src/i18n/locales/it/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/it/translations.json
Auto-merging ui/src/index.tsx
CONFLICT (add/add): Merge conflict in ui/src/index.tsx
Auto-merging ui/src/types/incident.ts
CONFLICT (add/add): Merge conflict in ui/src/types/incident.ts
Auto-merging ui/src/types/journal.ts
CONFLICT (add/add): Merge conflict in ui/src/types/journal.ts
Auto-merging ui/src/views/Layout.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/Layout.tsx
Auto-merging ui/src/views/incident/New.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/incident/New.tsx
Auto-merging ui/src/views/incident/graphql.ts
CONFLICT (add/add): Merge conflict in ui/src/views/incident/graphql.ts
Auto-merging ui/src/views/journal/EditorForms/Elements.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/journal/EditorForms/Elements.tsx
Auto-merging ui/src/views/journal/graphql.ts
CONFLICT (add/add): Merge conflict in ui/src/views/journal/graphql.ts
Auto-merging ui/src/views/map/Map.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/Map.tsx
Auto-merging ui/src/views/map/controls/BabsIconController.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/BabsIconController.tsx
Auto-merging ui/src/views/map/controls/DrawControl.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/DrawControl.tsx
Auto-merging ui/src/views/map/controls/LayerControl.scss
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/LayerControl.scss
Auto-merging ui/src/views/map/controls/LayerControl.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/LayerControl.tsx
Auto-merging ui/src/views/map/controls/StyleController.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/StyleController.tsx
Auto-merging ui/src/views/map/style.ts
CONFLICT (add/add): Merge conflict in ui/src/views/map/style.ts
Auto-merging ui/src/vite-env.d.ts
CONFLICT (add/add): Merge conflict in ui/src/vite-env.d.ts
Auto-merging ui/vite.config.ts
CONFLICT (add/add): Merge conflict in ui/vite.config.ts
Auto-merging ui/yarn.lock
CONFLICT (add/add): Merge conflict in ui/yarn.lock
error: could not apply c6d8aee... docs: Add note for weblate
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply c6d8aee... docs: Add note for weblate
 (1)
2 weeks ago
User avatar None

Repository notification received

GitHub: https://github.com/f-eld-ch/sitrep, develop 2 weeks ago
User avatar None

Repository rebase failed

warning: skipped previously applied commit 6643726
warning: skipped previously applied commit e6a9093
warning: skipped previously applied commit 984ee1f
warning: skipped previously applied commit ff9bf8a
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/2)
Auto-merging .github/workflows/docker-image.yml
CONFLICT (add/add): Merge conflict in .github/workflows/docker-image.yml
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging Dockerfile.hasura
CONFLICT (add/add): Merge conflict in Dockerfile.hasura
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging docker-compose.yml
CONFLICT (add/add): Merge conflict in docker-compose.yml
Auto-merging ui/index.html
CONFLICT (add/add): Merge conflict in ui/index.html
Auto-merging ui/package.json
CONFLICT (add/add): Merge conflict in ui/package.json
warning: Cannot merge binary files: ui/public/favicon.ico (HEAD vs. c6d8aee (docs: Add note for weblate))
Auto-merging ui/public/favicon.ico
CONFLICT (add/add): Merge conflict in ui/public/favicon.ico
Auto-merging ui/src/App.tsx
CONFLICT (add/add): Merge conflict in ui/src/App.tsx
Auto-merging ui/src/client.tsx
CONFLICT (add/add): Merge conflict in ui/src/client.tsx
Auto-merging ui/src/components/map/EnrichedLayerFeatures.tsx
CONFLICT (add/add): Merge conflict in ui/src/components/map/EnrichedLayerFeatures.tsx
Auto-merging ui/src/i18n/locales/de/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/de/translations.json
Auto-merging ui/src/i18n/locales/en/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/en/translations.json
Auto-merging ui/src/i18n/locales/fr/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/fr/translations.json
Auto-merging ui/src/i18n/locales/it/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/it/translations.json
Auto-merging ui/src/index.tsx
CONFLICT (add/add): Merge conflict in ui/src/index.tsx
Auto-merging ui/src/types/incident.ts
CONFLICT (add/add): Merge conflict in ui/src/types/incident.ts
Auto-merging ui/src/types/journal.ts
CONFLICT (add/add): Merge conflict in ui/src/types/journal.ts
Auto-merging ui/src/views/Layout.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/Layout.tsx
Auto-merging ui/src/views/incident/New.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/incident/New.tsx
Auto-merging ui/src/views/incident/graphql.ts
CONFLICT (add/add): Merge conflict in ui/src/views/incident/graphql.ts
Auto-merging ui/src/views/journal/EditorForms/Elements.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/journal/EditorForms/Elements.tsx
Auto-merging ui/src/views/journal/graphql.ts
CONFLICT (add/add): Merge conflict in ui/src/views/journal/graphql.ts
Auto-merging ui/src/views/map/Map.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/Map.tsx
Auto-merging ui/src/views/map/controls/BabsIconController.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/BabsIconController.tsx
Auto-merging ui/src/views/map/controls/DrawControl.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/DrawControl.tsx
Auto-merging ui/src/views/map/controls/LayerControl.scss
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/LayerControl.scss
Auto-merging ui/src/views/map/controls/LayerControl.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/LayerControl.tsx
Auto-merging ui/src/views/map/controls/StyleController.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/StyleController.tsx
Auto-merging ui/src/views/map/style.ts
CONFLICT (add/add): Merge conflict in ui/src/views/map/style.ts
Auto-merging ui/src/vite-env.d.ts
CONFLICT (add/add): Merge conflict in ui/src/vite-env.d.ts
Auto-merging ui/vite.config.ts
CONFLICT (add/add): Merge conflict in ui/vite.config.ts
Auto-merging ui/yarn.lock
CONFLICT (add/add): Merge conflict in ui/yarn.lock
error: could not apply c6d8aee... docs: Add note for weblate
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply c6d8aee... docs: Add note for weblate
 (1)
a month ago
User avatar None

Repository notification received

GitHub: https://github.com/f-eld-ch/sitrep, develop a month ago
User avatar None

Repository rebase failed

warning: skipped previously applied commit 6643726
warning: skipped previously applied commit e6a9093
warning: skipped previously applied commit 984ee1f
warning: skipped previously applied commit ff9bf8a
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/2)
Auto-merging .github/workflows/docker-image.yml
CONFLICT (add/add): Merge conflict in .github/workflows/docker-image.yml
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging Dockerfile.hasura
CONFLICT (add/add): Merge conflict in Dockerfile.hasura
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging docker-compose.yml
CONFLICT (add/add): Merge conflict in docker-compose.yml
Auto-merging ui/index.html
CONFLICT (add/add): Merge conflict in ui/index.html
Auto-merging ui/package.json
CONFLICT (add/add): Merge conflict in ui/package.json
warning: Cannot merge binary files: ui/public/favicon.ico (HEAD vs. c6d8aee (docs: Add note for weblate))
Auto-merging ui/public/favicon.ico
CONFLICT (add/add): Merge conflict in ui/public/favicon.ico
Auto-merging ui/src/App.tsx
CONFLICT (add/add): Merge conflict in ui/src/App.tsx
Auto-merging ui/src/client.tsx
CONFLICT (add/add): Merge conflict in ui/src/client.tsx
Auto-merging ui/src/components/map/EnrichedLayerFeatures.tsx
CONFLICT (add/add): Merge conflict in ui/src/components/map/EnrichedLayerFeatures.tsx
Auto-merging ui/src/i18n/locales/de/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/de/translations.json
Auto-merging ui/src/i18n/locales/en/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/en/translations.json
Auto-merging ui/src/i18n/locales/fr/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/fr/translations.json
Auto-merging ui/src/i18n/locales/it/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/it/translations.json
Auto-merging ui/src/index.tsx
CONFLICT (add/add): Merge conflict in ui/src/index.tsx
Auto-merging ui/src/types/incident.ts
CONFLICT (add/add): Merge conflict in ui/src/types/incident.ts
Auto-merging ui/src/types/journal.ts
CONFLICT (add/add): Merge conflict in ui/src/types/journal.ts
Auto-merging ui/src/views/Layout.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/Layout.tsx
Auto-merging ui/src/views/incident/New.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/incident/New.tsx
Auto-merging ui/src/views/incident/graphql.ts
CONFLICT (add/add): Merge conflict in ui/src/views/incident/graphql.ts
Auto-merging ui/src/views/journal/graphql.ts
CONFLICT (add/add): Merge conflict in ui/src/views/journal/graphql.ts
Auto-merging ui/src/views/map/Map.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/Map.tsx
Auto-merging ui/src/views/map/controls/BabsIconController.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/BabsIconController.tsx
Auto-merging ui/src/views/map/controls/DrawControl.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/DrawControl.tsx
Auto-merging ui/src/views/map/controls/LayerControl.scss
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/LayerControl.scss
Auto-merging ui/src/views/map/controls/LayerControl.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/LayerControl.tsx
Auto-merging ui/src/views/map/controls/StyleController.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/StyleController.tsx
Auto-merging ui/src/views/map/style.ts
CONFLICT (add/add): Merge conflict in ui/src/views/map/style.ts
Auto-merging ui/src/vite-env.d.ts
CONFLICT (add/add): Merge conflict in ui/src/vite-env.d.ts
Auto-merging ui/vite.config.ts
CONFLICT (add/add): Merge conflict in ui/vite.config.ts
Auto-merging ui/yarn.lock
CONFLICT (add/add): Merge conflict in ui/yarn.lock
error: could not apply c6d8aee... docs: Add note for weblate
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply c6d8aee... docs: Add note for weblate
 (1)
2 months ago
User avatar None

Repository notification received

GitHub: https://github.com/f-eld-ch/sitrep, develop 2 months ago
User avatar None

Repository rebase failed

warning: skipped previously applied commit 6643726
warning: skipped previously applied commit e6a9093
warning: skipped previously applied commit 984ee1f
warning: skipped previously applied commit ff9bf8a
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/2)
Auto-merging .github/workflows/docker-image.yml
CONFLICT (add/add): Merge conflict in .github/workflows/docker-image.yml
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging Dockerfile.hasura
CONFLICT (add/add): Merge conflict in Dockerfile.hasura
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging docker-compose.yml
CONFLICT (add/add): Merge conflict in docker-compose.yml
Auto-merging ui/index.html
CONFLICT (add/add): Merge conflict in ui/index.html
Auto-merging ui/package.json
CONFLICT (add/add): Merge conflict in ui/package.json
warning: Cannot merge binary files: ui/public/favicon.ico (HEAD vs. c6d8aee (docs: Add note for weblate))
Auto-merging ui/public/favicon.ico
CONFLICT (add/add): Merge conflict in ui/public/favicon.ico
Auto-merging ui/src/App.tsx
CONFLICT (add/add): Merge conflict in ui/src/App.tsx
Auto-merging ui/src/client.tsx
CONFLICT (add/add): Merge conflict in ui/src/client.tsx
Auto-merging ui/src/components/map/EnrichedLayerFeatures.tsx
CONFLICT (add/add): Merge conflict in ui/src/components/map/EnrichedLayerFeatures.tsx
Auto-merging ui/src/i18n/locales/de/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/de/translations.json
Auto-merging ui/src/i18n/locales/en/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/en/translations.json
Auto-merging ui/src/i18n/locales/fr/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/fr/translations.json
Auto-merging ui/src/i18n/locales/it/translations.json
CONFLICT (add/add): Merge conflict in ui/src/i18n/locales/it/translations.json
Auto-merging ui/src/index.tsx
CONFLICT (add/add): Merge conflict in ui/src/index.tsx
Auto-merging ui/src/types/incident.ts
CONFLICT (add/add): Merge conflict in ui/src/types/incident.ts
Auto-merging ui/src/types/journal.ts
CONFLICT (add/add): Merge conflict in ui/src/types/journal.ts
Auto-merging ui/src/views/Layout.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/Layout.tsx
Auto-merging ui/src/views/incident/New.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/incident/New.tsx
Auto-merging ui/src/views/incident/graphql.ts
CONFLICT (add/add): Merge conflict in ui/src/views/incident/graphql.ts
Auto-merging ui/src/views/journal/graphql.ts
CONFLICT (add/add): Merge conflict in ui/src/views/journal/graphql.ts
Auto-merging ui/src/views/map/Map.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/Map.tsx
Auto-merging ui/src/views/map/controls/BabsIconController.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/BabsIconController.tsx
Auto-merging ui/src/views/map/controls/DrawControl.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/DrawControl.tsx
Auto-merging ui/src/views/map/controls/LayerControl.scss
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/LayerControl.scss
Auto-merging ui/src/views/map/controls/LayerControl.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/LayerControl.tsx
Auto-merging ui/src/views/map/controls/StyleController.tsx
CONFLICT (add/add): Merge conflict in ui/src/views/map/controls/StyleController.tsx
Auto-merging ui/src/views/map/style.ts
CONFLICT (add/add): Merge conflict in ui/src/views/map/style.ts
Auto-merging ui/src/vite-env.d.ts
CONFLICT (add/add): Merge conflict in ui/src/vite-env.d.ts
Auto-merging ui/vite.config.ts
CONFLICT (add/add): Merge conflict in ui/vite.config.ts
Auto-merging ui/yarn.lock
CONFLICT (add/add): Merge conflict in ui/yarn.lock
error: could not apply c6d8aee... docs: Add note for weblate
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply c6d8aee... docs: Add note for weblate
 (1)
2 months ago
User avatar None

Repository notification received

GitHub: https://github.com/f-eld-ch/sitrep, develop 2 months ago
Browse all project changes