2. Changes

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

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

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

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

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

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

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

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

The “language/es-mx.json” file was changed. 4 months ago

The “language/el.json” file was changed. 4 months ago

The “language/de.json” file was changed. 4 months ago

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

Repository reset

Original revision: 2213d89fa49481fe78cb0c3c3eab02dbb8cdd807
New revision: bb7a063b80ab125c6e3f9c9894751f45646ac2ac 4 months ago

warning: skipped previously applied commit 720738c
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/de.json
CONFLICT (content): Merge conflict in language/de.json
error: could not apply 2213d89... Oliver Tacke <o.tacke@posteo.de> 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 2213d89... Oliver Tacke <o.tacke@posteo.de> updated German translation using Weblate @ translate-h5p.tk.
 (1)

4 months ago

warning: skipped previously applied commit 720738c
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/de.json
CONFLICT (content): Merge conflict in language/de.json
error: could not apply 2213d89... Oliver Tacke <o.tacke@posteo.de> 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 2213d89... Oliver Tacke <o.tacke@posteo.de> updated German translation using Weblate @ translate-h5p.tk.
 (1)

4 months ago

Rebasing (1/2)
Rebasing (2/2)
Auto-merging language/de.json
CONFLICT (content): Merge conflict in language/de.json
error: could not apply 2213d89... Oliver Tacke <o.tacke@posteo.de> 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 2213d89... Oliver Tacke <o.tacke@posteo.de> updated German translation using Weblate @ translate-h5p.tk.
 (1)

4 months ago

Changes pushed 4 months ago

Changes committed 4 months ago

Translation completed 4 months ago

English German 0 characters edited Current translation Approved 4 months ago