2. Changes

ab.tbx: No such file or directory 3 months ago

Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)

3 months ago

ab.tbx: No such file or directory 3 months ago

ab.tbx: No such file or directory 3 months ago

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)

3 months ago

Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)

3 months ago

ab.tbx: No such file or directory 3 months ago

Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)

3 months ago

Repository rebased

Original revision: 5266fe7213cb3d1ce501385b033ffa1d70d6fcfe
New revision: 8ee9dabc91d0777e7232326c14165e391a2c8bf6 3 months ago

ab.tbx: No such file or directory 3 months ago

ab.tbx: No such file or directory 3 months ago

Repository rebased

Original revision: a6742920cfe42f3f391760e70decbac7f920220f
New revision: 6cc2a34203461a74c268c0270949ab63b453e549 3 months ago

Changes committed 3 months ago

ab.tbx: No such file or directory 3 months ago

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

English Norwegian Nynorsk 7 characters edited 3 months ago

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

English Norwegian Nynorsk 11 characters edited Current translation 3 months ago

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

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