There actually already is a cr_items.locale. The only problem is that it's a Foreign Key to cr_locales.locale, which is varchar(4), whereas ad_locale.locale is varchar(30) and in practice contains only five-character strings. The upshot is that the upgrade should be really easy. We just have to change the fk to use ad_locale, and figure out how to handle any data currently using cr_locales. How about just doing a one-time mapping from the initial values of cr_locale.locale to those of ad_locale.locale, and throwing an error back to the upgrader for locales not in the mapping? I'd like to get this into 5.2.