2. H5P
3. h5p-dialogcards
4. Changes

Rebasing (1/2)
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
error: could not apply ff8f8c5... 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 ff8f8c5... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk.
 (1)

2 months ago

Rebasing (1/2)
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
error: could not apply ff8f8c5... 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 ff8f8c5... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk.
 (1)

2 months ago

The component was automatically locked because of an alert. 2 months ago

Could not merge the repository. 2 months ago

Rebasing (1/2)
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
error: could not apply ff8f8c5... 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 ff8f8c5... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk.
 (1)

2 months ago

English Finnish 0 characters edited Current translation 2 months ago

Repository rebased

Original revision: 9d02b3ce09d227e1540f73eb08b3c6421333afb1
New revision: 4ddd79281312812b4a796987cb83507b152a23b7 4 months ago

Changes committed 4 months ago

Changes committed 4 months ago

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

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

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

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

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

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

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

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

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

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

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