2. H5P
3. Changes

Repository rebased 2 years ago

Changes committed 2 years ago

Changes committed 2 years ago

Changes committed 2 years ago

Changes committed 2 years ago

English Turkish 7 characters edited Current translation 2 years ago

Rebasing (1/1)
error: could not apply 10462ce... Translated using Weblate (Georgian)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 10462ce... Translated using Weblate (Georgian)
Auto-merging language/ka.json
CONFLICT (content): Merge conflict in language/ka.json
 (1)

2 years ago

Rebasing (1/1)
error: could not apply 10462ce... Translated using Weblate (Georgian)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 10462ce... Translated using Weblate (Georgian)
Auto-merging language/ka.json
CONFLICT (content): Merge conflict in language/ka.json
 (1)

2 years ago

Rebasing (1/1)
error: could not apply 10462ce... Translated using Weblate (Georgian)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 10462ce... Translated using Weblate (Georgian)
Auto-merging language/ka.json
CONFLICT (content): Merge conflict in language/ka.json
 (1)

2 years ago

The component was automatically locked because of an alert. 2 years ago

Could not merge the repository. 2 years ago

Rebasing (1/1)
error: could not apply 10462ce... Translated using Weblate (Georgian)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 10462ce... Translated using Weblate (Georgian)
Auto-merging language/ka.json
CONFLICT (content): Merge conflict in language/ka.json
 (1)

2 years ago

The component was automatically locked because of an alert. 2 years ago

Could not merge the repository. 2 years ago

Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
error: could not apply 87d4827... joep jacobs <jcb.jacobs@gmail.com> updated Dutch translation using Weblate @ translate-h5p.tk.
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 87d4827... joep jacobs <jcb.jacobs@gmail.com> updated Dutch translation using Weblate @ translate-h5p.tk.
Auto-merging language/nl.json
CONFLICT (content): Merge conflict in language/nl.json
 (1)

2 years ago

Repository rebased 2 years ago

Changes committed 2 years ago

Changes committed 2 years ago

The "/app/data/vcs/h5p/h5p-memory-game/language/tr.json" file was changed. 2 years ago

Repository rebased 2 years ago