Great, thank you!
On Sun, 17 Nov 2019, 02:37 Jean-Baptiste, <jean-baptiste(a)holcroft.fr> wrote:
Le 12/11/2019 à 02:25, Mike FABIAN a écrit :
> A few hours after I merged Weblate’s most recent pull request, this
happened in Weblate:
>
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch' to see the failed patch (1)
> Is this something I need to worry about, or will Weblate fix this
automatically?
Hello Mike,
you updated the pot file of your project. Then, you updated every single
po files:
https://github.com/mike-fabian/ibus-typing-booster/commit/1584339d5e111af...
This creates conflicts on po files with Weblate.
Weblate already knows when you update your pot file, don't update po
files please.
Situation is now fixed.
Have a nice day,
_______________________________________________
trans mailing list -- trans(a)lists.fedoraproject.org
To unsubscribe send an email to trans-leave(a)lists.fedoraproject.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines:
https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/trans@lists.fedoraproject.org