Summary of changes: 1d04b0a... - new upstream release - fixes broken translations (*) ac6a964... solve conflict (*) This commit already existed in another branch; no separate mail sent