Merge from Transifex. Changes include updates to de locale by Armin and modifications to whitespace (and unicode?) introduced by Transifex.