2 localization related commits

I'm not very sure commit 8e26569450013c1a26083a2168625b590e04e0b6 is adequte, please review it :-)