search

flameshot-org / flameshot

Powerful yet simple to use screenshot software :desktop_computer: :camera_flash:
https://flameshot.org
GNU General Public License v3.0
24.02k stars 1.53k forks source link

Translation on Weblate is locked due to merge conflict #3420

Open PeterDaveHello opened 7 months ago

PeterDaveHello commented 7 months ago

https://hosted.weblate.org/translate/flameshot/flameshot/zh_Hant/

The translation was automatically locked due to following alerts: Could not merge the repository.

Weblate could not merge upstream changes while updating the repository.

Rebasing (1/4) Auto-merging data/translations/Internationalization_es.ts CONFLICT (content): Merge conflict in data/translations/Internationalization_es.ts error: could not apply ae78e50... Translated using Weblate (Spanish) hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm ", 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 ae78e50... Translated using Weblate (Spanish) (1)