Fix some translation bugs

Fixes #6441 - the translation is already done in the code, but the strings are not added to the template and are therefor not available for translation.

Fixes #6696

Fixes some warnings.