[DE] Merge and cleanup of my last local state with the current state

[mickimnet]

I did a comparison between the changes from the other translator, which were partly in the current state, and updated those changes.