More i18n maintenance (stray markers, hard-coded constants)