Updated some language variables to make them more global-tolerant - refs BT#7149