adjust white space
merged Ethna 2.5.0

in the concrete, cherry-picked these commits:
889ab0aa60b65f3e73e96baa141d7444905ea64c
da8bb3fdde0eb77d178a8fedc00c4ac496f89601
bugfix for I18N
Merged Ethna2.5.0

In the correct, cherry-picked these commits
171867eb
d3655584
b4884412