Fixes, cleanup and translation

I deleted only identical keys ..