What triggered me to point it out is that both of you changed `desktop.in.h:3`, but in different ways. Both changes may be valid, I don't know Portuguese so I can't say. There may be other places as well, I stopped at that point.
If the changes by @wsalmeida are larger probably best if you agree what should happen on his Github fork and then update this PR and withdraw #2880.