> Ooh shit... Jens, I dropped the ball on this and now there are some merge
> conflicts! Could you look over this branch again and resubmit. I am deeply
> sorry and I owe you a whisky for that.
>
> Also... have we already opened the bug report for using translated strings in
> logic or have we not?
I did a "manual merge" (read: reimplement) the same directly on trunk. Setting this branch to merged anyway.
> Ooh shit... Jens, I dropped the ball on this and now there are some merge
> conflicts! Could you look over this branch again and resubmit. I am deeply
> sorry and I owe you a whisky for that.
>
> Also... have we already opened the bug report for using translated strings in
> logic or have we not?
I did a "manual merge" (read: reimplement) the same directly on trunk. Setting this branch to merged anyway.