2. Changes

Component unlocked 4 months ago

Component unlocked 4 months ago

Rebasing (1/2)
dropping a6f36bbf9c8d16ea98edf89d3847f5a98e8af5b9 Zurab Andguladze <zura.andguladze@gmail.com> updated Georgian translation using Weblate @ translate-h5p.tk. -- patch contents already upstream
Rebasing (2/2)
Auto-merging language/lt.json
CONFLICT (add/add): Merge conflict in language/lt.json
error: could not apply 7ea348a... 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 7ea348a... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
 (1)

4 months ago

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

Repository rebased

Original revision: 35fa13f851713a5a15959e79f384b6cd0d463536
New revision: f8fde429f6e50b7393995d7d5855c883a4f07459 4 months ago

Repository rebased

Original revision: 8121f1ea6e8fb340a6f27d3a732e7b7cdb06c7e1
New revision: 045f7acf51c736174f7f228fde2bd7b2831aa177 4 months ago

Repository rebased

Original revision: 5892305abb4f8df2d3d3ad194fdd204b56d9fdeb
New revision: 0542cb91e2349e2765b14495db88a4de95a08f92 4 months ago

Repository rebased

Original revision: 7149d6af413a9895c681d0601cabe9523b90c9ac
New revision: e3101a382af6ad1e9e84d12abb88a0e6b7b2d489 4 months ago

Repository rebased

Original revision: 168f9cda3338032e7f648ddd6f2ef7642cb20e12
New revision: 40ecfa03c91e1cd9d7d8b9511933f0e45db860e7 4 months ago

Repository rebased

Original revision: 694af1b620c30a0af8d9badf54abe53c9be7ba86
New revision: 603cdebcda957c7e8089914f5407b190173fe292 4 months ago

Repository rebased

Original revision: 8a238823318d269756fa45b898dc2af36c0de444
New revision: b932f013e4c3965ea894982e1b21088659911e7e 4 months ago

Repository rebased

Original revision: 98dd9c7e2faf0a15fc64bf49891529c2e91c2668
New revision: 315f0a68ebb9bf4bb8500d302426b8d1fa41abb5 4 months ago

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

4 months ago

Repository rebased

Original revision: 049b48704d625188e03228632736da8e30769905
New revision: 825faa8dbc33272d515af528dc1e941bfbad56ef 4 months ago

Repository rebased

Original revision: db50e5e3e9a4cf4e6836bc667553d07ce987410f
New revision: 04a7e7f49262bd0837790c560bb8537b6719c6e4 4 months ago

Repository rebased

Original revision: 4c3087009226be67c2e71b426a14f582a3b360ef
New revision: 1f7c3b2f34250fb471cb7d24900430f1d1af8fd8 4 months ago

Repository rebased

Original revision: 75824d409834d8b654128982f1fa449c54cd4062
New revision: db863d069c27a44060229275286705f36692dc3f 4 months ago

File language/ca.json was added. 7 months ago

Catalan 7 months ago

Changes committed 7 months ago