2. Changes

GitHub: https://github.com/otacke/h5p-game-map, master 9 months ago

English Spanish 16 characters edited Current translation Approved 9 months ago

Changes pushed 9 months ago

Changes committed 9 months ago

Translation completed 9 months ago

English Spanish (Mexico) (es-MX) (es-MX) 20 characters edited Current translation Approved 9 months ago

Repository rebased

Original revision: 8f557c1854e6900ca33707f58dfdc0d014ce7723
New revision: ff24ef434dabb842c260e7f102429fb2939bbb6b 9 months ago

GitHub: https://github.com/otacke/h5p-game-map, master 9 months ago

Repository rebased

Original revision: 9d073fc837ee7956ac754ceb8e71aa897b72916a
New revision: 0f94d070dcc5f2662a607533cb21c9e7644d23f8 9 months ago

GitHub: https://github.com/Lumieducation/H5P-Nodejs-library, master 9 months ago

Component seems unused. 9 months ago

Repository rebased

Original revision: f7cf9fb9bf8da6cb6d2bb8eadf61b67502e33d9a
New revision: 9d073fc837ee7956ac754ceb8e71aa897b72916a 9 months ago

GitHub: https://github.com/Lumieducation/H5P-Nodejs-library, master 9 months ago

Rebasing (1/6)
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 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/components/HUD/Buttons/Button/Button.js
CONFLICT (content): Merge conflict in scripts/components/HUD/Buttons/Button/Button.js
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/ThreeSixtyScene.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 semantics.json
CONFLICT (content): Merge conflict in semantics.json
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)

9 months ago

GitHub: https://github.com/NDLANO/h5p-ndla-virtual-tour, master 9 months ago

warning: skipped previously applied commit 3242db8
warning: skipped previously applied commit b08bcb2
warning: skipped previously applied commit ac7dda3
warning: skipped previously applied commit ddba6ca
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/lt.json
CONFLICT (add/add): Merge conflict in language/lt.json
error: could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian 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 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
 (1)

9 months ago

GitHub: https://github.com/NDLANO/h5p-editor-ndla-virtual-tour, master 9 months ago

File “language/zh.json” was added. 9 months ago

English Chinese (no variant code) (zh) 2 characters edited Current translation Translated 9 months ago

English Chinese (no variant code) (zh) 4 characters edited Current translation Translated 9 months ago