Bug 1081731 - Follow-up, use brandShortName and split private browsing strings r=flod