I needed to solve a few conflicts manually but finally merged it. Please, if you have the chance, get a recent checkout and run make update-po inside po folder and recheck your translation. This would be awesome.
-- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/1318#issuecomment-262580313
