2. Changes

Repository reset

Original revision: 60375faa1f78b2bd26492182ba9c36ee268748ab
New revision: bf18f2c4cbc57645f35b93d03b289b8685a5c5d1 4 months ago

Rebasing (1/1)
Auto-merging language/de.json
CONFLICT (content): Merge conflict in language/de.json
error: could not apply 60375fa... Prefill add-on <noreply-addon-prefill@weblate.org> updated German 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 60375fa... Prefill add-on <noreply-addon-prefill@weblate.org> updated German translation using Weblate @ translate-h5p.tk.
 (1)

4 months ago

Rebasing (1/1)
Auto-merging language/de.json
CONFLICT (content): Merge conflict in language/de.json
error: could not apply 60375fa... Prefill add-on <noreply-addon-prefill@weblate.org> updated German 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 60375fa... Prefill add-on <noreply-addon-prefill@weblate.org> updated German translation using Weblate @ translate-h5p.tk.
 (1)

4 months ago

Rebasing (1/1)
Auto-merging language/de.json
CONFLICT (content): Merge conflict in language/de.json
error: could not apply 60375fa... Prefill add-on <noreply-addon-prefill@weblate.org> updated German 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 60375fa... Prefill add-on <noreply-addon-prefill@weblate.org> updated German translation using Weblate @ translate-h5p.tk.
 (1)

4 months ago

GitHub: https://github.com/NDLANO/h5p-3d-model, master 4 months ago

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

Could not merge the repository. 4 months ago

Rebasing (1/1)
Auto-merging language/de.json
CONFLICT (content): Merge conflict in language/de.json
error: could not apply 60375fa... Prefill add-on <noreply-addon-prefill@weblate.org> updated German 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 60375fa... Prefill add-on <noreply-addon-prefill@weblate.org> updated German translation using Weblate @ translate-h5p.tk.
 (1)

4 months ago

GitHub: https://github.com/NDLANO/h5p-3d-model, master 4 months ago

Repository rebased

Original revision: 470830024b6dba2edc9c1ca6cf112ea422b27afb
New revision: 60375faa1f78b2bd26492182ba9c36ee268748ab 4 months ago

GitHub: https://github.com/NDLANO/h5p-3d-model, master 4 months ago

Repository rebased

Original revision: 27d26a0efd73b46b2d8c3af43ce2dbacbcfeec83
New revision: 470830024b6dba2edc9c1ca6cf112ea422b27afb 4 months ago

GitHub: https://github.com/NDLANO/h5p-3d-model, master 4 months ago

weblate.git.squash 4 months ago

weblate.json.customize 4 months ago

weblate.git.squash 4 months ago

Changes committed 4 months ago

English German 15 characters edited Current translation Needs editing 4 months ago

English German 47 characters edited Current translation Needs editing 4 months ago

English German 14 characters edited Current translation Needs editing 4 months ago