otacke
Repository rebase failed |
8 days ago
|
otacke
Repository rebase failed |
Rebasing (1/6) Rebasing (2/6) Auto-merging language/zh-cn.json CONFLICT (add/add): Merge conflict in language/zh-cn.json error: could not apply 29ac532... "David.song" <david.song@cangloryeducation.com> updated Chinese (PRC) (zh-cn) translation using Weblate @ Deutsche H5P-Übersetzungscommunity. 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 29ac532... "David.song" <david.song@cangloryeducation.com> updated Chinese (PRC) (zh-cn) translation using Weblate @ Deutsche H5P-Übersetzungscommunity. (1)8 days ago |
None
Component locked |
The component was automatically locked because of an alert.
8 days ago
|
None
Alert triggered |
Could not merge the repository.
8 days ago
|
otacke
Repository rebase failed |
Rebasing (1/6) Rebasing (2/6) Auto-merging language/zh-cn.json CONFLICT (add/add): Merge conflict in language/zh-cn.json error: could not apply 29ac532... "David.song" <david.song@cangloryeducation.com> updated Chinese (PRC) (zh-cn) translation using Weblate @ Deutsche H5P-Übersetzungscommunity. 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 29ac532... "David.song" <david.song@cangloryeducation.com> updated Chinese (PRC) (zh-cn) translation using Weblate @ Deutsche H5P-Übersetzungscommunity. (1)8 days ago |
Teemu_Tiainen
Suggestion added |
|
None
Alert triggered |
Repository outdated.
2 months ago
|
tuanhd
Suggestion added |
|
None
Changes committed |
Changes committed
3 months ago
|
None
Changes committed |
Changes committed
3 months ago
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|