Merge webL10n from gaia, fix .properties files