Merge "Fix pseudolocalizer at end of string"