Better version of the previous commit

Better version of the proposed patch to ensure that non-translated strings are returned in the event the translation is missing.