PMO-2838: added entries in resource bundle. some minor improvements