2. Changes

The “language/lt.json” file was changed. a year ago

Repository rebased a year ago

Repository rebased a year ago

Changes pushed a year ago

Rebasing (1/25)
dropping e4901f895670f040865ad99a7df2921dd6b3a5d7 fix French -- patch contents already upstream
Rebasing (2/25)
dropping e59054f45088a73f9179cdc4bee31401caefbf0f fix JSON structure -- patch contents already upstream
Rebasing (3/25)
dropping 10b5913ee21ef99bea6033f0a99eab4a2984725f Anonymous <noreply@weblate.org> updated Basque translation using Weblate @ translate-h5p.tk. -- patch contents already upstream
Rebasing (4/25)
dropping 80e5446e02a8b36dd5885705e4c9f544916c3bee fix JSON structure -- patch contents already upstream
Rebasing (5/25)
dropping c4071762950dd0d26b590f61051da299120f0490 fix JSON structure -- patch contents already upstream
Rebasing (6/25)
dropping 1a8ba9b73cfd47b8b327b51c06fe63ae4f008378 fix JSON structure -- patch contents already upstream
Rebasing (7/25)
dropping 97a231a8a035d78200a6d64f35d1ee0d5e619688 fix JSON structure -- patch contents already upstream
Rebasing (8/25)
dropping 8affb5c24574d7b5bd804b93575eec8aa9c5b3e6 fix JSON structure -- patch contents already upstream
Rebasing (9/25)
dropping b7ec85dd9315ea1d66abde5b8f0756bfc0198c69 fix JSON structure -- patch contents already upstream
Rebasing (10/25)
dropping 08576972d82d54cf4504d29a15041aaba375b716 fix JSON structure -- patch contents already upstream
Rebasing (11/25)
dropping 3855bdc1c3f339e32e33147851f870487186f5a2 fix JSON structure -- patch contents already upstream
Rebasing (12/25)
dropping 2ccd83cd9c8a5fbb3769ec2015d9b8967af9f33c fix JSON structure -- patch contents already upstream
Rebasing (13/25)
error: could not apply 30b0f17... Rickard Skiöld <rickard.skiold@xtractor.se> updated Swedish 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 30b0f17... Rickard Skiöld <rickard.skiold@xtractor.se> updated Swedish translation using Weblate @ translate-h5p.tk.
Auto-merging language/sv.json
CONFLICT (content): Merge conflict in language/sv.json
 (1)

a year ago

Rebasing (1/25)
dropping e4901f895670f040865ad99a7df2921dd6b3a5d7 fix French -- patch contents already upstream
Rebasing (2/25)
dropping e59054f45088a73f9179cdc4bee31401caefbf0f fix JSON structure -- patch contents already upstream
Rebasing (3/25)
dropping 10b5913ee21ef99bea6033f0a99eab4a2984725f Anonymous <noreply@weblate.org> updated Basque translation using Weblate @ translate-h5p.tk. -- patch contents already upstream
Rebasing (4/25)
dropping 80e5446e02a8b36dd5885705e4c9f544916c3bee fix JSON structure -- patch contents already upstream
Rebasing (5/25)
dropping c4071762950dd0d26b590f61051da299120f0490 fix JSON structure -- patch contents already upstream
Rebasing (6/25)
dropping 1a8ba9b73cfd47b8b327b51c06fe63ae4f008378 fix JSON structure -- patch contents already upstream
Rebasing (7/25)
dropping 97a231a8a035d78200a6d64f35d1ee0d5e619688 fix JSON structure -- patch contents already upstream
Rebasing (8/25)
dropping 8affb5c24574d7b5bd804b93575eec8aa9c5b3e6 fix JSON structure -- patch contents already upstream
Rebasing (9/25)
dropping b7ec85dd9315ea1d66abde5b8f0756bfc0198c69 fix JSON structure -- patch contents already upstream
Rebasing (10/25)
dropping 08576972d82d54cf4504d29a15041aaba375b716 fix JSON structure -- patch contents already upstream
Rebasing (11/25)
dropping 3855bdc1c3f339e32e33147851f870487186f5a2 fix JSON structure -- patch contents already upstream
Rebasing (12/25)
dropping 2ccd83cd9c8a5fbb3769ec2015d9b8967af9f33c fix JSON structure -- patch contents already upstream
Rebasing (13/25)
error: could not apply 30b0f17... Rickard Skiöld <rickard.skiold@xtractor.se> updated Swedish 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 30b0f17... Rickard Skiöld <rickard.skiold@xtractor.se> updated Swedish translation using Weblate @ translate-h5p.tk.
Auto-merging language/sv.json
CONFLICT (content): Merge conflict in language/sv.json
 (1)

a year ago

Repository rebased a year ago

File “language/ge.json” was added. a year ago

Repository rebased a year ago

Repository rebased a year ago

Repository rebased a year ago

Repository rebased a year ago

Repository rebased a year ago

Repository rebased a year ago

Repository rebased a year ago

Repository rebased a year ago

File “language/fi.json” was added. a year ago

Repository rebased a year ago

Repository rebased a year ago

File “language/th.json” was added. a year ago