Remove some unused l10n strings
Fix wrong behaviour in resolve_value