Weblate merge conflict

[hiddit]

Been working on the Dutch translation but now it show's this error.

Rebasing (1/172) dropping 181c1d3b356dd48d437a2ee62af8911f674e357e Translated using Weblate (Slovenian) -- patch contents already upstream Rebasing (2/172) Auto-merging booklore-ui/src/i18n/nl/settings.json CONFLICT (content): Merge conflict in booklore-ui/src/i18n/nl/settings.json error: could not apply 8cd40a9... Translated using Weblate (Dutch) 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". hint: Disable this message with "git config advice.mergeConflict false" Could not apply 8cd40a9... Translated using Weblate (Dutch) (1)

[thehijacker]

Yeah. You broke it. Hehe. I am sure @acx10 will quickly fix this. I have noticed one more thing. In main menu Authors is not translated:

I checked Weblate (that is why I saw the Dutch causing problem) and I beleive it should have used key main.authors which for Slovenian translation I have it translated:

I am using 2.0.1 and I have also checked on demo.booklore.org where it is the same. So probably a bug in code?

[thehijacker]

I can see Authors key is now fixed in 2.0.3, but Weblate is still broken and nothing can be edited.