Well.. Actually I was thinking about running a git rebase against upstream branch to get rid of e.g. the merge commit. Anyway, going to merge it like this. Won't hurt anybody beside the little noise causing it. And I'm happy for the translation update so users can use geany in their mother language maybe.