Changes in H5P @ Translate H5P

otacke Repository rebase failed H5P h5p-sequence-process	warning: skipped previously applied commit 515efb8 warning: skipped previously applied commit 865539c hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/1) Auto-merging language/te.json CONFLICT (add/add): Merge conflict in language/te.json error: could not apply 394bce3... Sushumna Rao <sushumnarao@gmail.com> updated Telugu translation using Weblate @ translate-h5p.tk. 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 394bce3... Sushumna Rao <sushumnarao@gmail.com> updated Telugu translation using Weblate @ translate-h5p.tk. (1) 6 days ago
otacke Repository rebased H5P h5p-editor-branching-scenario	Repository rebased Original revision: a41f3abbc615fcc809c2dce1916a1b9f796a2d35 New revision: dd1e0cd85a9530aa12efbb288f79d681b4bcbaa2 6 days ago
otacke Repository rebased H5P h5p-image-hotspot-question	Repository rebased Original revision: 1b327ef73a1b52e415c39f8de0c2c75cd86ea52d New revision: 827b39331550350e3272663af236255dc1edfc21 6 days ago
otacke Repository rebase failed H5P h5p-agamotto	Rebasing (1/2) Auto-merging src/scripts/h5p-agamotto.js CONFLICT (content): Merge conflict in src/scripts/h5p-agamotto.js error: could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted 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 1b5e8a5... HFP-3880 Fix audio playing even though muted (1) 6 days ago
otacke Repository rebased H5P wordpress-plugin	Repository rebased Original revision: 0616263f4a7f876b037fb2b06281f4294692cef1 New revision: d92202b475fbf7b247b55463d821101300b57907 6 days ago
otacke Repository rebase failed H5P h5p-course-presentation	Rebasing (1/1) Auto-merging language/nl.json CONFLICT (content): Merge conflict in language/nl.json error: could not apply 292c3c1... René Breedveld <info@qsento.nl> updated Dutch translation using Weblate @ translate-h5p.tk. 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 292c3c1... René Breedveld <info@qsento.nl> updated Dutch translation using Weblate @ translate-h5p.tk. (1) 6 days ago
None Component locked H5P h5p-image-hotspots	The component was automatically locked because of an alert. 6 days ago
None Alert triggered H5P h5p-image-hotspots	Could not merge the repository. 6 days ago
otacke Repository rebase failed H5P h5p-image-hotspots	warning: skipped previously applied commit d2849c3 warning: skipped previously applied commit e201402 warning: skipped previously applied commit 3c1d762 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/3) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply 3b3cac4... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. 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 3b3cac4... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1) 6 days ago
otacke Repository rebase failed H5P h5p-blanks	warning: skipped previously applied commit fcf9304 warning: skipped previously applied commit a03ae25 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/1) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply 47e66d7... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. 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 47e66d7... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1) 6 days ago
otacke Repository rebased H5P h5p-document-export-page	Repository rebased Original revision: c28803236ed3195ad10877942d4c748f3fa347ec New revision: 8336efb35cac73f009469d5f2bc6c8e9f4d44f00 6 days ago
otacke Repository rebase failed H5P h5p-ndla-virtual-tour	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) 6 days ago
otacke Repository rebase failed H5P h5p-dictation	Rebasing (1/3) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply b56bb52... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. 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 b56bb52... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1) 6 days ago
otacke Repository rebased H5P h5p-editor-three-image	Repository rebased Original revision: 92c8635ba7fa6f09f05cb06b632d475677ad12c3 New revision: a123724c0a9120e29ebdbb89223b1a26237ee466 6 days ago
otacke Repository rebase failed H5P h5p-editor-phrase-randomizer	Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Auto-merging language/de.json CONFLICT (add/add): Merge conflict in language/de.json error: could not apply ada62c9... Update translation files 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 ada62c9... Update translation files (1) 6 days ago
otacke Repository rebase failed H5P h5p-game-map	Rebasing (1/2) Auto-merging language/nl.json CONFLICT (add/add): Merge conflict in language/nl.json error: could not apply 9d55fbc... Update translation files 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 9d55fbc... Update translation files (1) 6 days ago
None Component locked H5P h5p-editor-interactive-video	The component was automatically locked because of an alert. 6 days ago
None Alert triggered H5P h5p-editor-interactive-video	Could not merge the repository. 6 days ago
otacke Repository rebase failed H5P h5p-editor-interactive-video	warning: skipped previously applied commit d8d3d15 warning: skipped previously applied commit 5a69ab9 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/3) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply b677d25... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. 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 b677d25... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1) 6 days ago
otacke Repository rebase failed H5P h5p-interactive-video	warning: skipped previously applied commit 5e8a576 warning: skipped previously applied commit 07f4e27 warning: skipped previously applied commit 6894a2e hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/3) Rebasing (2/3) Auto-merging language/sk.json CONFLICT (content): Merge conflict in language/sk.json error: could not apply b9202f4... "Mgr. Ing. Vladimír Výboh" <vybohv@gmail.com> updated Slovak translation using Weblate @ translate-h5p.tk. 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 b9202f4... "Mgr. Ing. Vladimír Výboh" <vybohv@gmail.com> updated Slovak translation using Weblate @ translate-h5p.tk. (1) 6 days ago

10 / 17708

/ 17708

Search

Action

Author username

Starting date

Ending date