Fixed locales for merge day. DONTBUILD CLOSED TREE NO BUG a=release