2. Changes

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)

2 months ago

GitHub: https://github.com/otacke/h5p-dictation, master 2 months ago

Repository rebased

Original revision: 0b18b7c55cb7969189c10dc34dc2740f2f5097f2
New revision: 6590400555e39de07ac81b39396afb7f6b1ecb43 2 months ago

GitHub: https://github.com/otacke/h5p-content-compiler, master 2 months ago

The “language/zh.json” file was changed. 2 months ago

The “language/zh-hans.json” file was changed. 2 months ago

The “language/zh-cn.json” file was changed. 2 months ago

Repository rebased

Original revision: 49cf8d70fcbba65e915817180e46131f7c7e5bf6
New revision: 0b18b7c55cb7969189c10dc34dc2740f2f5097f2 2 months ago

GitHub: https://github.com/otacke/h5p-content-compiler, master 2 months ago

warning: skipped previously applied commit 36c0e7f
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging src/scripts/app.js
CONFLICT (content): Merge conflict in src/scripts/app.js
error: could not apply 5d957c4... Fix fullscreen in preview
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 5d957c4... Fix fullscreen in preview
 (1)

2 months ago

GitHub: https://github.com/otacke/h5p-portfolio, master 2 months ago

The “language/.en.json” file was changed. 2 months ago

English Chinese (no variant code) (zh) 0 characters edited Current translation Needs editing 2 months ago

The “language/.en.json” file was changed. 2 months ago

English Chinese (Simplified) (zh-hans) 0 characters edited Current translation Needs editing 2 months ago

The “language/.en.json” file was changed. 2 months ago

The “language/lt.json” file was changed. 2 months ago

The “language/gl.json” file was changed. 2 months ago

The “language/eu.json” file was changed. 2 months ago

The “language/es.json” file was changed. 2 months ago