Merge "Reimport Settings translations.  DO NOT MERGE" into gingerbread