2. H5P
3. h5p-interactive-video
4. Changes

warning: skipped previously applied commit 5e8a576
warning: skipped previously applied commit 07f4e27
warning: skipped previously applied commit 6894a2e
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/3)
Rebasing (2/3)
Auto-merging language/sk.json
CONFLICT (content): Merge conflict in language/sk.json
error: could not apply b9202f4... "Mgr. Ing. Vladimír Výboh" <vybohv@gmail.com> updated Slovak 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 b9202f4... "Mgr. Ing. Vladimír Výboh" <vybohv@gmail.com> updated Slovak translation using Weblate @ translate-h5p.tk.
 (1)

10 days ago

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

10 days ago

warning: skipped previously applied commit 5e8a576
warning: skipped previously applied commit 07f4e27
warning: skipped previously applied commit 6894a2e
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/3)
Rebasing (2/3)
Auto-merging language/sk.json
CONFLICT (content): Merge conflict in language/sk.json
error: could not apply b9202f4... "Mgr. Ing. Vladimír Výboh" <vybohv@gmail.com> updated Slovak 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 b9202f4... "Mgr. Ing. Vladimír Výboh" <vybohv@gmail.com> updated Slovak translation using Weblate @ translate-h5p.tk.
 (1)

2 months ago

warning: skipped previously applied commit 5e8a576
warning: skipped previously applied commit 07f4e27
warning: skipped previously applied commit 6894a2e
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/3)
Rebasing (2/3)
Auto-merging language/sk.json
CONFLICT (content): Merge conflict in language/sk.json
error: could not apply b9202f4... "Mgr. Ing. Vladimír Výboh" <vybohv@gmail.com> updated Slovak 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 b9202f4... "Mgr. Ing. Vladimír Výboh" <vybohv@gmail.com> updated Slovak translation using Weblate @ translate-h5p.tk.
 (1)

2 months ago

warning: skipped previously applied commit 5e8a576
warning: skipped previously applied commit 07f4e27
warning: skipped previously applied commit 6894a2e
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/3)
Rebasing (2/3)
Auto-merging language/sk.json
CONFLICT (content): Merge conflict in language/sk.json
error: could not apply b9202f4... "Mgr. Ing. Vladimír Výboh" <vybohv@gmail.com> updated Slovak 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 b9202f4... "Mgr. Ing. Vladimír Výboh" <vybohv@gmail.com> updated Slovak translation using Weblate @ translate-h5p.tk.
 (1)

2 months ago

English Hungarian 7 characters edited 2 months ago

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

Could not merge the repository. 4 months ago

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

4 months ago

Changes committed 4 months ago

English Lithuanian 125 characters edited Current translation Translated 4 months ago

English Lithuanian 125 characters edited Current translation 4 months ago

Repository outdated. 5 months ago

Changes committed 8 months ago

English Slovak 0 characters edited Current translation Approved 8 months ago

English Slovak 2 characters edited Current translation Translated 8 months ago

Changes committed 8 months ago

Translation completed 8 months ago

English Hebrew 54 characters edited Current translation Approved 8 months ago

English Hebrew 32 characters edited Current translation Approved 8 months ago