fully translated wpsresource.ts
resolved conflicts
resolved conflicts