Index: content.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/Attic/content.module,v
retrieving revision 1.301.2.106.2.9
diff -u -r1.301.2.106.2.9 content.module
--- content.module	12 Aug 2009 09:58:45 -0000	1.301.2.106.2.9
+++ content.module	12 Aug 2009 11:59:55 -0000
@@ -1526,7 +1526,6 @@
         $type['tables'] = array();
         if ($fields = content_field_instance_read(array('type_name' => $type_name))) {
           foreach ($fields as $field) {
-            $type['fields'][$field['field_name']] = $field;
             $db_info = content_database_info($field);
             $type['tables'][$db_info['table']] = $db_info['table'];
 
@@ -1535,10 +1534,11 @@
               'widget_label' => $field['widget']['label'],
               'widget_description' => $field['widget']['description'],
             );
-            drupal_alter('content_field_strings', $field_strings, $field['field_name']);
+            drupal_alter('content_field_strings', $field_strings, $field['type_name'], $field['field_name']);
             $field['widget']['label'] = $field_strings['widget_label'];
             $field['widget']['description'] = $field_strings['widget_description'];
 
+            $type['fields'][$field['field_name']] = $field;
             // This means that content_fields($field_name) (no type name)
             // returns the last instance loaded.
             $info['fields'][$field['field_name']] = $field;