WIP general: translations fixes

(closes #1911)