The translation is temporarily closed for contributions due to maintenance, please come back later.
The translation was automatically locked due to following alerts: Could not merge the repository.
Language Approved Translated Unfinished Unfinished words Unfinished characters Untranslated Checks Suggestions Comments
English MIT 0% 0 0 0 0 144 0 0
Basque MIT 0% 99% 1 1 7 0 64 0 0
Bulgarian MIT 0% 78% 38 197 1,089 0 123 0 0
Catalan MIT 0% 79% 37 195 1,075 0 120 0 0
Czech MIT 0 0 0 0 0 0 0
Dutch MIT 0% 86% 24 140 767 0 84 0 0
Estonian MIT 0% 79% 37 196 1,084 0 126 0 0
Finnish MIT 0% 78% 38 197 1,089 0 124 4 0
French MIT 3% 82% 32 164 902 0 120 0 0
Galician MIT 7% 0 0 0 0 0 0 0
German MIT 0 0 0 0 0 0 0
Greek MIT 0% 78% 38 197 1,089 0 122 0 0
Italian MIT 0% 78% 38 197 1,089 0 127 0 0
Korean MIT 0% 23% 136 634 3,620 0 128 0 0
Lithuanian MIT 10% 10% 159 807 4,665 0 136 0 0
Norwegian Bokmål MIT 95% 0 0 0 0 8 0 0
Norwegian Nynorsk MIT 0% 97% 4 11 67 0 49 128 0
Portuguese (Brazil) MIT 0% 78% 38 197 1,089 0 123 0 0
Slovenian MIT 0% 78% 38 197 1,089 0 126 0 0
Spanish MIT 0 0 0 0 0 0 0
Spanish (Mexico) (es-MX) (es-MX) MIT 0 0 0 0 0 0 0
Swedish MIT 50% 0 0 0 0 2 0 0
Please sign in to see the alerts.

Overview

Project website h5p.org
Project maintainers User avatar otacke User avatar serettig
Translation license MIT License
Translation process
  • Translations can be made directly.
  • Translation suggestions can be made.
  • Translations are reviewed by dedicated reviewers.
  • Only chosen users can contribute.
  • The translation uses monolingual files.
  • The translation base language is editable.
File mask language/*.json
Monolingual base language file language/.en.json
13 days ago

String statistics

Strings percent Hosted strings Words percent Hosted words Characters percent Hosted characters
Total 3,916 18,920 109,692
Source 178 860 4,986
Approved 25% 1,009 26% 4,952 26% 28,687
Waiting for review 57% 2,249 56% 10,638 56% 62,284
Translated 83% 3,258 82% 15,590 82% 90,971
Needs editing 16% 658 17% 3,330 17% 18,721
Read-only 0% 0 0% 0 0% 0
Failing checks 44% 1,726 48% 9,147 48% 52,837
Strings with suggestions 3% 132 4% 776 4% 4,530
Untranslated strings 0% 0 0% 0 0% 0

Quick numbers

18,920
Hosted words
3,916
Hosted strings
83%
Translated
and previous 30 days

Trends of last 30 days

Hosted words
+100%
Hosted strings
+100%
Translated
+83%
+100%
Contributors
User avatar otacke

Repository rebase failed

Rebasing (1/6)
Auto-merging .github/workflows/build_and_test.yml
CONFLICT (modify/delete): .storybook/main.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of .storybook/main.js left in tree.
CONFLICT (modify/delete): entries/dist.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of entries/dist.js left in tree.
Auto-merging language/.en.json
CONFLICT (content): Merge conflict in language/.en.json
Auto-merging language/bg.json
CONFLICT (content): Merge conflict in language/bg.json
Auto-merging language/ca.json
CONFLICT (content): Merge conflict in language/ca.json
Auto-merging language/cs.json
CONFLICT (content): Merge conflict in language/cs.json
Auto-merging language/de.json
CONFLICT (content): Merge conflict in language/de.json
Auto-merging language/el.json
CONFLICT (content): Merge conflict in language/el.json
Auto-merging language/es-mx.json
CONFLICT (content): Merge conflict in language/es-mx.json
Auto-merging language/es.json
CONFLICT (content): Merge conflict in language/es.json
Auto-merging language/et.json
CONFLICT (content): Merge conflict in language/et.json
Auto-merging language/eu.json
CONFLICT (content): Merge conflict in language/eu.json
Auto-merging language/fi.json
CONFLICT (content): Merge conflict in language/fi.json
Auto-merging language/fr.json
CONFLICT (content): Merge conflict in language/fr.json
Auto-merging language/gl.json
CONFLICT (content): Merge conflict in language/gl.json
Auto-merging language/it.json
CONFLICT (content): Merge conflict in language/it.json
Auto-merging language/ko.json
CONFLICT (content): Merge conflict in language/ko.json
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
Auto-merging language/nl.json
CONFLICT (content): Merge conflict in language/nl.json
Auto-merging language/nn.json
CONFLICT (content): Merge conflict in language/nn.json
Auto-merging language/pt-br.json
CONFLICT (content): Merge conflict in language/pt-br.json
Auto-merging language/sl.json
CONFLICT (content): Merge conflict in language/sl.json
Auto-merging language/sv.json
CONFLICT (content): Merge conflict in language/sv.json
Auto-merging library.json
CONFLICT (content): Merge conflict in library.json
Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Auto-merging scripts/app.js
CONFLICT (content): Merge conflict in scripts/app.js
Auto-merging scripts/components/Dialog/InteractionContent.js
CONFLICT (content): Merge conflict in scripts/components/Dialog/InteractionContent.js
Auto-merging scripts/components/Dialog/InteractionContent.scss
CONFLICT (content): Merge conflict in scripts/components/Dialog/InteractionContent.scss
CONFLICT (modify/delete): scripts/components/FullscreenButton/FullscreenButton.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of scripts/components/FullscreenButton/FullscreenButton.js left in tree.
CONFLICT (modify/delete): scripts/components/FullscreenButton/FullscreenButton.scss deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of scripts/components/FullscreenButton/FullscreenButton.scss left in tree.
Auto-merging scripts/components/HUD/Buttons/Button/Button.js
CONFLICT (content): Merge conflict in scripts/components/HUD/Buttons/Button/Button.js
Auto-merging scripts/components/Interactions/HotspotNavButton.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/HotspotNavButton.js
Auto-merging scripts/components/Interactions/NavigationButton.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/NavigationButton.js
Auto-merging scripts/components/Interactions/NavigationButtonLabel.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/NavigationButtonLabel.js
Auto-merging scripts/components/Interactions/OpenContent.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/OpenContent.js
Auto-merging scripts/components/Interactions/OpenContent.scss
Auto-merging scripts/components/Main.js
CONFLICT (content): Merge conflict in scripts/components/Main.js
Auto-merging scripts/components/Scene/Scene.js
CONFLICT (content): Merge conflict in scripts/components/Scene/Scene.js
Auto-merging scripts/components/Scene/SceneTypes/StaticScene.js
CONFLICT (content): Merge conflict in scripts/components/Scene/SceneTypes/StaticScene.js
Auto-merging scripts/components/Scene/SceneTypes/ThreeSixtyScene.js
CONFLICT (content): Merge conflict in scripts/components/Scene/SceneTypes/ThreeSixtyScene.js
Auto-merging scripts/utils/focus-trap.js
Auto-merging scripts/utils/open-content-utils.js
CONFLICT (modify/delete): scripts/utils/sanitization.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of scripts/utils/sanitization.js left in tree.
Auto-merging scripts/utils/utils.js
CONFLICT (content): Merge conflict in scripts/utils/utils.js
Auto-merging semantics.json
CONFLICT (content): Merge conflict in semantics.json
CONFLICT (modify/delete): stories/static/h5p-content-type.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/h5p-content-type.js left in tree.
CONFLICT (modify/delete): stories/static/h5p-x-api-event.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/h5p-x-api-event.js left in tree.
CONFLICT (modify/delete): stories/static/h5p.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/h5p.js left in tree.
CONFLICT (modify/delete): stories/static/joubelui.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/joubelui.js left in tree.
CONFLICT (modify/delete): stories/static/questions.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/questions.js left in tree.
CONFLICT (modify/delete): stories/static/singlechoiceset.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/singlechoiceset.js left in tree.
CONFLICT (modify/delete): stories/static/summary.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/summary.js left in tree.
CONFLICT (modify/delete): stories/static/three-sixty.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/three-sixty.js left in tree.
Auto-merging upgrades.js
error: could not apply 31ece51... Revert "Prepare for release"
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 31ece51... Revert "Prepare for release"
 (1)
a week ago
User avatar otacke

Repository rebase failed

Rebasing (1/6)
Auto-merging .github/workflows/build_and_test.yml
CONFLICT (modify/delete): .storybook/main.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of .storybook/main.js left in tree.
CONFLICT (modify/delete): entries/dist.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of entries/dist.js left in tree.
Auto-merging language/.en.json
CONFLICT (content): Merge conflict in language/.en.json
Auto-merging language/bg.json
CONFLICT (content): Merge conflict in language/bg.json
Auto-merging language/ca.json
CONFLICT (content): Merge conflict in language/ca.json
Auto-merging language/cs.json
CONFLICT (content): Merge conflict in language/cs.json
Auto-merging language/de.json
CONFLICT (content): Merge conflict in language/de.json
Auto-merging language/el.json
CONFLICT (content): Merge conflict in language/el.json
Auto-merging language/es-mx.json
CONFLICT (content): Merge conflict in language/es-mx.json
Auto-merging language/es.json
CONFLICT (content): Merge conflict in language/es.json
Auto-merging language/et.json
CONFLICT (content): Merge conflict in language/et.json
Auto-merging language/eu.json
CONFLICT (content): Merge conflict in language/eu.json
Auto-merging language/fi.json
CONFLICT (content): Merge conflict in language/fi.json
Auto-merging language/fr.json
CONFLICT (content): Merge conflict in language/fr.json
Auto-merging language/gl.json
CONFLICT (content): Merge conflict in language/gl.json
Auto-merging language/it.json
CONFLICT (content): Merge conflict in language/it.json
Auto-merging language/ko.json
CONFLICT (content): Merge conflict in language/ko.json
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
Auto-merging language/nl.json
CONFLICT (content): Merge conflict in language/nl.json
Auto-merging language/nn.json
CONFLICT (content): Merge conflict in language/nn.json
Auto-merging language/pt-br.json
CONFLICT (content): Merge conflict in language/pt-br.json
Auto-merging language/sl.json
CONFLICT (content): Merge conflict in language/sl.json
Auto-merging language/sv.json
CONFLICT (content): Merge conflict in language/sv.json
Auto-merging library.json
CONFLICT (content): Merge conflict in library.json
Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Auto-merging scripts/app.js
CONFLICT (content): Merge conflict in scripts/app.js
Auto-merging scripts/components/Dialog/InteractionContent.js
CONFLICT (content): Merge conflict in scripts/components/Dialog/InteractionContent.js
Auto-merging scripts/components/Dialog/InteractionContent.scss
CONFLICT (content): Merge conflict in scripts/components/Dialog/InteractionContent.scss
CONFLICT (modify/delete): scripts/components/FullscreenButton/FullscreenButton.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of scripts/components/FullscreenButton/FullscreenButton.js left in tree.
CONFLICT (modify/delete): scripts/components/FullscreenButton/FullscreenButton.scss deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of scripts/components/FullscreenButton/FullscreenButton.scss left in tree.
Auto-merging scripts/components/HUD/Buttons/Button/Button.js
CONFLICT (content): Merge conflict in scripts/components/HUD/Buttons/Button/Button.js
Auto-merging scripts/components/Interactions/HotspotNavButton.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/HotspotNavButton.js
Auto-merging scripts/components/Interactions/NavigationButton.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/NavigationButton.js
Auto-merging scripts/components/Interactions/NavigationButtonLabel.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/NavigationButtonLabel.js
Auto-merging scripts/components/Interactions/OpenContent.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/OpenContent.js
Auto-merging scripts/components/Interactions/OpenContent.scss
Auto-merging scripts/components/Main.js
CONFLICT (content): Merge conflict in scripts/components/Main.js
Auto-merging scripts/components/Scene/Scene.js
CONFLICT (content): Merge conflict in scripts/components/Scene/Scene.js
Auto-merging scripts/components/Scene/SceneTypes/StaticScene.js
CONFLICT (content): Merge conflict in scripts/components/Scene/SceneTypes/StaticScene.js
Auto-merging scripts/components/Scene/SceneTypes/ThreeSixtyScene.js
CONFLICT (content): Merge conflict in scripts/components/Scene/SceneTypes/ThreeSixtyScene.js
Auto-merging scripts/utils/focus-trap.js
Auto-merging scripts/utils/open-content-utils.js
CONFLICT (modify/delete): scripts/utils/sanitization.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of scripts/utils/sanitization.js left in tree.
Auto-merging scripts/utils/utils.js
CONFLICT (content): Merge conflict in scripts/utils/utils.js
Auto-merging semantics.json
CONFLICT (content): Merge conflict in semantics.json
CONFLICT (modify/delete): stories/static/h5p-content-type.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/h5p-content-type.js left in tree.
CONFLICT (modify/delete): stories/static/h5p-x-api-event.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/h5p-x-api-event.js left in tree.
CONFLICT (modify/delete): stories/static/h5p.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/h5p.js left in tree.
CONFLICT (modify/delete): stories/static/joubelui.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/joubelui.js left in tree.
CONFLICT (modify/delete): stories/static/questions.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/questions.js left in tree.
CONFLICT (modify/delete): stories/static/singlechoiceset.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/singlechoiceset.js left in tree.
CONFLICT (modify/delete): stories/static/summary.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/summary.js left in tree.
CONFLICT (modify/delete): stories/static/three-sixty.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/three-sixty.js left in tree.
Auto-merging upgrades.js
error: could not apply 31ece51... Revert "Prepare for release"
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 31ece51... Revert "Prepare for release"
 (1)
a week ago
User avatar otacke

Repository rebase failed

Rebasing (1/6)
Auto-merging .github/workflows/build_and_test.yml
CONFLICT (modify/delete): .storybook/main.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of .storybook/main.js left in tree.
CONFLICT (modify/delete): entries/dist.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of entries/dist.js left in tree.
Auto-merging language/.en.json
CONFLICT (content): Merge conflict in language/.en.json
Auto-merging language/bg.json
CONFLICT (content): Merge conflict in language/bg.json
Auto-merging language/ca.json
CONFLICT (content): Merge conflict in language/ca.json
Auto-merging language/cs.json
CONFLICT (content): Merge conflict in language/cs.json
Auto-merging language/de.json
CONFLICT (content): Merge conflict in language/de.json
Auto-merging language/el.json
CONFLICT (content): Merge conflict in language/el.json
Auto-merging language/es-mx.json
CONFLICT (content): Merge conflict in language/es-mx.json
Auto-merging language/es.json
CONFLICT (content): Merge conflict in language/es.json
Auto-merging language/et.json
CONFLICT (content): Merge conflict in language/et.json
Auto-merging language/eu.json
CONFLICT (content): Merge conflict in language/eu.json
Auto-merging language/fi.json
CONFLICT (content): Merge conflict in language/fi.json
Auto-merging language/fr.json
CONFLICT (content): Merge conflict in language/fr.json
Auto-merging language/gl.json
CONFLICT (content): Merge conflict in language/gl.json
Auto-merging language/it.json
CONFLICT (content): Merge conflict in language/it.json
Auto-merging language/ko.json
CONFLICT (content): Merge conflict in language/ko.json
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
Auto-merging language/nl.json
CONFLICT (content): Merge conflict in language/nl.json
Auto-merging language/nn.json
CONFLICT (content): Merge conflict in language/nn.json
Auto-merging language/pt-br.json
CONFLICT (content): Merge conflict in language/pt-br.json
Auto-merging language/sl.json
CONFLICT (content): Merge conflict in language/sl.json
Auto-merging language/sv.json
CONFLICT (content): Merge conflict in language/sv.json
Auto-merging library.json
CONFLICT (content): Merge conflict in library.json
Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Auto-merging scripts/app.js
CONFLICT (content): Merge conflict in scripts/app.js
Auto-merging scripts/components/Dialog/InteractionContent.js
CONFLICT (content): Merge conflict in scripts/components/Dialog/InteractionContent.js
Auto-merging scripts/components/Dialog/InteractionContent.scss
CONFLICT (content): Merge conflict in scripts/components/Dialog/InteractionContent.scss
CONFLICT (modify/delete): scripts/components/FullscreenButton/FullscreenButton.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of scripts/components/FullscreenButton/FullscreenButton.js left in tree.
CONFLICT (modify/delete): scripts/components/FullscreenButton/FullscreenButton.scss deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of scripts/components/FullscreenButton/FullscreenButton.scss left in tree.
Auto-merging scripts/components/HUD/Buttons/Button/Button.js
CONFLICT (content): Merge conflict in scripts/components/HUD/Buttons/Button/Button.js
Auto-merging scripts/components/Interactions/HotspotNavButton.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/HotspotNavButton.js
Auto-merging scripts/components/Interactions/NavigationButton.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/NavigationButton.js
Auto-merging scripts/components/Interactions/NavigationButtonLabel.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/NavigationButtonLabel.js
Auto-merging scripts/components/Interactions/OpenContent.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/OpenContent.js
Auto-merging scripts/components/Interactions/OpenContent.scss
Auto-merging scripts/components/Main.js
CONFLICT (content): Merge conflict in scripts/components/Main.js
Auto-merging scripts/components/Scene/Scene.js
CONFLICT (content): Merge conflict in scripts/components/Scene/Scene.js
Auto-merging scripts/components/Scene/SceneTypes/StaticScene.js
CONFLICT (content): Merge conflict in scripts/components/Scene/SceneTypes/StaticScene.js
Auto-merging scripts/components/Scene/SceneTypes/ThreeSixtyScene.js
CONFLICT (content): Merge conflict in scripts/components/Scene/SceneTypes/ThreeSixtyScene.js
Auto-merging scripts/utils/focus-trap.js
Auto-merging scripts/utils/open-content-utils.js
CONFLICT (modify/delete): scripts/utils/sanitization.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of scripts/utils/sanitization.js left in tree.
Auto-merging scripts/utils/utils.js
CONFLICT (content): Merge conflict in scripts/utils/utils.js
Auto-merging semantics.json
CONFLICT (content): Merge conflict in semantics.json
CONFLICT (modify/delete): stories/static/h5p-content-type.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/h5p-content-type.js left in tree.
CONFLICT (modify/delete): stories/static/h5p-x-api-event.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/h5p-x-api-event.js left in tree.
CONFLICT (modify/delete): stories/static/h5p.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/h5p.js left in tree.
CONFLICT (modify/delete): stories/static/joubelui.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/joubelui.js left in tree.
CONFLICT (modify/delete): stories/static/questions.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/questions.js left in tree.
CONFLICT (modify/delete): stories/static/singlechoiceset.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/singlechoiceset.js left in tree.
CONFLICT (modify/delete): stories/static/summary.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/summary.js left in tree.
CONFLICT (modify/delete): stories/static/three-sixty.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/three-sixty.js left in tree.
Auto-merging upgrades.js
error: could not apply 31ece51... Revert "Prepare for release"
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 31ece51... Revert "Prepare for release"
 (1)
a week ago
User avatar Teemu_Tiainen

Suggestion added

2 weeks ago
User avatar Teemu_Tiainen

Suggestion added

2 weeks ago
User avatar Teemu_Tiainen

Suggestion added

2 weeks ago
User avatar Teemu_Tiainen

Suggestion added

2 weeks ago
User avatar None

Repository rebase failed

Rebasing (1/6)
Auto-merging .github/workflows/build_and_test.yml
CONFLICT (modify/delete): .storybook/main.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of .storybook/main.js left in tree.
CONFLICT (modify/delete): entries/dist.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of entries/dist.js left in tree.
Auto-merging language/.en.json
CONFLICT (content): Merge conflict in language/.en.json
Auto-merging language/bg.json
CONFLICT (content): Merge conflict in language/bg.json
Auto-merging language/ca.json
CONFLICT (content): Merge conflict in language/ca.json
Auto-merging language/cs.json
CONFLICT (content): Merge conflict in language/cs.json
Auto-merging language/de.json
CONFLICT (content): Merge conflict in language/de.json
Auto-merging language/el.json
CONFLICT (content): Merge conflict in language/el.json
Auto-merging language/es-mx.json
CONFLICT (content): Merge conflict in language/es-mx.json
Auto-merging language/es.json
CONFLICT (content): Merge conflict in language/es.json
Auto-merging language/et.json
CONFLICT (content): Merge conflict in language/et.json
Auto-merging language/eu.json
CONFLICT (content): Merge conflict in language/eu.json
Auto-merging language/fi.json
CONFLICT (content): Merge conflict in language/fi.json
Auto-merging language/fr.json
CONFLICT (content): Merge conflict in language/fr.json
Auto-merging language/gl.json
CONFLICT (content): Merge conflict in language/gl.json
Auto-merging language/it.json
CONFLICT (content): Merge conflict in language/it.json
Auto-merging language/ko.json
CONFLICT (content): Merge conflict in language/ko.json
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
Auto-merging language/nl.json
CONFLICT (content): Merge conflict in language/nl.json
Auto-merging language/nn.json
CONFLICT (content): Merge conflict in language/nn.json
Auto-merging language/pt-br.json
CONFLICT (content): Merge conflict in language/pt-br.json
Auto-merging language/sl.json
CONFLICT (content): Merge conflict in language/sl.json
Auto-merging language/sv.json
CONFLICT (content): Merge conflict in language/sv.json
Auto-merging library.json
CONFLICT (content): Merge conflict in library.json
Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Auto-merging scripts/app.js
CONFLICT (content): Merge conflict in scripts/app.js
Auto-merging scripts/components/Dialog/InteractionContent.js
CONFLICT (content): Merge conflict in scripts/components/Dialog/InteractionContent.js
Auto-merging scripts/components/Dialog/InteractionContent.scss
CONFLICT (content): Merge conflict in scripts/components/Dialog/InteractionContent.scss
CONFLICT (modify/delete): scripts/components/FullscreenButton/FullscreenButton.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of scripts/components/FullscreenButton/FullscreenButton.js left in tree.
CONFLICT (modify/delete): scripts/components/FullscreenButton/FullscreenButton.scss deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of scripts/components/FullscreenButton/FullscreenButton.scss left in tree.
Auto-merging scripts/components/HUD/Buttons/Button/Button.js
CONFLICT (content): Merge conflict in scripts/components/HUD/Buttons/Button/Button.js
Auto-merging scripts/components/Interactions/HotspotNavButton.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/HotspotNavButton.js
Auto-merging scripts/components/Interactions/NavigationButton.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/NavigationButton.js
Auto-merging scripts/components/Interactions/NavigationButtonLabel.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/NavigationButtonLabel.js
Auto-merging scripts/components/Interactions/OpenContent.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/OpenContent.js
Auto-merging scripts/components/Interactions/OpenContent.scss
Auto-merging scripts/components/Main.js
CONFLICT (content): Merge conflict in scripts/components/Main.js
Auto-merging scripts/components/Scene/Scene.js
CONFLICT (content): Merge conflict in scripts/components/Scene/Scene.js
Auto-merging scripts/components/Scene/SceneTypes/StaticScene.js
CONFLICT (content): Merge conflict in scripts/components/Scene/SceneTypes/StaticScene.js
Auto-merging scripts/components/Scene/SceneTypes/ThreeSixtyScene.js
Auto-merging scripts/utils/focus-trap.js
Auto-merging scripts/utils/open-content-utils.js
CONFLICT (modify/delete): scripts/utils/sanitization.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of scripts/utils/sanitization.js left in tree.
Auto-merging scripts/utils/utils.js
CONFLICT (content): Merge conflict in scripts/utils/utils.js
Auto-merging semantics.json
CONFLICT (content): Merge conflict in semantics.json
CONFLICT (modify/delete): stories/static/h5p-content-type.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/h5p-content-type.js left in tree.
CONFLICT (modify/delete): stories/static/h5p-x-api-event.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/h5p-x-api-event.js left in tree.
CONFLICT (modify/delete): stories/static/h5p.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/h5p.js left in tree.
CONFLICT (modify/delete): stories/static/joubelui.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/joubelui.js left in tree.
CONFLICT (modify/delete): stories/static/questions.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/questions.js left in tree.
CONFLICT (modify/delete): stories/static/singlechoiceset.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/singlechoiceset.js left in tree.
CONFLICT (modify/delete): stories/static/summary.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/summary.js left in tree.
CONFLICT (modify/delete): stories/static/three-sixty.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/three-sixty.js left in tree.
Auto-merging upgrades.js
error: could not apply 31ece51... Revert "Prepare for release"
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 31ece51... Revert "Prepare for release"
 (1)
5 months ago
User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-ndla-virtual-tour, master 5 months ago
User avatar None

Repository rebase failed

Rebasing (1/6)
Auto-merging .github/workflows/build_and_test.yml
CONFLICT (modify/delete): .storybook/main.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of .storybook/main.js left in tree.
CONFLICT (modify/delete): entries/dist.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of entries/dist.js left in tree.
Auto-merging language/.en.json
CONFLICT (content): Merge conflict in language/.en.json
Auto-merging language/bg.json
CONFLICT (content): Merge conflict in language/bg.json
Auto-merging language/ca.json
CONFLICT (content): Merge conflict in language/ca.json
Auto-merging language/cs.json
CONFLICT (content): Merge conflict in language/cs.json
Auto-merging language/de.json
CONFLICT (content): Merge conflict in language/de.json
Auto-merging language/el.json
CONFLICT (content): Merge conflict in language/el.json
Auto-merging language/es-mx.json
CONFLICT (content): Merge conflict in language/es-mx.json
Auto-merging language/es.json
CONFLICT (content): Merge conflict in language/es.json
Auto-merging language/et.json
CONFLICT (content): Merge conflict in language/et.json
Auto-merging language/eu.json
CONFLICT (content): Merge conflict in language/eu.json
Auto-merging language/fi.json
CONFLICT (content): Merge conflict in language/fi.json
Auto-merging language/fr.json
CONFLICT (content): Merge conflict in language/fr.json
Auto-merging language/gl.json
CONFLICT (content): Merge conflict in language/gl.json
Auto-merging language/it.json
CONFLICT (content): Merge conflict in language/it.json
Auto-merging language/ko.json
CONFLICT (content): Merge conflict in language/ko.json
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
Auto-merging language/nl.json
CONFLICT (content): Merge conflict in language/nl.json
Auto-merging language/nn.json
CONFLICT (content): Merge conflict in language/nn.json
Auto-merging language/pt-br.json
CONFLICT (content): Merge conflict in language/pt-br.json
Auto-merging language/sl.json
CONFLICT (content): Merge conflict in language/sl.json
Auto-merging language/sv.json
CONFLICT (content): Merge conflict in language/sv.json
Auto-merging library.json
CONFLICT (content): Merge conflict in library.json
Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Auto-merging scripts/app.js
CONFLICT (content): Merge conflict in scripts/app.js
Auto-merging scripts/components/Dialog/InteractionContent.js
CONFLICT (content): Merge conflict in scripts/components/Dialog/InteractionContent.js
Auto-merging scripts/components/Dialog/InteractionContent.scss
CONFLICT (content): Merge conflict in scripts/components/Dialog/InteractionContent.scss
CONFLICT (modify/delete): scripts/components/FullscreenButton/FullscreenButton.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of scripts/components/FullscreenButton/FullscreenButton.js left in tree.
CONFLICT (modify/delete): scripts/components/FullscreenButton/FullscreenButton.scss deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of scripts/components/FullscreenButton/FullscreenButton.scss left in tree.
Auto-merging scripts/components/HUD/Buttons/Button/Button.js
CONFLICT (content): Merge conflict in scripts/components/HUD/Buttons/Button/Button.js
Auto-merging scripts/components/Interactions/HotspotNavButton.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/HotspotNavButton.js
Auto-merging scripts/components/Interactions/NavigationButton.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/NavigationButton.js
Auto-merging scripts/components/Interactions/NavigationButtonLabel.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/NavigationButtonLabel.js
Auto-merging scripts/components/Interactions/OpenContent.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/OpenContent.js
Auto-merging scripts/components/Interactions/OpenContent.scss
Auto-merging scripts/components/Main.js
CONFLICT (content): Merge conflict in scripts/components/Main.js
Auto-merging scripts/components/Scene/Scene.js
CONFLICT (content): Merge conflict in scripts/components/Scene/Scene.js
Auto-merging scripts/components/Scene/SceneTypes/StaticScene.js
CONFLICT (content): Merge conflict in scripts/components/Scene/SceneTypes/StaticScene.js
Auto-merging scripts/components/Scene/SceneTypes/ThreeSixtyScene.js
Auto-merging scripts/utils/focus-trap.js
Auto-merging scripts/utils/open-content-utils.js
CONFLICT (modify/delete): scripts/utils/sanitization.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of scripts/utils/sanitization.js left in tree.
Auto-merging scripts/utils/utils.js
CONFLICT (content): Merge conflict in scripts/utils/utils.js
Auto-merging semantics.json
CONFLICT (content): Merge conflict in semantics.json
CONFLICT (modify/delete): stories/static/h5p-content-type.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/h5p-content-type.js left in tree.
CONFLICT (modify/delete): stories/static/h5p-x-api-event.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/h5p-x-api-event.js left in tree.
CONFLICT (modify/delete): stories/static/h5p.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/h5p.js left in tree.
CONFLICT (modify/delete): stories/static/joubelui.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/joubelui.js left in tree.
CONFLICT (modify/delete): stories/static/questions.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/questions.js left in tree.
CONFLICT (modify/delete): stories/static/singlechoiceset.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/singlechoiceset.js left in tree.
CONFLICT (modify/delete): stories/static/summary.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/summary.js left in tree.
CONFLICT (modify/delete): stories/static/three-sixty.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release").  Version 31ece51 (Revert "Prepare for release") of stories/static/three-sixty.js left in tree.
Auto-merging upgrades.js
error: could not apply 31ece51... Revert "Prepare for release"
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 31ece51... Revert "Prepare for release"
 (1)
5 months ago
Browse all component changes