2. H5P
3. h5p-editor-interactive-video
4. Changes

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)

8 days ago

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)

8 days ago

The component was automatically locked because of an alert. 8 days ago

Could not merge the repository. 8 days ago

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)

8 days ago

Repository rebased

Original revision: d676d37bddbabbc78abe478259e3859dbe0b8d5b
New revision: 3be27de4519bbe24810c1572d8c888366d8d8c08 2 months ago

Changes committed 2 months ago

Changes committed 2 months ago

English Norwegian Nynorsk 1 character edited Current translation Approved 2 months ago

English Norwegian Bokmål 1 character edited Current translation Approved 2 months ago

English Norwegian Bokmål 2 characters edited Current translation Approved 2 months ago

English Norwegian Nynorsk 2 characters edited Current translation Approved 2 months ago

English Norwegian Nynorsk 2 characters edited Approved 2 months ago

English Norwegian Bokmål 1 character edited Approved 2 months ago

English Norwegian Nynorsk 1 character edited Current translation Approved 2 months ago

English Norwegian Bokmål 7 characters edited Current translation Approved 2 months ago

English Norwegian Nynorsk 6 characters edited Current translation Approved 2 months ago

English Norwegian Bokmål 4 characters edited Current translation Approved 2 months ago

English Norwegian Nynorsk 4 characters edited Current translation Approved 2 months ago

English Norwegian Bokmål 5 characters edited Current translation Approved 2 months ago