Fixes to support apostrophe characters in translated text