Index: modules/field/field.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.install,v
retrieving revision 1.16
diff -u -r1.16 field.install
--- modules/field/field.install	15 Oct 2009 12:44:34 -0000	1.16
+++ modules/field/field.install	30 Oct 2009 23:01:18 -0000
@@ -130,7 +130,7 @@
         'not null' => TRUE,
         'default' => ''
       ),
-      'object_type'       => array(
+      'object_type' => array(
         'type' => 'varchar',
         'length' => 32,
         'not null' => TRUE,
@@ -142,18 +142,32 @@
         'not null' => TRUE,
         'default' => ''
       ),
-      'data' => array(
-        'type' => 'text',
-        'size' => 'medium',
-        'not null' => TRUE,
-        'serialize' => TRUE,
-      ),
       'deleted' => array(
         'type' => 'int',
         'size' => 'tiny',
         'not null' => TRUE,
         'default' => 0,
       ),
+      'label' => array(
+        'type' => 'varchar',
+        'length' => 255,
+        'not null' => TRUE,
+        'default' => '',
+        'translatable' => TRUE,
+      ),
+      'description' => array(
+        'type' => 'text',
+        'size' => 'medium',
+        'not null' => TRUE,
+        'default' => '',
+        'translatable' => TRUE,
+      ),
+      'data' => array(
+        'type' => 'text',
+        'size' => 'medium',
+        'not null' => TRUE,
+        'serialize' => TRUE,
+      ),
     ),
     'primary key' => array('id'),
     'indexes' => array(
Index: modules/field/field.crud.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.crud.inc,v
retrieving revision 1.40
diff -u -r1.40 field.crud.inc
--- modules/field/field.crud.inc	22 Oct 2009 00:49:12 -0000	1.40
+++ modules/field/field.crud.inc	30 Oct 2009 23:01:18 -0000
@@ -387,7 +387,7 @@
     throw new FieldException('Attempt to update a non-existent field.');
   }
 
-  // Use the prior field values for anything not specifically set by the new 
+  // Use the prior field values for anything not specifically set by the new
   // field to be sure that all values are set.
   $field += $prior_field;
   $field['settings'] += $prior_field['settings'];
@@ -441,9 +441,9 @@
 
   // Clear caches
   field_cache_clear(TRUE);
-  
+
   // Invoke external hooks after the cache is cleared for API consistency.
-  module_invoke_all('field_update_field', $field, $prior_field, $has_data);  
+  module_invoke_all('field_update_field', $field, $prior_field, $has_data);
 }
 
 /**
@@ -745,15 +745,17 @@
   // not have its own column and is not automatically populated when the
   // instance is read.
   $data = $instance;
-  unset($data['id'], $data['field_id'], $data['field_name'], $data['bundle'], $data['deleted']);
+  unset($data['id'], $data['field_id'], $data['field_name'], $data['bundle'], $data['deleted'], $data['label'], $data['description']);
 
   $record = array(
     'field_id' => $instance['field_id'],
     'field_name' => $instance['field_name'],
     'object_type' => $instance['object_type'],
     'bundle' => $instance['bundle'],
-    'data' => $data,
     'deleted' => $instance['deleted'],
+    'label' => $instance['label'],
+    'description' => $instance['description'],
+    'data' => $data,
   );
   // We need to tell drupal_update_record() the primary keys to trigger an
   // update.
@@ -813,7 +815,9 @@
 function field_read_instances($params = array(), $include_additional = array()) {
   $query = db_select('field_config_instance', 'fci', array('fetch' => PDO::FETCH_ASSOC));
   $query->join('field_config', 'fc', 'fc.id = fci.field_id');
-  $query->fields('fci');
+  $query
+    ->fields('fci')
+    ->addTag('translatable');
 
   // Turn the conditions into a query.
   foreach ($params as $key => $value) {
@@ -840,6 +844,8 @@
     $instance['object_type'] = $record['object_type'];
     $instance['bundle'] = $record['bundle'];
     $instance['deleted'] = $record['deleted'];
+    $instance['label'] = $record['label'];
+    $instance['description'] = $record['description'];
 
     module_invoke_all('field_read_instance', $instance);
     $instances[] = $instance;