Nothing to list here.
lucifer
Repository merge failed |
2 years ago
|
lucifer
Repository merge failed |
Auto-merging language/mn.json CONFLICT (content): Merge conflict in language/mn.json Automatic merge failed; fix conflicts and then commit the result. (1)2 years ago |
lucifer
Repository rebase failed |
Rebasing (1/43) dropping 577283614f79800a6eb7153225ca2682b182f3d1 Update translation files -- patch contents already upstream Rebasing (2/43) dropping 12d8f1ff25f87bf8376a6791da9b52ca8e3c8f2a Update translation files -- patch contents already upstream Rebasing (3/43) dropping eef3821349745b10083541394b6ef6d61173e6a8 Update translation files -- patch contents already upstream Rebasing (4/43) dropping bda4296f53154f87ae658f6ae377a58b2ad914e9 Update translation files -- patch contents already upstream Rebasing (5/43) dropping 9a5dad211a3963aa37c9b72d33ef38ca6257160e Update translation files -- patch contents already upstream Rebasing (6/43) dropping 9bc138a385916a259220db54c58180965a430377 Update translation files -- patch contents already upstream Rebasing (7/43) dropping 13bd3b4542b03907d776ea47fc2293e635d5d4a8 Update translation files -- patch contents already upstream Rebasing (8/43) dropping dcb18ff8428bf84c16946aa624f828dffa9a501d Update translation files -- patch contents already upstream Rebasing (9/43) dropping d1ebc317a6c12f275d42a058c00a1a83ea2be1c4 Update translation files -- patch contents already upstream Rebasing (10/43) dropping 45b61afe3e767486d6c31e7bd0121b3bed147241 Update translation files -- patch contents already upstream Rebasing (11/43) dropping 346c361577bf6b5ef97215f40e6a6ab6b8a09dab Update translation files -- patch contents already upstream Rebasing (12/43) dropping d20b331308d456f5ccb3f3d52900176141664078 Update translation files -- patch contents already upstream Rebasing (13/43) dropping 21a4fec20712f34afcf30d8dff263bd5f66aadab Update translation files -- patch contents already upstream Rebasing (14/43) dropping ddd4f67242f48ba25f8927be7efe9a43d501bd68 Update translation files -- patch contents already upstream Rebasing (15/43) dropping 5011d09c049ada6d866f926a9e3f420be20e9057 Update translation files -- patch contents already upstream Rebasing (16/43) dropping 3d60477967f525eb7afb4cb222dccf77498a5b1c Update translation files -- patch contents already upstream Rebasing (17/43) dropping ed4400ba077f7b4af9dc43ec629bae14a8700f1c Update translation files -- patch contents already upstream Rebasing (18/43) dropping efc11e976fdf775833f49d54d616e93082431fd9 Update translation files -- patch contents already upstream Rebasing (19/43) error: could not apply 68e3635... Nurbyek Khuansh <lighternurbek@gmail.com> updated Mongolian 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 68e3635... Nurbyek Khuansh <lighternurbek@gmail.com> updated Mongolian translation using Weblate @ translate-h5p.tk. Auto-merging language/mn.json CONFLICT (content): Merge conflict in language/mn.json (1)2 years ago |
lucifer
Repository rebase failed |
Rebasing (1/43) dropping 577283614f79800a6eb7153225ca2682b182f3d1 Update translation files -- patch contents already upstream Rebasing (2/43) dropping 12d8f1ff25f87bf8376a6791da9b52ca8e3c8f2a Update translation files -- patch contents already upstream Rebasing (3/43) dropping eef3821349745b10083541394b6ef6d61173e6a8 Update translation files -- patch contents already upstream Rebasing (4/43) dropping bda4296f53154f87ae658f6ae377a58b2ad914e9 Update translation files -- patch contents already upstream Rebasing (5/43) dropping 9a5dad211a3963aa37c9b72d33ef38ca6257160e Update translation files -- patch contents already upstream Rebasing (6/43) dropping 9bc138a385916a259220db54c58180965a430377 Update translation files -- patch contents already upstream Rebasing (7/43) dropping 13bd3b4542b03907d776ea47fc2293e635d5d4a8 Update translation files -- patch contents already upstream Rebasing (8/43) dropping dcb18ff8428bf84c16946aa624f828dffa9a501d Update translation files -- patch contents already upstream Rebasing (9/43) dropping d1ebc317a6c12f275d42a058c00a1a83ea2be1c4 Update translation files -- patch contents already upstream Rebasing (10/43) dropping 45b61afe3e767486d6c31e7bd0121b3bed147241 Update translation files -- patch contents already upstream Rebasing (11/43) dropping 346c361577bf6b5ef97215f40e6a6ab6b8a09dab Update translation files -- patch contents already upstream Rebasing (12/43) dropping d20b331308d456f5ccb3f3d52900176141664078 Update translation files -- patch contents already upstream Rebasing (13/43) dropping 21a4fec20712f34afcf30d8dff263bd5f66aadab Update translation files -- patch contents already upstream Rebasing (14/43) dropping ddd4f67242f48ba25f8927be7efe9a43d501bd68 Update translation files -- patch contents already upstream Rebasing (15/43) dropping 5011d09c049ada6d866f926a9e3f420be20e9057 Update translation files -- patch contents already upstream Rebasing (16/43) dropping 3d60477967f525eb7afb4cb222dccf77498a5b1c Update translation files -- patch contents already upstream Rebasing (17/43) dropping ed4400ba077f7b4af9dc43ec629bae14a8700f1c Update translation files -- patch contents already upstream Rebasing (18/43) dropping efc11e976fdf775833f49d54d616e93082431fd9 Update translation files -- patch contents already upstream Rebasing (19/43) error: could not apply 68e3635... Nurbyek Khuansh <lighternurbek@gmail.com> updated Mongolian 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 68e3635... Nurbyek Khuansh <lighternurbek@gmail.com> updated Mongolian translation using Weblate @ translate-h5p.tk. Auto-merging language/mn.json CONFLICT (content): Merge conflict in language/mn.json (1)2 years ago |
lucifer
Changes pushed |
Changes pushed
2 years ago
|
lucifer
Translation approved |
|
lucifer
Translation approved |
|
lucifer
Translation approved |
|
lucifer
Changes pushed |
Changes pushed
2 years ago
|
lucifer
Translation approved |
|