DO NOT MERGE Better i18n

The last issue to fix is with escaping strings.