fix non-translatable strings, and compiler warning for #endif