[Localization] Error committing fructose 0.82

[Markus Schlager]

Committing fructose0.82->log-activity.po I even get

---8X----------------------------
you are in the middle of a conflicted merge.
---X8----------------------------

Can't commit this file at all.

Markus