[bug 846026] Adding missing translation wraps and other lines for to use consistent methods.