Jade,
I am definetely to blame for that last "message_catalog" filetype error message that you are getting, sorry about that!
However, you should only be experiencing this error when upgrading to 4.7 not 4.6 (4.6 should be clean of any I18N traces). Are you sure you are on 4.6? Could you do
find -iname '*.info'|xargs grep -l message_catalog| xargs cvs status -v
to see the cvs status of the info files that contain message catalogs.
If you are indeed upgrading to 4.7 the workaround is to execute:
insert into apm_package_file_types(file_type_key, pretty_name) values(''message_catalog'', ''Message Catalog'');
Hope that helps!
Peter