1.0dev: Prevent merging of translation updates.
Authored by: rblank 2012-06-17
Parent: [r11057]
Child: [r11059]
