Merge "Updated emergency string when locale changes." into eclair