2. H5P
3. Changes

Repository rebased

Original revision: c3da5b6dc5c30beb3126525b61d400bb466652f8
New revision: 18aff7e20c04d48b46aa126c81e4fe025d063ffa a week ago

Repository rebased

Original revision: cd9203eb191c9f83e2bee4500019870ef12c43af
New revision: 9b000e87c832773927d79d5cf916e26b3e8489d5 a week ago

The component was automatically locked because of an alert. a week ago

Could not merge the repository. a week ago

Rebasing (1/6)
Rebasing (2/6)
Auto-merging language/zh-cn.json
CONFLICT (add/add): Merge conflict in language/zh-cn.json
error: could not apply 29ac532... "David.song" <david.song@cangloryeducation.com> updated Chinese (PRC) (zh-cn) translation using Weblate @ Deutsche H5P-Übersetzungscommunity.
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 29ac532... "David.song" <david.song@cangloryeducation.com> updated Chinese (PRC) (zh-cn) translation using Weblate @ Deutsche H5P-Übersetzungscommunity.
 (1)

a week ago

Repository rebased

Original revision: 99bdc59ea8b4d2a9a6adfb656783c5d3a6214bd3
New revision: e4c394b182a94efdf38ac3498ec6c235f94cbfe6 a week ago

warning: skipped previously applied commit 3242db8
warning: skipped previously applied commit b08bcb2
warning: skipped previously applied commit ac7dda3
warning: skipped previously applied commit ddba6ca
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/lt.json
CONFLICT (add/add): Merge conflict in language/lt.json
error: could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian 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 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
 (1)

a week ago

The component was automatically locked because of an alert. a week ago

Could not parse translation files. a week ago

The “language/zh-cn.json” file was changed. a week ago

English Chinese (PRC) (zh-cn) 0 characters edited Current translation Approved a week ago

English Chinese (PRC) (zh-cn) 0 characters edited Current translation Approved a week ago

English Chinese (PRC) (zh-cn) 0 characters edited Current translation Approved a week ago

English Chinese (PRC) (zh-cn) 0 characters edited Current translation Approved a week ago

English Chinese (PRC) (zh-cn) 2 characters edited Current translation Translated a week ago

English Chinese (PRC) (zh-cn) 2 characters edited Current translation Translated a week ago

English Chinese (PRC) (zh-cn) 6 characters edited Current translation Translated a week ago

English Chinese (PRC) (zh-cn) 23 characters edited Current translation Translated a week ago

English Chinese (PRC) (zh-cn) 5 characters edited Current translation Translated a week ago

English Chinese (PRC) (zh-cn) 47 characters edited Current translation Translated a week ago